Merge pull request #1879 from wallabag/v2-tag-field-position

Move tag form in Material theme

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 87e1d42f49c1b52c30247c1ed3cec1384e0cbe57..6e8a87a98e677eefc694a6cea12bf59c3fa9cb6c 100644 (file)
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -6,7 +6,7 @@ Remember, this is _not_ a place to ask questions. For that, go to http://gitter.
 ### Environment
 
 * wallabag version (or git revision) that exhibits the issue:
-* How did you install wallabag? Via `composer create-project` or by downloading the package?
+* How did you install wallabag? Via `git clone` or by downloading the package?
 * Last wallabag version that did not exhibit the issue (if applicable):
 * php version:
 * OS:

diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 677c33daa7f39181f155fb2bc3ee49ca619e3f7b..a36f33922e8805ecd00d7727ddb13293f084c898 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -39,7 +39,22 @@ services:
     wallabag_core.graby:
         class: Graby\Graby
         arguments:
-            - { error_message: "wallabag can't retrieve contents for this article. Please report this issue to us." }
+            -
+                error_message: "wallabag can't retrieve contents for this article. Please report this issue to us."
+                http_client:
+                    user_agents:
+                        'lifehacker.com': 'PHP/5.2'
+                        'gawker.com': 'PHP/5.2'
+                        'deadspin.com': 'PHP/5.2'
+                        'kotaku.com': 'PHP/5.2'
+                        'jezebel.com': 'PHP/5.2'
+                        'io9.com': 'PHP/5.2'
+                        'jalopnik.com': 'PHP/5.2'
+                        'gizmodo.com': 'PHP/5.2'
+                        '.wikipedia.org': 'Mozilla/5.2'
+                        '.fok.nl': 'Googlebot/2.1'
+                        'getpocket.com': 'PHP/5.2'
+                        'iansommerville.com': 'PHP/5.2'
         calls:
             - [ setLogger, [ "@logger" ] ]
         tags:

diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/saveLink.js b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/saveLink.js
index a7acd84c3e808969cac189ca5cf57d267cdba8d6..34e934ccd9d9f39913dabac8eed669598b5d720a 100755 (executable)
--- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/saveLink.js
+++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/saveLink.js
@@ -78,19 +78,6 @@ $.fn.ready(function() {
     event.preventDefault();
   });
 
-  /* ==========================================================================
-   Keyboard gestion
-   ========================================================================== */
-
-  $(window).keydown(function(e){
-    if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || (e.keyCode == 27 && $bagitForm.is(':visible') ) ) {
-      $bagit.removeClass("current");
-      $("#bagit-arrow").removeClass("arrow-down");
-      toggleSaveLinkForm();
-      return false;
-    }
-  });
-
   /* ==========================================================================
    Process all links inside an article
    ========================================================================== */

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index 89e6e0765ce4e76e6326de03440eff056cb6a9a6..0798962ca2d854ec0bbf030894154775c82f5146 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -49,7 +49,7 @@
 
     <h2>{{ 'config.tab_menu.rss'|trans }}</h2>
 
-    {{ form_start(form.rss) }}
+        {{ form_start(form.rss) }}
         {{ form_errors(form.rss) }}
 
         <div class="row">
@@ -169,7 +169,7 @@
         {{ form_rest(form.pwd) }}
     </form>
 
-    <h2>{{ 'config.tab_menu.rules'|trans }}}</h2>
+    <h2>{{ 'config.tab_menu.rules'|trans }}</h2>
 
     <ul>
         {% for tagging_rule in app.user.config.taggingRules %}
@@ -183,7 +183,7 @@
         {% endfor %}
     </ul>
 
-    {{ form_start(form.new_tagging_rule) }}
+        {{ form_start(form.new_tagging_rule) }}
         {{ form_errors(form.new_tagging_rule) }}
 
         <fieldset class="w500p inline">
@@ -205,6 +205,91 @@
         {{ form_rest(form.new_tagging_rule) }}
     </form>
 
+    <div class="row">
+        <div class="input-field col s12">
+            <h3>{{ 'config.form_rules.faq.title'|trans }}</h3>
+
+            <h4>{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}</h4>
+            <p class="help">{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}</p>
+
+            <h4>{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}</h4>
+            <p class="help">{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}</p>
+
+            <h4>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h4>
+            <p class="help">
+                {{ 'config.form_rules.faq.variables_available_description'|trans }}
+            </p>
+
+            <table class="bordered">
+                <thead>
+                <tr>
+                    <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
+                    <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
+                    <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
+                    <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
+                </tr>
+                </thead>
+
+                <tbody>
+                <tr>
+                    <td>title</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
+                    <td>&lt;=</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>url</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
+                    <td>&lt;</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>isArchived</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
+                    <td>=&gt;</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>isStarred</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
+                    <td>&gt;</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>content</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
+                    <td>=</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>language</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
+                    <td>!=</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>mimetype</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
+                    <td>OR</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>readingTime</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
+                    <td>AND</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>domainName</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
+                    <td>matches</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
     {% if is_granted('ROLE_SUPER_ADMIN') %}
     <h2>{{ 'config.tab_menu.new_user'|trans }}</h2>
 

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 3343a1d21f083ce67a55c2fa1965b99865043264..5b94f01c7c9b5ab94d96494820ca499041b162ff 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -250,75 +250,75 @@
                                 <h5>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h5>
                                 <p class="help">
                                     {{ 'config.form_rules.faq.variables_available_description'|trans }}
-
-                                    <table class="bordered">
-                                        <thead>
-                                            <tr>
-                                                <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
-                                                <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
-                                                <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
-                                                <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
-                                            </tr>
-                                        </thead>
-
-                                        <tbody>
-                                            <tr>
-                                                <td>title</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
-                                                <td>&lt;=</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>url</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
-                                                <td>&lt;</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>isArchived</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
-                                                <td>=&gt;</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>isStarred</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
-                                                <td>&gt;</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>content</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
-                                                <td>=</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>language</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
-                                                <td>!=</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>mimetype</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
-                                                <td>OR</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>readingTime</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
-                                                <td>AND</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>domainName</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
-                                                <td>matches</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
                                 </p>
+
+                                <table class="bordered">
+                                    <thead>
+                                        <tr>
+                                            <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
+                                            <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
+                                            <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
+                                            <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
+                                        </tr>
+                                    </thead>
+
+                                    <tbody>
+                                        <tr>
+                                            <td>title</td>
+                                            <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
+                                            <td>&lt;=</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td>url</td>
+                                            <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
+                                            <td>&lt;</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td>isArchived</td>
+                                            <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
+                                            <td>=&gt;</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td>isStarred</td>
+                                            <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
+                                            <td>&gt;</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td>content</td>
+                                            <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
+                                            <td>=</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td>language</td>
+                                            <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
+                                            <td>!=</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td>mimetype</td>
+                                            <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
+                                            <td>OR</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td>readingTime</td>
+                                            <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
+                                            <td>AND</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td>domainName</td>
+                                            <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
+                                            <td>matches</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
                             </div>
                         </div>
                     </div>