From d834a05fd9ef2e8ce7d4acd4216d43d1f9fe662d Mon Sep 17 00:00:00 2001
From: seefo <robbie.uvanni@gmail.com>
Date: Thu, 22 Jun 2017 13:23:41 -0700
Subject: [PATCH] Added confirmation to domain server webpage before restarting
---
domain-server/resources/web/header.html | 3 +++
domain-server/resources/web/js/domain-server.js | 14 +++++++++++---
domain-server/resources/web/settings/index.shtml | 1 -
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html
index 0dc08e6e31..a37e9a6ff0 100644
--- a/domain-server/resources/web/header.html
+++ b/domain-server/resources/web/header.html
@@ -10,6 +10,7 @@
<link href="/css/sweetalert.css" rel="stylesheet" media="screen">
<link href="/css/bootstrap-switch.min.css" rel="stylesheet" media="screen">
+ <script src='/js/sweetalert.min.js'></script>
</head>
<body>
<nav class="navbar navbar-default" role="navigation">
@@ -37,6 +38,8 @@
</li>
<li><a href="/content/">Content</a></li>
<li><a href="/settings/">Settings</a></li>
+ </ul>
+ <ul class="nav navbar-right navbar-nav">
<li><a href="#" id="restart-server"><span class="glyphicon glyphicon-refresh"></span> Restart</a></li>
</ul>
</div>
diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index 88ab7b1470..cc11cf4b48 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -33,9 +33,17 @@ $(document).ready(function(){
return this.href == url;
}).parent().addClass('active');
- $('body').on('click', '#restart-server', function(e){
- $.get("/restart");
- showRestartModal();
+ $('body').on('click', '#restart-server', function(e) {
+ swal( {
+ title: "Are you sure?",
+ text: "This will restart your domain server, causing your domain server to be briefly offline.",
+ type: "warning",
+ html: true,
+ showCancelButton: true
+ }, function() {
+ $.get("/restart");
+ showRestartModal();
+ });
return false;
});
});
\ No newline at end of file
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index 13f5668010..b74c3591f0 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -86,7 +86,6 @@
<script src='/js/underscore-keypath.min.js'></script>
<script src='/js/bootbox.min.js'></script>
<script src='js/bootstrap-switch.min.js'></script>
-<script src='/js/sweetalert.min.js'></script>
<script src='js/settings.js'></script>
<script src='js/form2js.min.js'></script>
<script src='js/sha256.js'></script>