summaryrefslogtreecommitdiffstats
path: root/modules-available/locations
diff options
context:
space:
mode:
authorUdo Walter2017-09-25 17:15:36 +0200
committerUdo Walter2017-09-25 17:15:36 +0200
commit3e03e00f9908a84aab344e0da0137152448be0d8 (patch)
tree779067e09484dbae1dacda21289c46c947b8adbe /modules-available/locations
parentMerge branch 'permission-manager' of git.openslx.org:openslx-ng/slx-admin int... (diff)
downloadslx-admin-3e03e00f9908a84aab344e0da0137152448be0d8.tar.gz
slx-admin-3e03e00f9908a84aab344e0da0137152448be0d8.tar.xz
slx-admin-3e03e00f9908a84aab344e0da0137152448be0d8.zip
[locations] small design changes
Diffstat (limited to 'modules-available/locations')
-rw-r--r--modules-available/locations/templates/location-subnets.html8
-rw-r--r--modules-available/locations/templates/locations.html6
-rw-r--r--modules-available/locations/templates/subnets.html2
3 files changed, 6 insertions, 10 deletions
diff --git a/modules-available/locations/templates/location-subnets.html b/modules-available/locations/templates/location-subnets.html
index 0722e54b..0ea096b6 100644
--- a/modules-available/locations/templates/location-subnets.html
+++ b/modules-available/locations/templates/location-subnets.html
@@ -54,7 +54,7 @@
<tr id="loc-sub-{{locationid}}">
<td colspan="4">
<button class="btn btn-success btn-sm pull-right" type="button" onclick="slxAddSubnetRow(this, {{locationid}})" title="{{lang_addNewSubnet}}">
- <span class="glyphicon glyphicon-plus-sign"></span> {{lang_subnet}}
+ <span class="glyphicon glyphicon-plus"></span> {{lang_subnet}}
</button>
</td>
</tr>
@@ -91,12 +91,8 @@
</div>
<div class ="modal fade" id="deleteLocationModal{{locationid}}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
- <div class="modal-dialog" role="document">
+ <div class="modal-dialog" style="width: 400px" 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="myModalLabel2">{{lang_deleteLocation}}</h4>
- </div>
<div class="modal-body">
{{lang_areYouSureNoUndo}}
<div class="checkbox">
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html
index 15dcdd42..451d8add 100644
--- a/modules-available/locations/templates/locations.html
+++ b/modules-available/locations/templates/locations.html
@@ -91,7 +91,7 @@
<span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}
</button>
<button class="btn btn-success" type="button" onclick="slxAddLocationRow()">
- <span class="glyphicon glyphicon-plus-sign"></span> {{lang_location}}
+ <span class="glyphicon glyphicon-plus"></span> {{lang_location}}
</button>
</td>
@@ -125,7 +125,7 @@ function slxAddLocationRow() {
<option value="0">{{lang_noParent}}</option>\
{{#list}}<option value="{{locationid}}">{{locationpad}} {{locationname}}</option>{{/list}}\
</select></td>\
- <td class="text-center"><button class="btn btn-default btn-sm" type="button" onclick="removeNewLocationRow(' + slxAddCounter + ')"><span class="glyphicon glyphicon-remove-sign"></span></button></td>\
+ <td class="text-center"><button class="btn btn-default btn-sm" type="button" onclick="removeNewLocationRow(' + slxAddCounter + ')"><span class="glyphicon glyphicon-remove"></span></button></td>\
</tr>');
slxAddCounter++;
newRowCounter++;
@@ -171,7 +171,7 @@ function slxAddSubnetRow(e, lid) {
<td>#</td>\
<td><input class="form-control cidrstart" type="text" name="newstartaddr[' + slxAddCounter + ']" pattern="\\d{1,3}\.\\d{1,3}\.\\d{1,3}\.\\d{1,3}"></td>\
<td><input class="form-control cidrend" type="text" name="newendaddr[' + slxAddCounter + ']" pattern="\\d{1,3}\.\\d{1,3}\.\\d{1,3}\.\\d{1,3}"></td>\
- <td class="text-center"><button class="btn btn-default btn-sm" type="button" onclick="removeNewSubnetRow(' + slxAddCounter + ')"><span class="glyphicon glyphicon-remove-sign"></span></button></td>\
+ <td class="text-center"><button class="btn btn-default btn-sm" type="button" onclick="removeNewSubnetRow(' + slxAddCounter + ')"><span class="glyphicon glyphicon-remove"></span></button></td>\
</tr>');
slxAddCounter++;
slxAttachCidr();
diff --git a/modules-available/locations/templates/subnets.html b/modules-available/locations/templates/subnets.html
index 1da5a942..4c96cc4d 100644
--- a/modules-available/locations/templates/subnets.html
+++ b/modules-available/locations/templates/subnets.html
@@ -29,7 +29,7 @@
</tr>
{{/list}}
</table>
- <div class="text-right">
+ <div class="text-right" style="margin-bottom: 20px">
<button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
</div>
</form>