diff --git a/.travis.yml b/.travis.yml index 20c0c6bf4f..f296f10230 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,14 +9,14 @@ env: - DB=postgres before_script: - - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" - - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" + - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" + - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" + - pyrus set auto_discover 1 - pyrus install --force phpunit/DbUnit - phpenv rehash - cd phpBB - - curl -s http://getcomposer.org/installer | php - - php composer.phar install + - php ../composer.phar install --dev - cd ../ script: diff --git a/README.md b/README.md index a7feb8db40..78aa306bed 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![phpBB](http://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com) +[![phpBB](https://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com) ## ABOUT @@ -13,8 +13,7 @@ Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the dev To be able to run an installation from the repo (and not from a pre-built package) you need to run the following commands to install phpBB's dependencies. cd phpBB - curl -s http://getcomposer.org/installer | php - php composer.phar install + php ../composer.phar install --dev ## CONTRIBUTE diff --git a/build/build.xml b/build/build.xml index 1b8d42a660..28dd36bea8 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php b/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php index ba2b40ecba..68e9e6bb86 100644 --- a/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php +++ b/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php @@ -35,7 +35,7 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff * @param int $stackPtr The position of the current token * in the stack passed in $tokens. * - * @return void + * @return null */ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) { @@ -120,7 +120,7 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff * @param integer The stack pointer for the first comment token. * @param array(string=>array) $tags The found file doc comment tags. * - * @return void + * @return null */ protected function processPackage(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags) { @@ -143,7 +143,7 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff * @param integer The stack pointer for the first comment token. * @param array(string=>array) $tags The found file doc comment tags. * - * @return void + * @return null */ protected function processVersion(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags) { @@ -166,7 +166,7 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff * @param integer The stack pointer for the first comment token. * @param array(string=>array) $tags The found file doc comment tags. * - * @return void + * @return null */ protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags) { @@ -189,7 +189,7 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff * @param integer The stack pointer for the first comment token. * @param array(string=>array) $tags The found file doc comment tags. * - * @return void + * @return null */ protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags) { diff --git a/composer.phar b/composer.phar index 3572477546..af7b8c1a67 100755 Binary files a/composer.phar and b/composer.phar differ diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index c2f8b34792..266b7e48b4 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -54,7 +54,7 @@
-

{options.TITLE_EXPLAIN}
+

{options.TITLE_EXPLAIN}
{options.CONTENT}
@@ -78,11 +78,11 @@ {L_SECURE_TITLE}

{L_DOWNLOAD_ADD_IPS_EXPLAIN}

-
+
-

{L_EXCLUDE_ENTERED_IP}
+

{L_EXCLUDE_ENTERED_IP}
@@ -97,7 +97,7 @@

{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}

-
+
@@ -172,39 +172,39 @@ {L_LEGEND}
-
+
-

{L_SPECIAL_CATEGORY_EXPLAIN}
+

{L_SPECIAL_CATEGORY_EXPLAIN}
{S_CATEGORY_SELECT}
-
+
checked="checked" />
-
+
checked="checked" />
-
+
 src="{PHPBB_ROOT_PATH}images/spacer.gif"src="{UPLOAD_ICON_SRC}" id="image_upload_icon" alt="" title="" /> 
-
+
-
+
{ASSIGNED_EXTENSIONS}
[{L_GO_TO_EXTENSIONS} ]
-

{L_ALLOWED_FORUMS_EXPLAIN}
+

{L_ALLOWED_FORUMS_EXPLAIN}
@@ -254,7 +254,7 @@

- {L_CREATE_GROUP}: + {L_CREATE_GROUP}{L_COLON}

{S_FORM_TOKEN} @@ -348,7 +348,7 @@ {orphan.REAL_FILENAME} {orphan.FILETIME} {orphan.FILESIZE} - {L_ATTACH_ID}: + {L_ATTACH_ID}{L_COLON} @@ -378,11 +378,16 @@
{L_TITLE} - + + {L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} • {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE} + + • + + • {S_ON_PAGE} + + @@ -397,8 +402,8 @@ @@ -414,14 +419,19 @@
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} + {L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index d564e89312..71c737de70 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -44,26 +44,26 @@
{L_TITLE}
-
+
[ {L_FIND_USERNAME} ]
-
+
-

{L_BAN_EXCLUDE_EXPLAIN}
+

{L_BAN_EXCLUDE_EXPLAIN}
-
+
-
+
@@ -88,19 +88,19 @@
-
+
-
+
-
+
-
+
diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index 781f5c6bce..6b8ceb3ef6 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -25,7 +25,7 @@
-

{options.TITLE_EXPLAIN}
+

{options.TITLE_EXPLAIN}
{options.CONTENT}
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 87679fc33a..cdd0fd4a93 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -22,27 +22,27 @@
{L_TITLE}
-

{L_BOT_NAME_EXPLAIN}
+

{L_BOT_NAME_EXPLAIN}
-

{L_BOT_STYLE_EXPLAIN}
+

{L_BOT_STYLE_EXPLAIN}
-

{L_BOT_LANG_EXPLAIN}
+

{L_BOT_LANG_EXPLAIN}
-
+
-

{L_BOT_AGENT_EXPLAIN}
+

{L_BOT_AGENT_EXPLAIN}
-

{L_BOT_IP_EXPLAIN}
+

{L_BOT_IP_EXPLAIN}
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 83314ab633..ab5e207e0d 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -13,25 +13,25 @@ {L_GENERAL_OPTIONS}
-

{L_VISUAL_CONFIRM_REG_EXPLAIN}
+

{L_VISUAL_CONFIRM_REG_EXPLAIN}
-

{L_REG_LIMIT_EXPLAIN}
+

{L_REG_LIMIT_EXPLAIN}
-

{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}
+

{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}
-

{L_VISUAL_CONFIRM_POST_EXPLAIN}
+

{L_VISUAL_CONFIRM_POST_EXPLAIN}
-

{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}
+

{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}
@@ -40,12 +40,12 @@
{L_AVAILABLE_CAPTCHAS}
-

{L_CAPTCHA_SELECT_EXPLAIN}
+

{L_CAPTCHA_SELECT_EXPLAIN}
-

{L_CAPTCHA_CONFIGURE_EXPLAIN}
+

{L_CAPTCHA_CONFIGURE_EXPLAIN}
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index 28ac2db1b9..bf0c80bcd9 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -13,7 +13,7 @@
{L_RESTORE_OPTIONS}
-
+
@@ -57,26 +57,26 @@
{L_BACKUP_OPTIONS}
-
+
-
+
-
+
-
+
@@ -28,7 +28,7 @@ {L_DELETE_DISALLOW_TITLE}
-
+
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index 1339ac6529..950ecb40b0 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -18,32 +18,32 @@
{L_COMPOSE}
-
+
-

{L_SEND_TO_USERS_EXPLAIN}
+

{L_SEND_TO_USERS_EXPLAIN}
[ {L_FIND_USERNAME} ]
-
+
-

{L_MASS_MESSAGE_EXPLAIN}
+

{L_MASS_MESSAGE_EXPLAIN}
-
+
-

{L_MAIL_BANNED_EXPLAIN}
+

{L_MAIL_BANNED_EXPLAIN}
-
+
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html new file mode 100644 index 0000000000..18786d80f9 --- /dev/null +++ b/phpBB/adm/style/acp_ext_details.html @@ -0,0 +1,97 @@ + + + + + « {L_BACK} + +

{L_EXTENSIONS_ADMIN}

+ +
+ {L_EXT_DETAILS} + +
+
+
{META_DISPLAY_NAME}
+
+ +
+
+
{META_NAME}
+
+ +
+
+

{META_DESCRIPTION}

+
+ +
+
+

{META_VERSION}

+
+ +
+
+

{META_HOMEPAGE}

+
+ + +
+
+

{META_TIME}

+
+ +
+
+

{META_LICENCE}

+
+
+ + +
+ {L_REQUIREMENTS} + + class="requirements_not_met"> +
+

{META_REQUIRE_PHPBB}

+ + + + class="requirements_not_met"> +
+

{META_REQUIRE_PHP}

+ + +
+ + +
+ {L_AUTHOR_INFORMATION} + +
+
+
+
{meta_authors.AUTHOR_NAME}
+
+ +
+
+
{meta_authors.AUTHOR_EMAIL}
+
+ + +
+
+
{meta_authors.AUTHOR_HOMEPAGE}
+
+ + +
+
+
{meta_authors.AUTHOR_ROLE}
+
+ +
+ +
+ + diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html new file mode 100644 index 0000000000..7dc3f6ec97 --- /dev/null +++ b/phpBB/adm/style/acp_ext_disable.html @@ -0,0 +1,34 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+

{L_DISABLE_EXPLAIN}

+ + +
+

{L_DISABLE_CONFIRM}

+
+ +
+
+ {L_DISABLE} + + +
+ + +
+

{L_DISABLE_IN_PROGRESS}

+
+ +
+

{L_DISABLE_SUCCESS}

+
+

{L_RETURN}

+
+ + + diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html new file mode 100644 index 0000000000..3f7be2c847 --- /dev/null +++ b/phpBB/adm/style/acp_ext_enable.html @@ -0,0 +1,34 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+

{L_ENABLE_EXPLAIN}

+ + +
+

{L_ENABLE_CONFIRM}

+
+ +
+
+ {L_ENABLE} + + +
+ + +
+

{L_ENABLE_IN_PROGRESS}

+
+ +
+

{L_ENABLE_SUCCESS}

+
+

{L_RETURN}

+
+ + + diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html new file mode 100644 index 0000000000..53de0b4d12 --- /dev/null +++ b/phpBB/adm/style/acp_ext_list.html @@ -0,0 +1,61 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+ +
- {L_EXTENSION_GROUP}: {attachments.EXT_GROUP_NAME}{L_NO_EXT_GROUP}
{attachments.L_DOWNLOAD_COUNT}
{L_IN} {L_PRIVATE_MESSAGE} - {attachments.REAL_FILENAME}
{attachments.COMMENT}
{attachments.L_DOWNLOAD_COUNT}
{L_TOPIC}: {attachments.TOPIC_TITLE} + {L_EXTENSION_GROUP}{L_COLON} {attachments.EXT_GROUP_NAME}{L_NO_EXT_GROUP}
{attachments.L_DOWNLOAD_COUNT}
{L_IN} {L_PRIVATE_MESSAGE} + {attachments.REAL_FILENAME}
{attachments.COMMENT}
{attachments.L_DOWNLOAD_COUNT}
{L_TOPIC}{L_COLON} {attachments.TOPIC_TITLE} 		{attachments.FILETIME}
{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}		 {attachments.FILESIZE}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_EXTENSION_NAME}{L_EXTENSION_OPTIONS}{L_EXTENSION_ACTIONS}
+ {L_ENABLED} {L_EXTENSIONS} +
{enabled.META_DISPLAY_NAME}{L_DETAILS} + + {enabled.actions.L_ACTION} +  |  + +
{L_DISABLED} {L_EXTENSIONS}
{disabled.META_DISPLAY_NAME} + {L_DETAILS} + + + {disabled.actions.L_ACTION} +  |  + +
+ + diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html new file mode 100644 index 0000000000..00a58721cb --- /dev/null +++ b/phpBB/adm/style/acp_ext_purge.html @@ -0,0 +1,34 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+

