diff options
| author | Christian Klinger | 2016-08-22 11:24:03 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-08-22 11:24:03 +0200 |
| commit | d3c689c6730ca6749c03ffd01c670f7b191e8355 (patch) | |
| tree | 9e2d7caa1ed3c45b4757621202087a64e5e87cc9 /modules-available/locations | |
| parent | css fix/hack to get roomplanner to work on medium sized screens. (diff) | |
| parent | [dozmod] Expect the client to tell wether it is running in exam mode and comp... (diff) | |
| download | slx-admin-d3c689c6730ca6749c03ffd01c670f7b191e8355.tar.gz slx-admin-d3c689c6730ca6749c03ffd01c670f7b191e8355.tar.xz slx-admin-d3c689c6730ca6749c03ffd01c670f7b191e8355.zip | |
Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization
Diffstat (limited to 'modules-available/locations')
| -rw-r--r-- | modules-available/locations/inc/location.inc.php | 3 | ||||
| -rw-r--r-- | modules-available/locations/templates/locations.html | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/modules-available/locations/inc/location.inc.php b/modules-available/locations/inc/location.inc.php index a018208d..71a621db 100644 --- a/modules-available/locations/inc/location.inc.php +++ b/modules-available/locations/inc/location.inc.php @@ -362,8 +362,7 @@ class Location private static function overlap($net1, $net2) { - return ($net1['startaddr'] >= $net2['startaddr'] && $net1['startaddr'] <= $net2['endaddr']) - || ($net1['endaddr'] >= $net2['startaddr'] && $net1['endaddr'] <= $net2['endaddr']); + return ($net1['startaddr'] <= $net2['endaddr'] && $net1['endaddr'] >= $net2['startaddr']); } } diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html index bb13131e..5fec2e2e 100644 --- a/modules-available/locations/templates/locations.html +++ b/modules-available/locations/templates/locations.html @@ -9,10 +9,10 @@ <th> {{#havestatistics}}{{lang_machineCount}}{{/havestatistics}} </th> - <th class="slx-nowrap"> + <th class="text-nowrap"> {{#havebaseconfig}}{{lang_editConfigVariables}}{{/havebaseconfig}} </th> - <th class="slx-nowrap"> + <th class="text-nowrap"> {{#havesysconfig}}{{lang_sysConfig}}{{/havesysconfig}} </th> </tr> @@ -22,13 +22,13 @@ <div style="display:inline-block;width:{{depth}}em"></div> <a href="#" onclick="slxOpenLocation(this, {{locationid}})">{{locationname}} <b class="caret"></b></a> </td> - <td class="slx-nowrap" align="right"> + <td class="text-nowrap" align="right"> {{#havestatistics}} {{clientCount}} <a class="btn btn-default btn-xs" href="?do=Statistics&show=list&filters=location={{locationid}}"><span class="glyphicon glyphicon-eye-open"></span></a> {{/havestatistics}} </td> - <td class="slx-nowrap"> + <td class="text-nowrap"> {{#havebaseconfig}} <div class="pull-right" style="z-index:-1"> <a class="btn btn-default btn-xs" href="?do=baseconfig&module=locations&locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span></a> @@ -38,7 +38,7 @@ {{/overriddenVars}} {{/havebaseconfig}} </td> - <td class="slx-nowrap"> + <td class="text-nowrap"> {{#havesysconfig}} <div class="pull-right"> <a class="btn btn-default btn-xs" href="?do=sysconfig&locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span></a> @@ -53,7 +53,7 @@ {{#unassignedCount}} <tr> <td>{{lang_unassignedMachines}}</td> - <td class="slx-nowrap" align="right"> + <td class="text-nowrap" align="right"> {{unassignedCount}} <a class="btn btn-default btn-xs" href="?do=Statistics&show=list&filters=location=0"> <span class="glyphicon glyphicon-eye-open"></span> |