From f92fcb53ca78cc8822962e676b0db117e1a08aa5 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 4 Dec 2016 13:51:58 +0100 Subject: Add CRUD for site credentials --- .../Resources/translations/messages.da.yml | 25 +++++++++ .../Resources/translations/messages.de.yml | 25 +++++++++ .../Resources/translations/messages.en.yml | 25 +++++++++ .../Resources/translations/messages.es.yml | 25 +++++++++ .../Resources/translations/messages.fa.yml | 25 +++++++++ .../Resources/translations/messages.fr.yml | 31 +++++++++-- .../Resources/translations/messages.it.yml | 25 +++++++++ .../Resources/translations/messages.oc.yml | 25 +++++++++ .../Resources/translations/messages.pl.yml | 25 +++++++++ .../Resources/translations/messages.pt.yml | 25 +++++++++ .../Resources/translations/messages.ro.yml | 25 +++++++++ .../Resources/translations/messages.tr.yml | 5 ++ .../themes/baggy/SiteCredential/edit.html.twig | 60 ++++++++++++++++++++++ .../themes/baggy/SiteCredential/index.html.twig | 44 ++++++++++++++++ .../themes/baggy/SiteCredential/new.html.twig | 53 +++++++++++++++++++ .../views/themes/material/Config/index.html.twig | 20 ++++---- .../themes/material/SiteCredential/edit.html.twig | 60 ++++++++++++++++++++++ .../themes/material/SiteCredential/index.html.twig | 44 ++++++++++++++++ .../themes/material/SiteCredential/new.html.twig | 53 +++++++++++++++++++ 19 files changed, 607 insertions(+), 13 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 5e7afe27..ef58a16b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -518,6 +518,26 @@ user: search: # placeholder: Filter by username or email +site_credential: + # page_title: Site credentials management + # new_site_credential: Create a credential + # edit_site_credential: Edit an existing credential + # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." + # list: + # actions: Actions + # edit_action: Edit + # yes: Yes + # no: No + # create_new_one: Create a new credential + # form: + # username_label: 'Username' + # host_label: 'Host' + # password_label: 'Password' + # save: Save + # delete: Delete + # delete_confirm: Are you sure? + # back_to_list: Back to list + error: # page_title: An error occurred @@ -570,3 +590,8 @@ flashes: # added: 'User "%username%" added' # updated: 'User "%username%" updated' # deleted: 'User "%username%" deleted' + site_credential: + notice: + # added: 'Site credential for "%host%" added' + # updated: 'Site credential for "%host%" updated' + # deleted: 'Site credential for "%host%" deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 00468575..d026a030 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -519,6 +519,26 @@ user: search: placeholder: Filtere nach Benutzer oder E-Mail-Adresse +site_credential: + # page_title: Site credentials management + # new_site_credential: Create a credential + # edit_site_credential: Edit an existing credential + # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." + list: + actions: Aktionen + edit_action: Bearbeiten + yes: Ja + no: Nein + # create_new_one: Create a new credential + form: + # username_label: 'Username' + # host_label: 'Host' + # password_label: 'Password' + save: Speichern + delete: Löschen + delete_confirm: Bist du sicher? + back_to_list: Zurück zur Liste + error: page_title: Ein Fehler ist aufgetreten @@ -571,3 +591,8 @@ flashes: added: 'Benutzer "%username%" hinzugefügt' updated: 'Benutzer "%username%" aktualisiert' deleted: 'Benutzer "%username%" gelöscht' + site_credential: + notice: + # added: 'Site credential for "%host%" added' + # updated: 'Site credential for "%host%" updated' + # deleted: 'Site credential for "%host%" deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 572084c1..12feb7dd 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -519,6 +519,26 @@ user: search: placeholder: Filter by username or email +site_credential: + page_title: Site credentials management + new_site_credential: Create a credential + edit_site_credential: Edit an existing credential + description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." + list: + actions: Actions + edit_action: Edit + yes: Yes + no: No + create_new_one: Create a new credential + form: + username_label: 'Username' + host_label: 'Host' + password_label: 'Password' + save: Save + delete: Delete + delete_confirm: Are you sure? + back_to_list: Back to list + error: page_title: An error occurred @@ -571,3 +591,8 @@ flashes: added: 'User "%username%" added' updated: 'User "%username%" updated' deleted: 'User "%username%" deleted' + site_credential: + notice: + added: 'Site credential for "%host%" added' + updated: 'Site credential for "%host%" updated' + deleted: 'Site credential for "%host%" deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 0f2a4a7b..2351d467 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -519,6 +519,26 @@ user: search: # placeholder: Filter by username or email +site_credential: + # page_title: Site credentials management + # new_site_credential: Create a credential + # edit_site_credential: Edit an existing credential + # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." + # list: + # actions: Actions + # edit_action: Edit + # yes: Yes + # no: No + # create_new_one: Create a new credential + # form: + # username_label: 'Username' + # host_label: 'Host' + # password_label: 'Password' + # save: Save + # delete: Delete + # delete_confirm: Are you sure? + # back_to_list: Back to list + error: page_title: Ha ocurrido un error @@ -571,3 +591,8 @@ flashes: added: 'Añadido el usuario "%username%"' updated: 'Actualizado el usuario "%username%"' deleted: 'Eliminado el usuario "%username%"' + site_credential: + notice: + # added: 'Site credential for "%host%" added' + # updated: 'Site credential for "%host%" updated' + # deleted: 'Site credential for "%host%" deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index a8900489..32e1ff42 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -519,6 +519,26 @@ user: search: # placeholder: Filter by username or email +site_credential: + # page_title: Site credentials management + # new_site_credential: Create a credential + # edit_site_credential: Edit an existing credential + # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." + # list: + # actions: Actions + # edit_action: Edit + # yes: Yes + # no: No + # create_new_one: Create a new credential + # form: + # username_label: 'Username' + # host_label: 'Host' + # password_label: 'Password' + # save: Save + # delete: Delete + # delete_confirm: Are you sure? + # back_to_list: Back to list + error: # page_title: An error occurred @@ -571,3 +591,8 @@ flashes: # added: 'User "%username%" added' # updated: 'User "%username%" updated' # deleted: 'User "%username%" deleted' + site_credential: + notice: + # added: 'Site credential for "%host%" added' + # updated: 'Site credential for "%host%" updated' + # deleted: 'Site credential for "%host%" deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 6969b67b..e37abfd3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -519,6 +519,26 @@ user: search: placeholder: "Filtrer par nom d’utilisateur ou email" +site_credential: + page_title: Gestion des accès aux sites + new_site_credential: Créer un accès à un site + edit_site_credential: Éditer l'accès d'un site + description: "Ici vous pouvez gérer les accès aux différents sites. Ces accès permettent de récupérer des contenus sur des sites qui requiert une authentification ou un paywall" + list: + actions: Actions + edit_action: Éditer + yes: Oui + no: Non + create_new_one: Créer un nouvel accès à un site + form: + username_label: 'Identifiant' + host_label: 'Domaine' + password_label: 'Mot de passe' + save: "Sauvegarder" + delete: "Supprimer" + delete_confirm: "Voulez-vous vraiment ?" + back_to_list: "Revenir à la liste" + error: page_title: "Une erreur est survenue" @@ -568,6 +588,11 @@ flashes: client_deleted: "Client %name% supprimé" user: notice: - added: "Utilisateur \"%username%\" ajouté" - updated: "Utilisateur \"%username%\" mis à jour" - deleted: "Utilisateur \"%username%\" supprimé" + added: 'Utilisateur "%username%" ajouté' + updated: 'Utilisateur "%username%" mis à jour' + deleted: 'Utilisateur "%username%" supprimé' + site_credential: + notice: + added: 'Accès au site "%host%" ajouté' + updated: 'Accès au site "%host%" mis à jour' + deleted: 'Accès au site "%host%" supprimé' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index c2007057..752085c8 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -519,6 +519,26 @@ user: search: # placeholder: Filter by username or email +site_credential: + # page_title: Site credentials management + # new_site_credential: Create a credential + # edit_site_credential: Edit an existing credential + # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." + # list: + # actions: Actions + # edit_action: Edit + # yes: Yes + # no: No + # create_new_one: Create a new credential + # form: + # username_label: 'Username' + # host_label: 'Host' + # password_label: 'Password' + # save: Save + # delete: Delete + # delete_confirm: Are you sure? + # back_to_list: Back to list + error: # page_title: An error occurred @@ -571,3 +591,8 @@ flashes: # added: 'User "%username%" added' # updated: 'User "%username%" updated' # deleted: 'User "%username%" deleted' + site_credential: + notice: + # added: 'Site credential for "%host%" added' + # updated: 'Site credential for "%host%" updated' + # deleted: 'Site credential for "%host%" deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 3ac472d0..9e941de0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -519,6 +519,26 @@ user: search: placeholder: "Filtrar per nom d'utilizaire o corrièl" +site_credential: + # page_title: Site credentials management + # new_site_credential: Create a credential + # edit_site_credential: Edit an existing credential + # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." + list: + actions: 'Accions' + edit_action: 'Modificar' + yes: 'Òc' + no: 'Non' + # create_new_one: Create a new credential + form: + # username_label: 'Username' + # host_label: 'Host' + # password_label: 'Password' + save: 'Enregistrar' + delete: 'Suprimir' + delete_confirm: 'Sètz segur ?' + back_to_list: 'Tornar a la lista' + error: page_title: Una error s'es produsida @@ -571,3 +591,8 @@ flashes: added: 'Utilizaire "%username%" ajustat' updated: 'Utilizaire "%username%" mes a jorn' deleted: 'Utilizaire "%username%" suprimit' + site_credential: + notice: + # added: 'Site credential for "%host%" added' + # updated: 'Site credential for "%host%" updated' + # deleted: 'Site credential for "%host%" deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index fa672387..38e051f5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -519,6 +519,26 @@ user: search: placeholder: Filtruj po nazwie użytkownika lub adresie e-mail +site_credential: + # page_title: Site credentials management + # new_site_credential: Create a credential + # edit_site_credential: Edit an existing credential + # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." + list: + actions: Akcje + edit_action: Edytuj + yes: Tak + no: Nie + # create_new_one: Create a new credential + form: + # username_label: 'Username' + # host_label: 'Host' + # password_label: 'Password' + save: Zapisz + delete: Usuń + delete_confirm: Jesteś pewien? + back_to_list: Powrót do listy + error: page_title: Wystąpił błąd @@ -571,3 +591,8 @@ flashes: added: 'Użytkownik "%username%" dodany' updated: 'Użytkownik "%username%" zaktualizowany' deleted: 'Użytkownik "%username%" usunięty' + site_credential: + notice: + # added: 'Site credential for "%host%" added' + # updated: 'Site credential for "%host%" updated' + # deleted: 'Site credential for "%host%" deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 896ccb04..d3b245b8 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml @@ -519,6 +519,26 @@ user: search: # placeholder: Filter by username or email +site_credential: + # page_title: Site credentials management + # new_site_credential: Create a credential + # edit_site_credential: Edit an existing credential + # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." + list: + actions: 'Ações' + edit_action: 'Editar' + yes: 'Sim' + no: 'Não' + # create_new_one: Create a new credential + form: + # username_label: 'Username' + # host_label: 'Host' + # password_label: 'Password' + save: 'Salvar' + delete: 'Apagar' + delete_confirm: 'Tem certeza?' + back_to_list: 'Voltar para a lista' + error: # page_title: An error occurred @@ -571,3 +591,8 @@ flashes: added: 'Usuário "%username%" adicionado' updated: 'Usuário "%username%" atualizado' deleted: 'Usuário "%username%" removido' + site_credential: + notice: + # added: 'Site credential for "%host%" added' + # updated: 'Site credential for "%host%" updated' + # deleted: 'Site credential for "%host%" deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index c447dc9b..66c72429 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -519,6 +519,26 @@ user: search: # placeholder: Filter by username or email +site_credential: + # page_title: Site credentials management + # new_site_credential: Create a credential + # edit_site_credential: Edit an existing credential + # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." + # list: + # actions: Actions + # edit_action: Edit + # yes: Yes + # no: No + # create_new_one: Create a new credential + # form: + # username_label: 'Username' + # host_label: 'Host' + # password_label: 'Password' + # save: Save + # delete: Delete + # delete_confirm: Are you sure? + # back_to_list: Back to list + error: # page_title: An error occurred @@ -571,3 +591,8 @@ flashes: # added: 'User "%username%" added' # updated: 'User "%username%" updated' # deleted: 'User "%username%" deleted' + site_credential: + notice: + # added: 'Site credential for "%host%" added' + # updated: 'Site credential for "%host%" updated' + # deleted: 'Site credential for "%host%" deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 61e1a1ea..34ae5b87 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -571,3 +571,8 @@ flashes: # added: 'User "%username%" added' # updated: 'User "%username%" updated' # deleted: 'User "%username%" deleted' + site_credential: + notice: + # added: 'Site credential for "%host%" added' + # updated: 'Site credential for "%host%" updated' + # deleted: 'Site credential for "%host%" deleted' diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig new file mode 100644 index 00000000..8448f17e --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig @@ -0,0 +1,60 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} + +{% block content %} + +
+
+
+
+
+

