diff options
Diffstat (limited to 'modules-available/locationinfo/templates')
8 files changed, 356 insertions, 210 deletions
diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html index 006d2661..4dee8ef7 100755 --- a/modules-available/locationinfo/templates/frontend-default.html +++ b/modules-available/locationinfo/templates/frontend-default.html @@ -327,6 +327,7 @@ optional: .wc-scrollable-grid { transition: height 500ms; background: rgba(0, 0, 0, 0); + overflow-y: hidden !important; } .wc-grid-timeslot-header, @@ -618,6 +619,15 @@ optional: generateProgressBar(); } + // Manually initialize mode 2, as initRoomLayout isn't called for this mode + if (room.config.mode === 2) { + var date = MyDate(); + var now = date.getTime(); + queryCalendars(); + queryRooms(); + lastCalendarUpdate = now; + lastRoomUpdate = now; + } mainUpdateLoop(); setInterval(mainUpdateLoop, 10000); setInterval(updateHeaders, globalConfig.eco ? 10000 : 1000); @@ -735,7 +745,7 @@ optional: timeslotHeight: 30, daysToShow: daysToShow, height: function () { - if (room.config.mode === 1 && room.config.vertical && (!room.timetable || !room.timetable.length)) return 20; + // if (room.config.mode === 1 && room.config.vertical && (!room.timetable || !room.timetable.length)) return 20; var height = $(window).height(); if (roomIds.length === 4) { height /= 2; @@ -770,7 +780,9 @@ optional: timeSeparator: " - ", startOnFirstDayOfWeek: false, displayFreeBusys: true, - defaultFreeBusy: {free: false} + defaultFreeBusy: {free: false}, + allowCalEventOverlap: true, + overlapEventsSeparate: true }); } @@ -918,7 +930,7 @@ optional: const SEVEN_DAYS = 7 * 86400 * 1000; /** - * applays new calendar data to the calendar plugin and also saves it to the room object + * applies new calendar data to the calendar plugin and also saves it to the room object * @param {Array} json Calendar data * @param room Room Object */ @@ -945,9 +957,18 @@ optional: console.log('Notice: Calendar has no current events for ' + room.name); } try { + for (var i = json.length - 1; i > 0; i--) { + // if title, start and end are the same, "merge" two events by removing one of them + if (json[i].title === json[i-1].title && json[i].start === json[i-1].start && json[i].end === json[i-1].end) { + json.splice(i, 1); + } + } room.timetable = json; + for (var property in room.timetable) { + room.timetable[property].start = cleanDate(room.timetable[property].start); + room.timetable[property].end = cleanDate(room.timetable[property].end); + } if (room.config.mode !== 3) { - // TODO: Check if they're the same var cal = room.$.calendar; cal.weekCalendar('option', 'data', {events: json}); cal.weekCalendar("refresh"); @@ -967,6 +988,27 @@ optional: } } + function cleanDate(d) { + if (typeof d === 'string') { + // if is numeric + if (!isNaN(Number(d))) { + return cleanDate(parseInt(d, 10)); + } + + // this is a human readable date + if (d[d.length - 1] !== 'Z') d += 'Z'; + var o = new Date(d); + o.setTime(o.getTime() + (o.getTimezoneOffset() * 60 * 1000)); + return o; + } + + if (typeof d === 'number') { + return new Date(d); + } + + return d; + } + /** * scales calendar, called once on create and on window resize * @param room Room Object @@ -1108,12 +1150,11 @@ optional: * @param room Room */ function SetFreeSeats(room) { - room.$.seatsCounter.text(room.freePcs >= 0 ? room.freePcs : ''); + // if room has no allowed value, set text in the box to - + room.$.seatsCounter.text(room.freePcs >= 0 ? room.freePcs : '-'); room.$.seatsCounter.data('state', JSON.stringify(room.state)); if (room.freePcs > 0 && room.state && room.state.free) { - room.$.seatsBackground.css('background-color', '#250'); - } else if (room.freePcs === -1) { - room.$.seatsBackground.css('background-color', 'red'); + room.$.seatsBackground.css('background-color', '#250'); } else { room.$.seatsBackground.css('background-color', 'red'); } @@ -1140,7 +1181,8 @@ optional: if (!same) newText = t("closed"); } else if (tmp.state === "CalendarEvent") { if (!same) newText = tmp.title; - seats = -1; + // whilst event is running set freePcs to -, hopefully not breaking anything else with this + room.freePcs = "-"; } else if (tmp.state === "Free") { if (!same) newText = t("free"); } else if (tmp.state === "FreeNoEnd") { @@ -1166,11 +1208,10 @@ optional: function ComputeCurrentState(room) { if (!IsOpen(MyDate(), room)) { room.state = {state: "closed", end: GetNextOpening(room), title: "", next: ""}; - return; } - var closing = GetNextClosing(room); + var closing = GetNextClosing(room); var event = getNextEvent(room.timetable); // no event and no closing @@ -1488,8 +1529,14 @@ optional: for (var i = 0; i < update.length; i++) { var $div = $("#pc_" + room.id + "_" + update[i].id); // Pc free - if (update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY") { - freePcs++; + if (room.config.roomplanner === true) { + if ((update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY") && !isNaN(update[i].x) && !isNaN(update[i].y)) { + freePcs++; + } + } else { + if ((update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY")) { + freePcs++; + } } $div.removeClass('BROKEN OFFLINE IDLE OCCUPIED STANDBY'.replace(update[i].pcState, '')).addClass(update[i].pcState); @@ -1585,7 +1632,7 @@ optional: /** * Function for translation - * @param toTranslate key which we wan't to translate + * @param toTranslate key which we want to translate * @returns r translated string */ function t(toTranslate) { diff --git a/modules-available/locationinfo/templates/frontend-summary.html b/modules-available/locationinfo/templates/frontend-summary.html index 4105dd16..ecb41467 100644 --- a/modules-available/locationinfo/templates/frontend-summary.html +++ b/modules-available/locationinfo/templates/frontend-summary.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="de"> +<html lang="{{language}}"> <meta name="viewport" content="width=device-width, initial-scale=1.0" charset="utf-8"> <head> <script type='text/javascript' src='{{dirprefix}}script/jquery.js'></script> @@ -108,6 +108,10 @@ border-radius: 1px; } + #i18n { + display: none; + } + </style> <script type='text/javascript'> @@ -116,6 +120,7 @@ var startdate; var roomidsString = ""; var config = {{{config}}}; + var lastPanelUpdate = 0; $(document).ready(function () { init(); @@ -139,6 +144,7 @@ SetUpDate(time); generateLayout(config.tree); update(); + setInterval(update, 10000); } function SetUpDate(d) { @@ -165,7 +171,7 @@ */ function generateObject(json, myParent, outermost) { var obj; - if (!json.children || json.children.length == 0) { + if (!json.children || json.children.length === 0) { obj = generateChild(myParent, json.locationid, json.locationname, outermost); } else { obj = generateParent(myParent, json.locationid, json.locationname, outermost); @@ -178,59 +184,24 @@ } /** - * Helper function to generate id string used in query functions - * @param list A string, wicht contains ids or not(for now) - * @param id An ID which should be added to the list + * Main Update loop, this loop runs every 10 seconds */ - function addIdToUpdateList(list, id) { - if (list == "") { - list += id; - } else { - list += ("," + id); - } - return list; - } - - - const ROOMUPDATE_MS = 2*60*1000; - const CALUPDATE_MS = 20*60*1000; - var timeout = null; - function update() { - var calendarUpdateIds = ""; - var rommUpdateIds = ""; - var count = 0; - var nextUpdate = 15000; - var property; - // TODO: Only query a few rooms is not possible with the new api stuff ... - for (property in rooms) { - if (rooms[property].lastCalendarUpdate === null || rooms[property].lastCalendarUpdate + CALUPDATE_MS < MyDate().getTime()) { - // TODO: NOT NECESSARY ANYMORE?! - calendarUpdateIds = addIdToUpdateList(calendarUpdateIds, rooms[property].id); - count++; - rooms[property].lastCalendarUpdate = MyDate().getTime(); - } - if (rooms[property].lastRoomUpdate === null || rooms[property].lastRoomUpdate + ROOMUPDATE_MS < MyDate().getTime()) { - // TODO: NOT NECESSARY ANYMORE?! - rommUpdateIds = addIdToUpdateList(rommUpdateIds, rooms[property].id); - count++; - rooms[property].lastRoomUpdate = MyDate().getTime(); - } - // TODO if (count > 7) break; - } - if (calendarUpdateIds !== "") { - queryCalendars(); - nextUpdate = 1000; - } - if (rommUpdateIds !== "") { + var date = MyDate(); + var now = date.getTime(); + if (lastPanelUpdate + (config.panelupdate * 1000) < now) { + // Set Roomupdate Interval has passed, update. queryRooms(); - nextUpdate = 1000; - } - if (nextUpdate !== 1000) { + queryCalendars(); + lastPanelUpdate = now; + for (var property in rooms) { + rooms[property].lastCalendarUpdate = now; + rooms[property].lastRoomUpdate = now; + } + } else { + // Set Roomupdate Interval has NOT passed, check if panel was changed since last call and reload if true. queryPanelChange(); } - clearTimeout(timeout); - setTimeout(update, nextUpdate); } function cleanDate(d) { @@ -283,7 +254,6 @@ cache: false, timeout: 30000, success: function (result) { - var l = result.length; if (result[0] == null) { console.log("Error: Backend reported null back for RoomUpdate, this might happend if the room isn't" + "configurated."); @@ -309,17 +279,16 @@ var state = room.getState(); if (state.state == "CalendarEvent") { - updateCourseText(room.id, state.titel); + updateCourseText(room.id, state.title); updateCoursTimer(room.id, GetTimeDiferenceAsString(state.end, MyDate())); } else if (state.state == "Free") { - updateCourseText(room.id, "Frei"); + updateCourseText(room.id, t("free")); updateCoursTimer(room.id, GetTimeDiferenceAsString(state.end, MyDate())); } else if (state.state == "FreeNoEnd") { - updateCourseText(room.id, "Frei"); + updateCourseText(room.id, t("free")); updateCoursTimer(room.id, ""); - } - else if (state.state == "closed") { - updateCourseText(room.id, "Geschlossen"); + } else if (state.state == "closed") { + updateCourseText(room.id, t("closed")); updateCoursTimer(room.id, ""); } } @@ -331,7 +300,7 @@ function updatePcStates(json) { var l = json.length; for (var i = 0; i < l; i++) { - updateRoomUsage(json[i].id, json[i].idle, json[i].occupied, json[i].offline, json[i].broken, json[i].standby) + updateRoomUsage(json[i].id, json[i].idle, json[i].occupied, json[i].offline, json[i].broken, json[i].standby); } } @@ -428,109 +397,86 @@ /** * computes state of a room, states are: - * closed, FreeNoEnd, Free, ClaendarEvent. - * @param Room Object + * closed, FreeNoEnd, Free, CalendarEvent. + * @param room Object */ function ComputeCurrentState(room) { - if (room.lastRoomUpdate === null) { - room.state = {state: 'unknown'}; + if (!IsOpen(MyDate(), room)) { + room.state = {state: "closed", end: GetNextOpening(room), title: "", next: ""}; return; } - if (!IsOpenNow(room)) { - room.state = {state: "closed", end: GetNextOpening(room), titel: "", next: ""}; - return; - } - var closing = GetNextClosing(room); + console.log("Timetable", room.id, room.timetable); + var closing = GetNextClosing(room); var event = getNextEvent(room.timetable); + + console.log("Event", room.id, event); + // no event and no closing - if (closing == null && event == null) { - room.state = {state: "FreeNoEnd", end: "", titel: "", next: ""}; + if (!closing && !event) { + room.state = {state: "FreeNoEnd", end: "", title: "", next: "", free: true}; return; } // no event so closing is next - if (event == null) { - room.state = {state: "Free", end: closing, titel: "", next: "closing"}; + if (!event) { + room.state = {state: "Free", end: closing, title: "", next: "closing", free: true}; return; } // event is at the moment - if ((closing == null || event.start.getTime() < closing.getTime()) && event.start.getTime() < new MyDate()) { - room.state = {state: "CalendarEvent", end: event.end, titel: event.title, next: ""}; + if ((!closing || event.start.getTime() < closing.getTime()) && event.start.getTime() < MyDate()) { + room.state = { + state: "CalendarEvent", + end: event.end, + title: event.title, + next: "" + }; + console.log("CalendarEvent", room.id, room.state); return; } // no closing so event is next - if (closing == null) { - room.state = {state: "Free", end: event.start, titel: "", next: "event"}; + if (!closing) { + room.state = {state: "Free", end: event.start, title: "", next: "event", free: true}; return; } // event sooner then closing if (event.start.getTime() < closing) { - room.state = {state: "Free", end: event.start, titel: "", next: "event"}; - } else if (event.start.getTime() > closing) { - room.state = {state: "Free", end: closing, titel: "", next: "closing"}; - } - } - - /** - * checks if a room is open - * @param room Room object - * @returns bool for open or not - */ - function IsOpenNow(room) { - var now = new MyDate(); - if (room.openingTimes == null) { - - // changes from falls needs testing - return true; + room.state = {state: "Free", end: event.start, title: "", next: "event", free: true}; + } else { + room.state = {state: "Free", end: closing, title: "", next: "closing", free: true}; } - var tmp = room.openingTimes[now.getDay()]; - if (tmp == null) { - return false; - } - for (var i = 0; i < tmp.length; i++) { - var openDate = new MyDate(); - openDate.setHours(tmp[i].HourOpen); - openDate.setMinutes(tmp[i].MinutesOpen); - var closeDate = new MyDate(); - closeDate.setHours(tmp[i].HourClose); - closeDate.setMinutes(tmp[i].MinutesClose); - if (openDate < now && closeDate > now) { - return true; - } - } - return false; } /** * returns next event from a given json of events - * @param json Json which contains the calendar data. - * @returns event next Carlendar Event + * @param calEvents Json which contains the calendar data. + * @returns event next Calendar Event */ - function getNextEvent(json) { - if (json == null) { - return; - } - var event; - var now = new MyDate(); - for (var i = 0; i < json.length; i++) { + function getNextEvent(calEvents) { + if (!calEvents) return null; + if (calEvents.constructor !== Array) { + console.log('getNextEvent called with something not array: ' + typeof(calEvents)); + return null; + } + var event = null; + var now = MyDate(); + for (var i = 0; i < calEvents.length; i++) { //event is now active - if (json[i].start.getTime() < now.getTime() && json[i].end.getTime() > now.getTime()) { - return json[i]; + if (calEvents[i].start.getTime() < now.getTime() && calEvents[i].end.getTime() > now.getTime()) { + return calEvents[i]; } //first element to consider - if (event == null) { - if (json[i].start.getTime() > now.getTime()) { - event = json[i]; + if (!event) { + if (calEvents[i].start.getTime() > now.getTime()) { + event = calEvents[i]; } - } - if (json[i].start.getTime() > now.getTime() && event.start.getTime() > json[i].start.getTime()) { - event = json[i]; + } else if (calEvents[i].start.getTime() > now.getTime() && event.start.getTime() > calEvents[i].start.getTime()) { + event = calEvents[i]; } } return event; @@ -791,9 +737,43 @@ }) } + /** + * Function for translation + * @param toTranslate key which we want to translate + * @returns r translated string + */ + function t(toTranslate) { + if (tCache[toTranslate]) + return tCache[toTranslate]; + var r = $('#i18n').find('[data-tag="' + toTranslate + '"]'); + return tCache[toTranslate] = (r.length === 0 ? toTranslate : r.text()); + } + var tCache = {}; + </script> </head> <body> <div id="main"></div> + +<div id="i18n"> + <span data-tag="room">{{lang_room}}</span> + <span data-tag="closed">{{lang_closed}}</span> + <span data-tag="free">{{lang_free}}</span> + <span data-tag="shortSun">{{lang_shortSun}}</span> + <span data-tag="shortMon">{{lang_shortMon}}</span> + <span data-tag="shortTue">{{lang_shortTue}}</span> + <span data-tag="shortWed">{{lang_shortWed}}</span> + <span data-tag="shortThu">{{lang_shortThu}}</span> + <span data-tag="shortFri">{{lang_shortFri}}</span> + <span data-tag="shortSat">{{lang_shortSat}}</span> + <span data-tag="longSun">{{lang_longSun}}</span> + <span data-tag="longMon">{{lang_longMon}}</span> + <span data-tag="longTue">{{lang_longTue}}</span> + <span data-tag="longWed">{{lang_longWed}}</span> + <span data-tag="longThu">{{lang_longThu}}</span> + <span data-tag="longFri">{{lang_longFri}}</span> + <span data-tag="longSat">{{lang_longSat}}</span> + <span data-tag="to">{{lang_to}}</span> +</div> </body> </html> diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html index ba493579..116c2e11 100644 --- a/modules-available/locationinfo/templates/page-config-panel-default.html +++ b/modules-available/locationinfo/templates/page-config-panel-default.html @@ -107,6 +107,22 @@ </div> </div> </div> + + <div class="list-group-item"> + <div class="row"> + <div class="col-sm-3"> + <label for="input-roomplanner">{{lang_useRoomplanner}}</label> + </div> + <div class="col-sm-7"> + <input id="input-roomplanner" type="checkbox" name="roomplanner" {{roomplanner_checked}}> + </div> + <div class="col-sm-2"> + <p class="btn btn-static helptext" title="{{lang_roomplannerTooltip}}"> + <span class="glyphicon glyphicon-question-sign"></span> + </p> + </div> + </div> + </div> </div> </div> </div> @@ -293,7 +309,7 @@ </ul> <div class="dropdown pull-right"> - <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown"> + <button id="addLocDdBtn" type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown"> <span class="glyphicon glyphicon-plus"></span> </button> <ul class="dropdown-menu" id="location-list"> @@ -309,8 +325,10 @@ </div> </div> - <a href="?do=locationinfo&show=panels" class="btn btn-default">{{lang_cancel}}</a> - <button type="submit" class="btn btn-primary">{{lang_save}}</button> + <div class="text-right"> + <a href="?do=locationinfo&show=panels" class="btn btn-default">{{lang_cancel}}</a> + <button type="submit" class="btn btn-primary">{{lang_save}}</button> + </div> </form> <div class="modal fade" id="no-locations-message" tabindex="-1" role="dialog"> @@ -336,6 +354,7 @@ document.addEventListener("DOMContentLoaded", function () { var $selLocs = $('#selected-locations'); var $locList = $('#location-list'); var $locInput = $('#locationids'); + var $addLocDbBtn = $('#addLocDdBtn'); // Initialize fancy tooltips $('p.helptext').tooltip(); @@ -372,6 +391,7 @@ document.addEventListener("DOMContentLoaded", function () { // Adding/removing locations $locList.find('a').click(function(ev) { ev.preventDefault(); + ev.stopPropagation(); var $this = $(this); var name = $this.find('.name').text(); var id = $this.data('lid'); @@ -388,13 +408,24 @@ document.addEventListener("DOMContentLoaded", function () { function addLocation(id, name) { $selLocs.find('li[data-lid="' + id + '"]').remove(); - var delButton = $('<button class="btn btn-danger btn-xs" type="button">').append($('<span class="glyphicon glyphicon-remove">')).click(delParent); - $selLocs.append($('<li>').attr('data-lid', id).text(name).prepend(delButton)); + var delButton = $('<button style="margin-right: 5px;" class="btn btn-danger btn-xs" type="button">').append($('<span class="glyphicon glyphicon-remove">')).click(delParent); + $selLocs.append($('<li style="margin-top: 5px;">').attr('data-lid', id).text(name).prepend(delButton)); + + if ($selLocs.find('li').length >= 4) { + $addLocDbBtn.prop("disabled",true); + var $addLocBtnParent = $addLocDbBtn.parent(); + if ($addLocBtnParent.hasClass('open')) { + $addLocBtnParent.removeClass('open'); + } + } } function delParent() { $(this).parent().remove(); serializeLocs(); + if ($selLocs.find('li').length < 4) { + $addLocDbBtn.prop("disabled",false); + } } function serializeLocs() { diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html index 7f145916..a77719b8 100644 --- a/modules-available/locationinfo/templates/page-config-panel-summary.html +++ b/modules-available/locationinfo/templates/page-config-panel-summary.html @@ -70,6 +70,22 @@ </div> </div> </div> + + <div class="list-group-item"> + <div class="row"> + <div class="col-sm-3"> + <label for="input-roomplanner">{{lang_useRoomplanner}}</label> + </div> + <div class="col-sm-7"> + <input id="input-roomplanner" type="checkbox" name="roomplanner" {{roomplanner_checked}}> + </div> + <div class="col-sm-2"> + <p class="btn btn-static helptext" title="{{lang_roomplannerTooltip}}"> + <span class="glyphicon glyphicon-question-sign"></span> + </p> + </div> + </div> + </div> <!-- <div class="list-group-item"> <div class="row"> @@ -91,6 +107,34 @@ </div> </div> </div> + + <div class="col-md-6"> + <div class="panel panel-default"> + <div class="panel-heading">{{lang_updateRates}}</div> + <div class="panel-body"> + <div class="list-group"> + + <div class="list-group-item"> + <div class="row"> + <div class="col-sm-3"> + <label for="form-panelupdate">{{lang_panel}}</label> + </div> + <div class="col-sm-7"> + <input class="form-control" name="panelupdate" type="number" min="15" id="form-panelupdate" + max="86400" value="{{panelupdate}}" required> + </div> + <div class="col-sm-2"> + <p class="btn btn-static helptext" title="{{lang_panelupdateTooltip}}"> + <span class="glyphicon glyphicon-question-sign"></span> + </p> + </div> + </div> + </div> + + </div> + </div> + </div> + </div> </div> <div class="modify-inputs"> @@ -101,7 +145,7 @@ <div class="panel-heading">{{lang_locations}}</div> <div class="panel-body"> <input type="hidden" name="locationids" value="{{locationids}}" id="locationids"> - <p>{{lang_fourLocsHint}}</p> + <p>{{lang_locsHint}}</p> <ul id="selected-locations" class="list-unstyled"> </ul> @@ -122,8 +166,10 @@ </div> </div> - <a href="?do=locationinfo&show=panels" class="btn btn-default">{{lang_cancel}}</a> - <button type="submit" class="btn btn-primary">{{lang_save}}</button> + <div class="text-right"> + <a href="?do=locationinfo&show=panels" class="btn btn-default">{{lang_cancel}}</a> + <button type="submit" class="btn btn-primary">{{lang_save}}</button> + </div> </form> <div class="modal fade" id="no-locations-message" tabindex="-1" role="dialog"> @@ -171,6 +217,7 @@ document.addEventListener("DOMContentLoaded", function () { // Adding/removing locations $locList.find('a').click(function(ev) { ev.preventDefault(); + ev.stopPropagation(); var $this = $(this); var name = $this.find('.name').text(); var id = $this.data('lid'); @@ -187,8 +234,8 @@ document.addEventListener("DOMContentLoaded", function () { function addLocation(id, name) { $selLocs.find('li[data-lid="' + id + '"]').remove(); - var delButton = $('<button class="btn btn-danger btn-xs" type="button">').append($('<span class="glyphicon glyphicon-remove">')).click(delParent); - $selLocs.append($('<li>').attr('data-lid', id).text(name).prepend(delButton)); + var delButton = $('<button style="margin-right: 5px;" class="btn btn-danger btn-xs" type="button">').append($('<span class="glyphicon glyphicon-remove">')).click(delParent); + $selLocs.append($('<li style="margin-top: 5px;">').attr('data-lid', id).text(name).prepend(delButton)); } function delParent() { diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html index efcafb77..1187c19f 100644 --- a/modules-available/locationinfo/templates/page-config-panel-url.html +++ b/modules-available/locationinfo/templates/page-config-panel-url.html @@ -87,9 +87,10 @@ </div> </div> </div> - - <a href="?do=locationinfo&show=panels" class="btn btn-default">{{lang_cancel}}</a> - <button type="submit" class="btn btn-primary">{{lang_save}}</button> + <div class="text-right"> + <a href="?do=locationinfo&show=panels" class="btn btn-default">{{lang_cancel}}</a> + <button type="submit" class="btn btn-primary">{{lang_save}}</button> + </div> </form> <script type="text/javascript"><!-- diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html index 67da2c2e..c79cdfe8 100644 --- a/modules-available/locationinfo/templates/page-locations.html +++ b/modules-available/locationinfo/templates/page-locations.html @@ -8,7 +8,7 @@ <th>{{lang_locationName}}</th> <th>{{lang_backend}}</th> <th>{{lang_lastCalendarUpdate}}</th> - <th>{{lang_openingtimes}}</th> + <th class="text-center slx-smallcol">{{lang_openingtimes}}</th> </tr> </thead> @@ -29,12 +29,12 @@ <td {{#backendMissing}}class="text-danger"{{/backendMissing}}> {{backend}} </td> - <td> + <td class="text-center"> {{#backend}} {{lastCalendarUpdate}} {{/backend}} </td> - <td> + <td class="text-center"> <span class="glyphicon glyphicon-{{openingGlyph}}"></span> </td> </tr> diff --git a/modules-available/locationinfo/templates/page-panels.html b/modules-available/locationinfo/templates/page-panels.html index 2bccc796..b30e7c87 100644 --- a/modules-available/locationinfo/templates/page-panels.html +++ b/modules-available/locationinfo/templates/page-panels.html @@ -9,16 +9,13 @@ <th>{{lang_panelType}}</th> <th>{{lang_locations}}</th> {{#hasRunmode}} - <th class="slx-smallcol">{{lang_runmodeTHead}}</th> + <th class="text-center slx-smallcol">{{lang_runmodeTHead}}</th> {{/hasRunmode}} - <th class="slx-smallcol">{{lang_edit}}</th> - <th class="slx-smallcol">{{lang_delete}}</th> + <th class="text-center slx-smallcol">{{lang_edit}}</th> + <th class="text-center slx-smallcol">{{lang_delete}}</th> </tr> </thead> <tbody> - <form method="post" action="?do=locationinfo" onsubmit="return confirm('{{lang_areYouSure}}')"> - <input type="hidden" name="token" value="{{token}}"> - <input type="hidden" name="action" value="deletePanel"> {{#panels}} <tr> <td> @@ -33,7 +30,7 @@ {{#locationurl}}</a>{{/locationurl}} </td> {{#hasRunmode}} - <td> + <td class="text-center" style="vertical-align: middle"> <a class="btn btn-default btn-xs {{runmode_disabled}}" href="?do=runmode&module=locationinfo&modeid={{paneluuid}}&redirect=?do=locationinfo"> <span class="glyphicon glyphicon-edit"></span> @@ -41,20 +38,19 @@ {{assignedMachineCount}} </td> {{/hasRunmode}} - <td> + <td class="text-center" style="vertical-align: middle"> <a class="btn btn-default btn-xs {{edit_disabled}}" href="?do=locationinfo&show=edit-panel&uuid={{paneluuid}}"> <span class="glyphicon glyphicon-cog"></span> </a> </td> - <td> - <button type="submit" name="uuid" value="{{paneluuid}}" class="btn btn-danger btn-xs" {{edit_disabled}}> + <td class="text-center" style="vertical-align: middle"> + <button type="button" class="btn btn-xs btn-danger" data-toggle="modal" data-target="#deleteModal" onclick="deletePanel('{{paneluuid}}')" {{edit_disabled}}> <span class="glyphicon glyphicon-trash"></span> </button> </td> </tr> {{/panels}} - </form> </tbody> </table> @@ -71,4 +67,33 @@ <span class="glyphicon glyphicon-plus"></span> {{lang_urlPanel}} </a> -</div>
\ No newline at end of file +</div> + +<form method="post" action="?do=locationinfo"> +<input type="hidden" name="token" value="{{token}}"> + +<div class ="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> + <div class="modal-dialog" 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">×</span></button> + <h4 class="modal-title" id="myModalLabel">{{lang_delete}}</h4> + </div> + <div class="modal-body"> + <p>{{lang_deleteConfirmation}}</p> + </div> + <div class="modal-footer"> + <input type="hidden" id="delete-panel-id" name="uuid" value=""> + <button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button> + <button type="submit" name="action" value="deletePanel" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button> + </div> + </div> + </div> +</div> +</form> + +<script> + function deletePanel(panelid) { + $("#delete-panel-id").val(panelid); + } +</script>
\ No newline at end of file diff --git a/modules-available/locationinfo/templates/page-servers.html b/modules-available/locationinfo/templates/page-servers.html index 6b02826e..46a148ce 100644 --- a/modules-available/locationinfo/templates/page-servers.html +++ b/modules-available/locationinfo/templates/page-servers.html @@ -2,50 +2,67 @@ <p>{{lang_serverTableHints}}</p> -<table class="table table-hover"> - <thead> - <tr> - <th width="1">{{lang_serverType}}</th> - <th>{{lang_locationName}}</th> - <th width="1"></th> - <th width="1"></th> - </tr> - </thead> - <tbody> - {{#serverlist}} - <form method="post" action="?do=locationinfo"> - <input type="hidden" name="token" value="{{token}}"> - <input type="hidden" name="serverid" value="{{serverid}}"> +<form method="post" action="?do=locationinfo"> + <table class="table table-hover"> + <thead> <tr> - <td nowrap>{{typename}}</td> - <td nowrap>{{servername}}</td> - - <td align="center" nowrap> - <button class="btn btn-xs {{^autherror}}btn-default{{/autherror}}{{#autherror}}btn-danger{{/autherror}}" - data-server-edit="{{serverid}}" {{disabled}} {{perms.backend.edit.disabled}} type="button"> - <span class="glyphicon glyphicon-cog"></span> - {{lang_edit}} - </button> - <button class="btn btn-xs btn-primary server-check" {{disabled}} {{perms.backend.check.disabled}} - name="action" value="checkConnection" type="submit"> - <span class="glyphicon glyphicon-refresh"></span> - {{lang_checkConnection}} - </button> - </td> - <td align="center" nowrap> - <button class="btn btn-xs btn-danger server-delete" type="submit" name="action" value="deleteServer" - {{perms.backend.edit.disabled}}> - <span class="glyphicon glyphicon-trash"></span> - {{lang_delete}} - </button> - </td> + <th class="text-center slx-smallcol">{{lang_serverType}}</th> + <th>{{lang_locationName}}</th> + <th class="text-center slx-smallcol">{{lang_edit}}</th> + <th class="text-center slx-smallcol">{{lang_checkConnection}}</th> + <th class="text-center slx-smallcol">{{lang_delete}}</th> </tr> - </form> - {{/serverlist}} - </tbody> -</table> + </thead> + <tbody> + {{#serverlist}} + <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="serverid" value="{{serverid}}"> + <tr> + <td nowrap>{{typename}}</td> + <td nowrap>{{servername}}</td> + + <td class="text-center"> + <button class="btn btn-xs {{^autherror}}btn-default{{/autherror}}{{#autherror}}btn-danger{{/autherror}}" + data-server-edit="{{serverid}}" {{disabled}} {{perms.backend.edit.disabled}} type="button"> + <span class="glyphicon glyphicon-cog"></span> + </button> + </td> + <td class="text-center"> + <button class="btn btn-xs btn-primary server-check" {{disabled}} {{perms.backend.check.disabled}} + name="action" value="checkConnection" type="submit"> + <span class="glyphicon glyphicon-refresh"></span> + </button> + </td> + <td class="text-center"> + <button type="button" class="btn btn-xs btn-danger" data-toggle="modal" data-target="#deleteModal" {{perms.backend.edit.disabled}}> + <span class="glyphicon glyphicon-trash"></span> + </button> + </td> + </tr> + {{/serverlist}} + </tbody> + </table> + + <div class ="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> + <div class="modal-dialog" 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">×</span></button> + <h4 class="modal-title" id="myModalLabel">{{lang_delete}}</h4> + </div> + <div class="modal-body"> + <p>{{lang_deleteConfirmation}}</p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button> + <button type="submit" name="action" value="deleteServer" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button> + </div> + </div> + </div> + </div> +</form> -<div> +<div class="text-right"> <button class="btn btn-sm btn-success" id="addServerButton" onclick="addServer()"> <span class="glyphicon glyphicon-plus"></span> {{lang_addServer}} @@ -54,7 +71,6 @@ <div class="modal fade" id="myModal" tabindex="-1" role="dialog"> <div class="modal-dialog"> - <div class="modal-content"> <div class="modal-header" id="myModalHeader"></div> <div class="modal-body" id="myModalBody"></div> @@ -63,7 +79,6 @@ <button type="submit" id="myModalSubmitButton" class="btn btn-primary" form="">{{lang_save}}</button> </div> </div> - </div> </div> |