mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-31 22:15:31 +01:00
Code Issues Releases Wiki Activity

Various updates

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@1383 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-11-20 02:24:41 +00:00
parent 5389b2c8ae
commit 0bc6beada8
4 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/faq.php
View File

@ -102,14 +102,23 @@ for($i = 0; $i < count($faq_block); $i++)
for($j = 0; $j < count($faq_block[$i]); $j++)
{
$row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars("faq_block.faq_row", array(
"ROW_COLOR" => "#" . $row_color,
"ROW_CLASS" => $row_class,
"FAQ_QUESTION" => $faq_block[$i][$j]['question'],
"FAQ_ANSWER" => $faq_block[$i][$j]['answer'],
"U_FAQ_ID" => $faq_block[$i][$j]['id'])
);
$template->assign_block_vars("faq_block_link.faq_row_link", array(
"ROW_COLOR" => "#" . $row_color,
"ROW_CLASS" => $row_class,
"FAQ_LINK" => $faq_block[$i][$j]['question'],
"U_FAQ_LINK" => "#" . $faq_block[$i][$j]['id'])
);
}

5
phpBB/includes/page_header.php
View File

@ -227,7 +227,7 @@ $template->assign_vars(array(
"L_REGISTER" => $lang['Register'],
"L_PROFILE" => $lang['Profile'],
"L_SEARCH" => $lang['Search'],
"L_PRIVATEMSGS" => $lang['Private_messages'],
"L_PRIVATEMSGS" => $lang['Private_Messages'],
"L_WHO_IS_ONLINE" => $lang['Who_is_Online'],
"L_MEMBERLIST" => $lang['Memberlist'],
"L_FAQ" => $lang['FAQ'],
@ -262,7 +262,8 @@ $template->assign_vars(array(
"U_PROFILE" => append_sid("profile.".$phpEx."?mode=editprofile"),
"U_PRIVATEMSGS" => append_sid("privmsg.".$phpEx."?folder=inbox"),
"U_SEARCH" => append_sid("search.".$phpEx),
"U_MEMBERLIST" => append_sid("memberlist.".$phpEx),
"U_MEMBERLIST" => append_sid("memberlist.".$phpEx),
"U_MODCP" => append_sid("modcp.".$phpEx),
"U_FAQ" => append_sid("faq.".$phpEx),
"U_VIEWONLINE" => append_sid("viewonline.$phpEx"),
"U_LOGIN_LOGOUT" => append_sid($u_login_logout),

35
phpBB/language/lang_english/lang_admin.php
View File

@ -1,8 +1,28 @@
<?php
// --------------------
// Main Admin section/s
// --------------------
/***************************************************************************
* lang_admin.php [English]
* -------------------
* begin : Sat Dec 16 2000
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
* $Id$
*
****************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
//
// Format is same as lang_main
//
//
// Index
@ -333,18 +353,23 @@ $lang['smiley_import_success'] = "The Smiley Pack was imported successfully!";
$lang['smiley_del_success'] = "The Smiley was successfully removed";
$lang['Click_return_smileadmin'] = "Click %sHere%s to return to Smiley Administration";
//
// User Management
//
$lang['User_admin'] = "Administration";
$lang['User_admin_explain'] = "Here you can change your user's information and certain specific options. To modify the users permissions please use the user and group permissions system.";
$lang['User_delete'] = "Delete this user";
$lang['User_delete_explain'] = "Click here to delete this user, this cannot be undone.";
$lang['User_deleted'] = "User was successfully deleted.";
$lang['User_status'] = "User is active";
$lang['User_allowpm'] = "Can send Private Messages";
$lang['User_allowavatar'] = "Can display avatar";
$lang['Admin_avatar_explain'] = "Here you can see and delete the user's current avatar.";
$lang['User_special'] = "Special admin-only fields";
$lang['User_special_explain'] = "These fields are not able to be modified by the users. Here you can set their status and other options that are not given to users.";
@ -567,4 +592,8 @@ $lang['Theme_updated'] = "The selected theme has been updated. Don't forget to e
$lang['Theme_created'] = "Theme created! Don't forget to export the new theme settings to the theme configuration file!";
$lang['Cannot_remove_style'] = "The style you have selected is the current forum wide default style. Therefor, you cannot remove it. Please change the default style and try again.";
//
// That's all Folks!
// -------------------------------------------------
?>

7
phpBB/viewtopic.php
View File

@ -453,6 +453,7 @@ $template->assign_vars(array(
"L_DISPLAY_POSTS" => $lang['Display_posts'],
"L_RETURN_TO_TOP" => $lang['Return_to_top'],
"S_TOPIC_LINK" => POST_TOPIC_URL,
"S_SELECT_POST_DAYS" => $select_post_days,
"S_SELECT_POST_ORDER" => $select_post_order,
"S_POST_DAYS_ACTION" => append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&amp;start=$start"))
@ -1065,6 +1066,12 @@ $template->assign_vars(array(
"PAGINATION" => $pagination,
"PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['posts_per_page'] ) + 1 ), ceil( $total_replies / $board_config['posts_per_page'] )),
"L_LOCK_TOPIC" => $lang['Lock_topic'],
"L_UNLOCK_TOPIC" => $lang['Unlock_topic'],
"L_MOVE_TOPIC" => $lang['Move_topic'],
"L_SPLIT_TOPIC" => $lang['Split_topic'],
"L_DELETE_TOPIC" => $lang['Delete_topic'],
"S_AUTH_LIST" => $s_auth_can,
"S_TOPIC_ADMIN" => $topic_mod,
"S_WATCH_TOPIC" => $s_watching_topic,