diff options
author | Thomas Citharel <tcit@tcit.fr> | 2017-05-31 09:31:18 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2017-06-23 10:08:54 +0200 |
commit | bf6c0346d8d35a719dd1bff1cb4d573d422f99ff (patch) | |
tree | 04fb80e20ad1cffacb72357a632a9afe2ec058cb /src/Wallabag/CoreBundle/Resources | |
parent | d6d3f4ec3698effd1d4b063e295341791bdcf7d7 (diff) | |
download | wallabag-bf6c0346d8d35a719dd1bff1cb4d573d422f99ff.tar.gz wallabag-bf6c0346d8d35a719dd1bff1cb4d573d422f99ff.tar.zst wallabag-bf6c0346d8d35a719dd1bff1cb4d573d422f99ff.zip |
WIPfederation
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
6 files changed, 72 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 183b6690..6864993c 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -222,3 +222,11 @@ services: | |||
222 | arguments: | 222 | arguments: |
223 | - "%wallabag_core.site_credentials.encryption_key_path%" | 223 | - "%wallabag_core.site_credentials.encryption_key_path%" |
224 | - "@logger" | 224 | - "@logger" |
225 | |||
226 | wallabag_core.activity.subscriber: | ||
227 | class: Wallabag\CoreBundle\Event\Activity\ActivitySubscriber | ||
228 | arguments: | ||
229 | - "@doctrine.orm.default_entity_manager" | ||
230 | - "@logger" | ||
231 | tags: | ||
232 | - { name: kernel.event_subscriber } | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 98f1b48c..4f19556f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -20,7 +20,7 @@ menu: | |||
20 | starred: 'Starred' | 20 | starred: 'Starred' |
21 | archive: 'Archive' | 21 | archive: 'Archive' |
22 | all_articles: 'All entries' | 22 | all_articles: 'All entries' |
23 | config: 'Config' | 23 | config: 'config' |
24 | tags: 'Tags' | 24 | tags: 'Tags' |
25 | internal_settings: 'Internal Settings' | 25 | internal_settings: 'Internal Settings' |
26 | import: 'Import' | 26 | import: 'Import' |
@@ -51,7 +51,7 @@ footer: | |||
51 | stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day! | 51 | stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day! |
52 | 52 | ||
53 | config: | 53 | config: |
54 | page_title: 'Config' | 54 | page_title: 'config' |
55 | tab_menu: | 55 | tab_menu: |
56 | settings: 'Settings' | 56 | settings: 'Settings' |
57 | rss: 'RSS' | 57 | rss: 'RSS' |
@@ -108,6 +108,11 @@ config: | |||
108 | description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. | 108 | description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. |
109 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) | 109 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) |
110 | button: Delete my account | 110 | button: Delete my account |
111 | form_account: | ||
112 | title: "Profile" | ||
113 | description_label: "Description de votre compte. Ce texte sera affiché sur votre page de profil." | ||
114 | avatar_label: "Avatar" | ||
115 | banner_label: "Bannière" | ||
111 | reset: | 116 | reset: |
112 | title: Reset area (a.k.a danger zone) | 117 | title: Reset area (a.k.a danger zone) |
113 | description: By hitting buttons below you'll have ability to remove some information from your account. Be aware that these actions are IRREVERSIBLE. | 118 | description: By hitting buttons below you'll have ability to remove some information from your account. Be aware that these actions are IRREVERSIBLE. |
@@ -562,7 +567,7 @@ error: | |||
562 | flashes: | 567 | flashes: |
563 | config: | 568 | config: |
564 | notice: | 569 | notice: |
565 | config_saved: 'Config saved.' | 570 | config_saved: 'config saved.' |
566 | password_updated: 'Password updated' | 571 | password_updated: 'Password updated' |
567 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 572 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
568 | user_updated: 'Information updated' | 573 | user_updated: 'Information updated' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 277f2f63..2c53c12b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -108,6 +108,11 @@ config: | |||
108 | description: "Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c’est IRRÉVERSIBLE). Vous serez ensuite déconnecté." | 108 | description: "Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c’est IRRÉVERSIBLE). Vous serez ensuite déconnecté." |
109 | confirm: "Vous êtes vraiment sûr ? (C’EST IRRÉVERSIBLE)" | 109 | confirm: "Vous êtes vraiment sûr ? (C’EST IRRÉVERSIBLE)" |
110 | button: "Supprimer mon compte" | 110 | button: "Supprimer mon compte" |
111 | form_account: | ||
112 | title: "Profil" | ||
113 | description_label: "Description de votre compte. Ce texte sera affiché sur votre page de profil." | ||
114 | avatar_label: "Avatar" | ||
115 | banner_label: "Bannière" | ||
111 | reset: | 116 | reset: |
112 | title: "Réinitialisation (attention danger !)" | 117 | title: "Réinitialisation (attention danger !)" |
113 | description: "En cliquant sur les boutons ci-dessous vous avez la possibilité de supprimer certaines informations de votre compte. Attention, ces actions sont IRRÉVERSIBLES !" | 118 | description: "En cliquant sur les boutons ci-dessous vous avez la possibilité de supprimer certaines informations de votre compte. Attention, ces actions sont IRRÉVERSIBLES !" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 2d71cb9d..b77bfd7f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -51,7 +51,7 @@ footer: | |||
51 | stats: 'Desde %user_creation% você leu %nb_archives% artigos. Isso é %per_day% por dia!' | 51 | stats: 'Desde %user_creation% você leu %nb_archives% artigos. Isso é %per_day% por dia!' |
52 | 52 | ||
53 | config: | 53 | config: |
54 | page_title: 'Config' | 54 | page_title: 'config' |
55 | tab_menu: | 55 | tab_menu: |
56 | settings: 'Configurações' | 56 | settings: 'Configurações' |
57 | rss: 'RSS' | 57 | rss: 'RSS' |
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 bd5932b0..c2beb35a 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 | |||
@@ -220,6 +220,51 @@ | |||
220 | </form> | 220 | </form> |
221 | 221 | ||
222 | <br /><hr /><br /> | 222 | <br /><hr /><br /> |
223 | <h5>{{ 'config.form_account.title'|trans }}</h5> | ||
224 | |||
225 | {{ form_start(form.account) }} | ||
226 | {{ form_errors(form.account) }} | ||
227 | |||
228 | <div class="row"> | ||
229 | <div class="input-field col s12"> | ||
230 | {{ form_errors(form.account.description) }} | ||
231 | {{ form_widget(form.account.description, {'attr': {'class': 'materialize-textarea'}}) }} | ||
232 | {{ form_label(form.account.description) }} | ||
233 | </div> | ||
234 | </div> | ||
235 | |||
236 | <div class="row"> | ||
237 | <div class="file-field input-field col s12"> | ||
238 | {{ form_errors(form.account.avatar) }} | ||
239 | <div class="btn"> | ||
240 | <span>{{ 'config.form_account.avatar_label'|trans }}</span> | ||
241 | {{ form_widget(form.account.avatar) }} | ||
242 | </div> | ||
243 | <div class="file-path-wrapper"> | ||
244 | <input class="file-path validate" type="text"> | ||
245 | </div> | ||
246 | </div> | ||
247 | </div> | ||
248 | |||
249 | <div class="row"> | ||
250 | <div class="file-field input-field col s12"> | ||
251 | {{ form_errors(form.account.banner) }} | ||
252 | <div class="btn"> | ||
253 | <span>{{ 'config.form_account.banner_label'|trans }}</span> | ||
254 | {{ form_widget(form.account.banner) }} | ||
255 | </div> | ||
256 | <div class="file-path-wrapper"> | ||
257 | <input class="file-path validate" type="text"> | ||
258 | </div> | ||
259 | </div> | ||
260 | </div> | ||
261 | |||
262 | {{ form_widget(form.account.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
263 | <a href="{{ path('user-profile', {'user': app.user.account.username}) }}" class="btn">{{ 'config.form_account.view_profile' | trans }}</a> | ||
264 | {{ form_widget(form.account._token) }} | ||
265 | </form> | ||
266 | |||
267 | <br /><hr /><br /> | ||
223 | 268 | ||
224 | <div class="row"> | 269 | <div class="row"> |
225 | <h5>{{ 'config.reset.title'|trans }}</h5> | 270 | <h5>{{ 'config.reset.title'|trans }}</h5> |
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 ccc44931..f93b635f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -117,6 +117,11 @@ | |||
117 | {% if unreadNotifs > 0 %}<span id="notifications-count" class="red-text text-accent-2">{{ unreadNotifs }}</span>{% endif %} | 117 | {% if unreadNotifs > 0 %}<span id="notifications-count" class="red-text text-accent-2">{{ unreadNotifs }}</span>{% endif %} |
118 | </a> | 118 | </a> |
119 | </li> | 119 | </li> |
120 | <li id="button_profile"> | ||
121 | <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.profile' | trans }}" href="{{ path('user-profile', {'user': app.user.account.username}) }}"> | ||
122 | <i class="material-icons">person</i> | ||
123 | </a> | ||
124 | </li> | ||
120 | <li id="button_filters"> | 125 | <li id="button_filters"> |
121 | <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> | 126 | <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> |
122 | <i class="material-icons">filter_list</i> | 127 | <i class="material-icons">filter_list</i> |