diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 1c7dc40b25..8066d90eca 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -174,7 +174,7 @@ {L_LEGEND}
-
+

{L_SPECIAL_CATEGORY_EXPLAIN}
@@ -197,7 +197,7 @@
-
+
@@ -253,7 +253,7 @@

- {L_CREATE_GROUP}: + {L_CREATE_GROUP}:

@@ -268,7 +268,7 @@ {L_ADD_EXTENSION}
-
+
@@ -346,7 +346,7 @@ {orphan.REAL_FILENAME} {orphan.FILETIME} {orphan.FILESIZE} - ID: + ID: diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index e196c697ac..4370b5e225 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -35,7 +35,7 @@

{L_BBCODE_HELPLINE_EXPLAIN}

-
+
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 25c5418479..6b531f545e 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -23,7 +23,7 @@ {L_TITLE}

{L_BOT_NAME_EXPLAIN}
-
+

{L_BOT_STYLE_EXPLAIN}
@@ -39,11 +39,11 @@

{L_BOT_AGENT_EXPLAIN}
-
+

{L_BOT_IP_EXPLAIN}
-
+

diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index b16f5c907f..5744136230 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -28,7 +28,7 @@

-
+

{L_MASS_MESSAGE_EXPLAIN}
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 08a3a45f83..b5b2dcabcb 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -148,7 +148,9 @@

{L_FORUM_DESC_EXPLAIN}
-
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}
+
+ +

{L_FORUM_IMAGE_EXPLAIN}
@@ -159,11 +161,11 @@

{L_FORUM_PASSWORD_EXPLAIN}
-
+

{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}
-
+
@@ -220,7 +222,7 @@

{L_FORUM_TOPICS_PAGE_EXPLAIN}
-
+
@@ -233,15 +235,15 @@

{L_AUTO_PRUNE_FREQ_EXPLAIN}
-
{L_DAYS}
+
{L_DAYS}

{L_AUTO_PRUNE_DAYS_EXPLAIN}
-
{L_DAYS}
+
{L_DAYS}

{L_AUTO_PRUNE_VIEWED_EXPLAIN}
-
{L_DAYS}
+
{L_DAYS}

{L_PRUNE_OLD_POLLS_EXPLAIN}
@@ -297,7 +299,9 @@

{L_FORUM_RULES_EXPLAIN}
-
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}
+
+ +
@@ -475,7 +479,7 @@
- +
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 446ca31040..3e98e5de4c 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -28,7 +28,9 @@
-
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}
+
+ +
@@ -70,11 +72,11 @@

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
-
+

{L_GROUP_COLOR_EXPLAIN}
-
  [ {L_COLOUR_SWATCH} ]
+
  [ {L_COLOUR_SWATCH} ]
@@ -87,7 +89,7 @@

{L_AVATAR_EXPLAIN}
{AVATAR_IMAGE}
-
 {L_DELETE_AVATAR}
+
@@ -97,16 +99,16 @@

{L_UPLOAD_AVATAR_URL_EXPLAIN}
-
+

{L_LINK_REMOTE_AVATAR_EXPLAIN}
-
+

{L_LINK_REMOTE_SIZE_EXPLAIN}
-
px X px
+
px X px
@@ -304,7 +306,7 @@
- {L_CREATE_GROUP}: + {L_CREATE_GROUP}:
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 2ceb0e5a69..1f14b7044b 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -24,27 +24,27 @@

