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

Merge pull request #13 from marc1706/master

Browse Source 
Added "open links in new window" to main menu and links module
This commit is contained in:
Marc Alexander
2011-05-11 05:11:12 -07:00
parent 7eb5a169c1 9bb57606b3
commit df93a27587
13 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
root/adm/style/portal/acp_portal_links.html
View File

@@ -111,7 +111,24 @@
<!-- ENDIF --> <!-- ENDIF -->
</fieldset> </fieldset>
<!-- ENDIF --> <!-- ENDIF -->
<!-- BEGIN options -->
<!-- IF options.S_LEGEND -->
<!-- IF not options.S_FIRST_ROW -->
</fieldset>
<!-- ENDIF -->
<fieldset>
<legend>{options.LEGEND}</legend>
<!-- ELSE -->
<dl>
<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
<dd>{options.CONTENT}</dd>
</dl>
<!-- ENDIF -->
<!-- BEGINELSE -->
<fieldset>
<!-- END options -->
<fieldset class="tabulated"> <fieldset class="tabulated">
<legend>{L_ACP_PORTAL_LINKS}</legend> <legend>{L_ACP_PORTAL_LINKS}</legend>
@@ -151,6 +168,7 @@
</p> </p>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>
</fieldset>
</form> </form>
<!-- ENDIF --> <!-- ENDIF -->

18
root/adm/style/portal/acp_portal_menu.html
View File

@@ -118,7 +118,24 @@
<!-- ENDIF --> <!-- ENDIF -->
</fieldset> </fieldset>
<!-- ENDIF --> <!-- ENDIF -->
<!-- BEGIN options -->
<!-- IF options.S_LEGEND -->
<!-- IF not options.S_FIRST_ROW -->
</fieldset>
<!-- ENDIF -->
<fieldset>
<legend>{options.LEGEND}</legend>
<!-- ELSE -->
<dl>
<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
<dd>{options.CONTENT}</dd>
</dl>
<!-- ENDIF -->
<!-- BEGINELSE -->
<fieldset>
<!-- END options -->
<fieldset class="tabulated"> <fieldset class="tabulated">
<legend>{L_ACP_PORTAL_LINKS}</legend> <legend>{L_ACP_PORTAL_LINKS}</legend>
@@ -158,6 +175,7 @@
</p> </p>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>
</fieldset>
</form> </form>
<!-- ENDIF --> <!-- ENDIF -->

1
root/language/de/mods/portal/portal_links_module.php
View File

@@ -48,4 +48,5 @@ $lang = array_merge($lang, array(
'ACP_PORTAL_LINK_URL_EXP' => 'Externe Links:<br />Alle Links sollten mit einem http:// eingegeben werden.<br /><br />Interne Links:<br />Gebe nur die PHP Datei als Link URL ein, z.B. index.php?style=4.', 'ACP_PORTAL_LINK_URL_EXP' => 'Externe Links:<br />Alle Links sollten mit einem http:// eingegeben werden.<br /><br />Interne Links:<br />Gebe nur die PHP Datei als Link URL ein, z.B. index.php?style=4.',
'ACP_PORTAL_LINK_PERMISSION' => 'Link Berechtigungen', 'ACP_PORTAL_LINK_PERMISSION' => 'Link Berechtigungen',
'ACP_PORTAL_LINK_PERMISSION_EXP'=> 'Wähle die Gruppen aus die berechtigt sein sollen den Link zu sehen. Falls alle Benutzer den Link sehen sollen, dann wähle nichts aus.<br />Wähle mehrere Gruppen aus/ab indem du <samp>STRG</samp> gedrückt hältst und klickst.', 'ACP_PORTAL_LINK_PERMISSION_EXP'=> 'Wähle die Gruppen aus die berechtigt sein sollen den Link zu sehen. Falls alle Benutzer den Link sehen sollen, dann wähle nichts aus.<br />Wähle mehrere Gruppen aus/ab indem du <samp>STRG</samp> gedrückt hältst und klickst.',
'ACP_PORTAL_LINKS_NEW_WINDOW' => 'Öffne externe Verknüpfungen in einem neuen Fenster',
)); ));

1
root/language/de/mods/portal/portal_main_menu_module.php
View File

