fixes for search button in header - #10389, #10225, #9548

added missing colour swatch to prosilver - #8657 language changes - #10387, #10375, #10373, #10353, #10279 line-height for font size (still not ideal) - #10317 Search load setting checked in sessions.php along with limit_load and also reset if not possible to determine load - #10383 Fix editing issues - #9660 git-svn-id: file:///svn/phpbb/trunk@7451 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2007-05-02 16:19:35 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2007-05-02 16:19:35 +0000
commit: 15aee8920041aeaf3c9d8893341bc5470ec63ff8 (patch)
tree: 4494c33edf3c0961a93969688a9ef3e347ce1365 /phpBB/styles
parent: f4b6f87641e60e8a2d746c8ac2e7b96bccf6d25d (diff)
download: forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar
forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.gz
forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.bz2
forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.xz
forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.zip
11 files changed, 96 insertions, 41 deletions
diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html
index 3e81a58bea..8a46fbdbb3 100644
--- a/phpBB/styles/prosilver/template/bbcode.html
+++ b/phpBB/styles/prosilver/template/bbcode.html
@@ -29,7 +29,7 @@
 
 <!-- BEGIN color --><span style="color: {COLOR}">{TEXT}</span><!-- END color -->
 
-<!-- BEGIN size --><span style="font-size: {SIZE}%;">{TEXT}</span><!-- END size -->
+<!-- BEGIN size --><span style="font-size: {SIZE}%; line-height: 116%;">{TEXT}</span><!-- END size -->
 
 <!-- BEGIN img --><img src="{URL}" alt="{L_IMAGE}" /><!-- END img -->
 
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 380394fc1e..38dd77bdbe 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -64,7 +64,7 @@ function bbstyle(bbnumber)
 	else 
 	{
 		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();		
+		document.forms[form_name].elements[text_name].focus();
 	}
 }
 
@@ -118,9 +118,8 @@ function bbfontstyle(bbopen, bbclose)
 	// IE
 	else if (document.selection)
 	{
-		
 		var range = textarea.createTextRange(); 
-       	range.move("character", new_pos); 
+		range.move("character", new_pos); 
 		range.select();
 		storeCaret(textarea);
 	}