{L_PURGE_EXPLAIN}

+ + +
+

{L_PURGE_CONFIRM}

+
+ +
+
+ {L_PURGE} + + +
+
+ +
+

{L_PURGE_IN_PROGRESS}

+
+ +
+

{L_PURGE_SUCCESS}

+
+

{L_RETURN}

+
+ + + diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 048a24a328..9a3706c2f0 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -112,13 +112,13 @@
{L_FORUM_SETTINGS}
-
+
-
+
@@ -127,7 +127,7 @@
-
+
-

{L_COPY_PERMISSIONS_EXPLAIN}
+

{L_COPY_PERMISSIONS_EXPLAIN}
-
+
-

{L_FORUM_DESC_EXPLAIN}
+

{L_FORUM_DESC_EXPLAIN}
-

{L_FORUM_IMAGE_EXPLAIN}
+

{L_FORUM_IMAGE_EXPLAIN}
{L_FORUM_IMAGE}
-

{L_FORUM_PASSWORD_EXPLAIN}
+

{L_FORUM_PASSWORD_EXPLAIN}
-

{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}
+

{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}
-

{L_FORUM_PASSWORD_UNSET_EXPLAIN}
+

{L_FORUM_PASSWORD_UNSET_EXPLAIN}
-
+
@@ -188,7 +188,7 @@
{L_GENERAL_FORUM_SETTINGS}
-

{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}
+

{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}
@@ -199,46 +199,46 @@
{L_GENERAL_FORUM_SETTINGS}
-
+
-

{L_LIST_SUBFORUMS_EXPLAIN}
+

{L_LIST_SUBFORUMS_EXPLAIN}
-

{L_LIST_INDEX_EXPLAIN}
+

{L_LIST_INDEX_EXPLAIN}
-

{L_ENABLE_POST_REVIEW_EXPLAIN}
+

{L_ENABLE_POST_REVIEW_EXPLAIN}
-

{L_ENABLE_QUICK_REPLY_EXPLAIN}
+

{L_ENABLE_QUICK_REPLY_EXPLAIN}
-

{L_ENABLE_INDEXING_EXPLAIN}
+

{L_ENABLE_INDEXING_EXPLAIN}
-
+
-

{L_ENABLE_RECENT_EXPLAIN}
+

{L_ENABLE_RECENT_EXPLAIN}
-

{L_FORUM_TOPICS_PAGE_EXPLAIN}
+

{L_FORUM_TOPICS_PAGE_EXPLAIN}
@@ -246,34 +246,34 @@
{L_FORUM_PRUNE_SETTINGS}
-

{L_FORUM_AUTO_PRUNE_EXPLAIN}
+

{L_FORUM_AUTO_PRUNE_EXPLAIN}
-

{L_AUTO_PRUNE_FREQ_EXPLAIN}
+

{L_AUTO_PRUNE_FREQ_EXPLAIN}
{L_DAYS}
-

{L_AUTO_PRUNE_DAYS_EXPLAIN}
+

{L_AUTO_PRUNE_DAYS_EXPLAIN}
{L_DAYS}
-

{L_AUTO_PRUNE_VIEWED_EXPLAIN}
+

{L_AUTO_PRUNE_VIEWED_EXPLAIN}
{L_DAYS}
-

{L_PRUNE_OLD_POLLS_EXPLAIN}
+

{L_PRUNE_OLD_POLLS_EXPLAIN}
-
+
-
+
@@ -284,16 +284,16 @@
{L_GENERAL_FORUM_SETTINGS}
-

{L_LIST_INDEX_EXPLAIN}
+

{L_LIST_INDEX_EXPLAIN}
-

{L_FORUM_LINK_EXPLAIN}
+

{L_FORUM_LINK_EXPLAIN}
-

{L_FORUM_LINK_TRACK_EXPLAIN}
+

{L_FORUM_LINK_TRACK_EXPLAIN}
@@ -304,17 +304,17 @@
{L_FORUM_RULES}
-

{L_FORUM_RULES_LINK_EXPLAIN}
+

{L_FORUM_RULES_LINK_EXPLAIN}
-
+
{FORUM_RULES_PREVIEW}
-

{L_FORUM_RULES_EXPLAIN}
+

{L_FORUM_RULES_EXPLAIN}
@@ -351,12 +351,12 @@
{L_FORUM_DELETE}
-
+
{FORUM_NAME}
-
+
@@ -365,7 +365,7 @@
-
+
@@ -449,17 +449,17 @@
{forums.FORUM_IMAGE}
{forums.FORUM_NAME}{forums.FORUM_NAME}
{forums.FORUM_DESCRIPTION} -

{L_TOPICS}: {forums.FORUM_TOPICS} / {L_POSTS}: {forums.FORUM_POSTS} +

{L_TOPICS}{L_COLON} {forums.FORUM_TOPICS} / {L_POSTS}{L_COLON} {forums.FORUM_POSTS} {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} + {ICON_MOVE_DOWN} - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} + {ICON_MOVE_UP} + {ICON_MOVE_DOWN} - {ICON_MOVE_UP} + {ICON_MOVE_UP} {ICON_MOVE_DOWN_DISABLED} {ICON_MOVE_UP_DISABLED} @@ -482,7 +482,7 @@
- {L_SELECT_FORUM}: + {L_SELECT_FORUM}{L_COLON} {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html index acec3c1967..1fcf2f62a4 100644 --- a/phpBB/adm/style/acp_forums_copy_perm.html +++ b/phpBB/adm/style/acp_forums_copy_perm.html @@ -9,7 +9,7 @@
-

{L_COPY_PERMISSIONS_EXPLAIN}
+

{L_COPY_PERMISSIONS_EXPLAIN}
{S_FORM_TOKEN}{S_HIDDEN_FIELDS} diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index ed94fa985e..4701bf702f 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -22,11 +22,11 @@
{L_GROUP_DETAILS}
-
for="group_name">{L_GROUP_NAME}:
+
for="group_name">{L_GROUP_NAME}{L_COLON}
{GROUP_NAME}
-
+
@@ -34,7 +34,7 @@
-

{L_GROUP_TYPE_EXPLAIN}
+

{L_GROUP_TYPE_EXPLAIN}
@@ -48,7 +48,7 @@
-

{L_COPY_PERMISSIONS_EXPLAIN}
+

{L_COPY_PERMISSIONS_EXPLAIN}
@@ -58,24 +58,24 @@ {L_GROUP_OPTIONS_SAVE}
-

{L_GROUP_FOUNDER_MANAGE_EXPLAIN}
+

{L_GROUP_FOUNDER_MANAGE_EXPLAIN}
-

{L_GROUP_SKIP_AUTH_EXPLAIN}
+

{L_GROUP_SKIP_AUTH_EXPLAIN}
-
+
-
+
-

{L_GROUP_RECEIVE_PM_EXPLAIN}
+

{L_GROUP_RECEIVE_PM_EXPLAIN}
@@ -83,19 +83,19 @@
{L_GROUP_SETTINGS_SAVE}
-

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
+

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
-

{L_GROUP_MAX_RECIPIENTS_EXPLAIN}
+

{L_GROUP_MAX_RECIPIENTS_EXPLAIN}
-

{L_GROUP_COLOR_EXPLAIN}
+

{L_GROUP_COLOR_EXPLAIN}
      [ {L_COLOUR_SWATCH} ]
-
+
@@ -103,32 +103,32 @@
{L_GROUP_AVATAR}
-

{L_AVATAR_EXPLAIN}
+

{L_AVATAR_EXPLAIN}
{AVATAR_IMAGE}
-
+
-

{L_UPLOAD_AVATAR_URL_EXPLAIN}
+

{L_UPLOAD_AVATAR_URL_EXPLAIN}
-

{L_LINK_REMOTE_AVATAR_EXPLAIN}
+

{L_LINK_REMOTE_AVATAR_EXPLAIN}
-

{L_LINK_REMOTE_SIZE_EXPLAIN}
+

{L_LINK_REMOTE_SIZE_EXPLAIN}
{L_PIXEL} × {L_PIXEL}
-
+
@@ -138,7 +138,7 @@
{L_AVATAR_GALLERY}
-
+
 
@@ -239,11 +239,11 @@ - + + +
@@ -258,17 +258,17 @@
{L_ADD_USERS}
-
+
-

{L_USER_GROUP_DEFAULT_EXPLAIN}
+

{L_USER_GROUP_DEFAULT_EXPLAIN}
-

{L_USERNAMES_EXPLAIN}
+

{L_USERNAMES_EXPLAIN}
[ {L_FIND_USERNAME} ]
@@ -322,7 +322,7 @@
- {L_CREATE_GROUP}: + {L_CREATE_GROUP}{L_COLON} {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html index 3a03573756..1e309d4cbc 100644 --- a/phpBB/adm/style/acp_groups_position.html +++ b/phpBB/adm/style/acp_groups_position.html @@ -9,7 +9,7 @@
{L_LEGEND_SETTINGS}
-

{L_LEGEND_SORT_GROUPNAME_EXPLAIN}
+

{L_LEGEND_SORT_GROUPNAME_EXPLAIN}
@@ -82,7 +82,7 @@
{L_TEAMPAGE_SETTINGS}
-
+


@@ -90,7 +90,7 @@
-

{L_TEAMPAGE_FORUMS_EXPLAIN}
+

{L_TEAMPAGE_FORUMS_EXPLAIN}
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index a8864d42f7..b9af20d5a2 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -255,7 +255,11 @@ -
{PAGINATION}
+

   

diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index 0889eaf400..726c8c8b32 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -10,9 +10,9 @@
- + @@ -33,7 +33,7 @@ {inactive.USERNAME_FULL} -
{L_POSTS}: {inactive.POSTS} [{L_SEARCH_USER_POSTS}] +
{L_POSTS}{L_COLON} {inactive.POSTS} [{L_SEARCH_USER_POSTS}] {inactive.JOINED} {inactive.INACTIVE_DATE} @@ -53,15 +53,15 @@
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} Users per page: + {L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR} Users per page{L_COLON}
- + diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 2ba1424bda..639bcd221f 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -21,35 +21,35 @@

{L_JAB_GTALK_NOTE}

-

{L_JAB_ENABLE_EXPLAIN}
+

{L_JAB_ENABLE_EXPLAIN}
-

{L_JAB_SERVER_EXPLAIN}
+

{L_JAB_SERVER_EXPLAIN}
-

{L_JAB_PORT_EXPLAIN}
+

{L_JAB_PORT_EXPLAIN}
-

{L_JAB_USERNAME_EXPLAIN}
+

{L_JAB_USERNAME_EXPLAIN}
-

{L_JAB_PASSWORD_EXPLAIN}
+

{L_JAB_PASSWORD_EXPLAIN}
-

{L_JAB_USE_SSL_EXPLAIN}
+

{L_JAB_USE_SSL_EXPLAIN}
-

{L_JAB_PACKAGE_SIZE_EXPLAIN}
+

{L_JAB_PACKAGE_SIZE_EXPLAIN}
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index 81276287c1..c400437049 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -13,7 +13,7 @@
{L_DOWNLOAD_AS}
-
+
{RADIO_BUTTONS}
@@ -35,19 +35,19 @@
{LANG_LOCAL_NAME}
-
+
-
+
-
+
{LANG_ISO}
-
+
@@ -147,7 +147,7 @@ -   {L_UPLOAD_METHOD}:  id="method" checked="checked" value="{buttons.VALUE}" name="method" /> {buttons.VALUE}  +   {L_UPLOAD_METHOD}{L_COLON}  id="method" checked="checked" value="{buttons.VALUE}" name="method" /> {buttons.VALUE}  @@ -186,12 +186,12 @@
{L_UPLOAD_SETTINGS}
-
+
{NAME}
-

{data.EXPLAIN}
+

{data.EXPLAIN}
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index f1c770d33b..e13196f65d 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -9,12 +9,12 @@
- {L_SEARCH_KEYWORDS}:   + {L_SEARCH_KEYWORDS}{L_COLON}  
- + @@ -54,9 +54,9 @@ - + @@ -67,7 +67,7 @@
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} + {L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR} {S_FORM_TOKEN}
@@ -75,7 +75,7 @@
- {L_SELECT_FORUM}: + {L_SELECT_FORUM}{L_COLON}
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index d9f833d878..8b591294d4 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -89,56 +89,56 @@ - {L_NUMBER_POSTS}: + {L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS} - {L_POSTS_PER_DAY}: + {L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY} - {L_NUMBER_TOPICS}: + {L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS} - {L_TOPICS_PER_DAY}: + {L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY} - {L_NUMBER_USERS}: + {L_NUMBER_USERS}{L_COLON} {TOTAL_USERS} - {L_USERS_PER_DAY}: + {L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY} - {L_NUMBER_FILES}: + {L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} - {L_FILES_PER_DAY}: + {L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY} - {L_BOARD_STARTED}: + {L_BOARD_STARTED}{L_COLON} {START_DATE} - {L_AVATAR_DIR_SIZE}: + {L_AVATAR_DIR_SIZE}{L_COLON} {AVATAR_DIR_SIZE} - {L_DATABASE_SIZE}: + {L_DATABASE_SIZE}{L_COLON} {DBSIZE} - {L_UPLOAD_DIR_SIZE}: + {L_UPLOAD_DIR_SIZE}{L_COLON} {UPLOAD_DIR_SIZE} - {L_DATABASE_SERVER_INFO}: + {L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO} - {L_GZIP_COMPRESSION}: + {L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION} - {L_BOARD_VERSION}: + {L_BOARD_VERSION}{L_COLON} style="color: #228822;"style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] - {L_NUMBER_ORPHAN}: + {L_NUMBER_ORPHAN}{L_COLON} {TOTAL_ORPHAN}   @@ -261,7 +261,7 @@ {inactive.USERNAME_FULL} -
{L_POSTS}: {inactive.POSTS} [{L_SEARCH_USER_POSTS}] +
{L_POSTS}{L_COLON} {inactive.POSTS} [{L_SEARCH_USER_POSTS}] {inactive.JOINED} {inactive.INACTIVE_DATE} diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 6c4645e80c..1e49198725 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -72,37 +72,37 @@
{L_GENERAL_OPTIONS}
-

