From 4ff986f5789b2c7dc5a8b16d8780a5a7ed2ece2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Fri, 25 May 2018 02:13:32 +0200 Subject: [ticket/15671] Limit accepted formats for avatar upload PHPBB3-15671 --- phpBB/adm/style/acp_avatar_options_upload.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html index 63a734ea7d..75bd1802d4 100644 --- a/phpBB/adm/style/acp_avatar_options_upload.html +++ b/phpBB/adm/style/acp_avatar_options_upload.html @@ -1,6 +1,6 @@
-
+
-- cgit v1.2.1 From dc397755d52639bf397bfba2c676438ab4f4d43d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Sun, 27 May 2018 00:06:17 +0200 Subject: [ticket/15671] Load extensions from a variable instead of harcode it PHPBB3-15671 --- phpBB/adm/style/acp_avatar_options_upload.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html index 75bd1802d4..4b067c00f8 100644 --- a/phpBB/adm/style/acp_avatar_options_upload.html +++ b/phpBB/adm/style/acp_avatar_options_upload.html @@ -1,6 +1,6 @@
-
+
-- cgit v1.2.1 From dc9b1c37b163a46b46b79f5b968408ede97e45e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Sun, 27 May 2018 13:40:52 +0200 Subject: [ticket/15671] Rewrite load extensions from a variable instead of harcode it PHPBB3-15671 --- phpBB/adm/style/acp_avatar_options_upload.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html index 4b067c00f8..666950e0ae 100644 --- a/phpBB/adm/style/acp_avatar_options_upload.html +++ b/phpBB/adm/style/acp_avatar_options_upload.html @@ -1,6 +1,6 @@
-
+
-- cgit v1.2.1 From 3e6fd7e8fd419ed999fe38ee48519dae98988081 Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Mon, 14 May 2018 21:14:41 +0200 Subject: [ticket/15664] Ajaxify ext actions in ACP PHPBB3-15664 --- phpBB/adm/style/acp_ext_actions.html | 6 ++++ phpBB/adm/style/acp_ext_delete_data.html | 40 ---------------------- phpBB/adm/style/acp_ext_disable.html | 34 ------------------- phpBB/adm/style/acp_ext_enable.html | 40 ---------------------- phpBB/adm/style/acp_ext_list.html | 19 +++-------- phpBB/adm/style/admin.js | 58 ++++++++++++++++++++++++++++++++ phpBB/adm/style/ajax.js | 28 +++++++++++++++ 7 files changed, 97 insertions(+), 128 deletions(-) create mode 100644 phpBB/adm/style/acp_ext_actions.html delete mode 100644 phpBB/adm/style/acp_ext_delete_data.html delete mode 100644 phpBB/adm/style/acp_ext_disable.html delete mode 100644 phpBB/adm/style/acp_ext_enable.html (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_ext_actions.html b/phpBB/adm/style/acp_ext_actions.html new file mode 100644 index 0000000000..b9c2febbe5 --- /dev/null +++ b/phpBB/adm/style/acp_ext_actions.html @@ -0,0 +1,6 @@ +{% for action in enabled.actions %} +{{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} +{% endfor %} +{% for action in disabled.actions %} +{{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} +{% endfor %} \ No newline at end of file diff --git a/phpBB/adm/style/acp_ext_delete_data.html b/phpBB/adm/style/acp_ext_delete_data.html deleted file mode 100644 index 0f3adb7cfe..0000000000 --- a/phpBB/adm/style/acp_ext_delete_data.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - -

{L_EXTENSIONS_ADMIN}

- -

{L_EXTENSIONS_EXPLAIN}

-

{L_EXTENSION_DELETE_DATA_EXPLAIN}

- - -
-

{L_MIGRATION_EXCEPTION_ERROR}

-

{MIGRATOR_ERROR}

-

{L_RETURN_TO_EXTENSION_LIST}

-
- -
-

{L_CONFIRM_MESSAGE}

-
- -
-
- {L_EXTENSION_DELETE_DATA} - - -
-
- -
-

{L_EXTENSION_DELETE_DATA_IN_PROGRESS}

-
- -
-

{L_EXTENSION_DELETE_DATA_SUCCESS}

-
-

{L_RETURN_TO_EXTENSION_LIST}

-
- - - diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html deleted file mode 100644 index d2b5c46fe8..0000000000 --- a/phpBB/adm/style/acp_ext_disable.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - -

{L_EXTENSIONS_ADMIN}

- -

{L_EXTENSIONS_EXPLAIN}

-

{L_EXTENSION_DISABLE_EXPLAIN}

- - -
-

{L_CONFIRM}

-

{L_CONFIRM_MESSAGE}

-
- -
-
- - -
-
- -
-

{L_EXTENSION_DISABLE_IN_PROGRESS}

-
- -
-

{L_EXTENSION_DISABLE_SUCCESS}

-
-

{L_RETURN_TO_EXTENSION_LIST}

-
- - - diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html deleted file mode 100644 index 8a4a35359e..0000000000 --- a/phpBB/adm/style/acp_ext_enable.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - -

{L_EXTENSIONS_ADMIN}

- -

{L_EXTENSIONS_EXPLAIN}

-

{L_EXTENSION_ENABLE_EXPLAIN}

- - -
-

{L_MIGRATION_EXCEPTION_ERROR}

-

{MIGRATOR_ERROR}

-

{L_RETURN_TO_EXTENSION_LIST}

-
- -
-

{L_CONFIRM}

-

{L_CONFIRM_MESSAGE}

-
- -
-
- - -
-
- -
-

{L_EXTENSION_ENABLE_IN_PROGRESS}

-
- -
-

{L_EXTENSION_ENABLE_SUCCESS}

-
-

{L_RETURN_TO_EXTENSION_LIST}

-
- - - diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index 8e2c7452a3..c3c3b3fb66 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -42,8 +42,8 @@ - - + + class="hidden"> {L_EXTENSIONS_ENABLED} @@ -59,17 +59,12 @@ {L_DETAILS} - - title="{enabled.actions.L_ACTION_EXPLAIN}">{enabled.actions.L_ACTION} -  |  - + - - - + class="hidden"> {L_EXTENSIONS_DISABLED} @@ -87,14 +82,10 @@ {L_DETAILS} - - title="{disabled.actions.L_ACTION_EXPLAIN}">{disabled.actions.L_ACTION} -  |  - + - diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index 551c78a4a3..b7c25b7c86 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -228,6 +228,64 @@ function parse_document(container) }); } +/** + * Extension actions helper functions + */ +function move_to_enabled(element) +{ + var disabled_header = document.querySelector('#ext_disabled_header'); + disabled_header.parentNode.insertBefore(element, disabled_header); + element.classList.remove('ext_disabled'); + element.classList.add('ext_enabled'); +} +function move_to_disabled(element) +{ + var table_body = document.querySelector('#ext_disabled_header').parentNode; + table_body.appendChild(element); + element.classList.remove('ext_enabled'); + element.classList.add('ext_disabled'); +} +function set_actions(container, actions) { + container.innerHTML = ''; + for (var i = 0; i < actions.length; i++) { + var a = document.createElement('a'); + a.href = actions[i].U_ACTION.split('&').join('&'); // replace all occurances + a.title = actions[i].L_ACTION_EXPLAIN; + if (actions[i].COLOR) { + a.style = actions[i].COLOR; + } + a.innerHTML = actions[i].L_ACTION; + // ajaxify this action as well + phpbb.ajaxify({ + selector: a, + refresh: false, + callback: actions[i].ACTION_AJAX + }); + + container.appendChild(a); + + if (i < actions.length - 1) { + container.innerHTML += ' | '; + } + } +} +function show_enabled_header() { + document.querySelector('#ext_enabled_header').classList.remove('hidden'); +} +function show_disabled_header() { + document.querySelector('#ext_disabled_header').classList.remove('hidden'); +} +function hide_disabled_header_if_empty() { + if (!document.querySelector('.ext_disabled')) { + document.querySelector('#ext_disabled_header').classList.add('hidden'); + } +} +function hide_enabled_header_if_empty() { + if (!document.querySelector('.ext_enabled')) { + document.querySelector('#ext_enabled_header').classList.add('hidden'); + } +} + /** * Run onload functions */ diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index 895bb056e5..644e74bef7 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -157,6 +157,34 @@ phpbb.addAjaxCallback('row_delete', function(res) { } }); +/** + * Callbacks for extension actions + */ +phpbb.addAjaxCallback('ext_enable', function(res) { + if (res.EXT_ENABLE_SUCCESS) { + move_to_enabled(this.parentNode.parentNode); + set_actions(this.parentNode, res.ACTIONS); + show_enabled_header(); + hide_disabled_header_if_empty(); + } +}); +phpbb.addAjaxCallback('ext_delete_data', function(res) { + if (res.EXT_DELETE_DATA_SUCCESS) { + move_to_disabled(this.parentNode.parentNode); + set_actions(this.parentNode, res.ACTIONS); + show_disabled_header(); + hide_enabled_header_if_empty(); + } +}); +phpbb.addAjaxCallback('ext_disable', function(res) { + if (res.EXT_DISABLE_SUCCESS) { + move_to_disabled(this.parentNode.parentNode); + set_actions(this.parentNode, res.ACTIONS); + show_disabled_header(); + hide_enabled_header_if_empty(); + } +}); + /** * Handler for submitting permissions form in chunks * This call will submit permissions forms in chunks of 5 fieldsets. -- cgit v1.2.1 From 4da589acbacbc524a739b384e1392866784cf88d Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Wed, 4 Jul 2018 14:56:36 +0200 Subject: [ticket/15664] Add support for multi step processes PHPBB3-15664 --- phpBB/adm/style/acp_ext_actions.html | 4 ++-- phpBB/adm/style/admin.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_ext_actions.html b/phpBB/adm/style/acp_ext_actions.html index b9c2febbe5..6f2341f381 100644 --- a/phpBB/adm/style/acp_ext_actions.html +++ b/phpBB/adm/style/acp_ext_actions.html @@ -1,6 +1,6 @@ {% for action in enabled.actions %} -{{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} +{{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} {% endfor %} {% for action in disabled.actions %} -{{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} +{{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} {% endfor %} \ No newline at end of file diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index b7c25b7c86..5fdd07356c 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -258,7 +258,7 @@ function set_actions(container, actions) { // ajaxify this action as well phpbb.ajaxify({ selector: a, - refresh: false, + refresh: true, callback: actions[i].ACTION_AJAX }); -- cgit v1.2.1 From 341962ae74ab45a67a19418fefd0fa76092cf65e Mon Sep 17 00:00:00 2001 From: amalnaeem <36226153+amalnaeem@users.noreply.github.com> Date: Wed, 4 Apr 2018 20:41:31 +0500 Subject: [ticket/15610] Improving UI of Board Statistics in ACP Master Improving UI of Board Statistics in ACP Statistics table was divided into two in acp_main.html. PHPBB3-15610 --- phpBB/adm/style/acp_main.html | 18 +++++++++--------- phpBB/adm/style/admin.css | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 9 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 12477a4b77..3841353241 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -94,9 +94,9 @@ - +
- + @@ -185,35 +185,35 @@

 
-
+

 
-
+

{L_RESYNC_STATS_EXPLAIN}
-
+

{L_RESYNC_POSTCOUNTS_EXPLAIN}
-
+

{L_RESYNC_POST_MARKING_EXPLAIN}
-
+
@@ -221,7 +221,7 @@

{L_PURGE_SESSIONS_EXPLAIN}
-
+
@@ -229,7 +229,7 @@

{L_PURGE_CACHE_EXPLAIN}
-
+
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 7cf6c22236..18c7413fef 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1555,6 +1555,17 @@ a.button2, input.button2 { border: 1px solid #666666; } +a.runbutton, +input.runbutton { + font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; + font-size: 0.85em; + color: #000000; + border-radius: 4px; + width: auto !important; + padding: 1px 3px 0; + cursor: pointer; +} + /* 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 { @@ -1563,6 +1574,15 @@ a.button2, a.button2:link, a.button2:visited, a.button2:active { padding: 4px 8px; } +a.runbutton, +a.runbutton:link, +a.runbutton:visited, +a.runbutton:active { + text-decoration: none; + color: #ffffff; + padding: 4px 8px; +} + /* Hover states */ a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover { @@ -1571,6 +1591,11 @@ a.button2:hover, input.button2:hover { color: #BC2A4D; } +a.runbutton:hover, +input.runbutton:hover { + opacity:0.75; +} + input.disabled { font-weight: normal; color: #666666; -- cgit v1.2.1 From 9b5b0589253b267da061c79866deac65de68cd9d Mon Sep 17 00:00:00 2001 From: amalnaeem <36226153+amalnaeem@users.noreply.github.com> Date: Wed, 4 Apr 2018 23:53:24 +0500 Subject: [ticket/15610] Improving UI of Board Statistics in ACP Master Improving UI of Board Statistics in ACP Statistics table was divided into two in acp_main.html. PHPBB3-15610 --- phpBB/adm/style/acp_main.html | 14 +++++++------- phpBB/adm/style/admin.css | 25 ------------------------- 2 files changed, 7 insertions(+), 32 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 3841353241..d955a7fe70 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -185,35 +185,35 @@

 
-
+

 
-
+

{L_RESYNC_STATS_EXPLAIN}
-
+

{L_RESYNC_POSTCOUNTS_EXPLAIN}
-
+

{L_RESYNC_POST_MARKING_EXPLAIN}
-
+
@@ -221,7 +221,7 @@

{L_PURGE_SESSIONS_EXPLAIN}
-
+
@@ -229,7 +229,7 @@

{L_PURGE_CACHE_EXPLAIN}
-
+
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 18c7413fef..7cf6c22236 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1555,17 +1555,6 @@ a.button2, input.button2 { border: 1px solid #666666; } -a.runbutton, -input.runbutton { - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 0.85em; - color: #000000; - border-radius: 4px; - width: auto !important; - padding: 1px 3px 0; - cursor: pointer; -} - /* 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 { @@ -1574,15 +1563,6 @@ a.button2, a.button2:link, a.button2:visited, a.button2:active { padding: 4px 8px; } -a.runbutton, -a.runbutton:link, -a.runbutton:visited, -a.runbutton:active { - text-decoration: none; - color: #ffffff; - padding: 4px 8px; -} - /* Hover states */ a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover { @@ -1591,11 +1571,6 @@ a.button2:hover, input.button2:hover { color: #BC2A4D; } -a.runbutton:hover, -input.runbutton:hover { - opacity:0.75; -} - input.disabled { font-weight: normal; color: #666666; -- cgit v1.2.1 From a66c4170a9a1d63cd6add2ae80aeeeacf9895e00 Mon Sep 17 00:00:00 2001 From: amalnaeem <36226153+amalnaeem@users.noreply.github.com> Date: Thu, 5 Apr 2018 21:09:41 +0500 Subject: [ticket/15610] Improving UI of Board Statistics Master Improving UI of Board Statistics in ACP. Statistics table was divided into two in acp_main.html. PHPBB3-15610 --- phpBB/adm/style/acp_main.html | 56 +++++++++++++++++++++++++++++++++---------- phpBB/adm/style/admin.css | 15 ++++++++++-- 2 files changed, 57 insertions(+), 14 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index d955a7fe70..fadb65bd1a 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -93,15 +93,14 @@ - -
{L_FORUM_STATS}
{L_STATISTIC}
- - + +
+ +
{L_FORUM_STATS}
+ - - - + @@ -109,48 +108,83 @@ + + + + + + + + +   + + + + +
{L_STATISTIC}{L_VALUE}{L_STATISTIC}Forum Statistics {L_VALUE}
{L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS}
{L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY}
{L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS}
{L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY}
{L_NUMBER_USERS}{L_COLON} {TOTAL_USERS}
{L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY}
{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES}
{L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY}
   
+ +     +
+ + + + + + + + + + + + + + + + + + - - + @@ -171,13 +204,12 @@ - - +
Configuration Statistics{L_VALUE}
{L_BOARD_STARTED}{L_COLON} {START_DATE}
{L_AVATAR_DIR_SIZE}{L_COLON} {AVATAR_DIR_SIZE}
{L_DATABASE_SIZE}{L_COLON} {DBSIZE}
{L_UPLOAD_DIR_SIZE}{L_COLON} {UPLOAD_DIR_SIZE}
{L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO}
{L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION}
{L_PHP_VERSION}{L_COLON} {PHP_VERSION_INFO}
{L_NUMBER_ORPHAN}{L_COLON} @@ -161,8 +195,7 @@   
style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ]   
- +
{L_STATISTIC_RESYNC_OPTIONS} diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 7cf6c22236..f9435a68dd 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -723,11 +723,22 @@ td { } .table1 { - border-collapse: separate; border-spacing: 1px; - clear: both; + border-collapse: separate; + display:inline-block; + +} + +#lside { + display: inline-block; + width: 40%; } +.table1 td { + width: 25%; +} + + dt#color_palette_placeholder table { margin-right: 5px; width: 80px; -- cgit v1.2.1 From 94f4062b296c567d5ccb7fd2f7d7478688d8fae8 Mon Sep 17 00:00:00 2001 From: amalnaeem <36226153+amalnaeem@users.noreply.github.com> Date: Thu, 5 Apr 2018 22:00:36 +0500 Subject: [ticket/15610] Improving UI of Board Statistics in ACP Master Improving UI of Board Statistics in ACP Statistics table was divided into two in acp_main.html. PHPBB3-15610 --- phpBB/adm/style/admin.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index f9435a68dd..d19ee9912b 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -724,9 +724,8 @@ td { .table1 { border-spacing: 1px; + display: inline-block; border-collapse: separate; - display:inline-block; - } #lside { -- cgit v1.2.1 From f993d918654961c8abca422883e379b1a66e2926 Mon Sep 17 00:00:00 2001 From: amalnaeem <36226153+amalnaeem@users.noreply.github.com> Date: Thu, 5 Apr 2018 22:13:27 +0500 Subject: [ticket/15610] Improving UI of Board Statistics in ACP Master Improving UI of Board Statistics in ACP Statistics table was divided into two in acp_main.html PHPBB3-15610 --- phpBB/adm/style/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index d19ee9912b..3a783ad76d 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -723,8 +723,8 @@ td { } .table1 { - border-spacing: 1px; display: inline-block; + border-spacing: 1px; border-collapse: separate; } -- cgit v1.2.1 From 7b4ef7a101a46cdb0615b0e9d2f0764e1d169e63 Mon Sep 17 00:00:00 2001 From: amalnaeem <36226153+amalnaeem@users.noreply.github.com> Date: Thu, 5 Apr 2018 23:46:17 +0500 Subject: [ticket/15610] Improving UI of Board Statistics in ACP Master Improving UI of Board Statistics in ACP Statistics table was divided into two in acp_main.html PHPBB3-15610 --- phpBB/adm/style/acp_main.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index fadb65bd1a..11fbac9b37 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -100,7 +100,7 @@ - Forum Statistics + {L_STATISTIC} {L_VALUE} @@ -151,7 +151,7 @@ - Configuration Statistics + {L_STATISTIC} {L_VALUE} -- cgit v1.2.1 From cbe983397503de9a4a7481b1a9b7d5f45371daa6 Mon Sep 17 00:00:00 2001 From: amalnaeem <36226153+amalnaeem@users.noreply.github.com> Date: Fri, 6 Apr 2018 09:54:59 +0500 Subject: [ticket/15610] Improving UI of Board Statistics in ACP Master Improving UI of Board Statistics in ACP Statistics table was divided into two in acp_main.html PHPBB3-15610 --- phpBB/adm/style/acp_main.html | 76 +++++++++++++++++++++---------------------- phpBB/adm/style/admin.css | 5 ++- 2 files changed, 40 insertions(+), 41 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 11fbac9b37..8d0b64735b 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -94,7 +94,7 @@ -
+
@@ -106,46 +106,46 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +   - - + +
{L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS}{L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS}
{L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY}{L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY}
{L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS}{L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS}
{L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY}{L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY}
{L_NUMBER_USERS}{L_COLON} {TOTAL_USERS}{L_NUMBER_USERS}{L_COLON} {TOTAL_USERS}
{L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY}{L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY}
{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES}{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES}
{L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY}{L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY}
      
    -
+
@@ -157,37 +157,37 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + - - + diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 3a783ad76d..24199eadf8 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -728,16 +728,15 @@ td { border-collapse: separate; } -#lside { +.lside { display: inline-block; width: 40%; } -.table1 td { +.tabled { width: 25%; } - dt#color_palette_placeholder table { margin-right: 5px; width: 80px; -- cgit v1.2.1 From 68cba0cb26883c5d5752b7587ad07c1653b91c05 Mon Sep 17 00:00:00 2001 From: amalnaeem <36226153+amalnaeem@users.noreply.github.com> Date: Fri, 6 Apr 2018 22:13:04 +0500 Subject: [ticket/15610] Improving UI of Board Statistics in ACP Master Improving UI of Board Statistics in ACP Statistics table was divided into two in acp_main.html PHPBB3-15610 --- phpBB/adm/style/acp_main.html | 216 +++++++++++++++++++++--------------------- 1 file changed, 108 insertions(+), 108 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 8d0b64735b..ea5c75fdeb 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -96,119 +96,119 @@
-
{L_BOARD_STARTED}{L_COLON} {START_DATE}{L_BOARD_STARTED}{L_COLON} {START_DATE}
{L_AVATAR_DIR_SIZE}{L_COLON} {AVATAR_DIR_SIZE}{L_AVATAR_DIR_SIZE}{L_COLON} {AVATAR_DIR_SIZE}
{L_DATABASE_SIZE}{L_COLON} {DBSIZE}{L_DATABASE_SIZE}{L_COLON} {DBSIZE}
{L_UPLOAD_DIR_SIZE}{L_COLON} {UPLOAD_DIR_SIZE}{L_UPLOAD_DIR_SIZE}{L_COLON} {UPLOAD_DIR_SIZE}
{L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO}{L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO}
{L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION}{L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION}
{L_PHP_VERSION}{L_COLON} {PHP_VERSION_INFO}{L_PHP_VERSION}{L_COLON} {PHP_VERSION_INFO}
{L_NUMBER_ORPHAN}{L_COLON} + {L_NUMBER_ORPHAN}{L_COLON} {TOTAL_ORPHAN} @@ -200,8 +200,8 @@
{L_BOARD_VERSION}{L_COLON} + {L_BOARD_VERSION}{L_COLON} style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ]
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - -
{L_STATISTIC}{L_VALUE}
{L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS}
{L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY}
{L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS}
{L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY}
{L_NUMBER_USERS}{L_COLON} {TOTAL_USERS}
{L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY}
{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES}
{L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY}
   
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + +
{L_STATISTIC}{L_VALUE}
{L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS}
{L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY}
{L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS}
{L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY}
{L_NUMBER_USERS}{L_COLON} {TOTAL_USERS}
{L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY}
{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES}
{L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY}
   
   
- - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - -
{L_STATISTIC}{L_VALUE}
{L_BOARD_STARTED}{L_COLON} {START_DATE}
{L_AVATAR_DIR_SIZE}{L_COLON} {AVATAR_DIR_SIZE}
{L_DATABASE_SIZE}{L_COLON} {DBSIZE}
{L_UPLOAD_DIR_SIZE}{L_COLON} {UPLOAD_DIR_SIZE}
{L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO}
{L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION}
{L_PHP_VERSION}{L_COLON} {PHP_VERSION_INFO}
{L_NUMBER_ORPHAN}{L_COLON} - - {TOTAL_ORPHAN} - - {TOTAL_ORPHAN} + +
{L_STATISTIC}{L_VALUE}
{L_BOARD_STARTED}{L_COLON} {START_DATE}
{L_AVATAR_DIR_SIZE}{L_COLON} {AVATAR_DIR_SIZE}
{L_DATABASE_SIZE}{L_COLON} {DBSIZE}
{L_UPLOAD_DIR_SIZE}{L_COLON} {UPLOAD_DIR_SIZE}
{L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO}
{L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION}
{L_PHP_VERSION}{L_COLON} {PHP_VERSION_INFO}
{L_NUMBER_ORPHAN}{L_COLON} + + {TOTAL_ORPHAN} + + {TOTAL_ORPHAN} + +
{L_BOARD_VERSION}{L_COLON} - style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] -
+ + + + {L_BOARD_VERSION}{L_COLON} + + style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] + + + + + +
-- cgit v1.2.1 From d227912ee8b1658b5eb910a3bd31d94ca8d78f8e Mon Sep 17 00:00:00 2001 From: amalnaeem <36226153+amalnaeem@users.noreply.github.com> Date: Sat, 7 Apr 2018 11:05:58 +0500 Subject: [ticket/15610] Improving UI of Board Statistics in ACP Master Improving UI of Board Statistics in ACP Statistics table was divided into two in acp_main.html. PHPBB3-15610 --- phpBB/adm/style/acp_main.html | 222 +++++++++++++++++++++--------------------- 1 file changed, 110 insertions(+), 112 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index ea5c75fdeb..69b12c6192 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -94,122 +94,120 @@ -
+
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - -
{L_STATISTIC}{L_VALUE}
{L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS}
{L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY}
{L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS}
{L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY}
{L_NUMBER_USERS}{L_COLON} {TOTAL_USERS}
{L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY}
{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES}
{L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY}
   
