diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 29d6539f80..4c71fe0aa9 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -16,9 +16,9 @@ define('NEED_SID', true); // Include files $phpbb_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -require($phpbb_root_path . 'common.'.$phpEx); -require($phpbb_root_path . 'includes/functions_admin.'.$phpEx); -require($phpbb_root_path . 'includes/functions_module.'.$phpEx); +require($phpbb_root_path . 'common.' . $phpEx); +require($phpbb_root_path . 'includes/functions_admin.' . $phpEx); +require($phpbb_root_path . 'includes/functions_module.' . $phpEx); // Start session management $user->session_begin(); @@ -58,6 +58,7 @@ $mode = request_var('mode', ''); // Set custom template for admin area $template->set_custom_template($phpbb_admin_path . 'style', 'admin'); $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); + // the acp template is never stored in the database $user->theme['template_storedb'] = false; @@ -75,7 +76,7 @@ $module->set_active($module_id, $mode); // Assign data to the template engine for the list of modules // We do this before loading the active module for correct menu display in trigger_error -$module->assign_tpl_vars("{$phpbb_admin_path}index.$phpEx$SID"); +$module->assign_tpl_vars(append_sid("{$phpbb_admin_path}index.$phpEx")); // Load and execute the relevant module $module->load_active(); @@ -89,19 +90,19 @@ $template->set_filenames(array( adm_page_footer(); -// --------- -// FUNCTIONS -// +/** +* Header for acp pages +*/ function adm_page_header($page_title) { global $config, $db, $user, $template; - global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID; + global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID; if (defined('HEADER_INC')) { return; } - + define('HEADER_INC', true); // gzip_compression @@ -116,17 +117,20 @@ function adm_page_header($page_title) $template->assign_vars(array( 'PAGE_TITLE' => $page_title, 'USERNAME' => $user->data['username'], + + 'SID' => $SID, + '_SID' => $_SID, + 'SESSION_ID' => $user->session_id, 'ROOT_PATH' => $phpbb_admin_path, - 'U_LOGOUT' => "{$phpbb_root_path}ucp.$phpEx$SID&mode=logout", - 'U_ADM_INDEX' => "{$phpbb_admin_path}index.$phpEx$SID", - 'U_INDEX' => "{$phpbb_root_path}index.$phpEx$SID", + 'U_LOGOUT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'), + 'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"), + 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), - 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], - 'S_CONTENT_ENCODING' => $user->lang['ENCODING'], - 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], - 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT'], - ) + 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], + 'S_CONTENT_ENCODING' => $user->lang['ENCODING'], + 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], + 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT']) ); if (!empty($config['send_encoding'])) @@ -140,10 +144,13 @@ function adm_page_header($page_title) return; } +/** +* Page footer for acp pages +*/ function adm_page_footer($copyright_html = true) { global $db, $config, $template, $user, $auth, $cache; - global $SID, $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx; + global $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx; // Output page creation time if (defined('DEBUG')) @@ -179,8 +186,7 @@ function adm_page_footer($copyright_html = true) $template->assign_vars(array( 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '', 'S_COPYRIGHT_HTML' => $copyright_html, - 'VERSION' => $config['version'] - ) + 'VERSION' => $config['version']) ); $template->display('body'); @@ -197,12 +203,18 @@ function adm_page_footer($copyright_html = true) exit; } +/** +* Generate back link for acp pages +*/ function adm_back_link($u_action) { global $user; return '

« ' . $user->lang['BACK_TO_PREV'] . ''; } +/** +* Build select field options in acp pages +*/ function build_select($option_ary, $option_default = false) { global $user; @@ -217,6 +229,9 @@ function build_select($option_ary, $option_default = false) return $html; } +/** +* Build radio fields in acp pages +*/ function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = false) { global $user; @@ -234,6 +249,9 @@ function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = return $html; } +/** +* Build configuration template for acp configuration pages +*/ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) { global $user, $module; @@ -249,21 +267,21 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) $maxlength = (int) $tpl_type[2]; $tpl = ''; - break; + break; case 'dimension': $size = (int) $tpl_type[1]; $maxlength = (int) $tpl_type[2]; $tpl = ' x '; - break; + break; case 'textarea': $rows = (int) $tpl_type[1]; $cols = (int) $tpl_type[2]; $tpl = ''; - break; + break; case 'radio': $key_yes = ($new[$config_key]) ? ' checked="checked"' : ''; @@ -276,7 +294,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) $tpl_yes = ' ' . (($type_no) ? $user->lang['YES'] : $user->lang['ENABLED']); $tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . '  ' . $tpl_no : $tpl_no . '  ' . $tpl_yes; - break; + break; case 'select': case 'custom': @@ -295,7 +313,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) { break; } - + if (isset($vars['params'])) { $args = array(); @@ -331,17 +349,17 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) $tpl = $return; } - break; + break; default: - break; + break; } if (isset($vars['append'])) { $tpl .= $vars['append']; } - + return $tpl; } diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 31d773993c..70a2415b6c 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -64,22 +64,22 @@ -
-

{L_SECURE_DOWNLOAD_NOTICE}

-
+
+

{L_SECURE_DOWNLOAD_NOTICE}

+
{L_SECURE_TITLE}

{L_DOWNLOAD_ADD_IPS_EXPLAIN}

-
-
-
-
-
-

{L_EXCLUDE_ENTERED_IP}
-
{L_YES}   {L_NO}
-
+
+
+
+
+
+

{L_EXCLUDE_ENTERED_IP}
+
{L_YES}   {L_NO}
+
@@ -89,16 +89,16 @@
{L_REMOVE_IPS} -

{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}

+

{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}

-
+
-
- -
+
+ +

{L_NO_IPS_DEFINED}

@@ -166,47 +166,47 @@ {L_LEGEND} -
-
-
-
-
-

{L_SPECIAL_CATEGORY_EXPLAIN}
-
{S_CATEGORY_SELECT}
-
-
-
-
checked="checked" />
-
-
-
-
checked="checked" />
-
-
-

{L_DOWNLOAD_MODE_EXPLAIN}
-
{S_DOWNLOAD_SELECT}
-
-
-
-
-
 src="{PHPBB_ROOT_PATH}images/spacer.gif"src="{UPLOAD_ICON_SRC}" name="image_upload_icon" alt="" title="" /> 
-
-
-
-
-
-
-
-
{ASSIGNED_EXTENSIONS}
[{L_GO_TO_EXTENSIONS} ]
-
-
-
-

{L_ALLOWED_FORUMS_EXPLAIN}
-
checked="checked" /> {L_ALLOW_ALL_FORUMS}   checked="checked" /> {L_ALLOW_SELECTED_FORUMS}
-
-
+
+
+
+
+
+

{L_SPECIAL_CATEGORY_EXPLAIN}
+
{S_CATEGORY_SELECT}
+
+
+
+
checked="checked" />
+
+
+
+
checked="checked" />
+
+
+

{L_DOWNLOAD_MODE_EXPLAIN}
+
{S_DOWNLOAD_SELECT}
+
+
+
+
+
 src="{PHPBB_ROOT_PATH}images/spacer.gif"src="{UPLOAD_ICON_SRC}" name="image_upload_icon" alt="" title="" /> 
+
+
+
+
+
+
+
+
{ASSIGNED_EXTENSIONS}
[{L_GO_TO_EXTENSIONS} ]
+
+
+
+

{L_ALLOWED_FORUMS_EXPLAIN}
+
checked="checked" /> {L_ALLOW_ALL_FORUMS}   checked="checked" /> {L_ALLOW_SELECTED_FORUMS}
+
+
@@ -258,14 +258,14 @@
{L_ADD_EXTENSION} -
-
-
-
-
-
-
{GROUP_SELECT_OPTIONS}
-
+
+
+
+
+
+
+
{GROUP_SELECT_OPTIONS}
+
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 4c645be178..8bfdf735a5 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -43,28 +43,28 @@
{L_TITLE} -
-
-
-
[ {L_FIND_USERNAME} ]
-
-
-
-
-
(YYYY-MM-DD)
-
-
-

{L_BAN_EXCLUDE_EXPLAIN}
-
{L_YES}   {L_NO}
-
-
-
-
-
-
-
-
-
+
+
+
+
[ {L_FIND_USERNAME} ]
+
+
+
+
+
(YYYY-MM-DD)
+
+
+

{L_BAN_EXCLUDE_EXPLAIN}
+
{L_YES}   {L_NO}
+
+
+
+
+
+
+
+
+
@@ -98,17 +98,18 @@
-
+
-
-   - -
+
+   + +

{L_NO_BAN_CELL}

+ diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 00af899397..116aba0aff 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -15,27 +15,27 @@
{L_BBCODE_USAGE}

{L_BBCODE_USAGE_EXPLAIN}

-
-


{L_BBCODE_USAGE_EXAMPLE}
-
-
+
+


{L_BBCODE_USAGE_EXAMPLE}
+
+
{L_HTML_REPLACEMENT}

{L_HTML_REPLACEMENT_EXPLAIN}

-
-


{L_HTML_REPLACEMENT_EXAMPLE}
-
-
+
+