{{ 'site_credential.edit_site_credential'|trans }}

+ +
+ {{ form_start(edit_form) }} + {{ form_errors(edit_form) }} + +
+
+ {{ form_label(edit_form.host) }} + {{ form_errors(edit_form.host) }} + {{ form_widget(edit_form.host) }} +
+
+ +
+
+ {{ form_label(edit_form.username) }} + {{ form_errors(edit_form.username) }} + {{ form_widget(edit_form.username) }} +
+
+ +
+
+ {{ form_label(edit_form.password) }} + {{ form_errors(edit_form.password) }} + {{ form_widget(edit_form.password) }} +
+
+ +
+ + {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_widget(edit_form._token) }} + +

+ {{ form_start(delete_form) }} + + {{ form_end(delete_form) }} +

+

{{ 'site_credential.form.back_to_list'|trans }}

+
+
+
+
+
+
+ +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig new file mode 100644 index 00000000..fda60b31 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig @@ -0,0 +1,44 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} + +{% block content %} + +
+
+
+
+
+

{{ 'site_credential.description'|trans|raw }}

+ + + + + + + + + + + {% for credential in credentials %} + + + + + + {% endfor %} + +
{{ 'site_credential.form.host_label'|trans }}{{ 'site_credential.form.username_label'|trans }}{{ 'site_credential.list.actions'|trans }}
{{ credential.host }}{{ credential.username }} + {{ 'site_credential.list.edit_action'|trans }} +
+
+

