diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-04-15 23:41:43 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-04-15 23:41:43 +0000 |
| commit | d3b302841cb797f0be0a086548d7996dfd2b6e2f (patch) | |
| tree | 4bae7aee1112ef6d08703302c581b83a00fd5ff7 | |
| parent | 1f80001ea89a763497a54cbda94bec14b010a9e2 (diff) | |
| download | forums-d3b302841cb797f0be0a086548d7996dfd2b6e2f.tar forums-d3b302841cb797f0be0a086548d7996dfd2b6e2f.tar.gz forums-d3b302841cb797f0be0a086548d7996dfd2b6e2f.tar.bz2 forums-d3b302841cb797f0be0a086548d7996dfd2b6e2f.tar.xz forums-d3b302841cb797f0be0a086548d7996dfd2b6e2f.zip | |
Only display PM/Search/Memberlist links if enabled
git-svn-id: file:///svn/phpbb/trunk@3847 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/page_header.php | 3 | ||||
| -rw-r--r-- | phpBB/templates/subSilver/overall_header.html | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index fc9d7a1bfa..c37985ac78 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -285,6 +285,9 @@ $template->assign_vars(array( 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT'], 'S_TIMEZONE' => ($user->data['user_dst'] || ($user->data['user_id'] == ANONYMOUS && $config['board_dst'])) ? sprintf($user->lang['ALL_TIMES'], $user->lang[$tz], $user->lang['tz']['dst']) : sprintf($user->lang['ALL_TIMES'], $user->lang[$tz], ''), 'S_DISPLAY_ONLINE_LIST' => (!empty($config['load_online'])) ? 1 : 0, + 'S_DISPLAY_SEARCH' => (!empty($config['load_search'])) ? 1 : 0, + 'S_DISPLAY_PM' => (empty($config['privmsg_disable'])) ? 1 : 0, + 'S_DISPLAY_MEMBERLIST' => (isset($auth)) ? $auth->acl_get('u_viewprofile') : 0, 'T_STYLESHEET_DATA' => $user->theme['css_data'], 'T_STYLESHEET_LINK' => 'templates/' . $user->theme['css_external'], diff --git a/phpBB/templates/subSilver/overall_header.html b/phpBB/templates/subSilver/overall_header.html index c3d42dda8f..475f02de61 100644 --- a/phpBB/templates/subSilver/overall_header.html +++ b/phpBB/templates/subSilver/overall_header.html @@ -17,7 +17,7 @@ <!-- IF S_USER_PM_POPUP --> if ( {PRIVATE_MESSAGE_NEW_FLAG} ) { - window.open('{U_PRIVATEMSGS}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400');; + window.open('{U_PRIVATEMSGS}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400'); } <!-- ENDIF --> function im_popup(url, width, height) @@ -47,9 +47,9 @@ function im_popup(url, width, height) <td colspan="2"><img src="images/spacer.gif" height="5" alt="" /></td> </tr> <tr> - <td height="25" valign="middle" nowrap="nowrap"><span class="mainmenu"><a href="{U_LOGIN_LOGOUT}"><img src="templates/subSilver/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" hspace="3" />{L_LOGIN_LOGOUT}</a> <!-- IF S_USER_LOGGED_IN --> <a href="{U_PRIVATEMSGS}"><img src="templates/subSilver/images/icon_mini_message.gif" width="12" height="13" border="0" alt="{PRIVATE_MESSAGE_INFO}" hspace="3" />{PRIVATE_MESSAGE_INFO}</a><!-- ELSE --> <a href="{U_REGISTER}"><img src="templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a><!-- ENDIF --></span></td> + <td height="25" valign="middle" nowrap="nowrap"><span class="mainmenu"><a href="{U_LOGIN_LOGOUT}"><img src="templates/subSilver/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" hspace="3" />{L_LOGIN_LOGOUT}</a> <!-- IF S_USER_LOGGED_IN --><!-- IF S_DISPLAY_PM --> <a href="{U_PRIVATEMSGS}"><img src="templates/subSilver/images/icon_mini_message.gif" width="12" height="13" border="0" alt="{PRIVATE_MESSAGE_INFO}" hspace="3" />{PRIVATE_MESSAGE_INFO}</a><!-- ENDIF --><!-- ELSE --> <a href="{U_REGISTER}"><img src="templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a><!-- ENDIF --></span></td> - <td height="25" align="right" valign="middle" nowrap="nowrap"><span class="mainmenu"> <a href="{U_FAQ}"><img src="templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a> <a href="{U_SEARCH}"><img src="templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a> <a href="{U_MEMBERLIST}"><img src="templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a> <a href="{U_GROUP_CP}"><img src="templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a><!-- IF S_USER_LOGGED_IN --> <a href="{U_PROFILE}"><img src="templates/subSilver/images/icon_mini_profile.gif" width="12" height="13" border="0" alt="{L_PROFILE}" hspace="3" />{L_PROFILE}</a><!-- ENDIF --></span></td> + <td height="25" align="right" valign="middle" nowrap="nowrap"><span class="mainmenu"> <a href="{U_FAQ}"><img src="templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a><!-- IF S_DISPLAY_SEARCH --> <a href="{U_SEARCH}"><img src="templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a><!-- ENDIF --> <!-- IF S_DISPLAY_MEMBERLIST --><a href="{U_MEMBERLIST}"><img src="templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a><!-- ENDIF --> <a href="{U_GROUP_CP}"><img src="templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a><!-- IF S_USER_LOGGED_IN --> <a href="{U_PROFILE}"><img src="templates/subSilver/images/icon_mini_profile.gif" width="12" height="13" border="0" alt="{L_PROFILE}" hspace="3" />{L_PROFILE}</a><!-- ENDIF --></span></td> </tr> <tr> <td><img src="images/spacer.gif" height="8" alt="" /></td> |