-
-     -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_STATISTIC}{L_VALUE}
{L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS}
{L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY}
{L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS}
{L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY}
{L_NUMBER_USERS}{L_COLON} {TOTAL_USERS}
{L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY}
{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES}
{L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY}
  
+
- - - - {L_STATISTIC} - {L_VALUE} - - - - - {L_BOARD_STARTED}{L_COLON} - {START_DATE} - - - {L_AVATAR_DIR_SIZE}{L_COLON} - {AVATAR_DIR_SIZE} - - - {L_DATABASE_SIZE}{L_COLON} - {DBSIZE} - - - {L_UPLOAD_DIR_SIZE}{L_COLON} - {UPLOAD_DIR_SIZE} - - - {L_DATABASE_SERVER_INFO}{L_COLON} - {DATABASE_INFO} - - - {L_GZIP_COMPRESSION}{L_COLON} - {GZIP_COMPRESSION} - - - {L_PHP_VERSION}{L_COLON} - {PHP_VERSION_INFO} - - - - {L_NUMBER_ORPHAN}{L_COLON} - - - {TOTAL_ORPHAN} - - {TOTAL_ORPHAN} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - -
{L_STATISTIC}{L_VALUE}
{L_BOARD_STARTED}{L_COLON} {START_DATE}
{L_AVATAR_DIR_SIZE}{L_COLON} {AVATAR_DIR_SIZE}
{L_DATABASE_SIZE}{L_COLON} {DBSIZE}
{L_UPLOAD_DIR_SIZE}{L_COLON} {UPLOAD_DIR_SIZE}
{L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO}
{L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION}
{L_PHP_VERSION}{L_COLON} {PHP_VERSION_INFO}
{L_NUMBER_ORPHAN}{L_COLON} + + {TOTAL_ORPHAN} + + {TOTAL_ORPHAN} + +
{L_BOARD_VERSION}{L_COLON} - style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] -
-
+ + + + {L_BOARD_VERSION}{L_COLON} + + style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] + + + + + + +
{L_STATISTIC_RESYNC_OPTIONS} -- cgit v1.2.1 From ee667ac897e44a546351cbff9e0ff71ad0e1a67c Mon Sep 17 00:00:00 2001 From: amalnaeem <36226153+amalnaeem@users.noreply.github.com> Date: Sat, 7 Apr 2018 23:14:16 +0500 Subject: [ticket/15610] Improving UI of Board Statistics in ACP Master Improving UI of Board Statistics in ACP Statistics table was divided into two in acp_main.html. PHPBB3-15610 --- phpBB/adm/style/acp_main.html | 206 +++++++++++++++++++++--------------------- 1 file changed, 103 insertions(+), 103 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 69b12c6192..ce8b9d5674 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -98,114 +98,114 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_STATISTIC}{L_VALUE}
{L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS}
{L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY}
{L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS}
{L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY}
{L_NUMBER_USERS}{L_COLON} {TOTAL_USERS}
{L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY}
{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES}
{L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY}
  