+ {{ 'site_credential.list.create_new_one'|trans }} +

+
+
+
+
+
+ +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig new file mode 100644 index 00000000..bf713902 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig @@ -0,0 +1,53 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} + +{% block content %} + +
+
+
+
+
+

{{ 'site_credential.new_site_credential'|trans }}

+ +
+ {{ form_start(form) }} + {{ form_errors(form) }} + +
+
+ {{ form_label(form.host) }} + {{ form_errors(form.host) }} + {{ form_widget(form.host) }} +
+
+ +
+
+ {{ form_label(form.username) }} + {{ form_errors(form.username) }} + {{ form_widget(form.username) }} +
+
+ +
+
+ {{ form_label(form.password) }} + {{ form_errors(form.password) }} + {{ form_widget(form.password) }} +
+
+ + {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_rest(form) }} + +

{{ 'site_credential.form.back_to_list'|trans }}

+
+
+
+
+
+
+ +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 9b0816eb..1e10bf38 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -66,13 +66,13 @@ -
-
- {{ form_errors(form.config.action_mark_as_read) }} - {{ form_widget(form.config.action_mark_as_read) }} - {{ form_label(form.config.action_mark_as_read) }} +
+
+ {{ form_label(form.config.action_mark_as_read) }} + {{ form_errors(form.config.action_mark_as_read) }} + {{ form_widget(form.config.action_mark_as_read) }} +
-
@@ -254,11 +254,11 @@ {{ form_start(form.pwd) }} {{ form_errors(form.pwd) }} -
-
- {{ 'config.form_password.description'|trans }} +
+
+ {{ 'config.form_password.description'|trans }} +
-
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig new file mode 100644 index 00000000..8448f17e --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig @@ -0,0 +1,60 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} + +{% block content %} + +
+
+
+
+
+