+

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

{L_MODULE_DISPLAYED_EXPLAIN}
+

{L_MODULE_DISPLAYED_EXPLAIN}
-

+

{L_CHOOSE_MODULE_EXPLAIN}
-

+

{L_CHOOSE_MODE_EXPLAIN}
@@ -201,7 +201,7 @@
- {L_SELECT_MODULE}: + {L_SELECT_MODULE}{L_COLON}
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 2ac77af25d..d654c320ca 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -36,11 +36,11 @@
{L_ROLE_DETAILS}
-
+
-

{L_ROLE_DESCRIPTION_EXPLAIN}
+

{L_ROLE_DESCRIPTION_EXPLAIN}
@@ -182,7 +182,7 @@
- {L_CREATE_ROLE}:
+ {L_CREATE_ROLE}{L_COLON}
{S_FORM_TOKEN}
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index b44cca782e..88a82532a1 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -19,7 +19,7 @@

{L_EXPLAIN}

-

{L_FORUMS}: {FORUM_NAMES}

+

{L_FORUMS}{L_COLON} {FORUM_NAMES}

@@ -30,7 +30,7 @@ {L_LOOK_UP_FORUM}

{L_LOOK_UP_FORUMS_EXPLAIN}

-
+
@@ -52,7 +52,7 @@ {L_LOOK_UP_FORUM}

{L_SELECT_FORUM_SUBFORUM_EXPLAIN}

-
+
@@ -74,7 +74,7 @@
{L_LOOK_UP_USER}
-
+
[ {L_FIND_USERNAME} ]
@@ -95,7 +95,7 @@
{L_LOOK_UP_GROUP}
-
+
@@ -225,7 +225,7 @@
{L_LOOK_UP_USER}
-
+
[ {L_FIND_USERNAME} ]
@@ -266,7 +266,7 @@
{L_LOOK_UP_GROUP}
-
+
 
@@ -317,7 +317,7 @@
{S_HIDDEN_FIELDS} {S_FORM_TOKEN} - {L_SELECT_TYPE}: + {L_SELECT_TYPE}{L_COLON}
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 4a6df768a8..13be669f70 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -24,22 +24,22 @@
{L_TITLE}
-

{L_FIELD_TYPE_EXPLAIN}
+

{L_FIELD_TYPE_EXPLAIN}
{FIELD_TYPE}
-

{L_FIELD_IDENT_EXPLAIN}
+

{L_FIELD_IDENT_EXPLAIN}
{FIELD_IDENT}
-

{L_FIELD_IDENT_EXPLAIN}
+

{L_FIELD_IDENT_EXPLAIN}
-

{L_DISPLAY_PROFILE_FIELD_EXPLAIN}
+

{L_DISPLAY_PROFILE_FIELD_EXPLAIN}
@@ -48,27 +48,31 @@
{L_VISIBILITY_OPTION}
-

{L_DISPLAY_AT_PROFILE_EXPLAIN}
+

{L_DISPLAY_AT_PROFILE_EXPLAIN}
checked="checked" />
-

{L_DISPLAY_AT_REGISTER_EXPLAIN}
+

{L_DISPLAY_AT_REGISTER_EXPLAIN}
checked="checked" />
-

{L_DISPLAY_ON_PM_EXPLAIN}
+

{L_DISPLAY_ON_PM_EXPLAIN}
checked="checked" />
-

{L_DISPLAY_ON_VT_EXPLAIN}
+

{L_DISPLAY_ON_VT_EXPLAIN}
checked="checked" />
-

{L_REQUIRED_FIELD_EXPLAIN}
+

{L_REQUIRED_FIELD_EXPLAIN}
checked="checked" />
-

{L_HIDE_PROFILE_FIELD_EXPLAIN}
+

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

{L_HIDE_PROFILE_FIELD_EXPLAIN}
checked="checked" />
@@ -82,22 +86,22 @@
{L_LANG_SPECIFIC}
-
+
-

{L_FIELD_DESCRIPTION_EXPLAIN}
+

{L_FIELD_DESCRIPTION_EXPLAIN}
-

{L_DEFAULT_VALUE_EXPLAIN}
+

{L_DEFAULT_VALUE_EXPLAIN}
-
+

{L_EDIT_DROPDOWN_LANG_EXPLAIN} @@ -126,7 +130,7 @@ {L_TITLE}
-

{option.EXPLAIN}
+

{option.EXPLAIN}
{option.FIELD}
@@ -149,7 +153,7 @@ {options.LANGUAGE}
-

{options.field.L_EXPLAIN}
+

{options.field.L_EXPLAIN}
{options.field.FIELD}
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index dfc5827117..aede662bcb 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -43,7 +43,7 @@ {L_SELECT_FORUM}

{L_LOOK_UP_FORUMS_EXPLAIN}

-
+
@@ -65,32 +65,32 @@

{L_FORUM}

-

{L_SELECTED_FORUMS}: {FORUM_LIST}

+

{L_SELECTED_FORUMS}{L_COLON} {FORUM_LIST}

{L_FORUM_PRUNE}
-
+
-
+
-

{L_PRUNE_OLD_POLLS_EXPLAIN}
+

{L_PRUNE_OLD_POLLS_EXPLAIN}
-
+
-
+
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 968d307832..75fa04a157 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -9,39 +9,64 @@
- {L_ACP_PRUNE_USERS} + {L_CRITERIA}
-
+
-
+
-

{L_JOINED_EXPLAIN}
-
+
+
-

{L_LAST_ACTIVE_EXPLAIN}
+

{L_JOINED_EXPLAIN}
+
+ {L_AFTER} +

{L_BEFORE} +
+
+
+

{L_LAST_ACTIVE_EXPLAIN}
-
+
-

{L_SELECT_USERS_EXPLAIN}
+
+
+
+ +
+

{L_PRUNE_USERS_GROUP_EXPLAIN}
+
+
+ +
+ +
+ {L_USERNAMES} +
+

{L_SELECT_USERS_EXPLAIN}
[ {L_FIND_USERNAME} ]
+
+ +
+ {L_OPTIONS}
-

{L_DELETE_USER_POSTS_EXPLAIN}
+

{L_DELETE_USER_POSTS_EXPLAIN}
-

{L_DEACTIVATE_DELETE_EXPLAIN}
+

{L_DEACTIVATE_DELETE_EXPLAIN}
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 7fb7da7095..a475370f73 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -25,22 +25,22 @@
{L_ACP_RANKS}
-
+
-
+
-
+
-
+
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index ff83f6b792..3da70bc0c8 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -12,32 +12,32 @@
{L_GENERAL_SEARCH_SETTINGS}
-