{L_STATISTIC}{L_VALUE}
{L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS}
{L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY}
{L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS}
{L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY}
{L_NUMBER_USERS}{L_COLON} {TOTAL_USERS}
{L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY}
{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES}
{L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY}
  
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_STATISTIC}{L_VALUE}
{L_BOARD_STARTED}{L_COLON} {START_DATE}
{L_AVATAR_DIR_SIZE}{L_COLON} {AVATAR_DIR_SIZE}
{L_DATABASE_SIZE}{L_COLON} {DBSIZE}
{L_UPLOAD_DIR_SIZE}{L_COLON} {UPLOAD_DIR_SIZE}
{L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO}
{L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION}
{L_PHP_VERSION}{L_COLON} {PHP_VERSION_INFO}
{L_NUMBER_ORPHAN}{L_COLON} - - {TOTAL_ORPHAN} - - {TOTAL_ORPHAN} - -
{L_BOARD_VERSION}{L_COLON} - style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] -
{L_STATISTIC}{L_VALUE}
{L_BOARD_STARTED}{L_COLON} {START_DATE}
{L_AVATAR_DIR_SIZE}{L_COLON} {AVATAR_DIR_SIZE}
{L_DATABASE_SIZE}{L_COLON} {DBSIZE}
{L_UPLOAD_DIR_SIZE}{L_COLON} {UPLOAD_DIR_SIZE}
{L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO}
{L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION}
{L_PHP_VERSION}{L_COLON} {PHP_VERSION_INFO}
{L_NUMBER_ORPHAN}{L_COLON} + + {TOTAL_ORPHAN} + + {TOTAL_ORPHAN} + +
{L_BOARD_VERSION}{L_COLON} + style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] +
-- cgit v1.2.1 From 7e96098e2999e6b95fb3affbbb3991028ccf818e Mon Sep 17 00:00:00 2001 From: amalnaeem <36226153+amalnaeem@users.noreply.github.com> Date: Sun, 8 Apr 2018 11:38:16 +0500 Subject: [ticket/15610] Improving UI of Board Statistics in ACP Master Improving UI of Board Statistics in ACP Statistics table was divided into two in acp_main.html. PHPBB3-15610 --- phpBB/adm/style/acp_main.html | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index ce8b9d5674..261c41a2e7 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -95,9 +95,7 @@
- - @@ -106,35 +104,35 @@ - + - + - + - + - + - + - + - + @@ -144,7 +142,6 @@
{L_STATISTIC}
{L_NUMBER_POSTS}{L_COLON} {L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS}
{L_POSTS_PER_DAY}{L_COLON} {L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY}
{L_NUMBER_TOPICS}{L_COLON} {L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS}
{L_TOPICS_PER_DAY}{L_COLON} {L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY}
{L_NUMBER_USERS}{L_COLON} {L_NUMBER_USERS}{L_COLON} {TOTAL_USERS}
{L_USERS_PER_DAY}{L_COLON} {L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY}
{L_NUMBER_FILES}{L_COLON} {L_NUMBER_FILES}{L_COLON} {TOTAL_FILES}
{L_FILES_PER_DAY}{L_COLON} {L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY}
-
@@ -155,36 +152,36 @@ - + - + - + - + - + - + - + - + - - + - -- cgit v1.2.1 From 62e609c10c4475846bb61400872e727ecb99cbc4 Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Sun, 18 Feb 2018 16:44:05 +0100 Subject: [ticket/15522] Improve color palette syntax PHPBB3-15522 --- phpBB/adm/style/acp_contact.html | 2 +- phpBB/adm/style/acp_groups.html | 2 +- phpBB/adm/style/acp_users_signature.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_contact.html b/phpBB/adm/style/acp_contact.html index 828fd4b659..f1752d0055 100644 --- a/phpBB/adm/style/acp_contact.html +++ b/phpBB/adm/style/acp_contact.html @@ -44,7 +44,7 @@
-
+
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index d0096370d9..8eec3b63c6 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -98,7 +98,7 @@        [ {L_COLOUR_SWATCH} ] - +
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index c7ec5cc0eb..2e57700fd1 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -26,7 +26,7 @@
-
+
-- cgit v1.2.1 From 89ae1c3221c40b6394aa5da6bfc87d2f19ae4c9a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 11 May 2019 17:30:43 +0200 Subject: [ticket/16052] Update version numbers to 3.3 PHPBB3-16052 --- phpBB/adm/style/acp_ext_list.html | 2 +- phpBB/adm/style/acp_language.html | 2 +- phpBB/adm/style/acp_styles.html | 2 +- phpBB/adm/style/admin.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index c3c3b3fb66..e5783124c6 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -7,7 +7,7 @@