@@ -157,18 +156,17 @@ function insert_text(text, spaces, popup)
 		mozWrap(textarea, text, '')
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
-	}	
-	
+	}
 	else if (textarea.createTextRange && textarea.caretPos)
 	{
 		if (baseHeight != textarea.caretPos.boundingHeight) 
 		{
 			textarea.focus();
 			storeCaret(textarea);
-		}		
+		}
+
 		var caret_pos = textarea.caretPos;
 		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-		
 	}
 	else
 	{
@@ -177,8 +175,7 @@ function insert_text(text, spaces, popup)
 	if (!popup) 
 	{
 		textarea.focus();
-	} 	
-
+	}
 }
 
 /**
@@ -329,7 +326,7 @@ function colorPalette(dir, width, height)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
 				document.write('<td bgcolor="#' + color + '">');
-				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" onmouseover="helpline(\'s\');"  onmouseout="helpline(\'tip\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
+				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
 				document.writeln('</td>');
 			}
 
diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html
index 318906349d..cc41ce9c1f 100644
--- a/phpBB/styles/prosilver/template/mcp_ban.html
+++ b/phpBB/styles/prosilver/template/mcp_ban.html
@@ -50,7 +50,7 @@
 	<dl>
 		<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
 		<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
-		<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>(YYYY-MM-DD)</span></label></dd>
+		<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
 	</dl>
 	<dl>
 		<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index d344294503..b86f7da822 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -99,10 +99,24 @@
 		<div class="headerbar">
 			<div class="inner"><span class="corners-top"><span></span></span>
 
-			<a href="{U_INDEX}" title="{L_INDEX}" id="logo">{SITE_LOGO_IMG}</a>
-			<h1>{SITENAME}</h1>
-			<p>{SITE_DESCRIPTION}</p>
-			<p style="display: none;"><a href="#start_here">{L_SKIP}</a></p>
+			<div id="site-description">
+				<a href="{U_INDEX}" title="{L_INDEX}" id="logo">{SITE_LOGO_IMG}</a>
+				<h1>{SITENAME}</h1>
+				<p>{SITE_DESCRIPTION}</p>
+				<p style="display: none;"><a href="#start_here">{L_SKIP}</a></p>
+			</div>
+
+		<!-- IF not S_IN_SEARCH -->
+			<div id="search-box">
+				<form action="{U_SEARCH}" method="get" id="search">
+				<fieldset>
+					<input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" accesskey="s" /> 
+					<input class="button2" value="{L_SEARCH}" type="submit" /><br />
+					<a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_HIDDEN_FIELDS}
+				</fieldset>
+				</form>
+			</div>
+		<!-- ENDIF -->
 
 			<span class="corners-bottom"><span></span></span></div>
 		</div>
@@ -147,16 +161,6 @@
 			<span class="corners-bottom"><span></span></span></div>
 		</div>
 
-		<div id="search-box">
-			<form action="{U_SEARCH}" method="get" id="search">
-			<fieldset>
-				<input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" accesskey="s" /> 
-				<input class="button2" value="{L_SEARCH}" type="submit" /><br />
-				<a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_HIDDEN_FIELDS}
-			</fieldset>
-			</form>
-		</div>
-
 	</div>
 
 	<a name="start_here"></a>
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 35356f2e84..6da383def5 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -1,3 +1,4 @@
+
 <script type="text/javascript">
 <!--
 	var form_name = 'postform';
@@ -58,6 +59,33 @@
 <script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
 
 <!-- IF S_BBCODE_ALLOWED -->
+<div id="colour_palette" style="display: none;">
+	<dl style="clear: left;">
+		<dt><label>{L_FONT_COLOR}:</label></dt>
+		<dd><script type="text/javascript">
+		<!--
+			function change_palette()
+			{
+				dE('colour_palette');
+				e = document.getElementById('colour_palette');
+				
+				if (e.style.display == 'block')
+				{
+					document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
+				}
+				else
+				{
+					document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
+				}
+			}
+
+			colorPalette('h', 15, 5);
+		//-->
+		</script>
+		</dd>
+	</dl>
+</div>
+
 <div id="format-buttons">
 	<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
 	<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
@@ -85,8 +113,9 @@
 		<option value="150">{L_FONT_LARGE}</option>
 		<option value="200">{L_FONT_HUGE}</option>
 	</select>
+	<input type="button" class="button2" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" />
 	<!-- BEGIN custom_tags -->
 		<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
 	<!-- END custom_tags -->
 </div>
-<!-- ENDIF -->
-\ No newline at end of file
+<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 304deef6ba..0d86a5e7e3 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -118,7 +118,7 @@
 		<!-- ENDIF -->
 
 		<!-- IF BBCODE_STATUS -->
-		<hr />
+		<!-- IF .smiley --><hr /><!-- ENDIF -->
 		{BBCODE_STATUS}<br />
 		<!-- IF S_BBCODE_ALLOWED -->
 			{IMG_STATUS}<br />
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 170d4b0a83..f60fdec719 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -128,6 +128,7 @@ p.right {
 	float: left;
 	width: auto;
 	padding: 10px 13px 0 10px;
+	height: auto;
 }
 
 a#logo:hover {
@@ -138,14 +139,22 @@ a#logo:hover {
 --------------------------------------------- */
 #search-box {
 	color: #FFFFFF;
-	position: absolute;
-	right: 35px;
-	top: 35px;
-	width: 17em;
+	position: relative;
+	margin-top: 30px;
+	margin-right: 5px;
+	display: block;
+	float: right;
 	text-align: right;
 	white-space: nowrap; /* For Opera */
 }
 
+.rtl #search-box {
+	float: left;
+	text-align: left;
+	margin-right: 0;
+	margin-left: 5px;
+}
+
 #search-box #keywords {
 	width: 95px;
 	background-color: #FFF;
@@ -170,6 +179,16 @@ a#logo:hover {
 	margin-right: 3px;
 }
 