@@ -61,4 +61,5 @@ $lang = array_merge($lang, array(
'ACP_PORTAL_MENU_URL_EXP' => 'Externe Links:<br />Alle Links sollten mit einem http:// eingegeben werden.<br /><br />Interne Links:<br />Gebe nur die PHP Datei als Link URL ein, z.B. index.php?style=4.', 'ACP_PORTAL_MENU_URL_EXP' => 'Externe Links:<br />Alle Links sollten mit einem http:// eingegeben werden.<br /><br />Interne Links:<br />Gebe nur die PHP Datei als Link URL ein, z.B. index.php?style=4.',
'ACP_PORTAL_MENU_PERMISSION' => 'Link Berechtigungen', 'ACP_PORTAL_MENU_PERMISSION' => 'Link Berechtigungen',
'ACP_PORTAL_MENU_PERMISSION_EXP'=> 'Wähle die Gruppen aus die berechtigt sein sollen den Link zu sehen. Falls alle Benutzer den Link sehen sollen, dann wähle nichts aus.<br />Wähle mehrere Gruppen aus/ab indem du <samp>STRG</samp> gedrückt hältst und klickst.', 'ACP_PORTAL_MENU_PERMISSION_EXP'=> 'Wähle die Gruppen aus die berechtigt sein sollen den Link zu sehen. Falls alle Benutzer den Link sehen sollen, dann wähle nichts aus.<br />Wähle mehrere Gruppen aus/ab indem du <samp>STRG</samp> gedrückt hältst und klickst.',
'ACP_PORTAL_MENU_EXT_NEW_WINDOW'=> 'Öffne externe Verknüpfungen in einem neuen Fenster',
)); ));

1
root/language/en/mods/portal/portal_links_module.php
View File

@@ -48,4 +48,5 @@ $lang = array_merge($lang, array(
'ACP_PORTAL_LINK_URL_EXP' => 'External links:<br />All links should be entered with a http://<br /><br />Internal links:<br />Only enter the php file as link url, i.e. index.php?style=4.', 'ACP_PORTAL_LINK_URL_EXP' => 'External links:<br />All links should be entered with a http://<br /><br />Internal links:<br />Only enter the php file as link url, i.e. index.php?style=4.',
'ACP_PORTAL_LINK_PERMISSION' => 'Link permissions', 'ACP_PORTAL_LINK_PERMISSION' => 'Link permissions',
'ACP_PORTAL_LINK_PERMISSION_EXP'=> 'Select the groups that should be authorized to view the link. If you want all users to be able to view the link, don’t select anything.<br />Select/Deselect multiple groups by holding <samp>CTRL</samp> and clicking.', 'ACP_PORTAL_LINK_PERMISSION_EXP'=> 'Select the groups that should be authorized to view the link. If you want all users to be able to view the link, don’t select anything.<br />Select/Deselect multiple groups by holding <samp>CTRL</samp> and clicking.',
'ACP_PORTAL_LINKS_NEW_WINDOW' => 'Open external links in a new window',
)); ));

1
root/language/en/mods/portal/portal_main_menu_module.php
View File

@@ -61,4 +61,5 @@ $lang = array_merge($lang, array(
'ACP_PORTAL_MENU_URL_EXP' => 'External links:<br />All links should be entered with a http://<br /><br />Internal links:<br />Only enter the php file as link url, i.e. index.php?style=4.', 'ACP_PORTAL_MENU_URL_EXP' => 'External links:<br />All links should be entered with a http://<br /><br />Internal links:<br />Only enter the php file as link url, i.e. index.php?style=4.',
'ACP_PORTAL_MENU_PERMISSION' => 'Link permissions', 'ACP_PORTAL_MENU_PERMISSION' => 'Link permissions',
'ACP_PORTAL_MENU_PERMISSION_EXP'=> 'Select the groups that should be authorized to view the link. If you want all users to be able to view the link, don’t select anything.<br />Select/Deselect multiple groups by holding <samp>CTRL</samp> and clicking.', 'ACP_PORTAL_MENU_PERMISSION_EXP'=> 'Select the groups that should be authorized to view the link. If you want all users to be able to view the link, don’t select anything.<br />Select/Deselect multiple groups by holding <samp>CTRL</samp> and clicking.',
'ACP_PORTAL_MENU_EXT_NEW_WINDOW'=> 'Open external links in a new window',
)); ));

