From b4c7dbcd66476678e4a9290a1071c0daf2f88968 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 15 Sep 2009 09:45:05 +0000 Subject: Fix #51305 - User need a_clearlog to delete warnings Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10145 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_users_warnings.html | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_users_warnings.html b/phpBB/adm/style/acp_users_warnings.html index be9ef06825..d27f3800fc 100644 --- a/phpBB/adm/style/acp_users_warnings.html +++ b/phpBB/adm/style/acp_users_warnings.html @@ -7,17 +7,16 @@ {L_REPORT_BY} {L_TIME} {L_FEEDBACK} - {L_MARK} + {L_MARK} - {warn.USERNAME} {warn.DATE} {warn.ACTION} - + @@ -28,12 +27,10 @@ - -
-   - -

{L_MARK_ALL} • {L_UNMARK_ALL}

-
- +
+   + +

{L_MARK_ALL} • {L_UNMARK_ALL}

+
{S_FORM_TOKEN} -- cgit v1.2.1 From 8cea32f3bfde976486bd59240f624eb481e11417 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 16 Sep 2009 14:30:36 +0000 Subject: fix some XHTML issues in admin style - Bug #51405 the acp_logs one is quite nasty, i know - but at least it does not require a new css class git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10153 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_database.html | 5 +++-- phpBB/adm/style/acp_inactive.html | 3 ++- phpBB/adm/style/acp_logs.html | 5 +++-- phpBB/adm/style/acp_main.html | 1 + phpBB/adm/style/acp_styles.html | 8 ++++---- 5 files changed, 13 insertions(+), 9 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index e839fb1bda..de02ac6dbe 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -71,8 +71,9 @@
- -
+ + +
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index ca65416421..3b20043dd9 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -41,6 +41,7 @@ {inactive.REASON}
{inactive.REMINDED_EXPLAIN} +    @@ -67,7 +68,7 @@
-

{L_MARK_ALL} • {L_UNMARK_ALL}

+

{L_MARK_ALL} • {L_UNMARK_ALL}

{S_FORM_TOKEN}
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 6e93dba940..f2fa5dbc26 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -14,11 +14,12 @@ -
 

+
 
+

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 139dc825c1..46d65df7a2 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -232,6 +232,7 @@ diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index c93d8b7d2d..5bde4008ad 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -20,7 +20,7 @@

{L_REPLACE_EXPLAIN}
-
+

@@ -135,11 +135,11 @@


{L_AUTOMATIC_EXPLAIN}
-
+

{L_AUTOMATIC_EXPLAIN}
-
+
@@ -266,7 +266,7 @@

{L_TEMPLATE_CACHE_EXPLAIN}

