Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #162 from marc1706/merge/master

Browse Source 
Merge/master
This commit is contained in:
Marc Alexander
2013-10-27 10:34:36 -07:00
parent 67c60419b8 1e83ce9489
commit 7214de04b7
10 changed files with 73 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/update_201_to_202/update.xml
View File

@@ -114,6 +114,7 @@ Weitere Sprachen kannst in unseren International Forum finden: http://www.board3
<file from="root/portal/includes/functions_upload.php" to="portal/includes/functions_upload.php" />
<file from="root/portal/modules/*.*" to="portal/modules/*.*" />
<file from="root/styles/prosilver/template/portal/modules/*.*" to="styles/prosilver/template/portal/modules/*.*" />
<file from="root/styles/prosilver/theme/portal.css" to="styles/prosilver/theme/portal.css" />
<file from="root/umil/*.*" to="umil/*.*" />
<file from="root/portal.php" to="portal.php" />
</copy>

4
install.xml
View File

@@ -105,7 +105,7 @@ Weitere Sprachen kannst in unserem Internationalen Forum finden: http://www.boar
</link-group>
<history>
<entry>
<date>2013-10-13</date>
<date>2013-10-27</date>
<rev-version>2.0.2</rev-version>
<changelog lang="en">
<change>[ticket/216] Add function for obtaining user's groups</change>
@@ -119,6 +119,7 @@ Weitere Sprachen kannst in unserem Internationalen Forum finden: http://www.boar
<change>[ŧicket/223] Set correct permissions to uploaded files (644)</change>
<change>[feature/clean-up] Remove duplicated code from portal modules</change>
<change>[gh/113] Update UMIL to 1.0.5</change>
<change>Slight changes to design of portal</change>
</changelog>
<changelog lang="de">
<change>[ticket/216] Füge Funktion zur Erlangung der Gruppen eines Benutzers hinzu</change>
@@ -132,6 +133,7 @@ Weitere Sprachen kannst in unserem Internationalen Forum finden: http://www.boar
<change>[ŧicket/223] Setze richtige Berechtigungen für hochgeladene Dateien (644)</change>
<change>[feature/clean-up] Entferne doppelten Code von Portal Modulen</change>
<change>[gh/113] Aktualisiere UMIL zu 1.0.5</change>
<change>Kleine Änderungen im Design des Portals</change>
</changelog>
</entry>
<entry>

6
root/acp/portal_module.php
View File

@@ -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
{

22
root/portal/modules/portal_birthday_list.php
View File

@@ -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);
}
}

11
root/portal/modules/portal_custom.php
View File

@@ -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'] . '&nbsp;-&nbsp;' . $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'] . ':&nbsp;' . $log_title);
// set_portal_config will take care of escaping the welcome message
set_portal_config('board3_custom_' . $module_id . '_code', $custom_code);

4
root/styles/prosilver/template/portal/modules/birthdays_side.html
View File

@@ -25,7 +25,7 @@
<img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" />
</span>
<span style="float:left; padding-left:5px; padding-top:2px;">
{board3_birthday_ahead_list.USER}
<span title="{board3_birthday_ahead_list.DATE}">{board3_birthday_ahead_list.USER}</span>
</span>
<span style="float: right;">
<!-- IF board3_birthday_ahead_list.AGE -->{board3_birthday_ahead_list.AGE}<!-- ENDIF -->
@@ -35,4 +35,4 @@
{L_NO_BIRTHDAYS_AHEAD}
<!-- ENDIF -->
<!-- ENDIF -->
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}

22
root/styles/prosilver/template/portal/modules/recent_center.html
View File

