From 392f4a2681d94b8af8e2725aa6ca4615329afa54 Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Wed, 12 Aug 2015 22:55:44 +0300 Subject: #1320 Design for filters --- .../Resources/views/themes/material/public/js/init.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js') 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 d75a9fa38b24b57fbbb11d52c17d56d04387718f Mon Sep 17 00:00:00 2001 From: Alexandr Danilov 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) --- .../Resources/views/themes/material/public/js/init.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js') 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 Date: Mon, 17 Aug 2015 01:50:46 +0300 Subject: My implementation progress bar at the top of the page #1348 --- .../CoreBundle/Resources/views/themes/material/public/js/init.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js') 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 790d18a319e6ac9934318cce339d17217e053c63 Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Mon, 17 Aug 2015 03:12:14 +0300 Subject: GUI for filter by creation date #1343 --- .../CoreBundle/Resources/views/themes/material/public/js/init.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js') 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