diff options
| author | Simon Rettberg | 2019-02-12 14:55:49 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-12 14:55:49 +0100 |
| commit | ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9 (patch) | |
| tree | 0134ad4e33aa259250fb46a82e7da44b091db88e /modules-available/locationinfo/templates/frontend-summary.html | |
| parent | [serversetup*] PXELinux and iPXE side-by-side (diff) | |
| parent | [inc/Dictionary] Teh evil unvalidated redirects must die! (diff) | |
| download | slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.tar.gz slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.tar.xz slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.zip | |
Merge branch 'master' into ipxeipxe
Diffstat (limited to 'modules-available/locationinfo/templates/frontend-summary.html')
| -rw-r--r-- | modules-available/locationinfo/templates/frontend-summary.html | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/modules-available/locationinfo/templates/frontend-summary.html b/modules-available/locationinfo/templates/frontend-summary.html index 95299e63..ae089da5 100644 --- a/modules-available/locationinfo/templates/frontend-summary.html +++ b/modules-available/locationinfo/templates/frontend-summary.html @@ -63,7 +63,7 @@ } .pc-idle, .pc-occupied, .pc-offline, .pc-broken, .pc-standby { - padding: 2px 1px; + padding: 2px 0px; text-align: center; font-size: 90%; font-weight: 800; @@ -604,7 +604,11 @@ // TODO: Add seconds again with a better update rate. var time_split = time.split(":"); if (time != "") { - $("#div_Time_" + id).text(time_split[0] + ":" + time_split[1]); + if (time_split[0] > 0) { + $("#div_Time_" + id).text(t("for") + " " + time_split[0] + "h " + time_split[1]+"min"); + } else { + $("#div_Time_" + id).text(t("for") + " " + time_split[1]+"min"); + } } else { $("#div_Time_" + id).text(time); } @@ -759,6 +763,7 @@ <span data-tag="room">{{lang_room}}</span> <span data-tag="closed">{{lang_closed}}</span> <span data-tag="free">{{lang_free}}</span> + <span data-tag="for">{{lang_for}}</span> <span data-tag="shortSun">{{lang_shortSun}}</span> <span data-tag="shortMon">{{lang_shortMon}}</span> <span data-tag="shortTue">{{lang_shortTue}}</span> |