aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-01-31 15:23:17 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-12-03 14:20:28 +0100
commit6f315da9ab3eaa8e680414eeed6d763a9e2102b6 (patch)
tree6fe391d1e52393f3e2ab3265af128ef3a0d8c445
parent430ec6f61d5da5b278ee2cadda535fcf9dcaed22 (diff)
downloadforums-6f315da9ab3eaa8e680414eeed6d763a9e2102b6.tar
forums-6f315da9ab3eaa8e680414eeed6d763a9e2102b6.tar.gz
forums-6f315da9ab3eaa8e680414eeed6d763a9e2102b6.tar.bz2
forums-6f315da9ab3eaa8e680414eeed6d763a9e2102b6.tar.xz
forums-6f315da9ab3eaa8e680414eeed6d763a9e2102b6.zip
[ticket/14492] Improve look and display data again
PHPBB3-14492
Diffstat
-rw-r--r--phpBB/adm/style/acp_send_statistics.html85
-rw-r--r--phpBB/adm/style/admin.css100
-rw-r--r--phpBB/adm/style/admin.js9
3 files changed, 121 insertions, 73 deletions
diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html
index d1f695bf8e..b45886f943 100644
--- a/phpBB/adm/style/acp_send_statistics.html
+++ b/phpBB/adm/style/acp_send_statistics.html
@@ -5,17 +5,47 @@
<h1>{L_SEND_STATISTICS}</h1>
<div class="send-stats-row">
- <div class="send-stats-col">
- <div class="send-stats-tile">
- <h2><p><i class="icon fa-bar-chart"></i>Send statistics</p></h2>
- <p>{L_EXPLAIN_SEND_STATISTICS}</p>
+ <div class="send-stats-tile">
+ <h2><i class="icon fa-bar-chart"></i>Send statistics</h2>
+ <p>{L_EXPLAIN_SEND_STATISTICS}</p>
+ <div class="send-stats-row">
+ <div class="send-stats-data-row send-stats-data-only-row">
+ <a id="trigger-configlist"><span>{L_SHOW_STATISTICS}</span><i class="icon fa-angle-down"></i></a>
+ </div>
+ <div class="send-stats-data-row send-stats-data-hidden">
+ <div class="configlist" id="configlist">
+ <!-- BEGIN providers -->
+ <fieldset>
+ <legend>{providers.NAME}</legend>
+ <!-- BEGIN values -->
+ <dl>
+ <dt>{providers.values.KEY}</dt>
+ <dd>{providers.values.VALUE}</dd>
+ </dl>
+ <!-- END values -->
+ </fieldset>
+ <!-- END providers -->
+ </div>
+ </div>
</div>
+ <dl class="send-stats-settings">
+ <dt>
+ <input id="enable-stats" type="checkbox" />
+ <label for="enable-stats"></label>
+ </dt>
+ <dd>{L_YES}</dd>
+ </dl>
</div>
- <div class="send-stats-col">
- <div class="send-stats-tile">
- <h2><p class="viglink-header">VigLink</p></h2>
- <p>{L_EXPLAIN_ENABLE_VIGLINK}</p>
- </div>
+ <div class="send-stats-tile">
+ <h2><span class="viglink-header">VigLink</span></h2>
+ <p>{L_EXPLAIN_ENABLE_VIGLINK}</p>
+ <dl class="send-stats-settings">
+ <dt>
+ <input id="enable-viglink" type="checkbox" />
+ <label for="enable-viglink"></label>
+ </dt>
+ <dd>Enable</dd>
+ </dl>
</div>
</div>
<div style="clear: both; display: none;">
@@ -36,43 +66,6 @@ function iframe_updated()
//]]>
</script>
-<iframe onload="iframe_updated();" name="questionaire_result" style="display: none;"></iframe>
-
-<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
-
- <p><a href="{U_ACP_MAIN}">{L_DONT_SEND_STATISTICS}</a></p>
-
- <p>{L_EXPLAIN_SHOW_STATISTICS}</p>
-
- <p id="show-button"><input type="button" class="button2" onclick="phpbb.toggleDisplay('configlist', 1); phpbb.toggleDisplay('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
-
- <div id="configlist">
- <input type="button" class="button2" onclick="phpbb.toggleDisplay('show-button', 1); phpbb.toggleDisplay('configlist', -1);" value="{L_HIDE_STATISTICS}" />
- <p class="submit-buttons">
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
- </p>
-
- <!-- BEGIN providers -->
- <fieldset>
- <legend>{providers.NAME}</legend>
- <!-- BEGIN values -->
- <dl>
- <dt>{providers.values.KEY}</dt>
- <dd>{providers.values.VALUE}</dd>
- </dl>
- <!-- END values -->
- </fieldset>
- <!-- END providers -->
- </div>
- <p class="submit-buttons">
- <input type="hidden" name="systemdata" value="{RAW_DATA}" />
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
- </p>
-</form>
-
-<div id="questionnaire-thanks" class="successbox">
- <p><strong>{L_THANKS_SEND_STATISTICS}</strong><br /><br /><a href="{U_ACP_MAIN}">&laquo; {L_GO_ACP_MAIN}</a></p>
-</div>
</div>
<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index c791f30cbc..afa0bd5d31 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2585,12 +2585,7 @@ fieldset.permissions .padding {
}
.send-stats-row {
- margin: 25px -15px 0;
-}
-
-.send-stats-row h3 {
- margin: 0;
- text-align: center;
+ margin: 15px 0;
}
.send-stats-row:before {
@@ -2598,20 +2593,6 @@ fieldset.permissions .padding {
content: " ";
}
-.send-stats-col {
- width: 50%;
- float: left;
- position: relative;
- min-height: 1px;
- padding-right: 15px;
- padding-left: 15px;
- box-sizing: border-box;
-}
-
-.send-stats-row > .send-stats-col:last-child {
- padding-left: 0;
-}
-
.send-stats-tile {
position: relative;
padding: 14px;
@@ -2624,10 +2605,7 @@ fieldset.permissions .padding {
.send-stats-tile h2 {
margin-top: 0;
text-align: center;
-}
-
-.send-stats-tile h2 > p {
- display: inline-block;
+ padding-bottom: 1em;
}
.send-stats-tile i {
@@ -2644,3 +2622,77 @@ fieldset.permissions .padding {
font-family: FontAwesome;
font-style: normal;
}
+
+.send-stats-data-row {
+ background: #f9f9f9;
+ border-radius: 6px;
+ border: #DEDEDE 1px solid;
+ padding: 10px;
+ border-top-width: 0;
+ border-top-right-radius: 0;
+ border-top-left-radius: 0;
+}
+
+.send-stats-data-hidden .configlist {
+ display: none;
+}
+
+.send-stats-data-only-row {
+ border-radius: 6px !important;
+ border-bottom-width: 1px !important;
+}
+
+.send-stats-data-hidden {
+ padding: 0;
+ border: none;
+}
+
+.send-stats-row > .send-stats-data-row:first-child {
+ background-color: #d9edf7;
+ border-bottom-width: 0;
+ border-top-right-radius: 6px;
+ border-top-left-radius: 6px;
+ border-top-width: 1px;
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+}
+
+.send-stats-settings dt, .send-stats-settings dd {
+ min-width: 25px;
+}
+
+.send-stats-settings dd {
+ line-height: 1.5em;
+}
+
+.send-stats-settings input {
+ display: none;
+}
+
+.send-stats-settings input[type=checkbox] + label:before {
+ content: "\f096";
+ font-family: FontAwesome;
+ font-size: 1.5em;
+}
+
+.send-stats-settings input[type=checkbox]:checked + label:before {
+ content: "\f14a";
+ color: #3c763d;
+}
+
+.send-stats-data-row a:hover span {
+ text-decoration: underline;
+}
+
+.send-stats-data-row a {
+ text-decoration: none;
+}
+
+.send-stats-data-row i {
+ padding-left: 6px;
+}
+
+.configlist {
+ word-wrap: break-word;
+ word-break: break-all;
+}
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 253fd46a62..e42fdb380a 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -243,8 +243,11 @@ function parse_document(container)
parse_document($('body'));
- // Hide configlist and success message in send statistics page
- phpbb.toggleDisplay('configlist', -1);
- phpbb.toggleDisplay('questionnaire-thanks', -1);
+ $('#trigger-configlist').on('click', function () {
+ var $configlist = $('#configlist');
+ $configlist.closest('.send-stats-data-row').toggleClass('send-stats-data-hidden');
+ $configlist.closest('.send-stats-row').find('.send-stats-data-row:first-child').toggleClass('send-stats-data-only-row');
+ $(this).find('i').toggleClass('fa-angle-down fa-angle-up');
+ });
});
})(jQuery);
generated by cgit v1.2.1 (git 2.21.0) at 2024-09-21 04:20:33 +0000