From 1cfc51b0848cb66840e5d947054793c937d99357 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Thu, 12 Jan 2017 23:37:37 +0700
Subject: [PATCH] Fixed delete confirms (for build, project, user, group) + UI
 fixes

---
 public/assets/css/main.css                   |  4 +++
 public/assets/js/app.js                      |  2 +-
 public/assets/js/init.js                     | 30 -------------------
 src/PHPCensor/Controller/BuildController.php |  2 +-
 src/PHPCensor/Controller/GroupController.php |  1 +
 src/PHPCensor/View/Build/view.phtml          |  6 ++--
 src/PHPCensor/View/BuildsTable.phtml         | 13 ++++++--
 src/PHPCensor/View/Group/index.phtml         | 31 +++++++++++++-------
 src/PHPCensor/View/Project/view.phtml        | 19 ++++++++----
 src/PHPCensor/View/User/index.phtml          | 21 +++++++++----
 10 files changed, 69 insertions(+), 60 deletions(-)
 delete mode 100644 public/assets/js/init.js

diff --git a/public/assets/css/main.css b/public/assets/css/main.css
index 48029bdf..bdd8b757 100644
--- a/public/assets/css/main.css
+++ b/public/assets/css/main.css
@@ -567,3 +567,7 @@ h6,
 .visible-line-breaks {
     white-space: pre-wrap;
 }
+
+.btn-group-right {
+    float: right;
+}
diff --git a/public/assets/js/app.js b/public/assets/js/app.js
index d5dad8ad..d28ac628 100644
--- a/public/assets/js/app.js
+++ b/public/assets/js/app.js
@@ -188,7 +188,7 @@ function confirmDelete(url, subject, reloadAfter) {
                         };
                     }
 
-                    dialog.showStatusMessage('Successfully deleted!', 1000);
+                    dialog.showStatusMessage('Successfully deleted!', 500);
                 },
                 error: function (data) {
                     dialog.showStatusMessage('Deletion failed! Server says "' + data.statusText + '"');
diff --git a/public/assets/js/init.js b/public/assets/js/init.js
deleted file mode 100644
index 92b309fa..00000000
--- a/public/assets/js/init.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Initialization of frontend of the application goes here
- *
- * @author Pavel Pavlov <Pavel.Pavlov@alera.ru>
- */
-
-$(function () {
-    $('#latest-builds').on('latest-builds:reload', bindAppDeleteEvents);
-    $('#latest-builds').trigger('latest-builds:reload');
-});
-
-function bindAppDeleteEvents () {
-    $('.app-delete-build').on('click', function (e) {
-        e.preventDefault();
-
-        confirmDelete(e.target.href, 'Build').onClose = function () {
-            window.location.reload();
-        };
-
-        return false;
-    });
-
-    $('.app-delete-user').on('click', function (e) {
-        e.preventDefault();
-
-        confirmDelete(e.target.href, 'User', true);
-
-        return false;
-    });
-}
diff --git a/src/PHPCensor/Controller/BuildController.php b/src/PHPCensor/Controller/BuildController.php
index 6bc2d353..a84276d1 100644
--- a/src/PHPCensor/Controller/BuildController.php
+++ b/src/PHPCensor/Controller/BuildController.php
@@ -97,7 +97,7 @@ class BuildController extends Controller
         $actions = "<a class=\"btn btn-default\" href=\"{$rebuildLink}\">{$rebuild}</a> ";
 
         if ($this->currentUserIsAdmin()) {
-            $actions .= " <a class=\"btn btn-danger\" href=\"{$deleteLink}\">{$delete}</a>";
+            $actions .= " <a class=\"btn btn-danger\" id=\"delete-build\" href=\"{$deleteLink}\">{$delete}</a>";
         }
 
         $this->layout->actions = $actions;
diff --git a/src/PHPCensor/Controller/GroupController.php b/src/PHPCensor/Controller/GroupController.php
index e436aed0..6229c6d8 100644
--- a/src/PHPCensor/Controller/GroupController.php
+++ b/src/PHPCensor/Controller/GroupController.php
@@ -96,6 +96,7 @@ class GroupController extends Controller
         $title->setValue($group->getTitle());
 
         $submit = new Form\Element\Submit();
+        $submit->setClass('btn btn-success');
         $submit->setValue(Lang::get('group_save'));
 
         $form->addField($title);
diff --git a/src/PHPCensor/View/Build/view.phtml b/src/PHPCensor/View/Build/view.phtml
index 3543afd1..3deb188a 100644
--- a/src/PHPCensor/View/Build/view.phtml
+++ b/src/PHPCensor/View/Build/view.phtml
@@ -181,10 +181,8 @@ foreach ($plugins as $plugin) {
         $('#delete-build').on('click', function (e) {
             e.preventDefault();
             confirmDelete(
-                "<?php echo APP_URL ?>build/delete/<?php print $build->getId(); ?>", "Build"
-            ).onCloseConfirmed = function () {window.location = '/'};
+                "<?= APP_URL; ?>build/delete/<?= $build->getId(); ?>", "Build"
+            ).onCloseConfirmed = function () {window.location = '<?= APP_URL; ?>project/view/<?= $build->getProjectId(); ?>'};
         });
     });