{L_EXTENSIONS_EXPLAIN}

- {L_BROWSE_EXTENSIONS_DATABASE} • {L_VERSIONCHECK_FORCE_UPDATE_ALL} • {L_SETTINGS} + {L_BROWSE_EXTENSIONS_DATABASE} • {L_VERSIONCHECK_FORCE_UPDATE_ALL} • {L_SETTINGS}
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index 79fef94207..5e3ac9532a 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -69,7 +69,7 @@

{L_ACP_LANGUAGE_PACKS_EXPLAIN}

- {L_BROWSE_LANGUAGE_PACKS_DATABASE} + {L_BROWSE_LANGUAGE_PACKS_DATABASE}
{L_BOARD_STARTED}{L_COLON} {L_BOARD_STARTED}{L_COLON} {START_DATE}
{L_AVATAR_DIR_SIZE}{L_COLON} {L_AVATAR_DIR_SIZE}{L_COLON} {AVATAR_DIR_SIZE}
{L_DATABASE_SIZE}{L_COLON} {L_DATABASE_SIZE}{L_COLON} {DBSIZE}
{L_UPLOAD_DIR_SIZE}{L_COLON} {L_UPLOAD_DIR_SIZE}{L_COLON} {UPLOAD_DIR_SIZE}
{L_DATABASE_SERVER_INFO}{L_COLON} {L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO}
{L_GZIP_COMPRESSION}{L_COLON} {L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION}
{L_PHP_VERSION}{L_COLON} {L_PHP_VERSION}{L_COLON} {PHP_VERSION_INFO}
{L_NUMBER_ORPHAN}{L_COLON} {L_NUMBER_ORPHAN}{L_COLON} {TOTAL_ORPHAN} @@ -193,16 +190,14 @@
{L_BOARD_VERSION}{L_COLON} {L_BOARD_VERSION}{L_COLON} style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ]
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 38bec5a1e4..b9c3925eca 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -33,7 +33,7 @@

