1 files changed, 18 insertions, 23 deletions
diff --git a/app/Template/group/associate.php b/app/Template/group/associate.php
index 9de46f35..87787568 100644
--- a/app/Template/group/associate.php
+++ b/app/Template/group/associate.php
@@ -1,25 +1,20 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'group', 'index') ?></li>
-            <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('View group members'), 'group', 'users', array('group_id' => $group['id'])) ?></li>
-        </ul>
-    </div>
-    <?php if (empty($users)): ?>
-        <p class="alert"><?= t('There is no user available.') ?></p>
-    <?php else: ?>
-        <form method="post" action="<?= $this->url->href('group', 'addUser', array('group_id' => $group['id'])) ?>" autocomplete="off">
-            <?= $this->form->csrf() ?>
-            <?= $this->form->hidden('group_id', $values) ?>
+<div class="page-header">
+    <h2><?= t('Add group member to "%s"', $group['name']) ?></h2>
+</div>
+<?php if (empty($users)): ?>
+    <p class="alert"><?= t('There is no user available.') ?></p>
+<?php else: ?>
+    <form class="popover-form" method="post" action="<?= $this->url->href('GroupListController', 'addUser', array('group_id' => $group['id'])) ?>" autocomplete="off">
+        <?= $this->form->csrf() ?>
+        <?= $this->form->hidden('group_id', $values) ?>
 
-            <?= $this->form->label(t('User'), 'user_id') ?>
-            <?= $this->form->select('user_id', $users, $values, $errors, array('required'), 'chosen-select') ?>
+        <?= $this->form->label(t('User'), 'user_id') ?>
+        <?= $this->form->select('user_id', $users, $values, $errors, array('required'), 'chosen-select') ?>
 
-            <div class="form-actions">
-                <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-                <?= t('or') ?>
-                <?= $this->url->link(t('cancel'), 'group', 'index') ?>
-            </div>
-        </form>
-    <?php endif ?>
-</section>
+        <div class="form-actions">
+            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+            <?= t('or') ?>
+            <?= $this->url->link(t('cancel'), 'GroupListController', 'index', array(), false, 'close-popover') ?>
+        </div>
+    </form>
+<?php endif ?>