aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-02-16 12:27:43 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-02-16 12:27:43 +0100
commitf6249b67f66371b70a9c5a076ed03e5653c1330e (patch)
tree6d884c508bd166c67c28781ac839393f8167f933 /src
parent559cd55bc8011b11706c1ffc5c0563b6f2f39491 (diff)
parent8935a97c17e6524f4a2459b886445562eed19614 (diff)
downloadwallabag-f6249b67f66371b70a9c5a076ed03e5653c1330e.tar.gz
wallabag-f6249b67f66371b70a9c5a076ed03e5653c1330e.tar.zst
wallabag-f6249b67f66371b70a9c5a076ed03e5653c1330e.zip
Merge pull request #1668 from wallabag/v2-stuff
Few updates
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php2
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php26
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/NewUserType.php2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml19
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig17
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig17
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig44
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig15
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig15
13 files changed, 107 insertions, 62 deletions
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 69fb0a6f..b3e20ceb 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -56,7 +56,7 @@ class InstallCommand extends ContainerAwareCommand
56 ; 56 ;
57 57
58 $output->writeln('<info>Wallabag has been successfully installed.</info>'); 58 $output->writeln('<info>Wallabag has been successfully installed.</info>');
59 $output->writeln('<comment>Just execute `php bin/console server:run` for using wallabag: http://localhost:8000</comment>'); 59 $output->writeln('<comment>Just execute `php bin/console server:run --env=prod` for using wallabag: http://localhost:8000</comment>');
60 } 60 }
61 61
62 protected function checkRequirements() 62 protected function checkRequirements()
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index b7799746..6eb621d8 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -5,6 +5,7 @@ namespace Wallabag\CoreBundle\Controller;
5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; 5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
6use Symfony\Bundle\FrameworkBundle\Controller\Controller; 6use Symfony\Bundle\FrameworkBundle\Controller\Controller;
7use Symfony\Component\HttpFoundation\JsonResponse; 7use Symfony\Component\HttpFoundation\JsonResponse;
8use Symfony\Component\HttpFoundation\RedirectResponse;
8use Symfony\Component\HttpFoundation\Request; 9use Symfony\Component\HttpFoundation\Request;
9use Wallabag\CoreBundle\Entity\Config; 10use Wallabag\CoreBundle\Entity\Config;
10use Wallabag\CoreBundle\Entity\TaggingRule; 11use Wallabag\CoreBundle\Entity\TaggingRule;
@@ -64,7 +65,7 @@ class ConfigController extends Controller
64 'Password updated' 65 'Password updated'
65 ); 66 );
66 67
67 return $this->redirect($this->generateUrl('config')); 68 return $this->redirect($this->generateUrl('config').'#set4');
68 } 69 }
69 70
70 // handle changing user information 71 // handle changing user information
@@ -82,7 +83,7 @@ class ConfigController extends Controller
82 'Information updated' 83 'Information updated'
83 ); 84 );
84 85
85 return $this->redirect($this->generateUrl('config')); 86 return $this->redirect($this->generateUrl('config').'#set3');
86 } 87 }
87 88
88 // handle rss information 89 // handle rss information
@@ -98,7 +99,7 @@ class ConfigController extends Controller
98 'RSS information updated' 99 'RSS information updated'
99 ); 100 );
100 101
101 return $this->redirect($this->generateUrl('config')); 102 return $this->redirect($this->generateUrl('config').'#set2');
102 } 103 }
103 104
104 // handle tagging rule 105 // handle tagging rule
@@ -116,7 +117,7 @@ class ConfigController extends Controller
116 'Tagging rules updated' 117 'Tagging rules updated'
117 ); 118 );
118 119
119 return $this->redirect($this->generateUrl('config')); 120 return $this->redirect($this->generateUrl('config').'#set5');
120 } 121 }
121 122
122 // handle adding new user 123 // handle adding new user
@@ -144,10 +145,10 @@ class ConfigController extends Controller
144 145
145 $this->get('session')->getFlashBag()->add( 146 $this->get('session')->getFlashBag()->add(
146 'notice', 147 'notice',
147 sprintf('User "%s" added', $newUser->getUsername()) 148 $this->get('translator')->trans('User "%username%" added', array('%username%' => $newUser->getUsername()))
148 ); 149 );
149 150
150 return $this->redirect($this->generateUrl('config')); 151 return $this->redirect($this->generateUrl('config').'#set6');
151 } 152 }
152 153
153 return $this->render('WallabagCoreBundle:Config:index.html.twig', array( 154 return $this->render('WallabagCoreBundle:Config:index.html.twig', array(
@@ -172,7 +173,7 @@ class ConfigController extends Controller
172 * 173 *
173 * @Route("/generate-token", name="generate_token") 174 * @Route("/generate-token", name="generate_token")
174 * 175 *
175 * @return JsonResponse 176 * @return RedirectResponse|JsonResponse
176 */ 177 */
177 public function generateTokenAction(Request $request) 178 public function generateTokenAction(Request $request)
178 { 179 {
@@ -187,7 +188,12 @@ class ConfigController extends Controller
187 return new JsonResponse(array('token' => $config->getRssToken())); 188 return new JsonResponse(array('token' => $config->getRssToken()));
188 } 189 }
189 190
190 return $request->headers->get('referer') ? $this->redirect($request->headers->get('referer')) : $this->redirectToRoute('config'); 191 $this->get('session')->getFlashBag()->add(
192 'notice',
193 'RSS token updated'
194 );
195
196 return $this->redirect($this->generateUrl('config').'#set2');
191 } 197 }
192 198
193 /** 199 /**
@@ -197,7 +203,7 @@ class ConfigController extends Controller
197 * 203 *
198 * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule") 204 * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule")
199 * 205 *
200 * @return \Symfony\Component\HttpFoundation\RedirectResponse 206 * @return RedirectResponse
201 */ 207 */
202 public function deleteTaggingRuleAction(TaggingRule $rule) 208 public function deleteTaggingRuleAction(TaggingRule $rule)
203 { 209 {
@@ -214,7 +220,7 @@ class ConfigController extends Controller
214 'Tagging rule deleted' 220 'Tagging rule deleted'
215 ); 221 );
216 222
217 return $this->redirect($this->generateUrl('config')); 223 return $this->redirect($this->generateUrl('config').'#set5');
218 } 224 }
219 225
220 /** 226 /**
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
index d8bde17e..6eb0e63f 100644
--- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
@@ -21,7 +21,7 @@ class NewUserType extends AbstractType
21 ->add('plainPassword', RepeatedType::class, array( 21 ->add('plainPassword', RepeatedType::class, array(
22 'type' => PasswordType::class, 22 'type' => PasswordType::class,
23 'invalid_message' => 'The password fields must match', 23 'invalid_message' => 'The password fields must match',
24 'first_options' => array('label' => 'Password'), 24 'first_options' => array('label' => 'Password'),
25 'second_options' => array('label' => 'Repeat new password'), 25 'second_options' => array('label' => 'Repeat new password'),
26 'constraints' => array( 26 'constraints' => array(
27 new Constraints\Length(array( 27 new Constraints\Length(array(
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index c7186c34..67750bee 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -27,6 +27,7 @@ Search: 'Rechercher'
27Filter entries: 'Filtrer les articles' 27Filter entries: 'Filtrer les articles'
28Enter your search here: 'Saisissez votre terme de recherche' 28Enter your search here: 'Saisissez votre terme de recherche'
29Save new entry: 'Sauvegarder un nouvel article' 29Save new entry: 'Sauvegarder un nouvel article'
30Export: Exporter
30 31
31# Config screen 32# Config screen
32Settings: 'Paramètres' 33Settings: 'Paramètres'
@@ -39,6 +40,7 @@ Items per page: "Nombre d'articles par page"
39Language: 'Langue' 40Language: 'Langue'
40Save: 'Enregistrer' 41Save: 'Enregistrer'
41RSS token: 'Jeton RSS' 42RSS token: 'Jeton RSS'
43RSS token updated: 'Jeton RSS mis à jour'
42Name: 'Nom' 44Name: 'Nom'
43Email: 'Adresse e-mail' 45Email: 'Adresse e-mail'
44No token: 'Aucun jeton généré' 46No token: 'Aucun jeton généré'
@@ -51,6 +53,7 @@ Old password: 'Mot de passe actuel'
51New password: 'Nouveau mot de passe' 53New password: 'Nouveau mot de passe'
52Repeat new password: 'Confirmez votre nouveau mot de passe' 54Repeat new password: 'Confirmez votre nouveau mot de passe'
53Username: "Nom d'utilisateur" 55Username: "Nom d'utilisateur"
56Two factor authentication: Double authentification
54 57
55# Tagging rules 58# Tagging rules
56Tagging rules: "Règles de tag automatiques" 59Tagging rules: "Règles de tag automatiques"
@@ -82,6 +85,7 @@ One rule and another: "Une règle et l'autre"
82The domain name of the entry: "Le nom de domaine de l'article" 85The domain name of the entry: "Le nom de domaine de l'article"
83"Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches \"football\"</code>": "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>" 86"Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches \"football\"</code>": "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>"
84Rule: "Règle" 87Rule: "Règle"
88FAQ: "FAQ"
85 89
86# Entries 90# Entries
87'estimated reading time': 'durée de lecture' 91'estimated reading time': 'durée de lecture'
@@ -97,6 +101,10 @@ Edit an entry: "Éditer un article"
97Title: "Titre" 101Title: "Titre"
98Is public: "Public" 102Is public: "Public"
99 103
104# tag
105Tags: Tags
106"{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.": "{0} Il n'y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags."
107
100# Filters 108# Filters
101Filters: 'Filtres' 109Filters: 'Filtres'
102Status: 'Statut' 110Status: 'Statut'
@@ -110,7 +118,7 @@ to: 'à'
110website.com: 'website.com' 118website.com: 'website.com'
111Domain name: 'Nom de domaine' 119Domain name: 'Nom de domaine'
112Creation date: 'Date de création' 120Creation date: 'Date de création'
113dd/mm/yyyy: 'dd/mm/aaaa' 121dd/mm/yyyy: 'jj/mm/aaaa'
114Clear: 'Effacer' 122Clear: 'Effacer'
115Filter: 'Filtrer' 123Filter: 'Filtrer'
116website.com: "siteweb.com" 124website.com: "siteweb.com"
@@ -161,6 +169,9 @@ Entry unstarred: "Article retiré des favoris"
161Entry archived: "Article marqué comme lu" 169Entry archived: "Article marqué comme lu"
162Entry unarchived: "Article marqué comme non lu" 170Entry unarchived: "Article marqué comme non lu"
163Entry deleted: "Article supprimé" 171Entry deleted: "Article supprimé"
172Tagging rule deleted: "Règle supprimée"
173Tagging rules updated: "Règles mises à jour"
174User "%username%" added: 'Utilisateur "%username%" ajouté'
164 175
165# Entry 176# Entry
166Mark as read: 'Marquer comme lu' 177Mark as read: 'Marquer comme lu'
@@ -173,6 +184,8 @@ Download: 'Télécharger'
173Does this article appear wrong?: "Est-ce que cet article s'affiche mal ?" 184Does this article appear wrong?: "Est-ce que cet article s'affiche mal ?"
174Problems?: 'Un problème ?' 185Problems?: 'Un problème ?'
175Edit title: "Modifier le titre" 186Edit title: "Modifier le titre"
187Re-fetch content: Recharger le contenu
188Tag added: Tag ajouté
176 189
177# Import 190# Import
178Welcome on wallabag importer. Please select your previous service that you want to migrate.: "Bienvenue dans l'outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer." 191Welcome on wallabag importer. Please select your previous service that you want to migrate.: "Bienvenue dans l'outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer."
@@ -189,8 +202,12 @@ Please select your wallabag export and click on the below button to upload and i
189File: "Fichier" 202File: "Fichier"
190Upload file: "Importer le fichier" 203Upload file: "Importer le fichier"
191Import contents: "Importer les contenus" 204Import contents: "Importer les contenus"
205Import: "Importer"
206Import > Wallabag v1: "Importer > Wallabag v1"
207Import > Wallabag v2: "Importer > Wallabag v2"
192 208
193# Quickstart 209# Quickstart
210Quickstart: Pour bien débuter
194Welcome on wallabag!: "Bienvenue sur wallabag !" 211Welcome on wallabag!: "Bienvenue sur wallabag !"
195We'll accompany you to visit wallabag and show you some features which can interess you.: "Nous allons vous accompagner pour vous faire faire le tour de la maison et vous présenter quelques fonctionnalités qui pourraient vous intéresser pour vous approprier cet outil." 212We'll accompany you to visit wallabag and show you some features which can interess you.: "Nous allons vous accompagner pour vous faire faire le tour de la maison et vous présenter quelques fonctionnalités qui pourraient vous intéresser pour vous approprier cet outil."
196Follow us!: "Suivez-nous !" 213Follow us!: "Suivez-nous !"
diff --git a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
index c8fb5612..966a84db 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
@@ -1 +1 @@
<a id="bookmarklet" ondragend="this.click();" href="javascript:var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURI(url),'_blank');wllbg.close();void(0);">{% trans %}bag it!{% endtrans %}</a> <a id="bookmarklet" ondragend="this.click();" href="javascript:var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURI(url),'_blank');wllbg.close();void(0);">bag it!</a>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 32dc0859..94f4ba7d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -12,7 +12,7 @@
12 <ul class="links"> 12 <ul class="links">
13 <li class="topPosF"><a href="#top" title="{% trans %}Back to top{% endtrans %}" class="tool top icon icon-arrow-up-thick"><span>{% trans %}Back to top{% endtrans %}</span></a></li> 13 <li class="topPosF"><a href="#top" title="{% trans %}Back to top{% endtrans %}" class="tool top icon icon-arrow-up-thick"><span>{% trans %}Back to top{% endtrans %}</span></a></li>
14 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li> 14 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
15 <li><a title="{% trans %}Reload content{% endtrans %}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{% trans %}Reload content{% endtrans %}</span></a></li> 15 <li><a title="{% trans %}Re-fetch content{% endtrans %}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{% trans %}Re-fetch content{% endtrans %}</span></a></li>
16 <li><a title="{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}</span></a></li> 16 <li><a title="{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}</span></a></li>
17 <li><a title="{% trans %}Favorite{% endtrans %}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle favorite{% endtrans %}</span></a></li> 17 <li><a title="{% trans %}Favorite{% endtrans %}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle favorite{% endtrans %}</span></a></li>
18 <li><a id="nav-btn-add-tag" title="{% trans %}Add a tag{% endtrans %}"><span>{% trans %}Tag{% endtrans %}</span></a></li> 18 <li><a id="nav-btn-add-tag" title="{% trans %}Add a tag{% endtrans %}"><span>{% trans %}Tag{% endtrans %}</span></a></li>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig
index d182d552..fa0a9f53 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig
@@ -1,15 +1,14 @@
1<form name="entry" method="post" action="{{ path('new_entry')}}"> 1<form name="entry" method="post" action="{{ path('new_entry')}}">
2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %}
2 5
3 {% if form_errors(form) %} 6 {% if form_errors(form.url) %}
4 <span class="black-text">{{ form_errors(form) }}</span> 7 <span class="black-text">{{ form_errors(form.url) }}</span>
5 {% endif %} 8 {% endif %}
6 9
7 {% if form_errors(form.url) %} 10 {{ form_label(form.url) }}
8 <span class="black-text">{{ form_errors(form.url) }}</span> 11 {{ form_widget(form.url) }}
9 {% endif %}
10
11 {{ form_label(form.url) }}
12 {{ form_widget(form.url) }}
13 12
14 <div class="hidden">{{ form_rest(form) }}</div> 13 <div class="hidden">{{ form_rest(form) }}</div>
15</form> 14</form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
index 6a320692..e32264f3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
@@ -16,7 +16,7 @@
16 </ul> 16 </ul>
17 <h3>{% trans %}Mobile Apps{% endtrans %}</h3> 17 <h3>{% trans %}Mobile Apps{% endtrans %}</h3>
18 <ul> 18 <ul>
19 <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans %}via F-Droid{% endtrans %}</a> {% trans %} or {% endtrans %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans %}via Google Play{% endtrans %}</a></li> 19 <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">via F-Droid</a> {% trans %} or {% endtrans %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">via Google Play</a></li>
20 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li> 20 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
21 <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{% trans %}download the application{% endtrans %}</a></li> 21 <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
22 </ul> 22 </ul>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig
index 0b5a530d..ade7f56d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig
@@ -1,15 +1,14 @@
1<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}"> 1<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}">
2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %}
2 5
3 {% if form_errors(form) %} 6 {% if form_errors(form.label) %}
4 <span class="black-text">{{ form_errors(form) }}</span> 7 <span class="black-text">{{ form_errors(form.label) }}</span>
5 {% endif %} 8 {% endif %}
6 9
7 {% if form_errors(form.label) %} 10 {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
8 <span class="black-text">{{ form_errors(form.label) }}</span> 11 {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
9 {% endif %}
10
11 {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
12 {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
13 12
14 <div class="hidden">{{ form_rest(form) }}</div> 13 <div class="hidden">{{ form_rest(form) }}</div>
15</form> 14</form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 6f8c3674..a40789d8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -52,9 +52,9 @@
52 </li> 52 </li>
53 53
54 <li class="bold hide-on-med-and-down"> 54 <li class="bold hide-on-med-and-down">
55 <a class="waves-effect collapsible-header" title="{% trans %}Reload content{% endtrans %}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload"> 55 <a class="waves-effect collapsible-header" title="{% trans %}Re-fetch content{% endtrans %}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload">
56 <i class="mdi-action-autorenew small"></i> 56 <i class="mdi-action-autorenew small"></i>
57 <span>{% trans %}Reload content{% endtrans %}</span> 57 <span>{% trans %}Re-fetch content{% endtrans %}</span>
58 </a> 58 </a>
59 <div class="collapsible-body"></div> 59 <div class="collapsible-body"></div>
60 </li> 60 </li>
@@ -97,11 +97,41 @@
97 </a> 97 </a>
98 <div class="collapsible-body"> 98 <div class="collapsible-body">
99 <ul> 99 <ul>
100 {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans %}twitter{% endtrans %}"><span>{% trans %}twitter{% endtrans %}</span></a></li>{% endif %} 100 {% if craue_setting('share_twitter') %}
101 {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans %}shaarli{% endtrans %}"><span>{% trans %}shaarli{% endtrans %}</span></a></li>{% endif %} 101 <li>
102 {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="{% trans %}diaspora*{% endtrans %}"><span>{% trans %}diaspora*{% endtrans %}</span></a></li>{% endif %} 102 <a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="twitter">
103 {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans %}carrot{% endtrans %}"><span>Carrot</span></a></li>{% endif %} 103 <span>twitter</span>
104 {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans %}Email{% endtrans %}"><span>{% trans %}Email{% endtrans %}</span></a></li>{% endif %} 104 </a>
105 </li>
106 {% endif %}
107 {% if craue_setting('share_shaarli') %}
108 <li>
109 <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli">
110 <span>shaarli</span>
111 </a>
112 </li>
113 {% endif %}
114 {% if craue_setting('share_diaspora') %}
115 <li>
116 <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora}">
117 <span>diaspora}</span>
118 </a>
119 </li>
120 {% endif %}
121 {% if craue_setting('carrot') %}
122 <li>
123 <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot">
124 <span>Carrot</span>
125 </a>
126 </li>
127 {% endif %}
128 {% if craue_setting('share_mail') %}
129 <li>
130 <a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans %}Email{% endtrans %}">
131 <span>{% trans %}Email{% endtrans %}</span>
132 </a>
133 </li>
134 {% endif %}
105 </ul> 135 </ul>
106 </div> 136 </div>
107 </li> 137 </li>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
index 2de53106..f1e56412 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
@@ -1,14 +1,13 @@
1<form name="entry" method="post" action="{{ path('new_entry')}}"> 1<form name="entry" method="post" action="{{ path('new_entry')}}">
2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %}
2 5
3 {% if form_errors(form) %} 6 {% if form_errors(form.url) %}
4 <span class="black-text">{{ form_errors(form) }}</span> 7 <span class="black-text">{{ form_errors(form.url) }}</span>
5 {% endif %} 8 {% endif %}
6 9
7 {% if form_errors(form.url) %} 10 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website'} }) }}
8 <span class="black-text">{{ form_errors(form.url) }}</span>
9 {% endif %}
10
11 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website' | trans} }) }}
12 11
13 <div class="hidden">{{ form_rest(form) }}</div> 12 <div class="hidden">{{ form_rest(form) }}</div>
14</form> 13</form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
index 63b51aaa..e2795409 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
@@ -18,12 +18,10 @@
18 </ul> 18 </ul>
19 </div> 19 </div>
20 20
21
22 <div id="set1" class="col s12"> 21 <div id="set1" class="col s12">
23 <a href="{{ path('new') }}">{% trans %}Thanks to this form{% endtrans %}</a> 22 <a href="{{ path('new') }}">{% trans %}Thanks to this form{% endtrans %}</a>
24 </div> 23 </div>
25 24
26
27 <div id="set2" class="col s12"> 25 <div id="set2" class="col s12">
28 <ul> 26 <ul>
29 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans %}Standard Firefox Add-On{% endtrans %}</a></li> 27 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans %}Standard Firefox Add-On{% endtrans %}</a></li>
@@ -31,16 +29,14 @@
31 </ul> 29 </ul>
32 </div> 30 </div>
33 31
34
35 <div id="set3" class="col s12"> 32 <div id="set3" class="col s12">
36 <ul> 33 <ul>
37 <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans %}via F-Droid{% endtrans %}</a> {% trans %} or {% endtrans %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans %}via Google Play{% endtrans %}</a></li> 34 <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">via F-Droid</a> {% trans %} or {% endtrans %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">via Google Play</a></li>
38 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li> 35 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
39 <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{% trans %}download the application{% endtrans %}</a></li> 36 <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
40 </ul> 37 </ul>
41 </div> 38 </div>
42 39
43
44 <div id="set4" class="col s12"> 40 <div id="set4" class="col s12">
45 {% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %} 41 {% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %}
46 {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} 42 {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
index 0534a4cc..79310307 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
@@ -1,14 +1,13 @@
1<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}"> 1<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}">
2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %}
2 5
3 {% if form_errors(form) %} 6 {% if form_errors(form.label) %}
4 <span class="black-text">{{ form_errors(form) }}</span> 7 <span class="black-text">{{ form_errors(form.label) }}</span>
5 {% endif %} 8 {% endif %}
6 9
7 {% if form_errors(form.label) %} 10 {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
8 <span class="black-text">{{ form_errors(form.label) }}</span>
9 {% endif %}
10
11 {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
12 11
13 <div class="hidden">{{ form_rest(form) }}</div> 12 <div class="hidden">{{ form_rest(form) }}</div>
14</form> 13</form>