4 files changed, 56 insertions, 2 deletions

diff --git a/src/Wallabag/GroupBundle/Resources/config/services.yml b/src/Wallabag/GroupBundle/Resources/config/services.yml
new file mode 100644
index 00000000..76e8427a
--- /dev/null
+++ b/src/Wallabag/GroupBundle/Resources/config/services.yml
@@ -0,0 +1,3 @@
+services:
+    sha256salted_encoder:
+          class: Strut\StrutBundle\Service\Sha256Salted
\ No newline at end of file
diff --git a/src/Wallabag/GroupBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/GroupBundle/Resources/views/Manage/edit.html.twig
index 7de68c35..c12e8625 100644
--- a/src/Wallabag/GroupBundle/Resources/views/Manage/edit.html.twig
+++ b/src/Wallabag/GroupBundle/Resources/views/Manage/edit.html.twig
@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{{ 'group.page_title'|trans }}{% endblock %}
+{% block title %}{{ 'group.page_title' | trans }}{% endblock %}
 
 {% block content %}
 
@@ -9,7 +9,7 @@
             <div class="card-panel">
                 <div class="row">
                     <div class="input-field col s12">
-                        <h4>{{ 'group.edit_group'|trans }}</h4>
+                        <h4>{{ 'group.edit_group'|trans({'%group%': group.name }) }}</h4>
 
                         <div id="set6" class="col s12">
                             {{ form_start(edit_form) }}
@@ -23,6 +23,30 @@
                                     </div>
                                 </div>
 
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.defaultRole) }}
+                                        {{ form_errors(edit_form.defaultRole) }}
+                                        {{ form_widget(edit_form.defaultRole) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.acceptSystem) }}
+                                        {{ form_errors(edit_form.acceptSystem) }}
+                                        {{ form_widget(edit_form.acceptSystem) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.plainPassword) }}
+                                        {{ form_errors(edit_form.plainPassword) }}
+                                        {{ form_widget(edit_form.plainPassword) }}
+                                    </div>
+                                </div>
+
                                 <br/>
 
                                 {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
diff --git a/src/Wallabag/GroupBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/GroupBundle/Resources/views/Manage/index.html.twig
index 58af3a75..01466e52 100644
--- a/src/Wallabag/GroupBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/GroupBundle/Resources/views/Manage/index.html.twig
@@ -37,6 +37,9 @@
                         <p>
                             <a href="{{ path('group_new') }}" class="waves-effect waves-light btn">{{ 'group.list.create_new_one'|trans }}</a>
                         </p>
+                        {% if groups.getNbPages > 1 %}
+                            {{ pagerfanta(groups, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+                        {% endif %}
                     </div>
                 </div>
             </div>
diff --git a/src/Wallabag/GroupBundle/Resources/views/Manage/new.html.twig b/src/Wallabag/GroupBundle/Resources/views/Manage/new.html.twig
index 3f1c2ad5..cb009b5d 100644
--- a/src/Wallabag/GroupBundle/Resources/views/Manage/new.html.twig
+++ b/src/Wallabag/GroupBundle/Resources/views/Manage/new.html.twig
@@ -23,6 +23,30 @@
                                     </div>
                                 </div>
 
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.defaultRole) }}
+                                        {{ form_errors(form.defaultRole) }}
+                                        {{ form_widget(form.defaultRole) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.acceptSystem) }}
+                                        {{ form_errors(form.acceptSystem) }}
+                                        {{ form_widget(form.acceptSystem) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.plainPassword) }}
+                                        {{ form_errors(form.plainPassword) }}
+                                        {{ form_widget(form.plainPassword) }}
+                                    </div>
+                                </div>
+
                                 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
                                 {{ form_rest(form) }}
                             </form>