{L_YES_SEARCH_EXPLAIN}
+

{L_YES_SEARCH_EXPLAIN}
-

{L_SEARCH_INTERVAL_EXPLAIN}
+

{L_SEARCH_INTERVAL_EXPLAIN}
{L_SECONDS}
-

{L_SEARCH_GUEST_INTERVAL_EXPLAIN}
+

{L_SEARCH_GUEST_INTERVAL_EXPLAIN}
{L_SECONDS}
-

{L_LIMIT_SEARCH_LOAD_EXPLAIN}
+

{L_LIMIT_SEARCH_LOAD_EXPLAIN}
-

{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}
+

{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}
-

{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}
+

{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}
-

{L_SEARCH_STORE_RESULTS_EXPLAIN}
+

{L_SEARCH_STORE_RESULTS_EXPLAIN}
{L_SECONDS}
@@ -45,7 +45,7 @@
{L_SEARCH_TYPE}
-

{L_SEARCH_TYPE_EXPLAIN}
+

{L_SEARCH_TYPE_EXPLAIN}
@@ -110,7 +110,7 @@ {backend.S_HIDDEN_FIELDS} - {L_INDEX_STATS}: {backend.L_NAME} ({L_ACTIVE}) + {L_INDEX_STATS}{L_COLON} {backend.L_NAME} ({L_ACTIVE}) @@ -126,9 +126,9 @@ - + - + diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index b09cbafc95..3dc4c2d616 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -36,7 +36,7 @@
-
+
@@ -44,11 +44,11 @@
{STYLE_PATH}
-
+
{STYLE_COPYRIGHT}
-
+
-
+
-
+
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index a8794176a9..96c9de6ebb 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -13,7 +13,7 @@
{L_SELECT_USER}
-
+
[ {L_FIND_USERNAME} ]
@@ -68,7 +68,7 @@
- {L_SELECT_FORM}: + {L_SELECT_FORM}{L_COLON} {S_FORM_TOKEN}
@@ -106,7 +106,7 @@
{L_ACP_USER_RANK}
-
+
@@ -146,7 +146,7 @@
- {L_USER_GROUP_ADD}: + {L_USER_GROUP_ADD}{L_COLON} {S_FORM_TOKEN}
@@ -157,11 +157,11 @@
- + + +
{backend.L_NAME} ({L_ACTIVE})
{backend.data.STATISTIC_1}:{backend.data.STATISTIC_1}{L_COLON} {backend.data.VALUE_1}{backend.data.STATISTIC_2}:{backend.data.STATISTIC_2}{L_COLON} {backend.data.VALUE_2}
@@ -177,7 +177,7 @@ - + @@ -192,15 +192,15 @@
- {L_SORT_BY}: + {L_SORT_BY}{L_COLON}
- + + +
@@ -219,7 +219,7 @@
- {L_SELECT_FORUM}: + {L_SELECT_FORUM}{L_COLON} {S_FORM_TOKEN}
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 35d8374237..2135b52fb9 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -3,36 +3,36 @@
{L_ACP_USER_AVATAR}
-

{L_AVATAR_EXPLAIN}
+

{L_AVATAR_EXPLAIN}
{AVATAR_IMAGE}
-
+
-

{L_UPLOAD_AVATAR_URL_EXPLAIN}
+

{L_UPLOAD_AVATAR_URL_EXPLAIN}
-

{L_LINK_REMOTE_AVATAR_EXPLAIN}
+

{L_LINK_REMOTE_AVATAR_EXPLAIN}
-

{L_LINK_REMOTE_SIZE_EXPLAIN}
+

