fix some errors on calendar plugin

Admidio · Jun 21, 2015 · 5e94cc9 · 5e94cc9
1 parent 79015a4
commit 5e94cc9
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 144 deletions.
diff --git a/adm_plugins/calendar/calendar.php b/adm_plugins/calendar/calendar.php
@@ -241,9 +241,13 @@
         if($plg_kal_cat_show == 1)
         {
             if(substr($row['cat_name'], 3, 1)=='_')
-            {$calendar_name = $gL10n->get($row['cat_name']);}
+            {
+                $calendar_name = $gL10n->get($row['cat_name']);
+            }
             else
-            {$calendar_name = $row['cat_name'];}
+            {
+                $calendar_name = $row['cat_name'];
+            }
             $termin_titel[$ter]= $calendar_name. ': '. $termin_titel[$ter];
         }
 
@@ -323,6 +327,7 @@
                 data: 'ajax_change&amp;date_id=".date('mY', mktime(0, 0, 0, $monat-1, 1, $jahr))."',
                 success: function(html){
                     $('#plgCalendarContent').replaceWith(html);
+                    $('.admidio-calendar-link').popover();
                 }
             }); return false;\">&laquo;</a></th>";
             echo '<th colspan="5" style="text-align: center;" class="plgCalendarHeader">'.$monate[$monat-1].' '.$jahr.'</th>';
@@ -333,6 +338,7 @@
                 data: 'ajax_change&amp;date_id=".date('mY', mktime(0, 0, 0, $monat+1, 1, $jahr))."',
                 success: function(html){
                     $('#plgCalendarContent').replaceWith(html);
+                    $('.admidio-calendar-link').popover();
                 }
             }); return false;\">&raquo;</a></th>";
         }
@@ -471,7 +477,16 @@
                         }
                     }
 
-                    $htmlContent .= $geb_name[$k]. ' ('.$alter[$k].')';
+                    if($plg_geb_icon == 1)
+                    {
+                        $icon = '<img src=\''.$g_root_path.'/adm_plugins/'.$plugin_folder.'/cake.png\' alt=\'Birthday\' /> ';
+                    }
+                    else
+                    {
+                        $icon = '';
+                    }
+
+                    $htmlContent .= $icon.$geb_name[$k]. ' ('.$alter[$k].')';
                     $geb_aktuell  = $geb_day[$k];
                     $geb_anzahl++;
                 }
@@ -562,7 +577,7 @@
                 }
 
                 // plg_link_class bestimmt das Erscheinungsbild des jeweiligen Links
-                echo '<a class="'.$plg_link_class.'" href="'.$plg_link.'" data-toggle="popover" data-html="true" data-trigger="hover" data-placement="auto"
+                echo '<a class="admidio-calendar-link '.$plg_link_class.'" href="'.$plg_link.'" data-toggle="popover" data-html="true" data-trigger="hover" data-placement="auto"
                     title="'.$dateObj->format($gPreferences['system_date']).'" data-content="'.$htmlContent.'" target="'.$plg_link_target.'">'.$i.'</a>';
             }
             else
@@ -615,6 +630,7 @@
             data: \'ajax_change&amp;date_id='.date('mY').'\',
             success: function(html){
                 $(\'#plgCalendarContent\').replaceWith(html);
+                $(\'.admidio-calendar-link\').popover();
             }
         }); return false;">'.$gL10n->get('PLG_CALENDAR_CURRENT_MONTH').'</a></div>';
 }

diff --git a/adm_plugins/calendar/calendar_msg.php b/adm_plugins/calendar/calendar_msg.php
diff --git a/adm_plugins/calendar/languages/da.xml b/adm_plugins/calendar/languages/da.xml
@@ -11,6 +11,5 @@
         <text id="PLG_CALENDAR_SUNDAY_SHORT" development="new" translation="todo">Sø</text>
         <text id="PLG_CALENDAR_MORE" development="new" translation="todo"> (... mere)</text>
         <text id="PLG_CALENDAR_CURRENT_MONTH" development="new" translation="todo">Nuværende måned</text>
-        <text id="PLG_CALENDAR_FULLTIME" development="new" translation="todo">(Hel dags event)</text>
     </version>
 </language>
diff --git a/adm_plugins/calendar/languages/de.xml b/adm_plugins/calendar/languages/de.xml
@@ -11,6 +11,5 @@
         <text id="PLG_CALENDAR_SUNDAY_SHORT" development="new" translation="todo">So</text>
         <text id="PLG_CALENDAR_MORE" development="new" translation="todo"> (... weitere)</text>
         <text id="PLG_CALENDAR_CURRENT_MONTH" development="new" translation="todo">Aktueller Monat</text>
-        <text id="PLG_CALENDAR_FULLTIME" development="new" translation="todo">(ganztägiger Termin)</text>
     </version>
 </language>
diff --git a/adm_plugins/calendar/languages/de_sie.xml b/adm_plugins/calendar/languages/de_sie.xml
@@ -11,6 +11,5 @@
         <text id="PLG_CALENDAR_SUNDAY_SHORT" development="new" translation="todo">So</text>
         <text id="PLG_CALENDAR_MORE" development="new" translation="todo"> (... weitere)</text>
         <text id="PLG_CALENDAR_CURRENT_MONTH" development="new" translation="todo">Aktueller Monat</text>
-        <text id="PLG_CALENDAR_FULLTIME" development="new" translation="todo">(ganztägiger Termin)</text>
     </version>
 </language>
diff --git a/adm_plugins/calendar/languages/en.xml b/adm_plugins/calendar/languages/en.xml
@@ -11,6 +11,5 @@
         <text id="PLG_CALENDAR_SUNDAY_SHORT" development="new" translation="todo">Su</text>
         <text id="PLG_CALENDAR_MORE" development="new" translation="todo"> (... more)</text>
         <text id="PLG_CALENDAR_CURRENT_MONTH" development="new" translation="todo">Current month</text>
-        <text id="PLG_CALENDAR_FULLTIME" development="new" translation="todo">(full-time event)</text>
     </version>
 </language>
diff --git a/adm_program/system/constants.php b/adm_program/system/constants.php
@@ -19,7 +19,7 @@
 define('ADMIDIO_VERSION_MAIN', 3);
 define('ADMIDIO_VERSION_MINOR', 0);
 define('ADMIDIO_VERSION_PATCH', 0);
-define('ADMIDIO_VERSION_BETA', 3);
+define('ADMIDIO_VERSION_BETA', 4);
 define('ADMIDIO_VERSION', ADMIDIO_VERSION_MAIN . '.' . ADMIDIO_VERSION_MINOR . '.' . ADMIDIO_VERSION_PATCH);
 
 if(ADMIDIO_VERSION_BETA > 0)