3
root/portal/includes/functions.php
View File

@@ -936,6 +936,9 @@ function board3_basic_install($mode = 'install', $purge_modules = true, $u_actio
$c_class->install($db->sql_nextid()); $c_class->install($db->sql_nextid());
} }
// Make sure we get rid of old data
$cache->destroy('portal_modules');
if ($mode == 'update') if ($mode == 'update')
{ {

6
root/portal/modules/portal_links.php
View File

@@ -102,6 +102,7 @@ class portal_links_module
'LINK_TITLE' => (isset($user->lang[$links[$i]['title']])) ? $user->lang[$links[$i]['title']] : $links[$i]['title'], 'LINK_TITLE' => (isset($user->lang[$links[$i]['title']])) ? $user->lang[$links[$i]['title']] : $links[$i]['title'],
'LINK_URL' => $cur_url, 'LINK_URL' => $cur_url,
'MODULE_ID' => $module_id, 'MODULE_ID' => $module_id,
'NEW_WINDOW' => ($links[$i]['type'] != self::LINK_INT && $config['board3_links_url_new_window_' . $module_id]) ? true : false,
)); ));
} }
} }
@@ -115,8 +116,9 @@ class portal_links_module
return array( return array(
'title' => 'ACP_PORTAL_LINKS', 'title' => 'ACP_PORTAL_LINKS',
'vars' => array( 'vars' => array(
'legend1' => 'ACP_PORTAL_MENU', 'legend1' => 'ACP_PORTAL_LINKS',
'board3_links_' . $module_id => array('lang' => 'ACP_PORTAL_MENU_MANAGE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'manage_links', 'submit' => 'update_links'), 'board3_links_' . $module_id => array('lang' => 'ACP_PORTAL_MENU_MANAGE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'manage_links', 'submit' => 'update_links'),
'board3_links_url_new_window_' . $module_id => array('lang' => 'ACP_PORTAL_LINKS_NEW_WINDOW', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
), ),
); );
} }
@@ -163,6 +165,7 @@ class portal_links_module
$board3_menu_array = serialize($links); $board3_menu_array = serialize($links);
set_portal_config('board3_links_array_' . $module_id, $board3_menu_array); set_portal_config('board3_links_array_' . $module_id, $board3_menu_array);
set_config('board3_links_' . $module_id, ''); set_config('board3_links_' . $module_id, '');
set_config('board3_links_url_new_window_' . $module_id, 0);
return true; return true;
} }
@@ -181,6 +184,7 @@ class portal_links_module
$del_config = array( $del_config = array(
'board3_links_' . $module_id, 'board3_links_' . $module_id,
'board3_links_url_new_window_' . $module_id
); );
$sql = 'DELETE FROM ' . CONFIG_TABLE . ' $sql = 'DELETE FROM ' . CONFIG_TABLE . '
WHERE ' . $db->sql_in_set('config_name', $del_config); WHERE ' . $db->sql_in_set('config_name', $del_config);

4
root/portal/modules/portal_main_menu.php
View File

