diff --git a/contrib/update_201_to_202/update.xml b/contrib/update_201_to_202/update.xml index c734faa2..a696d7cd 100644 --- a/contrib/update_201_to_202/update.xml +++ b/contrib/update_201_to_202/update.xml @@ -114,6 +114,7 @@ Weitere Sprachen kannst in unseren International Forum finden: http://www.board3 + diff --git a/install.xml b/install.xml index fb32edec..9af0557f 100644 --- a/install.xml +++ b/install.xml @@ -105,7 +105,7 @@ Weitere Sprachen kannst in unserem Internationalen Forum finden: http://www.boar - 2013-10-13 + 2013-10-27 2.0.2 [ticket/216] Add function for obtaining user's groups @@ -119,6 +119,7 @@ Weitere Sprachen kannst in unserem Internationalen Forum finden: http://www.boar [ŧicket/223] Set correct permissions to uploaded files (644) [feature/clean-up] Remove duplicated code from portal modules [gh/113] Update UMIL to 1.0.5 + Slight changes to design of portal [ticket/216] Füge Funktion zur Erlangung der Gruppen eines Benutzers hinzu @@ -132,6 +133,7 @@ Weitere Sprachen kannst in unserem Internationalen Forum finden: http://www.boar [ŧicket/223] Setze richtige Berechtigungen für hochgeladene Dateien (644) [feature/clean-up] Entferne doppelten Code von Portal Modulen [gh/113] Aktualisiere UMIL zu 1.0.5 + Kleine Änderungen im Design des Portals diff --git a/root/acp/portal_module.php b/root/acp/portal_module.php index 3fb776f0..1ee7efb1 100644 --- a/root/acp/portal_module.php +++ b/root/acp/portal_module.php @@ -267,9 +267,13 @@ class phpbb_ext_board3_portal_acp_portal_module $this->cache->destroy('portal_modules'); $this->cache->destroy('sql', CONFIG_TABLE); + if(isset($module_name)) { - add_log('admin', 'LOG_PORTAL_CONFIG', $module_name); + if ($module_data['module_classname'] !== 'custom') + { + add_log('admin', 'LOG_PORTAL_CONFIG', $module_name); + } } else { diff --git a/root/portal/modules/portal_birthday_list.php b/root/portal/modules/portal_birthday_list.php index c7c1d235..39845ef3 100644 --- a/root/portal/modules/portal_birthday_list.php +++ b/root/portal/modules/portal_birthday_list.php @@ -107,6 +107,7 @@ class portal_birthday_list_module $template->assign_block_vars('board3_birthday_ahead_list', array( 'USER' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), 'AGE' => ($age = (int) substr($row['user_birthday'], -4)) ? ' (' . ($now['year'] - $age) . ')' : '', + 'DATE' => $this->format_birthday($user, $row['user_birthday'], 'd M'), )); } } @@ -156,4 +157,25 @@ class portal_birthday_list_module WHERE ' . $db->sql_in_set('config_name', $del_config); return $db->sql_query($sql); } + + /** + * Format birthday for span title + * + * @param object $user phpBB user object + * @param string $birthday User's birthday from database + * @param string $date_settings Settings for date() function + */ + protected function format_birthday($user, $birthday, $date_settings) + { + if (!preg_match('/(?:[0-9])+-+(?:[0-9]{2})+-+(?:[0-9]{4})/', $birthday, $match)) + { + return ''; + } + + $date = explode('-', $birthday); + $time = mktime(0, 0, 0, $date[1], $date[0], $date[2]); + $lang_dates = array_filter($user->lang['datetime'], 'is_string'); + + return strtr(date($date_settings, $time), $lang_dates); + } } diff --git a/root/portal/modules/portal_custom.php b/root/portal/modules/portal_custom.php index e4c69d38..13007490 100644 --- a/root/portal/modules/portal_custom.php +++ b/root/portal/modules/portal_custom.php @@ -169,7 +169,16 @@ class portal_custom_module $custom_permission = array_intersect($custom_permission, $groups_ary); $custom_permission = implode(',', $custom_permission); - add_log('admin', 'LOG_PORTAL_CONFIG', $user->lang['PORTAL_CUSTOM'] . ' - ' . $config['board3_custom_' . $module_id . '_title']); + if (isset($user->lang[$custom_title])) + { + $log_title = $user->lang[$custom_title]; + } + else + { + $log_title = $custom_title; + } + + add_log('admin', 'LOG_PORTAL_CONFIG', $user->lang['PORTAL_CUSTOM'] . ': ' . $log_title); // set_portal_config will take care of escaping the welcome message set_portal_config('board3_custom_' . $module_id . '_code', $custom_code); diff --git a/root/styles/prosilver/template/portal/modules/birthdays_side.html b/root/styles/prosilver/template/portal/modules/birthdays_side.html index 5f81104d..d9a62654 100644 --- a/root/styles/prosilver/template/portal/modules/birthdays_side.html +++ b/root/styles/prosilver/template/portal/modules/birthdays_side.html @@ -25,7 +25,7 @@ - {board3_birthday_ahead_list.USER} + {board3_birthday_ahead_list.USER} {board3_birthday_ahead_list.AGE} @@ -35,4 +35,4 @@ {L_NO_BIRTHDAYS_AHEAD} -{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} \ No newline at end of file +{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} diff --git a/root/styles/prosilver/template/portal/modules/recent_center.html b/root/styles/prosilver/template/portal/modules/recent_center.html index 36f8a9d7..2f470b4e 100644 --- a/root/styles/prosilver/template/portal/modules/recent_center.html +++ b/root/styles/prosilver/template/portal/modules/recent_center.html @@ -1,20 +1,23 @@ {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R} +
+
+
  • - - - - + + + + @@ -23,7 +26,7 @@ @@ -32,7 +35,7 @@ @@ -42,5 +45,8 @@ + + + {$C_BLOCK_F_L}{$C_BLOCK_F_R} - \ No newline at end of file + diff --git a/root/styles/prosilver/theme/portal.css b/root/styles/prosilver/theme/portal.css index c19a7f90..acb502d1 100644 --- a/root/styles/prosilver/theme/portal.css +++ b/root/styles/prosilver/theme/portal.css @@ -49,6 +49,13 @@ span.portal-corners-top-inner, span.portal-corners-bottom-inner{ padding: 1px 0; font: bold 90% 'Trebuchet MS', 'Lucida Grande', Arial, sans-serif; font-size: 12px; + text-decoration: underline; +} + +.portal-navigation tr.menutitle{ + font: bold 90% 'Trebuchet MS', 'Lucida Grande', Arial, sans-serif; + font-size: 12px; + text-decoration: underline; } .calendar-info { diff --git a/root/styles/subsilver2/template/portal/modules/birthdays_side.html b/root/styles/subsilver2/template/portal/modules/birthdays_side.html index 8426fcc0..9d11bee5 100644 --- a/root/styles/subsilver2/template/portal/modules/birthdays_side.html +++ b/root/styles/subsilver2/template/portal/modules/birthdays_side.html @@ -31,7 +31,7 @@ - {board3_birthday_ahead_list.USER} + {board3_birthday_ahead_list.USER} {board3_birthday_ahead_list.AGE} @@ -44,4 +44,4 @@
    {L_PORTAL_RECENT_ANN}{L_PORTAL_RECENT_HOT_TOPIC}{L_PORTAL_RECENT_TOPIC}
    - {latest_announcements.TITLE}
    + {latest_announcements.TITLE}
    - {latest_hot_topics.TITLE}
    + {latest_hot_topics.TITLE}
    - {latest_topics.TITLE}
    + {latest_topics.TITLE}
    -{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} \ No newline at end of file +{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} diff --git a/root/styles/subsilver2/template/portal/modules/recent_center.html b/root/styles/subsilver2/template/portal/modules/recent_center.html index 14de1a01..a8bd39e8 100644 --- a/root/styles/subsilver2/template/portal/modules/recent_center.html +++ b/root/styles/subsilver2/template/portal/modules/recent_center.html @@ -1,30 +1,30 @@ {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R} - - - - + + + +
    {L_PORTAL_RECENT_ANN}{L_PORTAL_RECENT_HOT_TOPIC}{L_PORTAL_RECENT_TOPIC}
    {L_PORTAL_RECENT_ANN}{L_PORTAL_RECENT_HOT_TOPIC}{L_PORTAL_RECENT_TOPIC}
    - {latest_announcements.TITLE}
    +  {latest_announcements.TITLE}
    - {latest_hot_topics.TITLE}
    +  {latest_hot_topics.TITLE}
    - {latest_topics.TITLE}
    +  {latest_topics.TITLE}