]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Added new tag form in mobile view for Material theme 2553/head
authorNicolas Lœuillet <nicolas@loeuillet.org>
Mon, 7 Nov 2016 08:05:04 +0000 (09:05 +0100)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Tue, 8 Nov 2016 13:24:00 +0000 (14:24 +0100)
Fix #2376

15 files changed:
src/Wallabag/CoreBundle/Form/Type/NewTagType.php
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig

index 3db4105fc3e5de4213809fc9636122b9f1b0a45c..e830ade480d7dde9a4bb4b819cb093b563b1e141 100644 (file)
@@ -3,6 +3,7 @@
 namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -12,7 +13,15 @@ class NewTagType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('label', TextType::class, ['required' => true])
+            ->add('label', TextType::class, [
+                'required' => true,
+                'attr' => [
+                    'placeholder' => 'tag.new.placeholder',
+                ],
+            ])
+            ->add('add', SubmitType::class, [
+                'label' => 'tag.new.add',
+            ])
         ;
     }
 
index 14b528f9c2148650deaa438e9a005a8237506829..b66aa3ea53285a76b4792c932cac9b3a845d809d 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
         # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 
 import:
     # page_title: 'Import'
index 5eae8b86832a5c731b7d8be754f540d4e54d1376..9e19dcc4a7ffaa6c28f5435eafaaf82487c0db92 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         number_on_the_page: '{0} Es gibt keine Tags.|{1} Es gibt einen Tag.|]1,Inf[ Es gibt %count% Tags.'
         see_untagged_entries: 'Zeige nicht getaggte Einträge'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 
 import:
     page_title: 'Importieren'
index 45d7fd8ced17d8470427d5b41b2481ac7736a04f..7516bbd5cf30857de81e0390f18cd58a15a628c7 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
         see_untagged_entries: 'See untagged entries'
+    new:
+        add: 'Add'
+        placeholder: 'You can add several tags, separated by a comma.'
 
 import:
     page_title: 'Import'
index 8b555cc227e0b3e970fc90358830c9c98a232672..208982d9bbe4070ff83a43bae43d56c635ce5166 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         number_on_the_page: '{0} No hay ninguna etiqueta.|{1} Hay una etiqueta.|]1,Inf[ Hay %count% etiquetas.'
         # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 
 import:
     page_title: 'Importar'
index 3d7e8078ffa4b02796d9d17a332667bcb3c64b2f..c443b21c5812154030456be64a73b137035bde6a 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.'
         # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 
 import:
     page_title: 'درون‌ریزی'
index 833f97bbf6cbabfbc4874b9876ef6e9dae0e56bb..ea759dd30a962c31b6a23a5b31b4a68261dbbab5 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags."
         see_untagged_entries: "Voir les articles sans tag"
+    new:
+        add: 'Ajouter'
+        placeholder: 'Vous pouvez ajouter plusieurs tags, séparés par une virgule.'
 
 import:
     page_title: "Importer"
index 197d5e07c668b87e9ec29d4b92668257dcaa6330..b3bc573bd028f6b5b9f33d3fff09c0a8322940b6 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         number_on_the_page: "{0} Non ci sono tag.|{1} C'è un tag.|]1,Inf[ ci sono %count% tag."
         # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 
 import:
     page_title: 'Importa'
index 75268e00ca8a7a1939ffac415dec3c565776f69d..97b5f4a9ff4c78c2e805776f7436b059307f7221 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         number_on_the_page: "{0} I a pas cap d'etiquetas.|{1} I a una etiqueta.|]1,Inf[ I a %count% etiquetas."
         see_untagged_entries: "Afichar las entradas sens pas cap d'etiquetas"
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 
 import:
     page_title: 'Importar'
index 40ded0be2ae8503f4640b454a6c40242a5396ff3..36f93042f4bab621f94a52b83b78f8796b9cd0f9 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         number_on_the_page: '{0} Nie ma tagów.|{1} Jest jeden tag.|]1,Inf[ Są %count% tagi.'
         see_untagged_entries: 'Zobacz nieotagowane wpisy'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 
 import:
     page_title: 'Import'
index ed371cbc43aa3103cea20c7bfde84fae81db4be2..d8fc9d5c628f10c8c75e4e8ef6cfc07fd60bfde8 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         number_on_the_page: '{0} Não existem tags.|{1} Uma tag.|]1,Inf[ Existem %count% tags.'
         see_untagged_entries: 'Ver entradas sem tags'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 
 import:
     page_title: 'Importar'
index a3c0e266e1282158c8092a88b3531755b99c887c..d130e431fc66c09f1c19eff40b4d2ccb324da3cc 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
         # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 
 import:
     # page_title: 'Import'
index a6d2e1374aa8e320f5a12d2567eba019670ad0b2..f67d8beec09fb9d88d48d0a578472e473666d2c8 100644 (file)
@@ -335,6 +335,9 @@ tag:
     list:
         number_on_the_page: '{0} Herhangi bir etiket yok.|{1} Burada bir adet etiket var.|]1,Inf[ Burada %count% adet etiket var.'
         # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 
 import:
     page_title: 'İçe Aktar'
index 5188eb0119957c8d75521909331dae8d97d409dc..37a29d033e870f67ec2541edf8df91f85911156d 100644 (file)
@@ -53,7 +53,7 @@
             <div class="collapsible-body"></div>
         </li>
 
-        <li class="bold hide-on-med-and-down">
+        <li class="bold">
             <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload">
                 <i class="material-icons small">autorenew</i>
                 <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span>
@@ -81,7 +81,7 @@
             </a>
             <div class="collapsible-body"></div>
         </li>
-        <li class="bold border-bottom hide-on-med-and-down">
+        <li class="bold border-bottom">
             <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
                 <i class="material-icons small">delete</i>
                 <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
@@ -89,7 +89,7 @@
             <div class="collapsible-body"></div>
         </li>
 
-        <li class="bold border-bottom hide-on-med-and-down">
+        <li class="bold border-bottom">
             <a class="waves-effect collapsible-header" id="nav-btn-add-tag">
                 <i class="material-icons small">label_outline</i>
                 <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span>
             </div>
         </li>
 
-        <li class="bold hide-on-large-only">
-            <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
-                <i class="material-icons small">delete</i>
-                <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
-            </a>
-            <div class="collapsible-body"></div>
-        </li>
-
         <li class="bold">
             <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}">
                 <i class="material-icons small">error</i>
index 6e552560ec14c2a491e08bcd6c3b9b071ddc5cc7..b702c4b68b32970c8be96557812db6b0614d1d84 100644 (file)
@@ -9,5 +9,6 @@
 
     {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
 
-    {{ form_rest(form) }}
+    {{ form_widget(form.add, {'attr': {'class': 'btn waves-effect waves-light hide-on-large-only'}}) }}
+    {{ form_widget(form._token) }}
 </form>