-
-
 </script>
diff --git a/src/PHPCensor/View/BuildsTable.phtml b/src/PHPCensor/View/BuildsTable.phtml
index 3f094e60..d99f083c 100644
--- a/src/PHPCensor/View/BuildsTable.phtml
+++ b/src/PHPCensor/View/BuildsTable.phtml
@@ -71,17 +71,26 @@ switch($build->getStatus())
         <span class='label label-<?php echo $subcls ?>'><?php echo $status ?></span>
     </td>
     <td>
-        <div class="btn-group">
+        <div class="btn-group btn-group-right">
             <a class="btn btn-default btn-sm" href="<?php echo APP_URL ?>build/view/<?php print $build->getId(); ?>"><?php Lang::out('view'); ?></a>
             <?php if($this->User()->getIsAdmin()): ?>
             <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
-                <li><a href="<?php echo APP_URL ?>build/delete/<?php print $build->getId(); ?>" class="app-delete-build"><?php Lang::out('delete_build'); ?></a></li>
+                <li><a href="<?php echo APP_URL ?>build/delete/<?php print $build->getId(); ?>" class="delete-build"><?php Lang::out('delete_build'); ?></a></li>
             </ul>
             <?php endif; ?>
         </div>
     </td>
 </tr>
 <?php endforeach; ?>
+
+<script>
+    $(document).ready(function() {
+        $('.delete-build').on('click', function (e) {
+            e.preventDefault();
+            confirmDelete(e.target.href, "Build").onCloseConfirmed = function () {window.location = window.location.href};
+        });
+    });
+</script>
diff --git a/src/PHPCensor/View/Group/index.phtml b/src/PHPCensor/View/Group/index.phtml
index 9b6c6b16..780cb921 100644
--- a/src/PHPCensor/View/Group/index.phtml
+++ b/src/PHPCensor/View/Group/index.phtml
@@ -24,18 +24,29 @@
                 <td><?php print $group['title']; ?></td>
                 <td><?php print count($group['projects']); ?></td>
                 <td>
-                    <a class="btn btn-sm btn-default" href="<?php print APP_URL . 'group/edit/' . $group['id']; ?>">
-                        <?php Lang::out('group_edit'); ?>
-                    </a>
-
-                    <?php if (!count($group['projects'])): ?>
-                    <a class="btn btn-sm btn-danger delete-group" href="<?php print APP_URL . 'group/delete/' . $group['id']; ?>">
-                        <?php Lang::out('group_delete'); ?>
-                    </a>
-                    <?php endif; ?>
+                    <div class="btn-group btn-group-right">
+                        <a class="btn btn-default btn-sm" href="<?php echo APP_URL ?>group/edit/<?php print $group['id']; ?>"><?php Lang::out('group_edit'); ?></a>
+                        <?php if($this->User()->getIsAdmin() && (!count($group['projects']))): ?>
+                            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
+                                <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu">
+                                <li><a href="<?php echo APP_URL ?>group/delete/<?php print $group['id']; ?>" class="delete-group"><?php Lang::out('group_delete'); ?></a></li>
+                            </ul>
+                        <?php endif; ?>
+                    </div>
                 </td>
             </tr>
             <?php endforeach; ?>
         </tbody>
     </table>