{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 2b9e541e6a..d15f722e98 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -36,11 +36,11 @@ {LANG_LOCAL_NAME}

-
+
-
+
@@ -48,7 +48,7 @@
-
+

diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 40d052bc2a..d241119fb6 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -192,7 +192,7 @@ - + diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 593c43b965..d70533bd94 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -37,7 +37,7 @@ {L_ROLE_DETAILS}

-
+

{L_ROLE_DESCRIPTION_EXPLAIN}
@@ -181,7 +181,7 @@
- {L_CREATE_ROLE}:
+ {L_CREATE_ROLE}:
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 0f1583fd39..9097bf1e61 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -30,7 +30,7 @@
-
  {L_ALL_FORUMS}
+

@@ -75,7 +75,7 @@

[ {L_FIND_USERNAME} ]
-
 {L_SELECT_ANONYMOUS}
+

@@ -120,7 +120,7 @@ {L_MANAGE_USERS}

-
  {L_ALL_USERS}
+
@@ -132,13 +132,13 @@
- +
{L_ADD_USERS}

{L_USERNAMES_EXPLAIN}

-
 {L_SELECT_ANONYMOUS}
+
@@ -165,7 +165,7 @@ {L_MANAGE_GROUPS}
-
  {L_ALL_GROUPS}
+
@@ -224,9 +224,9 @@ {L_LOOK_UP_USER}
-
+
[ {L_FIND_USERNAME} ]
-
 {L_SELECT_ANONYMOUS}
+
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 9831384533..ad8d987a02 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -45,7 +45,7 @@
-
  {L_ALL_FORUMS}
+

@@ -73,11 +73,11 @@ {L_FORUM_PRUNE}

-
+
-
+

{L_PRUNE_OLD_POLLS_EXPLAIN}
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 8f1d03ec7a..1300ddffb2 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -12,23 +12,23 @@ {L_ACP_PRUNE_USERS}
-
+
-
+

{L_JOINED_EXPLAIN}
-
+

{L_LAST_ACTIVE_EXPLAIN}
-
+
-
+

{L_SELECT_USERS_EXPLAIN}
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 017def30a6..a8d496e257 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -26,7 +26,7 @@ {L_ACP_RANKS}
-
+
@@ -41,7 +41,7 @@
-
+
@@ -284,7 +284,7 @@ {L_THEME_EDITOR}
-
+
@@ -295,7 +295,7 @@ {L_BACKGROUND}

{L_CSS_COLOUR_EXPLAIN}
-
  [ {L_COLOUR_SWATCH} ]
+
  [ {L_COLOUR_SWATCH} ]
@@ -311,15 +311,15 @@ {L_FOREGROUND}

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

{L_FONT_FACE_EXPLAIN}
-
+
-
+
@@ -341,7 +341,7 @@
-
+
@@ -374,7 +374,7 @@ {L_CUSTOM_CLASS}
-
+

@@ -566,7 +566,7 @@

{L_CREATE} - {L_CREATE}: {L_FROM} + {L_CREATE}: {L_FROM}
@@ -593,11 +593,11 @@ {L_TITLE}
-
{NAME}
+
{NAME}
-
{COPYRIGHT}
+
{COPYRIGHT}
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 01d34e7f70..958becd809 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -16,7 +16,7 @@
[ {L_FIND_USERNAME} ]
-
 {L_SELECT_ANONYMOUS}
+

@@ -126,22 +126,25 @@ - {group.GROUP_TYPE} + {group.GROUP_TYPE} - {group.GROUP_NAME} - {L_GROUP_DEFAULT}{L_GROUP_DEFAULT} - {group.L_DEMOTE_PROMOTE} - {L_GROUP_DELETE} + {group.GROUP_NAME} + {L_GROUP_DEFAULT}{L_GROUP_DEFAULT} + {group.L_DEMOTE_PROMOTE}  + {L_GROUP_DELETE} + -

- {L_USER_GROUP_ADD}: -
+ +
+ {L_USER_GROUP_ADD}: +
+ diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 66385ee428..c2590ebca0 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -5,7 +5,7 @@

{L_AVATAR_EXPLAIN}
{AVATAR_IMAGE}
-
 {L_DELETE_AVATAR}
+
@@ -15,17 +15,17 @@

{L_UPLOAD_AVATAR_URL_EXPLAIN}
-
+

{L_LINK_REMOTE_AVATAR_EXPLAIN}
-
+

{L_LINK_REMOTE_SIZE_EXPLAIN}
-
px X px
+
px X px
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index 322df38662..9f8ed9648a 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -4,7 +4,7 @@ {L_ACP_USER_OVERVIEW}

{L_NAME_CHARS_EXPLAIN}
-
+
[ {L_USE_PERMISSIONS} ]
@@ -51,11 +51,11 @@

{L_CHANGE_PASSWORD_EXPLAIN}
-
+

{L_CONFIRM_PASSWORD_EXPLAIN}
-
+

diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index e8e3aced8f..99e82ea0db 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -58,7 +58,7 @@


{L_BOARD_DATE_FORMAT_EXPLAIN}
-
style="display:none;">
+
style="display:none;">
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index 2d087c39f2..69edb1159b 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -4,31 +4,31 @@ {L_USER_PROFILE}
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index f6a38b4f36..43373a2a7e 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -86,13 +86,13 @@
-   {L_DISABLE_BBCODE}   + -   {L_DISABLE_SMILIES}   + -   {L_DISABLE_MAGIC_URL}   +

{L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index 22bd641e4d..fa85669595 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -16,11 +16,11 @@ {L_EDIT_WORD}
-
+
-
+
{S_HIDDEN_FIELDS} diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 13711deb95..691accc13c 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -663,7 +663,7 @@ input, textarea { font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 0.90em; font-weight: normal; - cursor: default; + cursor: text; vertical-align: middle; padding: 2px; color: #111111; @@ -735,7 +735,6 @@ textarea { font-size: 0.85em; width: 60%; padding: 2px; - cursor: text; } label { @@ -969,7 +968,6 @@ p.submit-buttons { fieldset.submit-buttons input, p.submit-buttons input { padding: 3px 2px; - cursor: pointer; } fieldset.submit-buttons legend { @@ -979,10 +977,6 @@ fieldset.submit-buttons legend { /* Input field styles ---------------------------------------- */ -input.text { - cursor: text; -} - input.radio, input.permissions-checkbox { width: auto !important; background-color: transparent; @@ -1005,11 +999,11 @@ input.autowidth { width: auto !important;} /* Form button styles ---------------------------------------- */ a.button1, input.button1, input.button3, -a.button2, input.button2 { +a.button2, input.button2 { width: auto !important; - padding: 1px 3px; + padding: 1px 3px 0 3px; font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - color: #000000; + color: #000; font-size: 0.85em; background: #EFEFEF url("../images/bg_button.gif") repeat-x top; cursor: pointer; @@ -1041,6 +1035,11 @@ a.button2:hover, input.button2:hover { color: #BC2A4D; } +input.disabled { + font-weight: normal; + color: #666666; +} + /* Pagination ---------------------------------------- */ .pagination { @@ -1098,40 +1097,6 @@ a.button2:hover, input.button2:hover { } -/* Form button styles ----------------------------------------- */ -a.button1, input.button1, input.button3, -a.button2, input.button2 { - width: auto !important; - padding: 1px 3px 0 3px; - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - 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, -a.button2, a.button2:link, a.button2:visited, a.button2:active { - text-decoration: none; - color: #000000; - padding: 4px 8px; -} - -input.disabled { - font-weight: normal; - color: #666666; -} - /* Action Highlighting ---------------------------------------- */ .successbox, .errorbox { diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html index 289d11d32e..1aba162d00 100644 --- a/phpBB/adm/style/custom_profile_fields.html +++ b/phpBB/adm/style/custom_profile_fields.html @@ -10,7 +10,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index c8f3811abe..30f797cc8c 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -187,7 +187,7 @@
[ {files.L_SHOW_DIFF} ]{L_BINARY_FILE}
-
  {L_DO_NOT_UPDATE}
+
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 8b54589707..dd67cdda87 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -106,12 +106,26 @@ class acp_modules trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); } + $sql = 'SELECT * + FROM ' . MODULES_TABLE . " + WHERE module_class = '" . $db->sql_escape($this->module_class) . "' + AND module_id = $module_id"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if (!$row) + { + trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); + } + $sql = 'UPDATE ' . MODULES_TABLE . ' SET module_enabled = ' . (($action == 'enable') ? 1 : 0) . " - WHERE module_id = $module_id"; + WHERE module_class = '" . $db->sql_escape($this->module_class) . "' + AND module_id = $module_id"; $db->sql_query($sql); - add_log('admin', 'LOG_MODULE_' . strtoupper($action)); + add_log('admin', 'LOG_MODULE_' . strtoupper($action), $this->lang_name($row['module_langname'])); $this->remove_cache_file(); break; diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index aae147af4f..78a9983b0f 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3355,7 +3355,7 @@ function truncate_string($string, $max_length = 60, $allow_reply = true, $append */ function get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false) { - global $phpbb_root_path, $phpEx, $user; + global $phpbb_root_path, $phpEx, $user, $auth; $profile_url = ''; $username_colour = ($username_colour) ? '#' . $username_colour : ''; @@ -3372,8 +3372,17 @@ function get_username_string($mode, $user_id, $username, $username_colour = '', // Only show the link if not anonymous if ($user_id && $user_id != ANONYMOUS) { - $profile_url = ($custom_profile_url !== false) ? $custom_profile_url : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile'); - $profile_url .= '&u=' . (int) $user_id; + // Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly). + // For all others the link leads to a login page or the profile. + if ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) + { + $profile_url = ''; + } + else + { + $profile_url = ($custom_profile_url !== false) ? $custom_profile_url : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile'); + $profile_url .= '&u=' . (int) $user_id; + } } else { diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 51a45166ba..18853eb013 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1490,18 +1490,18 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false, { if (sizeof($forum_ids) == 1) { - $sql = 'SELECT SUM(topic_replies + 1) AS forum_posts + $sql = 'SELECT SUM(t.topic_replies + 1) AS forum_posts FROM ' . TOPICS_TABLE . ' t WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . ' AND t.topic_approved = 1'; } else { - $sql = 'SELECT p.forum_id, SUM(topic_replies + 1) AS forum_posts + $sql = 'SELECT t.forum_id, SUM(t.topic_replies + 1) AS forum_posts FROM ' . TOPICS_TABLE . ' t WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . ' AND t.topic_approved = 1 - GROUP BY p.forum_id'; + GROUP BY t.forum_id'; } $result = $db->sql_query($sql); diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php index a7a9e48c8f..cec097cd8a 100755 --- a/phpBB/includes/mcp/mcp_logs.php +++ b/phpBB/includes/mcp/mcp_logs.php @@ -18,7 +18,7 @@ class mcp_logs var $u_action; var $p_master; - function mcp_main(&$p_master) + function mcp_logs(&$p_master) { $this->p_master = &$p_master; } diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index ced9f83ce9..7d16664a77 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -598,7 +598,7 @@ function mcp_move_topic($topic_ids) $db->sql_transaction('begin'); - $sql = 'SELECT SUM(topic_replies + 1) as topic_posts + $sql = 'SELECT SUM(t.topic_replies + 1) as topic_posts FROM ' . TOPICS_TABLE . ' t WHERE ' . $db->sql_in_set('t.topic_id', $topic_ids); $result = $db->sql_query($sql); diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 2fc97d423a..03347101e0 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -18,7 +18,7 @@ class mcp_queue var $p_master; var $u_action; - function mcp_main(&$p_master) + function mcp_queue(&$p_master) { $this->p_master = &$p_master; } diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 06d5ffd03d..9080dcdc76 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -18,7 +18,7 @@ class mcp_reports var $p_master; var $u_action; - function mcp_main(&$p_master) + function mcp_reports(&$p_master) { $this->p_master = &$p_master; } diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index fd6ef88480..739368c3df 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -542,8 +542,8 @@ $lang = array_merge($lang, array( 'LOG_MCP_CHANGE_POSTER' => 'Changed poster in topic “%1$s”
» from %2$s to %3$s', - 'LOG_MODULE_DISABLE' => 'Module disabled', - 'LOG_MODULE_ENABLE' => 'Module enabled', + 'LOG_MODULE_DISABLE' => 'Module disabled
» %s', + 'LOG_MODULE_ENABLE' => 'Module enabled
» %s', 'LOG_MODULE_MOVE_DOWN' => 'Module moved down
» %s', 'LOG_MODULE_MOVE_UP' => 'Module moved up
» %s', 'LOG_MODULE_REMOVED' => 'Module removed
» %s', diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index f828ffa72e..80886b477d 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -95,8 +95,9 @@ onload_functions.push('subPanels()');
+

