Merge branch 'master' of git.openslx.org:openslx-ng/slx-admin

# Conflicts:
#	modules-available/dozmod/page.inc.php

2 files changed, 111 insertions, 0 deletions

diff --git a/modules-available/dozmod/templates/ldapfilter-add.html b/modules-available/dozmod/templates/ldapfilter-add.html
new file mode 100644
index 00000000..c74fbcda
--- /dev/null
+++ b/modules-available/dozmod/templates/ldapfilter-add.html
@@ -0,0 +1,39 @@
+<h1>{{lang_ldapfilters}}</h1>
+
+<div class="panel panel-default">
+	<div class="panel-heading">
+		{{lang_ldapFilterEdit}}
+	</div>
+	<div class="panel-body">
+
+		<p>{{lang_ldapFilterDescription}}</p>
+		<form method="post" action="?do=dozmod&section=ldapfilters">
+			<input type="hidden" name="token" value="{{token}}">
+			<input type="hidden" id="filterid" name="filterid" value="{{filterid}}">
+
+			<div class="input-group">
+				<label class="input-group-addon" for="filtername">{{lang_ldapFilterName}}</label>
+				<input type="text" name="filtername" id ="filtername" class="form-control" placeholder="" value="{{filtername}}" required>
+			</div>
+			<div class="input-group">
+				<label class="input-group-addon" for="attribute">{{lang_ldapFilterAttribute}}</label>
+				<input type="text" name="attribute" id ="attribute" class="form-control" placeholder="" value="{{attribute}}" required>
+			</div>
+			<div class="input-group">
+				<label class="input-group-addon" for="value">{{lang_ldapFilterValue}}</label>
+				<input type="text" name="value" id ="value" class="form-control" placeholder="" value="{{value}}" required>
+			</div>
+
+			<div class="text-right" style="margin-top: 20px;">
+				<a type="button" class="btn btn-default" href="?do=dozmod&section=ldapfilters">{{lang_cancel}}</a>
+				<button class="btn btn-primary" type="submit" name="action" value="saveFilter">
+					<span class="glyphicon glyphicon-floppy-disk"></span>
+					{{lang_save}}
+				</button>
+			</div>
+		</form>
+	</div>
+</div>
+
+<script type="text/javascript">
+</script>
diff --git a/modules-available/dozmod/templates/ldapfilters.html b/modules-available/dozmod/templates/ldapfilters.html
new file mode 100644
index 00000000..49ecc222
--- /dev/null
+++ b/modules-available/dozmod/templates/ldapfilters.html
@@ -0,0 +1,72 @@
+<h1>{{lang_ldapfilters}}</h1>
+<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>{{attribute}}</td>
+		<td>{{value}}</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>
+
+{{#hasEditPermission}}
+<div class="text-right">
+	<a class="btn btn-sm btn-success" href="?do=dozmod&section=ldapfilters&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>