Introduce JS helper for bootstrap confirm dialogs on button-submit

4 files changed, 137 insertions, 233 deletions

diff --git a/modules-available/dozmod/templates/ldapfilters.html b/modules-available/dozmod/templates/ldapfilters.html
index 824ec70b..f12fd049 100644
--- a/modules-available/dozmod/templates/ldapfilters.html
+++ b/modules-available/dozmod/templates/ldapfilters.html
@@ -4,74 +4,52 @@
 	{{lang_ldapfiltersIntro}}
 </p>
 
-<table class="table">
-	<thead>
-	<tr>
-		<th class="">{{lang_ldapFilterName}}</th>
-		<th class="">{{lang_ldapFilterAttribute}}</th>
-		<th class="">{{lang_ldapFilterValue}}</th>
-		{{#hasEditPermission}}
-		<th class="slx-smallcol">{{lang_edit}}</th>
-		<th class="slx-smallcol">{{lang_delete}}</th>
-		{{/hasEditPermission}}
-	</tr>
-	</thead>
-	<tbody>
-	{{#ldapfilters}}
-	<tr>
-		<td>{{filtername}}</td>
-		<td>{{filterkey}}</td>
-		<td>{{filtervalue}}</td>
-		{{#hasEditPermission}}
-		<td class="text-center">
-			<a class="btn btn-xs btn-primary" href="?do=dozmod&section=ldapfilters&show=edit&filterid={{filterid}}">
-				<span class="glyphicon glyphicon-edit"></span>
-			</a>
-		</td>
-		<td class="text-center">
-			<button type="button" class="btn btn-xs btn-danger" data-toggle="modal" data-target="#deleteModal" onclick="setDeleteId('{{filterid}}')">
-				<span class="glyphicon glyphicon-trash"></span>
-			</button>
-		</td>
-		{{/hasEditPermission}}
-	</tr>
-	{{/ldapfilters}}
-	</tbody>
-</table>
+<form method="post" action="?do=dozmod&section=ldapfilters">
+	<input type="hidden" name="token" value="{{token}}">
+	<input type="hidden" name="action" value="deleteFilter">
+	<table class="table">
+		<thead>
+		<tr>
+			<th class="">{{lang_ldapFilterName}}</th>
+			<th class="">{{lang_ldapFilterAttribute}}</th>
+			<th class="">{{lang_ldapFilterValue}}</th>
+			{{#hasEditPermission}}
+			<th class="slx-smallcol">{{lang_edit}}</th>
+			<th class="slx-smallcol">{{lang_delete}}</th>
+			{{/hasEditPermission}}
+		</tr>
+		</thead>
+		<tbody>
+		{{#ldapfilters}}
+		<tr>
+			<td>{{filtername}}</td>
+			<td>{{filterkey}}</td>
+			<td>{{filtervalue}}</td>
+			{{#hasEditPermission}}
+			<td class="text-center">
+				<a class="btn btn-xs btn-primary" href="?do=dozmod&amp;section=ldapfilters&amp;show=edit&amp;filterid={{filterid}}">
+					<span class="glyphicon glyphicon-edit"></span>
+				</a>
+			</td>
+			<td class="text-center">
+				<button type="submit" name="filterid" value="{{filterid}}" class="btn btn-xs btn-danger"
+						  data-confirm="#confirm-delete" data-title="{{filtername}}">
+					<span class="glyphicon glyphicon-trash"></span>
+				</button>
+			</td>
+			{{/hasEditPermission}}
+		</tr>
+		{{/ldapfilters}}
+		</tbody>
+	</table>
+</form>
+<div class="hidden" id="confirm-delete">{{lang_ldapFilterDeleteConfirmation}}</div>
 
 {{#hasEditPermission}}
 <div class="text-right">
-	<a class="btn btn-sm btn-success" href="?do=dozmod&section=ldapfilters&show=edit">
+	<a class="btn btn-sm btn-success" href="?do=dozmod&amp;section=ldapfilters&amp;show=edit">
 		<span class="glyphicon glyphicon-plus"></span>
 		{{lang_ldapFilterAdd}}
 	</a>
 </div>
 {{/hasEditPermission}}
-
-<form method="post" action="?do=dozmod&section=ldapfilters">
-	<input type="hidden" name="token" value="{{token}}">
-	<input type="hidden" id="deleteAction" name="filterid" value="">
-	<div class ="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					<h4 class="modal-title" id="myModalLabel">{{lang_delete}}</h4>
-				</div>
-				<div class="modal-body">
-					<p>{{lang_ldapFilterDeleteConfirmation}}</p>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" name="action" value="deleteFilter" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button>
-				</div>
-			</div>
-		</div>
-	</div>
-</form>
-
-<script type="text/javascript">
-function setDeleteId(id) {
-	$('#deleteAction').val(id)
-}
-</script>
diff --git a/modules-available/dozmod/templates/networkrules.html b/modules-available/dozmod/templates/networkrules.html
index eb16a7ed..a9549aa0 100644
--- a/modules-available/dozmod/templates/networkrules.html
+++ b/modules-available/dozmod/templates/networkrules.html
@@ -4,36 +4,44 @@
 	{{lang_networkrulesIntro}}
 </p>
 
-<table class="table">
-	<thead>
-		<tr>
-			<th>{{lang_name}}</th>
-			{{#hasEditPermissions}}
-			<th class="slx-smallcol">{{lang_edit}}</th>
-			<th class="slx-smallcol">{{lang_delete}}</th>
-			{{/hasEditPermissions}}
-		</tr>
-	</thead>
-	<tbody>
-	{{#networkrules}}
-		<tr>
-			<td>{{rulename}}</td>
-			{{#hasEditPermissions}}
-			<td align="center">
-				<a href="?do=dozmod&amp;section=networkrules&amp;show=edit&amp;ruleid={{ruleid}}" class="btn btn-xs btn-primary">
-					<span class="glyphicon glyphicon-edit"></span>
-				</a>
-			</td>
-			<td align="center">
-				<button type="button" class="btn btn-xs btn-danger" data-toggle="modal" data-target="#deleteModal" onclick="deleteRule('{{ruleid}}')">
-					<span class="glyphicon glyphicon-trash"></span>
-				</button>
-			</td>
-			{{/hasEditPermissions}}
-		</tr>
-	{{/networkrules}}
-	</tbody>
-</table>
+<form method="post" action="?do=dozmod">
+	<input type="hidden" name="token" value="{{token}}">
+	<input type="hidden" name="section" value="networkrules">
+	<input type="hidden" name="action" value="delete">
+	<table class="table">
+		<thead>
+			<tr>
+				<th>{{lang_name}}</th>
+				{{#hasEditPermissions}}
+				<th class="slx-smallcol">{{lang_edit}}</th>
+				<th class="slx-smallcol">{{lang_delete}}</th>
+				{{/hasEditPermissions}}
+			</tr>
+		</thead>
+		<tbody>
+		{{#networkrules}}
+			<tr>
+				<td>{{rulename}}</td>
+				{{#hasEditPermissions}}
+				<td align="center">
+					<a href="?do=dozmod&amp;section=networkrules&amp;show=edit&amp;ruleid={{ruleid}}" class="btn btn-xs btn-primary">
+						<span class="glyphicon glyphicon-edit"></span>
+					</a>
+				</td>
+				<td align="center">
+					<button type="submit" name="ruleid" value="{{ruleid}}" class="btn btn-xs btn-danger"
+							  data-confirm="#confirm-delete" data-title="{{rulename}}">
+						<span class="glyphicon glyphicon-trash"></span>
+					</button>
+				</td>
+				{{/hasEditPermissions}}
+			</tr>
+		{{/networkrules}}
+		</tbody>
+	</table>
+</form>
+<div class="hidden" id="confirm-delete">{{lang_ruleDeleteConfirm}}</div>
+
 {{#hasEditPermissions}}
 <div class="text-right">
 	<a href="?do=dozmod&amp;section=networkrules&amp;show=edit" class="btn btn-success">
@@ -42,35 +50,3 @@
 	</a>
 </div>
 {{/hasEditPermissions}}
-
-<!-- Modals -->
-<form method="post" action="?do=dozmod">
-	<input type="hidden" name="token" value="{{token}}">
-	<input type="hidden" name="section" value="networkrules">
-	<div class ="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					<h4 class="modal-title" id="myModalLabel">{{lang_delete}}</h4>
-				</div>
-				<div class="modal-body">
-					<p>{{lang_ruleDeleteConfirm}}</p>
-				</div>
-				<div class="modal-footer">
-					<input type="hidden" id="delete-rule-id" name="ruleid" value="">
-					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" name="action" value="delete" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button>
-				</div>
-			</div>
-		</div>
-	</div>
-</form>
-
-<script type="text/javascript">
-
-	function deleteRule(ruleid) {
-		$("#delete-rule-id").val(ruleid);
-	}
-
-</script>
\ No newline at end of file
diff --git a/modules-available/dozmod/templates/networkshares.html b/modules-available/dozmod/templates/networkshares.html
index aaafa256..0974cc6a 100644
--- a/modules-available/dozmod/templates/networkshares.html
+++ b/modules-available/dozmod/templates/networkshares.html
@@ -58,9 +58,15 @@
 				</a>
 			</td>
 			<td align="center">
-				<button type="button" class="btn btn-xs btn-danger" data-toggle="modal" data-target="#deleteModal" onclick="deleteShare('{{shareid}}')">
-					<span class="glyphicon glyphicon-trash"></span>
-				</button>
+				<form method="post" action="?do=dozmod">
+					<input type="hidden" name="token" value="{{token}}">
+					<input type="hidden" name="section" value="networkshares">
+					<input type="hidden" name="shareid" value="{{shareid}}">
+					<button type="submit" name="action" value="delete" class="btn btn-xs btn-danger"
+							  data-confirm="#confirm-delete" data-title="{{sharename}}">
+						<span class="glyphicon glyphicon-trash"></span>
+					</button>
+				</form>
 			</td>
 			{{/hasEditPermissions}}
 		</tr>
@@ -76,38 +82,4 @@
 </div>
 {{/hasEditPermissions}}
 
-<!-- Modals -->
-<form method="post" action="?do=dozmod">
-	<input type="hidden" name="token" value="{{token}}">
-	<input type="hidden" name="section" value="networkshares">
-	<div class ="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					<h4 class="modal-title" id="myModalLabel">{{lang_delete}}</h4>
-				</div>
-				<div class="modal-body">
-					<p>{{lang_shareDeleteConfirm}}</p>
-				</div>
-				<div class="modal-footer">
-					<input type="hidden" id="delete-share-id" name="shareid" value="">
-					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" name="action" value="delete" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button>
-				</div>
-			</div>
-		</div>
-	</div>
-</form>
-
-<script type="text/javascript">
-
-	function deleteShare(shareid) {
-		$("#delete-share-id").val(shareid);
-	}
-
-	document.addEventListener("DOMContentLoaded", function () {
-
-	})
-
-</script>
\ No newline at end of file
+<div class="hidden" id="confirm-delete">{{lang_shareDeleteConfirm}}</div>
diff --git a/modules-available/dozmod/templates/runscripts-list.html b/modules-available/dozmod/templates/runscripts-list.html
index 4d519afb..21cb9835 100644
--- a/modules-available/dozmod/templates/runscripts-list.html
+++ b/modules-available/dozmod/templates/runscripts-list.html
@@ -4,52 +4,58 @@
 	{{lang_scriptsIntro}}
 </p>
 
-<table class="table">
-	<thead>
-	<tr>
-		<th>{{lang_name}}</th>
-		<th class="slx-smallcol">{{lang_scriptExtensionHead}}</th>
-		<th class="slx-smallcol">{{lang_scriptVisibilityHead}}</th>
-		<th class="slx-smallcol">{{lang_scriptPassCredentialsHead}}</th>
-		<th class="slx-smallcol">{{lang_scriptIsGlobalHead}}</th>
-		{{#hasEditPermission}}
-			<th class="slx-smallcol">{{lang_edit}}</th>
-			<th class="slx-smallcol">{{lang_delete}}</th>
-		{{/hasEditPermission}}
-	</tr>
-	</thead>
-	<tbody>
-	{{#list}}
+<form method="post" action="?do=dozmod&amp;section=runscripts">
+	<input type="hidden" name="token" value="{{token}}">
+	<input type="hidden" name="action" value="delete">
+	<table class="table">
+		<thead>
 		<tr>
-			<td>{{scriptname}}</td>
-			<td>.{{extension}}</td>
-			<td><span class="glyphicon glyphicon-{{visibility}}"></span></td>
-			<td>
-				{{#passcreds}}
-					<span class="glyphicon glyphicon-ok"></span>
-				{{/passcreds}}
-			</td>
-			<td>
-				{{#isglobal}}
-					<span class="glyphicon glyphicon-ok"></span>
-				{{/isglobal}}
-			</td>
+			<th>{{lang_name}}</th>
+			<th class="slx-smallcol">{{lang_scriptExtensionHead}}</th>
+			<th class="slx-smallcol">{{lang_scriptVisibilityHead}}</th>
+			<th class="slx-smallcol">{{lang_scriptPassCredentialsHead}}</th>
+			<th class="slx-smallcol">{{lang_scriptIsGlobalHead}}</th>
 			{{#hasEditPermission}}
-				<td class="text-center">
-					<a class="btn btn-xs btn-primary" href="?do=dozmod&amp;section=runscripts&amp;show=edit&amp;runscriptid={{runscriptid}}">
-						<span class="glyphicon glyphicon-edit"></span>
-					</a>
-				</td>
-				<td class="text-center">
-					<button type="button" class="btn btn-xs btn-danger" data-toggle="modal" data-target="#deleteModal" onclick="setDeleteId('{{runscriptid}}')">
-						<span class="glyphicon glyphicon-trash"></span>
-					</button>
-				</td>
+				<th class="slx-smallcol">{{lang_edit}}</th>
+				<th class="slx-smallcol">{{lang_delete}}</th>
 			{{/hasEditPermission}}
 		</tr>
-	{{/list}}
-	</tbody>
-</table>
+		</thead>
+		<tbody>
+		{{#list}}
+			<tr>
+				<td>{{scriptname}}</td>
+				<td>.{{extension}}</td>
+				<td><span class="glyphicon glyphicon-{{visibility}}"></span></td>
+				<td>
+					{{#passcreds}}
+						<span class="glyphicon glyphicon-ok"></span>
+					{{/passcreds}}
+				</td>
+				<td>
+					{{#isglobal}}
+						<span class="glyphicon glyphicon-ok"></span>
+					{{/isglobal}}
+				</td>
+				{{#hasEditPermission}}
+					<td class="text-center">
+						<a class="btn btn-xs btn-primary" href="?do=dozmod&amp;section=runscripts&amp;show=edit&amp;runscriptid={{runscriptid}}">
+							<span class="glyphicon glyphicon-edit"></span>
+						</a>
+					</td>
+					<td class="text-center">
+						<button type="submit" name="runscriptid" value="{{runscriptid}}" class="btn btn-xs btn-danger"
+								  data-confirm="#confirm-delete" data-title="{{scriptname}}">
+							<span class="glyphicon glyphicon-trash"></span>
+						</button>
+					</td>
+				{{/hasEditPermission}}
+			</tr>
+		{{/list}}
+		</tbody>
+	</table>
+</form>
+<div class="hidden" id="confirm-delete">{{lang_runScriptDeleteConfirmation}}</div>
 
 {{#hasEditPermission}}
 	<div class="text-right">
@@ -59,31 +65,3 @@
 		</a>
 	</div>
 {{/hasEditPermission}}
-
-<form method="post" action="?do=dozmod&amp;section=runscripts">
-	<input type="hidden" name="token" value="{{token}}">
-	<input type="hidden" id="deleteAction" name="runscriptid" value="">
-	<div class ="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					<h4 class="modal-title" id="myModalLabel">{{lang_delete}}</h4>
-				</div>
-				<div class="modal-body">
-					<p>{{lang_runScriptDeleteConfirmation}}</p>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" name="action" value="delete" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button>
-				</div>
-			</div>
-		</div>
-	</div>
-</form>
-
-<script type="text/javascript">
-	function setDeleteId(id) {
-		$('#deleteAction').val(id)
-	}
-</script>