mirror of
https://github.com/jokob-sk/NetAlertX.git
synced 2025-12-07 01:26:11 -08:00
presence #294 work + setings improvements
This commit is contained in:
@@ -1232,6 +1232,16 @@ function initializeCalendar () {
|
|||||||
duration : { month: 1 },
|
duration : { month: 1 },
|
||||||
buttonText : '<?= lang('Presence_CalHead_month');?>',
|
buttonText : '<?= lang('Presence_CalHead_month');?>',
|
||||||
columnHeaderFormat : 'D'
|
columnHeaderFormat : 'D'
|
||||||
|
},
|
||||||
|
agendaWeek: {
|
||||||
|
buttonText : '<?= lang('Presence_CalHead_week');?>',
|
||||||
|
},
|
||||||
|
agendaDay: {
|
||||||
|
type : 'agenda',
|
||||||
|
duration : { day: 1 },
|
||||||
|
buttonText : '<?= lang('Presence_CalHead_day');?>',
|
||||||
|
slotLabelFormat : 'H',
|
||||||
|
slotDuration : '01:00:00'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -1278,7 +1288,7 @@ function initializeCalendar () {
|
|||||||
},
|
},
|
||||||
|
|
||||||
eventRender: function (event, element) {
|
eventRender: function (event, element) {
|
||||||
$(element).tooltip({container: 'body', placement: 'right',
|
$(element).tooltip({container: 'body', placement: 'bottom',
|
||||||
title: event.tooltip});
|
title: event.tooltip});
|
||||||
// element.attr ('title', event.tooltip); // Alternative tooltip
|
// element.attr ('title', event.tooltip); // Alternative tooltip
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -56,6 +56,10 @@ function lang($key)
|
|||||||
// if found, use default language
|
// if found, use default language
|
||||||
$temp = $lang[$defaultLang][$key];
|
$temp = $lang[$defaultLang][$key];
|
||||||
|
|
||||||
|
} elseif (strpos($key, "__metadata") !== false) {
|
||||||
|
// If the key contains "__metadata", handle it here.
|
||||||
|
// You can set a specific value or perform some other action for these keys.
|
||||||
|
$temp = "__metadata";
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
// String not found in the default or selected language
|
// String not found in the default or selected language
|
||||||
|
|||||||
@@ -332,7 +332,7 @@ function initializeCalendar () {
|
|||||||
},
|
},
|
||||||
|
|
||||||
eventRender: function (event, element, view) {
|
eventRender: function (event, element, view) {
|
||||||
$(element).tooltip({container: 'body', placement: 'right', title: event.tooltip});
|
$(element).tooltip({container: 'body', placement: 'bottom', title: event.tooltip});
|
||||||
// element.attr ('title', event.tooltip); // Alternative tooltip
|
// element.attr ('title', event.tooltip); // Alternative tooltip
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -305,7 +305,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
|
|||||||
// "test" => [lang("settings_event_tooltip"),""]
|
// "test" => [lang("settings_event_tooltip"),""]
|
||||||
// ];
|
// ];
|
||||||
|
|
||||||
if(count($eventsList) > 0)
|
if(count($eventsList) > 0 && $set['Type'] != 'json')
|
||||||
{
|
{
|
||||||
foreach ($eventsList as $event) {
|
foreach ($eventsList as $event) {
|
||||||
$eventsHtml = $eventsHtml.'<span class="input-group-addon pointer"
|
$eventsHtml = $eventsHtml.'<span class="input-group-addon pointer"
|
||||||
|
|||||||
0
pialert/flows/unmark_new.json
Normal file → Executable file
0
pialert/flows/unmark_new.json
Normal file → Executable file
Reference in New Issue
Block a user