{{ 'site_credential.edit_site_credential'|trans }}

+ +
+ {{ form_start(edit_form) }} + {{ form_errors(edit_form) }} + +
+
+ {{ form_label(edit_form.host) }} + {{ form_errors(edit_form.host) }} + {{ form_widget(edit_form.host) }} +
+
+ +
+
+ {{ form_label(edit_form.username) }} + {{ form_errors(edit_form.username) }} + {{ form_widget(edit_form.username) }} +
+
+ +
+
+ {{ form_label(edit_form.password) }} + {{ form_errors(edit_form.password) }} + {{ form_widget(edit_form.password) }} +
+
+ +
+ + {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_widget(edit_form._token) }} + +

+ {{ form_start(delete_form) }} + + {{ form_end(delete_form) }} +

+

{{ 'site_credential.form.back_to_list'|trans }}

+
+
+
+
+
+
+ +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig new file mode 100644 index 00000000..fda60b31 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig @@ -0,0 +1,44 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} + +{% block content %} + +
+
+
+
+
+

{{ 'site_credential.description'|trans|raw }}

+ + + + + + + + + + + {% for credential in credentials %} + + + + + + {% endfor %} + +
{{ 'site_credential.form.host_label'|trans }}{{ 'site_credential.form.username_label'|trans }}{{ 'site_credential.list.actions'|trans }}
{{ credential.host }}{{ credential.username }} + {{ 'site_credential.list.edit_action'|trans }} +
+
+

