diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-30 12:21:30 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-03 14:20:28 +0100 |
| commit | c5e0635bc79197011744394a221b5ccdcf305fc6 (patch) | |
| tree | d311c3b05ed4958d442b97f6ef238a05b547406d | |
| parent | 267d1b15c4884dd67a299b2428251e68cd55327b (diff) | |
| download | forums-c5e0635bc79197011744394a221b5ccdcf305fc6.tar forums-c5e0635bc79197011744394a221b5ccdcf305fc6.tar.gz forums-c5e0635bc79197011744394a221b5ccdcf305fc6.tar.bz2 forums-c5e0635bc79197011744394a221b5ccdcf305fc6.tar.xz forums-c5e0635bc79197011744394a221b5ccdcf305fc6.zip | |
[ticket/14492] Add basic layout for enabling viglink
PHPBB3-14492
| -rw-r--r-- | phpBB/adm/style/acp_send_statistics.html | 18 | ||||
| -rw-r--r-- | phpBB/adm/style/admin.css | 61 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_header.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_acp.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 1 |
5 files changed, 80 insertions, 2 deletions
diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html index 480e438e1f..d1f695bf8e 100644 --- a/phpBB/adm/style/acp_send_statistics.html +++ b/phpBB/adm/style/acp_send_statistics.html @@ -4,8 +4,21 @@ <h1>{L_SEND_STATISTICS}</h1> -<p>{L_EXPLAIN_SEND_STATISTICS}</p> - +<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> + </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> +</div> +<div style="clear: both; display: none;"> <script type="text/javascript"> //<![CDATA[ var iframect = 0; @@ -60,5 +73,6 @@ function iframe_updated() <div id="questionnaire-thanks" class="successbox"> <p><strong>{L_THANKS_SEND_STATISTICS}</strong><br /><br /><a href="{U_ACP_MAIN}">« {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 e1668bf70b..c791f30cbc 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -2583,3 +2583,64 @@ fieldset.permissions .padding { line-height: 25px; font-weight: bold; } + +.send-stats-row { + margin: 25px -15px 0; +} + +.send-stats-row h3 { + margin: 0; + text-align: center; +} + +.send-stats-row:before { + display: table; + 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; + margin-bottom: 20px; + background-color: #eff0f2; + border-radius: 6px; + box-shadow: rgba(0,0,0,0.3) 1px 1px 5px; +} + +.send-stats-tile h2 { + margin-top: 0; + text-align: center; +} + +.send-stats-tile h2 > p { + display: inline-block; +} + +.send-stats-tile i { + padding-right: 0.3em; +} + +.viglink-header { + background: url('http://www.viglink.com/wp-content/uploads/2015/05/favicon-96x96.png') no-repeat 0 0; + padding-left: 30px; + background-size: 25px; +} + +.icon { + font-family: FontAwesome; + font-style: normal; +} diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index f227f729fd..1e8de766ff 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -7,6 +7,7 @@ <!-- IF META -->{META}<!-- ENDIF --> <title>{PAGE_TITLE}</title> +<link href="{T_FONT_AWESOME_LINK}" rel="stylesheet"> <link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" /> <script type="text/javascript"> diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 766669480d..8bf42aa36e 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -88,6 +88,7 @@ function adm_page_header($page_title) 'T_ICONS_PATH' => "{$phpbb_root_path}{$config['icons_path']}/", 'T_RANKS_PATH' => "{$phpbb_root_path}{$config['ranks_path']}/", 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/", + 'T_FONT_AWESOME_LINK' => !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$phpbb_root_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'], 'T_ASSETS_VERSION' => $config['assets_version'], diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index f30d1e7198..0acc18e373 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -484,6 +484,7 @@ $lang = array_merge($lang, array( 'SEND_STATISTICS' => 'Send statistical information', 'SHOW_STATISTICS' => 'Show details', 'THANKS_SEND_STATISTICS' => 'Thank you for submitting your information.', + 'EXPLAIN_ENABLE_VIGLINK' => 'Viglink is a non-invasive third-party service that will monetize existing links posted by users of your forum. When visitors click on those existing links and perform certain actions, such as shopping, the merchants pay VigLink a commission, of which a share is donated to the phpBB project. By agreeing to enable VigLink and donating proceeds to the phpBB project, you are supporting our open source organization and ensuring our continued financial security.<br /><br />You can change these settings at any time in VigLink settings panel.', )); // Log Entries |