Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11568-develop

* 'develop' of https://github.com/phpbb/phpbb3: (29 commits) [ticket/11588] Also use version.phpbb.com in install_update.php. [ticket/11587] Add functional tests for group teampage settings [ticket/11538] Add admin as admins leader and moderator in memberlist_test [ticket/11587] Pass legend and teampage settings to group_create() [ticket/11586] Move $filedata['thumbnail'] to where it might be returned. [ticket/11586] Combine $filedata['post_attach'] assign into a single statement. [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE. [ticket/11586] Combine administrator/moderator checks together. [ticket/11583] Use a new lang key instead of giving the old one a new meaning. [ticket/11122] Add dhruv to active authors [ticket/11122] Remove Oleg and igorw from active authors [ticket/10840] Add check_form_key to acp_groups.php [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. [ticket/11409] Add success message after updating group position settings [ticket/11549] Add functional test for ACP Extension Module with Template [ticket/11570] Fix link and make the notice more conspiciuous [ticket/11549] Do not set extension dir path for style in adm/index.php [ticket/11570] Add link back to update process [ticket/11569] Add type parameter and fix language variable [ticket/11569] Add parameter to URL and remove comment ... Conflicts: tests/functional/common_groups_test.php
author: Joas Schilling <nickvergessen@gmx.de> 2013-06-07 00:15:28 +0200
committer: Joas Schilling <nickvergessen@gmx.de> 2013-06-07 00:15:28 +0200
commit: 1d7c80b91210337845ae33267131bb82473b9a9f (patch)
tree: e9a254aa34b872d99244d09e715a8b3371382ec7 /phpBB/styles
parent: 8c4670eeb1264e2535021e400d2cf7e2c2028010 (diff)
parent: b4b1704a9b2f2c6e7770f478e27c5c408772f3ff (diff)
download: forums-1d7c80b91210337845ae33267131bb82473b9a9f.tar
forums-1d7c80b91210337845ae33267131bb82473b9a9f.tar.gz
forums-1d7c80b91210337845ae33267131bb82473b9a9f.tar.bz2
forums-1d7c80b91210337845ae33267131bb82473b9a9f.tar.xz
forums-1d7c80b91210337845ae33267131bb82473b9a9f.zip
4 files changed, 36 insertions, 80 deletions
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index fd4c68adfe..235cc0025b 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -401,7 +401,7 @@ function getCaretPosition(txtarea) {
 */
 (function($) {
 	$(document).ready(function() {
-		var doc, textarea, startTags, endTags;
+		var doc, textarea;
 
 		// find textarea, make sure browser supports necessary functions
 		if (document.forms[form_name]) {
@@ -415,81 +415,8 @@ function getCaretPosition(txtarea) {
 		}
 
 		textarea = doc.forms[form_name].elements[text_name];
-		if (!textarea || typeof textarea.selectionStart !== 'number') {
-			return;
-		}
-
-		// list of allowed start and end bbcode code tags, in lower case
-		startTags = ['[code]', '[code='];
-		endTags = ['[/code]'];
-
-		function inTag() {
-			var start = textarea.selectionStart,
-				lastEnd = -1,
-				lastStart = -1,
-				i, index, value;
-
-			value = textarea.value.toLowerCase();
-
-			for (i = 0; i < startTags.length; i++) {
-				var tagLength = startTags[i].length;
-				if (start >= tagLength) {
-					index = value.lastIndexOf(startTags[i], start - tagLength);
-					lastStart = Math.max(lastStart, index);
-				}
-			}
-			if (lastStart == -1) return false;
-
-			if (start > 0) {
-				for (i = 0; i < endTags.length; i++) {
-					index = value.lastIndexOf(endTags[i], start - 1);
-					lastEnd = Math.max(lastEnd, index);
-				}
-			}
-
-			return (lastEnd < lastStart);
-		}
-
-		function getLastLine() {
-			var start = textarea.selectionStart,
-				value = textarea.value,
-				index = value.lastIndexOf("\n", start - 1);
-			return value.substring(index + 1, start);
-		}
-
-		function appendCode(code) {
-			var start = textarea.selectionStart,
-				end = textarea.selectionEnd,
-				value = textarea.value;
-			textarea.value = value.substr(0, start) + code + value.substr(end);
-			textarea.selectionStart = textarea.selectionEnd = start + code.length;
-		}
-
-		$(textarea).on('keydown', function(event) {
-			var key = event.keyCode || event.which;
 
-			// intercept tabs
-			if (key == 9) {
-				if (inTag()) {
-					appendCode("\t");
-					event.preventDefault();
-					return;
-				}
-			}
-
-			// intercept new line characters
-			if (key == 13) {
-				if (inTag()) {
-					var lastLine = getLastLine(),
-						code = '' + /^\s*/g.exec(lastLine);
-					if (code.length > 0) {
-						appendCode("\n" + code);
-						event.preventDefault();
-						return;
-					}
-				}
-			}
-		});
+		phpbb.applyCodeEditor(textarea);
 	});
 })(jQuery);
 
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 26ec23b2e6..89b3ab7ada 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -306,8 +306,12 @@ a#logo:hover {
 ul.linklist {
 	display: block;
 	margin: 0;
-	height: 4%;
-	overflow: hidden;
+}
+
+ul.linklist:after {
+	content: '';
+	display: block;
+	clear: both;
 }
 
 #cp-main .panel {
@@ -689,28 +693,33 @@ p.rules a {
 	vertical-align: text-bottom;
 }
 
+.icon-notification {
+	position: relative;
+}
+
 #notification_list {
 	display: none;
 	position: absolute;
+	left: 0;
 	width: 330px;
 	z-index: 1;
 	border: 1px solid;
 	box-shadow: 3px 3px 5px darkgray;
 	border-radius: 5px;
-	margin-top: 8px;
+	top: 32px;
 }
 
 #notification_list ul {
 	max-height: 350px;
 	overflow-y: auto;
 	overflow-x: hidden;
+	clear: both;
 }
 
 #notification_list ul li {