+/* Site description and logo */
+#site-description {
+	float: left;
+	width: 70%;
+}
+
+.rtl #site-description {
+	float: right;
+}
+
 /* Round cornered boxes and backgrounds
 ---------------------------------------- */
 .headerbar {
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 733a3cc8d3..a6418914a5 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -73,7 +73,6 @@ a.topictitle:active {
 
 /* Post body links */
 .postlink {
-	text-decoration: none;
 	color: #d2d2d2;
 	border-bottom: 1px solid #d2d2d2;
 	padding-bottom: 0;
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index 4dd490ea33..e3a2557fc5 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -52,4 +52,13 @@ dl.icon {
 	min-height: 35px;
 	height: auto !important;
 	height: 35px;
+}
+
+* html #search-box {
+	margin-right: 35px;
+}
+
+* html .rtl #search-box {
+	margin-right: 0;
+	margin-left: 35px;
 }
 \ No newline at end of file
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index c9d6321394..339609b56e 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -64,7 +64,7 @@ function bbstyle(bbnumber)
 	else 
 	{
 		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();		
+		document.forms[form_name].elements[text_name].focus();
 	}
 }
 
@@ -103,7 +103,7 @@ function bbfontstyle(bbopen, bbclose)
 	
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;		
+	var new_pos = caret_pos + bbopen.length;
 
 	// Open tag
 	insert_text(bbopen + bbclose);
@@ -118,9 +118,8 @@ function bbfontstyle(bbopen, bbclose)
 	// IE
 	else if (document.selection)
 	{
-		
 		var range = textarea.createTextRange(); 
-       	range.move("character", new_pos); 
+		range.move("character", new_pos); 
 		range.select();
 		storeCaret(textarea);
 	}
@@ -230,7 +229,7 @@ function addquote(post_id, username)
 			theSelection = theSelection.replace(/<br\/>/ig, '\n');
 			theSelection = theSelection.replace(/&lt\;/ig, '<');
 			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');			
+			theSelection = theSelection.replace(/&amp\;/ig, '&');
 		}
 		else if (document.all)
 		{
@@ -374,7 +373,6 @@ function getCaretPosition(txtarea)
 	// dirty and slow IE way
 	else if(document.selection)
 	{
-	
 		// get current selection
 		var range = document.selection.createRange();
 
@@ -393,7 +391,7 @@ function getCaretPosition(txtarea)
 	
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;			
+		caretPos.end = txtarea.sel_start;
 	}
 
 	return caretPos;
diff --git a/phpBB/styles/subsilver2/template/mcp_ban.html b/phpBB/styles/subsilver2/template/mcp_ban.html
index 1834e729ba..a995163f39 100644
--- a/phpBB/styles/subsilver2/template/mcp_ban.html
+++ b/phpBB/styles/subsilver2/template/mcp_ban.html
@@ -49,7 +49,7 @@
 </tr>
 <tr>
 	<td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td>
-	<td class="row2"><select name="banlength">{S_BAN_END_OPTIONS}</select><br /><input type="text" name="banlengthother" class="post" /> (YYYY-MM-DD)</td>
+	<td class="row2"><select name="banlength">{S_BAN_END_OPTIONS}</select><br /><input type="text" name="banlengthother" class="post" /> {L_YEAR_MONTH_DAY}</td>
 </tr>
 <tr>
 	<td class="row1" valign="top"><b>{L_BAN_EXCLUDE}:</b><br /><span class="gensmall">{L_BAN_EXCLUDE_EXPLAIN}</span></td>
author	Meik Sievertsen <acydburn@phpbb.com>	2007-05-02 16:19:35 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2007-05-02 16:19:35 +0000
commit	15aee8920041aeaf3c9d8893341bc5470ec63ff8 (patch)
tree	4494c33edf3c0961a93969688a9ef3e347ce1365 /phpBB/styles
parent	f4b6f87641e60e8a2d746c8ac2e7b96bccf6d25d (diff)
download	forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.gz forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.bz2 forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.xz forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.zip