aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2015-08-17 23:22:24 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2015-08-17 23:22:24 +0200
commitfac3f8abfaf1a6552a180543d1b1f13a42ba0bc6 (patch)
treed79f206fb082cd79c81823fdc4afe0074f1bc873
parente40ff14d7d2865659b7e9804489e4fc5a2eaf781 (diff)
parent5f246a55430e33ae2dc6015c0427f543c4cf24ef (diff)
downloadwallabag-fac3f8abfaf1a6552a180543d1b1f13a42ba0bc6.tar.gz
wallabag-fac3f8abfaf1a6552a180543d1b1f13a42ba0bc6.tar.zst
wallabag-fac3f8abfaf1a6552a180543d1b1f13a42ba0bc6.zip
Merge pull request #1355 from wallabag/v2-clear-button
clean -> clear
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig2
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js2
2 files changed, 2 insertions, 2 deletions
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 d0ebdad6..8fc6e8f6 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
@@ -96,7 +96,7 @@
96 </div> 96 </div>
97 97
98 <div class="col s6"> 98 <div class="col s6">
99 <a href="#!" class="center waves-effect waves-green btn-flat" id="clean_form_filters">{% trans %}Clean{% endtrans %}</a> 99 <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{% trans %}Clear{% endtrans %}</a>
100 </div> 100 </div>
101 101
102 <div class="col s6"> 102 <div class="col s6">
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 0339eba0..c0700c2c 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,7 +3,7 @@ function init_filters() {
3 if ($("div").is("#filters")) { 3 if ($("div").is("#filters")) {
4 $('#button_filters').show(); 4 $('#button_filters').show();
5 $('.button-collapse-right').sideNav({ edge: 'right' }); 5 $('.button-collapse-right').sideNav({ edge: 'right' });
6 $('#clean_form_filters').on('click', function(){ 6 $('#clear_form_filters').on('click', function(){
7 $('#filters input').val(''); 7 $('#filters input').val('');
8 return false; 8 return false;
9 }); 9 });