-	width: 310px;
 	padding: 10px;
 	margin: 0;
-	float: left;
+	float: none;
 	border-bottom: 1px solid;
 	list-style-type: none;
 	font-size: 0.95em;
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index 89510aa32f..ca4e9a23b6 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -9,6 +9,10 @@ tweaks required due to its poor CSS support.
 	zoom: 1;
 }
 
+ul.linklist {
+	zoom: 1;
+}
+
 /* Align checkboxes/radio buttons nicely */
 dd label input { 
 	vertical-align: text-bottom; 
@@ -47,3 +51,18 @@ dd.lastpost, dd.redirect, dd.moderation, dd.time, dd.info {
 dd.option {
 	*width: 124px;
 }
+
+/* Notifications list for IE7 */
+#notification_list {
+	*left: 0;
+}
+
+#notification_list .header_settings {
+	*position: absolute;
+	*right: 10px;
+	*top: 0;
+}
+
+.icon-notification {
+	*z-index: 2;
+}
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 93506b8d4a..6cf616e180 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -38,6 +38,7 @@ function initInsertions() {
 	}
 
 	var textarea = doc.forms[form_name].elements[text_name];
+	phpbb.applyCodeEditor(textarea);
 
 	if (is_ie && typeof(baseHeight) !== 'number') {
 		textarea.focus();
author	Joas Schilling <nickvergessen@gmx.de>	2013-06-07 00:15:28 +0200
committer	Joas Schilling <nickvergessen@gmx.de>	2013-06-07 00:15:28 +0200
commit	1d7c80b91210337845ae33267131bb82473b9a9f (patch)
tree	e9a254aa34b872d99244d09e715a8b3371382ec7 /phpBB/styles
parent	8c4670eeb1264e2535021e400d2cf7e2c2028010 (diff)
parent	b4b1704a9b2f2c6e7770f478e27c5c408772f3ff (diff)
download	forums-1d7c80b91210337845ae33267131bb82473b9a9f.tar forums-1d7c80b91210337845ae33267131bb82473b9a9f.tar.gz forums-1d7c80b91210337845ae33267131bb82473b9a9f.tar.bz2 forums-1d7c80b91210337845ae33267131bb82473b9a9f.tar.xz forums-1d7c80b91210337845ae33267131bb82473b9a9f.zip