From 3833c12ccce59bcc49c4cfa892401973558f604d Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Mon, 2 Jan 2017 17:01:27 -0500
Subject: Refactoring/rewrite of modal boxes handling

---
 app/Template/user_list/dropdown.php |  9 +++------
 app/Template/user_list/show.php     | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'app/Template/user_list')

diff --git a/app/Template/user_list/dropdown.php b/app/Template/user_list/dropdown.php
index 9e90c230..44a78162 100644
--- a/app/Template/user_list/dropdown.php
+++ b/app/Template/user_list/dropdown.php
@@ -7,20 +7,17 @@
         </li>
         <?php if ($user['is_active'] == 1 && $this->user->hasAccess('UserStatusController', 'disable') && ! $this->user->isCurrentUser($user['id'])): ?>
             <li>
-                <i class="fa fa-times fa-fw"></i>
-                <?= $this->url->link(t('Disable'), 'UserStatusController', 'confirmDisable', array('user_id' => $user['id']), false, 'popover') ?>
+                <?= $this->modal->confirm('times', t('Disable'), 'UserStatusController', 'confirmDisable', array('user_id' => $user['id'])) ?>
             </li>
         <?php endif ?>
         <?php if ($user['is_active'] == 0 && $this->user->hasAccess('UserStatusController', 'enable') && ! $this->user->isCurrentUser($user['id'])): ?>
             <li>
-                <i class="fa fa-check-square-o fa-fw"></i>
-                <?= $this->url->link(t('Enable'), 'UserStatusController', 'confirmEnable', array('user_id' => $user['id']), false, 'popover') ?>
+                <?= $this->modal->confirm('check-square-o', t('Enable'), 'UserStatusController', 'confirmEnable', array('user_id' => $user['id'])) ?>
             </li>
         <?php endif ?>
         <?php if ($this->user->hasAccess('UserStatusController', 'remove') && ! $this->user->isCurrentUser($user['id'])): ?>
             <li>
-                <i class="fa fa-trash-o fa-fw"></i>
-                <?= $this->url->link(t('Remove'), 'UserStatusController', 'confirmRemove', array('user_id' => $user['id']), false, 'popover') ?>
+                <?= $this->modal->confirm('trash-o', t('Remove'), 'UserStatusController', 'confirmRemove', array('user_id' => $user['id'])) ?>
             </li>
         <?php endif ?>
     </ul>
diff --git a/app/Template/user_list/show.php b/app/Template/user_list/show.php
index 5e285c89..92ea74e7 100644
--- a/app/Template/user_list/show.php
+++ b/app/Template/user_list/show.php
@@ -2,10 +2,18 @@
     <div class="page-header">
         <?php if ($this->user->hasAccess('UserCreationController', 'show')): ?>
         <ul>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'UserCreationController', 'show', array(), false, 'popover') ?></li>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'UserCreationController', 'show', array('remote' => 1), false, 'popover') ?></li>
-            <li><i class="fa fa-upload fa-fw"></i><?= $this->url->link(t('Import'), 'UserImportController', 'show', array(), false, 'popover') ?></li>
-            <li><i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'GroupListController', 'index') ?></li>
+            <li>
+                <?= $this->modal->medium('plus', t('New local user'), 'UserCreationController', 'show') ?>
+            </li>
+            <li>
+                <?= $this->modal->medium('plus', t('New remote user'), 'UserCreationController', 'show', array('remote' => 1)) ?>
+            </li>
+            <li>
+                <?= $this->modal->medium('upload', t('Import'), 'UserImportController', 'show') ?>
+            </li>
+            <li>
+                <i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'GroupListController', 'index') ?>
+            </li>
         </ul>
         <?php endif ?>
     </div>
-- 
cgit v1.2.3