From 06fdfd025ec7f81e11e22f8596752296c0105143 Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Wed, 12 Aug 2015 19:18:31 +0300
Subject: fix #1321

---
 .../views/themes/material/layout.html.twig         |  2 +-
 .../views/themes/material/public/css/main.css      | 32 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 5a1f7001..32933d56 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -71,7 +71,7 @@
             </form>
             <div class="input-field nav-panel-add" style="display: none">
                 {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }}
-                <label for="add"><i class="mdi-content-add"></i></label>
+                <label for="add" class="active"><i class="mdi-content-add"></i></label>
                 <i class="mdi-navigation-close"></i>
             </div>
             <!--<form name="entry" method="post" action="{{ path('new_entry') }}">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index bf7e667e..9650a12b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -60,6 +60,10 @@ nav, main, footer {
    1 = Nav
    ========================================================================== */
 
+nav input {
+    color: #aaa;
+}
+
 .nav-wrapper .button-collapse {
     padding: 0px 15px;
 }
@@ -96,6 +100,34 @@ nav, main, footer {
     white-space: nowrap;
 }
 
+.input-field input {
+    display: block;
+    line-height: inherit;
+    padding-left: 4rem !important;
+    width: calc(100% - 8rem);
+}
+
+.input-field input:focus {
+    background-color: #fff;
+    border: 0;
+    box-shadow: none;
+    color: #444;
+}
+
+.input-field.nav-panel-add label {
+    left: 1rem;
+}
+
+.input-field.nav-panel-add .mdi-navigation-close {
+    position: absolute;
+    top: 0;
+    right: 1rem;
+    color: transparent;
+    cursor: pointer;
+    font-size: 2rem;
+    transition: .3s color;
+}
+
 /* ==========================================================================
    2 = Side-nav
    ========================================================================== */
-- 
cgit v1.2.3


From 8ba913d87a1e7f5223080c4e422301561fa74467 Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Wed, 12 Aug 2015 20:27:30 +0300
Subject: improved view

---
 .../views/themes/material/Security/login.html.twig | 26 +++++++++++++---------
 .../views/themes/material/public/css/main.css      |  4 ++--
 2 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
index 73abc3f8..2c513ffe 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
@@ -23,19 +23,23 @@
                             <span class="black-text"><p>{{ flashMessage }}</p></span>
                         {% endfor %}
 
-                        <div class="input-field s12">
-                            <label for="username">{% trans %}Username{% endtrans %}</label>
-                            <input type="text" id="username" name="_username" value="{{ last_username }}" />
-                        </div>
+                        <div class="row">
 
-                        <div class="input-field s12">
-                            <label for="password">{% trans %}Password{% endtrans %}</label>
-                            <input type="password" id="password" name="_password" />
-                        </div>
+                            <div class="input-field col s12">
+                                <label for="username">{% trans %}Username{% endtrans %}</label>
+                                <input type="text" id="username" name="_username" value="{{ last_username }}" />
+                            </div>
+
+                            <div class="input-field col s12">
+                                <label for="password">{% trans %}Password{% endtrans %}</label>
+                                <input type="password" id="password" name="_password" />
+                            </div>
+
+                            <div class="input-field col s12">
+                                <input type="checkbox" id="remember_me" name="_remember_me" checked />
+                                <label for="remember_me">{% trans %}Keep me logged in{% endtrans %}</label>
+                            </div>
 
-                        <div class="input-field s12">
-                            <input type="checkbox" id="remember_me" name="_remember_me" checked />
-                            <label for="remember_me">{% trans %}Keep me logged in{% endtrans %}</label>
                         </div>
 
                     </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index 9650a12b..6dd6ed55 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -100,14 +100,14 @@ nav input {
     white-space: nowrap;
 }
 
-.input-field input {
+.nav-panels .input-field input {
     display: block;
     line-height: inherit;
     padding-left: 4rem !important;
     width: calc(100% - 8rem);
 }
 
-.input-field input:focus {
+.nav-panels .input-field input:focus {
     background-color: #fff;
     border: 0;
     box-shadow: none;
-- 
cgit v1.2.3


From 392f4a2681d94b8af8e2725aa6ca4615329afa54 Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Wed, 12 Aug 2015 22:55:44 +0300
Subject: #1320  Design for filters

---
 .../views/themes/material/Entry/entries.html.twig  | 37 +++++++++++++++++++++-
 .../views/themes/material/layout.html.twig         |  8 +----
 .../views/themes/material/public/css/main.css      | 13 ++++++++
 .../views/themes/material/public/js/init.js        | 14 ++++++++
 4 files changed, 64 insertions(+), 8 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 55e3540d..7a1cc9b4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -18,7 +18,6 @@
     {% if entries is not empty %}
         <div class="results clearfix">
             <div class="nb-results left">{{ entries.count }} {% trans %}entries{% endtrans %}</div>
-            <div class="left"><form>{{ form_rest(form) }}<button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">Filter</button></form></div>
             <ul class="pagination right">
                 {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %}
                     <li class="{{ currentPage == p ? 'active':'waves-effect'}}">
@@ -62,4 +61,40 @@
             {% endfor %}
         </ul>
     {% endif %}
+
+
+    <!-- Filters -->
+    <div id="filters" class="side-nav fixed right-aligned">
+        <form>
+
+            <h4 class="center">{% trans %}Filters{% endtrans %}</h1>
+
+            <div class="row">
+
+                <div class="col s12">
+                    <label>{% trans %}Reading time in minutes{% endtrans %}</label>
+                </div>
+
+                <div class="input-field col s6">
+                    <input id="entry_filter_readingTime_left_number" name="entry_filter[readingTime][left_number]" type="number">
+                    <label for="entry_filter_readingTime_left_number">{% trans %}from{% endtrans %}</label>
+                </div>
+
+                <div class="input-field col s6">
+                    <input id="entry_filter_readingTime_right_number" name="entry_filter[readingTime][right_number]" type="number">
+                    <label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label>
+                </div>
+
+                <div class="col s6">
+                    <a href="#!" class="center waves-effect waves-green btn-flat" id="clean_form_filters">{% trans %}Clean{% endtrans %}</a>
+                </div>
+
+                <div class="col s6">
+                    <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{% trans %}Filter{% endtrans %}</button>
+                </div>
+
+            </div>
+
+        </form>
+    </div>
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 32933d56..88b6c6b7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -60,6 +60,7 @@
                 <ul>
                     <li class="bold"><a class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li>
                     <li><a class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a>
+                    <li id="button_filters"><a href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"><i class="mdi-content-filter-list"></i></a></li>
                 </ul>
             </div>
             <form method="get" action="index.php">
@@ -74,13 +75,6 @@
                 <label for="add" class="active"><i class="mdi-content-add"></i></label>
                 <i class="mdi-navigation-close"></i>
             </div>
-            <!--<form name="entry" method="post" action="{{ path('new_entry') }}">
-                <div class="input-field nav-panel-add" style="display: none">
-                    <input id="add entry_url" name="entry[url]" type="search" required placeholder="{% trans %}Enter your link here{% endtrans %}">
-                    <label for="add"><i class="mdi-content-add"></i></label>
-                    <i class="mdi-navigation-close"></i>
-                </div>
-            </form>-->
         </div>
     </nav>
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index 6dd6ed55..2497e3e9 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -128,6 +128,10 @@ nav input {
     transition: .3s color;
 }
 
+#button_filters {
+    display: none;
+}
+
 /* ==========================================================================
    2 = Side-nav
    ========================================================================== */
@@ -164,6 +168,15 @@ nav input {
     margin: 0px 1rem;
 }
 
+/* ==========================================================================
+ * 3 = Filters slider
+ * ========================================================================== */
+
+#filters button {
+    padding: 0px;
+    width: 100%;
+}
+
 /* ==========================================================================
    3 = Cards
    ========================================================================== */
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
index 9341cb5a..4adc1a8d 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
@@ -1,3 +1,16 @@
+function init_filters() {
+    // no display if filters not aviable
+    if ($("div").is("#filters")) {
+        $('#button_filters').show();
+        $('.button-collapse-right').sideNav({ edge: 'right' });
+        $('#filters').css({ "left": "auto" });
+        $('#clean_form_filters').click(function(){
+            $('#filters input').val('');
+            return false;
+        });
+    }
+}
+
 $(document).ready(function(){
     // sideNav
     $('.button-collapse').sideNav();
@@ -5,6 +18,7 @@ $(document).ready(function(){
     $('.collapsible').collapsible({
         accordion : false
     });
+    init_filters();
 
     $('#nav-btn-add').click(function(){
        $(".nav-panel-buttom").hide(100);
-- 
cgit v1.2.3


From bac5a3455295971e60b027740a6b6ee1367742cf Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Wed, 12 Aug 2015 23:52:40 +0300
Subject: Fix form rendere

---
 .../Resources/views/themes/material/Entry/entries.html.twig           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 3561c509..4fbc4473 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -76,12 +76,12 @@
                 </div>
 
                 <div class="input-field col s6">
-                    <input id="entry_filter_readingTime_left_number" name="entry_filter[readingTime][left_number]" type="number">
+                    {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }}
                     <label for="entry_filter_readingTime_left_number">{% trans %}from{% endtrans %}</label>
                 </div>
 
                 <div class="input-field col s6">
-                    <input id="entry_filter_readingTime_right_number" name="entry_filter[readingTime][right_number]" type="number">
+                    {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }}
                     <label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label>
                 </div>
 
-- 
cgit v1.2.3


From d75a9fa38b24b57fbbb11d52c17d56d04387718f Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Mon, 17 Aug 2015 01:29:51 +0300
Subject: Fix:

    When I click on "new article" icon, and on the cross after, the filter icon is no more visible.
    When I change the size of my browser window, the filter appears but I didn't click on the icon
    Bug: can't click on pagination > 1
    display bug: when we load homepage, we see quickly the filter form
    new entry form: when we click on the field, the history of the field is at the left of the screen, not below the field (see screenshot)
---
 .../views/themes/material/Entry/new_form.html.twig        |  2 +-
 .../Resources/views/themes/material/public/css/main.css   | 15 +++++++++++++++
 .../Resources/views/themes/material/public/js/init.js     | 10 ++++------
 3 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
index 1a3ab86d..fda53e5b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
@@ -8,7 +8,7 @@
             <span class="black-text">{{ form_errors(form.url) }}</span>
         {% endif %}
 
-        {{ form_widget(form.url) }}
+        {{ form_widget(form.url, { 'attr': {'autocomplete': 'off'} }) }}
 
     <div class="hidden">{{ form_rest(form) }}</div>
 </form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index 2497e3e9..cc1bbd3f 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -48,6 +48,16 @@ nav, main, footer {
     margin-bottom: 0;
 }
 
+.pagination li {
+    padding: 0;
+}
+
+.pagination a {
+    padding: 0px 10px;
+    height: 30px;
+    display: block;
+}
+
 .page-footer .footer-copyright p {
     display: inline;
 }
@@ -177,6 +187,11 @@ nav input {
     width: 100%;
 }
 
+.side-nav.fixed.right-aligned {
+    right: -250px;
+    left: auto !important;
+}
+
 /* ==========================================================================
    3 = Cards
    ========================================================================== */
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
index 4adc1a8d..5e5ea847 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
@@ -3,8 +3,7 @@ function init_filters() {
     if ($("div").is("#filters")) {
         $('#button_filters').show();
         $('.button-collapse-right').sideNav({ edge: 'right' });
-        $('#filters').css({ "left": "auto" });
-        $('#clean_form_filters').click(function(){
+        $('#clean_form_filters').on('click', function(){
             $('#filters input').val('');
             return false;
         });
@@ -20,17 +19,16 @@ $(document).ready(function(){
     });
     init_filters();
 
-    $('#nav-btn-add').click(function(){
+    $('#nav-btn-add').on('click', function(){
        $(".nav-panel-buttom").hide(100);
        $(".nav-panel-add").show(100);
-       $(".nav-panel-menu").hide(100);
        $(".nav-panels .action").hide(100);
        $(".nav-panel-menu").addClass('hidden');
        $(".nav-panels").css('background', 'white');
        $("#entry_url").focus();
        return false;
     });
-    $('#nav-btn-search').click(function(){
+    $('#nav-btn-search').on('click', function(){
         $(".nav-panel-buttom").hide(100);
         $(".nav-panel-search").show(100);
         $(".nav-panels .action").hide(100);
@@ -39,7 +37,7 @@ $(document).ready(function(){
         $("#searchfield").focus();
         return false;
     });
-    $('.mdi-navigation-close').click(function(){
+    $('.mdi-navigation-close').on('click', function(){
         $(".nav-panel-add").hide(100);
         $(".nav-panel-search").hide(100);
         $(".nav-panel-buttom").show(100);
-- 
cgit v1.2.3


From fcb3faf10989caa0ec1fd27a6bad0b0abf0d77cc Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Mon, 17 Aug 2015 01:50:46 +0300
Subject: My implementation progress bar at the top of the page #1348

---
 .../Resources/views/themes/material/Entry/entry.html.twig         | 3 +++
 .../Resources/views/themes/material/public/css/main.css           | 8 ++++++++
 .../CoreBundle/Resources/views/themes/material/public/js/init.js  | 7 +++++++
 3 files changed, 18 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 4b0e1a7b..2aa9d1b8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -3,6 +3,9 @@
 {% block title %}{{ entry.title|raw }} ({{ entry.domainName }}){% endblock %}
 
 {% block menu %}
+    <div class="progress">
+        <div class="determinate"></div>
+    </div>
     <nav class="hide-on-large-only">
         <div class="nav-wrapper cyan darken-1">
             <ul>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index cc1bbd3f..f06fd6db 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -269,6 +269,14 @@ main ul.row {
     opacity: 1;
 }
 
+.progress {
+    position:fixed;
+    top:0px;
+    width: 100%;
+    height: 3px;
+    margin: 0;
+    z-index: 9999;
+}
 /* ==========================================================================
    6 = Media queries
    ========================================================================== */
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
index 5e5ea847..dffeaaad 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
@@ -46,4 +46,11 @@ $(document).ready(function(){
         $(".nav-panels").css('background', 'transparent');
         return false;
     });
+    $(window).scroll(function () {
+        var s = $(window).scrollTop(),
+        d = $(document).height(),
+        c = $(window).height();
+        var scrollPercent = (s / (d-c)) * 100;
+        $(".progress .determinate").css('width', scrollPercent+'%');
+    });
 });
-- 
cgit v1.2.3


From 6fd3d82c01f3ab9747b5a6f0ca779202f0e9cbe1 Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Mon, 17 Aug 2015 02:02:55 +0300
Subject: Hide open menu on page reading articles

---
 .../Resources/views/themes/material/public/css/main.css          | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index f06fd6db..a3cbe651 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -260,6 +260,15 @@ main ul.row {
     width: 240px !important;
 }
 
+.reader-mode .collapsible-body {
+    height: 0;
+    overflow: hidden;
+}
+
+.reader-mode:hover .collapsible-body {
+    height: auto;
+}
+
 .reader-mode span {
     opacity: 0;
     transition: opacity 0.2s ease;
-- 
cgit v1.2.3


From 790d18a319e6ac9934318cce339d17217e053c63 Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Mon, 17 Aug 2015 03:12:14 +0300
Subject: GUI for filter by creation date #1343

---
 .../views/themes/material/Entry/entries.html.twig          | 14 ++++++++++++--
 .../Resources/views/themes/material/public/js/init.js      |  7 +++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 4fbc4473..c05e4b87 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -74,17 +74,27 @@
                 <div class="col s12">
                     <label>{% trans %}Reading time in minutes{% endtrans %}</label>
                 </div>
-
                 <div class="input-field col s6">
                     {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }}
                     <label for="entry_filter_readingTime_left_number">{% trans %}from{% endtrans %}</label>
                 </div>
-
                 <div class="input-field col s6">
                     {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }}
                     <label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label>
                 </div>
 
+                <div class="col s12">
+                    <label>{% trans %}Create at{% endtrans %}</label>
+                </div>
+                <div class="input-field col s6">
+                    {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }}
+                    <label for="entry_filter_createdAt_left_date" class="active">{% trans %}from{% endtrans %}</label>
+                </div>
+                <div class="input-field col s6">
+                    {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }}
+                    <label for="entry_filter_createdAt_right_date" class="active">{% trans %}to{% endtrans %}</label>
+                </div>
+
                 <div class="col s6">
                     <a href="#!" class="center waves-effect waves-green btn-flat" id="clean_form_filters">{% trans %}Clean{% endtrans %}</a>
                 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
index dffeaaad..0339eba0 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
@@ -17,6 +17,13 @@ $(document).ready(function(){
     $('.collapsible').collapsible({
         accordion : false
     });
+    $('.datepicker').pickadate({
+        selectMonths: true,
+        selectYears: 15,
+        formatSubmit: 'dd/mm/yyyy',
+        hiddenName: true,
+        format: 'dd/mm/yyyy',
+    });
     init_filters();
 
     $('#nav-btn-add').on('click', function(){
-- 
cgit v1.2.3


From 727b39a90eddd03502c972ff27f520a1e8c8d3db Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Mon, 17 Aug 2015 15:43:44 +0300
Subject: Fix calendar in chromium and reducing the size of the calendar

---
 .../CoreBundle/Resources/views/themes/material/public/css/main.css   | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index a3cbe651..81ea598c 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -66,6 +66,10 @@ nav, main, footer {
     display: none;
 }
 
+.picker__date-display {
+    display: none;
+}
+
 /* ==========================================================================
    1 = Nav
    ========================================================================== */
@@ -190,6 +194,7 @@ nav input {
 .side-nav.fixed.right-aligned {
     right: -250px;
     left: auto !important;
+    overflow-y: visible;
 }
 
 /* ==========================================================================
-- 
cgit v1.2.3


From d5b28518e9c1c654e3eaa913603dd08fc7b04677 Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Mon, 17 Aug 2015 16:30:30 +0300
Subject: fix

---
 .../CoreBundle/Resources/views/themes/material/Entry/entries.html.twig  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index c05e4b87..9862b579 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -91,7 +91,7 @@
                     <label for="entry_filter_createdAt_left_date" class="active">{% trans %}from{% endtrans %}</label>
                 </div>
                 <div class="input-field col s6">
-                    {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }}
+                    {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.right_date.vars.value} }) }}
                     <label for="entry_filter_createdAt_right_date" class="active">{% trans %}to{% endtrans %}</label>
                 </div>
 
-- 
cgit v1.2.3