From 467c794b9779412cf2cc29deb42c232168989486 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 29 May 2015 16:05:16 +0200
Subject: [ticket/6466] Use jQuery and custom dropdown for permission roles
 tooltips

PHPBB3-6466
---
 phpBB/adm/style/acp_permissions.html |  11 +--
 phpBB/adm/style/admin.css            |  33 +++++++++
 phpBB/adm/style/permission_mask.html |  13 +++-
 phpBB/adm/style/tooltip.js           | 127 ++++++++++++++++++-----------------
 4 files changed, 113 insertions(+), 71 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index 6dc9dca2e7..004027df41 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -327,14 +327,9 @@
 	<br class="responsive-hide" /><br class="responsive-hide" />
 
 	<!-- include tooltip file -->
-	<script type="text/javascript" src="style/tooltip.js"></script>
-	<script type="text/javascript">
-	// <![CDATA[
-		window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
-	// ]]>
-	</script>
-
-	<form id="set-permissions" method="post" action="{U_ACTION}">
+	<!-- INCLUDEJS tooltip.js -->
+
+	<form id="set-permissions" method="post" action="{U_ACTION}" data-role-description="{L_ROLE_DESCRIPTION}">
 
 	{S_HIDDEN_FIELDS}
 
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index b03cb0ba24..8ae39b7754 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2435,6 +2435,39 @@ fieldset.permissions .padding {
 	display: none !important;
 }
 
+.roles-options > .dropdown {
+	left: auto;
+	top: 3em;
+	width: 250px;
+}
+
+.roles-options {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	-o-user-select: none;
+	user-select: none;
+	width: 250px;
+}
+
+.roles-options > span {
+	border: 1px solid #DEDEDE;
+	border-radius: 3px;
+	padding: 4px;
+	width: 250px;
+	display: block;
+	background: url('../images/arrow_down.gif') no-repeat 245px .7em;
+}
+
+.roles-options li {
+	list-style: none;
+}
+
+.roles-highlight {
+	background-color: #1e90ff;
+	color: #fff;
+}
+
 
 /* Classes for additional tasks
 ---------------------------------------- */
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 7b5c071693..5aeafba476 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -40,7 +40,18 @@
 		<dl class="permissions-simple">
 			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>
 			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
-				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>
+				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
+					<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
+						<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
+						<div class="dropdown hidden">
+							<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
+								{% for role in loops.role_options %}
+									<li data-id="{{ role.ID }}" data-target-id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" data-title="{{ role.TITLE }}">{{ role.ROLE_NAME }}</li>
+								{% endfor %}
+							</ul>
+						</div>
+					</div>
+				</dd>
 			<!-- ELSE -->
 				<dd>{L_NO_ROLE_AVAILABLE}</dd>
 			<!-- ENDIF -->
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 3a89008706..ec170ef6b2 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -10,7 +10,12 @@ phpBB Development Team:
 	- further adjustements
 */
 
