diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-10-02 11:06:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-02 11:06:03 +0200 |
commit | 52c1fc7449554c942c945e6c740e0e11d2f60a0d (patch) | |
tree | 46603da9fee8a8bc8109899749548efa821048c3 | |
parent | 6e5e27ab078527cb68c2e7a37512d050fd330258 (diff) | |
parent | 24ad330be6be01af05091fe044183e95b4a0ebd8 (diff) | |
download | wallabag-52c1fc7449554c942c945e6c740e0e11d2f60a0d.tar.gz wallabag-52c1fc7449554c942c945e6c740e0e11d2f60a0d.tar.zst wallabag-52c1fc7449554c942c945e6c740e0e11d2f60a0d.zip |
Merge pull request #2326 from wallabag/update-quickstart
Changed quickstart layout
14 files changed, 171 insertions, 53 deletions
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 9ea59eb0..005cc302 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css | |||
@@ -411,12 +411,12 @@ main ul.row { | |||
411 | } | 411 | } |
412 | 412 | ||
413 | .card .card-action a { | 413 | .card .card-action a { |
414 | color: #fff; | 414 | color: #fff !important; |
415 | margin: 0; | 415 | margin: 0; |
416 | } | 416 | } |
417 | 417 | ||
418 | .card .card-action a:hover { | 418 | .card .card-action a:hover { |
419 | color: #fff; | 419 | color: #fff !important; |
420 | } | 420 | } |
421 | 421 | ||
422 | .settings .div_tabs { | 422 | .settings .div_tabs { |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 628cdbdb..da7e2652 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -268,12 +268,14 @@ howto: | |||
268 | 268 | ||
269 | quickstart: | 269 | quickstart: |
270 | # page_title: 'Quickstart' | 270 | # page_title: 'Quickstart' |
271 | # more: 'More…' | ||
271 | # intro: | 272 | # intro: |
272 | # title: 'Welcome to wallabag!' | 273 | # title: 'Welcome to wallabag!' |
273 | # paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you." | 274 | # paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you." |
274 | # paragraph_2: 'Follow us!' | 275 | # paragraph_2: 'Follow us!' |
275 | # configure: | 276 | # configure: |
276 | # title: 'Configure the application' | 277 | # title: 'Configure the application' |
278 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | ||
277 | # language: 'Change language and design' | 279 | # language: 'Change language and design' |
278 | # rss: 'Enable RSS feeds' | 280 | # rss: 'Enable RSS feeds' |
279 | # tagging_rules: 'Write rules to automatically tag your articles' | 281 | # tagging_rules: 'Write rules to automatically tag your articles' |
@@ -287,6 +289,7 @@ quickstart: | |||
287 | # import: 'Configure import' | 289 | # import: 'Configure import' |
288 | # first_steps: | 290 | # first_steps: |
289 | # title: 'First steps' | 291 | # title: 'First steps' |
292 | # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link." | ||
290 | # new_article: 'Save your first article' | 293 | # new_article: 'Save your first article' |
291 | # unread_articles: 'And classify it!' | 294 | # unread_articles: 'And classify it!' |
292 | # migrate: | 295 | # migrate: |
@@ -296,11 +299,15 @@ quickstart: | |||
296 | # wallabag_v1: 'Migrate from wallabag v1' | 299 | # wallabag_v1: 'Migrate from wallabag v1' |
297 | # wallabag_v2: 'Migrate from wallabag v2' | 300 | # wallabag_v2: 'Migrate from wallabag v2' |
298 | # readability: 'Migrate from Readability' | 301 | # readability: 'Migrate from Readability' |
302 | # instapaper: 'Migrate from Instapaper' | ||
299 | # developer: | 303 | # developer: |
300 | # title: 'Developers' | 304 | # title: 'Developers' |
305 | # description: 'We also thought to the developers: Docker, API, translations, etc.' | ||
301 | # create_application: 'Create your third application' | 306 | # create_application: 'Create your third application' |
307 | # use_docker: 'Use Docker to install wallabag' | ||
302 | # docs: | 308 | # docs: |
303 | # title: 'Full documentation' | 309 | # title: 'Full documentation' |
310 | # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them." | ||
304 | # annotate: 'Annotate your article' | 311 | # annotate: 'Annotate your article' |
305 | # export: 'Convert your articles into ePUB or PDF' | 312 | # export: 'Convert your articles into ePUB or PDF' |
306 | # search_filters: 'See how you can look for an article by using search engine and filters' | 313 | # search_filters: 'See how you can look for an article by using search engine and filters' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 2e683b8c..eb82f13f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -268,12 +268,14 @@ howto: | |||
268 | 268 | ||
269 | quickstart: | 269 | quickstart: |
270 | page_title: 'Schnelleinstieg' | 270 | page_title: 'Schnelleinstieg' |
271 | # more: 'More…' | ||
271 | intro: | 272 | intro: |
272 | title: 'Willkommen zu wallabag!' | 273 | title: 'Willkommen zu wallabag!' |
273 | paragraph_1: "Wir werden dich bei der Benutzung von wallabag begleiten und dir einige Funktionen zeigen, die dich interessieren könnten." | 274 | paragraph_1: "Wir werden dich bei der Benutzung von wallabag begleiten und dir einige Funktionen zeigen, die dich interessieren könnten." |
274 | paragraph_2: 'Folge uns!' | 275 | paragraph_2: 'Folge uns!' |
275 | configure: | 276 | configure: |
276 | title: 'Anwendung konfigurieren' | 277 | title: 'Anwendung konfigurieren' |
278 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | ||
277 | language: 'Sprache und Design ändern' | 279 | language: 'Sprache und Design ändern' |
278 | rss: 'RSS-Feeds aktivieren' | 280 | rss: 'RSS-Feeds aktivieren' |
279 | tagging_rules: 'Schreibe Regeln, um deine Beiträge automatisch zu taggen (verschlagworten)' | 281 | tagging_rules: 'Schreibe Regeln, um deine Beiträge automatisch zu taggen (verschlagworten)' |
@@ -287,6 +289,7 @@ quickstart: | |||
287 | import: 'Import-Einstellungen ändern' | 289 | import: 'Import-Einstellungen ändern' |
288 | first_steps: | 290 | first_steps: |
289 | title: 'Erste Schritte' | 291 | title: 'Erste Schritte' |
292 | # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link" | ||
290 | new_article: 'Speichere deinen ersten Artikel' | 293 | new_article: 'Speichere deinen ersten Artikel' |
291 | unread_articles: 'Und klassifiziere ihn!' | 294 | unread_articles: 'Und klassifiziere ihn!' |
292 | migrate: | 295 | migrate: |
@@ -296,11 +299,15 @@ quickstart: | |||
296 | wallabag_v1: 'von wallabag v1 migrieren' | 299 | wallabag_v1: 'von wallabag v1 migrieren' |
297 | wallabag_v2: 'von wallabag v2 migrieren' | 300 | wallabag_v2: 'von wallabag v2 migrieren' |
298 | readability: 'von Readability migrieren' | 301 | readability: 'von Readability migrieren' |
302 | instapaper: 'von Instapaper migrieren' | ||
299 | developer: | 303 | developer: |
300 | title: 'Entwickler' | 304 | title: 'Entwickler' |
305 | # description: 'We also thought to the developers: Docker, API, translations, etc.' | ||
301 | create_application: 'Erstelle eine Anwendung und nutze die wallabag API' | 306 | create_application: 'Erstelle eine Anwendung und nutze die wallabag API' |
307 | # use_docker: 'Use Docker to install wallabag' | ||
302 | docs: | 308 | docs: |
303 | title: 'Komplette Dokumentation' | 309 | title: 'Komplette Dokumentation' |
310 | # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them." | ||
304 | annotate: 'Anmerkungen zu Artikeln hinzufügen' | 311 | annotate: 'Anmerkungen zu Artikeln hinzufügen' |
305 | export: 'Artikel nach ePUB oder PDF konvertieren' | 312 | export: 'Artikel nach ePUB oder PDF konvertieren' |
306 | search_filters: 'Schau nach, wie du nach einem Artikel über die Such- und Filterfunktion suchen kannst' | 313 | search_filters: 'Schau nach, wie du nach einem Artikel über die Such- und Filterfunktion suchen kannst' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index d629312c..01d8053b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -268,12 +268,14 @@ howto: | |||
268 | 268 | ||
269 | quickstart: | 269 | quickstart: |
270 | page_title: 'Quickstart' | 270 | page_title: 'Quickstart' |
271 | more: 'More…' | ||
271 | intro: | 272 | intro: |
272 | title: 'Welcome to wallabag!' | 273 | title: 'Welcome to wallabag!' |
273 | paragraph_1: "We'll accompany you on your visit to wallabag and show you some features that might interest you." | 274 | paragraph_1: "We'll accompany you on your visit to wallabag and show you some features that might interest you." |
274 | paragraph_2: 'Follow us!' | 275 | paragraph_2: 'Follow us!' |
275 | configure: | 276 | configure: |
276 | title: 'Configure the application' | 277 | title: 'Configure the application' |
278 | description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | ||
277 | language: 'Change language and design' | 279 | language: 'Change language and design' |
278 | rss: 'Enable RSS feeds' | 280 | rss: 'Enable RSS feeds' |
279 | tagging_rules: 'Write rules to automatically tag your articles' | 281 | tagging_rules: 'Write rules to automatically tag your articles' |
@@ -287,6 +289,7 @@ quickstart: | |||
287 | import: 'Configure import' | 289 | import: 'Configure import' |
288 | first_steps: | 290 | first_steps: |
289 | title: 'First steps' | 291 | title: 'First steps' |
292 | description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link." | ||
290 | new_article: 'Save your first article' | 293 | new_article: 'Save your first article' |
291 | unread_articles: 'And classify it!' | 294 | unread_articles: 'And classify it!' |
292 | migrate: | 295 | migrate: |
@@ -296,11 +299,15 @@ quickstart: | |||
296 | wallabag_v1: 'Migrate from wallabag v1' | 299 | wallabag_v1: 'Migrate from wallabag v1' |
297 | wallabag_v2: 'Migrate from wallabag v2' | 300 | wallabag_v2: 'Migrate from wallabag v2' |
298 | readability: 'Migrate from Readability' | 301 | readability: 'Migrate from Readability' |
302 | instapaper: 'Migrate from Instapaper' | ||
299 | developer: | 303 | developer: |
300 | title: 'Developers' | 304 | title: 'Developers' |
305 | description: 'We also thought to the developers: Docker, API, translations, etc.' | ||
301 | create_application: 'Create your third application' | 306 | create_application: 'Create your third application' |
307 | use_docker: 'Use Docker to install wallabag' | ||
302 | docs: | 308 | docs: |
303 | title: 'Full documentation' | 309 | title: 'Full documentation' |
310 | description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them." | ||
304 | annotate: 'Annotate your article' | 311 | annotate: 'Annotate your article' |
305 | export: 'Convert your articles into ePUB or PDF' | 312 | export: 'Convert your articles into ePUB or PDF' |
306 | search_filters: 'See how you can look for an article by using the search engine and filters' | 313 | search_filters: 'See how you can look for an article by using the search engine and filters' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 860c466f..5364e99a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -268,12 +268,14 @@ howto: | |||
268 | 268 | ||
269 | quickstart: | 269 | quickstart: |
270 | page_title: 'Comienzo rápido' | 270 | page_title: 'Comienzo rápido' |
271 | # more: 'More…' | ||
271 | intro: | 272 | intro: |
272 | title: 'Bienvenido a wallabag !' | 273 | title: 'Bienvenido a wallabag !' |
273 | paragraph_1: "Le acompañaremos a su visita de wallabag y le mostraremos algunas características que le pueden interesar." | 274 | paragraph_1: "Le acompañaremos a su visita de wallabag y le mostraremos algunas características que le pueden interesar." |
274 | paragraph_2: '¡Síganos!' | 275 | paragraph_2: '¡Síganos!' |
275 | configure: | 276 | configure: |
276 | title: 'Configure la aplicación' | 277 | title: 'Configure la aplicación' |
278 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | ||
277 | language: 'Cambie el idioma y el diseño de la aplicación' | 279 | language: 'Cambie el idioma y el diseño de la aplicación' |
278 | rss: 'Activar los feeds RSS' | 280 | rss: 'Activar los feeds RSS' |
279 | tagging_rules: 'Escribir reglas para etiquetear automaticamente sus artículos' | 281 | tagging_rules: 'Escribir reglas para etiquetear automaticamente sus artículos' |
@@ -287,6 +289,7 @@ quickstart: | |||
287 | import: 'Configure importación' | 289 | import: 'Configure importación' |
288 | first_steps: | 290 | first_steps: |
289 | title: 'Primeros pasos' | 291 | title: 'Primeros pasos' |
292 | # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link." | ||
290 | new_article: 'Guarde su primer artículo' | 293 | new_article: 'Guarde su primer artículo' |
291 | unread_articles: '¡Y clasifíquelo!' | 294 | unread_articles: '¡Y clasifíquelo!' |
292 | migrate: | 295 | migrate: |
@@ -296,11 +299,15 @@ quickstart: | |||
296 | wallabag_v1: 'Migrar desde wallabag v1' | 299 | wallabag_v1: 'Migrar desde wallabag v1' |
297 | wallabag_v2: 'Migrar desde wallabag v2' | 300 | wallabag_v2: 'Migrar desde wallabag v2' |
298 | readability: 'Migrar desde Readability' | 301 | readability: 'Migrar desde Readability' |
302 | instapaper: 'Migrar desde Instapaper' | ||
299 | developer: | 303 | developer: |
300 | title: 'Promotores' | 304 | title: 'Promotores' |
305 | # description: 'We also thought to the developers: Docker, API, translations, etc.' | ||
301 | create_application: 'Cree su tercera aplicación' | 306 | create_application: 'Cree su tercera aplicación' |
307 | # use_docker: 'Use Docker to install wallabag' | ||
302 | docs: | 308 | docs: |
303 | title: 'Documentación completa' | 309 | title: 'Documentación completa' |
310 | # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them." | ||
304 | annotate: 'Anote su artículo' | 311 | annotate: 'Anote su artículo' |
305 | export: 'Convierta sus artículos a ePub o a PDF' | 312 | export: 'Convierta sus artículos a ePub o a PDF' |
306 | search_filters: 'Aprenda a utilizar el buscador y los filtros para encontrar el artículo que le interese' | 313 | search_filters: 'Aprenda a utilizar el buscador y los filtros para encontrar el artículo que le interese' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 6e02010c..6f42b173 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -268,6 +268,7 @@ howto: | |||
268 | 268 | ||
269 | quickstart: | 269 | quickstart: |
270 | page_title: 'Quickstart' | 270 | page_title: 'Quickstart' |
271 | # more: 'More…' | ||
271 | intro: | 272 | intro: |
272 | title: 'به wallabag خوش آمدید!!' | 273 | title: 'به wallabag خوش آمدید!!' |
273 | paragraph_1: "به شما کمک خواهیم کرد تا wallabag را بشناسید و با برخی از ویژگیهای جالبش آشنا شوید" | 274 | paragraph_1: "به شما کمک خواهیم کرد تا wallabag را بشناسید و با برخی از ویژگیهای جالبش آشنا شوید" |
@@ -287,6 +288,7 @@ quickstart: | |||
287 | import: 'درونریزی را تنظیم کنید' | 288 | import: 'درونریزی را تنظیم کنید' |
288 | first_steps: | 289 | first_steps: |
289 | title: 'گام نخست' | 290 | title: 'گام نخست' |
291 | # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link." | ||
290 | new_article: 'نخستین مقالهٔ خود را ذخیره کنید' | 292 | new_article: 'نخستین مقالهٔ خود را ذخیره کنید' |
291 | unread_articles: 'و آن را طبقهبندی کنید!' | 293 | unread_articles: 'و آن را طبقهبندی کنید!' |
292 | migrate: | 294 | migrate: |
@@ -296,11 +298,15 @@ quickstart: | |||
296 | wallabag_v1: 'مهاجرت از نسخهٔ یکم wallabag' | 298 | wallabag_v1: 'مهاجرت از نسخهٔ یکم wallabag' |
297 | wallabag_v2: 'مهاجرت از نسخهٔ دوم wallabag' | 299 | wallabag_v2: 'مهاجرت از نسخهٔ دوم wallabag' |
298 | readability: 'مهاجرت از نسخهٔ دوم Readability' | 300 | readability: 'مهاجرت از نسخهٔ دوم Readability' |
301 | instapaper: 'مهاجرت از نسخهٔ دوم Instapaper' | ||
299 | developer: | 302 | developer: |
300 | title: 'برنامهنویسان' | 303 | title: 'برنامهنویسان' |
304 | # description: 'We also thought to the developers: Docker, API, translations, etc.' | ||
301 | create_application: 'برنامهٔ wallabag خود را بسازید' | 305 | create_application: 'برنامهٔ wallabag خود را بسازید' |
306 | # use_docker: 'Use Docker to install wallabag' | ||
302 | docs: | 307 | docs: |
303 | title: 'راهنمای کامل' | 308 | title: 'راهنمای کامل' |
309 | # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them." | ||
304 | annotate: 'روی مقالههایتان یادداشت بگذارید' | 310 | annotate: 'روی مقالههایتان یادداشت بگذارید' |
305 | export: 'مقالههایتان را به قالب ePUB یا PDF دربیاورید' | 311 | export: 'مقالههایتان را به قالب ePUB یا PDF دربیاورید' |
306 | search_filters: 'به کمک موتور جستجو و فیلترها به دنبال مقالههایتان بگردید' | 312 | search_filters: 'به کمک موتور جستجو و فیلترها به دنبال مقالههایتان بگردید' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 0eeda011..6984be83 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -268,12 +268,14 @@ howto: | |||
268 | 268 | ||
269 | quickstart: | 269 | quickstart: |
270 | page_title: 'Pour bien débuter' | 270 | page_title: 'Pour bien débuter' |
271 | more: 'Et plus encore…' | ||
271 | intro: | 272 | intro: |
272 | title: 'Bienvenue sur wallabag !' | 273 | title: 'Bienvenue sur wallabag !' |
273 | paragraph_1: "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." | 274 | paragraph_1: "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." |
274 | paragraph_2: 'Suivez-nous !' | 275 | paragraph_2: 'Suivez-nous !' |
275 | configure: | 276 | configure: |
276 | title: "Configurez l'application" | 277 | title: "Configurez l'application" |
278 | description: 'Pour voir une application qui vous correspond, allez voir du côté de la configuration de wallabag.' | ||
277 | language: "Changez la langue et le design de l'application" | 279 | language: "Changez la langue et le design de l'application" |
278 | rss: 'Activez les flux RSS' | 280 | rss: 'Activez les flux RSS' |
279 | tagging_rules: 'Écrivez des règles pour classer automatiquement vos articles' | 281 | tagging_rules: 'Écrivez des règles pour classer automatiquement vos articles' |
@@ -287,6 +289,7 @@ quickstart: | |||
287 | import: "Configurer l'import" | 289 | import: "Configurer l'import" |
288 | first_steps: | 290 | first_steps: |
289 | title: 'Premiers pas' | 291 | title: 'Premiers pas' |
292 | description: "Maintenant que wallabag est bien configuré, il est temps d'archiver le web. Vous pouvez cliquer sur le signe + dans le coin en haut à droite." | ||
290 | new_article: 'Ajoutez votre premier article' | 293 | new_article: 'Ajoutez votre premier article' |
291 | unread_articles: 'Et rangez-le !' | 294 | unread_articles: 'Et rangez-le !' |
292 | migrate: | 295 | migrate: |
@@ -296,11 +299,15 @@ quickstart: | |||
296 | wallabag_v1: 'Migrer depuis wallabag v1' | 299 | wallabag_v1: 'Migrer depuis wallabag v1' |
297 | wallabag_v2: 'Migrer depuis wallabag v2' | 300 | wallabag_v2: 'Migrer depuis wallabag v2' |
298 | readability: 'Migrer depuis Readability' | 301 | readability: 'Migrer depuis Readability' |
302 | instapaper: 'Migrer depuis Instapaper' | ||
299 | developer: | 303 | developer: |
300 | title: 'Pour les développeurs' | 304 | title: 'Pour les développeurs' |
305 | description: 'Nous avons aussi pensé aux développeurs : Docker, API, traductions, etc.' | ||
301 | create_application: 'Créer votre application tierce' | 306 | create_application: 'Créer votre application tierce' |
307 | use_docker: 'Utiliser Docker pour installer wallabag' | ||
302 | docs: | 308 | docs: |
303 | title: 'Documentation complète' | 309 | title: 'Documentation complète' |
310 | description: "Il y a tellement de fonctionnalités dans wallabag. N'hésitez pas à lire le manuel pour les connaitre et apprendre comment les utiliser." | ||
304 | annotate: 'Annoter votre article' | 311 | annotate: 'Annoter votre article' |
305 | export: 'Convertissez vos articles en ePub ou en PDF' | 312 | export: 'Convertissez vos articles en ePub ou en PDF' |
306 | search_filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l'article qui vous intéresse" | 313 | search_filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l'article qui vous intéresse" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 34f660f7..30b3287e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -267,12 +267,14 @@ howto: | |||
267 | 267 | ||
268 | quickstart: | 268 | quickstart: |
269 | page_title: 'Introduzione' | 269 | page_title: 'Introduzione' |
270 | # more: 'More…' | ||
270 | intro: | 271 | intro: |
271 | title: 'Benvenuto su wallabag!' | 272 | title: 'Benvenuto su wallabag!' |
272 | paragraph_1: "Un tour in cui ti guideremo per scoprire e che ti mostrerà delle funzionalità che potrebbero interessarti." | 273 | paragraph_1: "Un tour in cui ti guideremo per scoprire e che ti mostrerà delle funzionalità che potrebbero interessarti." |
273 | paragraph_2: 'Seguici!' | 274 | paragraph_2: 'Seguici!' |
274 | configure: | 275 | configure: |
275 | title: "Configura l'applicazione" | 276 | title: "Configura l'applicazione" |
277 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | ||
276 | language: 'Cambia lingua e design' | 278 | language: 'Cambia lingua e design' |
277 | rss: 'Abilita i feed RSS' | 279 | rss: 'Abilita i feed RSS' |
278 | tagging_rules: 'Scrivi delle regole per taggare automaticamente i contenuti' | 280 | tagging_rules: 'Scrivi delle regole per taggare automaticamente i contenuti' |
@@ -286,6 +288,7 @@ quickstart: | |||
286 | import: "Configura l'importazione" | 288 | import: "Configura l'importazione" |
287 | first_steps: | 289 | first_steps: |
288 | title: 'Pimi passi' | 290 | title: 'Pimi passi' |
291 | # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link." | ||
289 | new_article: 'Salva il tuo primo contenuto' | 292 | new_article: 'Salva il tuo primo contenuto' |
290 | unread_articles: 'E classificalo!' | 293 | unread_articles: 'E classificalo!' |
291 | migrate: | 294 | migrate: |
@@ -295,11 +298,15 @@ quickstart: | |||
295 | wallabag_v1: 'Trasferisci da wallabag v1' | 298 | wallabag_v1: 'Trasferisci da wallabag v1' |
296 | wallabag_v2: 'Trasferisci da wallabag v2' | 299 | wallabag_v2: 'Trasferisci da wallabag v2' |
297 | readability: 'Trasferisci da Readability' | 300 | readability: 'Trasferisci da Readability' |
301 | instapaper: 'Trasferisci da Instapaper' | ||
298 | developer: | 302 | developer: |
299 | title: 'Sviluppatori' | 303 | title: 'Sviluppatori' |
304 | # description: 'We also thought to the developers: Docker, API, translations, etc.' | ||
300 | create_application: 'Crea la tua applicazione' | 305 | create_application: 'Crea la tua applicazione' |
306 | # use_docker: 'Use Docker to install wallabag' | ||
301 | docs: | 307 | docs: |
302 | title: 'Documentazione completa' | 308 | title: 'Documentazione completa' |
309 | # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them." | ||
303 | annotate: 'Annota il tuo contenuto' | 310 | annotate: 'Annota il tuo contenuto' |
304 | export: 'Converti i tuoi contenuti in EPUB o PDF' | 311 | export: 'Converti i tuoi contenuti in EPUB o PDF' |
305 | search_filters: 'Impara come puoi recuperare un contenuto tramite la ricerca e i filtri' | 312 | search_filters: 'Impara come puoi recuperare un contenuto tramite la ricerca e i filtri' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index bcc59b29..a077f1bf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -268,12 +268,14 @@ howto: | |||
268 | 268 | ||
269 | quickstart: | 269 | quickstart: |
270 | page_title: 'Per ben començar' | 270 | page_title: 'Per ben començar' |
271 | # more: 'More…' | ||
271 | intro: | 272 | intro: |
272 | title: 'Benvenguda sus wallabag !' | 273 | title: 'Benvenguda sus wallabag !' |
273 | paragraph_1: "Anem vos guidar per far lo torn de la proprietat e vos presentar unas fonccionalitats que vos poirián interessar per vos apropriar aquesta aisina." | 274 | paragraph_1: "Anem vos guidar per far lo torn de la proprietat e vos presentar unas fonccionalitats que vos poirián interessar per vos apropriar aquesta aisina." |
274 | paragraph_2: 'Seguètz-nos ' | 275 | paragraph_2: 'Seguètz-nos ' |
275 | configure: | 276 | configure: |
276 | title: "Configuratz l'aplicacio" | 277 | title: "Configuratz l'aplicacio" |
278 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | ||
277 | language: "Cambiatz la lenga e l'estil de l'aplicacion" | 279 | language: "Cambiatz la lenga e l'estil de l'aplicacion" |
278 | rss: 'Activatz los fluxes RSS' | 280 | rss: 'Activatz los fluxes RSS' |
279 | tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles' | 281 | tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles' |
@@ -287,6 +289,7 @@ quickstart: | |||
287 | import: 'Configurar los impòrt' | 289 | import: 'Configurar los impòrt' |
288 | first_steps: | 290 | first_steps: |
289 | title: 'Primièrs passes' | 291 | title: 'Primièrs passes' |
292 | # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link." | ||
290 | new_article: 'Ajustatz vòstre primièr article' | 293 | new_article: 'Ajustatz vòstre primièr article' |
291 | unread_articles: 'E racaptatz-lo !' | 294 | unread_articles: 'E racaptatz-lo !' |
292 | migrate: | 295 | migrate: |
@@ -296,11 +299,15 @@ quickstart: | |||
296 | wallabag_v1: 'Migrar dempuèi wallabag v1' | 299 | wallabag_v1: 'Migrar dempuèi wallabag v1' |
297 | wallabag_v2: 'Migrar dempuèi wallabag v2' | 300 | wallabag_v2: 'Migrar dempuèi wallabag v2' |
298 | readability: 'Migrar dempuèi Readability' | 301 | readability: 'Migrar dempuèi Readability' |
302 | instapaper: 'Migrar dempuèi Instapaper' | ||
299 | developer: | 303 | developer: |
300 | title: 'Pels desvolopadors' | 304 | title: 'Pels desvolopadors' |
305 | # description: 'We also thought to the developers: Docker, API, translations, etc.' | ||
301 | create_application: 'Crear vòstra aplicacion tèrça' | 306 | create_application: 'Crear vòstra aplicacion tèrça' |
307 | # use_docker: 'Use Docker to install wallabag' | ||
302 | docs: | 308 | docs: |
303 | title: 'Documentacion complèta' | 309 | title: 'Documentacion complèta' |
310 | # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them." | ||
304 | annotate: 'Anotatar vòstre article' | 311 | annotate: 'Anotatar vòstre article' |
305 | export: 'Convertissètz vòstres articles en ePub o en PDF' | 312 | export: 'Convertissètz vòstres articles en ePub o en PDF' |
306 | search_filters: "Aprenètz a utilizar lo motor de recèrca e los filtres per retrobar l'article que vos interèssa" | 313 | search_filters: "Aprenètz a utilizar lo motor de recèrca e los filtres per retrobar l'article que vos interèssa" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index ce5ebab9..cad94dd5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -268,12 +268,14 @@ howto: | |||
268 | 268 | ||
269 | quickstart: | 269 | quickstart: |
270 | page_title: 'Szybki start' | 270 | page_title: 'Szybki start' |
271 | # more: 'More…' | ||
271 | intro: | 272 | intro: |
272 | title: 'Witaj w wallabag!' | 273 | title: 'Witaj w wallabag!' |
273 | paragraph_1: "Będziemy ci towarzyszyli w Twojej poznaniu wallabag i pokażemy możliwości, które mogą cię zainteresować." | 274 | paragraph_1: "Będziemy ci towarzyszyli w Twojej poznaniu wallabag i pokażemy możliwości, które mogą cię zainteresować." |
274 | paragraph_2: 'Śledź nas!' | 275 | paragraph_2: 'Śledź nas!' |
275 | configure: | 276 | configure: |
276 | title: 'Konfiguruj aplikację' | 277 | title: 'Konfiguruj aplikację' |
278 | description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | ||
277 | language: 'Zmień język i wygląd' | 279 | language: 'Zmień język i wygląd' |
278 | rss: 'Włącz kanały RSS' | 280 | rss: 'Włącz kanały RSS' |
279 | tagging_rules: 'Napisz reguły pozwalające na automatyczne otagowanie twoich artykułów' | 281 | tagging_rules: 'Napisz reguły pozwalające na automatyczne otagowanie twoich artykułów' |
@@ -287,6 +289,7 @@ quickstart: | |||
287 | import: 'Skonfigurować import' | 289 | import: 'Skonfigurować import' |
288 | first_steps: | 290 | first_steps: |
289 | title: 'Pierwsze kroki' | 291 | title: 'Pierwsze kroki' |
292 | # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link" | ||
290 | new_article: 'Zapisz swój pierwszy artukuł' | 293 | new_article: 'Zapisz swój pierwszy artukuł' |
291 | unread_articles: 'I sklasyfikuj go!' | 294 | unread_articles: 'I sklasyfikuj go!' |
292 | migrate: | 295 | migrate: |
@@ -296,11 +299,15 @@ quickstart: | |||
296 | wallabag_v1: 'Migruj z wallabag v1' | 299 | wallabag_v1: 'Migruj z wallabag v1' |
297 | wallabag_v2: 'Migruj z wallabag v2' | 300 | wallabag_v2: 'Migruj z wallabag v2' |
298 | readability: 'Migruj z Readability' | 301 | readability: 'Migruj z Readability' |
302 | instapaper: 'Migruj z Instapaper' | ||
299 | developer: | 303 | developer: |
300 | title: 'Deweloperzy' | 304 | title: 'Deweloperzy' |
305 | # description: 'We also thought to the developers: Docker, API, translations, etc.' | ||
301 | create_application: 'Stwórz swoją aplikację' | 306 | create_application: 'Stwórz swoją aplikację' |
307 | # use_docker: 'Use Docker to install wallabag' | ||
302 | docs: | 308 | docs: |
303 | title: 'Pełna Dokumentacja' | 309 | title: 'Pełna Dokumentacja' |
310 | # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them." | ||
304 | annotate: 'Dadaj adnotację do swojego artykułu' | 311 | annotate: 'Dadaj adnotację do swojego artykułu' |
305 | export: 'Konwertuj swoje artykuły do ePUB lub PDF' | 312 | export: 'Konwertuj swoje artykuły do ePUB lub PDF' |
306 | search_filters: 'Zabacz jak możesz znaleźć artykuł dzięku użyciu silnika wyszukiwarki i filtrów' | 313 | search_filters: 'Zabacz jak możesz znaleźć artykuł dzięku użyciu silnika wyszukiwarki i filtrów' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index a54efb4c..a271d6f3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -268,12 +268,14 @@ howto: | |||
268 | 268 | ||
269 | quickstart: | 269 | quickstart: |
270 | # page_title: 'Quickstart' | 270 | # page_title: 'Quickstart' |
271 | # more: 'More…' | ||
271 | # intro: | 272 | # intro: |
272 | # title: 'Welcome to wallabag!' | 273 | # title: 'Welcome to wallabag!' |
273 | # paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you." | 274 | # paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you." |
274 | # paragraph_2: 'Follow us!' | 275 | # paragraph_2: 'Follow us!' |
275 | # configure: | 276 | # configure: |
276 | # title: 'Configure the application' | 277 | # title: 'Configure the application' |
278 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | ||
277 | # language: 'Change language and design' | 279 | # language: 'Change language and design' |
278 | # rss: 'Enable RSS feeds' | 280 | # rss: 'Enable RSS feeds' |
279 | # tagging_rules: 'Write rules to automatically tag your articles' | 281 | # tagging_rules: 'Write rules to automatically tag your articles' |
@@ -287,6 +289,7 @@ quickstart: | |||
287 | # import: 'Configure import' | 289 | # import: 'Configure import' |
288 | # first_steps: | 290 | # first_steps: |
289 | # title: 'First steps' | 291 | # title: 'First steps' |
292 | # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link." | ||
290 | # new_article: 'Save your first article' | 293 | # new_article: 'Save your first article' |
291 | # unread_articles: 'And classify it!' | 294 | # unread_articles: 'And classify it!' |
292 | # migrate: | 295 | # migrate: |
@@ -296,11 +299,15 @@ quickstart: | |||
296 | # wallabag_v1: 'Migrate from wallabag v1' | 299 | # wallabag_v1: 'Migrate from wallabag v1' |
297 | # wallabag_v2: 'Migrate from wallabag v2' | 300 | # wallabag_v2: 'Migrate from wallabag v2' |
298 | # readability: 'Migrate from Readability' | 301 | # readability: 'Migrate from Readability' |
302 | # instapaper: 'Migrate from Instapaper' | ||
299 | # developer: | 303 | # developer: |
300 | # title: 'Developers' | 304 | # title: 'Developers' |
305 | # description: 'We also thought to the developers: Docker, API, translations, etc.' | ||
301 | # create_application: 'Create your third application' | 306 | # create_application: 'Create your third application' |
307 | # use_docker: 'Use Docker to install wallabag' | ||
302 | # docs: | 308 | # docs: |
303 | # title: 'Full documentation' | 309 | # title: 'Full documentation' |
310 | # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them." | ||
304 | # annotate: 'Annotate your article' | 311 | # annotate: 'Annotate your article' |
305 | # export: 'Convert your articles into ePUB or PDF' | 312 | # export: 'Convert your articles into ePUB or PDF' |
306 | # search_filters: 'See how you can look for an article by using search engine and filters' | 313 | # search_filters: 'See how you can look for an article by using search engine and filters' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index e46c17c8..f2307e65 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -267,12 +267,14 @@ howto: | |||
267 | 267 | ||
268 | quickstart: | 268 | quickstart: |
269 | page_title: 'Hızlı başlangıç' | 269 | page_title: 'Hızlı başlangıç' |
270 | # more: 'More…' | ||
270 | intro: | 271 | intro: |
271 | title: 'wallabag' | 272 | title: 'wallabag' |
272 | paragraph_1: "wallabag kurduğunuz için teşekkür ederiz. Bu sayfada biz size eşlik edecek ve ilginizi çekecek birkaç özellik göstereceğim." | 273 | paragraph_1: "wallabag kurduğunuz için teşekkür ederiz. Bu sayfada biz size eşlik edecek ve ilginizi çekecek birkaç özellik göstereceğim." |
273 | paragraph_2: 'Bizi takip edin!' | 274 | paragraph_2: 'Bizi takip edin!' |
274 | configure: | 275 | configure: |
275 | title: 'Uygulamayı Yapılandırma' | 276 | title: 'Uygulamayı Yapılandırma' |
277 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | ||
276 | language: 'Dili ve tasarımı değiştirme' | 278 | language: 'Dili ve tasarımı değiştirme' |
277 | rss: 'RSS akışını aktifleştirme' | 279 | rss: 'RSS akışını aktifleştirme' |
278 | # tagging_rules: 'Write rules to automatically tag your articles' | 280 | # tagging_rules: 'Write rules to automatically tag your articles' |
@@ -286,6 +288,7 @@ quickstart: | |||
286 | # import: 'Configure import' | 288 | # import: 'Configure import' |
287 | first_steps: | 289 | first_steps: |
288 | title: 'İlk adım' | 290 | title: 'İlk adım' |
291 | # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link." | ||
289 | new_article: 'İlk makalenizi kaydedin' | 292 | new_article: 'İlk makalenizi kaydedin' |
290 | unread_articles: 'Ve bunu sınıflandırın!' | 293 | unread_articles: 'Ve bunu sınıflandırın!' |
291 | migrate: | 294 | migrate: |
@@ -295,11 +298,15 @@ quickstart: | |||
295 | wallabag_v1: "wallabag v1 üzerindeki verilerinizi wallabag'in yeni sürümüne aktarın" | 298 | wallabag_v1: "wallabag v1 üzerindeki verilerinizi wallabag'in yeni sürümüne aktarın" |
296 | wallabag_v2: "wallabag v2 üzerindeki verilerinizi wallabag'in yeni sürümüne aktarın" | 299 | wallabag_v2: "wallabag v2 üzerindeki verilerinizi wallabag'in yeni sürümüne aktarın" |
297 | readability: "Readability üzerindeki verilerinizi wallabag'e aktarın'" | 300 | readability: "Readability üzerindeki verilerinizi wallabag'e aktarın'" |
301 | instapaper: "Instapaper üzerindeki verilerinizi wallabag'e aktarın'" | ||
298 | developer: | 302 | developer: |
299 | # title: 'Developers' | 303 | # title: 'Developers' |
304 | # description: 'We also thought to the developers: Docker, API, translations, etc.' | ||
300 | # create_application: 'Create your third application' | 305 | # create_application: 'Create your third application' |
306 | # use_docker: 'Use Docker to install wallabag' | ||
301 | docs: | 307 | docs: |
302 | title: 'Dokümantasyon' | 308 | title: 'Dokümantasyon' |
309 | # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them." | ||
303 | # annotate: 'Annotate your article' | 310 | # annotate: 'Annotate your article' |
304 | export: 'Makalelerinizi ePUB ya da PDF formatına çevirme' | 311 | export: 'Makalelerinizi ePUB ya da PDF formatına çevirme' |
305 | search_filters: 'Makaleleri görüntülemek için arama motorlarını ve filteri kullanma' | 312 | search_filters: 'Makaleleri görüntülemek için arama motorlarını ve filteri kullanma' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig index 8cbf4ab4..226bafea 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig | |||
@@ -10,64 +10,106 @@ | |||
10 | 10 | ||
11 | <div class="row"> | 11 | <div class="row"> |
12 | <h3>{{ 'quickstart.intro.title'|trans }}</h3> | 12 | <h3>{{ 'quickstart.intro.title'|trans }}</h3> |
13 | <p>{{ 'quickstart.intro.paragraph_1'|trans }}</p> | ||
14 | <p>{{ 'quickstart.intro.paragraph_2'|trans }}</p> | ||
15 | 13 | ||
16 | <h4>{{ 'quickstart.configure.title'|trans }}</h4> | 14 | <ul class="row data"> |
17 | <ul> | 15 | <li class="col l4 m6 s12"> |
18 | <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li> | 16 | <div class="card teal darken-1"> |
19 | <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li> | 17 | <div class="card-content white-text"> |
20 | <li><a href="{{ path('config') }}#set5">{{ 'quickstart.configure.tagging_rules'|trans }}</a></li> | 18 | <span class="card-title">{{ 'quickstart.configure.title'|trans }}</span> |
21 | </ul> | 19 | <p>{{ 'quickstart.configure.description'|trans }}</p> |
20 | </div> | ||
21 | <div class="card-action"> | ||
22 | <ul> | ||
23 | <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li> | ||
24 | <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li> | ||
25 | <li><a href="{{ path('config') }}#set5">{{ 'quickstart.more'|trans }}</a></li> | ||
26 | </ul> | ||
27 | </div> | ||
28 | </div> | ||
29 | </li> | ||
22 | 30 | ||
23 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 31 | <li class="col l4 m6 s12"> |
24 | <h4>{{ 'quickstart.admin.title'|trans }}</h4> | 32 | <div class="card green darken-1"> |
25 | <p>{{ 'quickstart.admin.description'|trans }}</p> | 33 | <div class="card-content white-text"> |
26 | <ul> | 34 | <span class="card-title">{{ 'quickstart.first_steps.title'|trans }}</span> |
27 | <li><a href="{{ path('config') }}#set6">{{ 'quickstart.admin.new_user'|trans }}</a></li> | 35 | <p>{{ 'quickstart.first_steps.description'|trans }}</p> |
28 | <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{{ 'quickstart.admin.analytics'|trans }}</a></li> | 36 | </div> |
29 | <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{{ 'quickstart.admin.sharing'|trans }}</a></li> | 37 | <div class="card-action"> |
30 | <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{{ 'quickstart.admin.export'|trans }}</a></li> | 38 | <ul> |
31 | <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{{ 'quickstart.admin.import'|trans }}</a></li> | 39 | <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li> |
32 | </ul> | 40 | <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li> |
33 | {% endif %} | 41 | </ul> |
42 | </div> | ||
43 | </div> | ||
44 | </li> | ||
34 | 45 | ||
35 | <h4>{{ 'quickstart.first_steps.title'|trans }}</h4> | 46 | <li class="col l4 m6 s12"> |
36 | <ul> | 47 | <div class="card light-green darken-1"> |
37 | <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li> | 48 | <div class="card-content white-text"> |
38 | <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li> | 49 | <span class="card-title">{{ 'quickstart.migrate.title'|trans }}</span> |
39 | </ul> | 50 | <p>{{ 'quickstart.migrate.description'|trans }}</p> |
51 | </div> | ||
52 | <div class="card-action"> | ||
53 | <ul> | ||
54 | <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li> | ||
55 | <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li> | ||
56 | <li><a href="{{ path('import_instapaper') }}">{{ 'quickstart.migrate.instapaper'|trans }}</a></li> | ||
57 | <li><a href="{{ path('import') }}">{{ 'quickstart.more'|trans }}</a></li> | ||
58 | </ul> | ||
59 | </div> | ||
60 | </div> | ||
61 | </li> | ||
40 | 62 | ||
41 | <h4>{{ 'quickstart.migrate.title'|trans }}</h4> | 63 | <li class="col l4 m6 s12"> |
42 | <p>{{ 'quickstart.migrate.description'|trans }}</p> | 64 | <div class="card blue darken-1"> |
43 | <ul> | 65 | <div class="card-content white-text"> |
44 | <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li> | 66 | <span class="card-title">{{ 'quickstart.developer.title'|trans }}</span> |
45 | <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li> | 67 | <p>{{ 'quickstart.developer.description'|trans }}</p> |
46 | <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li> | 68 | </div> |
47 | <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li> | 69 | <div class="card-action"> |
48 | </ul> | 70 | <ul> |
71 | <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li> | ||
72 | <li><a href="http://doc.wallabag.org/en/master/developer/docker.html">{{ 'quickstart.developer.use_docker'|trans }}</a></li> | ||
73 | <li><a href="http://doc.wallabag.org/en/master/index.html#dev-docs">{{ 'quickstart.more'|trans }}</a></li> | ||
74 | </ul> | ||
75 | </div> | ||
76 | </div> | ||
77 | </li> | ||
49 | 78 | ||
50 | <h4>{{ 'quickstart.developer.title'|trans }}</h4> | 79 | <li class="col l4 m6 s12"> |
51 | <ul> | 80 | <div class="card light-blue darken-1"> |
52 | <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li> | 81 | <div class="card-content white-text"> |
53 | </ul> | 82 | <span class="card-title">{{ 'quickstart.docs.title'|trans }}</span> |
83 | <p>{{ 'quickstart.docs.description'|trans }}</p> | ||
84 | </div> | ||
85 | <div class="card-action"> | ||
86 | <ul> | ||
87 | <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li> | ||
88 | <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li> | ||
89 | <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li> | ||
90 | </ul> | ||
91 | </div> | ||
92 | </div> | ||
93 | </li> | ||
54 | 94 | ||
55 | <h4>{{ 'quickstart.docs.title'|trans }}</h4> | 95 | <li class="col l4 m6 s12"> |
56 | <ul> | 96 | <div class="card cyan darken-1"> |
57 | <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li> | 97 | <div class="card-content white-text"> |
58 | <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li> | 98 | <span class="card-title">{{ 'quickstart.support.title'|trans }}</span> |
59 | <li><a href="http://doc.wallabag.org/en/master/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li> | 99 | <p>{{ 'quickstart.support.description'|trans }}</p> |
60 | <li><a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li> | 100 | </div> |
61 | <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li> | 101 | <div class="card-action"> |
62 | </ul> | 102 | <ul> |
103 | <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li> | ||
104 | <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li> | ||
105 | <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li> | ||
106 | </ul> | ||
107 | </div> | ||
108 | </div> | ||
109 | </li> | ||
63 | 110 | ||
64 | <h4>{{ 'quickstart.support.title'|trans }}</h4> | ||
65 | <p>{{ 'quickstart.support.description'|trans }}</p> | ||
66 | <ul> | ||
67 | <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li> | ||
68 | <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li> | ||
69 | <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li> | ||
70 | </ul> | 111 | </ul> |
112 | |||
71 | </div> | 113 | </div> |
72 | 114 | ||
73 | </div> | 115 | </div> |
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index a74c17d9..053aa679 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | |||
@@ -29,7 +29,7 @@ class EntryControllerTest extends WallabagCoreTestCase | |||
29 | 29 | ||
30 | $this->assertEquals(200, $client->getResponse()->getStatusCode()); | 30 | $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
31 | $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text'])); | 31 | $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text'])); |
32 | $this->assertContains('quickstart.intro.paragraph_1', $body[0]); | 32 | $this->assertContains('quickstart.intro.title', $body[0]); |
33 | 33 | ||
34 | // Test if quickstart is disabled when user has 1 entry | 34 | // Test if quickstart is disabled when user has 1 entry |
35 | $crawler = $client->request('GET', '/new'); | 35 | $crawler = $client->request('GET', '/new'); |