{L_HTML_REPLACEMENT_EXAMPLE}
+
+
{L_SETTINGS} -
-
-
checked="checked" />
-
+
+
+
checked="checked" />
+
@@ -44,6 +44,7 @@

+ @@ -77,10 +78,10 @@
- - - - + + + + diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index a5cc3363df..02cb055a74 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -24,6 +24,7 @@ + {auth_tpl.TPL} diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index facf5bd127..5d2fd9f77e 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -21,30 +21,30 @@
{L_TITLE} -
-

{L_BOT_NAME_EXPLAIN}
-
-
-
-

{L_BOT_STYLE_EXPLAIN}
-
-
-
-

{L_BOT_LANG_EXPLAIN}
-
-
-
-
-
-
-
-

{L_BOT_AGENT_EXPLAIN}
-
-
-
-

{L_BOT_IP_EXPLAIN}
-
-
+
+

{L_BOT_NAME_EXPLAIN}
+
+
+
+

{L_BOT_STYLE_EXPLAIN}
+
+
+
+

{L_BOT_LANG_EXPLAIN}
+
+
+
+
+
+
+
+

{L_BOT_AGENT_EXPLAIN}
+
+
+
+

{L_BOT_IP_EXPLAIN}
+
+
@@ -64,12 +64,12 @@
{L_BBCODE_TAG}{L_ACTION}
{L_BBCODE_TAG}{L_ACTION}
- - - - - - + + + + + + diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index 980ed4d68e..37b9557d83 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -1,51 +1,57 @@ + -

{L_ACP_RESTORE}

+

{L_ACP_RESTORE}

-

{L_ACP_RESTORE_EXPLAIN}

+

{L_ACP_RESTORE_EXPLAIN}

- -
- {L_RESTORE_OPTIONS} + + +
+ {L_RESTORE_OPTIONS}
-
- -
-   -   - -
- - +
+ + +
+   +   + +
+ + + + -

{L_ACP_BACKUP}

+

{L_ACP_BACKUP}

-

{L_ACP_BACKUP_EXPLAIN}

+

{L_ACP_BACKUP_EXPLAIN}

- + //--> + - -
- {L_BACKUP_OPTIONS} + + +
+ {L_BACKUP_OPTIONS}
 {L_FULL_BACKUP}   {L_STRUCTURE_ONLY}   {L_DATA_ONLY}
@@ -68,11 +74,15 @@

{L_SELECT_ALL}
{L_DESELECT_ALL}
-
-
-   - -
- +
+ +
+   + +
+ + + + \ No newline at end of file diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html index e5e63c6aae..8bd0957786 100644 --- a/phpBB/adm/style/acp_disallow.html +++ b/phpBB/adm/style/acp_disallow.html @@ -10,10 +10,10 @@
{L_ADD_DISALLOW_TITLE} -
-

{L_ADD_DISALLOW_EXPLAIN}
-
-
+
+

{L_ADD_DISALLOW_EXPLAIN}
+
+
@@ -31,16 +31,14 @@
-
- -
- -
+ +
+

{L_NO_DISALLOWED}

-
+ diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index f8eaabf2dc..c974f61eed 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -53,10 +53,10 @@

{L_FORUM_EDIT_EXPLAIN}

-
-

{L_WARNING}

-

{ERROR_MSG}

-
+
+

{L_WARNING}

+

{ERROR_MSG}

+
@@ -69,11 +69,11 @@
style="display: none;"> -
-
-
{L_DELETE_ALL_POSTS}
-
{L_MOVE_POSTS_TO}
-
+
+
+
{L_DELETE_ALL_POSTS}
+
{L_MOVE_POSTS_TO}
+
@@ -101,10 +101,10 @@
-
-

{L_COPY_PERMISSIONS_EXPLAIN}
-
-
+
+

{L_COPY_PERMISSIONS_EXPLAIN}
+
+
@@ -241,10 +241,10 @@

{L_FORUM_DELETE_EXPLAIN}

-
-

{L_WARNING}

-

{ERROR_MSG}

-
+
+

{L_WARNING}

+

{ERROR_MSG}

+
@@ -288,10 +288,10 @@

{L_FORUM_ADMIN_EXPLAIN}

-
-

{L_WARNING}

-

{ERROR_MSG}

-
+
+

{L_WARNING}

+

{ERROR_MSG}

+
@@ -303,30 +303,30 @@

{NAVIGATION} [{L_EDIT} | {L_DELETE} | {L_RESYNC}]

- -
{L_BOT_NAME}{L_BOT_LAST_VISIT}{L_OPTIONS}{L_MARK}
{L_BOT_NAME}{L_BOT_LAST_VISIT}{L_OPTIONS}{L_MARK}
- - - - - - - - - - -
{forums.FOLDER_IMAGE} - {forums.FORUM_NAME}{forums.FORUM_NAME} -
{forums.FORUM_DESCRIPTION} -

{L_TOPICS}: {forums.FORUM_TOPICS} / {L_POSTS}: {forums.FORUM_POSTS} - 		- {L_MOVE_UP} - {L_MOVE_DOWN} - {L_EDIT} - {L_RESYNC} - {L_DELETE} -
- + + + + + + + + + + + + +
{forums.FOLDER_IMAGE} + {forums.FORUM_NAME}{forums.FORUM_NAME} +
{forums.FORUM_DESCRIPTION} +

{L_TOPICS}: {forums.FORUM_TOPICS} / {L_POSTS}: {forums.FORUM_POSTS} + 		+ {L_MOVE_UP} + {L_MOVE_DOWN} + {L_EDIT} + {L_RESYNC} + {L_DELETE} +
+ diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 17193dff2e..471a41cf4c 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -21,15 +21,15 @@
{L_GROUP_DETAILS} -
-
for="group_name">{L_GROUP_NAME}:
-
{GROUP_NAME}
-
-
-
-
-
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}
-
+
+
for="group_name">{L_GROUP_NAME}:
+
{GROUP_NAME}
+
+
+
+
+
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}
+

{L_GROUP_TYPE_EXPLAIN}
@@ -45,44 +45,44 @@ -
-

{L_COPY_PERMISSIONS_EXPLAIN}
-
-
+
+

{L_COPY_PERMISSIONS_EXPLAIN}
+
+
{L_GROUP_SETTINGS_SAVE} -
-
-
-
-
-
-
-
-
-

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
-
-
-
-

{L_GROUP_COLOR_EXPLAIN}
-
  [ {L_COLOUR_SWATCH} ]
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
+
+
+
+

{L_GROUP_COLOR_EXPLAIN}
+
  [ {L_COLOUR_SWATCH} ]
+
+
+
+
+
{L_GROUP_AVATAR} -
-

{L_AVATAR_EXPLAIN}
-
{AVATAR_IMAGE}
-
 {L_DELETE_AVATAR}
-
+
+

{L_AVATAR_EXPLAIN}
+
{AVATAR_IMAGE}
+
 {L_DELETE_AVATAR}
+
@@ -94,14 +94,14 @@
-
-

{L_LINK_REMOTE_AVATAR_EXPLAIN}
-
-
-
-

{L_LINK_REMOTE_SIZE_EXPLAIN}
-
px X px
-
+
+

{L_LINK_REMOTE_AVATAR_EXPLAIN}
+
+
+
+

{L_LINK_REMOTE_SIZE_EXPLAIN}
+
px X px
+
@@ -113,26 +113,26 @@
{L_AVATAR_GALLERY} -
-
-
 
-
-
- - - - - - - - - - - - - -
{avatar_row.avatar_column.AVATAR_NAME}
-
+
+
+
 
+
+
+ + + + + + + + + + + + + +
{avatar_row.avatar_column.AVATAR_NAME}
+
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 1f4e305f95..82bc7fed2f 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -17,34 +17,34 @@
{L_ACP_JABBER_SETTINGS} -
-

{L_JAB_ENABLE_EXPLAIN}
-
checked="checked" /> {L_ENABLED}    checked="checked" /> {L_DISABLED}
-
-
-

{L_JAB_SERVER_EXPLAIN}
-
-
-
-

{L_JAB_PORT_EXPLAIN}
-
-
-
-

{L_JAB_USERNAME_EXPLAIN}
-
-
-
-
-
-
-
-

{L_JAB_RESOURCE_EXPLAIN}
-
-
-
-

{L_JAB_PACKAGE_SIZE_EXPLAIN}
-
-
+
+

{L_JAB_ENABLE_EXPLAIN}
+
checked="checked" /> {L_ENABLED}    checked="checked" /> {L_DISABLED}
+
+
+

{L_JAB_SERVER_EXPLAIN}
+
+
+
+

{L_JAB_PORT_EXPLAIN}
+
+
+
+

{L_JAB_USERNAME_EXPLAIN}
+
+
+
+
+
+
+
+

{L_JAB_RESOURCE_EXPLAIN}
+
+
+
+

{L_JAB_PACKAGE_SIZE_EXPLAIN}
+
+
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index c0a0e8e745..dce0c00de6 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -150,7 +150,9 @@ + + « {L_BACK}

{L_UPLOAD_SETTINGS}

@@ -188,6 +190,7 @@
+

{L_ACP_LANGUAGE_PACKS}

diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 5aec4dba1b..8690103f1e 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -24,45 +24,48 @@ - - - - - - - - - - - - - - - - - - - +
{L_USERNAME}{L_IP}{L_TIME}{L_ACTION}{L_MARK}
- {log.USERNAME} - -
» {log.REPORTEE_USERNAME} - - 		{log.IP}{log.DATE}{log.ACTION}
{log.DATA}
+ + + + + + + - - -
{L_USERNAME}{L_IP}{L_TIME}{L_ACTION}{L_MARK}
+ + + + + + + {log.USERNAME} + +
» {log.REPORTEE_USERNAME} + + + {log.IP} + {log.DATE} + {log.ACTION}
{log.DATA} + + + + + + +

{L_NO_ENTRIES}

+ -
- {L_SELECT_FORUM}: - -
+
+ {L_SELECT_FORUM}: + +
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index e1c0fa9a05..5e2dfc7890 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -14,58 +14,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_FORUM_STATS}
{L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}
{L_NUMBER_POSTS}: {TOTAL_POSTS}{L_POSTS_PER_DAY}: {POSTS_PER_DAY}
{L_NUMBER_TOPICS}: {TOTAL_TOPICS}{L_TOPICS_PER_DAY}: {TOPICS_PER_DAY}
{L_NUMBER_USERS}: {TOTAL_USERS}{L_USERS_PER_DAY}: {USERS_PER_DAY}
{L_NUMBER_FILES}: {TOTAL_FILES}{L_FILES_PER_DAY}: {FILES_PER_DAY}
{L_BOARD_STARTED}: {START_DATE}{L_AVATAR_DIR_SIZE}: {AVATAR_DIR_SIZE}
{L_DATABASE_SIZE}: {DBSIZE}{L_UPLOAD_DIR_SIZE}: {UPLOAD_DIR_SIZE}
{L_GZIP_COMPRESSION}: {GZIP_COMPRESSION}  
{L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}
{L_NUMBER_POSTS}: {TOTAL_POSTS}{L_POSTS_PER_DAY}: {POSTS_PER_DAY}
{L_NUMBER_TOPICS}: {TOTAL_TOPICS}{L_TOPICS_PER_DAY}: {TOPICS_PER_DAY}
{L_NUMBER_USERS}: {TOTAL_USERS}{L_USERS_PER_DAY}: {USERS_PER_DAY}
{L_NUMBER_FILES}: {TOTAL_FILES}{L_FILES_PER_DAY}: {FILES_PER_DAY}
{L_BOARD_STARTED}: {START_DATE}{L_AVATAR_DIR_SIZE}: {AVATAR_DIR_SIZE}
{L_DATABASE_SIZE}: {DBSIZE}{L_UPLOAD_DIR_SIZE}: {UPLOAD_DIR_SIZE}
{L_GZIP_COMPRESSION}: {GZIP_COMPRESSION}  
@@ -115,11 +115,11 @@ - - - - - + + + + + diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 20b2fd4399..bec0e76def 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -57,36 +57,36 @@

{L_EDIT_MODULE_EXPLAIN}

-
-

{L_WARNING}

-

{ERROR_MSG}

-
+
+

{L_WARNING}

+

{ERROR_MSG}

+
{L_GENERAL_OPTIONS} -
-

- {L_MODULE_LANGNAME_EXPLAIN}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
style="display: none;"> +
+

+ {L_MODULE_LANGNAME_EXPLAIN}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
style="display: none;">

{L_MODULE_DISPLAYED_EXPLAIN}
@@ -102,7 +102,7 @@ {L_CHOOSE_MODE_EXPLAIN}
-
+
@@ -122,10 +122,10 @@

{L_ACP_MODULE_MANAGEMENT_EXPLAIN}

-
-

{L_WARNING}

-

{ERROR_MSG}

-
+
+

{L_WARNING}

+

{ERROR_MSG}

+
{L_USERNAME}{L_JOINED}{L_MARK}
{L_USERNAME}{L_JOINED}{L_MARK}
@@ -136,24 +136,24 @@
- - - - - - - - - - - - - -
{modules.MODULE_IMAGE}{modules.MODULE_TITLE} [{L_HIDDEN_MODULE}]{L_MOVE_UP}
{L_MOVE_DOWN}		  - {L_EDIT} | {L_DELETE} | - {L_DISABLE}{L_ENABLE} -  
- + + + + + + + + + + + + + +
{modules.MODULE_IMAGE}{modules.MODULE_TITLE} [{L_HIDDEN_MODULE}]{L_MOVE_UP}
{L_MOVE_DOWN}		  + {L_EDIT} | {L_DELETE} | + {L_DISABLE}{L_ENABLE} +  
+ diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 8e1076d701..9538af8451 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -8,8 +8,10 @@ \ No newline at end of file diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index ce260d1b98..55186376ef 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -11,10 +11,10 @@

{L_EXPLAIN}

-
-

{L_WARNING}

-

{ERROR_MSG}

-
+
+

{L_WARNING}

+

{ERROR_MSG}

+
@@ -23,38 +23,38 @@
{L_TITLE} -
-

{L_FIELD_TYPE_EXPLAIN}
-
{FIELD_TYPE}
-
-
-

{L_FIELD_IDENT_EXPLAIN}
-
-
-
-

{L_DISPLAY_PROFILE_FIELD_EXPLAIN}
-
checked="checked" /> {L_YES} checked="checked" /> {L_NO}
-
+
+

{L_FIELD_TYPE_EXPLAIN}
+
{FIELD_TYPE}
+
+
+

{L_FIELD_IDENT_EXPLAIN}
+
+
+
+

{L_DISPLAY_PROFILE_FIELD_EXPLAIN}
+
checked="checked" /> {L_YES} checked="checked" /> {L_NO}
+
{L_VISIBILITY_OPTION} -
-
-
checked="checked" />
-
-
-

{L_DISPLAY_AT_REGISTER_EXPLAIN}
-
checked="checked" />
-
-
-

{L_REQUIRED_FIELD_EXPLAIN}
-
checked="checked" />
-
-
-

{L_HIDE_PROFILE_FIELD_EXPLAIN}
-
checked="checked" />
-
+
+
+
checked="checked" />
+
+
+

{L_DISPLAY_AT_REGISTER_EXPLAIN}
+
checked="checked" />
+
+
+

{L_REQUIRED_FIELD_EXPLAIN}
+
checked="checked" />
+
+
+

{L_HIDE_PROFILE_FIELD_EXPLAIN}
+
checked="checked" />
+
@@ -65,31 +65,31 @@
{L_LANG_SPECIFIC} +
+
+
+
+
+

{L_FIELD_DESCRIPTION_EXPLAIN}
+
+
+
-
-
+

{L_DEFAULT_VALUE_EXPLAIN}
+
+ +
-

{L_FIELD_DESCRIPTION_EXPLAIN}
-
+

{L_LANG_OPTIONS_EXPLAIN}
+ +
+ +
{L_FIRST_OPTION}
+
{L_SECOND_OPTION}
+
- -
-

{L_DEFAULT_VALUE_EXPLAIN}
-
-
- - -
-

{L_LANG_OPTIONS_EXPLAIN}
- -
- -
{L_FIRST_OPTION}
-
{L_SECOND_OPTION}
- -
- +
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index ee8c337725..924e2d4fb3 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -8,7 +8,6 @@ -

{L_ACP_SEARCH_INDEX}

+ - - {L_CONTINUE} +

{L_ACP_SEARCH_INDEX}

+ +

{L_ACP_SEARCH_INDEX_EXPLAIN}

+ + + {L_CONTINUE} + +

{L_CONTINUE_EXPLAIN}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
» {L_INDEX_STATS}: {backend.L_NAME} ({L_ACTIVE})
{L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}
{backend.data.STATISTIC_1}:{backend.data.VALUE_1}{backend.data.STATISTIC_2}:{backend.data.VALUE_2}
+ + + + + {backend.S_HIDDEN_FIELDS} + +
+ + + + + +
+ + + + + -

{L_CONTINUE_EXPLAIN}

- - - - - - - - - - - - - - - - - - - - - - - - -
» {L_INDEX_STATS}: {backend.L_NAME} ({L_ACTIVE})
{L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}
{backend.data.STATISTIC_1}:{backend.data.VALUE_1}{backend.data.STATISTIC_2}:{backend.data.VALUE_2}
- -
-{backend.S_HIDDEN_FIELDS} -
- - - - - -
-
- - \ No newline at end of file diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 3a5b6330db..83e5e6c639 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -39,352 +39,367 @@

{L_EXPLAIN}

-
- - + +
{L_SELECT_IMAGE}: + + - - - + + + + + + + + +
{L_SELECT_IMAGE}:  
- - - - - - - - - - - - - - - - - - - - - - - + + + - -
{L_EDIT_IMAGESET}
{L_IMAGESET_UPDATED}
{L_NO_IMAGE}
- - - - - - - - -
{L_CURRENT_IMAGE}{L_SELECTED_IMAGE}
{L_IMAGE_PARAMETER}{L_IMAGE_VALUE}
{L_IMAGE}:   +
+ + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - -
{L_EDIT_IMAGESET}
{L_IMAGESET_UPDATED}
{L_NO_IMAGE}
+ + + + + + + + + +
{L_CURRENT_IMAGE}{L_SELECTED_IMAGE}
+
{L_IMAGE_PARAMETER}{L_IMAGE_VALUE}
{L_IMAGE}:
{L_INCLUDE_DIMENSIONS}:
{L_DIMENSIONS_EXPLAIN}		 checked="checked" /> {L_YES}   checked="checked" /> {L_NO}
  
