[usb-lock-off] Design changes to fit the design_guidelines. TODO: lang_discardChanges should be a global Variable

2 files changed, 13 insertions, 9 deletions

diff --git a/modules-available/usblockoff/templates/usb-choose-config.html b/modules-available/usblockoff/templates/usb-choose-config.html
index f2f5bb10..06dcf92f 100644
--- a/modules-available/usblockoff/templates/usb-choose-config.html
+++ b/modules-available/usblockoff/templates/usb-choose-config.html
@@ -61,7 +61,7 @@
 								<!--	<button class="btn btn-danger confirm-delete" type="submit" onclick="deleteConfig();">{{lang_delete}}</button>-->
 								<button class="btn btn-danger" value="" id="deleteConfigButton" title="{{lang_delete}}"
 										  onclick="deleteConfig(event);">
-									<span class="glyphicon glyphicon-trash"> {{lang_delete}}</span>
+									<span class="glyphicon glyphicon-trash"></span> {{lang_delete}}
 								</button>
 							</div>
 						</div>
@@ -105,7 +105,7 @@
 			closable: false, // <-- Default value is false
 			draggable: false, // <-- Default value is false
 			btnCancelLabel: '{{lang_cancel}}', // <-- Default value is 'Cancel',
-			btnOKLabel: '{{lang_delete}}', // <-- Default value is 'OK',
+			btnOKLabel: '<span class="glyphicon glyphicon-trash"></span> {{lang_delete}}', // <-- Default value is 'OK',
 			btnOKClass: 'btn-danger', // <-- If you didn't specify it, dialog type will be used,
 			callback: function (result) {
 				if (result) {
diff --git a/modules-available/usblockoff/templates/usb-configuration.html b/modules-available/usblockoff/templates/usb-configuration.html
index 7032e249..fdfb0793 100644
--- a/modules-available/usblockoff/templates/usb-configuration.html
+++ b/modules-available/usblockoff/templates/usb-configuration.html
@@ -38,24 +38,28 @@
 
 			<div class="pull-right">
 				<a class="btn btn-default" title="{{lang_howToRuleLang}}"
-					href="https://dkopecek.github.io/usbguard/documentation/rule-language.html"
-					style="float: right;" target="_blank">
+					href="https://usbguard.github.io/documentation/rule-language.html"
+					style="margin-right: 3px;" target="_blank">
 					<span class="glyphicon glyphicon-question-sign"></span>
 				</a>
-				<a class="btn btn-success" style="margin-right: 3px;" onclick="loadAddDeviceModal();">
+				<a class="btn btn-success" style="float: right;" onclick="loadAddDeviceModal();">
 					<span style="margin-right: 5px;" class="glyphicon glyphicon-plus"></span>
 					<span>{{lang_devices}}</span>
 				</a>
 			</div>
-
 		</div>
 	</div>
 </div>
 
 <div class="pull-right">
-	<button type="submit" id="configFormButton" class="btn btn-primary">{{lang_save}}</button>
 	<!-- TODO: Reset Button should't call loadConfig instead do not reset the select input... but how? -->
-	<button class="btn btn-default" type="reset" onclick="loadConfig($('#select_config'));">{{lang_reset}}</button>
+	<button class="btn btn-warning" type="reset" onclick="loadConfig($('#select_config'));">
+		<!-- TODO: Add discardChanges to the main-> globalVariables -->
+		<span class="glyphicon glyphicon-refresh"></span> {{lang_discardChanges}}
+	</button>
+	<button type="submit" id="configFormButton" class="btn btn-primary">
+		<span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}
+	</button>
 </div>
 
 
@@ -65,11 +69,11 @@
 			<div class="modal-header" id="myModalHeader"></div>
 			<div class="modal-body" id="myModalBody"></div>
 			<div class="modal-footer">
+				<a class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</a>
 				<button id="myModalAddButton" class="btn btn-success" type="button" onclick="addDevices();">
 					<span style="margin-right: 5px;" class="glyphicon glyphicon-plus"></span>
 					<span id="myModalAddButtonText"></span>
 				</button>
-				<a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a>
 			</div>
 		</div>
 	</div>