+ {{ 'site_credential.list.create_new_one'|trans }} +

+
+
+
+
+
+ +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig new file mode 100644 index 00000000..bf713902 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig @@ -0,0 +1,53 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} + +{% block content %} + +
+
+
+
+
+

{{ 'site_credential.new_site_credential'|trans }}

+ +
+ {{ form_start(form) }} + {{ form_errors(form) }} + +
+
+ {{ form_label(form.host) }} + {{ form_errors(form.host) }} + {{ form_widget(form.host) }} +
+
+ +
+
+ {{ form_label(form.username) }} + {{ form_errors(form.username) }} + {{ form_widget(form.username) }} +
+
+ +
+
+ {{ form_label(form.password) }} + {{ form_errors(form.password) }} + {{ form_widget(form.password) }} +
+
+ + {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_rest(form) }} + +

{{ 'site_credential.form.back_to_list'|trans }}

+
+
+
+
+
+
+ +{% endblock %} -- cgit v1.2.3 From fc6d92c63dc5629a9e005628e416e0ecf4daa6ed Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 9 Dec 2016 16:47:50 +0100 Subject: Update route & user verification --- src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | 6 +++--- .../Resources/views/themes/material/SiteCredential/edit.html.twig | 2 +- .../Resources/views/themes/material/SiteCredential/index.html.twig | 4 ++-- .../Resources/views/themes/material/SiteCredential/new.html.twig | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index e37abfd3..17eaf015 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -514,7 +514,7 @@ user: twofactor_label: "Double authentification" save: "Sauvegarder" delete: "Supprimer" - delete_confirm: "Voulez-vous vraiment ?" + delete_confirm: "Êtes-vous sur ?" back_to_list: "Revenir à la liste" search: placeholder: "Filtrer par nom d’utilisateur ou email" @@ -523,7 +523,7 @@ site_credential: page_title: Gestion des accès aux sites new_site_credential: Créer un accès à un site edit_site_credential: Éditer l'accès d'un site - description: "Ici vous pouvez gérer les accès aux différents sites. Ces accès permettent de récupérer des contenus sur des sites qui requiert une authentification ou un paywall" + description: "Ici vous pouvez gérer les accès aux différents sites. Ces accès permettent de récupérer des contenus sur des sites qui requièrent une authentification ou un paywall" list: actions: Actions edit_action: Éditer @@ -536,7 +536,7 @@ site_credential: password_label: 'Mot de passe' save: "Sauvegarder" delete: "Supprimer" - delete_confirm: "Voulez-vous vraiment ?" + delete_confirm: "Êtes-vous sur ?" back_to_list: "Revenir à la liste" error: diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig index 8448f17e..882be430 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig @@ -49,7 +49,7 @@ {{ form_end(delete_form) }}

