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

[ticket/416] Allow adding links module more than once

Browse Source 
B3P-416
This commit is contained in:
Marc Alexander
2014-12-01 14:31:36 +01:00
parent 4bf63d4929
commit b5e317ad06
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/links.php
View File

@@ -56,13 +56,13 @@ class links extends module_base
/** @var \phpbb\config\config */ /** @var \phpbb\config\config */
protected $config; protected $config;
/** @var \phpbb\db\driver */ /** @var \phpbb\db\driver\driver_interface */
protected $db; protected $db;
/** @var \phpbb\request\request */ /** @var \phpbb\request\request */
protected $request; protected $request;
/** @var \phpbb\template */ /** @var \phpbb\template\template */
protected $template; protected $template;
/** @var string PHP file extension */ /** @var string PHP file extension */
@@ -81,9 +81,9 @@ class links extends module_base
* Construct a links object * Construct a links object
* *
* @param \phpbb\config\config $config phpBB config * @param \phpbb\config\config $config phpBB config
* @param \phpbb\db\driver $db phpBB db driver * @param \phpbb\db\driver\driver_interface $db phpBB db driver
* @param \phpbb\request\request $request phpBB request * @param \phpbb\request\request $request phpBB request
* @param \phpbb\template $template phpBB template * @param \phpbb\template\template $template phpBB template
* @param string $phpEx php file extension * @param string $phpEx php file extension
* @param string $phpbb_root_path phpBB root path * @param string $phpbb_root_path phpBB root path
* @param \phpbb\user $user phpBB user object * @param \phpbb\user $user phpBB user object
@@ -113,6 +113,8 @@ class links extends module_base
// get user's groups // get user's groups
$groups_ary = get_user_groups(); $groups_ary = get_user_groups();
$this->template->assign_block_vars('portal_links', array('MODULE_ID' => $module_id));
for ($i = 0; $i < sizeof($links); $i++) for ($i = 0; $i < sizeof($links); $i++)
{ {
if ($links[$i]['type'] == self::LINK_INT) if ($links[$i]['type'] == self::LINK_INT)
@@ -130,7 +132,7 @@ class links extends module_base
if (!empty($permission_check) || $links[$i]['permission'] == '') if (!empty($permission_check) || $links[$i]['permission'] == '')
{ {
$this->template->assign_block_vars('portallinks', array( $this->template->assign_block_vars('portal_links.links', array(
'LINK_TITLE' => (isset($this->user->lang[$links[$i]['title']])) ? $this->user->lang[$links[$i]['title']] : $links[$i]['title'], 'LINK_TITLE' => (isset($this->user->lang[$links[$i]['title']])) ? $this->user->lang[$links[$i]['title']] : $links[$i]['title'],
'LINK_URL' => $cur_url, 'LINK_URL' => $cur_url,
'MODULE_ID' => $module_id, 'MODULE_ID' => $module_id,

12
styles/prosilver/template/portal/modules/links_side.html
View File

@@ -1,11 +1,15 @@
<!-- BEGIN portal_links -->
<!-- IF portal_links.MODULE_ID eq $MODULE_ID -->
{$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R} {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
<div class="portal-navigation"> <div class="portal-navigation">
<ul> <ul>
<!-- BEGIN portallinks --> <!-- BEGIN links -->
<!-- IF $MODULE_ID eq portallinks.MODULE_ID --><li><a href="{portallinks.LINK_URL}" title="{portallinks.LINK_TITLE}" <!-- IF portallinks.NEW_WINDOW -->onclick="window.open('{portallinks.LINK_URL}'); return false;"<!-- ENDIF -->>{portallinks.LINK_TITLE}</a></li><!-- ENDIF --> <li><a href="{portal_links.links.LINK_URL}" title="{portal_links.links.LINK_TITLE}" <!-- IF portal_links.links.NEW_WINDOW -->onclick="window.open('{portal_links.links.LINK_URL}'); return false;"<!-- ENDIF -->>{portal_links.links.LINK_TITLE}</a></li>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<span class="portal-title-span gensmall"><strong>{L_LINKS_NO_LINKS}</strong></span><br /> <span class="portal-title-span gensmall"><strong>{L_LINKS_NO_LINKS}</strong></span><br />
<!-- END portallinks --> <!-- END links -->
</ul> </ul>
</div> </div>
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
<!-- ENDIF -->
<!-- END portal_links -->

12
styles/subsilver2/template/portal/modules/links_side.html
View File

@@ -1,9 +1,11 @@
<!-- BEGIN portal_links -->
<!-- IF portal_links.MODULE_ID eq $MODULE_ID -->
{$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R} {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
<table class="tablebg" cellspacing="1" width="100%"> <table class="tablebg" cellspacing="1" width="100%">
<!-- BEGIN portallinks --> <!-- BEGIN links -->
<tr class="row1"> <tr class="row1">
<td> <td>
<!-- IF $MODULE_ID eq portallinks.MODULE_ID --><a class="portal-arrow-bullet" href="{portallinks.LINK_URL}" title="{portallinks.LINK_TITLE}" <!-- IF portallinks.NEW_WINDOW -->onclick="window.open('{portallinks.LINK_URL}'); return false;"<!-- ENDIF -->>&nbsp;{portallinks.LINK_TITLE}</a><!-- ENDIF --> <a class="portal-arrow-bullet" href="{portal_links.links.LINK_URL}" title="{portal_links.links.LINK_TITLE}" <!-- IF portal_links.links.NEW_WINDOW -->onclick="window.open('{portal_links.links.LINK_URL}'); return false;"<!-- ENDIF -->>&nbsp;{portal_links.links.LINK_TITLE}</a>
</td> </td>
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
@@ -12,6 +14,8 @@
<span style="float: left" class="gensmall"><strong>{L_LINKS_NO_LINKS}</strong></span><br /> <span style="float: left" class="gensmall"><strong>{L_LINKS_NO_LINKS}</strong></span><br />
</td> </td>
</tr> </tr>
<!-- END portallinks --> <!-- END links -->
</table> </table>
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
<!-- ENDIF -->
<!-- END portal_links -->