From b776d02682492077a4fafd8835d7c4a17e50762d Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 2 Jun 2009 14:12:23 +0000 Subject: Okay, a first ci of the new captcha plugins. We'll add dynamic template includes later, as well as documentation on how to use this. I'm prepared to get yelled at for bugs (oh, I know that there are plenty); but please blame spammers for broken styles and MODs. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9524 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_captcha.html | 66 ++++++------------------ phpBB/adm/style/captcha_default_acp_demo.html | 5 ++ phpBB/adm/style/captcha_gd_acp.html | 74 +++++++++++++++++++++++++++ phpBB/adm/style/captcha_recaptcha.html | 19 +++++++ phpBB/adm/style/captcha_recaptcha_acp.html | 48 +++++++++++++++++ 5 files changed, 161 insertions(+), 51 deletions(-) create mode 100755 phpBB/adm/style/captcha_default_acp_demo.html create mode 100755 phpBB/adm/style/captcha_gd_acp.html create mode 100644 phpBB/adm/style/captcha_recaptcha.html create mode 100644 phpBB/adm/style/captcha_recaptcha_acp.html (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 8a067cda66..68909e4012 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -25,69 +25,33 @@

{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}
-
-
- -
-

{L_CAPTCHA_GD_EXPLAIN}
-
-
-
-
-

{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}
-
-
-
-
-

{L_CAPTCHA_GD_X_GRID_EXPLAIN}
-
-
-
-

{L_CAPTCHA_GD_Y_GRID_EXPLAIN}
-
-
-
-

{L_CAPTCHA_GD_WAVE_EXPLAIN}
-
- -
+
+ + +
+{L_AVAILABLE_CAPTCHAS}
-

{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}
-
- -
+

{L_CAPTCHA_SELECT_EXPLAIN}
+
-

{L_CAPTCHA_GD_FONTS_EXPLAIN}
-
- - - -
+

{L_CAPTCHA_CONFIGURE_EXPLAIN}
+
- -
+ +
{L_PREVIEW} - -
-

{L_WARNING}

-

{L_CAPTCHA_PREVIEW_MSG}

-
- -
-

{L_CAPTCHA_PREVIEW_EXPLAIN}
-
{L_PREVIEW}width="360" height="96" width="320" height="50" id="captcha_preview" />
-
+{CAPTCHA_PREVIEW}
+
{L_SUBMIT} -   -   - +   +   {S_FORM_TOKEN}
diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html new file mode 100755 index 0000000000..a714386e51 --- /dev/null +++ b/phpBB/adm/style/captcha_default_acp_demo.html @@ -0,0 +1,5 @@ + +
+

{L_CAPTCHA_PREVIEW_EXPLAIN}
+
{L_PREVIEW}
+
\ No newline at end of file diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html new file mode 100755 index 0000000000..ea7a851be3 --- /dev/null +++ b/phpBB/adm/style/captcha_gd_acp.html @@ -0,0 +1,74 @@ + + + + +

{L_ACP_VC_SETTINGS}

+ +

{L_ACP_VC_SETTINGS_EXPLAIN}

+ + +
+ +
+{L_GENERAL_OPTIONS} + +
+

{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}
+
+
+
+
+

{L_CAPTCHA_GD_X_GRID_EXPLAIN}
+
+
+
+

{L_CAPTCHA_GD_Y_GRID_EXPLAIN}
+
+
+
+

{L_CAPTCHA_GD_WAVE_EXPLAIN}
+
+ +
+
+
+

{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}
+
+ +
+
+
+

{L_CAPTCHA_GD_FONTS_EXPLAIN}
+
+ + + +
+
+ +
+
+ {L_PREVIEW} + +
+

{L_WARNING}

+

{L_CAPTCHA_PREVIEW_MSG}

+
+ +{CAPTCHA_PREVIEW} +
+ +
+ {L_SUBMIT} +   +   +   + + + + + {S_FORM_TOKEN} +
+
+ + diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html new file mode 100644 index 0000000000..f325c3727d --- /dev/null +++ b/phpBB/adm/style/captcha_recaptcha.html @@ -0,0 +1,19 @@ + +
+ + + +
+ +{L_RECAPTCHA_NOT_AVAILABLE} + \ No newline at end of file diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html new file mode 100644 index 0000000000..07751d1d03 --- /dev/null +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -0,0 +1,48 @@ + + + + +

{L_ACP_VC_SETTINGS}

+ +

{L_ACP_VC_SETTINGS_EXPLAIN}

+ + +
+ +
+{L_GENERAL_OPTIONS} + +
+

{L_RECAPTCHA_PUBLIC_EXPLAIN}
+
+
+
+

{L_RECAPTCHA_PRIVATE_EXPLAIN}
+
+
+ + +
+
+ {L_PREVIEW} + +
+

{L_WARNING}

+

{L_CAPTCHA_PREVIEW_MSG}

+
+ +{CAPTCHA_PREVIEW} +
+ +
+ {L_SUBMIT} +   +   + + + + {S_FORM_TOKEN} +
+
+ + -- cgit v1.2.1 From 8f46e94294ace956d9b120791b37c1eaf2eec626 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 12 Jun 2009 12:29:08 +0000 Subject: Fix bugs #25545, #26315 and #31325 - Mostly XHTML mistakes in prosilver and the ACP. Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9573 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/overall_header.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index ccf38e49b8..a376884507 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -194,21 +194,27 @@ function switch_menu() -- cgit v1.2.1 From c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Wed, 17 Jun 2009 13:29:26 +0000 Subject: Use dynamic includes, fix some style bugs, make the old default captcha family backwards compatible to 3.0.5 styles git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9609 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_captcha.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 68909e4012..290aaa254c 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -41,10 +41,10 @@ - +
{L_PREVIEW} -{CAPTCHA_PREVIEW} +
-- cgit v1.2.1 From d7d96223e7bae7cd60b13c6e7896d95838c3633c Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 19 Jun 2009 09:51:50 +0000 Subject: - Display coloured usernames in ACP groups management screens - Changed behaviour of group_create() function to support specifying additional group columns - New groups option to excempt group leaders from group permissions git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9625 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_groups.html | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 5df8a16a39..a513e69a8a 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -55,21 +55,29 @@
- {L_GROUP_SETTINGS_SAVE} + {L_GROUP_OPTIONS_SAVE}

{L_GROUP_FOUNDER_MANAGE_EXPLAIN}
-
+
+
+

{L_GROUP_SKIP_AUTH_EXPLAIN}
+
+
-
+

{L_GROUP_RECEIVE_PM_EXPLAIN}
-
+
+
+ +
+ {L_GROUP_SETTINGS_SAVE}

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
@@ -80,7 +88,7 @@

{L_GROUP_COLOR_EXPLAIN}
-
  [ {L_COLOUR_SWATCH} ]
+
      [ {L_COLOUR_SWATCH} ]
@@ -97,7 +105,7 @@
-
+
@@ -115,7 +123,7 @@
px X px
-
+
@@ -132,7 +140,7 @@
- + @@ -146,11 +154,11 @@
{avatar_row.avatar_column.AVATAR_NAME}
- +
- + @@ -192,7 +200,7 @@ - {leader.USERNAME} + {leader.USERNAME}{leader.USERNAME} {L_YES}{L_NO} {leader.JOINED} {leader.USER_POSTS} @@ -213,7 +221,7 @@ - {member.USERNAME} + {member.USERNAME}{member.USERNAME} {L_YES}{L_NO} {member.JOINED} {member.USER_POSTS} @@ -231,12 +239,12 @@ - +
-

{L_MARK_ALL} • {L_UNMARK_ALL}

+

{L_MARK_ALL} • {L_UNMARK_ALL}

{L_ADD_USERS}

-- cgit v1.2.1 From c2c79d8297369fa461976061e0b7b95dd8c8a721 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 21 Jun 2009 13:31:26 +0000 Subject: fix the captcha ACP, restore xhtml compliance for recaptcha (#46195) - note, that this will not work in IE git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9645 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/captcha_gd_acp.html | 3 ++- phpBB/adm/style/captcha_recaptcha.html | 16 +++++++++++----- phpBB/adm/style/captcha_recaptcha_acp.html | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html index ea7a851be3..f4755a37da 100755 --- a/phpBB/adm/style/captcha_gd_acp.html +++ b/phpBB/adm/style/captcha_gd_acp.html @@ -54,8 +54,9 @@

{L_WARNING}

{L_CAPTCHA_PREVIEW_MSG}

+ -{CAPTCHA_PREVIEW} +
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html index f325c3727d..0cb43cf01f 100644 --- a/phpBB/adm/style/captcha_recaptcha.html +++ b/phpBB/adm/style/captcha_recaptcha.html @@ -1,5 +1,6 @@ -
+
+
- -
{L_RECAPTCHA_NOT_AVAILABLE} diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html index 07751d1d03..78f035a01d 100644 --- a/phpBB/adm/style/captcha_recaptcha_acp.html +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -31,7 +31,7 @@

{L_CAPTCHA_PREVIEW_MSG}

-{CAPTCHA_PREVIEW} +
-- cgit v1.2.1 From b16626e947328379ea986c10fe1c4840e502aacb Mon Sep 17 00:00:00 2001 From: Gabriel Vazquez Date: Sun, 21 Jun 2009 14:42:20 +0000 Subject: Fixed bug #45975 Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9647 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/index.php | 2 +- phpBB/adm/style/admin.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 2c3f9deb6c..778070e2e1 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -246,7 +246,7 @@ function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = foreach ($input_ary as $value => $title) { $selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : ''; - $html .= ''; + $html .= ' '; $id_assigned = true; } diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 344b5cacf0..173af4f7ab 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -184,6 +184,7 @@ a:active { width: 76%; margin: 0 0 0 3%; min-height: 350px; + overflow-y: auto; } .rtl #main { -- cgit v1.2.1 From c32f49679f635175d43de7264ee09782c56c628e Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 23 Jun 2009 10:48:53 +0000 Subject: - add options for quick reply (forum-based and board-wide) - add option for minimum post chars (which is a required setting for quick reply, therefore we introduce it here) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9656 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_forums.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 547ac66e3c..937a288cb2 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -217,6 +217,11 @@
+
+

{L_ENABLE_QUICK_REPLY_EXPLAIN}
+
+
+

{L_ENABLE_INDEXING_EXPLAIN}
-- cgit v1.2.1 From 6c9ddcf1df1d4255867ef1d34eb4498ba908338c Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 23 Jun 2009 12:10:50 +0000 Subject: fix previews git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9659 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/captcha_gd_acp.html | 8 ++------ phpBB/adm/style/captcha_recaptcha_acp.html | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html index f4755a37da..d1f50bc899 100755 --- a/phpBB/adm/style/captcha_gd_acp.html +++ b/phpBB/adm/style/captcha_gd_acp.html @@ -49,13 +49,9 @@
{L_PREVIEW} - -
-

{L_WARNING}

-

{L_CAPTCHA_PREVIEW_MSG}

-
+ - +
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html index 78f035a01d..fba59a9647 100644 --- a/phpBB/adm/style/captcha_recaptcha_acp.html +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -31,7 +31,7 @@

{L_CAPTCHA_PREVIEW_MSG}

- +
-- cgit v1.2.1 From 9b3ffb02c2fe867c46b91f785222c99a83e58f31 Mon Sep 17 00:00:00 2001 From: Gabriel Vazquez Date: Tue, 23 Jun 2009 14:01:09 +0000 Subject: Fixed Bug #24155 - mark buttons in acp with logs Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9661 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_logs.html | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 11ab5faa9c..155917e84f 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -22,13 +22,14 @@ {L_IP} {L_TIME} {L_ACTION} - {L_MARK} + + {L_MARK} + - {log.USERNAME} @@ -38,32 +39,27 @@ {log.IP} {log.DATE} {log.ACTION}
{log.DATA} - + + + - +
+ {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} + + {S_FORM_TOKEN} +
+
-
-

{L_NO_ENTRIES}

+ + - - -
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} - - {S_FORM_TOKEN} -
-
- - -
{L_SELECT_FORUM}: @@ -79,7 +75,14 @@
+ + +
+

{L_NO_ENTRIES}

+
+ + - \ No newline at end of file + -- cgit v1.2.1 From bd9ab51165172584c5401d5d98c3c6d3e4278ca7 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 23 Jun 2009 14:06:30 +0000 Subject: svn... git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9662 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/captcha_default_acp_demo.html | 0 phpBB/adm/style/captcha_gd_acp.html | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 phpBB/adm/style/captcha_default_acp_demo.html mode change 100755 => 100644 phpBB/adm/style/captcha_gd_acp.html (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html old mode 100755 new mode 100644 diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html old mode 100755 new mode 100644 -- cgit v1.2.1 From 6273718dc5a7812b980ca45b20d123e5e0908026 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sat, 27 Jun 2009 20:56:49 +0000 Subject: acp module for submitting statistical information to phpBB git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9698 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_send_statistics.html | 63 ++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 phpBB/adm/style/acp_send_statistics.html (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html new file mode 100644 index 0000000000..573eee6fad --- /dev/null +++ b/phpBB/adm/style/acp_send_statistics.html @@ -0,0 +1,63 @@ + + + + +

{L_SEND_STATISTICS}

+ +

{L_EXPLAIN_SEND_STATISTICS}

+ + + + +
+ +

+ +
+ +

+ +

+ +
+ {providers.NAME} + +
+
{providers.values.KEY}
+
{providers.values.VALUE}
+
+ +
+ +
+

+ + +

+
+
+

{L_THANKS_SEND_STATISTICS}

+
+ + + \ No newline at end of file -- cgit v1.2.1 From 3f7ab4b8a6759374bc48c2ee5b8c88d1b695f0eb Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 6 Jul 2009 13:10:05 +0000 Subject: Add a purge option for the session table to the acp. Seems that many boards get unusable due to styles not embedding the cron image and/or extremely long session timeout settings and/or DOS attacks. This new button can be a stopgap measure in those cases. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9714 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_main.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 4b6bc1910d..3318215623 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -143,6 +143,12 @@
+
+
+

{L_PURGE_SESSIONS_EXPLAIN}
+
+
+
-- cgit v1.2.1 From 59a5278c69250adf1b8459df45b7873613240a09 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 7 Jul 2009 09:29:00 +0000 Subject: merged questioinnaire and questionnaire_phpbb and adjusted all files to our coding guidelines... if we want to allow dropping in other providers we could add provider files to the questionnaire directory (and grab them), if not it is best to remove the questionnaire directory and put the file under includes/ git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9719 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_send_statistics.html | 34 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html index 573eee6fad..ce45705559 100644 --- a/phpBB/adm/style/acp_send_statistics.html +++ b/phpBB/adm/style/acp_send_statistics.html @@ -10,31 +10,33 @@ // - -
+ -

+ -
- +

+ +
+

+ -
+
{providers.NAME}
@@ -44,20 +46,22 @@ function iframeUpdated()
-
-

+

+

-
-

{L_THANKS_SEND_STATISTICS}

+ +
+

{L_THANKS_SEND_STATISTICS}

+ \ No newline at end of file -- cgit v1.2.1 From 2b2119375243231f5ed735ecb6f664ea96a0b5d5 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 7 Jul 2009 12:01:37 +0000 Subject: put purge sessions above purge cache (admins are used to click the purge cache button and it may irretate them to have it not in a position where they expect it). :) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9724 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_main.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 3318215623..6b16f5ad69 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -139,14 +139,14 @@
-

{L_PURGE_CACHE_EXPLAIN}
-
+

{L_PURGE_SESSIONS_EXPLAIN}
+
-

{L_PURGE_SESSIONS_EXPLAIN}
-
+

{L_PURGE_CACHE_EXPLAIN}
+
-- cgit v1.2.1 From 8750fdf3f57bad9bbf64eb98a8fb85a3dc3f1b0a Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 7 Jul 2009 19:41:22 +0000 Subject: #47885 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9730 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_main.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 6b16f5ad69..4718869d73 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -137,9 +137,9 @@ -
+
-

{L_PURGE_SESSIONS_EXPLAIN}
+

{L_PURGE_SESSIONS_EXPLAIN}
-- cgit v1.2.1 From cc1b91bb92612fcc84bb48e3d690ab4362d3c149 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 8 Jul 2009 14:04:55 +0000 Subject: Fix cosmetic ACP bug showing on hover elements in IE7 (Bug #16109 - Patch by prototech) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9736 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/install_footer.html | 1 + phpBB/adm/style/overall_footer.html | 1 + 2 files changed, 2 insertions(+) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index 2ec3581ef4..4df43eaaa0 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -2,6 +2,7 @@
+
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index d5316aae08..8af299ad57 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -2,6 +2,7 @@ +
-- cgit v1.2.1 From 0b2979c6bab97297f839937606635fd4cc6b1eae Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 14 Jul 2009 20:25:41 +0000 Subject: Feature Bug #45375 - Add option to disable remote upload avatars Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9757 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_users_avatar.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 20b5b60050..deed41e16e 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -8,11 +8,13 @@
- +
+ +

{L_UPLOAD_AVATAR_URL_EXPLAIN}
-- cgit v1.2.1 From e3866c939d78b925844cd61d6ad567988f24e42d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 14 Jul 2009 20:35:53 +0000 Subject: Feature Bug #43375 - Ability to delete warnings and keep warnings permanently Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9758 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_users.html | 4 ++++ phpBB/adm/style/acp_users_warnings.html | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 phpBB/adm/style/acp_users_warnings.html (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 34e4147356..da7d2a495b 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -83,6 +83,10 @@ + + + + diff --git a/phpBB/adm/style/acp_users_warnings.html b/phpBB/adm/style/acp_users_warnings.html new file mode 100644 index 0000000000..be9ef06825 --- /dev/null +++ b/phpBB/adm/style/acp_users_warnings.html @@ -0,0 +1,39 @@ +
+ + + + + + + + + + + + + + + + + + + + + + +
{L_REPORT_BY}{L_TIME}{L_FEEDBACK}{L_MARK}
{warn.USERNAME}{warn.DATE}{warn.ACTION}
+ +
+

{L_NO_WARNINGS}

+
+ + + +
+   + +

{L_MARK_ALL} • {L_UNMARK_ALL}

+
+ + {S_FORM_TOKEN} +
-- cgit v1.2.1 From 33033ad12555377a9b50cfbeb72b683ddd56b893 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 14 Jul 2009 20:40:45 +0000 Subject: Fix Bug #45675 - Do not allow setting group as default group for pending user Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9759 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_users.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index da7d2a495b..e266654649 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -135,8 +135,8 @@ {group.GROUP_NAME} - {L_GROUP_DEFAULT}{L_GROUP_DEFAULT} - {group.L_DEMOTE_PROMOTE}  + {L_GROUP_DEFAULT}{L_GROUP_DEFAULT}{L_GROUP_APPROVE}  + {group.L_DEMOTE_PROMOTE}  {L_GROUP_DELETE} -- cgit v1.2.1 From a7776919945450eb2c0a37af30b35695f93fae51 Mon Sep 17 00:00:00 2001 From: "Marek A. R" Date: Thu, 16 Jul 2009 17:57:05 +0000 Subject: - Add pagination for icons and smilies in the ACP and smilies in the smiley popup git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9763 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_icons.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 86500ae047..10166fec35 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -243,8 +243,8 @@ {items.EMOTION} - {ICON_MOVE_UP_DISABLED}{ICON_MOVE_UP}  - {ICON_MOVE_DOWN_DISABLED}{ICON_MOVE_DOWN} + {ICON_MOVE_UP_DISABLED}{ICON_MOVE_UP}  + {ICON_MOVE_DOWN_DISABLED}{ICON_MOVE_DOWN}  {ICON_EDIT} {ICON_DELETE} @@ -255,7 +255,7 @@ - +
{PAGINATION}

   

-- cgit v1.2.1 From b6a1271c3aedab008be367565db9c9713e22e638 Mon Sep 17 00:00:00 2001 From: Jim Wigginton Date: Sat, 18 Jul 2009 19:19:38 +0000 Subject: - added ability to filter logs by log_operation git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9781 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_logs.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 155917e84f..843aa21c63 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -8,12 +8,18 @@
+
+ {L_SELECT_LANG_KEY}:   +
+ -

{L_ANSWERS_EXPLAIN}
-
+
diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html index 5c3f9c320e..919d4d48d5 100644 --- a/phpBB/adm/style/captcha_qa_acp_demo.html +++ b/phpBB/adm/style/captcha_qa_acp_demo.html @@ -1,7 +1,7 @@
-

{L_QUESTION_EXPLAIN}
+

{L_CONFIRM_QUESTION_EXPLAIN}
- +
-- cgit v1.2.1 From e7a17a34295106391cb1803070dccb9e7a419d86 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 19 Jul 2009 22:21:50 +0000 Subject: Set some svn properties. Cleanup. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9799 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/captcha_default_acp_demo.html | 3 +-- phpBB/adm/style/captcha_qa_acp_demo.html | 4 ++-- phpBB/adm/style/captcha_recaptcha.html | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 15 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html index a714386e51..0b1434f7e0 100644 --- a/phpBB/adm/style/captcha_default_acp_demo.html +++ b/phpBB/adm/style/captcha_default_acp_demo.html @@ -1,5 +1,4 @@ -

{L_CAPTCHA_PREVIEW_EXPLAIN}
{L_PREVIEW}
-
\ No newline at end of file + diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html index 919d4d48d5..474dfc58ea 100644 --- a/phpBB/adm/style/captcha_qa_acp_demo.html +++ b/phpBB/adm/style/captcha_qa_acp_demo.html @@ -1,7 +1,7 @@

{L_CONFIRM_QUESTION_EXPLAIN}
- +
- +
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html index 0cb43cf01f..93fc6e7499 100644 --- a/phpBB/adm/style/captcha_recaptcha.html +++ b/phpBB/adm/style/captcha_recaptcha.html @@ -1,5 +1,5 @@ -
+
- - -
{L_RECAPTCHA_NOT_AVAILABLE} - \ No newline at end of file + -- cgit v1.2.1 From 112f4a9be188a23a27f9b98c76fa40f5fbb9a9d9 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 20 Jul 2009 10:22:54 +0000 Subject: fixing back links git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9802 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/captcha_qa_acp.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index 343bb14a3e..245f57b65e 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -3,8 +3,7 @@ - - « {L_BACK} + « {L_BACK}

{L_QUESTIONS}

-- cgit v1.2.1 From 8d28978d8595c45e1e55b25a5bc8161534d5296c Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 20 Jul 2009 11:07:10 +0000 Subject: cleaning git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9805 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/captcha_qa_acp.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index 245f57b65e..7cb563dae6 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -74,7 +74,7 @@

{L_ANSWERS_EXPLAIN}
-
+
-- cgit v1.2.1 From 354cab397f72f4485101b4e1ca541d229d2b2455 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 20 Jul 2009 12:46:24 +0000 Subject: cleaning git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9806 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/captcha_qa_acp.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index 7cb563dae6..6913915892 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -52,7 +52,7 @@

{L_WARNING}

-

{QA_ERROR_MSG}

+

{L_QA_ERROR_MSG}

-- cgit v1.2.1 From 2dbf5fd1a2ac3db106abfb768fe629f66cb328d9 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 20 Jul 2009 12:47:45 +0000 Subject: cleaning git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9807 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/captcha_qa_acp.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index 6913915892..d069233ccd 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -70,7 +70,7 @@

{L_QUESTION_TEXT_EXPLAIN}
-
+

{L_ANSWERS_EXPLAIN}
-- cgit v1.2.1 From 3a3872766177c30c580353c2946b0d308685a2c5 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 21 Jul 2009 10:26:18 +0000 Subject: copy regiustration attempt setting to acp_captcha - although the setting is pointless git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9809 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_captcha.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 290aaa254c..3d87aa89ec 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -17,6 +17,10 @@
+
+

{L_REG_LIMIT_EXPLAIN}
+
+

{L_VISUAL_CONFIRM_POST_EXPLAIN}
-- cgit v1.2.1 From 269c2c294457d0f31348f6bcd805f6800fd3087d Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 21 Jul 2009 10:52:38 +0000 Subject: fix back link git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9810 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/captcha_qa_acp.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index d069233ccd..064d6969d1 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -3,7 +3,7 @@ - « {L_BACK} + « {L_BACK}

{L_QUESTIONS}

@@ -57,7 +57,7 @@
- {L_QUESTIONS} + {L_EDIT_QUESTION}

{L_QUESTION_STRICT_EXPLAIN}
-- cgit v1.2.1 From 8e8c40bc75f1394dfcb9fd772858069388b86b06 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 22 Jul 2009 00:11:46 +0000 Subject: - Added install_id to data collector - config variable whitelist, so sensitive MOD info is not transmitted, currently mostly bool/int values - should we reduce the amount of data? git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9818 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_send_statistics.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html index ce45705559..1097dbd438 100644 --- a/phpBB/adm/style/acp_send_statistics.html +++ b/phpBB/adm/style/acp_send_statistics.html @@ -17,8 +17,8 @@ function iframe_updated() return; } - //dE('questionnaire-form', -1); - //dE('questionnaire-thanks', 1); + dE('questionnaire-form', -1); + dE('questionnaire-thanks', 1); } //]]> @@ -59,8 +59,8 @@ function iframe_updated() -- cgit v1.2.1 From 5d7dfaebe1099dbf375950026a5ab0916f174c5b Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Wed, 22 Jul 2009 10:08:14 +0000 Subject: layout git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9824 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/captcha_qa_acp.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index 064d6969d1..c9a2a4c8ec 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -21,8 +21,8 @@ {L_QUESTION_TEXT} - {L_QUESTION_LANG} - {L_ACTION} + {L_QUESTION_LANG} + {L_ACTION} @@ -30,7 +30,7 @@ - {questions.QUESTION_TEXT} + {questions.QUESTION_TEXT} {questions.QUESTION_LANG} {ICON_EDIT}{ICON_DELETE} -- cgit v1.2.1 From 4739c7ba3957dfe585973dafe7465cb9fd8c6d1f Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 24 Jul 2009 11:13:32 +0000 Subject: [Feature] Added new functionality to inactive users module: - Ability to set users per page. - Ability to sort by posts/number of reminders/last reminded date. - Show number of posts and ability to search posts. - Show number of reminders sent to user. - Show date of last reminder sent to user. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9845 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_inactive.html | 51 +++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 23 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index 240cec1643..ca65416421 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -12,7 +12,7 @@ @@ -22,8 +22,8 @@ {L_USERNAME} {L_JOINED} {L_INACTIVE_DATE} - {L_INACTIVE_REASON} {L_LAST_VISIT} + {L_INACTIVE_REASON} {L_MARK} @@ -31,11 +31,16 @@ - {inactive.USERNAME} - {inactive.JOINED} - {inactive.INACTIVE_DATE} - {inactive.REASON} - {inactive.LAST_VISIT} + + {inactive.USERNAME_FULL} +
{L_POSTS}: {inactive.POSTS} [{L_SEARCH_USER_POSTS}] + + {inactive.JOINED} + {inactive.INACTIVE_DATE} + {inactive.LAST_VISIT} + + {inactive.REASON} +
{inactive.REMINDED_EXPLAIN}    @@ -46,25 +51,25 @@ -
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} - -
-
- - - +
+ {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} Users per page: + +
-
- - -

{L_MARK_ALL} • {L_UNMARK_ALL}

- {S_FORM_TOKEN} -
+
+ + + +
+ + +

{L_MARK_ALL} • {L_UNMARK_ALL}

+ {S_FORM_TOKEN} +
-- cgit v1.2.1 From b6ebd2e4972f8cff7e16ed96788b1fa861f7568d Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Sun, 26 Jul 2009 17:58:10 +0000 Subject: XHTML mistakes in the updater. #46585 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9861 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/install_update_diff.html | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index efbe1d045c..d794c5c516 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -28,6 +28,9 @@ function resize_panel() //whatever IE needs to do this } } + +window.onresize = resize_panel; + // ]]> @@ -48,10 +51,7 @@ function resize_panel() div#codepanel { - overflow: auto; width: 100%; - height: 350px; - display: inline-block; } div#codepanel { @@ -59,12 +59,22 @@ div#codepanel { } + +div#diff_content pre { + overflow: auto; + height: 414px; + width: 100% !important; +} + + /** * Unified Diff */ .file { line-height: .7em; + overflow: auto; + height: 414px; } .diff { @@ -203,9 +213,8 @@ table.hrdiff caption span { - - + @@ -220,7 +229,7 @@ table.hrdiff caption span {

{L_SKIP}

-
+
-- cgit v1.2.1 From 9795ceef149fe5772c1619f8940ecd26c950b9cc Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Mon, 27 Jul 2009 12:58:15 +0000 Subject: Display the filter settings in the ACP log viewer when no entries are found. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9873 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_logs.html | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 843aa21c63..1c5c8940d2 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -53,19 +53,25 @@ -
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} - - {S_FORM_TOKEN} -
-
- + +
+