@@ -111,6 +111,7 @@ class portal_main_menu_module
$template->assign_block_vars('portalmenu.links', array( $template->assign_block_vars('portalmenu.links', array(
'LINK_TITLE' => (isset($user->lang[$links[$i]['title']])) ? $user->lang[$links[$i]['title']] : $links[$i]['title'], 'LINK_TITLE' => (isset($user->lang[$links[$i]['title']])) ? $user->lang[$links[$i]['title']] : $links[$i]['title'],
'LINK_URL' => $cur_url, 'LINK_URL' => $cur_url,
'NEW_WINDOW' => ($links[$i]['type'] != self::LINK_INT && $config['board3_menu_url_new_window_' . $module_id]) ? true : false,
)); ));
} }
} }
@@ -127,6 +128,7 @@ class portal_main_menu_module
'vars' => array( 'vars' => array(
'legend1' => 'ACP_PORTAL_MENU', 'legend1' => 'ACP_PORTAL_MENU',
'board3_menu_' . $module_id => array('lang' => 'ACP_PORTAL_MENU_MANAGE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'manage_links', 'submit' => 'update_links'), 'board3_menu_' . $module_id => array('lang' => 'ACP_PORTAL_MENU_MANAGE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'manage_links', 'submit' => 'update_links'),
'board3_menu_url_new_window_' . $module_id => array('lang' => 'ACP_PORTAL_MENU_EXT_NEW_WINDOW', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
), ),
); );
} }
@@ -219,6 +221,7 @@ class portal_main_menu_module
$board3_menu_array = serialize($links); $board3_menu_array = serialize($links);
set_portal_config('board3_menu_array_' . $module_id, $board3_menu_array); set_portal_config('board3_menu_array_' . $module_id, $board3_menu_array);
set_config('board3_menu_' . $module_id, ''); set_config('board3_menu_' . $module_id, '');
set_config('board3_menu_url_new_window_' . $module_id, 0);
return true; return true;
} }
@@ -237,6 +240,7 @@ class portal_main_menu_module
$del_config = array( $del_config = array(
'board3_menu_' . $module_id, 'board3_menu_' . $module_id,
'board3_menu_url_new_window_' . $module_id,
); );
$sql = 'DELETE FROM ' . CONFIG_TABLE . ' $sql = 'DELETE FROM ' . CONFIG_TABLE . '
WHERE ' . $db->sql_in_set('config_name', $del_config); WHERE ' . $db->sql_in_set('config_name', $del_config);

2
root/styles/prosilver/template/portal/modules/links_side.html
View File

@@ -2,7 +2,7 @@
<div class="portal-navigation"> <div class="portal-navigation">
<ul> <ul>
<!-- BEGIN portallinks --> <!-- BEGIN portallinks -->
<!-- IF $MODULE_ID eq portallinks.MODULE_ID --><li><a href="{portallinks.LINK_URL}" title="{portallinks.LINK_TITLE}">{portallinks.LINK_TITLE}</a></li><!-- ENDIF --> <!-- 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 -->
<!-- BEGINELSE --> <!-- BEGINELSE -->
<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 />
<!-- END portallinks --> <!-- END portallinks -->

2
root/styles/prosilver/template/portal/modules/main_menu_side.html
View File

@@ -5,7 +5,7 @@
<div class="menutitle">{portalmenu.CAT_TITLE}</div> <div class="menutitle">{portalmenu.CAT_TITLE}</div>
<ul> <ul>
<!-- BEGIN links --> <!-- BEGIN links -->
<li><a href="{portalmenu.links.LINK_URL}">{portalmenu.links.LINK_TITLE}</a></li> <li><a href="{portalmenu.links.LINK_URL}" <!-- IF portalmenu.links.NEW_WINDOW -->onclick="window.open('{portalmenu.links.LINK_URL}'); return false;"<!-- ENDIF -->>{portalmenu.links.LINK_TITLE}</a></li>
<!-- END links --> <!-- END links -->
</ul> </ul>
<hr class="dashed" /> <hr class="dashed" />

2
root/styles/subsilver2/template/portal/modules/links_side.html
View File

@@ -3,7 +3,7 @@
<!-- BEGIN portallinks --> <!-- BEGIN portallinks -->
<tr class="row1"> <tr class="row1">
<td> <td>
<!-- IF $MODULE_ID eq portallinks.MODULE_ID --><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;<a href="{portallinks.LINK_URL}" title="{portallinks.LINK_TITLE}">{portallinks.LINK_TITLE}</a><!-- ENDIF --> <!-- IF $MODULE_ID eq portallinks.MODULE_ID --><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;<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><!-- ENDIF -->
</td> </td>
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->

2
root/styles/subsilver2/template/portal/modules/main_menu_side.html
View File

@@ -10,7 +10,7 @@
<!-- BEGIN links --> <!-- BEGIN links -->
<tr class="row1"> <tr class="row1">
<td> <td>
<a href="{portalmenu.links.LINK_URL}" title="{portalmenu.links.LINK_TITLE}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{portalmenu.links.LINK_TITLE}</a> <a href="{portalmenu.links.LINK_URL}" title="{portalmenu.links.LINK_TITLE}" <!-- IF portalmenu.links.NEW_WINDOW -->onclick="window.open('{portalmenu.links.LINK_URL}'); return false;"<!-- ENDIF -->><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{portalmenu.links.LINK_TITLE}</a>
</td> </td>
</tr> </tr>
<!-- END links --> <!-- END links -->