-

{{ 'site_credential.form.back_to_list'|trans }}

+

{{ 'site_credential.form.back_to_list'|trans }}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig index fda60b31..c128bceb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig @@ -25,7 +25,7 @@ {{ credential.host }} {{ credential.username }} - {{ 'site_credential.list.edit_action'|trans }} + {{ 'site_credential.list.edit_action'|trans }} {% endfor %} @@ -33,7 +33,7 @@

- {{ 'site_credential.list.create_new_one'|trans }} + {{ 'site_credential.list.create_new_one'|trans }}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig index bf713902..3c008cde 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig @@ -42,7 +42,7 @@ {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} {{ form_rest(form) }} -

{{ 'site_credential.form.back_to_list'|trans }}

+

{{ 'site_credential.form.back_to_list'|trans }}

-- cgit v1.2.3 From 5a9bc00726ddaf7c8798d4932d0a8b7a38422670 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 1 May 2017 22:13:17 +0200 Subject: Retrieve username/password from database Inject the current user & the repo to retrieve username/password from the database --- src/Wallabag/CoreBundle/Resources/config/services.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 4be79547..a59152d3 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -63,7 +63,8 @@ services: class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder arguments: - "@wallabag_core.graby.config_builder" - - "%sites_credentials%" + - "@=service('security.token_storage').getToken().getUser()" + - "@wallabag_core.site_credential_repository" - '@logger' tags: - { name: monolog.logger, channel: graby } @@ -120,6 +121,12 @@ services: arguments: - WallabagCoreBundle:Tag + wallabag_core.site_credential_repository: + class: Wallabag\CoreBundle\Repository\SiteCredentialRepository + factory: [ "@doctrine.orm.default_entity_manager", getRepository ] + arguments: + - WallabagCoreBundle:SiteCredential + wallabag_core.helper.entries_export: class: Wallabag\CoreBundle\Helper\EntriesExport arguments: -- cgit v1.2.3 From b8427f22f06cab58383ec3080f09715c712c65ef Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 1 May 2017 22:13:35 +0200 Subject: Add menu access to site credentials CRUD --- src/Wallabag/CoreBundle/Resources/config/services.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | 1 + .../Resources/views/themes/baggy/SiteCredential/edit.html.twig | 2 +- .../Resources/views/themes/baggy/SiteCredential/index.html.twig | 4 ++-- .../Resources/views/themes/baggy/SiteCredential/new.html.twig | 2 +- .../CoreBundle/Resources/views/themes/baggy/layout.html.twig | 3 +++ .../CoreBundle/Resources/views/themes/material/layout.html.twig | 5 +++++ 18 files changed, 25 insertions(+), 5 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index a59152d3..09bc77fe 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -63,7 +63,7 @@ services: class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder arguments: - "@wallabag_core.graby.config_builder" - - "@=service('security.token_storage').getToken().getUser()" + - "@security.token_storage" - "@wallabag_core.site_credential_repository" - '@logger' tags: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index ef58a16b..3a3fb91d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -32,6 +32,7 @@ menu: # save_link: 'Save a link' back_to_unread: 'Tilbage til de ulæste artikler' # users_management: 'Users management' + # site_credentials: 'Site credentials' top: add_new_entry: 'Tilføj ny artikel' search: 'Søg' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index d026a030..85f0e1a3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -32,6 +32,7 @@ menu: save_link: 'Link speichern' back_to_unread: 'Zurück zu ungelesenen Artikeln' users_management: 'Benutzerverwaltung' + # site_credentials: 'Site credentials' top: add_new_entry: 'Neuen Artikel hinzufügen' search: 'Suche' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 12feb7dd..284fa2fb 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -32,6 +32,7 @@ menu: save_link: 'Save a link' back_to_unread: 'Back to unread articles' users_management: 'Users management' + site_credentials: 'Site credentials' top: add_new_entry: 'Add a new entry' search: 'Search' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 2351d467..33bb879c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -32,6 +32,7 @@ menu: save_link: 'Guardar un enlace' back_to_unread: 'Volver a los artículos sin leer' users_management: 'Configuración de usuarios' + # site_credentials: 'Site credentials' top: add_new_entry: 'Añadir un nuevo artículo' search: 'Buscar' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 32e1ff42..90eb119c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -32,6 +32,7 @@ menu: save_link: 'ذخیرهٔ یک پیوند' back_to_unread: 'بازگشت به خوانده‌نشده‌ها' # users_management: 'Users management' + # site_credentials: 'Site credentials' top: add_new_entry: 'افزودن مقالهٔ تازه' search: 'جستجو' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 17eaf015..542ddf48 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -32,6 +32,7 @@ menu: save_link: "Sauvegarder un nouvel article" back_to_unread: "Retour aux articles non lus" users_management: "Gestion des utilisateurs" + site_credentials: 'Accès aux sites' top: add_new_entry: "Sauvegarder un nouvel article" search: "Rechercher" diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 752085c8..5cb2a68f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -32,6 +32,7 @@ menu: save_link: 'Salva collegamento' back_to_unread: 'Torna ai contenuti non letti' # users_management: 'Users management' + # site_credentials: 'Site credentials' top: add_new_entry: 'Aggiungi un nuovo contenuto' search: 'Cerca' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 9e941de0..bc11b2a4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -32,6 +32,7 @@ menu: save_link: 'Enregistrar un novèl article' back_to_unread: 'Tornar als articles pas legits' users_management: 'Gestion dels utilizaires' + # site_credentials: 'Site credentials' top: add_new_entry: 'Enregistrar un novèl article' search: 'Cercar' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 38e051f5..033d6ac5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -32,6 +32,7 @@ menu: save_link: 'Zapisz link' back_to_unread: 'Powrót do nieprzeczytanych artykułów' users_management: 'Zarządzanie użytkownikami' + # site_credentials: 'Site credentials' top: add_new_entry: 'Dodaj nowy wpis' search: 'Szukaj' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index d3b245b8..c70c2496 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml @@ -32,6 +32,7 @@ menu: save_link: 'Salvar um link' back_to_unread: 'Voltar para os artigos não lidos' users_management: 'Gestão de Usuários' + # site_credentials: 'Site credentials' top: add_new_entry: 'Adicionar uma nova entrada' search: 'Pesquisa' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 66c72429..a5dc44f0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -32,6 +32,7 @@ menu: # save_link: 'Save a link' back_to_unread: 'Înapoi la articolele necitite' # users_management: 'Users management' + # site_credentials: 'Site credentials' top: add_new_entry: 'Introdu un nou articol' search: 'Căutare' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 34ae5b87..4d01e7f7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -32,6 +32,7 @@ menu: # save_link: 'Save a link' back_to_unread: 'Okunmayan makalelere geri dön' # users_management: 'Users management' + # site_credentials: 'Site credentials' top: add_new_entry: 'Yeni bir makale ekle' search: 'Ara' diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig index 8448f17e..882be430 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig @@ -49,7 +49,7 @@ {{ form_end(delete_form) }}

