MOAR WIP

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

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:
             delete_public_link: 'delete public link'
             export: 'Export'
             print: 'Print'
+            groups: Groups
             problem:
                 label: 'Problems?'
                 description: 'Does this article appear wrong?'
@@ -515,6 +516,31 @@ group:
         delete: Delete
         delete_confirm: Are you sure?
         back_to_list: Back to list
+        role_label: Default roles
+        access_label: Access
+        password_label: Password (if applicable)
+
+    roles:
+        readonly: Read only
+        write: Write access
+        manage_entries: Managing articles
+        manage_users: Managing members
+        admin: Administrator
+    access:
+        open: Open
+        request: On request
+        password: With password
+        invitation: Upon invitation
+        hidden: Upon invitation and private
+    tab_menu:
+        public: Public groups
+        own: My groups
+    manage:
+        label: Manage this group
+    entries:
+        label: Entries shared with this group
+    leave:
+        label: Leave
 
 user:
     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:
             delete_public_link: "Supprimer le lien public"
             export: "Exporter"
             print: "Imprimer"
+            groups: Groupes
             problem:
                 label: "Un problème ?"
                 description: "Est-ce que cet article s’affiche mal ?"
@@ -549,6 +550,32 @@ group:
     tab_menu:
         public: Groupes publics
         own: Mes groupes
+    requests:
+        list: Liste des requêtes
+        sent: Requête envoyée
+        username: Utilisateur
+        action: Action
+    manage:
+        label: Gérer le groupe
+        title: Gérer le groupe
+    entries:
+        label: Liste des articles partagés avec ce groupe
+    leave:
+        label: Sortir de ce groupe
+    user:
+        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"
+        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"
+    members:
+        empty: Le groupe est vide
+        name: Nom d'utilisateur
+        role: Rôle
+        action: Action
+        edit: Modifier les droits de l'utilisateur
+        exclude: Exclure l'utilisateur
+    edit_user:
+        title: Édition des droits de l'utilisateur
+        role: Rôle
+        cancel: Annuler
 
 user:
     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 @@
+<!-- Groups Modal -->
+<div id="groups-modal" class="modal bottom-sheet">
+    <div class="modal-content">
+        <div class="row">
+            <h4>Groups</h4>
+            <p>Select the groups you want to share this article with</p>
+            <form name="search" method="POST" action="{{ path('group-shares-entry', {'entry': entry.id})}}">
+                {% if form_errors(form) %}
+                    <span class="black-text">{{ form_errors(form) }}</span>
+                {% endif %}
+
+                {% if form_errors(form.groupshares) %}
+                    <span class="black-text">{{ form_errors(form.groupshares) }}</span>
+                {% endif %}
+
+                {{ form_widget(form.groupshares) }}
+                {{ form_widget(form.save, {'attr': {'class': 'modal-action modal-close waves-effect waves-light btn'}}) }}
+
+                {{ form_rest(form) }}
+            </form>
+
+        </div>
+    </div>
+</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 @@
             </div>
         </li>
 
+        {#{% if craue_setting('groups') %}#}
+            <li class="bold border-bottom hide-on-med-and-down">
+                <a class="waves-effect groups-button" onclick="$('#groups-modal').openModal();" title="{{ 'entry.view.left_menu.group'|trans }}">
+                    <i class="material-icons small">group</i>
+                    <span>{{ 'entry.view.left_menu.groups'|trans }}</span>
+                </a>
+            </li>
+        {#{% endif %}#}
+
         {% if craue_setting('show_printlink') %}
         <li class="bold border-bottom hide-on-med-and-down">
             <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.print'|trans }}" href="javascript: window.print();">
@@ -287,6 +296,8 @@
         </div>
     </div>
 
+    {{ render(controller( "WallabagCoreBundle:Entry:GroupShare", { 'entry': entry.id } )) }}
+
 <script id="annotationroutes" type="application/json">
 {
     "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 @@
                 <li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}">
                     <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a>
                 </li>
-                <li class="bold {% if currentRoute starts with 'group_' %}active{% endif %}">
-                    <a class="waves-effect" href="{{ path('group_index') }}">{{ 'menu.left.groups_management'|trans }}</a>
-                </li>
 
                 <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}">
                     <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a>
                 </li>
             {% endif %}
+            <li class="bold {% if currentRoute starts with 'group_' %}active{% endif %}">
+                <a class="waves-effect" href="{{ path('group_index') }}">{{ 'menu.left.groups_management'|trans }}</a>
+            </li>
             <li class="bold {% if currentRoute == 'import' %}active{% endif %}">
                 <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a>
             </li>