{L_LINK_REMOTE_SIZE_EXPLAIN}
{L_PIXEL} × {L_PIXEL}
-
+
@@ -42,7 +42,7 @@
{L_AVATAR_GALLERY}
-
+
 
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html index aa92353807..d1a4f59445 100644 --- a/phpBB/adm/style/acp_users_feedback.html +++ b/phpBB/adm/style/acp_users_feedback.html @@ -1,10 +1,10 @@ - + + +
{attach.REAL_FILENAME}
{L_PM}: {L_POST}: {attach.TOPIC_TITLE}		{attach.REAL_FILENAME}
{L_PM}{L_COLON} {L_POST}{L_COLON} {attach.TOPIC_TITLE}		 {attach.POST_TIME} {attach.SIZE} {attach.DOWNLOAD_COUNT}
@@ -40,15 +40,15 @@
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} + {L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
- + + +
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index ffdb4d472c..b7e3a9822e 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -3,54 +3,54 @@
{L_ACP_USER_OVERVIEW}
-

{L_NAME_CHARS_EXPLAIN}
+

{L_NAME_CHARS_EXPLAIN}
[ {L_USE_PERMISSIONS} ]
-
+
{USER_INACTIVE_REASON}
-
+
{USER_REGISTERED}
-
+
{REGISTERED_IP}
[ {L_WHOIS} ]
-
+
{USER_LASTACTIVE}
-
+
{USER_POSTS} ({L_POSTS_IN_QUEUE}) ({L_POSTS_IN_QUEUE})
-
+
{USER_WARNINGS}
-

{L_FOUNDER_EXPLAIN}
+

{L_FOUNDER_EXPLAIN}
-
+
-

{L_CHANGE_PASSWORD_EXPLAIN}
+

{L_CHANGE_PASSWORD_EXPLAIN}
-

{L_CONFIRM_PASSWORD_EXPLAIN}
+

{L_CONFIRM_PASSWORD_EXPLAIN}
@@ -107,16 +107,16 @@
{L_USER_TOOLS}
-
+
@@ -135,13 +135,14 @@
{L_DELETE_USER}
-

{L_DELETE_USER_EXPLAIN}
+

{L_DELETE_USER_EXPLAIN}
-
+ {L_USER_NO_POSTS_TO_DELETE} +

diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index a519447b2f..f1b9e28a66 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -9,60 +9,52 @@

{L_UCP_PREFS_PERSONAL}
-
+
-
+
-

{L_ALLOW_PM_EXPLAIN}
+

{L_ALLOW_PM_EXPLAIN}
-
+
-

{L_NOTIFY_METHOD_EXPLAIN}
+

{L_NOTIFY_METHOD_EXPLAIN}
-
+
-
+
-
+
-
+
+
-
-
-
-
-
-
-
-
-
-

{L_BOARD_DATE_FORMAT_EXPLAIN}
+

{L_BOARD_DATE_FORMAT_EXPLAIN}
style="display:none;">
@@ -71,22 +63,22 @@
{L_UCP_PREFS_POST}
-
+
-
+
-
+
-
+
@@ -95,57 +87,57 @@
{L_UCP_PREFS_VIEW}
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{S_TOPIC_SORT_DAYS}
-
+
{S_TOPIC_SORT_KEY}
-
+
{S_TOPIC_SORT_DIR}
-
+
{S_POST_SORT_DAYS}
-
+
{S_POST_SORT_KEY}
-
+
{S_POST_SORT_DIR}
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index ea7204e2e4..3232e8d1f5 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -3,44 +3,44 @@
{L_USER_PROFILE}
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-

{L_BIRTHDAY_EXPLAIN}
-
{L_DAY}: {L_MONTH}: {L_YEAR}:
+

{L_BIRTHDAY_EXPLAIN}
+
{L_DAY}{L_COLON} {L_MONTH}{L_COLON} {L_YEAR}{L_COLON}
@@ -49,7 +49,7 @@ {L_USER_CUSTOM_PROFILE_FIELDS}
-
for="{profile_fields.FIELD_ID}">{profile_fields.LANG_NAME}:
{profile_fields.LANG_EXPLAIN}
+
for="{profile_fields.FIELD_ID}">{profile_fields.LANG_NAME}{L_COLON}
{profile_fields.LANG_EXPLAIN}
{profile_fields.FIELD}
{profile_fields.ERROR}
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index d55deac808..c9cc053eec 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -26,7 +26,7 @@ d: '{LA_BBCODE_D_HELP}', tip: '{L_STYLES_TIP}' - ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' + ,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}' } @@ -66,7 +66,7 @@ - {L_FONT_SIZE}: @@ -92,8 +92,8 @@ // ]]> -
-
+
+
@@ -104,7 +104,7 @@
-
{L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
+
{L_OPTIONS}{L_COLON} {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 08613de0dd..8551c952c7 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1148,55 +1148,79 @@ input.disabled { width: auto; text-align: right; margin-top: 5px; - font-size: 0.85em; - padding-bottom: 2px; + float: right; } .rtl .pagination { text-align: left; + float: left; } -.pagination strong, -.pagination b { - font-weight: normal; -} - -.pagination span.page-sep { - display:none; -} - -.pagination span strong { - padding: 0 2px; - margin: 0 2px; - font-weight: normal; - font-size: 0.85em; - color: #FFFFFF; - background: #4692BF; - border: 1px solid #4692BF; -} - -.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active { - font-weight: normal; - font-size: 0.85em; - text-decoration: none; - color: #5C758C; - margin: 0 2px; - padding: 0 2px; - background: #ECEDEE; - border: 1px solid #B4BAC0; -} - -.pagination span a:hover { - border-color: #368AD2; - background: #368AD2; - color: #FFFFFF; - text-decoration: none; +li.pagination { + margin-top: 0; } .pagination img { vertical-align: middle; } +.pagination ul { + display: inline-block; + *display: inline; /* IE7 inline-block hack */ + *zoom: 1; + margin-left: 0; + margin-bottom: 0; +} + +li.pagination ul { + margin-top: -2px; + vertical-align: middle; +} + +.pagination ul li, dl .pagination ul li, dl.icon .pagination ul li { + display: inline; + padding: 0; + font-size: 100%; + line-height: normal; +} + +.pagination li a, .pagnation li span, li .pagination li a, li .pagnation li span, .pagination li.active span, .pagination li.ellipsis span { + font-weight: normal; + text-decoration: none; + padding: 0 2px; + border: 1px solid transparent; + font-size: 0.9em; + line-height: 1.5em; +} + +.pagination li a, .pagination li a:link, .pagination li a:visited { + color: #5C758C; + background-color: #ECEDEE; + border-color: #B4BAC0; +} + +.pagination li.ellipsis span { + background-color: transparent; + color: #000000; +} + +.pagination li.active span { + color: #FFFFFF; + background-color: #4692BF; + border-color: #4692BF; +} + +.pagination li a:hover, .pagination .active a:hover { + color: #FFFFFF; + background-color: #368AD2; + border-color: #368AD2; +} + +.pagination li a:active, .pagination li.active a:active { + color: #5C758C; + background-color: #ECEDEE; + border-color: #B4BAC0; +} /* Action Highlighting ---------------------------------------- */ @@ -1718,3 +1742,13 @@ fieldset.permissions .padding { .phpinfo td, .phpinfo th, .phpinfo h2, .phpinfo h1 { text-align: left; } + +.requirements_not_met { + padding: 5px; + background-color: #BC2A4D; +} + +.requirements_not_met dt label, .requirements_not_met dd p { + color: #FFFFFF; + font-size: 1.4em; +} diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index 12541cb057..3ccb368665 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -10,76 +10,98 @@ var img_templates = { }; /** - * The following callbacks are for reording forums in acp_forums. forum_down - * is triggered when a forum is moved down, and forum_up is triggered when - * a forum is moved up. It moves the row up or down, and deactivates / + * The following callbacks are for reording items. row_down + * is triggered when an item is moved down, and row_up is triggered when + * an item is moved up. It moves the row up or down, and deactivates / * activates any up / down icons that require it (the ones at the top or bottom). */ -phpbb.add_ajax_callback('forum_down', function() { +phpbb.add_ajax_callback('row_down', function() { var el = $(this), - tr = el.parents('tr'); + tr = el.parents('tr'), + tr_swap = tr.next(); + /* + * If the element was the first one, we have to: + * - Add the up-link to the row we moved + * - Remove the up-link on the next row + */ if (tr.is(':first-child')) { var up_img = img_templates.up.clone().attr('href', tr.attr('data-up')); - el.parents('span').siblings('.up').html(up_img); - - tr.next().find('.up').html(img_templates.up_disabled); + tr.find('.up').html(up_img); phpbb.ajaxify({ - selector: el.parents('span').siblings('.up').children('a'), - callback: 'forum_up', + selector: tr.find('.up').children('a'), + callback: 'row_up', overlay: false }); + + tr_swap.find('.up').html(img_templates.up_disabled.clone()); } - tr.insertAfter(tr.next()); + tr.insertAfter(tr_swap); + /* + * As well as: + * - Remove the down-link on the moved row, if it is now the last row + * - Add the down-link to the next row, if it was the last row + */ if (tr.is(':last-child')) { - el.replaceWith(img_templates.down_disabled); + tr.find('.down').html(img_templates.down_disabled.clone()); - var down_img = img_templates.down.clone().attr('href', tr.attr('data-down')); - tr.prev().find('.down').html(down_img); + var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down')); + tr_swap.find('.down').html(down_img); phpbb.ajaxify({ - selector: tr.prev().find('.down').children('a'), - callback: 'forum_down', + selector: tr_swap.find('.down').children('a'), + callback: 'row_down', overlay: false }); } }); -phpbb.add_ajax_callback('forum_up', function() { +phpbb.add_ajax_callback('row_up', function() { var el = $(this), - tr = el.parents('tr'); + tr = el.parents('tr'), + tr_swap = tr.prev(); + /* + * If the element was the last one, we have to: + * - Add the down-link to the row we moved + * - Remove the down-link on the next row + */ if (tr.is(':last-child')) { var down_img = img_templates.down.clone().attr('href', tr.attr('data-down')); - el.parents('span').siblings('.down').html(down_img); - - tr.prev().find('.down').html(img_templates.down_disabled); + tr.find('.down').html(down_img); phpbb.ajaxify({ - selector: el.parents('span').siblings('.down').children('a'), - callback: 'forum_down', + selector: tr.find('.down').children('a'), + callback: 'row_down', overlay: false }); + + tr_swap.find('.down').html(img_templates.down_disabled.clone()); } - tr.insertBefore(tr.prev()); + tr.insertBefore(tr_swap); + /* + * As well as: + * - Remove the up-link on the moved row, if it is now the first row + * - Add the up-link to the previous row, if it was the first row + */ if (tr.is(':first-child')) { - el.replaceWith(img_templates.up_disabled); + tr.find('.up').html(img_templates.up_disabled.clone()); - var up_img = img_templates.up.clone().attr('href', tr.attr('data-up')); - tr.next().find('.up').html(up_img); + var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up')); + tr_swap.find('.up').html(up_img); phpbb.ajaxify({ - selector: tr.next().find('.up').children('a'), - callback: 'forum_up', + selector: tr_swap.find('.up').children('a'), + callback: 'row_up', overlay: false }); } diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html index 0b1434f7e0..0f137f28df 100644 --- a/phpBB/adm/style/captcha_default_acp_demo.html +++ b/phpBB/adm/style/captcha_default_acp_demo.html @@ -1,4 +1,4 @@
-

{L_CAPTCHA_PREVIEW_EXPLAIN}
+

{L_CAPTCHA_PREVIEW_EXPLAIN}
{L_PREVIEW}
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html index e2804bbc7d..b333d9205c 100644 --- a/phpBB/adm/style/captcha_gd_acp.html +++ b/phpBB/adm/style/captcha_gd_acp.html @@ -14,32 +14,32 @@ {L_GENERAL_OPTIONS}
-

{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}
+

{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}
-

{L_CAPTCHA_GD_X_GRID_EXPLAIN}
+

{L_CAPTCHA_GD_X_GRID_EXPLAIN}
-

{L_CAPTCHA_GD_Y_GRID_EXPLAIN}
+

{L_CAPTCHA_GD_Y_GRID_EXPLAIN}
-

{L_CAPTCHA_GD_WAVE_EXPLAIN}
+

{L_CAPTCHA_GD_WAVE_EXPLAIN}
-

{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}
+

{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}
-

{L_CAPTCHA_GD_FONTS_EXPLAIN}
+

{L_CAPTCHA_GD_FONTS_EXPLAIN}
diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index 4eb46d2d3c..99f3f24f70 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -59,7 +59,7 @@
{L_EDIT_QUESTION}
-

{L_QUESTION_STRICT_EXPLAIN}
+

{L_QUESTION_STRICT_EXPLAIN}
diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html index 0ea2d6a024..79170e27c6 100644 --- a/phpBB/adm/style/captcha_qa_acp_demo.html +++ b/phpBB/adm/style/captcha_qa_acp_demo.html @@ -1,5 +1,5 @@
-

{L_CONFIRM_QUESTION_EXPLAIN}
+

{L_CONFIRM_QUESTION_EXPLAIN}
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html index 34912c7955..67176ebd07 100644 --- a/phpBB/adm/style/captcha_recaptcha_acp.html +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -13,11 +13,11 @@ {L_GENERAL_OPTIONS}
-

{L_RECAPTCHA_PUBLIC_EXPLAIN}
+

{L_RECAPTCHA_PUBLIC_EXPLAIN}
-

{L_RECAPTCHA_PRIVATE_EXPLAIN}
+

{L_RECAPTCHA_PRIVATE_EXPLAIN}
diff --git a/phpBB/adm/style/confirm_body_prune.html b/phpBB/adm/style/confirm_body_prune.html index 9481386231..4c00ac2c3d 100644 --- a/phpBB/adm/style/confirm_body_prune.html +++ b/phpBB/adm/style/confirm_body_prune.html @@ -2,6 +2,23 @@ +
+

{L_PRUNE_USERS_LIST}

+

{L_PRUNE_USERS_LIST_DEACTIVATE}

{L_PRUNE_USERS_LIST_DELETE}

+ +
+ + » + {users.USERNAME} + [ {L_USER_ADMIN} ]
+ +
+ + {L_MARK_ALL} • + {L_UNMARK_ALL} + +
+

{MESSAGE_TITLE}

{MESSAGE_TEXT}

@@ -12,17 +29,6 @@   - -

{L_PRUNE_USERS_LIST}

-

{L_PRUNE_USERS_LIST_DEACTIVATE}

{L_PRUNE_USERS_LIST_DELETE}

- -
- - » {users.USERNAME} [{L_USER_ADMIN}]
- - -

-
diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html index 351397d3c7..982356bfa7 100644 --- a/phpBB/adm/style/custom_profile_fields.html +++ b/phpBB/adm/style/custom_profile_fields.html @@ -26,7 +26,7 @@ - {L_DAY}: - {L_MONTH}: - {L_YEAR}: + {L_DAY}{L_COLON} + {L_MONTH}{L_COLON} + {L_YEAR}{L_COLON} diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index cf78f30b50..5fec8c4789 100644 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -86,7 +86,7 @@
-

{checks.TITLE_EXPLAIN}
+

{checks.TITLE_EXPLAIN}
{checks.RESULT}
@@ -109,7 +109,7 @@
-

{options.TITLE_EXPLAIN}
+

{options.TITLE_EXPLAIN}
{options.CONTENT}
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index a3b2294025..73c3f5a6b9 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -8,7 +8,7 @@
- Powered by phpBB® Forum Software © phpBB Group + Powered by phpBB® Forum Software © phpBB Group
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index e306d8f6bf..6826654ded 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -42,7 +42,7 @@ function dE(n, s, type)
- + {S_LANG_SELECT}
diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html index 79006fba69..1a809a3588 100644 --- a/phpBB/adm/style/install_install.html +++ b/phpBB/adm/style/install_install.html @@ -20,7 +20,7 @@
-
{checks.TITLE}:
{checks.TITLE_EXPLAIN}
+
{checks.TITLE}{L_COLON}
{checks.TITLE_EXPLAIN}
{checks.RESULT}
@@ -43,7 +43,7 @@
-

{options.TITLE_EXPLAIN}
+

{options.TITLE_EXPLAIN}
{options.CONTENT}
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 818889c89b..b5fa46dbf6 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -221,13 +221,13 @@
{new.DIR_PART}
{new.FILE_PART} -
{L_FILE_USED}: {new.CUSTOM_ORIGINAL} +
{L_FILE_USED}{L_COLON} {new.CUSTOM_ORIGINAL}
-
+
[{new.L_SHOW_DIFF}]{L_BINARY_FILE}
-
+
@@ -245,11 +245,11 @@
{not_modified.DIR_PART}
{not_modified.FILE_PART} -
{L_FILE_USED}: {not_modified.CUSTOM_ORIGINAL} +
{L_FILE_USED}{L_COLON} {not_modified.CUSTOM_ORIGINAL}
-
[{not_modified.L_SHOW_DIFF}]{L_BINARY_FILE}
+
[{not_modified.L_SHOW_DIFF}]{L_BINARY_FILE}
-
+
@@ -266,24 +266,24 @@ {L_STATUS_MODIFIED}
{modified.DIR_PART}
{modified.FILE_PART} -
{L_FILE_USED}: {modified.CUSTOM_ORIGINAL} +
{L_FILE_USED}{L_COLON} {modified.CUSTOM_ORIGINAL}
-
 
+
 
-
+
-
[{modified.L_SHOW_DIFF}]{L_BINARY_FILE}
+
[{modified.L_SHOW_DIFF}]{L_BINARY_FILE}
-
[{L_SHOW_DIFF_FINAL}] 
+
[{L_SHOW_DIFF_FINAL}] 
-
[{L_SHOW_DIFF_FINAL}] 
+
[{L_SHOW_DIFF_FINAL}] 
@@ -299,13 +299,13 @@
{new_conflict.DIR_PART}
{new_conflict.FILE_PART} -
{L_FILE_USED}: {new_conflict.CUSTOM_ORIGINAL} +
{L_FILE_USED}{L_COLON} {new_conflict.CUSTOM_ORIGINAL}
-
+
[{new_conflict.L_SHOW_DIFF}]{L_BINARY_FILE}
-
+
@@ -322,38 +322,38 @@ {L_STATUS_CONFLICT}
{conflict.DIR_PART}
{conflict.FILE_PART} -
{L_FILE_USED}: {conflict.CUSTOM_ORIGINAL} -
{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS} +
{L_FILE_USED}{L_COLON} {conflict.CUSTOM_ORIGINAL} +
{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}
-
+
[{L_DOWNLOAD_CONFLICTS}]
{L_DOWNLOAD_CONFLICTS_EXPLAIN} {L_BINARY_FILE}
-
+
-
 
+
 
-
[{L_SHOW_DIFF_MODIFIED}]
+
[{L_SHOW_DIFF_MODIFIED}]
-
[{L_SHOW_DIFF_MODIFIED}]
+
[{L_SHOW_DIFF_MODIFIED}]
-
[{L_SHOW_DIFF_FINAL}]
+
[{L_SHOW_DIFF_FINAL}]
-
[{L_SHOW_DIFF_FINAL}]
+
[{L_SHOW_DIFF_FINAL}]
@@ -392,7 +392,7 @@
{L_SELECT_DOWNLOAD_FORMAT}
-
+
{RADIO_BUTTONS}
@@ -455,12 +455,12 @@
{L_FTP_SETTINGS}
-
+
{UPLOAD_METHOD}
-

{data.EXPLAIN}
+

{data.EXPLAIN}
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index b5d25e82f2..ecdc40e157 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -223,7 +223,7 @@ table.hrdiff caption span {

{L_SKIP}

- + @@ -231,7 +231,7 @@ table.hrdiff caption span { -
{L_NUM_CONFLICTS}: {NUM_CONFLICTS}
+
{L_NUM_CONFLICTS}{L_COLON} {NUM_CONFLICTS}

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index f79c0318b5..f7902e6d2e 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -9,7 +9,7 @@ @@ -16,11 +18,11 @@
class="fields1"class="fields2">
{LOGIN_ERROR}
-
+
-
+
{L_FORGOT_PASS}
diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html index 13669a78bb..63f0b2e0f7 100644 --- a/phpBB/styles/prosilver/template/login_forum.html +++ b/phpBB/styles/prosilver/template/login_forum.html @@ -17,7 +17,7 @@
-
+
diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html index 8b7f7c8c6d..faa88aefc7 100644 --- a/phpBB/styles/prosilver/template/mcp_approve.html +++ b/phpBB/styles/prosilver/template/mcp_approve.html @@ -20,14 +20,14 @@
-
+
-

{L_CAN_LEAVE_BLANK}
+

{L_CAN_LEAVE_BLANK}
diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html index adcd86d057..591dbf8076 100644 --- a/phpBB/styles/prosilver/template/mcp_ban.html +++ b/phpBB/styles/prosilver/template/mcp_ban.html @@ -43,28 +43,28 @@
-
+
{L_FIND_USERNAME}
-
+
-
+
-
+
-

{L_BAN_EXCLUDE_EXPLAIN}
+

{L_BAN_EXCLUDE_EXPLAIN}
@@ -90,19 +90,19 @@
-
+
-
{L_BAN_LENGTH}:
+
{L_BAN_LENGTH}{L_COLON}
-
{L_BAN_REASON}:
+
{L_BAN_REASON}{L_COLON}
-
{L_BAN_GIVE_REASON}:
+
{L_BAN_GIVE_REASON}{L_COLON}
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index afd4f2308a..e559f178f2 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -3,18 +3,22 @@ -

{L_FORUM}: {FORUM_NAME}

+

{L_FORUM}{L_COLON} {FORUM_NAME}

- +
@@ -42,7 +46,20 @@ {REPORTED_IMG}  [ {L_DELETE_SHADOW_TOPIC} ]
- {topicrow.PAGINATION} + + + {topicrow.ATTACH_ICON_IMG} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME}
{topicrow.REPLIES} {L_REPLIES}
{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
{topicrow.LAST_POST_TIME} @@ -63,20 +80,37 @@
- {L_NEXT} - {L_PREVIOUS} - + {L_NEXT} + {L_PREVIOUS} +
- + diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html index 69e0b02a4e..57e57d8254 100644 --- a/phpBB/styles/prosilver/template/mcp_front.html +++ b/phpBB/styles/prosilver/template/mcp_front.html @@ -31,8 +31,8 @@ {L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} » {unapproved.POST_TIME}
- {L_TOPIC}: {unapproved.TOPIC_TITLE} [{L_MODERATE}]
- {L_FORUM}: {unapproved.FORUM_NAME}{unapproved.FORUM_NAME} [{L_MODERATE}] + {L_TOPIC}{L_COLON} {unapproved.TOPIC_TITLE} [{L_MODERATE}]
+ {L_FORUM}{L_COLON} {unapproved.FORUM_NAME}{unapproved.FORUM_NAME} [{L_MODERATE}]
@@ -84,7 +84,7 @@
{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} {report.REPORT_TIME}
- {L_FORUM}: {report.FORUM_NAME} + {L_FORUM}{L_COLON} {report.FORUM_NAME}
diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html index b5561687b2..9e4a6f272e 100644 --- a/phpBB/styles/prosilver/template/mcp_logs.html +++ b/phpBB/styles/prosilver/template/mcp_logs.html @@ -9,11 +9,15 @@
  • - {L_SEARCH_KEYWORDS}:   + {L_SEARCH_KEYWORDS}{L_COLON}  
@@ -50,9 +54,9 @@
- {L_NEXT} - {L_PREVIOUS} - + {L_NEXT} + {L_PREVIOUS} + @@ -62,8 +66,12 @@
{S_FORM_TOKEN} diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html index 4611412a9e..d7a4f3d798 100644 --- a/phpBB/styles/prosilver/template/mcp_move.html +++ b/phpBB/styles/prosilver/template/mcp_move.html @@ -11,7 +11,7 @@
-
+
diff --git a/phpBB/styles/prosilver/template/mcp_notes_front.html b/phpBB/styles/prosilver/template/mcp_notes_front.html index 3da66ccb2e..db10284bce 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_front.html +++ b/phpBB/styles/prosilver/template/mcp_notes_front.html @@ -9,7 +9,7 @@
-
+
{L_FIND_USERNAME}
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index afe904dab3..3bbbd10f12 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -16,11 +16,11 @@
-
{L_RANK}:
{RANK_TITLE}
-
 {L_RANK}:
{RANK_IMG}
-
{L_JOINED}:
{JOINED}
-
{L_TOTAL_POSTS}:
{POSTS}
-
{L_WARNINGS}:
{WARNINGS}
+
{L_RANK}{L_COLON}
{RANK_TITLE}
+
 {L_RANK}{L_COLON}
{RANK_IMG}
+
{L_JOINED}{L_COLON}
{JOINED}
+
{L_TOTAL_POSTS}{L_COLON}
{POSTS}
+
{L_WARNINGS}{L_COLON}
{WARNINGS}
@@ -52,11 +52,15 @@
  • - {L_SEARCH_KEYWORDS}:   + {L_SEARCH_KEYWORDS}{L_COLON}  
@@ -91,9 +95,9 @@
- {L_NEXT} - {L_PREVIOUS} - + {L_NEXT} + {L_PREVIOUS} +
@@ -102,8 +106,12 @@
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 752fbdd078..756a6eb114 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -11,7 +11,7 @@
-

{L_REPORT_REASON}: {REPORT_REASON_TITLE}

+

{L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}

{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} « {REPORT_DATE}

{L_REPORT_CLOSED}

@@ -59,10 +59,10 @@

{POST_SUBJECT}

- {L_SENT_AT}: {POST_DATE} -
{L_PM_FROM}: {POST_AUTHOR_FULL} -
{L_TO}: {to_recipient.NAME_FULL}{to_recipient.NAME}  -
{L_BCC}: {bcc_recipient.NAME_FULL}{bcc_recipient.NAME}  + {L_SENT_AT}{L_COLON} {POST_DATE} +
{L_PM_FROM}{L_COLON} {POST_AUTHOR_FULL} +
{L_TO}{L_COLON} {to_recipient.NAME_FULL}{to_recipient.NAME}  +
{L_BCC}{L_COLON} {bcc_recipient.NAME_FULL}{bcc_recipient.NAME} 

{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} » {POST_DATE}

@@ -106,7 +106,7 @@
-
{L_THIS_PM_IP}{L_THIS_POST_IP}: +
{L_THIS_PM_IP}{L_THIS_POST_IP}{L_COLON} {POST_IPADDR}{POST_IP} ({POST_IP}{L_LOOKUP_IP}) {POST_IPADDR} ({POST_IP}){POST_IP} ({L_LOOKUP_IP}) @@ -128,7 +128,7 @@
-
+
@@ -147,7 +147,7 @@
-
+
{usernotes.ACTION}
@@ -227,8 +227,8 @@

{L_MCP_POST_REPORTS}

- {L_REPORTED_BY}: {reports.REPORTER}{reports.REPORTER} « {reports.REPORT_TIME} -

{reports.REASON_TITLE}: {reports.REASON_DESC}
{reports.REPORT_TEXT}

+ {L_REPORTED_BY}{L_COLON} {reports.REPORTER}{reports.REPORTER} « {reports.REPORT_TIME} +

{reports.REASON_TITLE}{L_COLON} {reports.REASON_DESC}
{reports.REPORT_TEXT}

@@ -239,7 +239,7 @@
-

{L_THIS_POST_IP}: +

{L_THIS_POST_IP}{L_COLON} {POST_IPADDR}{POST_IP} ({POST_IP}{L_LOOKUP_IP}) {POST_IPADDR} ({POST_IP}){POST_IP} ({L_LOOKUP_IP}) diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html index e9a477a24c..847151a01e 100644 --- a/phpBB/styles/prosilver/template/mcp_queue.html +++ b/phpBB/styles/prosilver/template/mcp_queue.html @@ -3,7 +3,7 @@

- + {S_FORM_TOKEN}
@@ -18,8 +18,12 @@
- {L_NEXT} - {L_PREVIOUS} - + {L_NEXT} + {L_PREVIOUS} + @@ -73,8 +77,12 @@
diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html index 95e7d9e021..ea9a4edd6f 100644 --- a/phpBB/styles/prosilver/template/mcp_reports.html +++ b/phpBB/styles/prosilver/template/mcp_reports.html @@ -4,7 +4,7 @@
- + {S_FORM_TOKEN}
@@ -20,8 +20,12 @@
    @@ -54,7 +58,7 @@
    {postrow.REPORTER_FULL} « {postrow.REPORT_TIME}
    - {L_FORUM}: {postrow.FORUM_NAME}{postrow.FORUM_NAME}     + {L_FORUM}{L_COLON} {postrow.FORUM_NAME}{postrow.FORUM_NAME}
    @@ -64,9 +68,9 @@
- {L_NEXT} - {L_PREVIOUS} - + {L_NEXT} + {L_PREVIOUS} + @@ -74,8 +78,12 @@
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 8d0294d226..a89fd8a171 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -1,7 +1,7 @@
-

{L_TOPIC}: {TOPIC_TITLE}

+

{L_TOPIC}{L_COLON} {TOPIC_TITLE}

@@ -13,11 +13,11 @@
-
+
- {to_recipient.NAME} {to_recipient.NAME_FULL}  + {to_recipient.NAME}{to_recipient.NAME_FULL}   
@@ -25,11 +25,11 @@
-
+
- {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}  + {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}   
@@ -45,12 +45,12 @@
-

{L_FIND_USERNAME}
+

{L_FIND_USERNAME}
- {to_recipient.NAME}{to_recipient.NAME_FULL}  + {to_recipient.NAME}{to_recipient.NAME_FULL}   
@@ -67,7 +67,7 @@
-
+
@@ -78,14 +78,14 @@
-
+
-
+
@@ -95,14 +95,14 @@
-
+
-
+
@@ -163,9 +163,9 @@
-
+
-
{attach_row.FILENAME}
+
{attach_row.FILENAME}
  @@ -241,14 +241,14 @@
-
+
-
+
{L_STICK_TOPIC_FOR_EXPLAIN}
@@ -256,7 +256,7 @@
-
+
diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html index a5cb3fc154..4e9954ef81 100644 --- a/phpBB/styles/prosilver/template/posting_layout.html +++ b/phpBB/styles/prosilver/template/posting_layout.html @@ -45,7 +45,7 @@

{L_SELECT_DESTINATION_FORUM}

{L_UNGLOBALISE_EXPLAIN}

-
+
diff --git a/phpBB/styles/prosilver/template/posting_poll_body.html b/phpBB/styles/prosilver/template/posting_poll_body.html index 3f64c5d5b5..5d6e01e997 100644 --- a/phpBB/styles/prosilver/template/posting_poll_body.html +++ b/phpBB/styles/prosilver/template/posting_poll_body.html @@ -9,28 +9,28 @@
-
+
-
+
-

{L_POLL_OPTIONS_EXPLAIN}
+

{L_POLL_OPTIONS_EXPLAIN}
-
+
{L_POLL_MAX_OPTIONS_EXPLAIN}
-
+
{L_POLL_FOR_EXPLAIN}
@@ -39,14 +39,14 @@
-
+
-
+
diff --git a/phpBB/styles/prosilver/template/posting_preview.html b/phpBB/styles/prosilver/template/posting_preview.html index 16fc4ba233..a5aae8c436 100644 --- a/phpBB/styles/prosilver/template/posting_preview.html +++ b/phpBB/styles/prosilver/template/posting_preview.html @@ -3,7 +3,7 @@
-

{L_PREVIEW}: {POLL_QUESTION}

+

{L_PREVIEW}{L_COLON} {POLL_QUESTION}

{L_POLL_LENGTH}
{L_MAX_VOTES}

@@ -25,7 +25,7 @@
-

{L_PREVIEW}: {PREVIEW_SUBJECT}

+

{L_PREVIEW}{L_COLON} {PREVIEW_SUBJECT}

{PREVIEW_MESSAGE}
diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html index d3d6293586..01b74c710c 100644 --- a/phpBB/styles/prosilver/template/posting_smilies.html +++ b/phpBB/styles/prosilver/template/posting_smilies.html @@ -17,7 +17,11 @@
-
{PAGINATION}
+ {L_CLOSE_WINDOW} diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index 5e7b36c526..1fcc9facd0 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -1,7 +1,7 @@

{L_EXPAND_VIEW} - {L_TOPIC_REVIEW}: {TOPIC_TITLE} + {L_TOPIC_REVIEW}{L_COLON} {TOPIC_TITLE}

diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html index 5fcdf0f5d4..9164cb1919 100644 --- a/phpBB/styles/prosilver/template/quickreply_editor.html +++ b/phpBB/styles/prosilver/template/quickreply_editor.html @@ -4,7 +4,7 @@

{L_QUICKREPLY}

-
+
diff --git a/phpBB/styles/prosilver/template/report_body.html b/phpBB/styles/prosilver/template/report_body.html index 3e876afe85..4cb03dc51c 100644 --- a/phpBB/styles/prosilver/template/report_body.html +++ b/phpBB/styles/prosilver/template/report_body.html @@ -11,12 +11,12 @@
-
+
-

{L_REPORT_NOTIFY_EXPLAIN}
+

{L_REPORT_NOTIFY_EXPLAIN}
@@ -24,7 +24,7 @@
-

{L_CAN_LEAVE_BLANK}
+

{L_CAN_LEAVE_BLANK}
diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html index a8baafa5f1..dee080def5 100644 --- a/phpBB/styles/prosilver/template/search_body.html +++ b/phpBB/styles/prosilver/template/search_body.html @@ -2,7 +2,9 @@ @@ -16,13 +18,13 @@
-

{L_SEARCH_KEYWORDS_EXPLAIN}
+

{L_SEARCH_KEYWORDS_EXPLAIN}
-

{L_SEARCH_AUTHOR_EXPLAIN}
+

{L_SEARCH_AUTHOR_EXPLAIN}
@@ -37,18 +39,18 @@
-

{L_SEARCH_FORUMS_EXPLAIN}
+

{L_SEARCH_FORUMS_EXPLAIN}
-
+
-
+
@@ -58,25 +60,25 @@
-
+
-
+
{S_SELECT_SORT_KEY} 
-
+
{S_SELECT_SORT_DAYS}
-
+
{L_POST_CHARACTERS}
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 5d75bd3d56..62b7c61eb3 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -1,15 +1,17 @@ -

{SEARCH_TITLE}{SEARCH_MATCHES}: {SEARCH_WORDS}

-

{L_IGNORED_TERMS}: {IGNORED_WORDS}

+

{SEARCH_TITLE}{SEARCH_MATCHES}{L_COLON} {SEARCH_WORDS}

+

{L_SEARCHED_QUERY}{L_COLON} {SEARCHED_QUERY}

+

{L_IGNORED_TERMS}{L_COLON} {IGNORED_WORDS}

+

{L_PHRASE_SEARCH_DISABLED}

-

{L_RETURN_TO}: {SEARCH_TOPIC}

+

{L_RETURN_TO}{L_COLON} {SEARCH_TOPIC}

-

{L_RETURN_TO_SEARCH_ADV}

+

{L_RETURN_TO_SEARCH_ADV}

- +
@@ -17,14 +19,20 @@
- +
@@ -57,7 +65,20 @@ {searchresults.TOPIC_TITLE} {searchresults.ATTACH_ICON_IMG} {searchresults.UNAPPROVED_IMG} {REPORTED_IMG}
- {searchresults.PAGINATION} + + + {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » {searchresults.FIRST_POST_TIME} » {L_IN} {searchresults.FORUM_TITLE}
{searchresults.TOPIC_REPLIES}
@@ -101,16 +122,16 @@
{L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}
{searchresults.POST_DATE}
 
-
{L_FORUM}: {searchresults.FORUM_TITLE}
-
{L_TOPIC}: {searchresults.TOPIC_TITLE}
-
{L_REPLIES}: {searchresults.TOPIC_REPLIES}
-
{L_VIEWS}: {searchresults.TOPIC_VIEWS}
+
{L_FORUM}{L_COLON} {searchresults.FORUM_TITLE}
+
{L_TOPIC}{L_COLON} {searchresults.TOPIC_TITLE}
+
{L_REPLIES}{L_COLON} {searchresults.TOPIC_REPLIES}
+
{L_VIEWS}{L_COLON} {searchresults.TOPIC_VIEWS}
@@ -125,12 +146,12 @@ - +
- {L_PREVIOUS} - {L_NEXT} + {L_PREVIOUS} + {L_NEXT} @@ -142,10 +163,29 @@
- + diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 5440d66520..88b2c0c025 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -10,7 +10,7 @@ + + diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html index d480258209..b957bd4fe4 100644 --- a/phpBB/styles/prosilver/template/ucp_remind.html +++ b/phpBB/styles/prosilver/template/ucp_remind.html @@ -10,11 +10,11 @@
-
+
-

{L_EMAIL_REMIND}
+

{L_EMAIL_REMIND}
diff --git a/phpBB/styles/prosilver/template/ucp_resend.html b/phpBB/styles/prosilver/template/ucp_resend.html index 36e112863c..6b1b2d84e2 100644 --- a/phpBB/styles/prosilver/template/ucp_resend.html +++ b/phpBB/styles/prosilver/template/ucp_resend.html @@ -11,11 +11,11 @@
-
+
-

{L_EMAIL_REMIND}
+

{L_EMAIL_REMIND}
diff --git a/phpBB/styles/prosilver/template/ucp_zebra_foes.html b/phpBB/styles/prosilver/template/ucp_zebra_foes.html index 7aceac74c3..712479dc18 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_foes.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_foes.html @@ -12,7 +12,7 @@

{ERROR}

-

{L_YOUR_FOES_EXPLAIN}
+

{L_YOUR_FOES_EXPLAIN}
@@ -22,7 +22,7 @@
-

{L_ADD_FOES_EXPLAIN}
+

{L_ADD_FOES_EXPLAIN}
{L_FIND_USERNAME}
diff --git a/phpBB/styles/prosilver/template/ucp_zebra_friends.html b/phpBB/styles/prosilver/template/ucp_zebra_friends.html index 8908e4ba69..583b911284 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_friends.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_friends.html @@ -12,7 +12,7 @@

{ERROR}

-

{L_YOUR_FRIENDS_EXPLAIN}
+

{L_YOUR_FRIENDS_EXPLAIN}
@@ -22,7 +22,7 @@
-

{L_ADD_FRIENDS_EXPLAIN}
+

{L_ADD_FRIENDS_EXPLAIN}
{L_FIND_USERNAME}
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index f5ff1d3f98..a3239602ae 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -6,7 +6,7 @@
{FORUM_DESC}
-

{L_MODERATOR}{L_MODERATORS}: {MODERATORS}

+

{L_MODERATOR}{L_MODERATORS}{L_COLON} {MODERATORS}

@@ -34,7 +34,7 @@ - +
style="margin-top: 2em;"> @@ -55,11 +55,14 @@
- + @@ -87,11 +90,11 @@
-
+
-
+
@@ -142,7 +145,20 @@ style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">{NEWEST_POST_IMG} {topicrow.TOPIC_TITLE} {topicrow.UNAPPROVED_IMG} {REPORTED_IMG}
- {topicrow.PAGINATION} + + + {topicrow.ATTACH_ICON_IMG} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} » {L_IN} {topicrow.FORUM_NAME} @@ -173,10 +189,10 @@
- {L_PREVIOUS} - {L_NEXT} + {L_PREVIOUS} + {L_NEXT} - + @@ -193,13 +209,16 @@
- +
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index 9da8202783..cb19a40d8f 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -4,7 +4,13 @@

{TOTAL_GUEST_USERS_ONLINE} • {L_SWITCH_GUEST_DISPLAY}

    - +
@@ -23,7 +29,7 @@
- @@ -43,14 +49,20 @@
- {L_PREVIOUS}{L_PREVIOUS} • {L_NEXT}{L_NEXT} + {L_PREVIOUS}{L_PREVIOUS} • {L_NEXT}{L_NEXT}
-

{L_LEGEND}: {LEGEND}

+

{L_LEGEND}{L_COLON} {LEGEND}

    - +
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 1af512732d..1b7d78e063 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -6,7 +6,7 @@

- {L_MODERATOR}{L_MODERATORS}: {MODERATORS} + {L_MODERATOR}{L_MODERATORS}{L_COLON} {MODERATORS}

@@ -45,10 +45,14 @@ - + @@ -78,7 +82,7 @@
 
-
{L_TOTAL_VOTES} : {TOTAL_VOTES}
+
{L_TOTAL_VOTES}{L_COLON} {TOTAL_VOTES}
@@ -153,7 +157,19 @@
-
{L_ATTACHMENTS}
+
+ {L_ATTACHMENTS} + +
+ {L_DOWNLOAD_ALL}{L_COLON} + +
+ +
{postrow.attachment.DISPLAY_ATTACHMENT}
@@ -163,7 +179,7 @@
{L_DOWNLOAD_NOTICE}
{postrow.EDITED_MESSAGE} -
{L_REASON}: {postrow.EDIT_REASON} +
{L_REASON}{L_COLON} {postrow.EDIT_REASON}
@@ -186,17 +202,17 @@
 
-
{L_POSTS}: {postrow.POSTER_POSTS}
-
{L_JOINED}: {postrow.POSTER_JOINED}
-
{L_LOCATION}: {postrow.POSTER_FROM}
+
{L_POSTS}{L_COLON} {postrow.POSTER_POSTS}
+
{L_JOINED}{L_COLON} {postrow.POSTER_JOINED}
+
{L_LOCATION}{L_COLON} {postrow.POSTER_FROM}
-
{postrow.PROFILE_FIELD1_NAME}: {postrow.PROFILE_FIELD1_VALUE}
+
{postrow.PROFILE_FIELD1_NAME}{L_COLON} {postrow.PROFILE_FIELD1_VALUE}
-
{postrow.custom_fields.PROFILE_FIELD_NAME}: {postrow.custom_fields.PROFILE_FIELD_VALUE}
+
{postrow.custom_fields.PROFILE_FIELD_NAME}{L_COLON} {postrow.custom_fields.PROFILE_FIELD_VALUE}
@@ -205,7 +221,7 @@
  • {L_PRIVATE_MESSAGE}
    • -
  • {L_WEBSITE}
    • +
  • {L_WEBSITE}
  • {L_MSNM}
  • {L_ICQ}
  • {L_YIM}
    • @@ -229,14 +245,14 @@ - +
    - {L_PREVIOUS} - {L_NEXT} + {L_PREVIOUS} + {L_NEXT} - +
    @@ -252,10 +268,35 @@ - + +
    + {L_DOWNLOAD_ALL_ATTACHMENTS}{L_COLON} + +
    + + + @@ -265,7 +306,7 @@
    - +
{user_row.USERNAME_FULL} {L_IP}: {user_row.USER_IP} » {L_WHOIS} + {user_row.USERNAME_FULL} {L_IP}{L_COLON} {user_row.USER_IP} » {L_WHOIS}
{user_row.USER_BROWSER}		 {user_row.FORUM_LOCATION} {user_row.LASTUPDATE}
diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html index e2edf0b810..1be25403ce 100644 --- a/phpBB/styles/subsilver2/template/captcha_default.html +++ b/phpBB/styles/subsilver2/template/captcha_default.html @@ -11,7 +11,7 @@ - + diff --git a/phpBB/styles/subsilver2/template/captcha_qa.html b/phpBB/styles/subsilver2/template/captcha_qa.html index acc9cdcdfb..90a6492400 100644 --- a/phpBB/styles/subsilver2/template/captcha_qa.html +++ b/phpBB/styles/subsilver2/template/captcha_qa.html @@ -2,7 +2,7 @@ - - + + diff --git a/phpBB/styles/subsilver2/template/captcha_recaptcha.html b/phpBB/styles/subsilver2/template/captcha_recaptcha.html index ec09b28ef5..0d116b361f 100644 --- a/phpBB/styles/subsilver2/template/captcha_recaptcha.html +++ b/phpBB/styles/subsilver2/template/captcha_recaptcha.html @@ -3,7 +3,7 @@ - + + + + diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html index d5420f66a6..054d25282f 100644 --- a/phpBB/styles/subsilver2/template/ucp_agreement.html +++ b/phpBB/styles/subsilver2/template/ucp_agreement.html @@ -20,7 +20,7 @@
-

{L_INDEX} » {navlinks.FORUM_NAME}

+

{L_SITE_HOME} » {L_INDEX} » {navlinks.FORUM_NAME}

{S_TIMEZONE}
{L_CONFIRM_CODE}:
{L_CONFIRM_CODE_EXPLAIN}		{L_CONFIRM_CODE}{L_COLON}
{L_CONFIRM_CODE_EXPLAIN}		 tabindex="{$CAPTCHA_TAB_INDEX}" />
{L_CONFIRM_QUESTION}
{QA_CONFIRM_QUESTION}:
{L_CONFIRM_QUESTION_EXPLAIN}		 tabindex="{$CAPTCHA_TAB_INDEX}" />{QA_CONFIRM_QUESTION}{L_COLON}
{L_CONFIRM_QUESTION_EXPLAIN}		 tabindex="{$CAPTCHA_TAB_INDEX}" />
{L_CONFIRM_CODE}
{L_CONFIRM_CODE}:
{L_RECAPTCHA_EXPLAIN}		{L_CONFIRM_CODE}{L_COLON}
{L_RECAPTCHA_EXPLAIN}		 diff --git a/phpBB/styles/subsilver2/template/timezone.js b/phpBB/styles/subsilver2/template/timezone.js new file mode 100644 index 0000000000..da0a2b0bfd --- /dev/null +++ b/phpBB/styles/subsilver2/template/timezone.js @@ -0,0 +1,19 @@ +(function($) { // Avoid conflicts with other libraries + +$('#tz_date').change(function() { + phpbb.timezone_switch_date(false); +}); + +$('#tz_select_date_suggest').click(function(){ + phpbb.timezone_preselect_select(true); +}); + +$(document).ready( + phpbb.timezone_enable_date_selection +); + +$(document).ready( + phpbb.timezone_preselect_select($('#tz_select_date_suggest').attr('data-is-registration') == 'true') +); + +})(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html new file mode 100644 index 0000000000..7fa310b1bc --- /dev/null +++ b/phpBB/styles/subsilver2/template/timezone_option.html @@ -0,0 +1,20 @@ +
{L_BOARD_TIMEZONE}{L_COLON} + + + + + + +
- +
{L_LANGUAGE}: {L_LANGUAGE}{L_COLON}
{S_HIDDEN_FIELDS} diff --git a/phpBB/styles/subsilver2/template/ucp_attachments.html b/phpBB/styles/subsilver2/template/ucp_attachments.html index 63885f5da9..0f6101aac7 100644 --- a/phpBB/styles/subsilver2/template/ucp_attachments.html +++ b/phpBB/styles/subsilver2/template/ucp_attachments.html @@ -28,7 +28,7 @@  {attachrow.ROW_NUMBER}  - {attachrow.FILENAME}
{L_PM}: {L_TOPIC}: {attachrow.TOPIC_TITLE} + {attachrow.FILENAME}
{L_PM}{L_COLON} {L_TOPIC}{L_COLON} {attachrow.TOPIC_TITLE}  {attachrow.POST_TIME}  {attachrow.SIZE} {attachrow.DOWNLOAD_COUNT} @@ -36,7 +36,7 @@ -
{L_SORT_BY}:  
 
+
{L_SORT_BY}{L_COLON}  
 
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html index ac678895a6..12319c9e4e 100644 --- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html +++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html @@ -21,18 +21,18 @@ {L_GROUP_DETAILS} - for="group_name">{L_GROUP_NAME}: + for="group_name">{L_GROUP_NAME}{L_COLON} style="color: #{GROUP_COLOUR};">{GROUP_NAME} - +
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS} -
{L_GROUP_TYPE_EXPLAIN} +
{L_GROUP_TYPE_EXPLAIN} {L_GROUP_OPEN}   {L_GROUP_REQUEST}   @@ -48,46 +48,46 @@ {L_GROUP_SETTINGS_SAVE} -
{L_GROUP_COLOR_EXPLAIN} +
{L_GROUP_COLOR_EXPLAIN}   [ {L_COLOUR_SWATCH} ] - + {L_GROUP_AVATAR} -
{L_AVATAR_EXPLAIN} +
{L_AVATAR_EXPLAIN} {AVATAR_IMAGE}

 {L_DELETE_AVATAR} - + -
{L_UPLOAD_AVATAR_URL_EXPLAIN} +
{L_UPLOAD_AVATAR_URL_EXPLAIN} -
{L_LINK_REMOTE_AVATAR_EXPLAIN} +
{L_LINK_REMOTE_AVATAR_EXPLAIN} -
{L_LINK_REMOTE_SIZE_EXPLAIN} +
{L_LINK_REMOTE_SIZE_EXPLAIN} px X px - + @@ -97,7 +97,7 @@ {L_AVATAR_GALLERY} - +   @@ -185,7 +185,7 @@