From 04785d807878f5b1c8572900550c8b37092f0328 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 13 Mar 2008 14:08:59 +0000 Subject: [PATCH] #22875 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8426 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_attachments.html | 6 +++--- phpBB/adm/style/acp_bbcodes.html | 4 ++++ phpBB/adm/style/acp_database.html | 22 +++++++++++++--------- phpBB/adm/style/acp_icons.html | 20 ++++++++++++-------- phpBB/adm/style/acp_permission_roles.html | 15 ++++++++++----- phpBB/adm/style/acp_prune_forums.html | 2 +- phpBB/adm/style/acp_styles.html | 2 +- phpBB/adm/style/acp_words.html | 4 ++++ phpBB/docs/CHANGELOG.html | 2 ++ phpBB/language/en/acp/common.php | 2 ++ 10 files changed, 52 insertions(+), 27 deletions(-) diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index a002ad19ac..9573c34248 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -122,11 +122,11 @@ { if (newimage == 'no_image') { - document.image_upload_icon.src = "{PHPBB_ROOT_PATH}images/spacer.gif"; + document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif"; } else { - document.image_upload_icon.src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage; + document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage; } } @@ -192,7 +192,7 @@
-
 src="{PHPBB_ROOT_PATH}images/spacer.gif"src="{UPLOAD_ICON_SRC}" name="image_upload_icon" alt="" title="" /> 
+
 src="{PHPBB_ROOT_PATH}images/spacer.gif"src="{UPLOAD_ICON_SRC}" id="image_upload_icon" alt="" title="" /> 
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index a0b0016a11..c81c198fd5 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -103,6 +103,10 @@ {bbcodes.BBCODE_TAG} {ICON_EDIT} {ICON_DELETE} + + + {L_ACP_NO_ITEMS} + diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index e64c5ed437..ebc76c36a3 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -7,8 +7,9 @@

{L_ACP_RESTORE_EXPLAIN}

+
- +
{L_RESTORE_OPTIONS}
@@ -16,16 +17,19 @@
- -

-   -   - -

- - {S_FORM_TOKEN} +

+   +   + +

+ {S_FORM_TOKEN}
+ +
+

{L_ACP_NO_ITEMS}

+
+

{L_ACP_BACKUP}

diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 8bb8257318..86500ae047 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -43,19 +43,19 @@ function toggle_select(icon, display, select) { - var disp = document.getElementById('order_disp[' + icon + ']'); - var nodisp = document.getElementById('order_no_disp[' + icon + ']'); + var disp = document.getElementById('order_disp_' + select); + var nodisp = document.getElementById('order_no_disp_' + select); disp.disabled = !display; nodisp.disabled = display; if (display) { - document.getElementById(select).selectedIndex = 0; + document.getElementById('order_' + select).selectedIndex = 0; nodisp.className = 'disabled-options'; disp.className = ''; } else { - document.getElementById(select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT}; + document.getElementById('order_' + select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT}; disp.className = 'disabled-options'; nodisp.className = ''; } @@ -111,15 +111,15 @@ - + - + disabled="disabled" class="disabled-options" >{S_ORDER_LIST_DISPLAY} + disabled="disabled" class="disabled-options" >{S_ORDER_LIST_UNDISPLAY} @@ -248,6 +248,10 @@  {ICON_EDIT} {ICON_DELETE} + + + {L_ACP_NO_ITEMS} + diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 725c7a5ec1..220e7dafbe 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -28,11 +28,11 @@

{L_EXPLAIN}

-
-
» {L_SET_ROLE_PERMISSIONS} + +
{L_ROLE_DETAILS}
@@ -46,6 +46,7 @@

+ {S_FORM_TOKEN}

@@ -57,11 +58,15 @@ +

+ » {L_BACK_TO_TOP}


+

+

{L_ACL_TYPE}

@@ -107,9 +112,9 @@ {auth.mask.PERMISSION} - - - + + + diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 890a3ba569..069d2c91c3 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -44,7 +44,7 @@

{L_LOOK_UP_FORUMS_EXPLAIN}

-
+
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 4b3bcddf1d..a1363fce8d 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -459,7 +459,7 @@
-
{COPYRIGHT}
+
{COPYRIGHT}
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index 9bd0bf11a0..3fa4cfc91c 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -62,6 +62,10 @@ {words.REPLACEMENT}  {ICON_EDIT}  {ICON_DELETE}  + + + {L_ACP_NO_ITEMS} + diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 9c7a3fb7cf..c649b6466c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -132,6 +132,8 @@
  • [Change] Removed minimum form times
  • [Fix] Check topics_per_page value in acp_forums (Bug #15539)
  • [Fix] Custom profile fields with date type should be timezone independend (Bug #15003)
    • +
  • [Fix] Fixing some XHTML errors/warnings within the ACP (Bug #22875)
    • +

    1.i. Changes since 3.0.RC8

    diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index e69597395b..f8b91dd1aa 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -126,6 +126,8 @@ $lang = array_merge($lang, array( 'ACP_MOD_LOGS' => 'Moderator log', 'ACP_MOD_ROLES' => 'Moderator roles', + 'ACP_NO_ITEMS' => 'There are no items yet.', + 'ACP_ORPHAN_ATTACHMENTS' => 'Orphaned attachments', 'ACP_PERMISSIONS' => 'Permissions',