- Expand view + {L_EXPAND_VIEW} {L_TOPIC_REVIEW}: {TOPIC_TITLE}

diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index cf12aa631f..7ebe1e3472 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -19,11 +19,11 @@
-
+
-
+
 
@@ -54,7 +54,7 @@
-
+
 
@@ -67,10 +67,6 @@
 
{L_IM_NO_JABBER}
-
-
 
-
-
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index d999d344da..19b52d3738 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -1,6 +1,6 @@

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

diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index 008f5f2b3d..d49166fe62 100644 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ b/phpBB/styles/prosilver/template/ucp_main_front.html @@ -19,7 +19,7 @@ {topicrow.PAGINATION} {topicrow.ATTACH_ICON_IMG} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} -
{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} +
{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} {LAST_POST_IMG}
{L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html index aedf488f9d..f90c75f10d 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ b/phpBB/styles/prosilver/template/ucp_pm_history.html @@ -1,6 +1,6 @@

- {L_EXPAND_VIEW} + {L_EXPAND_VIEW} {L_MESSAGE_HISTORY}: {TITLE}

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index a1db3d514a..e376bf5390 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -170,7 +170,12 @@
-
{postrow.POSTER_AVATAR}
{postrow.POST_AUTHOR_FULL}
+
+ + {postrow.POSTER_AVATAR}{postrow.POSTER_AVATAR}
+ + {postrow.POST_AUTHOR_FULL}{postrow.POST_AUTHOR_FULL} +
{postrow.RANK_TITLE}
{postrow.RANK_IMG}
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index 733a3cc8d3..09f11fbca9 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -9,6 +9,7 @@ a:active { color: #d2d2d2; text-decoration: none; } /* Coloured usernames */ .username-coloured { font-weight: bold; + display: inline !important; } /* Links on gradient backgrounds */