+ +
{L_INCLUDE_DIMENSIONS}:
{L_DIMENSIONS_EXPLAIN}		 checked="checked" /> {L_YES}   checked="checked" /> {L_NO}
  
+
+ + + + - - « {L_BACK} + -

{L_EDIT_TEMPLATE}

+ « {L_BACK} -

{L_EDIT_TEMPLATE_EXPLAIN}

+

{L_EDIT_TEMPLATE}

-

{L_SELECTED_TEMPLATE}: {SELECTED_TEMPLATE}

+

{L_EDIT_TEMPLATE_EXPLAIN}

-
+

{L_SELECTED_TEMPLATE}: {SELECTED_TEMPLATE}

-
- {L_SELECT_TEMPLATE} + + +
+ {L_SELECT_TEMPLATE}
-
+
-
+ - - + +
+ +
+ {L_TEMPLATE_EDITOR} +
+
+
{TEMPLATE_FILE}
+
+
+
+
+
+ +
+ +
+ {S_HIDDEN_FIELDS} + +
+ +
+ + + + + -
+ //--> + -
- {L_TEMPLATE_EDITOR} -
-
-
{TEMPLATE_FILE}
-
-
-
-
-
- -
+ « {L_BACK} -
- {S_HIDDEN_FIELDS} - -
+

{L_EDIT_THEME}

+

{L_EDIT_THEME_EXPLAIN}

-
- +

{L_SELECTED_THEME}: {SELECTED_THEME}

- + +

{L_SHOW_CSS_NOTE}

+

{L_SHOW_CSS_EXPLAIN}

+ - - - « {L_BACK} - -

{L_EDIT_THEME}

- -

{L_EDIT_THEME_EXPLAIN}

- -

{L_SELECTED_THEME}: {SELECTED_THEME}

- - -

{L_SHOW_CSS_NOTE}

-

{L_SHOW_CSS_EXPLAIN}

- - -
-
- {L_SELECT_CLASS} +
+ {L_SELECT_CLASS}
-
-
-
{S_CLASS}
-
+
+
+
{S_CLASS}
+
-
- +
+ + - + -
+ - + -
- {L_THEME_EDITOR} -
-
-
-
- -
+
+ {L_THEME_EDITOR} +
+
+
+
+ +
- + -
- {L_BACKGROUND} -
-

{L_CSS_COLOUR_EXPLAIN}
-
  [ {L_COLOUR_SWATCH} ]
-
-
-
-
-
-
-
-
-
-
+
+ {L_BACKGROUND} +
+

{L_CSS_COLOUR_EXPLAIN}
+
  [ {L_COLOUR_SWATCH} ]
+
+
+
+
+
+
+
+
+
+
-
- {L_FOREGROUND} -
-

{L_CSS_COLOUR_EXPLAIN}
-
  [ {L_COLOUR_SWATCH} ]
-
-
-

{L_FONT_FACE_EXPLAIN}
-
-
-
-
-
-
-
-
-
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
-
-
-
-
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
-
-
-
-
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
-
-
-
-
-
-
+
+ {L_FOREGROUND} +
+

{L_CSS_COLOUR_EXPLAIN}
+
  [ {L_COLOUR_SWATCH} ]
+
+
+

{L_FONT_FACE_EXPLAIN}
+
+
+
+
+
+
+
+
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
+
+
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
+
+
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
+
+
+
+
+
- + + +
+ {S_HIDDEN_FIELDS} +   + +   + +   + + +
+ +
-
- {S_HIDDEN_FIELDS} -   - -   - -   - -
- +
+

{L_CUSTOM_CLASS}

- +

{L_CUSTOM_CLASS_EXPLAIN}

-
-

{L_CUSTOM_CLASS}

+
-

{L_CUSTOM_CLASS_EXPLAIN}

- - - -
- {L_CUSTOM_CLASS} +
+ {L_CUSTOM_CLASS}
-
+
-
- -
+
+ +
+ +
+ + - - + @@ -398,17 +413,17 @@
- - - - - - - - - - - + + + + + + + + + + + @@ -416,11 +431,12 @@ - + - + +
{L_CACHE_FILENAME}{L_CACHE_FILESIZE}{L_CACHE_CACHED}{L_CACHE_MODIFIED}{L_MARK}
{L_CACHE_FILENAME}{L_CACHE_FILESIZE}{L_CACHE_CACHED}{L_CACHE_MODIFIED}{L_MARK}
{file.FILENAME} {file.FILESIZE}{file.MODIFIED}
{L_TEMPLATE_CACHE_EMPTY}
@@ -428,7 +444,9 @@
+
+ « {L_BACK} @@ -438,10 +456,10 @@

{L_EXPLAIN}

-
-

{L_WARNING}

-

{ERROR_MSG}

-
+
+

{L_WARNING}

+

{ERROR_MSG}

+
@@ -453,18 +471,18 @@
{NAME}
-
-
-
  {L_YES}    {L_NO}
-
-
-
-
  {L_YES}    {L_NO}
-
-
-
-
  {L_YES}    {L_NO}
-
+
+
+
  {L_YES}    {L_NO}
+
+
+
+
  {L_YES}    {L_NO}
+
+
+
+
  {L_YES}    {L_NO}
+

{L_DOWNLOAD_STORE_EXPLAIN}
@@ -523,27 +541,27 @@ {L_UNINSTALLED} - - {L_NO_UNINSTALLED} - + + {L_NO_UNINSTALLED} + - - colspan="2">{uninstalled.NAME}
{L_COPYRIGHT}: {uninstalled.COPYRIGHT} - {L_INSTALL} - + + colspan="2">{uninstalled.NAME}
{L_COPYRIGHT}: {uninstalled.COPYRIGHT} + {L_INSTALL} + - +
{L_CREATE}: {L_FROM}
- + @@ -555,10 +573,10 @@

{L_EXPLAIN}

-
-

{L_WARNING}

-

{ERROR_MSG}

-
+
+

{L_WARNING}

+

{ERROR_MSG}

+
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index a787d9283f..8e0747a1ae 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -437,11 +437,11 @@
{L_ACP_USER_AVATAR} -
-

{L_AVATAR_EXPLAIN}
-
{AVATAR_IMAGE}
-
 {L_DELETE_AVATAR}
-
+
+

{L_AVATAR_EXPLAIN}
+
{AVATAR_IMAGE}
+
 {L_DELETE_AVATAR}
+
@@ -474,26 +474,26 @@
{L_AVATAR_GALLERY} -
-
-
 
-
-
- - - - - - - - - - - - - -
{avatar_row.avatar_column.AVATAR_NAME}
-
+
+
+
 
+
+
+ + + + + + + + + + + + + +
{avatar_row.avatar_column.AVATAR_NAME}
+
@@ -515,10 +515,10 @@
{L_ACP_USER_RANK} -
-
-
-
+
+
+
+
@@ -562,10 +562,10 @@ -
- {L_ADMIN_SIG_PREVIEW} -

{SIGNATURE_PREVIEW}

-
+
+ {L_ADMIN_SIG_PREVIEW} +

{SIGNATURE_PREVIEW}

+
@@ -591,19 +591,19 @@ {L_CLOSE_TAGS}

-
-
-
-
-
-   {L_DISABLE_BBCODE}   -   {L_DISABLE_SMILIES}   -   {L_DISABLE_MAGIC_URL}   -

