Skip to content

Commit 5e94cc9

Browse files
FasseFasse
committed
fix some errors on calendar plugin
1 parent 79015a4 commit 5e94cc9

File tree

7 files changed

+21
-144
lines changed

7 files changed

+21
-144
lines changed

‎adm_plugins/calendar/calendar.php

+20-4
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,13 @@
241241
if($plg_kal_cat_show == 1)
242242
{
243243
if(substr($row['cat_name'], 3, 1)=='_')
244-
{$calendar_name = $gL10n->get($row['cat_name']);}
244+
{
245+
$calendar_name = $gL10n->get($row['cat_name']);
246+
}
245247
else
246-
{$calendar_name = $row['cat_name'];}
248+
{
249+
$calendar_name = $row['cat_name'];
250+
}
247251
$termin_titel[$ter]= $calendar_name. ': '. $termin_titel[$ter];
248252
}
249253

@@ -323,6 +327,7 @@
323327
data: 'ajax_change&date_id=".date('mY', mktime(0, 0, 0, $monat-1, 1, $jahr))."',
324328
success: function(html){
325329
$('#plgCalendarContent').replaceWith(html);
330+
$('.admidio-calendar-link').popover();
326331
}
327332
}); return false;\">&laquo;</a></th>";
328333
echo '<th colspan="5" style="text-align: center;" class="plgCalendarHeader">'.$monate[$monat-1].' '.$jahr.'</th>';
@@ -333,6 +338,7 @@
333338
data: 'ajax_change&amp;date_id=".date('mY', mktime(0, 0, 0, $monat+1, 1, $jahr))."',
334339
success: function(html){
335340
$('#plgCalendarContent').replaceWith(html);
341+
$('.admidio-calendar-link').popover();
336342
}
337343
}); return false;\">&raquo;</a></th>";
338344
}
@@ -471,7 +477,16 @@
471477
}
472478
}
473479

474-
$htmlContent .= $geb_name[$k]. ' ('.$alter[$k].')';
480+
if($plg_geb_icon == 1)
481+
{
482+
$icon = '<img src=\''.$g_root_path.'/adm_plugins/'.$plugin_folder.'/cake.png\' alt=\'Birthday\' /> ';
483+
}
484+
else
485+
{
486+
$icon = '';
487+
}
488+
489+
$htmlContent .= $icon.$geb_name[$k]. ' ('.$alter[$k].')';
475490
$geb_aktuell = $geb_day[$k];
476491
$geb_anzahl++;
477492
}
@@ -562,7 +577,7 @@
562577
}
563578

564579
// plg_link_class bestimmt das Erscheinungsbild des jeweiligen Links
565-
echo '<a class="'.$plg_link_class.'" href="'.$plg_link.'" data-toggle="popover" data-html="true" data-trigger="hover" data-placement="auto"
580+
echo '<a class="admidio-calendar-link '.$plg_link_class.'" href="'.$plg_link.'" data-toggle="popover" data-html="true" data-trigger="hover" data-placement="auto"
566581
title="'.$dateObj->format($gPreferences['system_date']).'" data-content="'.$htmlContent.'" target="'.$plg_link_target.'">'.$i.'</a>';
567582
}
568583
else
@@ -615,6 +630,7 @@
615630
data: \'ajax_change&amp;date_id='.date('mY').'\',
616631
success: function(html){
617632
$(\'#plgCalendarContent\').replaceWith(html);
633+
$(\'.admidio-calendar-link\').popover();
618634
}
619635
}); return false;">'.$gL10n->get('PLG_CALENDAR_CURRENT_MONTH').'</a></div>';
620636
}

‎adm_plugins/calendar/calendar_msg.php

-135
This file was deleted.

‎adm_plugins/calendar/languages/da.xml

-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@
1111
<text id="PLG_CALENDAR_SUNDAY_SHORT" development="new" translation="todo">Sø</text>
1212
<text id="PLG_CALENDAR_MORE" development="new" translation="todo"> (... mere)</text>
1313
<text id="PLG_CALENDAR_CURRENT_MONTH" development="new" translation="todo">Nuværende måned</text>
14-
<text id="PLG_CALENDAR_FULLTIME" development="new" translation="todo">(Hel dags event)</text>
1514
</version>
1615
</language>

‎adm_plugins/calendar/languages/de.xml

-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@
1111
<text id="PLG_CALENDAR_SUNDAY_SHORT" development="new" translation="todo">So</text>
1212
<text id="PLG_CALENDAR_MORE" development="new" translation="todo"> (... weitere)</text>
1313
<text id="PLG_CALENDAR_CURRENT_MONTH" development="new" translation="todo">Aktueller Monat</text>
14-
<text id="PLG_CALENDAR_FULLTIME" development="new" translation="todo">(ganztägiger Termin)</text>
1514
</version>
1615
</language>

‎adm_plugins/calendar/languages/de_sie.xml

-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@
1111
<text id="PLG_CALENDAR_SUNDAY_SHORT" development="new" translation="todo">So</text>
1212
<text id="PLG_CALENDAR_MORE" development="new" translation="todo"> (... weitere)</text>
1313
<text id="PLG_CALENDAR_CURRENT_MONTH" development="new" translation="todo">Aktueller Monat</text>
14-
<text id="PLG_CALENDAR_FULLTIME" development="new" translation="todo">(ganztägiger Termin)</text>
1514
</version>
1615
</language>

‎adm_plugins/calendar/languages/en.xml

-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@
1111
<text id="PLG_CALENDAR_SUNDAY_SHORT" development="new" translation="todo">Su</text>
1212
<text id="PLG_CALENDAR_MORE" development="new" translation="todo"> (... more)</text>
1313
<text id="PLG_CALENDAR_CURRENT_MONTH" development="new" translation="todo">Current month</text>
14-
<text id="PLG_CALENDAR_FULLTIME" development="new" translation="todo">(full-time event)</text>
1514
</version>
1615
</language>

‎adm_program/system/constants.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
define('ADMIDIO_VERSION_MAIN', 3);
2020
define('ADMIDIO_VERSION_MINOR', 0);
2121
define('ADMIDIO_VERSION_PATCH', 0);
22-
define('ADMIDIO_VERSION_BETA', 3);
22+
define('ADMIDIO_VERSION_BETA', 4);
2323
define('ADMIDIO_VERSION', ADMIDIO_VERSION_MAIN . '.' . ADMIDIO_VERSION_MINOR . '.' . ADMIDIO_VERSION_PATCH);
2424

2525
if(ADMIDIO_VERSION_BETA > 0)

0 commit comments

Comments
 (0)