diff options
| author | Christian Klinger | 2016-06-24 15:24:23 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-06-24 15:24:23 +0200 |
| commit | d4cab9a9644975f58f299ad8c53674f88e0fff8c (patch) | |
| tree | cb3f1cadacfaffdb33caecfe7b1d587438c843b7 /modules-available | |
| parent | added summernote as an optional wysiwyg-editor. (diff) | |
| parent | [locations] Quick "fix" for buttons overlapping text in table (diff) | |
| download | slx-admin-d4cab9a9644975f58f299ad8c53674f88e0fff8c.tar.gz slx-admin-d4cab9a9644975f58f299ad8c53674f88e0fff8c.tar.xz slx-admin-d4cab9a9644975f58f299ad8c53674f88e0fff8c.zip | |
Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization
Diffstat (limited to 'modules-available')
| -rw-r--r-- | modules-available/locations/templates/locations.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html index 11142ef8..2971105b 100644 --- a/modules-available/locations/templates/locations.html +++ b/modules-available/locations/templates/locations.html @@ -32,7 +32,7 @@ <a class="btn btn-default btn-xs" href="?do=baseconfig&module=locations&locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span></a> </div> {{#overriddenVars}} - {{lang_overrideCount}}: {{overriddenVars}} + {{lang_overrideCount}}: {{overriddenVars}}   {{/overriddenVars}} {{/havebaseconfig}} </td> @@ -41,7 +41,7 @@ <a class="btn btn-default btn-xs" href="?do=sysconfig&locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span></a> </div> <span class="{{configClass}}"> - {{configName}} + {{configName}}   </span> {{#havesysconfig}} {{/havesysconfig}} |