@@ -1,20 +1,23 @@
<!-- IF .latest_announcements or .latest_hot_topics or .latest_topics -->
{$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
<div class="panel bg1" style="margin-bottom: 0px">
<div class="inner"><span class="portal-corners-top-inner"></span>
<div class="portal-navigation">
<ul class="topiclist bg1">
<li><dl><dt></dt>
<dd style="border-left:0px; width:100%">
<table style="width: 100%;">
<tr>
<!-- IF .latest_announcements --><td class="row1"><strong>{L_PORTAL_RECENT_ANN}</strong></td><!-- ENDIF -->
<!-- IF .latest_hot_topics --><td class="row1"><strong>{L_PORTAL_RECENT_HOT_TOPIC}</strong></td><!-- ENDIF -->
<!-- IF .latest_topics --><td class="row1"><strong>{L_PORTAL_RECENT_TOPIC}</strong></td><!-- ENDIF -->
<tr class="menutitle">
<!-- IF .latest_announcements --><td><strong>{L_PORTAL_RECENT_ANN}</strong></td><!-- ENDIF -->
<!-- IF .latest_hot_topics --><td><strong>{L_PORTAL_RECENT_HOT_TOPIC}</strong></td><!-- ENDIF -->
<!-- IF .latest_topics --><td><strong>{L_PORTAL_RECENT_TOPIC}</strong></td><!-- ENDIF -->
</tr>
<tr>
<!-- IF .latest_announcements -->
<td class="row1" style="width: 33%; vertical-align: top;">
<span class="gensmall">
<!-- BEGIN latest_announcements -->
<a href="{latest_announcements.U_VIEW_TOPIC}" title="{latest_announcements.FULL_TITLE}">{latest_announcements.TITLE}</a><br />
<a href="{latest_announcements.U_VIEW_TOPIC}" title="{latest_announcements.FULL_TITLE}">{latest_announcements.TITLE}</a>
<!-- END latest_announcements -->
</span>
</td>
@@ -23,7 +26,7 @@
<td class="row1" style="width: 33%; vertical-align: top;">
<span class="gensmall">
<!-- BEGIN latest_hot_topics -->
<a href="{latest_hot_topics.U_VIEW_TOPIC}" title="{latest_hot_topics.FULL_TITLE}">{latest_hot_topics.TITLE}</a><br />
<a href="{latest_hot_topics.U_VIEW_TOPIC}" title="{latest_hot_topics.FULL_TITLE}">{latest_hot_topics.TITLE}</a>
<!-- END latest_hot_topics -->
</span>
</td>
@@ -32,7 +35,7 @@
<td class="row1" style="width: 33%; vertical-align: top;">
<span class="gensmall">
<!-- BEGIN latest_topics -->
<a href="{latest_topics.U_VIEW_TOPIC}" title="{latest_topics.FULL_TITLE}">{latest_topics.TITLE}</a><br />
<a href="{latest_topics.U_VIEW_TOPIC}" title="{latest_topics.FULL_TITLE}">{latest_topics.TITLE}</a>
<!-- END latest_topics -->
</span>
</td>
@@ -42,5 +45,8 @@
</dd>
</dl></li>
</ul>
</div>
<span class="portal-corners-bottom-inner"></span></div>
</div>
{$C_BLOCK_F_L}{$C_BLOCK_F_R}
<!-- ENDIF -->
<!-- ENDIF -->

7
root/styles/prosilver/theme/portal.css
View File

@@ -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 {

4
root/styles/subsilver2/template/portal/modules/birthdays_side.html
View File

@@ -31,7 +31,7 @@
<img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" />
</span>
<span style="float:left; padding-left:5px; padding-top:2px;">
{board3_birthday_ahead_list.USER}
<span title="{board3_birthday_ahead_list.DATE}">{board3_birthday_ahead_list.USER}</span>
</span>
<span style="float: right;">
<!-- IF board3_birthday_ahead_list.AGE -->{board3_birthday_ahead_list.AGE}<!-- ENDIF -->
@@ -44,4 +44,4 @@
</tr>
<!-- ENDIF -->
</table>
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}

14
root/styles/subsilver2/template/portal/modules/recent_center.html
View File

@@ -1,30 +1,30 @@
<!-- IF .latest_announcements or .latest_hot_topics or .latest_topics -->
{$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
<table class="tablebg" cellspacing="1" width="100%">
<tr>
<!-- IF .latest_announcements --><td class="row1"><strong>{L_PORTAL_RECENT_ANN}</strong></td><!-- ENDIF -->
<!-- IF .latest_hot_topics --><td class="row1"><strong>{L_PORTAL_RECENT_HOT_TOPIC}</strong></td><!-- ENDIF -->
<!-- IF .latest_topics --><td class="row1"><strong>{L_PORTAL_RECENT_TOPIC}</strong></td><!-- ENDIF -->
<tr class="cat">
<!-- IF .latest_announcements --><td><strong>{L_PORTAL_RECENT_ANN}</strong></td><!-- ENDIF -->
<!-- IF .latest_hot_topics --><td><strong>{L_PORTAL_RECENT_HOT_TOPIC}</strong></td><!-- ENDIF -->
<!-- IF .latest_topics --><td><strong>{L_PORTAL_RECENT_TOPIC}</strong></td><!-- ENDIF -->
</tr>
<tr>
<!-- IF .latest_announcements -->
<td class="row1" width="33%" valign="top">
<!-- BEGIN latest_announcements -->
<a href="{latest_announcements.U_VIEW_TOPIC}" title="{latest_announcements.FULL_TITLE}">{latest_announcements.TITLE}</a><br />
<a href="{latest_announcements.U_VIEW_TOPIC}" title="{latest_announcements.FULL_TITLE}"><img src="{T_THEME_PATH}/images/portal/arrowbullet<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->_rtl<!-- ENDIF -->.gif" width="12" height="11" alt="" />&nbsp;{latest_announcements.TITLE}</a><br />
<!-- END latest_announcements -->
</td>
<!-- ENDIF -->
<!-- IF .latest_hot_topics -->
<td class="row1" width="33%" valign="top">
<!-- BEGIN latest_hot_topics -->
<a href="{latest_hot_topics.U_VIEW_TOPIC}" title="{latest_hot_topics.FULL_TITLE}">{latest_hot_topics.TITLE}</a><br />
<a href="{latest_hot_topics.U_VIEW_TOPIC}" title="{latest_hot_topics.FULL_TITLE}"><img src="{T_THEME_PATH}/images/portal/arrowbullet<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->_rtl<!-- ENDIF -->.gif" width="12" height="11" alt="" />&nbsp;{latest_hot_topics.TITLE}</a><br />
<!-- END latest_hot_topics -->
</td>
<!-- ENDIF -->
<!-- IF .latest_topics -->
<td class="row1" width="33%" valign="top">
<!-- BEGIN latest_topics -->
<a href="{latest_topics.U_VIEW_TOPIC}" title="{latest_topics.FULL_TITLE}">{latest_topics.TITLE}</a><br />
<a href="{latest_topics.U_VIEW_TOPIC}" title="{latest_topics.FULL_TITLE}"><img src="{T_THEME_PATH}/images/portal/arrowbullet<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->_rtl<!-- ENDIF -->.gif" width="12" height="11" alt="" />&nbsp;{latest_topics.TITLE}</a><br />
<!-- END latest_topics -->
</td>
<!-- ENDIF -->