-</div>
\ No newline at end of file
+</div>
+
+<script>
+    $(document).ready(function() {
+        $('.delete-group').on('click', function (e) {
+            e.preventDefault();
+            confirmDelete(e.target.href, "Group").onCloseConfirmed = function () {window.location = window.location.href};
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/src/PHPCensor/View/Project/view.phtml b/src/PHPCensor/View/Project/view.phtml
index a2149600..e27a571d 100644
--- a/src/PHPCensor/View/Project/view.phtml
+++ b/src/PHPCensor/View/Project/view.phtml
@@ -10,7 +10,7 @@
         <?php Lang::out('edit_project'); ?>
     </a>
 
-    <a  class="btn btn-danger" href="javascript:confirmDelete('<?php print APP_URL . 'project/delete/' . $project->getId(); ?>', '<?php print Lang::out('project'); ?>', true)">
+    <a class="btn btn-danger" id="delete-project">
         <?php Lang::out('delete_project'); ?>
     </a>
 
@@ -56,7 +56,7 @@
                 <th class="hidden-md hidden-sm hidden-xs"><?php Lang::out('commit'); ?></th>
                 <th><?php Lang::out('branch'); ?></th>
                 <th><?php Lang::out('status'); ?></th>
-                <th style="width: 100px"></th>
+                <th></th>
             </tr>
             </thead>
             <tbody id="latest-builds">
@@ -152,14 +152,21 @@ if ($pages > 1) {
     }
 }
 
-
-
 if ($page < $pages - 1) {
     print '<li><a href="' . $project_url . '?p='.($page == $pages ? $pages : $page + 1).'">'.Lang::get('next_link').'</a></li>';
 }
 
-
-
 print '</ul></div>';
 
 ?>
+
+<script>
+    $(function() {
+        $('#delete-project').on('click', function (e) {
+            e.preventDefault();
+            confirmDelete(
+                "<?= APP_URL; ?>project/delete/<?= $project->getId(); ?>", "Project"
+            ).onCloseConfirmed = function () {window.location = '/'};
+        });
+    })
+</script>
diff --git a/src/PHPCensor/View/User/index.phtml b/src/PHPCensor/View/User/index.phtml
index c1e2af79..20494a1f 100644
--- a/src/PHPCensor/View/User/index.phtml
+++ b/src/PHPCensor/View/User/index.phtml
@@ -1,7 +1,7 @@
 <?php use PHPCensor\Helper\Lang; ?>
 <div class="clearfix"  style="margin-bottom: 20px;">
     <div class="pull-right btn-group">
-        <a class="btn btn-primary" href="<?php print APP_URL; ?>user/add"><?php Lang::out('add_user'); ?></a>
+        <a class="btn btn-success" href="<?php print APP_URL; ?>user/add"><?php Lang::out('add_user'); ?></a>
     </div>
 </div>
 
@@ -15,7 +15,7 @@
                         <th><?php Lang::out('email_address'); ?></th>
                         <th><?php Lang::out('name'); ?></th>
                         <th><?php Lang::out('is_admin'); ?></th>
-                        <th style="width: 100px"></th>
+                        <th></th>
                     </tr>
                     </thead>
                     <tbody id="users">
@@ -40,13 +40,13 @@
                             <td><?php print $status; ?></td>
                             <td>
                                 <?php if($this->User()->getIsAdmin()): ?>
-                                    <div class="btn-group pull-right">
-                                        <a class="btn btn-default btn-small" href="<?php echo APP_URL ?>user/edit/<?php print $user->getId(); ?>"><?php Lang::out('edit'); ?></a>
-                                        <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
+                                    <div class="btn-group btn-group-right">
+                                        <a class="btn btn-default btn-sm" href="<?php echo APP_URL ?>user/edit/<?php print $user->getId(); ?>"><?php Lang::out('edit'); ?></a>
+                                        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
                                             <span class="caret"></span>
                                         </button>
                                         <ul class="dropdown-menu">
-                                            <li><a href="<?php echo APP_URL ?>user/delete/<?php print $user->getId(); ?>" class="app-delete-user"><?php Lang::out('delete_user'); ?></a></li>
+                                            <li><a href="<?php echo APP_URL ?>user/delete/<?php print $user->getId(); ?>" class="delete-user"><?php Lang::out('delete_user'); ?></a></li>
                                         </ul>
                                     </div>
                                 <?php endif; ?>
@@ -58,3 +58,12 @@
          </div>
     </div>
 </div>
+
+<script>
+    $(document).ready(function() {
+        $('.delete-user').on('click', function (e) {
+            e.preventDefault();
+            confirmDelete(e.target.href, "User").onCloseConfirmed = function () {window.location = window.location.href};
+        });
+    });
+</script>