- +
{L_TEMPLATE_CACHE} -- cgit v1.2.1 From 6b5d195a980145011800125f44466ab4823654f2 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 17 Sep 2009 08:13:28 +0000 Subject: correctly display diff for conflicts git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10156 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/install_update_diff.html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index d794c5c516..b65a014312 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -15,9 +15,9 @@ // -div#codepanel { +div#codepanel { background-color: #eee; } @@ -149,10 +149,10 @@ table.hrdiff tbody th { table.hrdiff tbody td.old { border-left: 1px solid #999; - border-right: 1px solid #999; + border-right: 1px solid #999; } table.hrdiff tbody td.new { - border-right: 1px solid #999; + border-right: 1px solid #999; } table.hrdiff td pre { @@ -237,19 +237,19 @@ table.hrdiff caption span {
+ + +
{L_NUM_CONFLICTS}: {NUM_CONFLICTS}
+
- +
- - -
{L_NUM_CONFLICTS}: {NUM_CONFLICTS}
- {DIFF_CONTENT}
@@ -257,6 +257,6 @@ table.hrdiff caption span {
- + \ No newline at end of file -- cgit v1.2.1 From 5d52b32a63a437d974e804d77ead895bfcfca4ad Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 22 Sep 2009 09:55:50 +0000 Subject: regression in r9647 (wrong fix for bug #45975) - Bug #51505 (Patch by HardStyle) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10176 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/admin.css | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index ad15036daa..9888ad3797 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -69,8 +69,8 @@ h2, caption { h3, h4 { font-family: "Trebuchet MS", Helvetica, sans-serif; font-size: 1.20em; - text-decoration: none; - line-height: 1.20em; + text-decoration: none; + line-height: 1.20em; margin-top: 25px; } @@ -97,8 +97,8 @@ hr { height: 1px; } -.small { - font-size: 0.85em; +.small { + font-size: 0.85em; } /* General links */ @@ -195,7 +195,7 @@ li { width: 76%; margin: 0 0 0 3%; min-height: 350px; - overflow-y: auto; + overflow-x: auto; } .rtl #main { @@ -203,8 +203,9 @@ li { margin: 0 3% 0 0; } -* html #main { - height: 350px; +* html #main { + height: 350px; + overflow-x: visible; } #page-body.simple-page-body { @@ -316,7 +317,7 @@ li { padding: 0; } -span.corners-top, span.corners-bottom, +span.corners-top, span.corners-bottom, span.corners-top span, span.corners-bottom span { font-size: 1px; line-height: 1px; @@ -795,7 +796,7 @@ label img { fieldset.quick, p.quick { margin: 0 0 5px; - padding: 5px 0 0; + padding: 5px 0 0; border: none; background-color: transparent; text-align: right; @@ -848,7 +849,7 @@ select option.disabled { } /* Special case inputs */ -select#board_timezone, +select#board_timezone, select#full_folder_action { width: 95%; } @@ -1245,12 +1246,12 @@ input.disabled { } /* Nice method for clearing floated blocks without having to insert any extra markup - From http://www.positioniseverything.net/easyclearing.html + From http://www.positioniseverything.net/easyclearing.html .clearfix:after, #tabs:after, .row:after, #content:after, fieldset dl:after, #page-body:after { - content: "."; - display: block; - height: 0; - clear: both; + content: "."; + display: block; + height: 0; + clear: both; visibility: hidden; }*/ @@ -1317,7 +1318,7 @@ fieldset.permissions legend input{ height: 1.1em; } -/* Permission sections */ +/* Permission sections */ fieldset.permissions .permissions-simple { text-align: left; padding-top: 3px; @@ -1528,7 +1529,7 @@ fieldset.permissions .padding { background-image: url("../images/corners_right2.gif"); } -.permissions-panel span.corners-top, .permissions-panel span.corners-bottom, +.permissions-panel span.corners-top, .permissions-panel span.corners-bottom, .permissions-panel span.corners-top span, .permissions-panel span.corners-bottom span { font-size: 1px; line-height: 1px; @@ -1606,7 +1607,7 @@ fieldset.permissions .padding { } .permissions-panel th.row4 { - background-image: none; + background-image: none; background-color: #E4E8EB; color: #536482; border: none; @@ -1614,8 +1615,8 @@ fieldset.permissions .padding { .permissions-panel th a:link, .permissions-panel th a:hover, .permissions-panel th a:visited { display: block; - color: #FFFFFF; - text-decoration: underline; + color: #FFFFFF; + text-decoration: underline; } .permissions-panel td.permissions-yes label:hover { -- cgit v1.2.1 From 1461beacf6cd399cb3a6fda8fec98959921364db Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 23 Sep 2009 17:03:04 +0000 Subject: submit buttons in same style as other submit buttons in ACP git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10181 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_captcha.html | 10 ++++++---- phpBB/adm/style/captcha_gd_acp.html | 12 +++++++----- phpBB/adm/style/captcha_recaptcha_acp.html | 10 ++++++---- 3 files changed, 19 insertions(+), 13 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 12f2251ab5..d31527b64d 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -54,10 +54,12 @@ -
- {L_SUBMIT} -   -   +
+ {L_ACP_SUBMIT_CHANGES} +

+   +   +

{S_FORM_TOKEN}
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html index be715401db..d0bb758cfe 100644 --- a/phpBB/adm/style/captcha_gd_acp.html +++ b/phpBB/adm/style/captcha_gd_acp.html @@ -56,11 +56,13 @@
-
- {L_SUBMIT} -   -   -   +
+ {L_ACP_SUBMIT_CHANGES} +

+   +   +   +

diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html index fba59a9647..5b97cff984 100644 --- a/phpBB/adm/style/captcha_recaptcha_acp.html +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -34,10 +34,12 @@
-
- {L_SUBMIT} -   -   +
+ {L_ACP_SUBMIT_CHANGES} +

+   +   +

-- cgit v1.2.1
{inactive.REASON}
{inactive.REMINDED_EXPLAIN} +