{L_NO_ENTRIES}

+
+ + +
+ {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} + + {S_FORM_TOKEN} +
+
+
{L_SELECT_FORUM}: @@ -73,7 +79,7 @@
- +
 
@@ -81,14 +87,6 @@
- - -
-

{L_NO_ENTRIES}

-
- - - -- cgit v1.2.1 From da169625a6a4e7682f0b3a2623f2081e52ad4a49 Mon Sep 17 00:00:00 2001 From: "Marek A. R" Date: Tue, 28 Jul 2009 13:58:01 +0000 Subject: - Display version check on ACP main page. - Cache version check. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9880 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_main.html | 16 ++++++++++++++++ phpBB/adm/style/acp_update.html | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 4718869d73..192d2e50f5 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -14,6 +14,22 @@

{L_ADMIN_INTRO}

+ +
+

{L_VERSIONCHECK_FAIL} - {L_VERSIONCHECK_FORCE_UPDATE} - {L_MORE}

+
+ + +
+

{L_VERSION_UP_TO_DATE_ACP} - {L_VERSIONCHECK_FORCE_UPDATE} - {L_MORE}

+
+ +
+

{L_VERSION_NOT_UP_TO_DATE_ACP} - {L_VERSIONCHECK_FORCE_UPDATE} - {L_MORE}