{L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {SMILIES_STATUS} -
-
+
+
+
+
+
+   {L_DISABLE_BBCODE}   +   {L_DISABLE_SMILIES}   +   {L_DISABLE_MAGIC_URL}   +

{L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {SMILIES_STATUS} +
+
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index b17e80a8e8..ca02124956 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -40,11 +40,11 @@ - - - - - + + + + + diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 67cd36ae16..759a5e0749 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1,8 +1,6 @@ /* phpBB 3.0 Admin Style Sheet ------------------------------------------------------------------------ Original author: subBlue ( http://www.subBlue.com/ ) - Official update: $Id$ - Copyright 2006 phpBB Group ( http://www.phpbb.com/ ) ------------------------------------------------------------------------ */ @@ -14,12 +12,14 @@ /* Reset browsers default margin, padding and font sizes */ margin: 0; padding: 0; - } +} + html { font-size: 100%; height: 100%; margin-bottom: 1px; - } +} + body { /* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */ font-family: Verdana, Helvetica, Arial, sans-serif; @@ -27,48 +27,55 @@ body { background: #E4EDF0 url("../images/bg_header.gif") 0 0 repeat-x; font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */ margin: 0; - } +} + img { border: 0; - } +} + h1 { font: bold 1.8em 'Trebuchet MS', Verdana, sans-serif; text-decoration: none; color: #333333; - } +} + h2, caption { font: bold 1.2em Arial, Helvetica, sans-serif; text-decoration: none; line-height: 120%; text-align: left; margin-top: 25px; - } +} + p { margin-bottom: 0.7em; line-height: 1.4em; font-size: 1.1em; - } +} + hr { border: 0 none; border-top: 1px solid #999999; margin-bottom: 5px; padding-bottom: 5px; height: 1px; - } +} + .small { font-size: 1em; - } +} /* General links */ a:link, a:active, a:visited { color: #006699; text-decoration: none; - } +} + a:hover { color: #DD6900; text-decoration: underline; - } +} /* Main blocks @@ -76,45 +83,54 @@ a:hover { #wrap { padding: 0 20px 15px 20px; min-width: 615px; - } +} + #page-header { text-align: right; background: url("../images/phpbb_logo.gif") 0 0 no-repeat; height: 84px; - } +} + #page-header h1 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 1.5em; font-weight: normal; padding-top: 15px; - } +} + #page-header p { font-size: 1.1em; - } +} + #page-body { clear: both; - } +} + #page-footer { clear: both; font-size: 1em; text-align: center; - } +} + #content { padding: 30px 10px 10px 10px; - } +} + #content h1 { line-height: 1.2em; margin-bottom: 0px; - } +} + #main { float:left; width: 76%; margin-left: 3%; min-height: 350px; - } +} + * html #main { height: 350px; - } +} /* Tabbed menu @@ -124,19 +140,22 @@ a:hover { line-height: normal; margin: 0 0 -6px 7px; min-width: 570px; - } +} + #tabs ul { margin:0; padding: 0; list-style: none; - } +} + #tabs li { display: inline; margin: 0; padding: 0; font-size: 1em; font-weight: bold; - } +} + #tabs a { float:left; background:url("../images/bg_tabs1.gif") no-repeat 0% -35px; @@ -144,7 +163,8 @@ a:hover { padding: 0 0 0 6px; text-decoration: none; position: relative; - } +} + #tabs a span { float: left; display: block; @@ -153,32 +173,38 @@ a:hover { color: #536482; white-space: nowrap; text-transform: uppercase; - } +} + /* Commented Backslash Hack hides rule from IE5-Mac \*/ #tabs a span { float:none; } /* End hack */ #tabs a:hover span { color: #DD6900; - } +} + #tabs #activetab a { background-position: 0 0px; border-bottom: 1px solid #FFFFFF; - } +} + #tabs #activetab a span { background-position: 100% 0px; padding-bottom: 7px; color: #333333; - } +} + #tabs a:hover { background-position: 0 -70px; - } +} + #tabs a:hover span { background-position:100% -70px; - } +} + #tabs #activetab a:hover span { color: #333333; - } +} /* Main Panel @@ -187,11 +213,12 @@ a:hover { margin: 4px 0; background-color: #FFFFFF; border: solid 1px #A9B8C2; - } +} + span.corners-top, span.corners-bottom, span.corners-top span, span.corners-bottom span { display: none; - } +} /* Sub-navigation Menu @@ -201,20 +228,22 @@ span.corners-top span, span.corners-bottom span { width: 20%; font-size: 100%; padding: 0; - } +} + #menu p { font-size: 1em; - } +} + #menu ul { list-style: none; - } +} /* Default list state */ #menu li { font-size: 1em; font-weight: bold; display: inline; - } +} /* Link styles for the sub-section links */ #menu li span { @@ -226,17 +255,20 @@ span.corners-top span, span.corners-bottom span { font-weight: bold; background-color: #ECECEC; border-top: 1px solid #FFFFFF; - } +} + #menu li a:hover span, #menu li#activemenu span { text-decoration: none; background-color: #FFA34F; color: #FFFFFF; - } +} + #menu li span.completed { text-decoration: none; background-color: #B9DBB3; color: #006699; - } +} + #menu li.header { display: block; padding: 5px; @@ -247,17 +279,19 @@ span.corners-top span, span.corners-bottom span { background: #006699 url("../images/cellpic3.gif") 0 0 repeat-x; margin-top: 5px; text-transform: uppercase; - } +} + #menu li#activemenu a span { text-decoration: none; font-weight: bold; color: #000; background-color: #DADFE4; - } +} + #menu li#activemenu a:hover span { text-decoration: none; color: #000; - } +} /* Table styles @@ -266,22 +300,25 @@ span.corners-top span, span.corners-bottom span { table { width: 100%; /*background-color: #ACBBC6;*/ - } +} + th, td { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 1.1em; text-align: left; - } -th { +} + +th { padding: 6px 4px; color: #FFA34F; font-weight: bold; background: #006699 url("../images/cellpic3.gif") 0 0 repeat-x; - } +} + td { padding: 4px; line-height: 1.2em; - } +} .row1 { background-color: #EFEFEF; } .row2 { background-color: #DEE3E7; } @@ -294,24 +331,26 @@ td { background-color: #D1D7DC; height: 1px; line-height: 1px; - } +} table.type2 { border: none; background: none; padding: 0; width: 0; - } +} + table.type2 th { background: none; border-top: none; text-align: center; color: #FFA34F; padding: 2px 0; - } +} + table.type2 td { padding: 0; - } +} /* General form styles @@ -325,13 +364,16 @@ fieldset { border-top: 1px solid #D5D5C8; background-color: #ECECEC; position: relative; - } +} + * html fieldset { padding: 0 10px 5px 10px; - } +} + fieldset p { font-size: 1.1em; - } +} + legend { padding: 1px 0; font-family: arial,Verdana,Sans-serif; @@ -343,12 +385,13 @@ legend { line-height: 100%; top: 0em; vertical-align:middle; - } +} + * html legend { margin-bottom: -10px; margin-left: -7px; top: -1.2em; - } +} input { font-family: Verdana, Helvetica, Arial, sans-serif; @@ -363,7 +406,8 @@ input { padding: 2px; cursor: text; vertical-align: middle; - } +} + select { font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 100%; @@ -375,17 +419,21 @@ select { border: 1px solid #666666; padding: 1px; background-color: #FAFAFA; - } +} + optgroup { font-weight: bold; - } +} + option { padding-right: 1em; - } +} + .sep { color: black; background-color: #FFA34F; - } +} + textarea { font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 100%; @@ -397,19 +445,22 @@ textarea { border-right: 1px solid #D5D5C8; border-bottom: 1px solid #D5D5C8; cursor: text; - } +} + label { cursor:pointer; font-size: 1.1em; padding-right: 5px; - } +} + label input { font-size: 100%; vertical-align: middle; - } +} + label img { vertical-align: middle; - } +} fieldset.quick { margin: 0 0 5px 0; @@ -418,14 +469,16 @@ fieldset.quick { background-color: transparent; text-align: right; font-size: 1.1em; - } +} + fieldset.nobg { margin: 15px 0 0 0; padding: 0; border: none; background-color: transparent; font-size: 1.1em; - } +} + fieldset.display-options { margin: 15px 0 2px 0; padding: 0 0 4px 0; @@ -433,21 +486,23 @@ fieldset.display-options { background-color: transparent; text-align: center; font-size: 1.1em; - } +} + fieldset.display-options select, fieldset.display-options input, fieldset.display-options label { font-size: 100%; vertical-align: middle; - } +} + select option.disabled { background-color: #bbb; color: #fff; - } +} /* Special case inputs */ select#board_timezone, select#full_folder_action { width: 95%; - } +} /* Definition list layout for forms @@ -455,11 +510,12 @@ select#full_folder_action { ---------------------------------------- */ dl { font-family: Verdana, Helvetica, Arial, sans-serif; - } +} + dt { float: left; width: auto; - } +} dd { color: #000; } dd + dd { padding-top: 5px; } @@ -471,46 +527,55 @@ dt label { font-size: 100%; text-align: left; font-weight: bold; - } +} + dd label { white-space: nowrap; margin-right: 10px; - } +} html>body dd label input { vertical-align: text-bottom; } /* Tweak for Moz to align checkboxes/radio buttons nicely */ + dd input, dd select { max-width: 100%; - } +} + dd textarea { width: 100%; - } +} + input.radio { width: auto !important; background-color: transparent; border: none; cursor: default; - } +} + dd select { width: auto; font-size: 100%; - } +} + fieldset dl { margin-bottom: 10px; font-size: 1.1em; - } +} + fieldset dt { width: 45%; text-align: left; border-right: 1px solid #CCC; padding-top: 3px; - } +} + fieldset dd { margin-left: 45%; padding-left: 5px; border-left: 1px solid #CCC; vertical-align: top; - } +} + dd.full { margin-left: 0; border: 0; @@ -518,15 +583,16 @@ dd.full { padding-top: 3px; text-align: center; width: 95%; - } +} /* Hover highlights for form rows */ fieldset dl:hover dt label { color: #000000; - } +} + input:focus, textarea:focus { color: #000000; - } +} /* Submit button fieldset @@ -537,10 +603,11 @@ fieldset.submit-buttons { margin: 0; padding: 4px; margin-top: -1px; - } +} + fieldset.submit-buttons input { padding: 3px 2px; - } +} /* Input field styles @@ -556,29 +623,33 @@ fieldset.submit-buttons input { padding:2px; cursor: text; width: 75%; - } +} + select.inputbox { cursor: pointer; padding: 0; width: auto; - } +} + .inputbox:hover { border-left: 1px solid #AFAEAA; border-top: 1px solid #AFAEAA; border-right: 1px solid #AFAEAA; border-bottom: 1px solid #AFAEAA; background-color: #E9E9E2; - } +} + .inputbox:focus { border: 1px solid #BC2A4D; background-color: #E9E9E2; color: #BC2A4D; - } +} input.full, textarea.full { width: 99%; - } +} + * html input.full, * html textarea.full { width: 95%; } input.medium { width: 50%; } input.narrow { width: 25%; } @@ -596,11 +667,13 @@ input.autowidth { width: auto !important; } margin-top: 5px; font-size: 1em; padding-bottom: 2px; - } +} + .pagination strong, .pagination b { font-weight: normal; - } +} + .pagination span strong { padding: 0 2px; margin: 0 2px; @@ -608,7 +681,8 @@ input.autowidth { width: auto !important; } color: #FFFFFF; background: #069; border: 1px solid #069; - } +} + .pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active { font-weight: normal; text-decoration: none; @@ -617,16 +691,18 @@ input.autowidth { width: auto !important; } padding: 0 2px; background: #ECEDEE; border: 1px solid #B4BAC0; - } +} + .pagination span a:hover { border-color: #069; background: #069; color: #FFF; text-decoration: none; - } +} + .pagination img { vertical-align: middle; - } +} /* Form button styles @@ -639,14 +715,16 @@ a.button2, input.button2 { color: #000; background-color: #EFEFEF; cursor: pointer; - } +} + a.button1, input.button1 { font-weight: bold; border: 1px solid #666666; - } +} + a.button2, input.button2 { border: 1px solid #666666; - } +} /* button in the style of the form buttons */ a.button1, a.button1:link, a.button1:visited, a.button1:active, @@ -654,7 +732,7 @@ a.button2, a.button2:link, a.button2:visited, a.button2:active { text-decoration: none; color: #000000; padding: 4px 8px; - } +} /* Permission related ---------------------------------------- */ @@ -823,55 +901,65 @@ table.pmask td.name { ---------------------------------------- */ .success { color: #282 !important; - } +} + .error { color: #BC2A4D !important; - } +} + .successbox, .errorbox { padding: 10px; margin: 20px 0; color: #1F5B13; text-align: center; - } +} + .successbox { background-color: #B9DBB3; - } +} + .errorbox { background-color: #ECECEC; - } +} + .successbox h3, .errorbox h3 { font-weight: bold; font-size: 1.4em; margin-bottom: 0.5em; - } +} + .successbox p, .errorbox p { font-size: 1.1em; margin-bottom: 0; - } +} + .successbox a, .errorbox a { font-weight: bold; text-decoration: none; - } +} /* Special cases for the error page */ #errorpage #page-header a { font-weight: bold; line-height: 6em; - } +} + #errorpage #content { padding-top: 10px; - } +} + #errorpage #content h1 { color: #DF075C; - } +} + #errorpage #content h2 { margin-top: 20px; margin-bottom: 5px; border-bottom: 1px solid #CCCCCC; padding-bottom: 5px; color: #333333; - } +} /* Tooltip for permission roles */ .tooltip { @@ -896,10 +984,11 @@ table.pmask td.name { */ #format-buttons { margin: 15px 0 2px 0; - } +} + #format-buttons input, #format-buttons select { vertical-align: middle; - } +} /* Nice method for clearing floated blocks without having to insert any extra markup From http://www.positioniseverything.net/easyclearing.html */ @@ -910,6 +999,7 @@ table.pmask td.name { clear: both; visibility: hidden; } + /* Hide from Mac IE, Windows IE uses this as it doesn't support the :after method above \*/ .clearfix, #tabs, .row, #content, fieldset dl, #page-body { height: 1%; @@ -927,27 +1017,34 @@ table.pmask td.name { text-align: right; padding: 0px; } + .source { font-family: 'Courier New', monospace; font-size: 125%; line-height: 120%; padding: 0px; } + .syntaxbg { color: #FFFFFF; - } +} + .syntaxcomment { color: #FF8000; - } +} + .syntaxdefault { color: #0000BB; - } +} + .syntaxhtml { color: #000000; - } +} + .syntaxkeyword { color: #007700; - } +} + .syntaxstring { color: #DD0000; - } \ No newline at end of file +} diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js index c9a93bd7bf..ef52b65998 100644 --- a/phpBB/adm/style/editor.js +++ b/phpBB/adm/style/editor.js @@ -1,5 +1,7 @@ -// bbCode control by subBlue design [ www.subBlue.com ] -// Includes unixsafe colour palette selector by SHS` +/** +* bbCode control by subBlue design [ www.subBlue.com ] +* Includes unixsafe colour palette selector by SHS` +*/ // Startup variables var imageTag = false; @@ -10,51 +12,74 @@ var theSelection = false; var clientPC = navigator.userAgent.toLowerCase(); // Get client info var clientVer = parseInt(navigator.appVersion); // Get browser version -var is_ie = ((clientPC.indexOf("msie") != -1) && (clientPC.indexOf("opera") == -1)); -var is_nav = ((clientPC.indexOf('mozilla')!=-1) && (clientPC.indexOf('spoofer')==-1) - && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera')==-1) - && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1)); +var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1)); +var is_nav = ((clientPC.indexOf('mozilla') != -1) && (clientPC.indexOf('spoofer') == -1) && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera') == -1) && (clientPC.indexOf('webtv') == -1) && (clientPC.indexOf('hotjava') == -1)); -var is_win = ((clientPC.indexOf("win")!=-1) || (clientPC.indexOf("16bit") != -1)); -var is_mac = (clientPC.indexOf("mac")!=-1); +var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); +var is_mac = (clientPC.indexOf('mac') != -1); -// Shows the help messages in the helpline window -function helpline(help) { - document.forms[form_name].helpbox.value = eval(help + "_help"); +/** +* Shows the help messages in the helpline window +*/ +function helpline(help) +{ + document.forms[form_name].helpbox.value = eval(help + '_help'); } -// Replacement for arrayname.length property -function getarraysize(thearray) { - for (i = 0; i < thearray.length; i++) { - if ((thearray[i] == "undefined") || (thearray[i] == "") || (thearray[i] == null)) +/** +* Replacement for arrayname.length property +*/ +function getarraysize(thearray) +{ + for (i = 0; i < thearray.length; i++) + { + if (thearray[i] == 'undefined' || thearray[i] == '' || thearray[i] == null) + { return i; } + } + return thearray.length; } -// Replacement for arrayname.push(value) not implemented in IE until version 5.5 -// Appends element to the array -function arraypush(thearray,value) { - thearray[ getarraysize(thearray) ] = value; +/** +* Replacement for arrayname.push(value) not implemented in IE until version 5.5 +* Appends element to the array +*/ +function arraypush(thearray,value) +{ + thearray[getarraysize(thearray)] = value; } -// Replacement for arrayname.pop() not implemented in IE until version 5.5 -// Removes and returns the last element of an array -function arraypop(thearray) { +/** +* Replacement for arrayname.pop() not implemented in IE until version 5.5 +* Removes and returns the last element of an array +*/ +function arraypop(thearray) +{ thearraysize = getarraysize(thearray); retval = thearray[thearraysize - 1]; delete thearray[thearraysize - 1]; + return retval; } -function smiley(text) { +/** +* Insert emoticon +*/ +function smiley(text) +{ text = ' ' + text + ' '; - if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) { + + if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) + { var caretPos = document.forms[form_name].elements[text_name].caretPos; caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text; document.forms[form_name].elements[text_name].focus(); - } else { + } + else + { var selStart = document.forms[form_name].elements[text_name].selectionStart; var selEnd = document.forms[form_name].elements[text_name].selectionEnd; @@ -65,75 +90,23 @@ function smiley(text) { } } -function bbfontstyle(bbopen, bbclose) { - if ((clientVer >= 4) && is_ie && is_win) { - theSelection = document.selection.createRange().text; - if (!theSelection) { - insert_text(bbopen + bbclose); - document.forms[form_name].elements[text_name].focus(); - return; - } - document.selection.createRange().text = bbopen + theSelection + bbclose; - document.forms[form_name].elements[text_name].focus(); - return; - } else { - insert_text(bbopen + bbclose); - document.forms[form_name].elements[text_name].focus(); - return; - } - storeCaret(document.forms[form_name].elements[text_name]); -} - -function insert_text(text) { - if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) { - var caretPos = document.forms[form_name].elements[text_name].caretPos; - caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text; - } else { - var selStart = document.forms[form_name].elements[text_name].selectionStart; - var selEnd = document.forms[form_name].elements[text_name].selectionEnd; - - mozWrap(document.forms[form_name].elements[text_name], text, '') - document.forms[form_name].elements[text_name].selectionStart = selStart + text.length; - document.forms[form_name].elements[text_name].selectionEnd = selEnd + text.length; - } -} - -function attach_inline() { - insert_text('[attachment=' + document.forms[form_name].elements['attachments'].value + ']' + document.forms[form_name].elements['attachments'].options[document.forms[form_name].elements['attachments'].selectedIndex].text + '[/attachment]'); -} - -function bbstyle(bbnumber) { - - donotinsert = false; +/** +* Apply bbcodes +*/ +function bbfontstyle(bbopen, bbclose) +{ theSelection = false; - bblast = 0; document.forms[form_name].elements[text_name].focus(); - if (bbnumber == -1) { // Close all open tags & default button names - while (bbcode[0]) { - butnumber = arraypop(bbcode) - 1; - document.forms[form_name].elements[text_name].value += bbtags[butnumber + 1]; - buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value'); - if (buttext != "[*]") - { - eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"'); - } - } - document.forms[form_name].addbbcode10.value = "List"; - bbtags[10] = "[list]"; - document.forms[form_name].addbbcode12.value = "List="; - bbtags[12] = "[list=]"; - imageTag = false; // All tags are closed including image tags :D - document.forms[form_name].elements[text_name].focus(); - return; - } - if ((clientVer >= 4) && is_ie && is_win) { - theSelection = document.selection.createRange().text; // Get text selection - if (theSelection) { + // Get text selection + theSelection = document.selection.createRange().text; + + if (theSelection) + { // Add tags around selection - document.selection.createRange().text = bbtags[bbnumber] + theSelection + bbtags[bbnumber+1]; + document.selection.createRange().text = bbopen + theSelection + bbclose; document.forms[form_name].elements[text_name].focus(); theSelection = ''; return; @@ -141,99 +114,296 @@ function bbstyle(bbnumber) { } else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) { - mozWrap(document.forms[form_name].elements[text_name], bbtags[bbnumber], bbtags[bbnumber+1]); + mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose); + document.forms[form_name].elements[text_name].focus(); + theSelection = ''; + return; + } + + // Close image tag before adding + if (imageTag) + { + insert_text(bbtags[15]); + + // Remove the close image tag from the list + lastValue = arraypop(bbcode) - 1; + + // Return button back to normal state + document.forms[form_name].addbbcode14.value = 'Img'; + imageTag = false; + } + + // Open tag + insert_text(bbopen + bbclose); + + document.forms[form_name].elements[text_name].focus(); + + storeCaret(document.forms[form_name].elements[text_name]); + return; +} + +/** +* Insert text at position +*/ +function insert_text(text) +{ + if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) + { + var caretPos = document.forms[form_name].elements[text_name].caretPos; + caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text; + } + else if (document.forms[form_name].elements[text_name].selectionStart) + { + var selStart = document.forms[form_name].elements[text_name].selectionStart; + var selEnd = document.forms[form_name].elements[text_name].selectionEnd; + + mozWrap(document.forms[form_name].elements[text_name], text, '') + document.forms[form_name].elements[text_name].selectionStart = selStart + text.length; + document.forms[form_name].elements[text_name].selectionEnd = selEnd + text.length; + } + else + { + document.forms[form_name].elements[text_name].value = document.forms[form_name].elements[text_name].value + text; + } +} + +/** +* Add inline attachment at position +*/ +function attach_inline() +{ + insert_text('[attachment=' + document.forms[form_name].elements['attachments'].value + ']' + document.forms[form_name].elements['attachments'].options[document.forms[form_name].elements['attachments'].selectedIndex].text + '[/attachment]'); + document.forms[form_name].elements[text_name].focus(); +} + +/** +* Add quote text to message +*/ +function addquote(post_id, username) +{ + var message_name = 'message_' + post_id; + var theSelection = ''; + var divarea = false; + + if (document.all) + { + eval('divarea = document.all.' + message_name + ';'); + } + else + { + eval("divarea = document.getElementById('" + message_name + "');"); + } + + // Get text selection - not only the post content :( + if (window.getSelection) + { + theSelection = window.getSelection().toString(); + } + else if (document.getSelection) + { + theSelection = document.getSelection(); + } + else if (document.selection) + { + theSelection = document.selection.createRange().text; + } + + if (theSelection == '') + { + if (document.all) + { + theSelection = divarea.innerText; + } + else if (divarea.textContent) + { + theSelection = divarea.textContent; + } + else if (divarea.firstChild.nodeValue) + { + theSelection = divarea.firstChild.nodeValue; + } + } + + if (theSelection) + { + insert_text('[quote="' + username + '"]' + theSelection + '[/quote]'); + } + + return; +} + +/** +* bbstyle +*/ +function bbstyle(bbnumber) +{ + donotinsert = false; + theSelection = false; + bblast = 0; + document.forms[form_name].elements[text_name].focus(); + + // Close all open tags & default button names + if (bbnumber == -1) + { + while (bbcode[0]) + { + butnumber = arraypop(bbcode) - 1; + document.forms[form_name].elements[text_name].value += bbtags[butnumber + 1]; + buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value'); + + if (buttext != '[*]') + { + eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"'); + } + } + + document.forms[form_name].addbbcode10.value = 'List'; + bbtags[10] = '[list]'; + + document.forms[form_name].addbbcode12.value = 'List='; + bbtags[12] = '[list=]'; + + // All tags are closed including image tags :D + imageTag = false; + document.forms[form_name].elements[text_name].focus(); + + return; + } + + // [*] doesn't have an end tag + noEndTag = (bbtags[bbnumber] == '[*]') + + if ((clientVer >= 4) && is_ie && is_win) + { + // Get text selection + theSelection = document.selection.createRange().text; + + if (theSelection) + { + // Add tags around selection + document.selection.createRange().text = bbtags[bbnumber] + theSelection + ((!noEndTag) ? bbtags[bbnumber+1] : ''); + document.forms[form_name].elements[text_name].focus(); + theSelection = ''; + return; + } + } + else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) + { + mozWrap(document.forms[form_name].elements[text_name], bbtags[bbnumber], ((!noEndTag) ? bbtags[bbnumber+1] : '')); document.forms[form_name].elements[text_name].focus(); theSelection = ''; return; } // Find last occurance of an open tag the same as the one just clicked - for (i = 0; i < bbcode.length; i++) { - if (bbcode[i] == bbnumber+1) { + for (i = 0; i < bbcode.length; i++) + { + if (bbcode[i] == bbnumber+1) + { bblast = i; donotinsert = true; } } - if ((bbnumber == 10) && (bbtags[10] != "[*]")) + if (bbnumber == 10 && bbtags[10] != '[*]') { if (donotinsert) { - document.forms[form_name].addbbcode12.value = "List="; + document.forms[form_name].addbbcode12.value = 'List='; tmp_help = o_help; o_help = e_help; e_help = tmp_help; - bbtags[12] = "[list=]"; + bbtags[12] = '[list=]'; } else { - document.forms[form_name].addbbcode12.value = "[*]"; + document.forms[form_name].addbbcode12.value = '[*]'; tmp_help = o_help; o_help = e_help; e_help = tmp_help; - bbtags[12] = "[*]"; + bbtags[12] = '[*]'; } } - if ((bbnumber == 12) && (bbtags[12] != "[*]")) + if (bbnumber == 12 && bbtags[12] != '[*]') { if (donotinsert) { - document.forms[form_name].addbbcode10.value = "List"; + document.forms[form_name].addbbcode10.value = 'List'; tmp_help = l_help; l_help = e_help; e_help = tmp_help; - bbtags[10] = "[list]"; + bbtags[10] = '[list]'; } else { - document.forms[form_name].addbbcode10.value = "[*]"; + document.forms[form_name].addbbcode10.value = '[*]'; tmp_help = l_help; l_help = e_help; e_help = tmp_help; - bbtags[10] = "[*]"; + bbtags[10] = '[*]'; } } - if (donotinsert) { // Close all open tags up to the one just clicked & default button names - while (bbcode[bblast]) { - butnumber = arraypop(bbcode) - 1; - if (bbtags[butnumber] != "[*]") - { - insert_text(bbtags[butnumber + 1]); - } - else - { - insert_text(bbtags[butnumber]); - } - buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value'); - if (bbtags[butnumber] != "[*]") - { - eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"'); - } - imageTag = false; + // Close all open tags up to the one just clicked & default button names + if (donotinsert) + { + while (bbcode[bblast]) + { + butnumber = arraypop(bbcode) - 1; + + if (bbtags[butnumber] != '[*]') + { + insert_text(bbtags[butnumber + 1]); + } + else + { + insert_text(bbtags[butnumber]); } - document.forms[form_name].elements[text_name].focus(); - return; - } else { // Open tags - if (imageTag && (bbnumber != 14)) { // Close image tag before adding another + buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value'); + + if (bbtags[butnumber] != '[*]') + { + eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"'); + } + imageTag = false; + } + document.forms[form_name].elements[text_name].focus(); + return; + } + else + { + // Open tags + + // Close image tag before adding another + if (imageTag && (bbnumber != 14)) + { insert_text(bbtags[15]); - lastValue = arraypop(bbcode) - 1; // Remove the close image tag from the list - document.forms[form_name].addbbcode14.value = "Img"; // Return button back to normal state + // Remove the close image tag from the list + lastValue = arraypop(bbcode) - 1; + + // Return button back to normal state + document.forms[form_name].addbbcode14.value = 'Img'; imageTag = false; } // Open tag insert_text(bbtags[bbnumber]); - if ((bbnumber == 14) && (imageTag == false)) imageTag = 1; // Check to stop additional tags after an unclosed image tag - if (bbtags[bbnumber] != "[*]") + // Check to stop additional tags after an unclosed image tag + if (bbnumber == 14 && imageTag == false) { - arraypush(bbcode,bbnumber+1); + imageTag = 1; + } + + if (bbtags[bbnumber] != '[*]') + { + arraypush(bbcode, bbnumber + 1); eval('document.forms[form_name].addbbcode'+bbnumber+'.value += "*"'); } + document.forms[form_name].elements[text_name].focus(); return; } @@ -241,66 +411,94 @@ function bbstyle(bbnumber) { storeCaret(document.forms[form_name].elements[text_name]); } -// From http://www.massless.org/mozedit/ +/** +* From http://www.massless.org/mozedit/ +*/ function mozWrap(txtarea, open, close) { var selLength = txtarea.textLength; var selStart = txtarea.selectionStart; var selEnd = txtarea.selectionEnd; + var scrollTop = txtarea.scrollTop; + if (selEnd == 1 || selEnd == 2) + { selEnd = selLength; + } var s1 = (txtarea.value).substring(0,selStart); var s2 = (txtarea.value).substring(selStart, selEnd) var s3 = (txtarea.value).substring(selEnd, selLength); + txtarea.value = s1 + open + s2 + close + s3; + txtarea.selectionStart = selEnd + open.length + close.length; + txtarea.selectionEnd = txtarea.selectionStart; + txtarea.focus(); + txtarea.scrollTop = scrollTop; + return; } -// Insert at Claret position. Code from -// http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 -function storeCaret(textEl) { - if (textEl.createTextRange) { textEl.caretPos = document.selection.createRange().duplicate(); } +/** +* Insert at Claret position. Code from +* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 +*/ +function storeCaret(textEl) +{ + if (textEl.createTextRange) + { + textEl.caretPos = document.selection.createRange().duplicate(); + } } +/** +* Color pallette +*/ function colorPalette(dir, width, height) { var r = 0, g = 0, b = 0; var numberList = new Array(6); - numberList[0] = "00"; - numberList[1] = "40"; - numberList[2] = "80"; - numberList[3] = "BF"; - numberList[4] = "FF"; - document.writeln('
{L_WORD}{L_REPLACEMENT}{L_ACTION}
{L_WORD}{L_REPLACEMENT}{L_ACTION}
'); - for(r = 0; r < 5; r++) + + numberList[0] = '00'; + numberList[1] = '40'; + numberList[2] = '80'; + numberList[3] = 'BF'; + numberList[4] = 'FF'; + + document.writeln('
'); + + for (r = 0; r < 5; r++) { if (dir == 'h') { document.writeln(''); } - for(g = 0; g < 5; g++) + + for (g = 0; g < 5; g++) { if (dir == 'v') { document.writeln(''); } - for(b = 0; b < 5; b++) + + for (b = 0; b < 5; b++) { color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); document.write(''); } + if (dir == 'v') { document.writeln(''); } } + if (dir == 'h') { document.writeln(''); } } document.writeln('
'); - document.write('#' + color + ''); + document.write('#' + color + ''); document.writeln('
'); -} \ No newline at end of file +} diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index 7755cf957e..22f3426626 100755 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -6,16 +6,16 @@ {BODY} - - - +
{L_AVAILABLE_CONVERTORS}
+ + - - - - - - + + + + + + @@ -36,7 +36,7 @@ -
{L_AVAILABLE_CONVERTORS}
{L_SOFTWARE}{L_VERSION}{L_AUTHOR}{L_OPTIONS}
{L_SOFTWARE}{L_VERSION}{L_AUTHOR}{L_OPTIONS}
+ @@ -88,13 +88,13 @@ -
-

{L_MESSAGE}

- {S_HIDDEN} - -
+
+

{L_MESSAGE}

+ {S_HIDDEN} + +
- + \ No newline at end of file diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index e46ca774c3..dd249d9259 100755 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -1,4 +1,4 @@ - + diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html index 148097acc6..3d265af354 100755 --- a/phpBB/adm/style/install_install.html +++ b/phpBB/adm/style/install_install.html @@ -54,22 +54,24 @@ -
- {L_DL_CONFIG} -

{L_DL_CONFIG_EXPLAIN}

-
-
- {S_HIDDEN} -   -
+
+ {L_DL_CONFIG} +

{L_DL_CONFIG_EXPLAIN}

+
+ +
+ {S_HIDDEN} +   +
-
- {S_HIDDEN} - -
+
+ {S_HIDDEN} + +
+ \ No newline at end of file diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html index 983b6aa0c4..5624102612 100755 --- a/phpBB/adm/style/install_main.html +++ b/phpBB/adm/style/install_main.html @@ -1,5 +1,6 @@ -

{TITLE}

- {BODY} +

{TITLE}

+ {BODY} + \ No newline at end of file diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index b81eba5000..1ca5c4304e 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ "phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our forums may be affected. - The phpBB Group : 2004 + The phpBB Group : 2006 // -->
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index 6d3e412347..518ce835f2 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -17,7 +17,9 @@ var on_page = '{ON_PAGE}'; var per_page = '{PER_PAGE}'; var base_url = '{BASE_URL}'; -// Jump to page +/** +* Jump to page +*/ function jumpto() { var page = prompt(jump_page, on_page); @@ -28,8 +30,10 @@ function jumpto() } } -// Set display of page element -// s[-1,0,1] = hide,toggle display,show +/** +* Set display of page element +* s[-1,0,1] = hide,toggle display,show +*/ function dE(n, s, type) { if (!type) @@ -45,8 +49,10 @@ function dE(n, s, type) e.style.display = (s == 1) ? type : 'none'; } -// Mark/unmark checkboxes -// id = ID of parent container, name = name prefix, state = state [true/false] +/** +* Mark/unmark checkboxes +* id = ID of parent container, name = name prefix, state = state [true/false] +*/ function marklist(id, name, state) { var parent = document.getElementById(id); @@ -71,6 +77,9 @@ function marklist(id, name, state) } } +/** +* Open trace popup +*/ function trace(link) { window.open(link, '_trace', 'height=515, resizable=yes, scrollbars=yes, width=680'); @@ -78,6 +87,9 @@ function trace(link) } + /** + * Color swatch + */ function swatch() { window.open('{UA_SWATCH}', '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html index 5df845702d..beec9d011f 100644 --- a/phpBB/adm/style/permission_mask.html +++ b/phpBB/adm/style/permission_mask.html @@ -11,8 +11,10 @@ {S_ROLE_JS_ARRAY} - // Show/hide option panels - // value = suffix for ID to show + /** + * Show/hide option panels + * value = suffix for ID to show + */ function swap_options(pmask, fmask, cat) { id = pmask + fmask + cat; @@ -38,19 +40,21 @@ active_cat = cat; } - // Mark all radio buttons in one panel - // id = table ID container, s = status ['y'/'u'/'n'] + /** + * Mark all radio buttons in one panel + * id = table ID container, s = status ['y'/'u'/'n'] + */ function mark_options(id, s) { var t = document.getElementById(id); - + if (!t) { return; } - + var rb = t.getElementsByTagName('input'); - + for (var r = 0; r < rb.length; r++ ) { if (rb[r].id.substr(rb[r].id.length-1) == s) @@ -60,19 +64,21 @@ } } - // Mark one radio button in one panel - // id = table ID container, field_name = the auth option, s = status ['y'/'u'/'n'] + /** + * Mark one radio button in one panel + * id = table ID container, field_name = the auth option, s = status ['y'/'u'/'n'] + */ function mark_one_option(id, field_name, s) { var t = document.getElementById(id); - + if (!t) { return; } var rb = t.getElementsByTagName('input'); - + for (var r = 0; r < rb.length; r++ ) { if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s) @@ -82,7 +88,9 @@ } } - // Reset role dropdown field to Select role... if an option gets changed + /** + * Reset role dropdown field to Select role... if an option gets changed + */ function reset_role(id) { var t = document.getElementById(id); @@ -95,7 +103,9 @@ t.options[0].selected = true; } - // Load role and set options accordingly + /** + * Load role and set options accordingly + */ function set_role_settings(role_id, target_id) { settings = role_options[role_id]; diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html index 0bf889adaf..6b21865562 100644 --- a/phpBB/adm/style/permission_trace.html +++ b/phpBB/adm/style/permission_trace.html @@ -42,9 +42,9 @@ - + -
+
diff --git a/phpBB/adm/style/search_index_progress_bar.html b/phpBB/adm/style/search_index_progress_bar.html index a55d4a3a77..ef9590119f 100644 --- a/phpBB/adm/style/search_index_progress_bar.html +++ b/phpBB/adm/style/search_index_progress_bar.html @@ -1,7 +1,10 @@ - -

{L_PROGRESS}

{L_PROGRESS}

{L_PROGRESS_EXPLAIN}

-