{L_EXPLAIN}

- {L_BROWSE_STYLES_DATABASE} + {L_BROWSE_STYLES_DATABASE}
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 24199eadf8..c0454dc570 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1,4 +1,4 @@ -/* phpBB 3.2 Admin Style Sheet +/* phpBB 3.3 Admin Style Sheet ------------------------------------------------------------------------ Original author: subBlue ( http://www.subblue.com/ ) Copyright (c) phpBB Limited -- cgit v1.2.1 From 8f0643a14c24b3f6e65508beea05a89ec4c3717d Mon Sep 17 00:00:00 2001 From: hanakin Date: Fri, 4 Jan 2019 18:17:26 -0500 Subject: [ticket/15927] Fix render issue PHPBB3-15927 --- phpBB/adm/style/acp_main.html | 8 +++----- phpBB/adm/style/admin.css | 14 ++++++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 261c41a2e7..ce55d81375 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -93,9 +93,9 @@ - +
-
+
@@ -141,9 +141,7 @@
{L_STATISTIC}
-
-
- +
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index c0454dc570..dafe9144d6 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -723,14 +723,20 @@ td { } .table1 { - display: inline-block; + clear: both; border-spacing: 1px; border-collapse: separate; } -.lside { - display: inline-block; - width: 40%; +.lside .table1 { + float: left; + clear: none; +} + +@media only screen and (min-width: 1100px), only screen and (min-device-width: 1100px) { + .lside .table1 { + width: 50%; + } } .tabled { -- cgit v1.2.1 From 52ed8bfaa176df778e2da819ee8fa76906b75d00 Mon Sep 17 00:00:00 2001 From: hanakin Date: Sat, 5 Jan 2019 12:54:55 -0500 Subject: [ticket/15927] Avoid using floats PHPBB3-15927 --- phpBB/adm/style/admin.css | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index dafe9144d6..4f0a3312e4 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -728,14 +728,10 @@ td { border-collapse: separate; } -.lside .table1 { - float: left; - clear: none; -} - @media only screen and (min-width: 1100px), only screen and (min-device-width: 1100px) { .lside .table1 { - width: 50%; + display: inline-table; + width: 49.7%; } } -- cgit v1.2.1 From c0e9ef21fe5c6d79857c4dc8d2a527f986b40d51 Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Tue, 20 Feb 2018 08:51:34 +0100 Subject: [ticket/15564] Update ACP as well PHPBB3-15564 --- phpBB/adm/style/captcha_recaptcha.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html index 3f61c76cb1..563bd98835 100644 --- a/phpBB/adm/style/captcha_recaptcha.html +++ b/phpBB/adm/style/captcha_recaptcha.html @@ -5,8 +5,9 @@
{L_RECAPTCHA_NOSCRIPT}
+ {L_RECAPTCHA_INVISIBLE} -
+
-- cgit v1.2.1 From e78632767c3c9eb9fc8c2757d3e6e8b5f1d60ced Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 20 Oct 2019 21:35:45 +0200 Subject: [ticket/15437] Rename jquery.min.js to jquery-3.4.1.min.js PHPBB3-15437 --- phpBB/adm/style/installer_footer.html | 2 +- phpBB/adm/style/overall_footer.html | 2 +- phpBB/adm/style/simple_footer.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html index 8b3b04d8a5..81a85d1b01 100644 --- a/phpBB/adm/style/installer_footer.html +++ b/phpBB/adm/style/installer_footer.html @@ -23,7 +23,7 @@ installLang = { - + {$SCRIPTS} diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 3ab633e04b..7a5b620f48 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -34,7 +34,7 @@ - + diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index 4b54b83373..dd9dc90fd0 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -17,7 +17,7 @@ - + -- cgit v1.2.1 From eb0195dd7c1ea62b7c3422af11c538563aff8965 Mon Sep 17 00:00:00 2001 From: hanakin Date: Sun, 27 Oct 2019 12:14:44 -1000 Subject: [ticket/16188] fix acp responsive stats PHPBB3-16188 --- phpBB/adm/style/admin.css | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 4f0a3312e4..5d7c013aba 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -728,13 +728,6 @@ td { border-collapse: separate; } -@media only screen and (min-width: 1100px), only screen and (min-device-width: 1100px) { - .lside .table1 { - display: inline-table; - width: 49.7%; - } -} - .tabled { width: 25%; } @@ -1073,6 +1066,36 @@ table.fixed-width-table { } } +.lside { + display: flex; + flex-direction: column; +} + +.lside .table1 { + display: table; + width: 100%; +} + +.lside .table1:first-child { + margin-right: 20px; +} + +@media (min-width: 1025px) { + .lside { + flex-direction: row; + } + + .lside .table1 { + flex: 1; + } + + .lside .table1:first-child { + margin-bottom: 0; + margin-right: 20px; + } +} + + /* General form styles ----------------------------------------*/ fieldset { -- cgit v1.2.1 From be17a8417d2931e7c31b3533ffcd39b222ccdf0f Mon Sep 17 00:00:00 2001 From: mrgoldy Date: Wed, 30 Oct 2019 20:13:01 +0100 Subject: [ticket/16195] Add missing paragraph PHPBB3-16195 --- phpBB/adm/style/permission_forum_copy.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html index b1539aff12..0560648baf 100644 --- a/phpBB/adm/style/permission_forum_copy.html +++ b/phpBB/adm/style/permission_forum_copy.html @@ -4,7 +4,7 @@

{L_ACP_FORUM_PERMISSIONS_COPY}

- {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN} +

{L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN}

-- cgit v1.2.1 From 1a2e5f6ee6c85cb84976d97a3a2e2a2d7403ff28 Mon Sep 17 00:00:00 2001 From: hanakin Date: Thu, 31 Oct 2019 17:22:18 -1000 Subject: [ticket/16188] Remove responsive tables in acp PHPBB3-16188 --- phpBB/adm/style/admin.css | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 5d7c013aba..d0f6583ce2 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1066,36 +1066,6 @@ table.fixed-width-table { } } -.lside { - display: flex; - flex-direction: column; -} - -.lside .table1 { - display: table; - width: 100%; -} - -.lside .table1:first-child { - margin-right: 20px; -} - -@media (min-width: 1025px) { - .lside { - flex-direction: row; - } - - .lside .table1 { - flex: 1; - } - - .lside .table1:first-child { - margin-bottom: 0; - margin-right: 20px; - } -} - - /* General form styles ----------------------------------------*/ fieldset { -- cgit v1.2.1 From 6ccffec90695becd92d1144f6cbd9ef72f0d9b51 Mon Sep 17 00:00:00 2001 From: PayBas Date: Sat, 17 May 2014 11:20:37 +0200 Subject: [ticket/12559] Add forum setting to limit subforum legend Squashed all commits, they were basically just typos and errors PHPBB3-12559 --- phpBB/adm/style/acp_forums.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 20bcd2e9f9..f51ce98776 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -210,6 +210,11 @@
+
+

{L_LIMIT_SUBFORUMS_EXPLAIN}
+
+
+

{L_LIST_INDEX_EXPLAIN}
-- cgit v1.2.1 From d65927674910b3f86c5af47731561ef51087af77 Mon Sep 17 00:00:00 2001 From: hanakin Date: Sun, 8 Dec 2019 00:07:57 -1000 Subject: [ticket/16248] fix logo in acp PHPBB3-16248 --- phpBB/adm/style/admin.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 4f0a3312e4..da5c50f260 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -191,7 +191,7 @@ li { #page-header { text-align: right; - background: url("../images/phpbb_logo.png") top left no-repeat; + background: url("../images/phpbb_logo.svg") top left no-repeat; height: 54px; font-size: 0.85em; margin-bottom: 10px; @@ -199,7 +199,7 @@ li { .rtl #page-header { text-align: left; - background: url("../images/phpbb_logo.png") top right no-repeat; + background: url("../images/phpbb_logo.svg") top right no-repeat; } #page-header h1 { -- cgit v1.2.1 From 9345bc16105b63c69f9631efe52fb6d1258dae0b Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Tue, 24 Dec 2019 23:37:15 +0100 Subject: [ticket/16221] Fix ACP statistics layout PHPBB3-16221 --- phpBB/adm/style/acp_main.html | 110 ++++++++++++++++++++++-------------------- phpBB/adm/style/admin.css | 8 ++- 2 files changed, 64 insertions(+), 54 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index ce55d81375..f874d0cc22 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -98,109 +98,113 @@
{L_STATISTIC}
- - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + {% if S_TOTAL_ORPHAN %} + + + {% else %} + {% endif %} + {% if S_VERSIONCHECK %} - - + + + {% endif %}
{L_STATISTIC}{L_VALUE}{{ lang('STATISTIC}') }}{{ lang('VALUE') }}
{L_NUMBER_POSTS}{L_COLON}{TOTAL_POSTS}{{ lang('BOARD_STARTED') ~ lang('COLON') }}{{ START_DATE }}
{L_POSTS_PER_DAY}{L_COLON}{POSTS_PER_DAY}{{ lang('AVATAR_DIR_SIZE') ~ lang('COLON') }}{{ AVATAR_DIR_SIZE }}
{L_NUMBER_TOPICS}{L_COLON}{TOTAL_TOPICS}{{ lang('DATABASE_SIZE') ~ lang('COLON') }}{{ DBSIZE }}
{L_TOPICS_PER_DAY}{L_COLON}{TOPICS_PER_DAY}{{ lang('UPLOAD_DIR_SIZE') ~ lang('COLON') }}{{ UPLOAD_DIR_SIZE }}
{L_NUMBER_USERS}{L_COLON}{TOTAL_USERS}{{ lang('DATABASE_SERVER_INFO') ~ lang('COLON') }}{{ DATABASE_INFO }}
{L_USERS_PER_DAY}{L_COLON}{USERS_PER_DAY}{{ lang('GZIP_COMPRESSION') ~ lang('COLON') }}{{ GZIP_COMPRESSION }}
{L_NUMBER_FILES}{L_COLON}{TOTAL_FILES}{{ lang('PHP_VERSION') ~ lang('COLON') }}{{ PHP_VERSION_INFO }}
{L_FILES_PER_DAY}{L_COLON}{FILES_PER_DAY}{{ lang('NUMBER_ORPHAN') ~ lang('COLON') }} + {% if TOTAL_ORPHAN > 0 %} + {{ TOTAL_ORPHAN }} + {% else %} + {{ TOTAL_ORPHAN }} + {% endif %} +
  {{ lang('BOARD_VERSION') ~ lang('COLON') }} + {{ BOARD_VERSION }} [ {{ lang('VERSIONCHECK_FORCE_UPDATE') }} ] +
+ - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + - - - + + -
{L_STATISTIC}{L_VALUE}{{ lang('STATISTIC}') }}{{ lang('VALUE') }}
{L_BOARD_STARTED}{L_COLON}{START_DATE}{{ lang('NUMBER_POSTS') ~ lang('COLON') }}{{ TOTAL_POSTS }}
{L_AVATAR_DIR_SIZE}{L_COLON}{AVATAR_DIR_SIZE}{{ lang('POSTS_PER_DAY') ~ lang('COLON') }}{{ POSTS_PER_DAY }}
{L_DATABASE_SIZE}{L_COLON}{DBSIZE}{{ lang('NUMBER_TOPICS') ~ lang('COLON') }}{{ TOTAL_TOPICS }}
{L_UPLOAD_DIR_SIZE}{L_COLON}{UPLOAD_DIR_SIZE}{{ lang('TOPICS_PER_DAY') ~ lang('COLON') }}{{ TOPICS_PER_DAY }}
{L_DATABASE_SERVER_INFO}{L_COLON}{DATABASE_INFO}{{ lang('NUMBER_USERS') ~ lang('COLON') }}{{ TOTAL_USERS }}
{L_GZIP_COMPRESSION}{L_COLON}{GZIP_COMPRESSION}{{ lang('USERS_PER_DAY') ~ lang('COLON') }}{{ USERS_PER_DAY }}
{L_PHP_VERSION}{L_COLON}{PHP_VERSION_INFO}{{ lang('NUMBER_FILES') ~ lang('COLON') }}{{ TOTAL_FILES }}
{L_NUMBER_ORPHAN}{L_COLON} - - {TOTAL_ORPHAN} - - {TOTAL_ORPHAN} - - {{ lang('FILES_PER_DAY') ~ lang('COLON') }}{{ FILES_PER_DAY }}
{L_BOARD_VERSION}{L_COLON} - style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] -   
+
{L_STATISTIC_RESYNC_OPTIONS} diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index a44de6561e..9a898cdb68 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -723,11 +723,17 @@ td { } .table1 { - clear: both; + display: inline-block; border-spacing: 1px; border-collapse: separate; } +.lside { + display: flex; + align-items: stretch; + width: 100%; +} + .tabled { width: 25%; } -- cgit v1.2.1 From b9fccc9fcef598ae62e0fbc33f3ad0da0e36f275 Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Tue, 24 Dec 2019 23:53:42 +0100 Subject: [ticket/16221] Fix ACP statistics layout PHPBB3-16221 --- phpBB/adm/style/acp_main.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index f874d0cc22..5416675200 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -98,7 +98,7 @@ - + @@ -159,7 +159,7 @@
{{ lang('STATISTIC}') }}{{ lang('STATISTIC') }} {{ lang('VALUE') }}
- + -- cgit v1.2.1 From b1596ffecb834be2d10fd08b66a2b105d5481ed4 Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Wed, 25 Dec 2019 00:06:15 +0100 Subject: [ticket/16221] Fix ACP statistics layout Resolve conflicts PHPBB3-16221 --- phpBB/adm/style/acp_main.html | 4 ++-- phpBB/adm/style/admin.css | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 5416675200..b8d337cfd8 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -95,7 +95,7 @@
-
{{ lang('STATISTIC}') }}{{ lang('STATISTIC') }} {{ lang('VALUE') }}
+
@@ -156,7 +156,7 @@
{{ lang('STATISTIC') }}
- +
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 9a898cdb68..f857020651 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -723,6 +723,12 @@ td { } .table1 { + clear: both; + border-spacing: 1px; + border-collapse: separate; +} + +.table2 { display: inline-block; border-spacing: 1px; border-collapse: separate; -- cgit v1.2.1 From b85c7be5ac8a08a3e3856137cb65050178a85a74 Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Wed, 25 Dec 2019 21:12:22 +0100 Subject: [ticket/16221] Fix ACP statistics layout Fix wide-screen layout PHPBB3-16221 --- phpBB/adm/style/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index f857020651..3243d0eb24 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -741,7 +741,7 @@ td { } .tabled { - width: 25%; + width: 1%; } dt#color_palette_placeholder table { -- cgit v1.2.1 From 7e5d0b9ec8568ea12bb2d8ef7fc7501ed17dce99 Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Wed, 1 Jan 2020 00:33:59 +0100 Subject: [ticket/16281] Fix Ajax refresh-data for extensions' Tab PHPBB3-16281 --- phpBB/adm/style/acp_ext_actions.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_ext_actions.html b/phpBB/adm/style/acp_ext_actions.html index 6f2341f381..6b59ab7180 100644 --- a/phpBB/adm/style/acp_ext_actions.html +++ b/phpBB/adm/style/acp_ext_actions.html @@ -1,6 +1,7 @@ {% for action in enabled.actions %} -{{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} + {{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} {% endfor %} + {% for action in disabled.actions %} -{{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} -{% endfor %} \ No newline at end of file + {{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} +{% endfor %} -- cgit v1.2.1 From f866a8fd1bac7da74c88763447ad2f3ff1b9a10c Mon Sep 17 00:00:00 2001 From: paul sohier Date: Thu, 2 Jan 2020 15:21:34 +0100 Subject: [ticket/16287] After installation an error is given over statistics submission The phpBB.com website required specific fields to be available for the statistics. This change switched over to a new statistics page on www.phpbb.com that uses form fields instead, and that returns JSON as value. PHPBB3-16287 --- phpBB/adm/style/acp_help_phpbb.html | 10 ++++++++-- phpBB/adm/style/ajax.js | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html index 478ecc162a..2426bf57cd 100644 --- a/phpBB/adm/style/acp_help_phpbb.html +++ b/phpBB/adm/style/acp_help_phpbb.html @@ -38,10 +38,12 @@
{L_SEND_STATISTICS_LONG}
+

-

@@ -52,7 +54,11 @@

- + + + + +

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index 644e74bef7..b9424723bb 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -1,4 +1,4 @@ -/* global phpbb */ +/* global phpbb, statsData */ (function($) { // Avoid conflicts with other libraries @@ -87,7 +87,7 @@ phpbb.prepareSendStats = function () { $.ajax({ url: $this.attr('data-ajax-action').replace('&', '&'), type: 'POST', - data: 'systemdata=' + encodeURIComponent($this.find('input[name=systemdata]').val()), + data: statsData, success: returnHandler, error: errorHandler, cache: false -- cgit v1.2.1 From b3f80239c1204cdaa69d4de66674d27fd4091da9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 2 Jan 2020 21:06:58 +0100 Subject: [ticket/16287] Use twig syntax and fix coding guidelines issues PHPBB3-16287 --- phpBB/adm/style/acp_help_phpbb.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html index 2426bf57cd..d526bf6ee7 100644 --- a/phpBB/adm/style/acp_help_phpbb.html +++ b/phpBB/adm/style/acp_help_phpbb.html @@ -39,7 +39,7 @@
@@ -54,11 +54,11 @@

- - - - - + {% for providers in loops.providers %} + {% for values in providers.values %} + + {% endfor %} + {% endfor %}

-- cgit v1.2.1 From d50d1101fbe991abcc7c42b7e624d4c202c2a8a1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 3 Jan 2020 08:57:09 +0100 Subject: [ticket/16287] Remove loops. prefix in providers loop PHPBB3-16287 --- phpBB/adm/style/acp_help_phpbb.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html index d526bf6ee7..7d3c503e77 100644 --- a/phpBB/adm/style/acp_help_phpbb.html +++ b/phpBB/adm/style/acp_help_phpbb.html @@ -54,7 +54,7 @@

- {% for providers in loops.providers %} + {% for providers in providers %} {% for values in providers.values %} {% endfor %} -- cgit v1.2.1 From a0ffbfce315ce45df4085d4c83536f2024e71a3f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 3 Jan 2020 10:17:40 +0100 Subject: [ticket/16287] Correctly pass json response to PHP file PHPBB3-16287 --- phpBB/adm/style/ajax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/adm/style') diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index b9424723bb..39b63e4696 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -74,7 +74,7 @@ phpbb.prepareSendStats = function () { var $sendStatisticsSuccess = $('', { type: 'hidden', name: 'send_statistics_response', - value: res + value: JSON.stringify(res) }); $sendStatisticsSuccess.appendTo('p.submit-buttons'); -- cgit v1.2.1

{{ lang('STATISTIC') }}