+
+ + +

{L_WARNING}

diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index e82aee0e87..34d4f6934e 100644 --- a/phpBB/adm/style/acp_update.html +++ b/phpBB/adm/style/acp_update.html @@ -10,11 +10,11 @@
-

{L_VERSION_UP_TO_DATE_ACP}

+

{L_VERSION_UP_TO_DATE_ACP} - {L_VERSIONCHECK_FORCE_UPDATE}

-

{L_VERSION_NOT_UP_TO_DATE_ACP}

+

{L_VERSION_NOT_UP_TO_DATE_ACP} - {L_VERSIONCHECK_FORCE_UPDATE}

-- cgit v1.2.1 From 1b8a1f73d77d3df21b8404611a130bb4ee19b822 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 28 Jul 2009 22:09:46 +0000 Subject: [Feature] Ability to copy permissions from one forum to several other forums. [Fix] Add log entry when copying forum permissions. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9887 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/permission_forum_copy.html | 120 +++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 phpBB/adm/style/permission_forum_copy.html (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html new file mode 100644 index 0000000000..5a7978438b --- /dev/null +++ b/phpBB/adm/style/permission_forum_copy.html @@ -0,0 +1,120 @@ + + + + +

{L_ACP_FORUM_PERMISSIONS_COPY}

+ + {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN} + +
+ +
+ {L_LOOK_UP_FORUM} + +
+

{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}
+
+
+
+ +
+ {L_LOOK_UP_FORUM} +

{L_LOOK_UP_FORUMS_EXPLAIN}

+ +
+

{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}
+
+
+
+ +
+ {L_SUBMIT} +   + + {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} +
+ +
+ + + + + + +

{L_ACP_FORUM_PERMISSIONS_COPY}

+ + {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN} + +
+ +
+ {L_LOOK_UP_FORUM} + +
+

{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}
+
+
+
+ +
+ {L_LOOK_UP_FORUM} +

{L_LOOK_UP_FORUMS_EXPLAIN}

+ +
+

{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}
+
+
+
+ +
+ {L_SUBMIT} +   + + {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} +
+ +
+ + + + + + +

{L_ACP_FORUM_PERMISSIONS_COPY}

+ + {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN} + +
+ +
+ {L_LOOK_UP_FORUM} + +
+

{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}
+
+
+
+ +
+ {L_LOOK_UP_FORUM} +

{L_LOOK_UP_FORUMS_EXPLAIN}

+ +
+

{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}
+
+
+
+ +
+ {L_SUBMIT} +   + + {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} +
+ +
+ + -- cgit v1.2.1 From a1807c8ddd87d604eaef8fc3f249e13b957d4730 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 28 Jul 2009 22:18:39 +0000 Subject: Fix r9887. Remove duplicate content. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9888 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/permission_forum_copy.html | 80 ------------------------------ 1 file changed, 80 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html index 5a7978438b..c919310035 100644 --- a/phpBB/adm/style/permission_forum_copy.html +++ b/phpBB/adm/style/permission_forum_copy.html @@ -38,83 +38,3 @@ - - - - -

{L_ACP_FORUM_PERMISSIONS_COPY}

- - {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN} - -
- -
- {L_LOOK_UP_FORUM} - -
-

{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}
-
-
-
- -
- {L_LOOK_UP_FORUM} -

{L_LOOK_UP_FORUMS_EXPLAIN}

- -
-

{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}
-
-
-
- -
- {L_SUBMIT} -   - - {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} -
- -
- - - - - - -

{L_ACP_FORUM_PERMISSIONS_COPY}

- - {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN} - -
- -
- {L_LOOK_UP_FORUM} - -
-

{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}
-
-
-
- -
- {L_LOOK_UP_FORUM} -

{L_LOOK_UP_FORUMS_EXPLAIN}

- -
-

{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}
-
-
-
- -
- {L_SUBMIT} -   - - {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} -
- -
- - -- cgit v1.2.1 From 01fe852ad8eb19e0700e6dd87ec518493adae897 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 29 Jul 2009 09:26:50 +0000 Subject: Slightly adjust version check on index page to be a bit more descriptive git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9889 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_main.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 192d2e50f5..bdb045e326 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -14,21 +14,22 @@

{L_ADMIN_INTRO}

+ +
-

{L_VERSIONCHECK_FAIL} - {L_VERSIONCHECK_FORCE_UPDATE} - {L_MORE}

-
+

{L_VERSIONCHECK_FAIL}

-

{L_VERSION_UP_TO_DATE_ACP} - {L_VERSIONCHECK_FORCE_UPDATE} - {L_MORE}

-
+

{L_VERSION_UP_TO_DATE_ACP}

-

{L_VERSION_NOT_UP_TO_DATE_ACP} - {L_VERSIONCHECK_FORCE_UPDATE} - {L_MORE}

-
+

{L_VERSION_NOT_UP_TO_DATE_TITLE}

+

{L_VERSIONCHECK_FORCE_UPDATE} · {L_MORE_INFORMATION}

+
-- cgit v1.2.1 From 7ebf9fa986df01b1fadfe43c1fbe09d2c0b779d7 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 29 Jul 2009 09:37:21 +0000 Subject: git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9890 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_main.html | 2 -- 1 file changed, 2 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index bdb045e326..5d97c012a5 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -14,8 +14,6 @@

{L_ADMIN_INTRO}

- -

{L_VERSIONCHECK_FAIL}

-- cgit v1.2.1 From 312f2c87edbc81af7e332c14d7ce590df183cf60 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Fri, 31 Jul 2009 12:46:15 +0000 Subject: Add box if users decided not to select a forum to copy permissions from on forum creation git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9896 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_forums_copy_perm.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 phpBB/adm/style/acp_forums_copy_perm.html (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html new file mode 100644 index 0000000000..73d9e70918 --- /dev/null +++ b/phpBB/adm/style/acp_forums_copy_perm.html @@ -0,0 +1,21 @@ + + +
+ +
+

{L_COPY_PERMISSIONS}

+

{L_COPY_PERMISSIONS_EXPLAIN}

+

{L_ACL_LINK}

+
+

{L_COPY_PERMISSIONS_EXPLAIN}
+
+
+
{S_FORM_TOKEN}{S_HIDDEN_FIELDS} +   +
+ +
+ +
+ + -- cgit v1.2.1 From d85e79719d9a6939feca14cfc22daba086936631 Mon Sep 17 00:00:00 2001 From: Jim Wigginton Date: Mon, 10 Aug 2009 22:09:10 +0000 Subject: fixed bug 44805 - extra initInsertions() calls needed git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9951 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_users_signature.html | 2 +- phpBB/adm/style/editor.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index 239d35f119..0ea5328c3c 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -93,7 +93,7 @@ // ]]> -
+
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js index 93d0059609..8d6df9164a 100644 --- a/phpBB/adm/style/editor.js +++ b/phpBB/adm/style/editor.js @@ -16,7 +16,6 @@ var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == - var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); var baseHeight; -window.onload = initInsertions; /** * Shows the help messages in the helpline window -- cgit v1.2.1 From cb74521e6484f7bccd9c587d61e10e90c8653b99 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 11 Aug 2009 12:49:38 +0000 Subject: less obstrusive version info git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9952 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_main.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 5d97c012a5..52c9dfd2c5 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -17,17 +17,15 @@

{L_VERSIONCHECK_FAIL}

- - -
-

{L_VERSION_UP_TO_DATE_ACP}

- -
-

{L_VERSION_NOT_UP_TO_DATE_TITLE}

- -

{L_VERSIONCHECK_FORCE_UPDATE} · {L_MORE_INFORMATION}

+ +
+

{L_VERSION_NOT_UP_TO_DATE_TITLE}

+

{L_VERSIONCHECK_FORCE_UPDATE} · {L_MORE_INFORMATION}

+
+ +
@@ -100,7 +98,9 @@ {L_BOARD_VERSION}: - {BOARD_VERSION} + + style="color: #228822"style="color: #BC2A4D" title="{L_MORE_INFORMATION}" href="{U_VERSIONCHECK}">{BOARD_VERSION} {L_VERSIONCHECK_FORCE_UPDATE}  + {L_NUMBER_ORPHAN}: {TOTAL_ORPHAN} -- cgit v1.2.1 From 926b38c4d5267559ead2970a2bf4e64e29d9da99 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 11 Aug 2009 12:58:00 +0000 Subject: use [] style we use for links occurring after text in acp_main too. ;) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9953 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_main.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 52c9dfd2c5..fc8804e62f 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -19,7 +19,7 @@

{L_VERSIONCHECK_FAIL}

{L_VERSIONCHECK_FORCE_UPDATE} · {L_MORE_INFORMATION}

- +

{L_VERSION_NOT_UP_TO_DATE_TITLE}

{L_VERSIONCHECK_FORCE_UPDATE} · {L_MORE_INFORMATION}

@@ -98,8 +98,8 @@ {L_BOARD_VERSION}: - - style="color: #228822"style="color: #BC2A4D" title="{L_MORE_INFORMATION}" href="{U_VERSIONCHECK}">{BOARD_VERSION} {L_VERSIONCHECK_FORCE_UPDATE}  + + style="color: #228822"style="color: #BC2A4D" title="{L_MORE_INFORMATION}" href="{U_VERSIONCHECK}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] {L_NUMBER_ORPHAN}: -- cgit v1.2.1 From 9dc2095b52fbe27925ac995879a0b491ae3e5130 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 11 Aug 2009 13:07:40 +0000 Subject: let the link wrap for tiny resolutions git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9954 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index fc8804e62f..1f1e7b8740 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -99,7 +99,7 @@ {L_BOARD_VERSION}: - style="color: #228822"style="color: #BC2A4D" title="{L_MORE_INFORMATION}" href="{U_VERSIONCHECK}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] + style="color: #228822"style="color: #BC2A4D" title="{L_MORE_INFORMATION}" href="{U_VERSIONCHECK}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] {L_NUMBER_ORPHAN}: -- cgit v1.2.1 From 09ad10a734c0993f9465e6ac3463951251602fc6 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 12 Aug 2009 15:00:47 +0000 Subject: ok, i am very sorry, but this needs to be fixed. Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored. Additionally, for this to work across all DBMS we support, we added a new method to the DBAL for the bitwise AND operator. Also moved the forum/topic feed template variable to the location where they belong to (forum and topic view) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9965 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/index.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 778070e2e1..b6b251d2fc 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -263,6 +263,12 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) $tpl = ''; $name = 'config[' . $config_key . ']'; + // Make sure there is no notice printed out for non-existent config options (we simply set them) + if (!isset($new[$config_key])) + { + $new[$config_key] = ''; + } + switch ($tpl_type[0]) { case 'text': @@ -301,7 +307,6 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) break; case 'select': - case 'select_multiple': case 'custom': $return = ''; @@ -340,21 +345,12 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) } else { - if ($tpl_type[0] == 'select_multiple') - { - $new[$config_key] = @unserialize(trim($new[$config_key])); - } - $args = array($new[$config_key], $key); } $return = call_user_func_array($call, $args); - if ($tpl_type[0] == 'select_multiple') - { - $tpl = ''; - } - else if ($tpl_type[0] == 'select') + if ($tpl_type[0] == 'select') { $tpl = ''; } -- cgit v1.2.1 From 4525d1cb733e893762e87a4f597f8489a9917191 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 13 Aug 2009 14:51:47 +0000 Subject: - links to send statistics after install and update - link back to ACP main from send statistics - improved language / better explanation (incl. Bug #48555) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9969 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_send_statistics.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'phpBB/adm') diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html index 1097dbd438..a3e27470e0 100644 --- a/phpBB/adm/style/acp_send_statistics.html +++ b/phpBB/adm/style/acp_send_statistics.html @@ -23,10 +23,14 @@ function iframe_updated() //]]> - +
+

{L_DONT_SEND_STATISTICS}

+ +

{L_EXPLAIN_SHOW_STATISTICS}

+

@@ -53,8 +57,8 @@ function iframe_updated()

-
-

{L_THANKS_SEND_STATISTICS}

+
+

{L_THANKS_SEND_STATISTICS}

« {L_GO_ACP_MAIN}

- +
-- cgit v1.2.1