-

{{ 'site_credential.form.back_to_list'|trans }}

+

{{ 'site_credential.form.back_to_list'|trans }}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig index fda60b31..c128bceb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig @@ -25,7 +25,7 @@ {{ credential.host }} {{ credential.username }} - {{ 'site_credential.list.edit_action'|trans }} + {{ 'site_credential.list.edit_action'|trans }} {% endfor %} @@ -33,7 +33,7 @@

- {{ 'site_credential.list.create_new_one'|trans }} + {{ 'site_credential.list.create_new_one'|trans }}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig index bf713902..3c008cde 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig @@ -42,7 +42,7 @@ {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} {{ form_rest(form) }} -

{{ 'site_credential.form.back_to_list'|trans }}

+

{{ 'site_credential.form.back_to_list'|trans }}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index 42aeace9..17fa13bb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -38,6 +38,9 @@ {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} + {% if craue_setting('restricted_access') %} +
  • {{ 'menu.left.site_credentials'|trans }}
    • + {% endif %}
  • {{ 'menu.left.config'|trans }}
    • {% if is_granted('ROLE_SUPER_ADMIN') %}
  • {{ 'menu.left.users_management'|trans }}
    • diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 2dab1c18..60907e11 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -66,6 +66,11 @@
  • {{ 'menu.left.config'|trans }}
    • + {% if craue_setting('restricted_access') %} +
  • + {{ 'menu.left.site_credentials'|trans }} +
    • + {% endif %} {% if is_granted('ROLE_SUPER_ADMIN') %}
  • {{ 'menu.left.users_management'|trans }} -- cgit v1.2.3 From 906424c1b6fd884bf2081bfe6dd0b1f9651c2801 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 11 Jun 2017 23:05:19 +0200 Subject: Crypt site credential password --- src/Wallabag/CoreBundle/Resources/config/services.yml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 09bc77fe..e09b0f18 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -126,6 +126,8 @@ services: factory: [ "@doctrine.orm.default_entity_manager", getRepository ] arguments: - WallabagCoreBundle:SiteCredential + calls: + - [ setCrypto, [ "@wallabag_core.helper.crypto_proxy" ] ] wallabag_core.helper.entries_export: class: Wallabag\CoreBundle\Helper\EntriesExport @@ -208,3 +210,9 @@ services: wallabag_core.entry.download_images.client: class: GuzzleHttp\Client + + wallabag_core.helper.crypto_proxy: + class: Wallabag\CoreBundle\Helper\CryptoProxy + arguments: + - "%wallabag_core.site_credentials.encryption_key_path%" + - "@logger" -- cgit v1.2.3 From bead8b42da4f17238dc0d5e0f90184b224ec5df7 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 14 Jun 2017 15:02:34 +0200 Subject: Fix reviews Encrypt username too Redirect to list after saving credentials Fix typos Signed-off-by: Thomas Citharel --- src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | 4 ++-- .../Resources/views/themes/material/SiteCredential/index.html.twig | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 542ddf48..cd239b5c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -515,7 +515,7 @@ user: twofactor_label: "Double authentification" save: "Sauvegarder" delete: "Supprimer" - delete_confirm: "Êtes-vous sur ?" + delete_confirm: "Êtes-vous sûr ?" back_to_list: "Revenir à la liste" search: placeholder: "Filtrer par nom d’utilisateur ou email" @@ -537,7 +537,7 @@ site_credential: password_label: 'Mot de passe' save: "Sauvegarder" delete: "Supprimer" - delete_confirm: "Êtes-vous sur ?" + delete_confirm: "Êtes-vous sûr ?" back_to_list: "Revenir à la liste" error: diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig index c128bceb..4d30a692 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig @@ -16,6 +16,7 @@ {{ 'site_credential.form.host_label'|trans }} {{ 'site_credential.form.username_label'|trans }} + {{ 'site_credential.form.password_label'|trans }} {{ 'site_credential.list.actions'|trans }} @@ -23,7 +24,8 @@ {% for credential in credentials %} {{ credential.host }} - {{ credential.username }} + ***** + ***** {{ 'site_credential.list.edit_action'|trans }} -- cgit v1.2.3 From f44dba22fc1a566cb156d9e6eda5afc353163eda Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 18 Jun 2017 15:34:59 +0200 Subject: Get rid of masked value in listing --- .../Resources/views/themes/baggy/SiteCredential/index.html.twig | 2 -- .../Resources/views/themes/material/SiteCredential/index.html.twig | 4 ---- 2 files changed, 6 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig index c128bceb..324854ad 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig @@ -15,7 +15,6 @@ {{ 'site_credential.form.host_label'|trans }} - {{ 'site_credential.form.username_label'|trans }} {{ 'site_credential.list.actions'|trans }} @@ -23,7 +22,6 @@ {% for credential in credentials %} {{ credential.host }} - {{ credential.username }} {{ 'site_credential.list.edit_action'|trans }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig index 4d30a692..324854ad 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig @@ -15,8 +15,6 @@ {{ 'site_credential.form.host_label'|trans }} - {{ 'site_credential.form.username_label'|trans }} - {{ 'site_credential.form.password_label'|trans }} {{ 'site_credential.list.actions'|trans }} @@ -24,8 +22,6 @@ {% for credential in credentials %} {{ credential.host }} - ***** - ***** {{ 'site_credential.list.edit_action'|trans }} -- cgit v1.2.3