diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-03 18:13:35 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-03 18:13:35 +0000 |
| commit | 501d1508731284bbc1e225e8223c5047dcf51c2e (patch) | |
| tree | 20df85bd5ed58eb3beb54caea51e5c19fe04f167 /phpBB | |
| parent | 187f55122e77a3e148a289fae04307b2d4f66f33 (diff) | |
| download | forums-501d1508731284bbc1e225e8223c5047dcf51c2e.tar forums-501d1508731284bbc1e225e8223c5047dcf51c2e.tar.gz forums-501d1508731284bbc1e225e8223c5047dcf51c2e.tar.bz2 forums-501d1508731284bbc1e225e8223c5047dcf51c2e.tar.xz forums-501d1508731284bbc1e225e8223c5047dcf51c2e.zip | |
Additions for site description
git-svn-id: file:///svn/phpbb/trunk@1266 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/admin/admin_board.php | 60 | ||||
| -rw-r--r-- | phpBB/language/lang_english/lang_main.php | 5 | ||||
| -rw-r--r-- | phpBB/templates/subSilver/admin/board_config_body.tpl | 4 |
3 files changed, 41 insertions, 28 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index da780cac3f..4b7a18807b 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -67,33 +67,33 @@ $lang_select = language_select($new['default_lang'], 'default_lang', "../languag $timezone_select = tz_select($new['board_timezone'], 'board_timezone'); $html_tags = $new['allow_html_tags']; -$override_user_style_yes = ($new['override_user_style']) ? "checked=\"checked\"" : ""; -$override_user_style_no = (!$new['override_user_style']) ? "checked=\"checked\"" : ""; -$html_yes = ($new['allow_html']) ? "checked=\"checked\"" : ""; -$html_no = (!$new['allow_html']) ? "checked=\"checked\"" : ""; -$bbcode_yes = ($new['allow_bbcode']) ? "checked=\"checked\"" : ""; -$bbcode_no = (!$new['allow_bbcode']) ? "checked=\"checked\"" : ""; -$activation_none = ($new['require_activation'] == USER_ACTIVATION_NONE) ? "checked=\"checked\"" : ""; -$activation_user = ($new['require_activation'] == USER_ACTIVATION_SELF) ? "checked=\"checked\"" : ""; -$activation_admin = ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? "checked=\"checked\"" : ""; -$gzip_yes = ($new['gzip_compress']) ? "checked=\"checked\"" : ""; -$gzip_no = (!$new['gzip_compress']) ? "checked=\"checked\"" : ""; -$prune_yes = ($new['prune_enable']) ? "checked=\"checked\"" : ""; -$prune_no = (!$new['prune_enable']) ? "checked=\"checked\"" : ""; -$smile_yes = ($new['allow_smilies']) ? "checked=\"checked\"" : ""; -$smile_no = (!$new['allow_smilies']) ? "checked=\"checked\"" : ""; -$sig_yes = ($new['allow_sig']) ? "checked=\"checked\"" : ""; -$sig_no = (!$new['allow_sig']) ? "checked=\"checked\"" : ""; -$namechange_yes = ($new['allow_namechange']) ? "checked=\"checked\"" : ""; -$namechange_no = (!$new['allow_namechange']) ? "checked=\"checked\"" : ""; -$avatars_local_yes = ($new['allow_avatar_local']) ? "checked=\"checked\"" : ""; -$avatars_local_no = (!$new['allow_avatar_local']) ? "checked=\"checked\"" : ""; -$avatars_remote_yes = ($new['allow_avatar_remote']) ? "checked=\"checked\"" : ""; -$avatars_remote_no = (!$new['allow_avatar_remote']) ? "checked=\"checked\"" : ""; -$avatars_upload_yes = ($new['allow_avatar_upload']) ? "checked=\"checked\"" : ""; -$avatars_upload_no = (!$new['allow_avatar_upload']) ? "checked=\"checked\"" : ""; -$smtp_yes = ($new['smtp_delivery']) ? "checked=\"checked\"" : ""; -$smtp_no = (!$new['smtp_delivery']) ? "checked=\"checked\"" : ""; +$override_user_style_yes = ( $new['override_user_style'] ) ? "checked=\"checked\"" : ""; +$override_user_style_no = ( !$new['override_user_style'] ) ? "checked=\"checked\"" : ""; +$html_yes = ( $new['allow_html'] ) ? "checked=\"checked\"" : ""; +$html_no = ( !$new['allow_html'] ) ? "checked=\"checked\"" : ""; +$bbcode_yes = ( $new['allow_bbcode'] ) ? "checked=\"checked\"" : ""; +$bbcode_no = ( !$new['allow_bbcode'] ) ? "checked=\"checked\"" : ""; +$activation_none = ( $new['require_activation'] == USER_ACTIVATION_NONE ) ? "checked=\"checked\"" : ""; +$activation_user = ( $new['require_activation'] == USER_ACTIVATION_SELF ) ? "checked=\"checked\"" : ""; +$activation_admin = ( $new['require_activation'] == USER_ACTIVATION_ADMIN ) ? "checked=\"checked\"" : ""; +$gzip_yes = ( $new['gzip_compress'] ) ? "checked=\"checked\"" : ""; +$gzip_no = ( !$new['gzip_compress'] ) ? "checked=\"checked\"" : ""; +$prune_yes = ( $new['prune_enable'] ) ? "checked=\"checked\"" : ""; +$prune_no = ( !$new['prune_enable'] ) ? "checked=\"checked\"" : ""; +$smile_yes = ( $new['allow_smilies'] ) ? "checked=\"checked\"" : ""; +$smile_no = ( !$new['allow_smilies'] ) ? "checked=\"checked\"" : ""; +$sig_yes = ( $new['allow_sig'] ) ? "checked=\"checked\"" : ""; +$sig_no = ( !$new['allow_sig'] ) ? "checked=\"checked\"" : ""; +$namechange_yes = ( $new['allow_namechange'] ) ? "checked=\"checked\"" : ""; +$namechange_no = ( !$new['allow_namechange'] ) ? "checked=\"checked\"" : ""; +$avatars_local_yes = ( $new['allow_avatar_local'] ) ? "checked=\"checked\"" : ""; +$avatars_local_no = ( !$new['allow_avatar_local'] ) ? "checked=\"checked\"" : ""; +$avatars_remote_yes = ( $new['allow_avatar_remote'] ) ? "checked=\"checked\"" : ""; +$avatars_remote_no = ( !$new['allow_avatar_remote'] ) ? "checked=\"checked\"" : ""; +$avatars_upload_yes = ( $new['allow_avatar_upload'] ) ? "checked=\"checked\"" : ""; +$avatars_upload_no = ( !$new['allow_avatar_upload'] ) ? "checked=\"checked\"" : ""; +$smtp_yes = ( $new['smtp_delivery'] ) ? "checked=\"checked\"" : ""; +$smtp_no = ( !$new['smtp_delivery'] ) ? "checked=\"checked\"" : ""; $template->set_filenames(array( "body" => "admin/board_config_body.tpl") @@ -101,14 +101,18 @@ $template->set_filenames(array( $template->assign_vars(array( "S_CONFIG_ACTION" => append_sid("admin_board.$phpEx"), - "SITENAME" => $new['sitename'], + "L_YES" => $lang['Yes'], "L_NO" => $lang['No'], "L_CONFIGURATION_TITLE" => $lang['General_Config'], "L_CONFIGURATION_EXPLAIN" => $lang['Config_explain'], "L_GENERAL_SETTINGS" => $lang['General_settings'], "L_SITE_NAME" => $lang['Site_name'], + "L_SITE_DESCRIPTION" => $lang['Site_desc'], "L_ACCT_ACTIVATION" => $lang['Acct_activation'], + + "SITENAME" => $new['sitename'], + "SITE_DESCRIPTION" => $new['site_desc'], "ACTIVATION_NONE" => USER_ACTIVATION_NONE, "ACTIVATION_NONE_CHECKED" => $activation_none, "ACTIVATION_USER" => USER_ACTIVATION_SELF, diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php index bb96ff6829..ad90d75003 100644 --- a/phpBB/language/lang_english/lang_main.php +++ b/phpBB/language/lang_english/lang_main.php @@ -556,6 +556,7 @@ $lang['Memberships_pending'] = "Memberships pending"; $lang['Join_group'] = "Join Group"; $lang['No_group_members'] = "This group has no members"; +$lang['Group_hidden_members'] = "This group is hidden, you cannot view its membership"; $lang['No_pending_group_members'] = "This group has no pending members"; $lang["Group_joined"] = "You have successfully subscribed to this group<br />You will be notifed when your subscription is approved by the group moderator"; $lang['Group_request'] = "A request to join your group has been made"; @@ -576,8 +577,10 @@ $lang['Remove_selected'] = "Remove Selected"; $lang['Add_member'] = "Add Member"; $lang['Not_group_moderator'] = "You are not this groups moderator therefor you cannot preform that action."; +$lang['Login_to_join'] = "Login to join or manage group memberships"; $lang['This_open_group'] = "This is an open group, click to request membership"; $lang['This_closed_group'] = "This is a closed group, no more users accepted"; +$lang['This_hidden_group'] = "This is a hidden group, automatic user addition is not allowed"; $lang['Member_this_group'] = "You are a member of this group"; $lang['Pending_this_group'] = "Your membership of this group is pending"; $lang['Are_group_moderator'] = "You are the group moderator"; @@ -919,6 +922,7 @@ $lang['General_Config'] = "General Configuration"; $lang['Config_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side."; $lang['General_settings'] = "General Board Settings"; $lang['Site_name'] = "Site name"; +$lang['Site_desc'] = "Site description"; $lang['Acct_activation'] = "Enable account activation"; @@ -992,6 +996,7 @@ $lang['group_moderator'] = "Group moderator"; $lang['group_status'] = "Group status"; $lang['group_open'] = "Open group"; $lang['group_closed'] = "Closed group"; +$lang['group_hidden'] = "Hidden group"; $lang['group_delete'] = "Delete group"; $lang['group_delete_check'] = "Delete this group"; $lang['submit_group_changes'] = "Submit Changes"; diff --git a/phpBB/templates/subSilver/admin/board_config_body.tpl b/phpBB/templates/subSilver/admin/board_config_body.tpl index b0565e88ae..1663d27a08 100644 --- a/phpBB/templates/subSilver/admin/board_config_body.tpl +++ b/phpBB/templates/subSilver/admin/board_config_body.tpl @@ -12,6 +12,10 @@ <td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td> </tr> <tr> + <td class="row1">{L_SITE_DESCRIPTION}:</td> + <td class="row2"><input type="text" size="40" maxlength="255" name="site_desc" value="{SITE_DESCRIPTION}"></td> + </tr> + <tr> <td class="row1">{L_ACCT_ACTIVATION}:</td> <td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED}>{L_NO}ne <input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED}>User <input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED}>Admin</td> </tr> |