-var head_text, tooltip_mode;
+(function($) { // Avoid conflicts with other libraries
+
+"use strict";
+
+var head_text, tooltip_mode, tooltips;
+tooltips = [];
 
 /**
 * Enable tooltip replacements for links
@@ -54,7 +59,7 @@ function enable_tooltips_link(id, headline, sub_id) {
 * Enable tooltip replacements for selects
 */
 function enable_tooltips_select(id, headline, sub_id) {
-	var links, i, hold;
+	var $links, hold;
 
 	head_text = headline;
 
@@ -66,24 +71,25 @@ function enable_tooltips_select(id, headline, sub_id) {
 	hold.id = '_tooltip_container';
 	hold.setAttribute('id', '_tooltip_container');
 	hold.style.position = 'absolute';
-
-	document.getElementsByTagName('body')[0].appendChild(hold);
+	$('body').append(hold);
 
 	if (id === null) {
-		links = document.getElementsByTagName('option');
+		$links = $('.roles-options li');
 	} else {
-		links = document.getElementById(id).getElementsByTagName('option');
+		$links = $('#' + id + ' .roles-options li');
 	}
 
-	for (i = 0; i < links.length; i++) {
+	$links.each(function () {
+		var $this = $(this);
+
 		if (sub_id) {
-			if (links[i].parentNode.id.substr(0, sub_id.length) === sub_id) {
-				prepare(links[i]);
+			if ($this.parent().attr('id').substr(0, sub_id.length) === sub_id) {
+				prepare($this);
 			}
 		} else {
-			prepare(links[i]);
+			prepare($this);
 		}
-	}
+	});
 
 	tooltip_mode = 'select';
 }
@@ -91,16 +97,15 @@ function enable_tooltips_select(id, headline, sub_id) {
 /**
 * Prepare elements to replace
 */
-function prepare(element) {
+function prepare($element) {
 	var tooltip, text, desc, title;
 
-	text = element.getAttribute('title');
+	text = $element.attr('data-title');;
 
 	if (text === null || text.length === 0) {
 		return;
 	}
 
-	element.removeAttribute('title');
 	tooltip = create_element('span', 'tooltip');
 
 	title = create_element('span', 'top');
@@ -113,12 +118,12 @@ function prepare(element) {
 
 	set_opacity(tooltip);
 
-	element.tooltip = tooltip;
-	element.onmouseover = show_tooltip;
-	element.onmouseout = hide_tooltip;
+	tooltips[$element.attr('data-id')] = tooltip;
+	$element.on('mouseover', show_tooltip);
+	$element.on('mouseout', hide_tooltip);
 
 	if (tooltip_mode === 'link') {
-		element.onmousemove = locate;
+		$element.onmousemove = locate;
 	}
 }
 
@@ -126,8 +131,9 @@ function prepare(element) {
 * Show tooltip
 */
 function show_tooltip(e) {
-	document.getElementById('_tooltip_container').appendChild(this.tooltip);
-	locate(this);
+	var $this = $(e.target);
+	$('#_tooltip_container').append(tooltips[$this.attr('data-id')]);
+	locate($this);
 }
 
 /**
@@ -164,52 +170,49 @@ function create_element(tag, c) {
 * Correct positioning of tooltip container
 */
 function locate(e) {
-	var posx = 0;
-	var posy = 0;
-
-	e = e.parentNode;
+	var offset;
 
-	if (e.offsetParent) {
-		for (posx = 0, posy = 0; e.offsetParent; e = e.offsetParent) {
-			posx += e.offsetLeft;
-			posy += e.offsetTop;
-		}
-	} else {
-		posx = e.offsetLeft;
-		posy = e.offsetTop;
-	}
+	e = e.parent();
+	offset = e.offset();
 
 	if (tooltip_mode === 'link') {
-		document.getElementById('_tooltip_container').style.top=(posy+20) + 'px';
-		document.getElementById('_tooltip_container').style.left=(posx-20) + 'px';
+		$('#_tooltip_container').css({
+			top: offset.top + 20,
+			left: offset.left - 20
+		});
 	} else {
-		document.getElementById('_tooltip_container').style.top=(posy+30) + 'px';
-		document.getElementById('_tooltip_container').style.left=(posx-205) + 'px';
+		$('#_tooltip_container').css({
+			top: offset.top + 30,
+			left: offset.left - 205
+		});
 	}
+}
 
-/*
-	if (e == null)
-	{
-		e = window.event;
-	}
+$(function() {
+	var $options;
 
-	if (e.pageX || e.pageY)
-	{
-		posx = e.pageX;
-		posy = e.pageY;
-	}
-	else if (e.clientX || e.clientY)
-	{
-		if (document.documentElement.scrollTop)
-		{
-			posx = e.clientX+document.documentElement.scrollLeft;
-			posy = e.clientY+document.documentElement.scrollTop;
-		}
-		else
-		{
-			posx = e.clientX+document.body.scrollLeft;
-			posy = e.clientY+document.body.scrollTop;
-		}
-	}
-*/
-}
+	// Enable tooltips
+	enable_tooltips_select('set-permissions', $('#set-permissions').attr('data-role-description'), 'role');
+
+	$options = $('.roles-options li');
+
+	// Prepare highlighting of select options and settings update
+	$options.each(function () {
+		$(this).on('mouseover', function (e) {
+			var $this = $(this);
+			$options.removeClass('roles-highlight');
+			$this.addClass('roles-highlight');
+		}).on('click', function (e) {
+			var $this = $(this);
+
+			// Update settings
+			set_role_settings($this.attr('data-id'), $this.attr('data-target-id'));
+			init_colours($this.attr('data-target-id').replace('advanced', ''));
+
+			// Set selected setting
+			$this.closest('.roles-options').children('span').text($this.text());
+		});
+	});
+});
+
+})(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From fc00447520d19ac2e0c6667f1c2cf5e7b41913a2 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 29 May 2015 16:44:12 +0200
Subject: [ticket/6466] Improve behavior of select and properly save role

PHPBB3-6466
---
 phpBB/adm/style/permission_mask.html |  5 +++--
 phpBB/adm/style/tooltip.js           | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 5aeafba476..7569867f8c 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -44,12 +44,13 @@
 					<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
 						<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
 						<div class="dropdown hidden">
-							<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
+							<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" >
 								{% for role in loops.role_options %}
-									<li data-id="{{ role.ID }}" data-target-id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" data-title="{{ role.TITLE }}">{{ role.ROLE_NAME }}</li>
+									<li data-id="{{ role.ID }}" data-target-id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" data-title="{{ role.TITLE }}"{% if role.SELECTED == true %} data-selected="{{ role.SELECTED }}"{% endif %}>{{ role.ROLE_NAME }}</li>
 								{% endfor %}
 							</ul>
 						</div>
+						<input type="hidden" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" />
 					</div>
 				</dd>
 			<!-- ELSE -->
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index ec170ef6b2..60222e51d5 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -198,7 +198,16 @@ $(function() {
 
 	// Prepare highlighting of select options and settings update
 	$options.each(function () {
-		$(this).on('mouseover', function (e) {
+		var $this = $(this);
+		var $roles_options = $this.closest('.roles-options');
+
+		// Correctly show selected option
+		if (typeof $this.attr('data-selected') !== 'undefined') {
+			$this.closest('.roles-options').children('span').text($this.text());
+			$('')
+		}
+
+		$this.on('mouseover', function (e) {
 			var $this = $(this);
 			$options.removeClass('roles-highlight');
 			$this.addClass('roles-highlight');
@@ -210,7 +219,11 @@ $(function() {
 			init_colours($this.attr('data-target-id').replace('advanced', ''));
 
 			// Set selected setting
-			$this.closest('.roles-options').children('span').text($this.text());
+			$roles_options.children('span').text($this.text());
+			$roles_options.children('input[type=hidden]').val($this.attr('data-id'));
+
+			// Trigger hiding of selection options
+			$('body').trigger('click');
 		});
 	});
 });
-- 
cgit v1.2.1


From 4d827b5b994f5efa2ec79583a87facb01897727f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 29 May 2015 16:56:24 +0200
Subject: [ticket/6466] Remove remnants of old code

PHPBB3-6466
---
 phpBB/adm/style/permission_mask.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 7569867f8c..91894ebc77 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -39,7 +39,7 @@
 		</div>
 		<dl class="permissions-simple">
 			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>
-			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
+			{% if role_options %}
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
 					<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
 						<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
@@ -53,9 +53,9 @@
 						<input type="hidden" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" />
 					</div>
 				</dd>
-			<!-- ELSE -->
+			{% else %}
 				<dd>{L_NO_ROLE_AVAILABLE}</dd>
-			<!-- ENDIF -->
+			{% endif %}
 		</dl>
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From faa5ab5899afc1023c7b42bd835e98c42d70eaa4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 29 May 2015 17:06:14 +0200
Subject: [ticket/6466] Improved code in tooltip.js

PHPBB3-6466
---
 phpBB/adm/style/tooltip.js | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 60222e51d5..feaa698c9a 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -12,7 +12,7 @@ phpBB Development Team:
 
 (function($) { // Avoid conflicts with other libraries
 
-"use strict";
+'use strict';
 
 var head_text, tooltip_mode, tooltips;
 tooltips = [];
@@ -56,7 +56,10 @@ function enable_tooltips_link(id, headline, sub_id) {
 }
 
 /**
-* Enable tooltip replacements for selects
+ * Enable tooltip replacements for selects
+ * @param {string} id ID tag of select
+ * @param {string} headline Text that should appear on top of tooltip
+ * @param {string} sub_id Sub ID that should only be using tooltips (optional)
 */
 function enable_tooltips_select(id, headline, sub_id) {
 	var $links, hold;
@@ -76,7 +79,7 @@ function enable_tooltips_select(id, headline, sub_id) {
 	if (id === null) {
 		$links = $('.roles-options li');
 	} else {
-		$links = $('#' + id + ' .roles-options li');
+		$links = $('.roles-options li', '#' + id);
 	}
 
 	$links.each(function () {
@@ -95,7 +98,9 @@ function enable_tooltips_select(id, headline, sub_id) {
 }
 
 /**
-* Prepare elements to replace
+ * Prepare elements to replace
+ *
+ * @param {object} $element Element to prepare for tooltips
 */
 function prepare($element) {
 	var tooltip, text, desc, title;
@@ -128,18 +133,22 @@ function prepare($element) {
 }
 
 /**
-* Show tooltip
+ * Show tooltip
+ *
+ * @param {object} $element Element passed by .on()
 */
-function show_tooltip(e) {
-	var $this = $(e.target);
+function show_tooltip($element) {
+	var $this = $($element.target);
 	$('#_tooltip_container').append(tooltips[$this.attr('data-id')]);
 	locate($this);
 }
 
 /**
-* Hide tooltip
+ * Hide tooltip
+ *
+ * @param {object} $element Element passed by .on()
 */
-function hide_tooltip(e) {
+function hide_tooltip($element) {
 	var d = document.getElementById('_tooltip_container');
 	if (d.childNodes.length > 0) {
 		d.removeChild(d.firstChild);
@@ -167,13 +176,15 @@ function create_element(tag, c) {
 }
 
 /**
-* Correct positioning of tooltip container
+ * Correct positioning of tooltip container
+ *
+ * @param {object} $element Tooltip element that should be positioned
 */
-function locate(e) {
+function locate($element) {
 	var offset;
 
-	e = e.parent();
-	offset = e.offset();
+	$element = $element.parent();
+	offset = $element.offset();
 
 	if (tooltip_mode === 'link') {
 		$('#_tooltip_container').css({
-- 
cgit v1.2.1


From 795776db4b09195e098d5c9dfd1b2fc8b4012be4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 29 May 2015 17:07:47 +0200
Subject: [ticket/6466] Removed link tooltip

It wasn't being used anymore and didn't work anymore.

PHPBB3-6466
---
 phpBB/adm/style/tooltip.js | 61 ++++------------------------------------------
 1 file changed, 5 insertions(+), 56 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index feaa698c9a..5850fa43c2 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -14,47 +14,9 @@ phpBB Development Team:
 
 'use strict';
 
-var head_text, tooltip_mode, tooltips;
+var head_text, tooltips;
 tooltips = [];
 
-/**
-* Enable tooltip replacements for links
-*/
-function enable_tooltips_link(id, headline, sub_id) {
-	var links, i, hold;
-
-	head_text = headline;
-
-	if (!document.getElementById || !document.getElementsByTagName) {
-		return;
-	}
-
-	hold = document.createElement('span');
-	hold.id = '_tooltip_container';
-	hold.setAttribute('id', '_tooltip_container');
-	hold.style.position = 'absolute';
-
-	document.getElementsByTagName('body')[0].appendChild(hold);
-
-	if (id === null) {
-		links = document.getElementsByTagName('a');
-	} else {
-		links = document.getElementById(id).getElementsByTagName('a');
-	}
-
-	for (i = 0; i < links.length; i++) {
-		if (sub_id) {
-			if (links[i].id.substr(0, sub_id.length) === sub_id) {
-				prepare(links[i]);
-			}
-		} else {
-			prepare(links[i]);
-		}
-	}
-
-	tooltip_mode = 'link';
-}
-
 /**
  * Enable tooltip replacements for selects
  * @param {string} id ID tag of select
@@ -93,8 +55,6 @@ function enable_tooltips_select(id, headline, sub_id) {
 			prepare($this);
 		}
 	});
-
-	tooltip_mode = 'select';
 }
 
 /**
@@ -126,10 +86,6 @@ function prepare($element) {
 	tooltips[$element.attr('data-id')] = tooltip;
 	$element.on('mouseover', show_tooltip);
 	$element.on('mouseout', hide_tooltip);
-
-	if (tooltip_mode === 'link') {
-		$element.onmousemove = locate;
-	}
 }
 
 /**
@@ -186,17 +142,10 @@ function locate($element) {
 	$element = $element.parent();
 	offset = $element.offset();
 
-	if (tooltip_mode === 'link') {
-		$('#_tooltip_container').css({
-			top: offset.top + 20,
-			left: offset.left - 20
-		});
-	} else {
-		$('#_tooltip_container').css({
-			top: offset.top + 30,
-			left: offset.left - 205
-		});
-	}
+	$('#_tooltip_container').css({
+		top: offset.top + 30,
+		left: offset.left - 205
+	});
 }
 
 $(function() {
-- 
cgit v1.2.1


From 75e1cbdc7728329f1c5d7375417e891c8d764fb5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 29 May 2015 17:08:17 +0200
Subject: [ticket/6466] Remove double semicolon

PHPBB3-6466
---
 phpBB/adm/style/tooltip.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 5850fa43c2..89736e40f7 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -65,7 +65,7 @@ function enable_tooltips_select(id, headline, sub_id) {
 function prepare($element) {
 	var tooltip, text, desc, title;
 
-	text = $element.attr('data-title');;
+	text = $element.attr('data-title');
 
 	if (text === null || text.length === 0) {
 		return;
-- 
cgit v1.2.1


From abf0be4b4c7c646ad35e5943fda1f0bb4a5e2a84 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 29 May 2015 17:18:03 +0200
Subject: [ticket/6466] Get rid of useless variables and functions in
 tooltip.js

PHPBB3-6466
---
 phpBB/adm/style/admin.css  |  1 +
 phpBB/adm/style/tooltip.js | 41 ++++++++++++++---------------------------
 2 files changed, 15 insertions(+), 27 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 8ae39b7754..145bcfaec1 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1858,6 +1858,7 @@ li.pagination ul {
 	color: #000;
 	text-align: center;
 	border: 1px solid #AAA;
+	opacity: .95;
 }
 
 .tooltip span.top {
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 89736e40f7..8e05cec30b 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -14,8 +14,7 @@ phpBB Development Team:
 
 'use strict';
 
-var head_text, tooltips;
-tooltips = [];
+var tooltips = [];
 
 /**
  * Enable tooltip replacements for selects
@@ -26,12 +25,6 @@ tooltips = [];
 function enable_tooltips_select(id, headline, sub_id) {
 	var $links, hold;
 
-	head_text = headline;
-
-	if (!document.getElementById || !document.getElementsByTagName) {
-		return;
-	}
-
 	hold = document.createElement('span');
 	hold.id = '_tooltip_container';
 	hold.setAttribute('id', '_tooltip_container');
@@ -49,10 +42,10 @@ function enable_tooltips_select(id, headline, sub_id) {
 
 		if (sub_id) {
 			if ($this.parent().attr('id').substr(0, sub_id.length) === sub_id) {
-				prepare($this);
+				prepare($this, headline);
 			}
 		} else {
-			prepare($this);
+			prepare($this, headline);
 		}
 	});
 }
@@ -61,8 +54,9 @@ function enable_tooltips_select(id, headline, sub_id) {
  * Prepare elements to replace
  *
  * @param {object} $element Element to prepare for tooltips
+ * @param {string} head_text Text heading to display
 */
-function prepare($element) {
+function prepare($element, head_text) {
 	var tooltip, text, desc, title;
 
 	text = $element.attr('data-title');
@@ -71,17 +65,15 @@ function prepare($element) {
 		return;
 	}
 
-	tooltip = create_element('span', 'tooltip');
-
 	title = create_element('span', 'top');
 	title.appendChild(document.createTextNode(head_text));
-	tooltip.appendChild(title);
 
 	desc = create_element('span', 'bottom');
 	desc.innerHTML = text;
-	tooltip.appendChild(desc);
 
-	set_opacity(tooltip);
+	tooltip = create_element('span', 'tooltip');
+	tooltip.appendChild(title);
+	tooltip.appendChild(desc);
 
 	tooltips[$element.attr('data-id')] = tooltip;
 	$element.on('mouseover', show_tooltip);
@@ -112,17 +104,12 @@ function hide_tooltip($element) {
 }
 
 /**
-* Set opacity on tooltip element
-*/
-function set_opacity(element) {
-	element.style.filter = 'alpha(opacity:95)';
-	element.style.KHTMLOpacity = '0.95';
-	element.style.MozOpacity = '0.95';
-	element.style.opacity = '0.95';
-}
-
-/**
-* Create new element
+ * Create new element
+ *
+ * @param {string} tag HTML tag
+ * @param {string} c Element's class
+ *
+ * @return {object} Created element
 */
 function create_element(tag, c) {
 	var x = document.createElement(tag);
-- 
cgit v1.2.1


From 120600e055c9220982ff4639f114d6bd60eaa41f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 29 May 2015 17:34:42 +0200
Subject: [ticket/6466] Rename functions and clean up code

PHPBB3-6466
---
 phpBB/adm/style/tooltip.js | 64 +++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 8e05cec30b..2798592c3d 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -22,7 +22,7 @@ var tooltips = [];
  * @param {string} headline Text that should appear on top of tooltip
  * @param {string} sub_id Sub ID that should only be using tooltips (optional)
 */
-function enable_tooltips_select(id, headline, sub_id) {
+phpbb.enableTooltipsSelect = function (id, headline, sub_id) {
 	var $links, hold;
 
 	hold = document.createElement('span');
@@ -42,13 +42,13 @@ function enable_tooltips_select(id, headline, sub_id) {
 
 		if (sub_id) {
 			if ($this.parent().attr('id').substr(0, sub_id.length) === sub_id) {
-				prepare($this, headline);
+				phpbb.prepareTooltips($this, headline);
 			}
 		} else {
-			prepare($this, headline);
+			phpbb.prepareTooltips($this, headline);
 		}
 	});
-}
+};
 
 /**
  * Prepare elements to replace
@@ -56,7 +56,7 @@ function enable_tooltips_select(id, headline, sub_id) {
  * @param {object} $element Element to prepare for tooltips
  * @param {string} head_text Text heading to display
 */
-function prepare($element, head_text) {
+phpbb.prepareTooltips = function ($element, head_text) {
 	var tooltip, text, desc, title;
 
 	text = $element.attr('data-title');
@@ -65,43 +65,43 @@ function prepare($element, head_text) {
 		return;
 	}
 
-	title = create_element('span', 'top');
+	title = phpbb.createElement('span', 'top');
 	title.appendChild(document.createTextNode(head_text));
 
-	desc = create_element('span', 'bottom');
+	desc = phpbb.createElement('span', 'bottom');
 	desc.innerHTML = text;
 
-	tooltip = create_element('span', 'tooltip');
+	tooltip = phpbb.createElement('span', 'tooltip');
 	tooltip.appendChild(title);
 	tooltip.appendChild(desc);
 
 	tooltips[$element.attr('data-id')] = tooltip;
-	$element.on('mouseover', show_tooltip);
-	$element.on('mouseout', hide_tooltip);
-}
+	$element.on('mouseover', phpbb.showTooltip);
+	$element.on('mouseout', phpbb.hideTooltip);
+};
 
 /**
  * Show tooltip
  *
  * @param {object} $element Element passed by .on()
 */
-function show_tooltip($element) {
+phpbb.showTooltip = function ($element) {
 	var $this = $($element.target);
 	$('#_tooltip_container').append(tooltips[$this.attr('data-id')]);
-	locate($this);
-}
+	phpbb.positionTooltip($this);
+};
 
 /**
  * Hide tooltip
  *
  * @param {object} $element Element passed by .on()
 */
-function hide_tooltip($element) {
+phpbb.hideTooltip = function () {
 	var d = document.getElementById('_tooltip_container');
 	if (d.childNodes.length > 0) {
 		d.removeChild(d.firstChild);
 	}
-}
+};
 
 /**
  * Create new element
@@ -111,19 +111,19 @@ function hide_tooltip($element) {
  *
  * @return {object} Created element
 */
-function create_element(tag, c) {
+phpbb.createElement = function (tag, c) {
 	var x = document.createElement(tag);
 	x.className = c;
 	x.style.display = 'block';
 	return x;
-}
+};
 
 /**
  * Correct positioning of tooltip container
  *
  * @param {object} $element Tooltip element that should be positioned
 */
-function locate($element) {
+phpbb.positionTooltip = function ($element) {
 	var offset;
 
 	$element = $element.parent();
@@ -133,25 +133,22 @@ function locate($element) {
 		top: offset.top + 30,
 		left: offset.left - 205
 	});
-}
+};
 
-$(function() {
-	var $options;
-
-	// Enable tooltips
-	enable_tooltips_select('set-permissions', $('#set-permissions').attr('data-role-description'), 'role');
-
-	$options = $('.roles-options li');
+/**
+ * Prepare roles drop down select
+ */
+phpbb.prepareRolesDropdown = function () {
+	var $options = $('.roles-options li');
 
 	// Prepare highlighting of select options and settings update
-	$options.each(function () {
+	$options.each(function (element) {
 		var $this = $(this);
 		var $roles_options = $this.closest('.roles-options');
 
 		// Correctly show selected option
 		if (typeof $this.attr('data-selected') !== 'undefined') {
 			$this.closest('.roles-options').children('span').text($this.text());
-			$('')
 		}
 
 		$this.on('mouseover', function (e) {
@@ -173,6 +170,15 @@ $(function() {
 			$('body').trigger('click');
 		});
 	});
+};
+
+// Run onload functions for RolesDropdown and tooltips
+$(function() {
+	// Enable tooltips
+	phpbb.enableTooltipsSelect('set-permissions', $('#set-permissions').attr('data-role-description'), 'role');
+
+	// Prepare dropdown
+	phpbb.prepareRolesDropdown();
 });
 
 })(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From c8bb0fd24179f9c2d639e53c896dd28f7d5562f8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 29 May 2015 17:35:53 +0200
Subject: [ticket/6466] Improve code in tooltip.js

PHPBB3-6466
---
 phpBB/adm/style/tooltip.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 2798592c3d..68750b8663 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -93,8 +93,6 @@ phpbb.showTooltip = function ($element) {
 
 /**
  * Hide tooltip
- *
- * @param {object} $element Element passed by .on()
 */
 phpbb.hideTooltip = function () {
 	var d = document.getElementById('_tooltip_container');
@@ -142,7 +140,7 @@ phpbb.prepareRolesDropdown = function () {
 	var $options = $('.roles-options li');
 
 	// Prepare highlighting of select options and settings update
-	$options.each(function (element) {
+	$options.each(function () {
 		var $this = $(this);
 		var $roles_options = $this.closest('.roles-options');
 
-- 
cgit v1.2.1


From 0d5f074f54caeeffcc9deea840fb1dc59911a596 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 29 May 2015 17:39:03 +0200
Subject: [ticket/6466] Rename variables and remove unused ones

PHPBB3-6466
---
 phpBB/adm/style/tooltip.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 68750b8663..f78e1da81f 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -20,9 +20,9 @@ var tooltips = [];
  * Enable tooltip replacements for selects
  * @param {string} id ID tag of select
  * @param {string} headline Text that should appear on top of tooltip
- * @param {string} sub_id Sub ID that should only be using tooltips (optional)
+ * @param {string} subId Sub ID that should only be using tooltips (optional)
 */
-phpbb.enableTooltipsSelect = function (id, headline, sub_id) {
+phpbb.enableTooltipsSelect = function (id, headline, subId) {
 	var $links, hold;
 
 	hold = document.createElement('span');
@@ -31,7 +31,7 @@ phpbb.enableTooltipsSelect = function (id, headline, sub_id) {
 	hold.style.position = 'absolute';
 	$('body').append(hold);
 
-	if (id === null) {
+	if (!id) {
 		$links = $('.roles-options li');
 	} else {
 		$links = $('.roles-options li', '#' + id);
@@ -40,8 +40,8 @@ phpbb.enableTooltipsSelect = function (id, headline, sub_id) {
 	$links.each(function () {
 		var $this = $(this);
 
-		if (sub_id) {
-			if ($this.parent().attr('id').substr(0, sub_id.length) === sub_id) {
+		if (subId) {
+			if ($this.parent().attr('id').substr(0, subId.length) === subId) {
 				phpbb.prepareTooltips($this, headline);
 			}
 		} else {
@@ -54,9 +54,9 @@ phpbb.enableTooltipsSelect = function (id, headline, sub_id) {
  * Prepare elements to replace
  *
  * @param {object} $element Element to prepare for tooltips
- * @param {string} head_text Text heading to display
+ * @param {string} headText Text heading to display
 */
-phpbb.prepareTooltips = function ($element, head_text) {
+phpbb.prepareTooltips = function ($element, headText) {
 	var tooltip, text, desc, title;
 
 	text = $element.attr('data-title');
@@ -66,7 +66,7 @@ phpbb.prepareTooltips = function ($element, head_text) {
 	}
 
 	title = phpbb.createElement('span', 'top');
-	title.appendChild(document.createTextNode(head_text));
+	title.appendChild(document.createTextNode(headText));
 
 	desc = phpbb.createElement('span', 'bottom');
 	desc.innerHTML = text;
@@ -142,18 +142,18 @@ phpbb.prepareRolesDropdown = function () {
 	// Prepare highlighting of select options and settings update
 	$options.each(function () {
 		var $this = $(this);
-		var $roles_options = $this.closest('.roles-options');
+		var $rolesOptions = $this.closest('.roles-options');
 
 		// Correctly show selected option
 		if (typeof $this.attr('data-selected') !== 'undefined') {
 			$this.closest('.roles-options').children('span').text($this.text());
 		}
 
-		$this.on('mouseover', function (e) {
+		$this.on('mouseover', function () {
 			var $this = $(this);
 			$options.removeClass('roles-highlight');
 			$this.addClass('roles-highlight');
-		}).on('click', function (e) {
+		}).on('click', function () {
 			var $this = $(this);
 
 			// Update settings
@@ -161,8 +161,8 @@ phpbb.prepareRolesDropdown = function () {
 			init_colours($this.attr('data-target-id').replace('advanced', ''));
 
 			// Set selected setting
-			$roles_options.children('span').text($this.text());
-			$roles_options.children('input[type=hidden]').val($this.attr('data-id'));
+			$rolesOptions.children('span').text($this.text());
+			$rolesOptions.children('input[type=hidden]').val($this.attr('data-id'));
 
 			// Trigger hiding of selection options
 			$('body').trigger('click');
-- 
cgit v1.2.1


From 89cb8a3217edf0f374122e678e48e65a5c86c998 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 29 May 2015 18:06:30 +0200
Subject: [ticket/6466] Minor documentation changes

PHPBB3-6466
---
 phpBB/adm/style/tooltip.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index f78e1da81f..a52fa36853 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -20,7 +20,7 @@ var tooltips = [];
  * Enable tooltip replacements for selects
  * @param {string} id ID tag of select
  * @param {string} headline Text that should appear on top of tooltip
- * @param {string} subId Sub ID that should only be using tooltips (optional)
+ * @param {string} [subId] Sub ID that should only be using tooltips (optional)
 */
 phpbb.enableTooltipsSelect = function (id, headline, subId) {
 	var $links, hold;
@@ -53,7 +53,7 @@ phpbb.enableTooltipsSelect = function (id, headline, subId) {
 /**
  * Prepare elements to replace
  *
- * @param {object} $element Element to prepare for tooltips
+ * @param {jQuery} $element Element to prepare for tooltips
  * @param {string} headText Text heading to display
 */
 phpbb.prepareTooltips = function ($element, headText) {
@@ -119,7 +119,7 @@ phpbb.createElement = function (tag, c) {
 /**
  * Correct positioning of tooltip container
  *
- * @param {object} $element Tooltip element that should be positioned
+ * @param {jQuery} $element Tooltip element that should be positioned
 */
 phpbb.positionTooltip = function ($element) {
 	var offset;
-- 
cgit v1.2.1


From 2e46bef2ecc42a225e53d27c9b7614107b878186 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 30 May 2015 10:54:32 +0200
Subject: [ticket/6466] Remove createElement function from tooltip.js

PHPBB3-6466
---
 phpBB/adm/style/tooltip.js | 61 ++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index a52fa36853..641d82c80a 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -25,10 +25,13 @@ var tooltips = [];
 phpbb.enableTooltipsSelect = function (id, headline, subId) {
 	var $links, hold;
 
-	hold = document.createElement('span');
-	hold.id = '_tooltip_container';
-	hold.setAttribute('id', '_tooltip_container');
-	hold.style.position = 'absolute';
+	hold = $('<span />', {
+		id:		'_tooltip_container',
+		css: {
+			position: 'absolute'
+		}
+	});
+
 	$('body').append(hold);
 
 	if (!id) {
@@ -57,7 +60,7 @@ phpbb.enableTooltipsSelect = function (id, headline, subId) {
  * @param {string} headText Text heading to display
 */
 phpbb.prepareTooltips = function ($element, headText) {
-	var tooltip, text, desc, title;
+	var $tooltip, text, $desc, $title;
 
 	text = $element.attr('data-title');
 
@@ -65,17 +68,32 @@ phpbb.prepareTooltips = function ($element, headText) {
 		return;
 	}
 
-	title = phpbb.createElement('span', 'top');
-	title.appendChild(document.createTextNode(headText));
-
-	desc = phpbb.createElement('span', 'bottom');
-	desc.innerHTML = text;
+	$title = $('<span />', {
+		class: 'top',
+		css: {
+			display:	'block'
+		}
+	})
+		.append(document.createTextNode(headText));
+
+	$desc = $('<span />', {
+		class: 'bottom',
+		html: text,
+		css: {
+			display: 'block'
+		}
+	});
 
-	tooltip = phpbb.createElement('span', 'tooltip');
-	tooltip.appendChild(title);
-	tooltip.appendChild(desc);
+	$tooltip = $('<span />', {
+		class: 'tooltip',
+		css: {
+			display: 'block'
+		}
+	})
+		.append($title)
+		.append($desc);
 
-	tooltips[$element.attr('data-id')] = tooltip;
+	tooltips[$element.attr('data-id')] = $tooltip;
 	$element.on('mouseover', phpbb.showTooltip);
 	$element.on('mouseout', phpbb.hideTooltip);
 };
@@ -101,21 +119,6 @@ phpbb.hideTooltip = function () {
 	}
 };
 
-/**
- * Create new element
- *
- * @param {string} tag HTML tag
- * @param {string} c Element's class
- *
- * @return {object} Created element
-*/
-phpbb.createElement = function (tag, c) {
-	var x = document.createElement(tag);
-	x.className = c;
-	x.style.display = 'block';
-	return x;
-};
-
 /**
  * Correct positioning of tooltip container
  *
-- 
cgit v1.2.1


From 44b8dafb233cb07403a303b9c3a5eb72539365d2 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 30 May 2015 11:20:04 +0200
Subject: [ticket/6466] Support form reset and do not loose role upon resubmit

PHPBB3-6466
---
 phpBB/adm/style/permission_mask.html |  2 +-
 phpBB/adm/style/tooltip.js           | 28 ++++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 91894ebc77..347da3181e 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -50,7 +50,7 @@
 								{% endfor %}
 							</ul>
 						</div>
-						<input type="hidden" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" />
+						<input type="hidden" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if S_ROLE_ID %}value="{{ S_ROLE_ID }}"{% endif %} />
 					</div>
 				</dd>
 			{% else %}
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 641d82c80a..68964034f0 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -141,15 +141,20 @@ phpbb.positionTooltip = function ($element) {
  */
 phpbb.prepareRolesDropdown = function () {
 	var $options = $('.roles-options li');
+	var $rolesOptions = $options.closest('.roles-options');
+	var $span = $rolesOptions.children('span');
 
 	// Prepare highlighting of select options and settings update
 	$options.each(function () {
 		var $this = $(this);
-		var $rolesOptions = $this.closest('.roles-options');
 
 		// Correctly show selected option
 		if (typeof $this.attr('data-selected') !== 'undefined') {
-			$this.closest('.roles-options').children('span').text($this.text());
+			$rolesOptions.closest('.roles-options')
+				.children('span')
+				.text($this.text())
+				.attr('data-default', $this.text())
+				.attr('data-default-val', $this.attr('data-id'));
 		}
 
 		$this.on('mouseover', function () {
@@ -164,13 +169,28 @@ phpbb.prepareRolesDropdown = function () {
 			init_colours($this.attr('data-target-id').replace('advanced', ''));
 
 			// Set selected setting
-			$rolesOptions.children('span').text($this.text());
-			$rolesOptions.children('input[type=hidden]').val($this.attr('data-id'));
+			$rolesOptions.children('span')
+				.text($this.text());
+			$rolesOptions.children('input[type=hidden]')
+				.val($this.attr('data-id'));
 
 			// Trigger hiding of selection options
 			$('body').trigger('click');
 		});
 	});
+
+	// Save default text of drop down if there is no default set yet
+	if (typeof $span.attr('data-default') === 'undefined') {
+		$span.attr('data-default', $span.text());
+	}
+
+	// Prepare resetting drop down on form reset
+	$options.closest('form').on('reset', function () {
+		$span.text($span.attr('data-default'));
+		$rolesOptions.children('input[type=hidden]')
+			.val($span.attr('data-id'));
+	});
+
 };
 
 // Run onload functions for RolesDropdown and tooltips
-- 
cgit v1.2.1


From 11623dd6718ec12504286db3dfcd042ccb4e3688 Mon Sep 17 00:00:00 2001
From: MateBartus <mate.bartus@gmail.com>
Date: Tue, 28 Apr 2015 22:33:04 +0200
Subject: [ticket/13740] Front facing files and controllers

[ci skip]

PHPBB3-13740
---
 phpBB/adm/style/admin.css              |  6 +++-
 phpBB/adm/style/installer_form.html    | 52 ++++++++++++++++++++++++++++++++++
 phpBB/adm/style/installer_install.html | 13 +++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/adm/style/installer_form.html
 create mode 100644 phpBB/adm/style/installer_install.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 145bcfaec1..dd5878a976 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1776,7 +1776,7 @@ li.pagination ul {
 
 /* Action Highlighting
 ---------------------------------------- */
-.successbox, .errorbox {
+.successbox, .errorbox, .warningbox {
 	padding: 8px;
 	margin: 10px 0;
 	color: #FFFFFF;
@@ -1800,6 +1800,10 @@ li.pagination ul {
 	background-color: #BC2A4D;
 }
 
+.warningbox {
+    background-color: #fca600;
+}
+
 .successbox h3, .errorbox h3 {
 	color: #FFFFFF;
 	margin: 0 0 0.5em;
diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html
new file mode 100644
index 0000000000..dbcf3c19f8
--- /dev/null
+++ b/phpBB/adm/style/installer_form.html
@@ -0,0 +1,52 @@
+<form id="<!-- IF FORM_ID -->{FORM_ID}<!-- ELSE -->install_install<!-- ENDIF -->" method="POST" action="{U_ACTION}">
+<!-- IF .options -->
+<fieldset>
+
+    <!-- BEGIN options -->
+        <!-- IF options.S_LEGEND -->
+            <!-- IF not options.S_FIRST_ROW -->
+            </fieldset>
+
+            <fieldset>
+            <!-- ENDIF -->
+        <legend>{options.LEGEND}</legend>
+        <!-- ELSE -->
+
+            <!-- IF options.TYPE <> 'submit' -->
+        <dl>
+            <dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+            <dd>
+                <!-- IF options.TYPE == 'text' -->
+                <input type="text" name="{options.KEY}" value="{options.DEFAULT}" />
+                <!-- ENDIF -->
+                <!-- IF options.TYPE == 'email' -->
+                <input type="email" name="{options.KEY}" value="{options.DEFAULT}" />
+                <!-- ENDIF -->
+                <!-- IF options.TYPE == 'password' -->
+                <input type="password" name="{options.KEY}" />
+                <!-- ENDIF -->
+                <!-- IF options.TYPE == 'select' -->
+                <select name="{options.KEY}">
+                    <!-- BEGIN options.OPTIONS -->
+                    <option value="{options.OPTIONS.value}"<!-- IF options.OPTIONS.selected --> selected<!-- ENDIF -->>{options.OPTIONS.label}</option>
+                    <!-- END options.OPTIONS -->
+                </select>
+                <!-- ENDIF -->
+                <!-- IF options.TYPE == 'radio' -->
+                    <!-- BEGIN options.OPTIONS -->
+                <input type="radio" name="{options.KEY}" value="{options.OPTIONS.value}" <!-- IF options.OPTIONS.selected -->checked<!-- ENDIF --> /> {options.OPTIONS.label}
+                    <!-- END options.OPTIONS -->
+                <!-- ENDIF -->
+            </dd>
+        </dl>
+            <!-- ELSE -->
+</fieldset>
+                <fieldset class="submit-buttons">
+                    <legend>{L_SUBMIT}</legend>
+                    <input class="button1" type="submit" name="{options.KEY}" value="{options.TITLE}" />
+                </fieldset>
+            <!-- ENDIF -->
+        <!-- ENDIF-->
+    <!-- END options -->
+<!-- ENDIF -->
+</form>
diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html
new file mode 100644
index 0000000000..7d62075c62
--- /dev/null
+++ b/phpBB/adm/style/installer_install.html
@@ -0,0 +1,13 @@
+<!-- INCLUDE install_header.html -->
+<h1>{L_INSTALL}</h1>
+{CONTENT}
+<!-- IF SHOW_INSTALL_START_FORM -->
+<form id="install_install" method="post" action="{U_ACTION}">
+    <fieldset class="submit-buttons">
+        <legend>{L_SUBMIT}</legend>
+        <input name="install" type="submit" value="{L_INSTALL}" />
+    </fieldset>
+</form>
+<!-- ENDIF -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
+<!-- INCLUDE install_footer.html -->
-- 
cgit v1.2.1


From b7ef709549597f2fa4f9c8525bfd602f81644530 Mon Sep 17 00:00:00 2001
From: MateBartus <mate.bartus@gmail.com>
Date: Wed, 3 Jun 2015 01:31:48 +0200
Subject: [ticket/13740] Implement progress bar for AJAX UI

PHPBB3-13740
---
 phpBB/adm/style/admin.css | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index dd5878a976..ca5daf5bc5 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2521,3 +2521,30 @@ fieldset.permissions .padding {
 	clear: both;
 	display: block;
 }
+
+#progress-bar {
+    position: relative;
+    width: 90%;
+    height: 25px;
+    margin: 20px auto;
+    border: 1px solid #cecece;
+}
+
+#progress-bar #progress-bar-text {
+    position: absolute;
+    top: 0;
+    width: 100%;
+    text-align: center;
+    line-height: 25px;
+    font-weight: bold;
+}
+
+#progress-bar #progress-bar-filler {
+    display: block;
+    position: relative;
+    top: 0;
+    left: 0;
+    background-color: #3c84ad;
+    width: 0;
+    height: 25px;
+}
-- 
cgit v1.2.1


From db4cfa7df62d5911bc5a0edcdc59236c39aede08 Mon Sep 17 00:00:00 2001
From: CHItA <mate.bartus@gmail.com>
Date: Thu, 11 Jun 2015 19:32:11 +0200
Subject: [ticket/13740] Add navigation bar support for the installer

Also added various UI elements and texts.
[ci skip]

PHPBB3-13740
---
 phpBB/adm/style/install_header.html    | 2 +-
 phpBB/adm/style/installer_form.html    | 4 ++++
 phpBB/adm/style/installer_install.html | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 6f7f129d39..b162fa3e89 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -43,7 +43,7 @@
 							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
 						<!-- END l_block1 -->
 						<!-- BEGIN l_block2 -->
-							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
+							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF --> id="installer-stage-{l_block2.STAGE_NAME}">{l_block2.L_TITLE}</span></li>
 						<!-- END l_block2 -->
 						</ul>
 						</div>
diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html
index dbcf3c19f8..3cb4185bc6 100644
--- a/phpBB/adm/style/installer_form.html
+++ b/phpBB/adm/style/installer_form.html
@@ -1,6 +1,8 @@
 <form id="<!-- IF FORM_ID -->{FORM_ID}<!-- ELSE -->install_install<!-- ENDIF -->" method="POST" action="{U_ACTION}">
 <!-- IF .options -->
+<!-- IF S_FORM_ELEM_COUNT > 1 -->
 <fieldset>
+<!-- ENDIF -->
 
     <!-- BEGIN options -->
         <!-- IF options.S_LEGEND -->
@@ -40,7 +42,9 @@
             </dd>
         </dl>
             <!-- ELSE -->
+<!-- IF S_FORM_ELEM_COUNT > 1 -->
 </fieldset>
+<!-- ENDIF -->
                 <fieldset class="submit-buttons">
                     <legend>{L_SUBMIT}</legend>
                     <input class="button1" type="submit" name="{options.KEY}" value="{options.TITLE}" />
diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html
index 7d62075c62..7700c79036 100644
--- a/phpBB/adm/style/installer_install.html
+++ b/phpBB/adm/style/installer_install.html
@@ -1,11 +1,11 @@
 <!-- INCLUDE install_header.html -->
-<h1>{L_INSTALL}</h1>
-{CONTENT}
+<h1>{TITLE}</h1>
+<p>{CONTENT}</p>
 <!-- IF SHOW_INSTALL_START_FORM -->
 <form id="install_install" method="post" action="{U_ACTION}">
     <fieldset class="submit-buttons">
         <legend>{L_SUBMIT}</legend>
-        <input name="install" type="submit" value="{L_INSTALL}" />
+        <input class="button1" name="install" type="submit" value="{L_INSTALL}" />
     </fieldset>
 </form>
 <!-- ENDIF -->
-- 
cgit v1.2.1


From 97d08d6f56cf448fd4def8a4d29c570da91faa89 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Wed, 22 Jul 2015 03:16:16 +0200
Subject: [ticket/13740] Allow language change in the installer

PHPBB3-13740
---
 phpBB/adm/style/install_header.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index b162fa3e89..9d0f9a56de 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -15,10 +15,14 @@
 		<h1>{L_INSTALL_PANEL}</h1>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 		<!-- IF S_LANG_SELECT -->
-		<form method="post" action="#">
+		<form method="post" action="#" id="language_selector">
 			<fieldset class="nobg">
 				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
-				{S_LANG_SELECT}
+				<select  id="language" name="language">
+                    <!-- BEGIN language_select_item -->
+                    <option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option>
+                    <!-- END language_select_item -->
+                </select>
 				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
 			</fieldset>
 		</form>
-- 
cgit v1.2.1


From 3356130ce2adf82248cf64fcaa81a47713ce7987 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Wed, 22 Jul 2015 12:43:17 +0200
Subject: [ticket/13740] Separate new installer style templates

PHPBB3-13740
---
 phpBB/adm/style/install_header.html    | 10 ++----
 phpBB/adm/style/installer_footer.html  | 21 +++++++++++++
 phpBB/adm/style/installer_header.html  | 57 ++++++++++++++++++++++++++++++++++
 phpBB/adm/style/installer_install.html |  4 +--
 phpBB/adm/style/installer_main.html    |  6 ++++
 5 files changed, 89 insertions(+), 9 deletions(-)
 create mode 100644 phpBB/adm/style/installer_footer.html
 create mode 100644 phpBB/adm/style/installer_header.html
 create mode 100644 phpBB/adm/style/installer_main.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 9d0f9a56de..8debfc69c0 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -15,14 +15,10 @@
 		<h1>{L_INSTALL_PANEL}</h1>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 		<!-- IF S_LANG_SELECT -->
-		<form method="post" action="#" id="language_selector">
+		<form method="post" action="#">
 			<fieldset class="nobg">
 				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
-				<select  id="language" name="language">
-                    <!-- BEGIN language_select_item -->
-                    <option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option>
-                    <!-- END language_select_item -->
-                </select>
+                {S_LANG_SELECT}
 				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
 			</fieldset>
 		</form>
@@ -47,7 +43,7 @@
 							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
 						<!-- END l_block1 -->
 						<!-- BEGIN l_block2 -->
-							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF --> id="installer-stage-{l_block2.STAGE_NAME}">{l_block2.L_TITLE}</span></li>
+                            <li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
 						<!-- END l_block2 -->
 						</ul>
 						</div>
diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
new file mode 100644
index 0000000000..2c70d4d5d3
--- /dev/null
+++ b/phpBB/adm/style/installer_footer.html
@@ -0,0 +1,21 @@
+                    </div>
+                </div><!-- /#main -->
+            </div>
+        </div><!-- /#acp -->
+    </div>
+
+    <div id="page-footer">
+        <div class="copyright">
+            Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<!-- INCLUDEJS admin.js -->
+{$SCRIPTS}
+
+</body>
+</html>
diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html
new file mode 100644
index 0000000000..ada6553aec
--- /dev/null
+++ b/phpBB/adm/style/installer_header.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <!-- IF META -->{META}<!-- ENDIF -->
+    <title>{PAGE_TITLE}</title>
+
+    <link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
+</head>
+
+<body class="{S_CONTENT_DIRECTION} nojs">
+<div id="wrap">
+    <div id="page-header">
+        <h1>{L_INSTALL_PANEL}</h1>
+        <p id="skip"><a href="#acp">{L_SKIP}</a></p>
+        <!-- IF S_LANG_SELECT -->
+        <form method="post" action="#" id="language_selector">
+            <fieldset class="nobg">
+                <label for="language">{L_SELECT_LANG}{L_COLON}</label>
+                <select  id="language" name="language">
+                    <!-- BEGIN language_select_item -->
+                    <option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option>
+                    <!-- END language_select_item -->
+                </select>
+                <input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
+            </fieldset>
+        </form>
+        <!-- ENDIF -->
+    </div>
+
+    <div id="page-body">
+        <div id="tabs">
+            <ul>
+                <!-- BEGIN t_block1 -->
+                <li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>
+                <!-- END t_block1 -->
+            </ul>
+        </div>
+
+        <div id="acp">
+            <div id="content">
+                <div id="menu">
+                    <div class="menu-block no-header">
+                        <ul>
+                            <!-- BEGIN l_block1 -->
+                            <li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
+                            <!-- END l_block1 -->
+                            <!-- BEGIN l_block2 -->
+                            <li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF --> id="installer-stage-{l_block2.STAGE_NAME}">{l_block2.L_TITLE}</span></li>
+                            <!-- END l_block2 -->
+                        </ul>
+                    </div>
+                </div>
+
+                <div id="main" class="install-body">
+                    <div class="main">
diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html
index 7700c79036..175c6eac67 100644
--- a/phpBB/adm/style/installer_install.html
+++ b/phpBB/adm/style/installer_install.html
@@ -1,4 +1,4 @@
-<!-- INCLUDE install_header.html -->
+<!-- INCLUDE installer_header.html -->
 <h1>{TITLE}</h1>
 <p>{CONTENT}</p>
 <!-- IF SHOW_INSTALL_START_FORM -->
@@ -10,4 +10,4 @@
 </form>
 <!-- ENDIF -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
-<!-- INCLUDE install_footer.html -->
+<!-- INCLUDE installer_footer.html -->
diff --git a/phpBB/adm/style/installer_main.html b/phpBB/adm/style/installer_main.html
new file mode 100644
index 0000000000..ed65da8a68
--- /dev/null
+++ b/phpBB/adm/style/installer_main.html
@@ -0,0 +1,6 @@
+<!-- INCLUDE installer_header.html -->
+
+    <h1>{TITLE}</h1>
+    <p>{BODY}</p>
+
+<!-- INCLUDE installer_footer.html -->
-- 
cgit v1.2.1


From b4552a8ba303881d53995d334cc22aa175d5c46f Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Fri, 24 Jul 2015 08:33:02 +0200
Subject: [ticket/13740] Replace more spaces with tabs

PHPBB3-13740
---
 phpBB/adm/style/admin.css              | 38 +++++++-------
 phpBB/adm/style/install_header.html    |  4 +-
 phpBB/adm/style/installer_footer.html  | 20 ++++----
 phpBB/adm/style/installer_form.html    | 86 +++++++++++++++----------------
 phpBB/adm/style/installer_header.html  | 92 +++++++++++++++++-----------------
 phpBB/adm/style/installer_install.html |  8 +--
 phpBB/adm/style/installer_main.html    |  4 +-
 7 files changed, 126 insertions(+), 126 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index ca5daf5bc5..992af0997f 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1801,7 +1801,7 @@ li.pagination ul {
 }
 
 .warningbox {
-    background-color: #fca600;
+	background-color: #fca600;
 }
 
 .successbox h3, .errorbox h3 {
@@ -2523,28 +2523,28 @@ fieldset.permissions .padding {
 }
 
 #progress-bar {
-    position: relative;
-    width: 90%;
-    height: 25px;
-    margin: 20px auto;
-    border: 1px solid #cecece;
+	position: relative;
+	width: 90%;
+	height: 25px;
+	margin: 20px auto;
+	border: 1px solid #cecece;
 }
 
 #progress-bar #progress-bar-text {
-    position: absolute;
-    top: 0;
-    width: 100%;
-    text-align: center;
-    line-height: 25px;
-    font-weight: bold;
+	position: absolute;
+	top: 0;
+	width: 100%;
+	text-align: center;
+	line-height: 25px;
+	font-weight: bold;
 }
 
 #progress-bar #progress-bar-filler {
-    display: block;
-    position: relative;
-    top: 0;
-    left: 0;
-    background-color: #3c84ad;
-    width: 0;
-    height: 25px;
+	display: block;
+	position: relative;
+	top: 0;
+	left: 0;
+	background-color: #3c84ad;
+	width: 0;
+	height: 25px;
 }
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 8debfc69c0..6f7f129d39 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -18,7 +18,7 @@
 		<form method="post" action="#">
 			<fieldset class="nobg">
 				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
-                {S_LANG_SELECT}
+				{S_LANG_SELECT}
 				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
 			</fieldset>
 		</form>
@@ -43,7 +43,7 @@
 							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
 						<!-- END l_block1 -->
 						<!-- BEGIN l_block2 -->
-                            <li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
+							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
 						<!-- END l_block2 -->
 						</ul>
 						</div>
diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
index 2c70d4d5d3..617d3dc254 100644
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -1,14 +1,14 @@
-                    </div>
-                </div><!-- /#main -->
-            </div>
-        </div><!-- /#acp -->
-    </div>
+					</div>
+				</div><!-- /#main -->
+			</div>
+		</div><!-- /#acp -->
+	</div>
 
-    <div id="page-footer">
-        <div class="copyright">
-            Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
-        </div>
-    </div>
+	<div id="page-footer">
+		<div class="copyright">
+			Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
+		</div>
+	</div>
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html
index 3cb4185bc6..669f7aa834 100644
--- a/phpBB/adm/style/installer_form.html
+++ b/phpBB/adm/style/installer_form.html
@@ -4,53 +4,53 @@
 <fieldset>
 <!-- ENDIF -->
 
-    <!-- BEGIN options -->
-        <!-- IF options.S_LEGEND -->
-            <!-- IF not options.S_FIRST_ROW -->
-            </fieldset>
+	<!-- BEGIN options -->
+		<!-- IF options.S_LEGEND -->
+			<!-- IF not options.S_FIRST_ROW -->
+			</fieldset>
 
-            <fieldset>
-            <!-- ENDIF -->
-        <legend>{options.LEGEND}</legend>
-        <!-- ELSE -->
+			<fieldset>
+			<!-- ENDIF -->
+		<legend>{options.LEGEND}</legend>
+		<!-- ELSE -->
 
-            <!-- IF options.TYPE <> 'submit' -->
-        <dl>
-            <dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-            <dd>
-                <!-- IF options.TYPE == 'text' -->
-                <input type="text" name="{options.KEY}" value="{options.DEFAULT}" />
-                <!-- ENDIF -->
-                <!-- IF options.TYPE == 'email' -->
-                <input type="email" name="{options.KEY}" value="{options.DEFAULT}" />
-                <!-- ENDIF -->
-                <!-- IF options.TYPE == 'password' -->
-                <input type="password" name="{options.KEY}" />
-                <!-- ENDIF -->
-                <!-- IF options.TYPE == 'select' -->
-                <select name="{options.KEY}">
-                    <!-- BEGIN options.OPTIONS -->
-                    <option value="{options.OPTIONS.value}"<!-- IF options.OPTIONS.selected --> selected<!-- ENDIF -->>{options.OPTIONS.label}</option>
-                    <!-- END options.OPTIONS -->
-                </select>
-                <!-- ENDIF -->
-                <!-- IF options.TYPE == 'radio' -->
-                    <!-- BEGIN options.OPTIONS -->
-                <input type="radio" name="{options.KEY}" value="{options.OPTIONS.value}" <!-- IF options.OPTIONS.selected -->checked<!-- ENDIF --> /> {options.OPTIONS.label}
-                    <!-- END options.OPTIONS -->
-                <!-- ENDIF -->
-            </dd>
-        </dl>
-            <!-- ELSE -->
+			<!-- IF options.TYPE <> 'submit' -->
+		<dl>
+			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dd>
+				<!-- IF options.TYPE == 'text' -->
+				<input type="text" name="{options.KEY}" value="{options.DEFAULT}" />
+				<!-- ENDIF -->
+				<!-- IF options.TYPE == 'email' -->
+				<input type="email" name="{options.KEY}" value="{options.DEFAULT}" />
+				<!-- ENDIF -->
+				<!-- IF options.TYPE == 'password' -->
+				<input type="password" name="{options.KEY}" />
+				<!-- ENDIF -->
+				<!-- IF options.TYPE == 'select' -->
+				<select name="{options.KEY}">
+					<!-- BEGIN options.OPTIONS -->
+					<option value="{options.OPTIONS.value}"<!-- IF options.OPTIONS.selected --> selected<!-- ENDIF -->>{options.OPTIONS.label}</option>
+					<!-- END options.OPTIONS -->
+				</select>
+				<!-- ENDIF -->
+				<!-- IF options.TYPE == 'radio' -->
+					<!-- BEGIN options.OPTIONS -->
+				<input type="radio" name="{options.KEY}" value="{options.OPTIONS.value}" <!-- IF options.OPTIONS.selected -->checked<!-- ENDIF --> /> {options.OPTIONS.label}
+					<!-- END options.OPTIONS -->
+				<!-- ENDIF -->
+			</dd>
+		</dl>
+			<!-- ELSE -->
 <!-- IF S_FORM_ELEM_COUNT > 1 -->
 </fieldset>
 <!-- ENDIF -->
-                <fieldset class="submit-buttons">
-                    <legend>{L_SUBMIT}</legend>
-                    <input class="button1" type="submit" name="{options.KEY}" value="{options.TITLE}" />
-                </fieldset>
-            <!-- ENDIF -->
-        <!-- ENDIF-->
-    <!-- END options -->
+				<fieldset class="submit-buttons">
+					<legend>{L_SUBMIT}</legend>
+					<input class="button1" type="submit" name="{options.KEY}" value="{options.TITLE}" />
+				</fieldset>
+			<!-- ENDIF -->
+		<!-- ENDIF-->
+	<!-- END options -->
 <!-- ENDIF -->
 </form>
diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html
index ada6553aec..775caa7c67 100644
--- a/phpBB/adm/style/installer_header.html
+++ b/phpBB/adm/style/installer_header.html
@@ -1,57 +1,57 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <!-- IF META -->{META}<!-- ENDIF -->
-    <title>{PAGE_TITLE}</title>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1" />
+	<!-- IF META -->{META}<!-- ENDIF -->
+	<title>{PAGE_TITLE}</title>
 
-    <link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
 </head>
 
 <body class="{S_CONTENT_DIRECTION} nojs">
 <div id="wrap">
-    <div id="page-header">
-        <h1>{L_INSTALL_PANEL}</h1>
-        <p id="skip"><a href="#acp">{L_SKIP}</a></p>
-        <!-- IF S_LANG_SELECT -->
-        <form method="post" action="#" id="language_selector">
-            <fieldset class="nobg">
-                <label for="language">{L_SELECT_LANG}{L_COLON}</label>
-                <select  id="language" name="language">
-                    <!-- BEGIN language_select_item -->
-                    <option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option>
-                    <!-- END language_select_item -->
-                </select>
-                <input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
-            </fieldset>
-        </form>
-        <!-- ENDIF -->
-    </div>
+	<div id="page-header">
+		<h1>{L_INSTALL_PANEL}</h1>
+		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
+		<!-- IF S_LANG_SELECT -->
+		<form method="post" action="#" id="language_selector">
+			<fieldset class="nobg">
+				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
+				<select  id="language" name="language">
+					<!-- BEGIN language_select_item -->
+					<option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option>
+					<!-- END language_select_item -->
+				</select>
+				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
+			</fieldset>
+		</form>
+		<!-- ENDIF -->
+	</div>
 
-    <div id="page-body">
-        <div id="tabs">
-            <ul>
-                <!-- BEGIN t_block1 -->
-                <li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>
-                <!-- END t_block1 -->
-            </ul>
-        </div>
+	<div id="page-body">
+		<div id="tabs">
+			<ul>
+				<!-- BEGIN t_block1 -->
+				<li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>
+				<!-- END t_block1 -->
+			</ul>
+		</div>
 
-        <div id="acp">
-            <div id="content">
-                <div id="menu">
-                    <div class="menu-block no-header">
-                        <ul>
-                            <!-- BEGIN l_block1 -->
-                            <li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
-                            <!-- END l_block1 -->
-                            <!-- BEGIN l_block2 -->
-                            <li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF --> id="installer-stage-{l_block2.STAGE_NAME}">{l_block2.L_TITLE}</span></li>
-                            <!-- END l_block2 -->
-                        </ul>
-                    </div>
-                </div>
+		<div id="acp">
+			<div id="content">
+				<div id="menu">
+					<div class="menu-block no-header">
+						<ul>
+							<!-- BEGIN l_block1 -->
+							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
+							<!-- END l_block1 -->
+							<!-- BEGIN l_block2 -->
+							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF --> id="installer-stage-{l_block2.STAGE_NAME}">{l_block2.L_TITLE}</span></li>
+							<!-- END l_block2 -->
+						</ul>
+					</div>
+				</div>
 
-                <div id="main" class="install-body">
-                    <div class="main">
+				<div id="main" class="install-body">
+					<div class="main">
diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html
index 175c6eac67..53a91f2700 100644
--- a/phpBB/adm/style/installer_install.html
+++ b/phpBB/adm/style/installer_install.html
@@ -3,10 +3,10 @@
 <p>{CONTENT}</p>
 <!-- IF SHOW_INSTALL_START_FORM -->
 <form id="install_install" method="post" action="{U_ACTION}">
-    <fieldset class="submit-buttons">
-        <legend>{L_SUBMIT}</legend>
-        <input class="button1" name="install" type="submit" value="{L_INSTALL}" />
-    </fieldset>
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" name="install" type="submit" value="{L_INSTALL}" />
+	</fieldset>
 </form>
 <!-- ENDIF -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
diff --git a/phpBB/adm/style/installer_main.html b/phpBB/adm/style/installer_main.html
index ed65da8a68..f14fe4da70 100644
--- a/phpBB/adm/style/installer_main.html
+++ b/phpBB/adm/style/installer_main.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE installer_header.html -->
 
-    <h1>{TITLE}</h1>
-    <p>{BODY}</p>
+	<h1>{TITLE}</h1>
+	<p>{BODY}</p>
 
 <!-- INCLUDE installer_footer.html -->
-- 
cgit v1.2.1


From 3937f1f4ae77b29faf69292783cc3ae267785ee4 Mon Sep 17 00:00:00 2001
From: Zoddo <zoddo.ino@gmail.com>
Date: Sat, 12 Sep 2015 00:53:33 +0200
Subject: [ticket/14157] Allow to set the alt/title attribute on post icons

PHPBB3-14157
---
 phpBB/adm/style/acp_icons.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index f18dad0ef6..e723129e37 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -89,6 +89,9 @@
 	<!-- ENDIF -->
 		<td>{L_WIDTH}</td>
 		<td>{L_HEIGHT}</td>
+	<!-- IF not S_SMILIES -->
+		<td>{L_ALT_TEXT}</td>
+	<!-- ENDIF -->
 		<td>{L_DISPLAY_ON_POSTING}</td>
 	<!-- IF ID or S_ADD -->
 		<td>{L_ORDER}</td>
@@ -102,7 +105,7 @@
 	<!-- BEGIN items -->
 		<tr>
 
-		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
+		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="{items.TEXT_ALT}" title="{items.TEXT_ALT}" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
 		<td style="vertical-align: top;">[{items.IMG}]</td>
 		<!-- IF S_SMILIES -->
 			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
@@ -110,6 +113,9 @@
 		<!-- ENDIF -->
 		<td><input class="text post" type="number" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
 		<td><input class="text post" type="number" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
+		<!-- IF not S_SMILIES -->
+			<td><input class="text post" type="text" name="alt[{items.IMG}]" value="{items.ALT}" size="10" maxlength="50" /></td>
+		<!-- ENDIF -->
 		<td>
 			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
 			<!-- IF items.S_ID -->
-- 
cgit v1.2.1


From 90038e32cd6d35aa7a516a8d4f998e9504112c6a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 13 Oct 2015 07:39:46 -0700
Subject: [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.

PHPBB3-13789
---
 phpBB/adm/style/captcha_recaptcha.html | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
index d3038fd714..3f61c76cb1 100644
--- a/phpBB/adm/style/captcha_recaptcha.html
+++ b/phpBB/adm/style/captcha_recaptcha.html
@@ -1,32 +1,12 @@
 <!-- IF S_RECAPTCHA_AVAILABLE -->
 	<dl>
 	<dd>
-		<script type="text/javascript">
-		// <![CDATA[
-		var RecaptchaOptions = {
-			lang : '{LA_RECAPTCHA_LANG}',
-			theme : 'clean'
-		};
-		// ]]>
-		</script>
-		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
-		<script type="text/javascript">
-		// <![CDATA[
-		<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-			document.getElementById('recaptcha_table').style.direction = 'ltr';
-		<!-- ENDIF -->
-		// ]]>
-		</script>
-
-
 	<noscript>
-	<div>
-		<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
-		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-		<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
-	</div>
+		<div>{L_RECAPTCHA_NOSCRIPT}</div>
 	</noscript>
 
+		<script src="{RECAPTCHA_SERVER}.js?hl={LA_RECAPTCHA_LANG}" async defer></script>
+		<div class="g-recaptcha" data-sitekey="{RECAPTCHA_PUBKEY}"></div>
 	</dd>
 	</dl>
 <!-- ELSE -->
-- 
cgit v1.2.1


From 8f5a0ad6f73e7b7757b02c827436384c96069b5a Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Fri, 24 Jul 2015 09:20:50 +0200
Subject: [ticket/14039] Revamp updater

PHPBB3-14039
---
 phpBB/adm/style/admin.css                         | 21 ++++++
 phpBB/adm/style/installer_footer.html             |  2 +-
 phpBB/adm/style/installer_form.html               | 24 +++----
 phpBB/adm/style/installer_install.html            |  2 +-
 phpBB/adm/style/installer_update.html             | 13 ++++
 phpBB/adm/style/installer_update_file_status.html | 80 +++++++++++++++++++++++
 6 files changed, 128 insertions(+), 14 deletions(-)
 create mode 100644 phpBB/adm/style/installer_update.html
 create mode 100644 phpBB/adm/style/installer_update_file_status.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index cf009562b3..d884e69e09 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1836,10 +1836,31 @@ li.pagination ul {
 	font-weight: bold;
 }
 
+#log-container {
+	max-height: 300px;
+	padding: 8px;
+	margin: 10px 0;
+	clear: both;
+	overflow-y: auto;
+	background-color: #FFFFFF;
+}
+
+#log-container.show_border {
+	border: 1px solid #DBD7D1;
+}
+
+.log {
+	font-size: 0.8em;
+}
+
 .notice {
 	background-color: #62A5CC;
 }
 
+.download-box {
+	margin: 10px 0 10px 0;
+}
+
 /* Special cases for the error page */
 #errorpage #page-header a {
 	font-weight: bold;
diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
index 617d3dc254..b2eba48ae6 100644
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -13,7 +13,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<script type="text/javascript" src="{T_ASSETS_PATH}javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 
diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html
index 669f7aa834..cc5b041fa1 100644
--- a/phpBB/adm/style/installer_form.html
+++ b/phpBB/adm/style/installer_form.html
@@ -1,6 +1,6 @@
 <form id="<!-- IF FORM_ID -->{FORM_ID}<!-- ELSE -->install_install<!-- ENDIF -->" method="POST" action="{U_ACTION}">
 <!-- IF .options -->
-<!-- IF S_FORM_ELEM_COUNT > 1 -->
+<!-- IF S_NOT_ONLY_BUTTON_FORM -->
 <fieldset>
 <!-- ENDIF -->
 
@@ -13,8 +13,6 @@
 			<!-- ENDIF -->
 		<legend>{options.LEGEND}</legend>
 		<!-- ELSE -->
-
-			<!-- IF options.TYPE <> 'submit' -->
 		<dl>
 			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>
@@ -41,16 +39,18 @@
 				<!-- ENDIF -->
 			</dd>
 		</dl>
-			<!-- ELSE -->
-<!-- IF S_FORM_ELEM_COUNT > 1 -->
-</fieldset>
-<!-- ENDIF -->
-				<fieldset class="submit-buttons">
-					<legend>{L_SUBMIT}</legend>
-					<input class="button1" type="submit" name="{options.KEY}" value="{options.TITLE}" />
-				</fieldset>
-			<!-- ENDIF -->
 		<!-- ENDIF-->
 	<!-- END options -->
+<!-- IF S_NOT_ONLY_BUTTON_FORM -->
+</fieldset>
+<!-- ENDIF -->
+<!-- ENDIF -->
+<!-- IF .submit_buttons -->
+<fieldset class="submit-buttons">
+	<legend>{L_SUBMIT}</legend>
+	<!-- BEGIN submit_buttons -->
+	<input class="button1" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}" />
+	<!-- END submit_buttons -->
+</fieldset>
 <!-- ENDIF -->
 </form>
diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html
index 53a91f2700..747b1291f4 100644
--- a/phpBB/adm/style/installer_install.html
+++ b/phpBB/adm/style/installer_install.html
@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->
diff --git a/phpBB/adm/style/installer_update.html b/phpBB/adm/style/installer_update.html
new file mode 100644
index 0000000000..6bcbc525e9
--- /dev/null
+++ b/phpBB/adm/style/installer_update.html
@@ -0,0 +1,13 @@
+<!-- INCLUDE installer_header.html -->
+<h1>{TITLE}</h1>
+<p>{CONTENT}</p>
+<!-- IF SHOW_INSTALL_START_FORM -->
+<form id="install_install" method="post" action="{U_ACTION}">
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" name="update" type="submit" value="{L_UPDATE}" />
+	</fieldset>
+</form>
+<!-- ENDIF -->
+<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
+<!-- INCLUDE installer_footer.html -->
diff --git a/phpBB/adm/style/installer_update_file_status.html b/phpBB/adm/style/installer_update_file_status.html
new file mode 100644
index 0000000000..9f15c402e9
--- /dev/null
+++ b/phpBB/adm/style/installer_update_file_status.html
@@ -0,0 +1,80 @@
+<!-- IF .deleted -->
+<h2>{L_FILES_DELETED}</h2>
+<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('deleted', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+<p>{L_FILES_DELETED_EXPLAIN}</p>
+
+<fieldset id="deleted">
+	<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
+	<!-- BEGIN deleted -->
+	<dl>
+		<dt style="width: 100%;"><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<!-- ENDIF --><strong>{deleted.FILE_PART}</strong></dt>
+	</dl>
+	<!-- END deleted -->
+</fieldset>
+
+<!-- ENDIF -->
+
+<!-- IF .conflict -->
+<h2>{L_FILES_CONFLICT}</h2>
+<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+<p>{L_FILES_CONFLICT_EXPLAIN}</p>
+
+<fieldset id="conflict">
+	<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+	<!-- BEGIN conflict -->
+	<dl>
+		<dt style="width: 100%;"><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<!-- ENDIF --><strong>{conflict.FILE_PART}</strong></dt>
+	</dl>
+	<!-- END conflict -->
+</fieldset>
+
+<!-- ENDIF -->
+
+<!-- IF .modified -->
+<h2>{L_FILES_MODIFIED}</h2>
+<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+<p>{L_FILES_MODIFIED_EXPLAIN}</p>
+
+<fieldset id="modified">
+	<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+	<!-- BEGIN modified -->
+	<dl>
+		<dt style="width: 100%;"><!-- IF modified.DIR_PART -->{modified.DIR_PART}<!-- ENDIF --><strong>{modified.FILE_PART}</strong></dt>
+	</dl>
+	<!-- END modified -->
+</fieldset>
+
+<!-- ENDIF -->
+
+<!-- IF .new -->
+<h2>{L_FILES_NEW}</h2>
+<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('new_files', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+<p>{L_FILES_NEW_EXPLAIN}</p>
+
+<fieldset id="new_files" style="display: none;">
+	<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
+	<!-- BEGIN new -->
+	<dl>
+		<dt style="width: 100%;"><!-- IF new.DIR_PART -->{new.DIR_PART}<!-- ENDIF --><strong>{new.FILE_PART}</strong>
+		</dt>
+	</dl>
+	<!-- END new -->
+</fieldset>
+
+<!-- ENDIF -->
+
+<!-- IF .not_modified -->
+<h2>{L_FILES_NOT_MODIFIED}</h2>
+<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
+
+<fieldset id="not_modified" style="display: none;">
+	<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
+	<!-- BEGIN not_modified -->
+	<dl>
+		<dt style="width: 100%;"><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<!-- ENDIF --><strong>{not_modified.FILE_PART}</strong></dt>
+	</dl>
+	<!-- END not_modified -->
+</fieldset>
+
+<!-- ENDIF -->
-- 
cgit v1.2.1


From afe91fa7d3af0d30389c49428b30c9aeb0fe0916 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Sun, 18 Oct 2015 11:22:19 +0200
Subject: [ticket/14039] Fix T_TEMPLATE_PATH constant

PHPBB3-14039
---
 phpBB/adm/style/installer_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html
index 775caa7c67..c4c3427fdb 100644
--- a/phpBB/adm/style/installer_header.html
+++ b/phpBB/adm/style/installer_header.html
@@ -6,7 +6,7 @@
 	<!-- IF META -->{META}<!-- ENDIF -->
 	<title>{PAGE_TITLE}</title>
 
-	<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="{T_TEMPLATE_PATH}admin.css" rel="stylesheet" type="text/css" media="screen" />
 </head>
 
 <body class="{S_CONTENT_DIRECTION} nojs">
-- 
cgit v1.2.1


From 74ae7d2a8d396701f0ae8bdbcb19cd67135c5f8d Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Sun, 18 Oct 2015 11:33:49 +0200
Subject: [ticket/14039] Only show log container when it has content

PHPBB3-14039
---
 phpBB/adm/style/admin.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index d884e69e09..cfa55b58a1 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1837,6 +1837,7 @@ li.pagination ul {
 }
 
 #log-container {
+	display: none;
 	max-height: 300px;
 	padding: 8px;
 	margin: 10px 0;
@@ -1845,7 +1846,8 @@ li.pagination ul {
 	background-color: #FFFFFF;
 }
 
-#log-container.show_border {
+#log-container.show_log_container {
+	display: block;
 	border: 1px solid #DBD7D1;
 }
 
-- 
cgit v1.2.1


From 597297b169e2ae14684ad1f40c8e083be22b241d Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Sun, 18 Oct 2015 22:47:04 +0200
Subject: [ticket/14044] Deduplicate the installers

PHPBB3-14044
---
 phpBB/adm/style/install_convert.html     | 134 ---------
 phpBB/adm/style/install_error.html       |   8 -
 phpBB/adm/style/install_footer.html      |  21 --
 phpBB/adm/style/install_header.html      |  53 ----
 phpBB/adm/style/install_install.html     |  77 -----
 phpBB/adm/style/install_main.html        |   6 -
 phpBB/adm/style/install_update.html      | 491 -------------------------------
 phpBB/adm/style/install_update_diff.html | 254 ----------------
 8 files changed, 1044 deletions(-)
 delete mode 100644 phpBB/adm/style/install_convert.html
 delete mode 100644 phpBB/adm/style/install_error.html
 delete mode 100644 phpBB/adm/style/install_footer.html
 delete mode 100644 phpBB/adm/style/install_header.html
 delete mode 100644 phpBB/adm/style/install_install.html
 delete mode 100644 phpBB/adm/style/install_main.html
 delete mode 100644 phpBB/adm/style/install_update.html
 delete mode 100644 phpBB/adm/style/install_update_diff.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
deleted file mode 100644
index 7e22404f56..0000000000
--- a/phpBB/adm/style/install_convert.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!-- INCLUDE install_header.html -->
-
-<!-- IF S_NOT_INSTALLED -->
-
-	<h1>{TITLE}</h1>
-
-	<p>{BODY}</p>
-
-<!-- ELSE -->
-
-	<form id="install_convert" method="post" action="{U_ACTION}">
-
-	<h1>{TITLE}</h1>
-
-	<p>{BODY}</p>
-
-	<!-- IF S_ERROR_BOX -->
-	<div class="errorbox">
-		<h3>{ERROR_TITLE}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_LIST -->
-		<table class="table1">
-			<caption>{L_AVAILABLE_CONVERTORS}</caption>
-			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-		<thead>
-		<tr>
-			<th>{L_SOFTWARE}</th>
-			<th>{L_VERSION}</th>
-			<th>{L_AUTHOR}</th>
-			<th>{L_OPTIONS}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- IF .convertors -->
-			<!-- BEGIN convertors -->
-			<tr>
-				<td>{convertors.SOFTWARE}</td>
-				<td>{convertors.VERSION}</td>
-				<td>{convertors.AUTHOR}</td>
-				<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
-			</tr>
-			<!-- END convertors -->
-		<!-- ELSE -->
-			<tr>
-				<td>{L_NO_CONVERTORS}</td>
-				<td>-</td>
-				<td>-</td>
-				<td>-</td>
-			</tr>
-		<!-- ENDIF -->
-		</tbody>
-		</table>
-	<!-- ENDIF -->
-
-	<!-- IF S_CONTINUE -->
-		</form>
-
-		<fieldset class="submit-buttons">
-			<form method="post" action="{U_NEW_ACTION}">
-				<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
-			</form>
-			<br />
-			<form method="post" action="{U_CONTINUE_ACTION}">
-				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
-			</form>
-		</fieldset>
-
-		<form method="post" action="{U_ACTION}">
-	<!-- ENDIF -->
-
-	<!-- IF .checks -->
-		<fieldset>
-
-		<!-- BEGIN checks -->
-			<!-- IF checks.S_LEGEND -->
-				<!-- IF not checks.S_FIRST_ROW -->
-				</fieldset>
-
-				<fieldset>
-				<!-- ENDIF -->
-					<legend>{checks.LEGEND}</legend>
-					<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{checks.RESULT}</dd>
-				</dl>
-			<!-- ENDIF -->
-		<!-- END checks -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF .options -->
-		<fieldset>
-
-		<!-- BEGIN options -->
-			<!-- IF options.S_LEGEND -->
-				<!-- IF not options.S_FIRST_ROW -->
-					</fieldset>
-
-					<fieldset>
-				<!-- ENDIF -->
-					<legend>{options.LEGEND}</legend>
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{options.CONTENT}</dd>
-				</dl>
-
-			<!-- ENDIF -->
-		<!-- END options -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF L_SUBMIT -->
-		<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
-
-		<fieldset class="submit-buttons">
-			{S_HIDDEN}
-			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
-		</fieldset>
-	<!-- ENDIF -->
-
-	</form>
-<!-- ENDIF -->
-
-<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_error.html b/phpBB/adm/style/install_error.html
deleted file mode 100644
index 3f7c8b9ed4..0000000000
--- a/phpBB/adm/style/install_error.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- INCLUDE install_header.html -->
-
-<div class="errorbox">
-	<h3>{MESSAGE_TITLE}</h3>
-	<p>{MESSAGE_TEXT}</p>
-</div>
-
-<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
deleted file mode 100644
index a29fce6c5a..0000000000
--- a/phpBB/adm/style/install_footer.html
+++ /dev/null
@@ -1,21 +0,0 @@
-						</div>
-					</div><!-- /#main -->
-				</div>
-		</div><!-- /#acp -->
-	</div>
-
-	<div id="page-footer">
-		<div class="copyright">
-			Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
-		</div>
-	</div>
-</div>
-
-<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
-<!-- INCLUDEJS admin.js -->
-{$SCRIPTS}
-
-</body>
-</html>
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
deleted file mode 100644
index 6f7f129d39..0000000000
--- a/phpBB/adm/style/install_header.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
-</head>
-
-<body class="{S_CONTENT_DIRECTION} nojs">
-<div id="wrap">
-	<div id="page-header">
-		<h1>{L_INSTALL_PANEL}</h1>
-		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-		<!-- IF S_LANG_SELECT -->
-		<form method="post" action="#">
-			<fieldset class="nobg">
-				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
-				{S_LANG_SELECT}
-				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
-			</fieldset>
-		</form>
-		<!-- ENDIF -->
-	</div>
-
-	<div id="page-body">
-		<div id="tabs">
-			<ul>
-			<!-- BEGIN t_block1 -->
-				<li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>
-			<!-- END t_block1 -->
-			</ul>
-		</div>
-
-		<div id="acp">
-				<div id="content">
-					<div id="menu">
-						<div class="menu-block no-header">
-						<ul>
-						<!-- BEGIN l_block1 -->
-							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
-						<!-- END l_block1 -->
-						<!-- BEGIN l_block2 -->
-							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
-						<!-- END l_block2 -->
-						</ul>
-						</div>
-					</div>
-
-					<div id="main" class="install-body">
-						<div class="main">
diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html
deleted file mode 100644
index 1a809a3588..0000000000
--- a/phpBB/adm/style/install_install.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- INCLUDE install_header.html -->
-
-<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
-<!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
-
-<!-- IF .checks -->
-	<fieldset>
-
-	<!-- BEGIN checks -->
-		<!-- IF checks.S_LEGEND -->
-			<!-- IF not checks.S_FIRST_ROW -->
-			</fieldset>
-
-			<fieldset>
-			<!-- ENDIF -->
-				<legend>{checks.LEGEND}</legend>
-				<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-		<!-- ELSE -->
-
-			<dl>
-				<dt>{checks.TITLE}{L_COLON}<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{checks.RESULT}</dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- END checks -->
-
-	</fieldset>
-<!-- ENDIF -->
-
-<!-- IF .options -->
-	<fieldset>
-
-	<!-- BEGIN options -->
-		<!-- IF options.S_LEGEND -->
-			<!-- IF not options.S_FIRST_ROW -->
-				</fieldset>
-		
-				<fieldset>
-			<!-- ENDIF -->
-				<legend>{options.LEGEND}</legend>
-		<!-- ELSE -->
-
-			<dl>
-				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{options.CONTENT}</dd>
-			</dl>
-
-		<!-- ENDIF -->
-	<!-- END options -->
-
-	</fieldset>
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_DOWNLOAD -->
-	<h1>{L_DL_CONFIG}</h1>
-	<p>{L_DL_CONFIG_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_DL_CONFIG}</legend>
-		{S_HIDDEN}
-		<input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" />&nbsp;<input class="button1" type="submit" id="dldone" name="dldone" value="{L_DL_DONE}" />
-	</fieldset>
-<!-- ENDIF -->
-
-<!-- IF L_SUBMIT -->
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		{S_HIDDEN}
-		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
-	</fieldset>
-<!-- ENDIF -->
-
-</form>
-
-<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html
deleted file mode 100644
index 73e73ad578..0000000000
--- a/phpBB/adm/style/install_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- INCLUDE install_header.html -->
-
-	<h1>{TITLE}</h1>
-	<p>{BODY}</p>
-
-<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
deleted file mode 100644
index 898233f72d..0000000000
--- a/phpBB/adm/style/install_update.html
+++ /dev/null
@@ -1,491 +0,0 @@
-<!-- INCLUDE install_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	function popup(url, width, height, name)
-	{
-		if (!name)
-		{
-			name = '_popup';
-		}
-
-		window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
-		return false;
-	}
-
-	function diff_popup(url)
-	{
-		popup(url, 950, 600, '_diff');
-		return false;
-	}
-// ]]>
-</script>
-
-<!-- IF S_ERROR -->
-	<div class="errorbox" style="margin-top: 0;">
-		<h3>{L_NOTICE}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_IN_PROGRESS -->
-
-	<div class="successbox" style="margin-top: 0;">
-		<h3>{L_IN_PROGRESS}</h3>
-		<p>{L_IN_PROGRESS_EXPLAIN}</p>
-	</div>
-
-<!-- ELSEIF S_INTRO -->
-
-	<!-- IF S_WARNING -->
-	<div class="successbox" style="margin-top: 0;">
-		<h3>{L_NOTICE}</h3>
-		<p>{WARNING_MSG}</p>
-	</div>
-	<!-- ENDIF -->
-	
-	<div class="errorbox" style="margin-top: 0;">
-		<h3>{L_NOTICE}</h3>
-		<p>{L_BACKUP_NOTICE}</p>
-	</div>
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<h1>{L_UPDATE_INSTALLATION}</h1>
-	<p>{L_UPDATE_INSTALLATION_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_UPLOAD_SUCCESS -->
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<h1>{L_UPDATE_SUCCESS}</h1>
-	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="check_again" value="{L_CONTINUE_UPDATE}" />
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- IF S_VERSION_CHECK -->
-
-	<h1>{L_VERSION_CHECK}</h1>
-
-	<p>{L_VERSION_CHECK_EXPLAIN}</p>
-
-	<!-- IF S_UP_TO_DATE -->
-		<div class="successbox">
-			<p>{L_VERSION_UP_TO_DATE}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_VERSION_NOT_UP_TO_DATE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend></legend>
-	<dl>
-		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><strong>{CURRENT_VERSION}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_LATEST_VERSION}</label></dt>
-		<dd><strong>{LATEST_VERSION}</strong></dd>
-	</dl>
-	<!-- IF PACKAGE_VERSION and not S_UP_TO_DATE -->
-	<dl>
-		<dt><label>{L_PACKAGE_UPDATES_TO}</label></dt>
-		<dd><strong>{PACKAGE_VERSION}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
-	</fieldset>
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<fieldset class="submit-buttons">
-		<p>{L_CHECK_FILES_EXPLAIN}</p>
-		<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_DB_UPDATE -->
-
-	<!-- IF not S_DB_UPDATE_FINISHED -->
-
-		<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
-
-		<p>
-			{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
-		</p>
-
-		<br /><br />
-
-		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a>
-
-			<!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / -->
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-
-		<div class="successbox">
-			<h3>{L_UPDATE_SUCCESS}</h3>
-			<p>{L_EVERYTHING_UP_TO_DATE}</p>
-		</div>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_FILE_CHECK -->
-
-	<!-- IF S_ALL_UP_TO_DATE -->
-
-		<h1>{L_UPDATE_FILE_SUCCESS}</h1>
-		<p>{L_ALL_FILES_UP_TO_DATE}</p>
-
-		<p>{L_UPDATE_DATABASE_EXPLAIN}</p>
-
-		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-		<h1>{L_COLLECTED_INFORMATION}</h1>
-
-		<p>{L_COLLECTED_INFORMATION_EXPLAIN}</p>
-
-		<!-- IF S_NO_UPDATE_FILES -->
-			<div class="errorbox">
-				<h3>{L_NO_UPDATE_FILES}</h3>
-
-				<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
-
-				<strong>{NO_UPDATE_FILES}</strong>
-
-			</div>
-		<!-- ENDIF -->
-
-		<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
-
-		<!-- IF .deleted -->
-			<h2>{L_FILES_DELETED}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('deleted', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
-			<p>{L_FILES_DELETED_EXPLAIN}</p>
-
-			<fieldset id="deleted">
-				<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
-				<!-- BEGIN deleted -->
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong></dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">
-						<!-- IF not deleted.S_BINARY -->[<a href="{deleted.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{deleted.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-					</dd>
-				</dl>
-				<!-- END deleted -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .conflict -->
-			<h2>{L_FILES_CONFLICT}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
-			<p>{L_FILES_CONFLICT_EXPLAIN}</p>
-
-			<!-- BEGIN conflict -->
-			<fieldset id="conflict">
-				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
-						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
-					</dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
-						<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
-						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-					</dd>
-					<!-- IF conflict.S_CUSTOM -->
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-					<!-- ENDIF -->
-				</dl>
-				<!-- IF conflict.S_BINARY -->
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
-					</dl>
-				<!-- ELSE -->
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-					</dl>
-				<!-- ENDIF -->
-			</fieldset>
-			<!-- END conflict -->
-
-		<!-- ENDIF -->
-
-		<!-- IF .new_conflict -->
-			<h2>{L_FILES_NEW_CONFLICT}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('new_conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
-			<p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p>
-
-			<fieldset id="new_conflict">
-				<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend>
-			<!-- BEGIN new_conflict -->
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
-					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
-					<!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-				</dd>
-				<!-- IF new_conflict.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
-				</dl>
-			<!-- END new_conflict -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .modified -->
-			<h2>{L_FILES_MODIFIED}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
-			<p>{L_FILES_MODIFIED_EXPLAIN}</p>
-
-			<!-- BEGIN modified -->
-			<fieldset id="modified">
-				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong>
-					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
-				<!-- IF modified.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-				</dl>
-			</fieldset>
-			<!-- END modified -->
-
-		<!-- ENDIF -->
-
-		<!-- IF .new -->
-			<h2>{L_FILES_NEW}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('new_files', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
-			<p>{L_FILES_NEW_EXPLAIN}</p>
-
-			<fieldset id="new_files" style="display: none;">
-				<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
-			<!-- BEGIN new -->
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong>
-					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
-					<!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-				</dd>
-				<!-- IF new.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
-				</dl>
-			<!-- END new -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .not_modified -->
-			<h2>{L_FILES_NOT_MODIFIED}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
-			<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
-
-			<fieldset id="not_modified" style="display: none;">
-				<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
-			<!-- BEGIN not_modified -->
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
-						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-					</dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
-					<!-- IF not_modified.S_CUSTOM -->
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-					<!-- ENDIF -->
-				</dl>
-			<!-- END not_modified -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .up_to_date -->
-			<h2>{L_FILES_UP_TO_DATE}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('up_to_date', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
-			<p>{L_FILES_UP_TO_DATE_EXPLAIN}</p>
-
-			<fieldset id="up_to_date" style="display: none;">
-				<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend>
-			<!-- BEGIN up_to_date -->
-				<dl>
-					<dd class="full" style="text-align: {S_CONTENT_FLOW_BEGIN};"><strong>{up_to_date.FILENAME}</strong></dd>
-				</dl>
-			<!-- END up_to_date -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<br />
-
-		<fieldset class="quick">
-			<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
-		</fieldset>
-
-		<br />
-
-		<h1>{L_UPDATE_METHOD}</h1>
-
-		<p>{L_UPDATE_METHOD_EXPLAIN}</p>
-
-		<fieldset class="submit-buttons">
-			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_DOWNLOAD_FILES -->
-
-	<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
-
-	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
-	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt>
-		<dd>{RADIO_BUTTONS}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input type="submit" class="button2" value="{L_CONTINUE_UPDATE}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
-	</fieldset>
-
-	</form>
-
-	<br /><br />
-
-	<p>{L_MAPPING_FILE_STRUCTURE}</p>
-
-	<table class="table1">
-		<col class="row1" /><col class="row2" /><col class="row1" />
-	<thead>
-	<tr>
-		<th style="width: 49%">{L_ARCHIVE_FILE}</th>
-		<th style="width: 2%">&nbsp;</th>
-		<th style="width: 49%">{L_DESTINATION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN location -->
-	<tr>
-		<td>{location.SOURCE}</td>
-		<td><strong>&raquo;</strong></td>
-		<td>{location.DESTINATION}</td>
-	</tr>
-	<!-- END location -->
-	</tbody>
-	</table>
-
-<!-- ELSEIF S_FTP_UPLOAD -->
-
-	<h1>{L_SELECT_FTP_SETTINGS}</h1>
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<!-- IF S_CONNECTION_SUCCESS -->
-		<div class="successbox">
-			<p>{L_CONNECTION_SUCCESS}</p>
-		</div>
-	<!-- ELSEIF S_CONNECTION_FAILED -->
-		<div class="successbox">
-			<p>{L_TRY_DOWNLOAD_METHOD}</p>
-
-			<fieldset class="quick">
-				<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" />
-			</fieldset>
-		</div>
-
-		<div class="errorbox">
-			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_FTP_SETTINGS}</legend>
-	<dl>
-		<dt><label>{L_UPLOAD_METHOD}{L_COLON}</label></dt>
-		<dd><strong>{UPLOAD_METHOD}</strong></dd>
-	</dl>
-	<!-- BEGIN data -->
-	<dl>
-		<dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br /><span>{data.EXPLAIN}</span></dt>
-		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
-	</dl>
-	<!-- END data -->
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
-		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
-		<input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}" />
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
deleted file mode 100644
index 5f80084705..0000000000
--- a/phpBB/adm/style/install_update_diff.html
+++ /dev/null
@@ -1,254 +0,0 @@
-<!DOCTYPE html>
-<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-function resize_panel()
-{
-	var block = document.getElementById('diff_content');
-	var height;
-
-	if (window.innerHeight)
-	{
-		height = window.innerHeight - 200;
-		block.style.height = height + 'px';
-	}
-	else
-	{
-		//whatever IE needs to do this
-	}
-}
-
-window.onresize = resize_panel;
-
-// ]]>
-</script>
-
-<style type="text/css">
-/* <![CDATA[ */
-
-#main, .rtl #main {
-	font-size: 1em;
-	line-height: 0.7em;
-	margin: 0;
-	padding: 0;
-	width: 99%;
-}
-
-#diff_content {
-	padding: 30px 10px 10px;
-	overflow: hidden;
-}
-
-<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
-div#codepanel {
-	width: 100%;
-}
-<!-- ELSE -->
-div#codepanel {
-	background-color: #eee;
-}
-<!-- ENDIF -->
-
-<!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side'  -->
-div#diff_content pre {
-	overflow: auto;
-	height: 414px;
-	width: 100% !important;
-}
-<!-- ENDIF -->
-
-<!-- IF not S_DIFF_NEW_FILE -->
-/**
-* Unified Diff
-*/
-.file {
-	line-height: .7em;
-	overflow: auto;
-	height: 414px;
-}
-
-.diff {
-	margin: 0;
-}
-
-.added {
-	background-color: #dfd;
-}
-
-.removed {
-	background-color: #fdd;
-}
-
-.info {
-	color: #888;
-}
-
-.context {
-	background-color: #eee;
-}
-
-/**
-* Inline Diff
-*/
-.ins {
-	background-color: #dfd;
-	text-decoration: underline;
-}
-
-.del {
-	background-color: #fdd;
-	text-decoration: line-through;
-}
-
-/**
-* Column Diff
-*/
-table.hrdiff {
-	margin: 0 0 8px 5px;
-	width: 100%;
-	overflow: hidden;
-	border-bottom: 1px solid #999;
-	table-layout: fixed;
-	background: transparent;
-}
-
-table.hrdiff th {
-	text-align: left;
-	width: 50%;
-	color: #333;
-	font-family: Verdana,Helvetica,sans-serif;
-	font-size: 11px;
-	border-bottom: 1px solid #999;
-	border-right: 1px solid #999;
-	background: #D9D9D9;
-}
-
-table.hrdiff thead th {
-	font-weight: bold;
-	font-size: 110%;
-	padding: 2px;
-}
-
-table.hrdiff tr:first-child th {
-	border-top: none;
-}
-
-table.hrdiff tbody th {
-	font-size: 80%;
-	border-top: 1px solid #999;
-}
-
-table.hrdiff tbody td {
-	border-right: 1px solid #999;
-}
-
-table.hrdiff td pre {
-	font-family: "Consolas", monospace;
-	font-size: 1.1em;
-	white-space: pre-wrap;		/* css-3 */
-	word-wrap: break-word;		/* Internet Explorer 5.5+ */
-}
-
-table.hrdiff .unmodified {
-	background: transparent;
-}
-
-table.hrdiff .added {
-	background: #9f9;
-}
-
-table.hrdiff .added_empty {
-	background: #cfc;
-}
-
-table.hrdiff .modified {
-	background: #fd9;
-}
-
-table.hrdiff .removed {
-	background: #f99;
-}
-
-table.hrdiff .removed_empty {
-	background: #fcc;
-}
-
-table.hrdiff caption {
-	caption-side: top;
-	text-align: left;
-	margin: 0 0 8px 5px;
-	font-size: 90%;
-	font-weight: bold;
-	padding: 5px;
-}
-
-table.hrdiff caption span {
-	height: 10px;
-	width: 10px;
-	line-height: 10px;
-	letter-spacing: 10px;
-	border: 1px solid #000;
-	margin-left: 0.5em;
-	vertical-align: baseline;
-}
-
-<!-- ENDIF -->
-
-/* ]]> */
-</style>
-
-</head>
-
-<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
-<body onload="resize_panel();">
-<!-- ELSE -->
-<body>
-<!-- ENDIF -->
-
-<div id="wrap">
-	<div id="page-header">
-<!-- IF S_DIFF_NEW_FILE -->
-
-		<h1>{L_VIEWING_FILE_CONTENTS}</h1>
-<!-- ELSE -->
-		<h1>{L_VIEWING_FILE_DIFF}</h1>
-<!-- ENDIF -->
-<!-- IF not S_DIFF_NEW_FILE -->
-		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-		<form method="post" action="#">
-		<fieldset class="quick">
-			<label for="diff_mode">{L_SELECT_DIFF_MODE}{L_COLON}</label>
-			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
-
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
-		</fieldset>
-		</form>
-<!-- ENDIF -->
-<!-- IF S_DIFF_CONFLICT_FILE -->
-		<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}{L_COLON} {NUM_CONFLICTS}</strong></div>
-		<br style="clear: both;" />
-<!-- ENDIF -->
-	</div>
-
-	<div id="page-body">
-		<div id="acp">
-			<div id="codepanel">
-				<div id="diff_content">
-					<div id="main">
-						{DIFF_CONTENT}
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-<!-- INCLUDE simple_footer.html -->
-- 
cgit v1.2.1


From d7317c9b25e5343bc28bd7cee7ad825cba30734a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 7 Dec 2015 16:41:23 +0100
Subject: [ticket/14310] Put progress percentage inside span and make more
 visible

PHPBB3-14310
---
 phpBB/adm/style/admin.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index cfa55b58a1..e38e1cc3d7 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2566,6 +2566,7 @@ fieldset.permissions .padding {
 	text-align: center;
 	line-height: 25px;
 	font-weight: bold;
+	color: #fff;
 }
 
 #progress-bar #progress-bar-filler {
-- 
cgit v1.2.1


From c02fc0f63fb8098cd4096481ad27b31f8069d5d1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 22 Dec 2015 20:01:22 +0100
Subject: [ticket/14378] Use consistent template variable paths

PHPBB3-14378
---
 phpBB/adm/style/installer_footer.html             |  2 +-
 phpBB/adm/style/installer_header.html             |  2 +-
 phpBB/adm/style/installer_update_file_status.html | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
index 44010b5589..63aebec993 100644
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -13,7 +13,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 
diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html
index c4c3427fdb..775caa7c67 100644
--- a/phpBB/adm/style/installer_header.html
+++ b/phpBB/adm/style/installer_header.html
@@ -6,7 +6,7 @@
 	<!-- IF META -->{META}<!-- ENDIF -->
 	<title>{PAGE_TITLE}</title>
 
-	<link href="{T_TEMPLATE_PATH}admin.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
 </head>
 
 <body class="{S_CONTENT_DIRECTION} nojs">
diff --git a/phpBB/adm/style/installer_update_file_status.html b/phpBB/adm/style/installer_update_file_status.html
index 9f15c402e9..a27bfa6a44 100644
--- a/phpBB/adm/style/installer_update_file_status.html
+++ b/phpBB/adm/style/installer_update_file_status.html
@@ -4,7 +4,7 @@
 <p>{L_FILES_DELETED_EXPLAIN}</p>
 
 <fieldset id="deleted">
-	<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
 	<!-- BEGIN deleted -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<!-- ENDIF --><strong>{deleted.FILE_PART}</strong></dt>
@@ -20,7 +20,7 @@
 <p>{L_FILES_CONFLICT_EXPLAIN}</p>
 
 <fieldset id="conflict">
-	<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
 	<!-- BEGIN conflict -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<!-- ENDIF --><strong>{conflict.FILE_PART}</strong></dt>
@@ -36,7 +36,7 @@
 <p>{L_FILES_MODIFIED_EXPLAIN}</p>
 
 <fieldset id="modified">
-	<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
 	<!-- BEGIN modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF modified.DIR_PART -->{modified.DIR_PART}<!-- ENDIF --><strong>{modified.FILE_PART}</strong></dt>
@@ -52,7 +52,7 @@
 <p>{L_FILES_NEW_EXPLAIN}</p>
 
 <fieldset id="new_files" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_new.gif" alt="{L_STATUS_NEW}" /></legend>
 	<!-- BEGIN new -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF new.DIR_PART -->{new.DIR_PART}<!-- ENDIF --><strong>{new.FILE_PART}</strong>
@@ -69,7 +69,7 @@
 <p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
 
 <fieldset id="not_modified" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
 	<!-- BEGIN not_modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<!-- ENDIF --><strong>{not_modified.FILE_PART}</strong></dt>
-- 
cgit v1.2.1


From 84171c5776889a3f58576866bc6f12f3d5f2b70c Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Tue, 22 Dec 2015 21:52:05 +0100
Subject: [ticket/14380] Maintain consistent template var paths in 3.2
 installer

PHPBB3-14380
---
 phpBB/adm/style/installer_install.html | 2 +-
 phpBB/adm/style/installer_update.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html
index 747b1291f4..53a91f2700 100644
--- a/phpBB/adm/style/installer_install.html
+++ b/phpBB/adm/style/installer_install.html
@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->
diff --git a/phpBB/adm/style/installer_update.html b/phpBB/adm/style/installer_update.html
index 6bcbc525e9..48cc07f5d6 100644
--- a/phpBB/adm/style/installer_update.html
+++ b/phpBB/adm/style/installer_update.html
@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->
-- 
cgit v1.2.1


From 78349ed80f24cb61ad05f997e97d805cc5b0409f Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Fri, 11 Dec 2015 21:31:27 +0100
Subject: [ticket/14306] Automatically enable a safe mode when container
 building fails

PHPBB3-14306
---
 phpBB/adm/style/overall_header.html | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index ada88edff2..dbf27eb942 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -49,7 +49,7 @@ function marklist(id, name, state)
 	}
 
 	var rb = parent.getElementsByTagName('input');
-	
+
 	for (var r = 0; r < rb.length; r++)
 	{
 		if (rb[r].name.substr(0, name.length) == name)
@@ -103,7 +103,7 @@ function popup(url, width, height, name)
 		<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 	</div>
-	
+
 	<div id="page-body">
 		<div id="tabs">
 			<ul>
@@ -120,7 +120,7 @@ function popup(url, width, height, name)
 						<!-- DEFINE $LI_USED = 0 -->
 						<!-- BEGIN l_block1 -->
 							<!-- IF l_block1.S_SELECTED -->
-	
+
 						<!-- BEGIN l_block2 -->
 							<!-- IF .l_block1.l_block2.l_block3 -->
 							<!-- IF $LI_USED --></ul></div><!-- ENDIF -->
@@ -129,13 +129,13 @@ function popup(url, width, height, name)
 								<ul>
 							<!-- DEFINE $LI_USED = 1 -->
 							<!-- ENDIF -->
-	
+
 							<!-- BEGIN l_block3 -->
 								<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
 								<!-- DEFINE $LI_USED = 1 -->
 							<!-- END l_block3 -->
 						<!-- END l_block2 -->
-						
+
 							<!-- ENDIF -->
 						<!-- END l_block1 -->
 						<!-- IF $LI_USED -->
@@ -143,6 +143,14 @@ function popup(url, width, height, name)
 							</div>
 						<!-- ENDIF -->
 					</div>
-	
+
 					<div id="main">
 						<div class="main">
+							<!-- IF CONTAINER_EXCEPTION !== false -->
+							<div class="errorbox">
+								<p>{L_CONTAINER_EXCEPTION}</p>
+								<p>{L_CONTAINER_EXCEPTION_DETAIL}</p>
+								<p>Exception message: {{ CONTAINER_EXCEPTION.getMessage() }}</p>
+								<pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
+							</div>
+							<!-- ENDIF -->
-- 
cgit v1.2.1


From 7f8b6c02c6380d44d2bc3c402cfa5e9953d4819b Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Tue, 15 Dec 2015 20:18:55 +0100
Subject: [ticket/14306] Update the error message

PHPBB3-14306
---
 phpBB/adm/style/overall_header.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index dbf27eb942..4212f01f15 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -149,8 +149,7 @@ function popup(url, width, height, name)
 							<!-- IF CONTAINER_EXCEPTION !== false -->
 							<div class="errorbox">
 								<p>{L_CONTAINER_EXCEPTION}</p>
-								<p>{L_CONTAINER_EXCEPTION_DETAIL}</p>
-								<p>Exception message: {{ CONTAINER_EXCEPTION.getMessage() }}</p>
+								<p>{L_EXCEPTION}{L_COLON} {{ CONTAINER_EXCEPTION.getMessage() }}</p>
 								<pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
 							</div>
 							<!-- ENDIF -->
-- 
cgit v1.2.1


From 6594ef8b1e0b63f911fbcc2b8859fcfb09977e2f Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Sat, 9 Jan 2016 15:32:11 +0100
Subject: [ticket/14306] CS and correctly handle exception loop

PHPBB3-14306
---
 phpBB/adm/style/overall_header.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 4212f01f15..3feb94f89c 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -146,10 +146,10 @@ function popup(url, width, height, name)
 
 					<div id="main">
 						<div class="main">
-							<!-- IF CONTAINER_EXCEPTION !== false -->
+							{% if CONTAINER_EXCEPTION !== false %}
 							<div class="errorbox">
-								<p>{L_CONTAINER_EXCEPTION}</p>
-								<p>{L_EXCEPTION}{L_COLON} {{ CONTAINER_EXCEPTION.getMessage() }}</p>
+								<p>{{ lang('CONTAINER_EXCEPTION') }}</p>
+								<p>{{ lang('EXCEPTION') }}{{ lang('COLON') }} {{ CONTAINER_EXCEPTION.getMessage() }}</p>
 								<pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
 							</div>
-							<!-- ENDIF -->
+							{% endif %}
-- 
cgit v1.2.1


From 1e0340b0cf7cc34094e03985457f1aed2f60da36 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Sat, 9 Jan 2016 18:03:21 +0100
Subject: =?UTF-8?q?[ticket/14306]=C2=A0Improves=20Error=20display?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PHPBB3-14306
---
 phpBB/adm/style/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 3feb94f89c..9266372ab8 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -148,7 +148,7 @@ function popup(url, width, height, name)
 						<div class="main">
 							{% if CONTAINER_EXCEPTION !== false %}
 							<div class="errorbox">
-								<p>{{ lang('CONTAINER_EXCEPTION') }}</p>
+								<p>{{ lang('CONTAINER_EXCEPTION') }}</p><br />
 								<p>{{ lang('EXCEPTION') }}{{ lang('COLON') }} {{ CONTAINER_EXCEPTION.getMessage() }}</p>
 								<pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
 							</div>
-- 
cgit v1.2.1


From 57ce891d5f2c0b7090d44fac074ab27b4f98b93b Mon Sep 17 00:00:00 2001
From: cunha17 <cunha17@gmail.com>
Date: Wed, 28 Oct 2015 11:38:14 -0200
Subject: [ticket/14253] Show group requests pending aproval at the ACP groups
 summary

Currenty, you need to open each existing group in ACP to know if there
are pending group requests or not. Doing so is really boring and
annoying... :/
This patch displays the number of pending group requests at the ACP groups
summary page.

PHPBB3-14253
---
 phpBB/adm/style/acp_groups.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 23f6e744c0..ffde27a437 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -267,11 +267,12 @@
 
 	<!-- EVENT acp_groups_manage_before -->
 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+		<col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
+		<th>{L_PENDING_MEMBERS}</th>
 		<th colspan="2">{L_OPTIONS}</th>
 		<th>{L_ACTION}</th>
 	</tr>
@@ -281,7 +282,7 @@
 		<!-- IF groups.S_SPECIAL -->
 		<!-- IF groups.S_FIRST_ROW -->
 			<tr>
-				<td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
+				<td colspan="6" class="row3">{L_NO_GROUPS_CREATED}</td>
 			</tr>
 		<!-- ENDIF -->
 	</tbody>
@@ -302,11 +303,12 @@
 	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
 
 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+		<col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
+		<th>{L_PENDING_MEMBERS}</th>
 		<th colspan="2">{L_OPTIONS}</th>
 		<th>{L_ACTION}</th>
 	</tr>
@@ -316,6 +318,7 @@
 		<tr>
 			<td><strong>{groups.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
+			<td style="text-align: center;">{groups.PENDING_MEMBERS}</td>
 			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
 			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
 			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-- 
cgit v1.2.1


From a649768e17d25bcf55ae539420abe4eb4b7a1ef1 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Wed, 28 Oct 2015 15:00:11 +0100
Subject: [ticket/14262] Move convertor to controller

PHPBB3-14262
---
 phpBB/adm/style/installer_convert.html     |  79 +++++++++++++++++
 phpBB/adm/style/installer_convert_old.html | 134 +++++++++++++++++++++++++++++
 2 files changed, 213 insertions(+)
 create mode 100644 phpBB/adm/style/installer_convert.html
 create mode 100644 phpBB/adm/style/installer_convert_old.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/installer_convert.html b/phpBB/adm/style/installer_convert.html
new file mode 100644
index 0000000000..8f1c51a1cb
--- /dev/null
+++ b/phpBB/adm/style/installer_convert.html
@@ -0,0 +1,79 @@
+<!-- INCLUDE installer_header.html -->
+<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
+<!-- IF S_ERROR_BOX -->
+<div class="errorbox">
+	<h3>{ERROR_TITLE}</h3>
+	<p>{ERROR_MSG}</p>
+</div>
+<!-- ENDIF -->
+<!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
+<!-- IF CONTENT -->{CONTENT}<!-- ENDIF -->
+<!-- IF S_CONV_IN_PROGRESS -->
+<p class="centered-text"><a href="{U_ACTION}" class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->"<!-- IF S_REFRESH --> onclick="return false;"<!-- ENDIF -->>{L_SUBMIT}</a></p>
+<!-- ENDIF -->
+<!-- IF S_CONTINUE -->
+<div id="download-wrapper" class="download-box">
+	<p class="centered-text">
+		<a href="{U_NEW_ACTION}" class="button1">{L_CONVERT_NEW_CONVERSION}</a>
+		<a href="{U_CONTINUE_ACTION}" class="button1">{L_CONTINUE_OLD_CONVERSION}</a>
+	</p>
+</div>
+<!-- ENDIF -->
+<!-- IF S_LIST -->
+<table class="table1">
+	<caption>{L_AVAILABLE_CONVERTORS}</caption>
+	<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+	<thead>
+	<tr>
+		<th>{L_SOFTWARE}</th>
+		<th>{L_VERSION}</th>
+		<th>{L_AUTHOR}</th>
+		<th>{L_CONVERT_OPTIONS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- IF .convertors -->
+	<!-- BEGIN convertors -->
+	<tr>
+		<td>{convertors.SOFTWARE}</td>
+		<td>{convertors.VERSION}</td>
+		<td>{convertors.AUTHOR}</td>
+		<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
+	</tr>
+	<!-- END convertors -->
+	<!-- ELSE -->
+	<tr>
+		<td>{L_NO_CONVERTORS}</td>
+		<td>-</td>
+		<td>-</td>
+		<td>-</td>
+	</tr>
+	<!-- ENDIF -->
+	</tbody>
+</table>
+<!-- ENDIF -->
+<!-- IF .checks -->
+<fieldset>
+
+	<!-- BEGIN checks -->
+	<!-- IF checks.S_LEGEND -->
+	<!-- IF not checks.S_FIRST_ROW -->
+</fieldset>
+
+<fieldset>
+	<!-- ENDIF -->
+	<legend>{checks.LEGEND}</legend>
+	<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
+	<!-- ELSE -->
+
+	<dl>
+		<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+		<dd>{checks.RESULT}</dd>
+	</dl>
+	<!-- ENDIF -->
+	<!-- END checks -->
+
+</fieldset>
+<!-- ENDIF -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
+<!-- INCLUDE installer_footer.html -->
diff --git a/phpBB/adm/style/installer_convert_old.html b/phpBB/adm/style/installer_convert_old.html
new file mode 100644
index 0000000000..75cc151c9e
--- /dev/null
+++ b/phpBB/adm/style/installer_convert_old.html
@@ -0,0 +1,134 @@
+<!-- INCLUDE installer_header.html -->
+
+<!-- IF S_NOT_INSTALLED -->
+
+	<h1>{TITLE}</h1>
+
+	<p>{BODY}</p>
+
+<!-- ELSE -->
+
+	<form id="install_convert" method="post" action="{U_ACTION}">
+
+	<h1>{TITLE}</h1>
+
+	<p>{BODY}</p>
+
+	<!-- IF S_ERROR_BOX -->
+	<div class="errorbox">
+		<h3>{ERROR_TITLE}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_LIST -->
+		<table class="table1">
+			<caption>{L_AVAILABLE_CONVERTORS}</caption>
+			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+		<thead>
+		<tr>
+			<th>{L_SOFTWARE}</th>
+			<th>{L_VERSION}</th>
+			<th>{L_AUTHOR}</th>
+			<th>{L_OPTIONS}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- IF .convertors -->
+			<!-- BEGIN convertors -->
+			<tr>
+				<td>{convertors.SOFTWARE}</td>
+				<td>{convertors.VERSION}</td>
+				<td>{convertors.AUTHOR}</td>
+				<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
+			</tr>
+			<!-- END convertors -->
+		<!-- ELSE -->
+			<tr>
+				<td>{L_NO_CONVERTORS}</td>
+				<td>-</td>
+				<td>-</td>
+				<td>-</td>
+			</tr>
+		<!-- ENDIF -->
+		</tbody>
+		</table>
+	<!-- ENDIF -->
+
+	<!-- IF S_CONTINUE -->
+		</form>
+
+		<fieldset class="submit-buttons">
+			<form method="post" action="{U_NEW_ACTION}">
+				<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
+			</form>
+			<br />
+			<form method="post" action="{U_CONTINUE_ACTION}">
+				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
+			</form>
+		</fieldset>
+
+		<form method="post" action="{U_ACTION}">
+	<!-- ENDIF -->
+
+	<!-- IF .checks -->
+		<fieldset>
+
+		<!-- BEGIN checks -->
+			<!-- IF checks.S_LEGEND -->
+				<!-- IF not checks.S_FIRST_ROW -->
+				</fieldset>
+
+				<fieldset>
+				<!-- ENDIF -->
+					<legend>{checks.LEGEND}</legend>
+					<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
+			<!-- ELSE -->
+
+				<dl>
+					<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dd>{checks.RESULT}</dd>
+				</dl>
+			<!-- ENDIF -->
+		<!-- END checks -->
+
+		</fieldset>
+	<!-- ENDIF -->
+
+	<!-- IF .options -->
+		<fieldset>
+
+		<!-- BEGIN options -->
+			<!-- IF options.S_LEGEND -->
+				<!-- IF not options.S_FIRST_ROW -->
+					</fieldset>
+
+					<fieldset>
+				<!-- ENDIF -->
+					<legend>{options.LEGEND}</legend>
+			<!-- ELSE -->
+
+				<dl>
+					<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dd>{options.CONTENT}</dd>
+				</dl>
+
+			<!-- ENDIF -->
+		<!-- END options -->
+
+		</fieldset>
+	<!-- ENDIF -->
+
+	<!-- IF L_SUBMIT -->
+		<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
+
+		<fieldset class="submit-buttons">
+			{S_HIDDEN}
+			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+		</fieldset>
+	<!-- ENDIF -->
+
+	</form>
+<!-- ENDIF -->
+
+<!-- INCLUDE installer_footer.html -->
-- 
cgit v1.2.1


From a3f16c1f5fa7c22687840f7760fdc40a36c6d545 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Fri, 29 Jan 2016 13:55:49 +0100
Subject: [ticket/14262] Remove converter template duplicate

PHPBB3-14262
---
 phpBB/adm/style/installer_convert_old.html | 134 -----------------------------
 1 file changed, 134 deletions(-)
 delete mode 100644 phpBB/adm/style/installer_convert_old.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/installer_convert_old.html b/phpBB/adm/style/installer_convert_old.html
deleted file mode 100644
index 75cc151c9e..0000000000
--- a/phpBB/adm/style/installer_convert_old.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!-- INCLUDE installer_header.html -->
-
-<!-- IF S_NOT_INSTALLED -->
-
-	<h1>{TITLE}</h1>
-
-	<p>{BODY}</p>
-
-<!-- ELSE -->
-
-	<form id="install_convert" method="post" action="{U_ACTION}">
-
-	<h1>{TITLE}</h1>
-
-	<p>{BODY}</p>
-
-	<!-- IF S_ERROR_BOX -->
-	<div class="errorbox">
-		<h3>{ERROR_TITLE}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_LIST -->
-		<table class="table1">
-			<caption>{L_AVAILABLE_CONVERTORS}</caption>
-			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-		<thead>
-		<tr>
-			<th>{L_SOFTWARE}</th>
-			<th>{L_VERSION}</th>
-			<th>{L_AUTHOR}</th>
-			<th>{L_OPTIONS}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- IF .convertors -->
-			<!-- BEGIN convertors -->
-			<tr>
-				<td>{convertors.SOFTWARE}</td>
-				<td>{convertors.VERSION}</td>
-				<td>{convertors.AUTHOR}</td>
-				<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
-			</tr>
-			<!-- END convertors -->
-		<!-- ELSE -->
-			<tr>
-				<td>{L_NO_CONVERTORS}</td>
-				<td>-</td>
-				<td>-</td>
-				<td>-</td>
-			</tr>
-		<!-- ENDIF -->
-		</tbody>
-		</table>
-	<!-- ENDIF -->
-
-	<!-- IF S_CONTINUE -->
-		</form>
-
-		<fieldset class="submit-buttons">
-			<form method="post" action="{U_NEW_ACTION}">
-				<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
-			</form>
-			<br />
-			<form method="post" action="{U_CONTINUE_ACTION}">
-				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
-			</form>
-		</fieldset>
-
-		<form method="post" action="{U_ACTION}">
-	<!-- ENDIF -->
-
-	<!-- IF .checks -->
-		<fieldset>
-
-		<!-- BEGIN checks -->
-			<!-- IF checks.S_LEGEND -->
-				<!-- IF not checks.S_FIRST_ROW -->
-				</fieldset>
-
-				<fieldset>
-				<!-- ENDIF -->
-					<legend>{checks.LEGEND}</legend>
-					<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{checks.RESULT}</dd>
-				</dl>
-			<!-- ENDIF -->
-		<!-- END checks -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF .options -->
-		<fieldset>
-
-		<!-- BEGIN options -->
-			<!-- IF options.S_LEGEND -->
-				<!-- IF not options.S_FIRST_ROW -->
-					</fieldset>
-
-					<fieldset>
-				<!-- ENDIF -->
-					<legend>{options.LEGEND}</legend>
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{options.CONTENT}</dd>
-				</dl>
-
-			<!-- ENDIF -->
-		<!-- END options -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF L_SUBMIT -->
-		<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
-
-		<fieldset class="submit-buttons">
-			{S_HIDDEN}
-			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
-		</fieldset>
-	<!-- ENDIF -->
-
-	</form>
-<!-- ENDIF -->
-
-<!-- INCLUDE installer_footer.html -->
-- 
cgit v1.2.1


From 43cdb35b848b914d11cc1ccb57f84497a012db86 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Fri, 29 Jan 2016 17:06:23 +0100
Subject: [ticket/14438] Allign progressbar text to center

PHPBB3-14438
---
 phpBB/adm/style/admin.css | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index e38e1cc3d7..4bb9922d56 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2554,6 +2554,7 @@ fieldset.permissions .padding {
 #progress-bar {
 	position: relative;
 	width: 90%;
+	text-align: center;
 	height: 25px;
 	margin: 20px auto;
 	border: 1px solid #cecece;
@@ -2563,10 +2564,7 @@ fieldset.permissions .padding {
 	position: absolute;
 	top: 0;
 	width: 100%;
-	text-align: center;
-	line-height: 25px;
-	font-weight: bold;
-	color: #fff;
+	color: #000;
 }
 
 #progress-bar #progress-bar-filler {
@@ -2577,4 +2575,11 @@ fieldset.permissions .padding {
 	background-color: #3c84ad;
 	width: 0;
 	height: 25px;
+	overflow: hidden;
+	color: #fff;
+}
+
+#progress-bar p {
+	line-height: 25px;
+	font-weight: bold;
 }
-- 
cgit v1.2.1


From 91f809dc3dc926ff858e5e53ee8cfed781c1aeaa Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Tue, 2 Feb 2016 16:09:40 +0100
Subject: [ticket/14262] Add error handling and small CS fixes

PHPBB3-14262
---
 phpBB/adm/style/installer_convert.html | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/installer_convert.html b/phpBB/adm/style/installer_convert.html
index 8f1c51a1cb..aa16542b6b 100644
--- a/phpBB/adm/style/installer_convert.html
+++ b/phpBB/adm/style/installer_convert.html
@@ -6,6 +6,14 @@
 	<p>{ERROR_MSG}</p>
 </div>
 <!-- ENDIF -->
+<!-- IF .errors -->
+<div id="error-container">
+<!-- BEGIN errors -->
+	<strong>{errors.TITLE}</strong>
+	<!-- IF errors.DESCRIPTION --><p>{errors.DESCRIPTION}</p><!-- ENDIF -->
+<!-- END errors -->
+</div>
+<!-- ENDIF -->
 <!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
 <!-- IF CONTENT -->{CONTENT}<!-- ENDIF -->
 <!-- IF S_CONV_IN_PROGRESS -->
-- 
cgit v1.2.1


From 2084404d2a0648d406749d67e44f1ba3ba44d7df Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sat, 13 Feb 2016 23:10:40 +0100
Subject: [ticket/14462] Make timeout error translateable

PHPBB3-14462
---
 phpBB/adm/style/installer_footer.html | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
index 63aebec993..fefa8f6d3f 100644
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -11,6 +11,15 @@
 	</div>
 </div>
 
+<script type="text/javascript">
+<!--
+installLang = {
+	title: '{LA_TIMEOUT_DETECTED_TITLE}',
+	msg: '{LA_TIMEOUT_DETECTED_MESSAGE}'
+};
+//-->
+</script>
+
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
-- 
cgit v1.2.1


From 49736322887029b409ff177eafca9581c6622e83 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 5 Feb 2016 23:48:57 +0100
Subject: [ticket/14315] Only add role options specified for each group

PHPBB3-14315
---
 phpBB/adm/style/permission_mask.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 347da3181e..75e76b157d 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -46,7 +46,9 @@
 						<div class="dropdown hidden">
 							<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" >
 								{% for role in loops.role_options %}
+									{% if role.UG_ID == p_mask.f_mask.UG_ID %}
 									<li data-id="{{ role.ID }}" data-target-id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" data-title="{{ role.TITLE }}"{% if role.SELECTED == true %} data-selected="{{ role.SELECTED }}"{% endif %}>{{ role.ROLE_NAME }}</li>
+									{% endif %}
 								{% endfor %}
 							</ul>
 						</div>
-- 
cgit v1.2.1


From eab1b1ad11ae2e42cf4f6c3af9f7171d6dd0837b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 5 Feb 2016 23:59:19 +0100
Subject: [ticket/14315] Correctly set default values and reset values

The permissions tooltip javascript failed at correctly passing
the default values to the page. The same applied to the
display_mask() method in includes/acp/auth.php.

PHPBB3-14315
---
 phpBB/adm/style/permission_mask.html |  2 +-
 phpBB/adm/style/tooltip.js           | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 75e76b157d..aa18a40cb7 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -52,7 +52,7 @@
 								{% endfor %}
 							</ul>
 						</div>
-						<input type="hidden" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if S_ROLE_ID %}value="{{ S_ROLE_ID }}"{% endif %} />
+						<input type="hidden" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if p_mask.f_mask.S_ROLE_ID %}value="{{ p_mask.f_mask.S_ROLE_ID }}"{% endif %} />
 					</div>
 				</dd>
 			{% else %}
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 68964034f0..3abeefbffe 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -141,20 +141,32 @@ phpbb.positionTooltip = function ($element) {
  */
 phpbb.prepareRolesDropdown = function () {
 	var $options = $('.roles-options li');
-	var $rolesOptions = $options.closest('.roles-options');
-	var $span = $rolesOptions.children('span');
 
 	// Prepare highlighting of select options and settings update
 	$options.each(function () {
 		var $this = $(this);
+		var $rolesOptions = $this.closest('.roles-options');
+		var $span = $rolesOptions.children('span');
 
 		// Correctly show selected option
 		if (typeof $this.attr('data-selected') !== 'undefined') {
-			$rolesOptions.closest('.roles-options')
+			$rolesOptions
 				.children('span')
 				.text($this.text())
 				.attr('data-default', $this.text())
 				.attr('data-default-val', $this.attr('data-id'));
+
+			// Save default text of drop down if there is no default set yet
+			if (typeof $span.attr('data-default') === 'undefined') {
+				$span.attr('data-default', $span.text());
+			}
+
+			// Prepare resetting drop down on form reset
+			$this.closest('form').on('reset', function () {
+				$span.text($span.attr('data-default'));
+				$rolesOptions.children('input[type=hidden]')
+					.val($span.attr('data-default-val'));
+			});
 		}
 
 		$this.on('mouseover', function () {
@@ -163,6 +175,7 @@ phpbb.prepareRolesDropdown = function () {
 			$this.addClass('roles-highlight');
 		}).on('click', function () {
 			var $this = $(this);
+			var $rolesOptions = $this.closest('.roles-options');
 
 			// Update settings
 			set_role_settings($this.attr('data-id'), $this.attr('data-target-id'));
@@ -178,19 +191,6 @@ phpbb.prepareRolesDropdown = function () {
 			$('body').trigger('click');
 		});
 	});
-
-	// Save default text of drop down if there is no default set yet
-	if (typeof $span.attr('data-default') === 'undefined') {
-		$span.attr('data-default', $span.text());
-	}
-
-	// Prepare resetting drop down on form reset
-	$options.closest('form').on('reset', function () {
-		$span.text($span.attr('data-default'));
-		$rolesOptions.children('input[type=hidden]')
-			.val($span.attr('data-id'));
-	});
-
 };
 
 // Run onload functions for RolesDropdown and tooltips
-- 
cgit v1.2.1


From 4cfba8f3a40c424d831b6034bdf1dc4975822406 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 6 Feb 2016 09:33:33 +0100
Subject: [ticket/14315] Build role options for each permission group

Previously all role options were put into one array. This required
filtering the options. Instead, these are now passed to the template
via template loops.

PHPBB3-14315
---
 phpBB/adm/style/permission_mask.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index aa18a40cb7..721fc42473 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -39,16 +39,14 @@
 		</div>
 		<dl class="permissions-simple">
 			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>
-			{% if role_options %}
+			{% if p_mask.f_mask.role_options %}
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
 					<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
 						<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
 						<div class="dropdown hidden">
 							<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" >
-								{% for role in loops.role_options %}
-									{% if role.UG_ID == p_mask.f_mask.UG_ID %}
+								{% for role in p_mask.f_mask.role_options %}
 									<li data-id="{{ role.ID }}" data-target-id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" data-title="{{ role.TITLE }}"{% if role.SELECTED == true %} data-selected="{{ role.SELECTED }}"{% endif %}>{{ role.ROLE_NAME }}</li>
-									{% endif %}
 								{% endfor %}
 							</ul>
 						</div>
-- 
cgit v1.2.1


From 32815faa3357e307a7459a88baabeb2c9cd5de0d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 16 Feb 2016 17:06:07 +0100
Subject: [ticket/14315] Tweak location of drop-down

PHPBB3-14315
---
 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 4bb9922d56..e537e970a3 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2471,7 +2471,7 @@ fieldset.permissions .padding {
 
 .roles-options > .dropdown {
 	left: auto;
-	top: 3em;
+	top: 3.2em;
 	width: 250px;
 }
 
-- 
cgit v1.2.1


From 6f41fcb3d615557c79892bc8d0c43d523a2c1959 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 16 Feb 2016 17:32:33 +0100
Subject: [ticket/14315] Add back roles select for disable javascript

The javascript will hide the old select and show the version using
the span and showing the tooltips.

PHPBB3-14315
---
 phpBB/adm/style/admin.css            | 2 +-
 phpBB/adm/style/permission_mask.html | 1 +
 phpBB/adm/style/tooltip.js           | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index e537e970a3..e1668bf70b 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2489,7 +2489,7 @@ fieldset.permissions .padding {
 	border-radius: 3px;
 	padding: 4px;
 	width: 250px;
-	display: block;
+	display: none;
 	background: url('../images/arrow_down.gif') no-repeat 245px .7em;
 }
 
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 721fc42473..cddcac170f 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -42,6 +42,7 @@
 			{% if p_mask.f_mask.role_options %}
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
 					<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
+						<select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select>
 						<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
 						<div class="dropdown hidden">
 							<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" >
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 3abeefbffe..b38418876d 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -142,6 +142,10 @@ phpbb.positionTooltip = function ($element) {
 phpbb.prepareRolesDropdown = function () {
 	var $options = $('.roles-options li');
 
+	// Display span and hide select
+	$('.roles-options > span').css('display', 'block');
+	$('.roles-options > select').hide();
+
 	// Prepare highlighting of select options and settings update
 	$options.each(function () {
 		var $this = $(this);
-- 
cgit v1.2.1


From 620a8622660c5a00f56ce686e397ed09d9cd4039 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 17 Feb 2016 12:56:19 +0100
Subject: [ticket/14315] Add functional tests for permission roles and fix
 non-js

Without JS the settings were not applied due to duplicate input names.

PHPBB3-14315
---
 phpBB/adm/style/permission_mask.html | 4 ++--
 phpBB/adm/style/tooltip.js           | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index cddcac170f..017d29d832 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -42,7 +42,7 @@
 			{% if p_mask.f_mask.role_options %}
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
 					<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
-						<select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select>
+						<select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]">{p_mask.f_mask.S_ROLE_OPTIONS}</select>
 						<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
 						<div class="dropdown hidden">
 							<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" >
@@ -51,7 +51,7 @@
 								{% endfor %}
 							</ul>
 						</div>
-						<input type="hidden" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if p_mask.f_mask.S_ROLE_ID %}value="{{ p_mask.f_mask.S_ROLE_ID }}"{% endif %} />
+						<input type="hidden" data-name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if p_mask.f_mask.S_ROLE_ID %}value="{{ p_mask.f_mask.S_ROLE_ID }}"{% endif %} />
 					</div>
 				</dd>
 			{% else %}
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index b38418876d..65773ae14f 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -145,6 +145,13 @@ phpbb.prepareRolesDropdown = function () {
 	// Display span and hide select
 	$('.roles-options > span').css('display', 'block');
 	$('.roles-options > select').hide();
+	$('.roles-options > input[type=hidden]').each(function () {
+		var $this = $(this);
+
+		if ($this.attr('data-name') && !$this.attr('name')) {
+			$this.attr('name', $this.attr('data-name'));
+		}
+	});
 
 	// Prepare highlighting of select options and settings update
 	$options.each(function () {
-- 
cgit v1.2.1


From 48d6abcf0a28d33363c8da596570bfe8637d246c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 26 Nov 2016 23:10:47 +0100
Subject: [ticket/9590] Update permissions with correct permission role

PHPBB3-9590
---
 phpBB/adm/style/ajax.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 7ddd2d3742..3c1c57505b 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -70,6 +70,7 @@ function submitPermissions() {
 	var $form = $('form#set-permissions'),
 		fieldsetList = $form.find('fieldset[id^=perm]'),
 		formDataSets = [],
+		dataSetIndex = 0,
 		$submitAllButton = $form.find('input[type=submit][name^=action]')[0],
 		$submitButton = $form.find('input[type=submit][data-clicked=true]')[0];
 
@@ -84,10 +85,21 @@ function submitPermissions() {
 	}
 
 	$.each(fieldsetList, function (key, value) {
+		dataSetIndex = Math.floor(key / 5);
+		var $fieldset = $('fieldset#' + value.id);
 		if (key % 5 === 0) {
-			formDataSets[Math.floor(key / 5)] = $form.find('fieldset#' + value.id).serialize();
+			formDataSets[dataSetIndex] = $fieldset.find('select:visible, input:not([data-name])').serialize();
 		} else {
-			formDataSets[Math.floor(key / 5)] += '&' + $form.find('fieldset#' + value.id).serialize();
+			formDataSets[dataSetIndex] += '&' + $fieldset.find('select:visible, input:not([data-name])').serialize();
+		}
+
+		// Find proper role value
+		var roleInput = $fieldset.find('input[name^=role][data-name]');
+		if (roleInput.val()) {
+			formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '=' + roleInput.val();
+		} else {
+			formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '=' +
+				$fieldset.find('select[name="' + roleInput.attr('name') + '"]').val();
 		}
 	});
 
-- 
cgit v1.2.1


From b24c2ea5be700b09053c9916f15f807c195d151b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 1 Dec 2016 11:34:00 +0100
Subject: [ticket/14736] Reset role dropdown when modifying permissions

PHPBB3-14736
---
 phpBB/adm/style/tooltip.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 65773ae14f..8781e2b509 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -211,6 +211,23 @@ $(function() {
 
 	// Prepare dropdown
 	phpbb.prepareRolesDropdown();
+
+	// Reset role drop-down on modifying permissions in advanced tab
+	$('div.permissions-switch > a').on('click', function () {
+		$.each($('input[type=radio][name^="setting["]'), function () {
+			var $this = $(this);
+			$this.on('click', function () {
+				var $rolesOptions = $this.closest('fieldset.permissions').find('.roles-options'),
+					rolesSelect = $rolesOptions.find('select > option')[0];
+
+				// Set selected setting
+				$rolesOptions.children('span')
+					.text(rolesSelect.text);
+				$rolesOptions.children('input[type=hidden]')
+					.val(rolesSelect.value);
+			});
+		});
+	});
 });
 
 })(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From c5e0635bc79197011744394a221b5ccdcf305fc6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 30 Jan 2016 12:21:30 +0100
Subject: [ticket/14492] Add basic layout for enabling viglink

PHPBB3-14492
---
 phpBB/adm/style/acp_send_statistics.html | 18 ++++++++--
 phpBB/adm/style/admin.css                | 61 ++++++++++++++++++++++++++++++++
 phpBB/adm/style/overall_header.html      |  1 +
 3 files changed, 78 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

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}">&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 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">
-- 
cgit v1.2.1


From 6f315da9ab3eaa8e680414eeed6d763a9e2102b6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 31 Jan 2016 15:23:17 +0100
Subject: [ticket/14492] Improve look and display data again

PHPBB3-14492
---
 phpBB/adm/style/acp_send_statistics.html |  85 ++++++++++++--------------
 phpBB/adm/style/admin.css                | 100 +++++++++++++++++++++++--------
 phpBB/adm/style/admin.js                 |   9 ++-
 3 files changed, 121 insertions(+), 73 deletions(-)

(limited to 'phpBB/adm/style')

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);
-- 
cgit v1.2.1


From c1035c98e455548fe14fbf5443bb98137d4e3d5d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 31 Jan 2016 23:49:17 +0100
Subject: [ticket/14492] Rename files to  help_phpbb and fix css tabbing

PHPBB3-14492
---
 phpBB/adm/style/acp_help_phpbb.html      | 52 +++++++++++++++++++++++
 phpBB/adm/style/acp_send_statistics.html | 71 --------------------------------
 phpBB/adm/style/admin.css                | 61 +++++++++++++--------------
 3 files changed, 83 insertions(+), 101 deletions(-)
 create mode 100644 phpBB/adm/style/acp_help_phpbb.html
 delete mode 100644 phpBB/adm/style/acp_send_statistics.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html
new file mode 100644
index 0000000000..a984b25b25
--- /dev/null
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -0,0 +1,52 @@
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+
+<h1>{L_SEND_STATISTICS}</h1>
+
+<div class="send-stats-row">
+	<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" checked="checked" />
+				<label for="enable-stats"></label>
+			</dt>
+			<dd>{L_SEND_STATISTICS}</dd>
+		</dl>
+	</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>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html
deleted file mode 100644
index b45886f943..0000000000
--- a/phpBB/adm/style/acp_send_statistics.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-
-<h1>{L_SEND_STATISTICS}</h1>
-
-<div class="send-stats-row">
-	<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-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;">
-<script type="text/javascript">
-//<![CDATA[
-var iframect = 0;
-
-function iframe_updated()
-{
-	if (iframect++ == 0)
-	{
-		return;
-	}
-
-	phpbb.toggleDisplay('questionnaire-form', -1);
-	phpbb.toggleDisplay('questionnaire-thanks', 1);
-}
-//]]>
-</script>
-
-</div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index afa0bd5d31..d4df01dba7 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2624,72 +2624,73 @@ fieldset.permissions .padding {
 }
 
 .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;
+	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;
+	display: none;
 }
 
 .send-stats-data-only-row {
-    border-radius: 6px !important;
-    border-bottom-width: 1px !important;
+	border-radius: 6px !important;
+	border-bottom-width: 1px !important;
 }
 
 .send-stats-data-hidden {
-    padding: 0;
-    border: none;
+	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;
+	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;
+	min-width: 25px;
 }
 
 .send-stats-settings dd {
-    line-height: 1.5em;
+	line-height: 1.5em;
 }
 
 .send-stats-settings input {
-    display: none;
+	display: none;
 }
 
 .send-stats-settings input[type=checkbox] + label:before {
-    content: "\f096";
-    font-family: FontAwesome;
-    font-size: 1.5em;
+	content: "\f096";
+	font-family: FontAwesome;
+	font-size: 1.5em;
 }
 
 .send-stats-settings input[type=checkbox]:checked + label:before {
-    content: "\f14a";
-    color: #3c763d;
+	content: "\f14a";
+	color: #3c763d;
 }
 
 .send-stats-data-row a:hover span {
-    text-decoration: underline;
+	text-decoration: underline;
 }
 
 .send-stats-data-row a {
-    text-decoration: none;
+	text-decoration: none;
+	cursor: default;
 }
 
 .send-stats-data-row i {
-    padding-left: 6px;
+	padding-left: 6px;
 }
 
 .configlist {
-- 
cgit v1.2.1


From 9fb2a5d5f8ed4c23689843178a4a06a151d146e6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 1 Feb 2016 00:01:26 +0100
Subject: [ticket/14492] Update language variables and trigger details text

PHPBB3-14492
---
 phpBB/adm/style/acp_help_phpbb.html | 6 +++---
 1 file changed, 3 insertions(+), 3 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 a984b25b25..347d39af86 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -2,7 +2,7 @@
 
 <a id="maincontent"></a>
 
-<h1>{L_SEND_STATISTICS}</h1>
+<h1>{L_ACP_HELP_PHPBB}</h1>
 
 <div class="send-stats-row">
 	<div class="send-stats-tile">
@@ -10,7 +10,7 @@
 		<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>
+				<a id="trigger-configlist" data-ajax="toggle_link" data-toggle-text="{L_HIDE_STATISTICS}"><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">
@@ -33,7 +33,7 @@
 				<input id="enable-stats" type="checkbox" checked="checked" />
 				<label for="enable-stats"></label>
 			</dt>
-			<dd>{L_SEND_STATISTICS}</dd>
+			<dd>{L_SEND_STATISTICS_LONG}</dd>
 		</dl>
 	</div>
 	<div class="send-stats-tile">
-- 
cgit v1.2.1


From cc7a0aa4fb2d6c8efd5c78df7d68328c9f8d4d32 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 1 Feb 2016 13:55:36 +0100
Subject: [ticket/14492] Use guzzle for submitting data to stats service

PHPBB3-14492
---
 phpBB/adm/style/acp_help_phpbb.html | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html
index 347d39af86..cbbe42e8c7 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -4,6 +4,7 @@
 
 <h1>{L_ACP_HELP_PHPBB}</h1>
 
+<form id="acp_board" method="post" action="{U_ACTION}">
 <div class="send-stats-row">
 	<div class="send-stats-tile">
 		<h2><i class="icon fa-bar-chart"></i>Send statistics</h2>
@@ -47,6 +48,13 @@
 			<dd>Enable</dd>
 		</dl>
 	</div>
+	<fieldset>
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+		</p>
+		{S_FORM_TOKEN}
+	</fieldset>
 </div>
+</form>
 
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From c07ecb060dd04c76d8bd166a0a8a7226a8167f06 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 2 Feb 2016 12:19:55 +0100
Subject: [ticket/14492] Add events for modifying help phpBB page

PHPBB3-14492
---
 phpBB/adm/style/acp_help_phpbb.html | 17 ++++-------------
 phpBB/adm/style/admin.css           |  6 ------
 2 files changed, 4 insertions(+), 19 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 cbbe42e8c7..a9406e2c2e 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -6,6 +6,7 @@
 
 <form id="acp_board" method="post" action="{U_ACTION}">
 <div class="send-stats-row">
+	<!-- EVENT acp_help_phpbb_stats_before -->
 	<div class="send-stats-tile">
 		<h2><i class="icon fa-bar-chart"></i>Send statistics</h2>
 		<p>{L_EXPLAIN_SEND_STATISTICS}</p>
@@ -31,23 +32,13 @@
 		</div>
 		<dl class="send-stats-settings">
 			<dt>
-				<input id="enable-stats" type="checkbox" checked="checked" />
-				<label for="enable-stats"></label>
+				<input id="help_send_statistics" type="checkbox"<!-- IF S_COLLECT_STATS --> checked="checked"<!-- ENDIF --> />
+				<label for="help_send_statistics"></label>
 			</dt>
 			<dd>{L_SEND_STATISTICS_LONG}</dd>
 		</dl>
 	</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>
+	<!-- EVENT acp_help_phpbb_stats_after -->
 	<fieldset>
 		<p class="submit-buttons">
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index d4df01dba7..bcf01fe597 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2612,12 +2612,6 @@ fieldset.permissions .padding {
 	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;
-- 
cgit v1.2.1


From 80a63a9a94af042da37227ed747eba0feeac1049 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 20 Feb 2016 11:58:36 +0100
Subject: [ticket/14492] Add missing input name

PHPBB3-14492
---
 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 a9406e2c2e..d2f5e76916 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -32,7 +32,7 @@
 		</div>
 		<dl class="send-stats-settings">
 			<dt>
-				<input id="help_send_statistics" type="checkbox"<!-- IF S_COLLECT_STATS --> checked="checked"<!-- ENDIF --> />
+				<input name="help_send_statistics" id="help_send_statistics" type="checkbox"<!-- IF S_COLLECT_STATS --> checked="checked"<!-- ENDIF --> />
 				<label for="help_send_statistics"></label>
 			</dt>
 			<dd>{L_SEND_STATISTICS_LONG}</dd>
-- 
cgit v1.2.1


From 89fef2ce13a183c7b963032274f455a09a05f325 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 21 Feb 2016 22:14:58 +0100
Subject: [ticket/14492] Send statistics via ajax request

Flooding ajax requests will try to be prevented and sending
stats without JS will also properly work.

PHPBB3-14492
---
 phpBB/adm/style/acp_help_phpbb.html | 16 ++++--
 phpBB/adm/style/admin.js            |  7 ++-
 phpBB/adm/style/ajax.js             | 99 +++++++++++++++++++++++++++++++++++++
 3 files changed, 118 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 d2f5e76916..48a4595913 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -4,7 +4,7 @@
 
 <h1>{L_ACP_HELP_PHPBB}</h1>
 
-<form id="acp_board" method="post" action="{U_ACTION}">
+<form id="acp_help_phpbb" method="post" action="{U_ACTION}" data-ajax-action="{U_COLLECT_STATS}">
 <div class="send-stats-row">
 	<!-- EVENT acp_help_phpbb_stats_before -->
 	<div class="send-stats-tile">
@@ -12,9 +12,9 @@
 		<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" data-ajax="toggle_link" data-toggle-text="{L_HIDE_STATISTICS}"><span>{L_SHOW_STATISTICS}</span><i class="icon fa-angle-down"></i></a>
+				<a id="trigger-configlist" data-ajax="toggle_link" data-overlay="false" data-toggle-text="{L_HIDE_STATISTICS}"><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="send-stats-data-row">
 				<div class="configlist" id="configlist">
 					<!-- BEGIN providers -->
 					<fieldset>
@@ -41,11 +41,21 @@
 	<!-- EVENT acp_help_phpbb_stats_after -->
 	<fieldset>
 		<p class="submit-buttons">
+			<input type="hidden" name="systemdata" value="{RAW_DATA}" />
+			<input type="hidden" name="help_send_statistics_time" value="{COLLECT_STATS_TIME}" />
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
 		</p>
 		{S_FORM_TOKEN}
 	</fieldset>
 </div>
 </form>
+<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
+	<fieldset>
+		<p class="submit-buttons">
+			<input type="hidden" name="systemdata" value="{RAW_DATA}" />
+			<input class="button1" type="submit" id="submit_stats" name="submit" value="{L_SEND_STATISTICS}" />
+		</p>
+	</fieldset>
+</form>
 
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index e42fdb380a..551c78a4a3 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -243,11 +243,16 @@ function parse_document(container)
 
 		parse_document($('body'));
 
-		$('#trigger-configlist').on('click', function () {
+		$('#questionnaire-form').css('display', 'none');
+		var $triggerConfiglist = $('#trigger-configlist');
+
+		$triggerConfiglist.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');
 		});
+
+		$('#configlist').closest('.send-stats-data-row').addClass('send-stats-data-hidden');
 	});
 })(jQuery);
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 3c1c57505b..1d4e00dfa4 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -4,6 +4,101 @@
 
 'use strict';
 
+
+phpbb.prepareSendStats = function () {
+	var $form = $('#acp_help_phpbb');
+	var $dark = $('#darkenwrapper');
+	var $loadingIndicator;
+
+	$form.on('submit', function () {
+		var $this = $(this),
+			currentTime = Math.floor(new Date().getTime() / 1000),
+			statsTime = parseInt($this.find('input[name=help_send_statistics_time]').val(), 10);
+
+		event.preventDefault();
+		$this.unbind('submit');
+
+		// Skip ajax request if form is submitted too early or send stats
+		// checkbox is not checked
+		if (!$this.find('input[name=help_send_statistics]').is(':checked') ||
+			statsTime > currentTime) {
+			$form.find('input[type=submit]').click();
+			setTimeout(function () {
+				$form.find('input[type=submit]').click();
+			}, 300);
+			return;
+		}
+
+		/**
+		 * Handler for AJAX errors
+		 */
+		function errorHandler(jqXHR, textStatus, errorThrown) {
+			if (typeof console !== 'undefined' && console.log) {
+				console.log('AJAX error. status: ' + textStatus + ', message: ' + errorThrown);
+			}
+			phpbb.clearLoadingTimeout();
+			var errorText = '';
+
+			if (typeof errorThrown === 'string' && errorThrown.length > 0) {
+				errorText = errorThrown;
+			} else {
+				errorText = $dark.attr('data-ajax-error-text-' + textStatus);
+				if (typeof errorText !== 'string' || !errorText.length) {
+					errorText = $dark.attr('data-ajax-error-text');
+				}
+			}
+			phpbb.alert($dark.attr('data-ajax-error-title'), errorText);
+		}
+
+		/**
+		 * This is a private function used to handle the callbacks, refreshes
+		 * and alert. It calls the callback, refreshes the page if necessary, and
+		 * displays an alert to the user and removes it after an amount of time.
+		 *
+		 * It cannot be called from outside this function, and is purely here to
+		 * avoid repetition of code.
+		 *
+		 * @param {object} res The object sent back by the server.
+		 */
+		function returnHandler(res) {
+			phpbb.clearLoadingTimeout();
+
+			// If a confirmation is not required, display an alert and call the
+			// callbacks.
+			$dark.fadeOut(phpbb.alertTime);
+
+			if ($loadingIndicator) {
+				$loadingIndicator.fadeOut(phpbb.alertTime);
+			}
+
+			var $sendStatisticsSuccess = $('<input />', {
+				type: 'hidden',
+				name: 'send_statistics_response',
+				value: res
+			});
+			$sendStatisticsSuccess.appendTo('p.submit-buttons');
+
+			// Finish actual form submission
+			$form.find('input[type=submit]').click();
+		}
+
+		$loadingIndicator = phpbb.loadingIndicator();
+
+		$.ajax({
+			url: $this.attr('data-ajax-action').replace('&amp;', '&'),
+			type: 'POST',
+			data: 'systemdata=' + $this.find('input[name=systemdata]').val(),
+			success: returnHandler,
+			error: errorHandler,
+			cache: false
+		}).always(function() {
+			if ($loadingIndicator && $loadingIndicator.is(':visible')) {
+				$loadingIndicator.fadeOut(phpbb.alertTime);
+			}
+		});
+	});
+};
+
 /**
  * The following callbacks are for reording items. row_down
  * is triggered when an item is moved down, and row_up is triggered when
@@ -225,6 +320,10 @@ $(function() {
 			$(this).attr('data-clicked', true);
 		});
 	}
+
+	if ($('#acp_help_phpbb')) {
+		phpbb.prepareSendStats();
+	}
 });
 
 
-- 
cgit v1.2.1


From afe16a62724451cb5c7eca7864a3c110404f4e2a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 3 Sep 2016 10:47:20 +0200
Subject: [ticket/14492] Add missing event variable

PHPBB3-14492
---
 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 1d4e00dfa4..28f761bc0b 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -10,7 +10,7 @@ phpbb.prepareSendStats = function () {
 	var $dark = $('#darkenwrapper');
 	var $loadingIndicator;
 
-	$form.on('submit', function () {
+	$form.on('submit', function (event) {
 		var $this = $(this),
 			currentTime = Math.floor(new Date().getTime() / 1000),
 			statsTime = parseInt($this.find('input[name=help_send_statistics_time]').val(), 10);
-- 
cgit v1.2.1


From 9b4190e1365aed639068d341cb4296e895ad4ba1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 9 Nov 2016 22:02:46 +0100
Subject: [ticket/14492] Encode URI components in systemdata for stats

The stats data needs to be URI encoded to prevent issues when
submitting the data to the receive_stats script on www.phpbb.com.

PHPBB3-14492
---
 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 28f761bc0b..d5154b2a61 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -87,7 +87,7 @@ phpbb.prepareSendStats = function () {
 		$.ajax({
 			url: $this.attr('data-ajax-action').replace('&amp;', '&'),
 			type: 'POST',
-			data: 'systemdata=' + $this.find('input[name=systemdata]').val(),
+			data: 'systemdata=' + encodeURIComponent($this.find('input[name=systemdata]').val()),
 			success: returnHandler,
 			error: errorHandler,
 			cache: false
-- 
cgit v1.2.1


From a2793f24b1b4394871e897679fd407ba703d1937 Mon Sep 17 00:00:00 2001
From: Derky <derky@phpbb.com>
Date: Fri, 9 Dec 2016 20:03:00 +0100
Subject: [ticket/14901] Remove notice for extension without version check

Extensions without version check should not display a notice on the
details page in the ACP.

PHPBB3-14901
---
 phpBB/adm/style/acp_ext_details.html | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 830c2e3cb4..4c1feb59a9 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -7,19 +7,17 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<!-- IF S_VERSIONCHECK -->
-	<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
-		<p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-	</div>
-	<!-- ELSE IF S_VERSIONCHECK_STATUS == 0 -->
-	<div class="errorbox notice">
-		<p>{L_VERSIONCHECK_FAIL}</p>
-		<p>{VERSIONCHECK_FAIL_REASON}</p>
-		<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-	</div>
-	<!-- ELSE IF S_VERSIONCHECK_STATUS == 1 -->
-	<div class="errorbox notice">
-		<p>{VERSIONCHECK_FAIL_REASON}</p>
-	</div>
+		<!-- IF S_VERSIONCHECK_FAIL -->
+		<div class="errorbox notice">
+			<p>{L_VERSIONCHECK_FAIL}</p>
+			<p>{VERSIONCHECK_FAIL_REASON}</p>
+			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+		</div>
+		<!-- ELSE -->
+		<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
+			<p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+		</div>
+		<!-- ENDIF -->
 	<!-- ENDIF -->
 
 	<fieldset>
-- 
cgit v1.2.1


From dfe42e96035ed63e92f8c14a553c3631c1ea08e4 Mon Sep 17 00:00:00 2001
From: Christian Schnegelberger <mail@crizzo.de>
Date: Sat, 10 Dec 2016 21:50:09 +0100
Subject: [ticket/14908] Uses lang-variable instead of english text

PHPBB3-14908
---
 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 48a4595913..478ecc162a 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -8,7 +8,7 @@
 <div class="send-stats-row">
 	<!-- EVENT acp_help_phpbb_stats_before -->
 	<div class="send-stats-tile">
-		<h2><i class="icon fa-bar-chart"></i>Send statistics</h2>
+		<h2><i class="icon fa-bar-chart"></i>{L_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">
-- 
cgit v1.2.1


From 80ecad5cf922527b976680d570041bd47f888d5d Mon Sep 17 00:00:00 2001
From: Vinny <vinny@suportephpbb.com.br>
Date: Wed, 1 Feb 2017 02:34:01 -0300
Subject: [ticket/15062] Update to Rhea version the CSS files

PHPBB3-15062
---
 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 bcf01fe597..d46530700f 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1,4 +1,4 @@
-/*  phpBB 3.1 Admin Style Sheet
+/*  phpBB 3.2 Admin Style Sheet
 	------------------------------------------------------------------------
 	Original author:	subBlue ( http://www.subblue.com/ )
 	Copyright (c) phpBB Limited <https://www.phpbb.com>
-- 
cgit v1.2.1


From b4821907b7f8acf84229f95018688636c8aad159 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 11 Feb 2017 11:19:46 +0100
Subject: [ticket/15083] Fix invalid emoji sizing in ACP & print view

PHPBB3-15083
---
 phpBB/adm/style/admin.css | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index d46530700f..2ad964e6bb 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2691,3 +2691,10 @@ fieldset.permissions .padding {
 	word-wrap: break-word;
 	word-break: break-all;
 }
+
+.emoji {
+	min-height: 18px;
+	min-width: 18px;
+	height: 1em;
+	width: 1em;
+}
-- 
cgit v1.2.1


From c06f4756eca4dfbbdad8984a62976745aeb183dd Mon Sep 17 00:00:00 2001
From: nomind60s <nomind60s@users.noreply.github.com>
Date: Fri, 17 Feb 2017 13:44:42 -0700
Subject: [ticket/15097] Add PHP version to Board statistics

The ACP main page shows the phpBB version and the database version,
but didn't show the PHP version.

With this change the PHP version is displayed as part of the
Board statistics.

PHPBB3-15097
---
 phpBB/adm/style/acp_main.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 1bdb7b8d2a..944cf10ea5 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -167,6 +167,10 @@
 		<td>&nbsp;</td>
 	<!-- ENDIF -->
 	</tr>
+        <tr>
+        <td>{L_PHP_VERSION}{L_COLON} </td>
+        <td><strong>{PHP_VERSION}</strong></td>
+    </tr>
 	<!-- ENDIF -->
 	</tbody>
 	</table>
-- 
cgit v1.2.1


From c30ad4ce60267a1301a406c3d0279f95b856f5a5 Mon Sep 17 00:00:00 2001
From: nomind60s <nomind60s@users.noreply.github.com>
Date: Fri, 17 Feb 2017 14:19:18 -0700
Subject: [ticket/15097] Add PHP version to Board statistics

Rework commit message per DavidIQ's guidance and change variable name
to avoid confusion

PHPBB3-15907
---
 phpBB/adm/style/acp_main.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 944cf10ea5..5f8040b57e 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -169,7 +169,7 @@
 	</tr>
         <tr>
         <td>{L_PHP_VERSION}{L_COLON} </td>
-        <td><strong>{PHP_VERSION}</strong></td>
+        <td><strong>{PHP_VERSION_INFO}</strong></td>
     </tr>
 	<!-- ENDIF -->
 	</tbody>
-- 
cgit v1.2.1


From f677376b8ca4451e3a0c415f603ad1513ed24ef7 Mon Sep 17 00:00:00 2001
From: nomind60s <nomind60s@users.noreply.github.com>
Date: Sun, 19 Feb 2017 11:49:07 -0700
Subject: [ticket/15097] New 'Installed software' lead section

Created a new lead section showing the installed software (phpBB,
PHP and Database server) and their versions. Implementation is
inspired by MediaWiki's Special:Version page.

Removed those items from Board statistics section.

PHPBB3-15097
---
 phpBB/adm/style/acp_main.html | 59 +++++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 24 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 5f8040b57e..e306ce78e9 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -94,15 +94,45 @@
 
 	<!-- EVENT acp_main_notice_after -->
 
+	<table class="table1 no-header" style="width: auto;" data-no-responsive-header="true">
+		<caption>{L_SOFTWARE_HEADING}</caption>
+		<col class="col1" /><col class="col2" />
+	<thead>
+	<tr>
+		<th>{L_SOFTWARE_PRODUCT}</th>
+		<th>{L_SOFTWARE_VERSION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<td>{L_BOARD_VERSION}</td>
+	<!-- IF S_VERSIONCHECK -->
+		<td><strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+		</td>
+	<!-- ELSE -->
+		<td><strong>{BOARD_VERSION}</strong></td>
+	<!-- ENDIF -->
+	</tr>
+	<tr>
+		<td>{L_PHP_VERSION}</td>
+		<td><strong>{PHP_VERSION_INFO}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_DATABASE_SERVER_INFO}</td>
+		<td><strong>{DATABASE_INFO}</strong></td>
+	</tr>
+	</tbody>
+	</table>
+
 	<table class="table1 two-columns no-header" data-no-responsive-header="true">
 		<caption>{L_FORUM_STATS}</caption>
 		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 	<thead>
 	<tr>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
+		<th style="width: 25%">{L_STATISTIC}</th>
+		<th style="width: 25%">{L_VALUE}</th>
+		<th style="width: 25%">{L_STATISTIC}</th>
+		<th style="width: 25%">{L_VALUE}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -130,8 +160,6 @@
 		<td>{L_FILES_PER_DAY}{L_COLON} </td>
 		<td><strong>{FILES_PER_DAY}</strong></td>
 	</tr>
-
-
 	<tr>
 		<td>{L_BOARD_STARTED}{L_COLON} </td>
 		<td><strong>{START_DATE}</strong></td>
@@ -145,33 +173,16 @@
 		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>
-		<td><strong>{DATABASE_INFO}</strong></td>
 		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
 		<td><strong>{GZIP_COMPRESSION}</strong></td>
-	</tr>
-	<!-- IF S_TOTAL_ORPHAN or S_VERSIONCHECK -->
-	<tr>
-	<!-- IF S_VERSIONCHECK -->
-		<td>{L_BOARD_VERSION}{L_COLON} </td>
-		<td>
-			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
-		</td>
-	<!-- ENDIF -->
 	<!-- IF S_TOTAL_ORPHAN -->
 		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
 		<td><strong>{TOTAL_ORPHAN}</strong></td>
-	<!-- ENDIF -->
-	<!-- IF not S_TOTAL_ORPHAN or not S_VERSIONCHECK -->
+	<!-- ELSE -->
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
 	<!-- ENDIF -->
 	</tr>
-        <tr>
-        <td>{L_PHP_VERSION}{L_COLON} </td>
-        <td><strong>{PHP_VERSION_INFO}</strong></td>
-    </tr>
-	<!-- ENDIF -->
 	</tbody>
 	</table>
 
-- 
cgit v1.2.1


From f36eb932a4bfe0e56fd01753531dbc7a31db1b1f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 8 Mar 2017 21:36:27 +0100
Subject: [ticket/15083] Add stylelint exceptions for admin.css

PHPBB3-15083
---
 phpBB/adm/style/admin.css | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 2ad964e6bb..2322b3da88 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2692,9 +2692,11 @@ fieldset.permissions .padding {
 	word-break: break-all;
 }
 
+/* stylelint-disable declaration-property-unit-whitelist */
 .emoji {
 	min-height: 18px;
 	min-width: 18px;
 	height: 1em;
 	width: 1em;
 }
+/* stylelint-enable declaration-property-unit-whitelist */
-- 
cgit v1.2.1


From 95f61af798a304e3edce6cca3ab6489e02806b04 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 26 Apr 2017 09:34:15 -0700
Subject: [ticket/15198] Add PHP version to board stats in the ACP

PHPBB3-15198
---
 phpBB/adm/style/acp_main.html | 54 ++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index e306ce78e9..9522baa9c2 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -94,45 +94,15 @@
 
 	<!-- EVENT acp_main_notice_after -->
 
-	<table class="table1 no-header" style="width: auto;" data-no-responsive-header="true">
-		<caption>{L_SOFTWARE_HEADING}</caption>
-		<col class="col1" /><col class="col2" />
-	<thead>
-	<tr>
-		<th>{L_SOFTWARE_PRODUCT}</th>
-		<th>{L_SOFTWARE_VERSION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td>{L_BOARD_VERSION}</td>
-	<!-- IF S_VERSIONCHECK -->
-		<td><strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
-		</td>
-	<!-- ELSE -->
-		<td><strong>{BOARD_VERSION}</strong></td>
-	<!-- ENDIF -->
-	</tr>
-	<tr>
-		<td>{L_PHP_VERSION}</td>
-		<td><strong>{PHP_VERSION_INFO}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_DATABASE_SERVER_INFO}</td>
-		<td><strong>{DATABASE_INFO}</strong></td>
-	</tr>
-	</tbody>
-	</table>
-
 	<table class="table1 two-columns no-header" data-no-responsive-header="true">
 		<caption>{L_FORUM_STATS}</caption>
 		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 	<thead>
 	<tr>
-		<th style="width: 25%">{L_STATISTIC}</th>
-		<th style="width: 25%">{L_VALUE}</th>
-		<th style="width: 25%">{L_STATISTIC}</th>
-		<th style="width: 25%">{L_VALUE}</th>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -173,8 +143,14 @@
 		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
 	</tr>
 	<tr>
+		<td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>
+		<td><strong>{DATABASE_INFO}</strong></td>
 		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
 		<td><strong>{GZIP_COMPRESSION}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_PHP_VERSION}{L_COLON} </td>
+		<td><strong>{PHP_VERSION_INFO}</strong></td>
 	<!-- IF S_TOTAL_ORPHAN -->
 		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
 		<td><strong>{TOTAL_ORPHAN}</strong></td>
@@ -183,6 +159,16 @@
 		<td>&nbsp;</td>
 	<!-- ENDIF -->
 	</tr>
+	<!-- IF S_VERSIONCHECK -->
+	<tr>
+		<td>{L_BOARD_VERSION}{L_COLON} </td>
+		<td>
+			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+		</td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	<!-- ENDIF -->
 	</tbody>
 	</table>
 
-- 
cgit v1.2.1


From d84834db88ea54bc33a323457236943a56399747 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 23 Jul 2017 21:09:30 +0200
Subject: [ticket/15293] Prevent continuing to database update on incomplete
 file update

PHPBB3-15293
---
 phpBB/adm/style/acp_board.html      | 7 ++++---
 phpBB/adm/style/installer_form.html | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
index 64592a5de2..04dee98276 100644
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -18,10 +18,11 @@
 <!-- BEGIN options -->
 	<!-- IF options.S_LEGEND -->
 		<!-- IF not options.S_FIRST_ROW -->
-			</fieldset>
-		<!-- ENDIF -->
+		</fieldset>
+
 		<fieldset>
-			<legend>{options.LEGEND}</legend>
+		<!-- ENDIF -->
+		<legend>{options.LEGEND}</legend>
 	<!-- ELSE -->
 
 		<dl>
diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html
index cc5b041fa1..a38f33c7c2 100644
--- a/phpBB/adm/style/installer_form.html
+++ b/phpBB/adm/style/installer_form.html
@@ -49,7 +49,7 @@
 <fieldset class="submit-buttons">
 	<legend>{L_SUBMIT}</legend>
 	<!-- BEGIN submit_buttons -->
-	<input class="button1" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}" />
+	<input class="button1<!-- IF submit_buttons.DISABLED --> disabled<!-- ENDIF -->" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}"<!-- IF submit_buttons.DISABLED --> disabled="disabled"<!-- ENDIF --> />
 	<!-- END submit_buttons -->
 </fieldset>
 <!-- ENDIF -->
-- 
cgit v1.2.1


From b6cb353239b00ad08e76594973035283afc9afb1 Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Sun, 6 Aug 2017 14:22:57 +0200
Subject: [ticket/15307] Extensions may add modes to acp_users

Includes both PHP and Template events.

PHPBB3-15307
---
 phpBB/adm/style/acp_users.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 18c3d84f96..50b6ec9bc9 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -231,6 +231,10 @@
 
 	<!-- INCLUDE permission_mask.html -->
 
+<!-- ELSE -->
+
+	<!-- EVENT acp_users_mode_add -->
+
 <!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 9adf7474a9ca4a04da3636c1d867b8cdbcd07ea8 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sat, 9 Sep 2017 19:06:12 +0200
Subject: [ticket/15353] Fix html in acp_board.html

PHPBB3-15353
---
 phpBB/adm/style/acp_board.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
index 04dee98276..fe3e250099 100644
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -19,9 +19,9 @@
 	<!-- IF options.S_LEGEND -->
 		<!-- IF not options.S_FIRST_ROW -->
 		</fieldset>
+		<!-- ENDIF -->
 
 		<fieldset>
-		<!-- ENDIF -->
 		<legend>{options.LEGEND}</legend>
 	<!-- ELSE -->
 
-- 
cgit v1.2.1