diff options
author | Thomas Citharel <tcit@tcit.fr> | 2017-04-27 19:17:19 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2017-06-23 09:27:23 +0200 |
commit | 5847dd3572caf06c0e0d5e307241c3b6bc3f8611 (patch) | |
tree | 8905d4de388dd18239ea323f4650ff0070064eab /src/Wallabag/CoreBundle/Resources | |
parent | 2585953e0dae631b65c59b0e31196d65bdde84df (diff) | |
download | wallabag-5847dd3572caf06c0e0d5e307241c3b6bc3f8611.tar.gz wallabag-5847dd3572caf06c0e0d5e307241c3b6bc3f8611.tar.zst wallabag-5847dd3572caf06c0e0d5e307241c3b6bc3f8611.zip |
MOAR WIP
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
5 files changed, 91 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 8f507c40..94bce434 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -224,6 +224,7 @@ entry: | |||
224 | delete_public_link: 'delete public link' | 224 | delete_public_link: 'delete public link' |
225 | export: 'Export' | 225 | export: 'Export' |
226 | print: 'Print' | 226 | print: 'Print' |
227 | groups: Groups | ||
227 | problem: | 228 | problem: |
228 | label: 'Problems?' | 229 | label: 'Problems?' |
229 | description: 'Does this article appear wrong?' | 230 | description: 'Does this article appear wrong?' |
@@ -515,6 +516,31 @@ group: | |||
515 | delete: Delete | 516 | delete: Delete |
516 | delete_confirm: Are you sure? | 517 | delete_confirm: Are you sure? |
517 | back_to_list: Back to list | 518 | back_to_list: Back to list |
519 | role_label: Default roles | ||
520 | access_label: Access | ||
521 | password_label: Password (if applicable) | ||
522 | |||
523 | roles: | ||
524 | readonly: Read only | ||
525 | write: Write access | ||
526 | manage_entries: Managing articles | ||
527 | manage_users: Managing members | ||
528 | admin: Administrator | ||
529 | access: | ||
530 | open: Open | ||
531 | request: On request | ||
532 | password: With password | ||
533 | invitation: Upon invitation | ||
534 | hidden: Upon invitation and private | ||
535 | tab_menu: | ||
536 | public: Public groups | ||
537 | own: My groups | ||
538 | manage: | ||
539 | label: Manage this group | ||
540 | entries: | ||
541 | label: Entries shared with this group | ||
542 | leave: | ||
543 | label: Leave | ||
518 | 544 | ||
519 | user: | 545 | user: |
520 | page_title: Users management | 546 | page_title: Users management |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index d909cf15..007d5b2a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -240,6 +240,7 @@ entry: | |||
240 | delete_public_link: "Supprimer le lien public" | 240 | delete_public_link: "Supprimer le lien public" |
241 | export: "Exporter" | 241 | export: "Exporter" |
242 | print: "Imprimer" | 242 | print: "Imprimer" |
243 | groups: Groupes | ||
243 | problem: | 244 | problem: |
244 | label: "Un problème ?" | 245 | label: "Un problème ?" |
245 | description: "Est-ce que cet article s’affiche mal ?" | 246 | description: "Est-ce que cet article s’affiche mal ?" |
@@ -549,6 +550,32 @@ group: | |||
549 | tab_menu: | 550 | tab_menu: |
550 | public: Groupes publics | 551 | public: Groupes publics |
551 | own: Mes groupes | 552 | own: Mes groupes |
553 | requests: | ||
554 | list: Liste des requêtes | ||
555 | sent: Requête envoyée | ||
556 | username: Utilisateur | ||
557 | action: Action | ||
558 | manage: | ||
559 | label: Gérer le groupe | ||
560 | title: Gérer le groupe | ||
561 | entries: | ||
562 | label: Liste des articles partagés avec ce groupe | ||
563 | leave: | ||
564 | label: Sortir de ce groupe | ||
565 | user: | ||
566 | inGroup: "{0}Il n'y a personne dans ce groupe|{1}Vous êtes tout seul dans ce groupe|]1,Inf[Vous êtes %count% utilisateurs dans ce groupe" | ||
567 | notInGroup: "{0}Il n'y a personne dans ce groupe|{1}Il y a un seul utilisateur dans ce groupe|]1,Inf[%count% utilisateurs dans ce groupe" | ||
568 | members: | ||
569 | empty: Le groupe est vide | ||
570 | name: Nom d'utilisateur | ||
571 | role: Rôle | ||
572 | action: Action | ||
573 | edit: Modifier les droits de l'utilisateur | ||
574 | exclude: Exclure l'utilisateur | ||
575 | edit_user: | ||
576 | title: Édition des droits de l'utilisateur | ||
577 | role: Rôle | ||
578 | cancel: Annuler | ||
552 | 579 | ||
553 | user: | 580 | user: |
554 | page_title: "Gestion des utilisateurs" | 581 | page_title: "Gestion des utilisateurs" |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_share_groups.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_share_groups.html.twig new file mode 100644 index 00000000..5c81ccc2 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_share_groups.html.twig | |||
@@ -0,0 +1,24 @@ | |||
1 | <!-- Groups Modal --> | ||
2 | <div id="groups-modal" class="modal bottom-sheet"> | ||
3 | <div class="modal-content"> | ||
4 | <div class="row"> | ||
5 | <h4>Groups</h4> | ||
6 | <p>Select the groups you want to share this article with</p> | ||
7 | <form name="search" method="POST" action="{{ path('group-shares-entry', {'entry': entry.id})}}"> | ||
8 | {% if form_errors(form) %} | ||
9 | <span class="black-text">{{ form_errors(form) }}</span> | ||
10 | {% endif %} | ||
11 | |||
12 | {% if form_errors(form.groupshares) %} | ||
13 | <span class="black-text">{{ form_errors(form.groupshares) }}</span> | ||
14 | {% endif %} | ||
15 | |||
16 | {{ form_widget(form.groupshares) }} | ||
17 | {{ form_widget(form.save, {'attr': {'class': 'modal-action modal-close waves-effect waves-light btn'}}) }} | ||
18 | |||
19 | {{ form_rest(form) }} | ||
20 | </form> | ||
21 | |||
22 | </div> | ||
23 | </div> | ||
24 | </div> | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 4cff7bf2..05f51aa8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -170,6 +170,15 @@ | |||
170 | </div> | 170 | </div> |
171 | </li> | 171 | </li> |
172 | 172 | ||
173 | {#{% if craue_setting('groups') %}#} | ||
174 | <li class="bold border-bottom hide-on-med-and-down"> | ||
175 | <a class="waves-effect groups-button" onclick="$('#groups-modal').openModal();" title="{{ 'entry.view.left_menu.group'|trans }}"> | ||
176 | <i class="material-icons small">group</i> | ||
177 | <span>{{ 'entry.view.left_menu.groups'|trans }}</span> | ||
178 | </a> | ||
179 | </li> | ||
180 | {#{% endif %}#} | ||
181 | |||
173 | {% if craue_setting('show_printlink') %} | 182 | {% if craue_setting('show_printlink') %} |
174 | <li class="bold border-bottom hide-on-med-and-down"> | 183 | <li class="bold border-bottom hide-on-med-and-down"> |
175 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.print'|trans }}" href="javascript: window.print();"> | 184 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.print'|trans }}" href="javascript: window.print();"> |
@@ -287,6 +296,8 @@ | |||
287 | </div> | 296 | </div> |
288 | </div> | 297 | </div> |
289 | 298 | ||
299 | {{ render(controller( "WallabagCoreBundle:Entry:GroupShare", { 'entry': entry.id } )) }} | ||
300 | |||
290 | <script id="annotationroutes" type="application/json"> | 301 | <script id="annotationroutes" type="application/json"> |
291 | { | 302 | { |
292 | "prefix": "", | 303 | "prefix": "", |
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 575c77f2..92b47dac 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -75,14 +75,14 @@ | |||
75 | <li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}"> | 75 | <li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}"> |
76 | <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a> | 76 | <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a> |
77 | </li> | 77 | </li> |
78 | <li class="bold {% if currentRoute starts with 'group_' %}active{% endif %}"> | ||
79 | <a class="waves-effect" href="{{ path('group_index') }}">{{ 'menu.left.groups_management'|trans }}</a> | ||
80 | </li> | ||
81 | 78 | ||
82 | <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}"> | 79 | <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}"> |
83 | <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a> | 80 | <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a> |
84 | </li> | 81 | </li> |
85 | {% endif %} | 82 | {% endif %} |
83 | <li class="bold {% if currentRoute starts with 'group_' %}active{% endif %}"> | ||
84 | <a class="waves-effect" href="{{ path('group_index') }}">{{ 'menu.left.groups_management'|trans }}</a> | ||
85 | </li> | ||
86 | <li class="bold {% if currentRoute == 'import' %}active{% endif %}"> | 86 | <li class="bold {% if currentRoute == 'import' %}active{% endif %}"> |
87 | <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a> | 87 | <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a> |
88 | </li> | 88 | </li> |