Merge pull request #1354 from wallabag/v2-clean

some cleanup

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 4b722677dfb96b368c393998f0a8bec4ffccd99d..08f4a3e98cd9fa74e64c49794a26d551f2525275 100644 (file)
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -16,8 +16,8 @@ tools:
     php_code_sniffer: true
     php_pdepend: true
     sensiolabs_security_checker: true
-    external_code_coverage:
-        timeout: 1800
+    #external_code_coverage:
+    #    timeout: 3600
     php_code_coverage: true
     php_sim: false
     php_cpd: false

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 d0ebdad6e621eb7587f45d31ec0937af3a386973..8fc6e8f6e8790a7e216d9ec024ed84904e3735b0 100644 (file)
--- 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 @@
                 </div>
 
                 <div class="col s6">
-                    <a href="#!" class="center waves-effect waves-green btn-flat" id="clean_form_filters">{% trans %}Clean{% endtrans %}</a>
+                    <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{% trans %}Clear{% endtrans %}</a>
                 </div>
 
                 <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 0339eba02fdf73b630ebb9f65e2bf84c46dab5ed..c0700c2cbbeac312c3716093de2f247999e487a9 100755 (executable)
--- 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() {
     if ($("div").is("#filters")) {
         $('#button_filters').show();
         $('.button-collapse-right').sideNav({ edge: 'right' });
-        $('#clean_form_filters').on('click', function(){
+        $('#clear_form_filters').on('click', function(){
             $('#filters input').val('');
             return false;
         });