small changes - mostly style related to fix cross-browser issues.

git-svn-id: file:///svn/phpbb/trunk@7696 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2007-05-29 16:07:42 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2007-05-29 16:07:42 +0000
commit: 88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a (patch)
tree: 9a3d7fbc187b6f90429aabae40326b523440de23
parent: 8385b34222d421a258b934f459e9c6d869f80576 (diff)
download: forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar
forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar.gz
forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar.bz2
forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar.xz
forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.zip
16 files changed, 31 insertions, 45 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index b385b724e2..5895920525 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -187,7 +187,7 @@ p a {
 	<ul class="menu">
 		<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>
 		<li>[Fix] Tiny language and grammar changes</li>
-		<li>[Fix] Several tiny style related fixes</li>
+		<li>[Fix] Several style related fixes, mainly fixing cross-browser issues</li>
 		<li>[Fix] MCP looses forum_id in some panels (Bug #11255)</li>
 		<li>[Fix] Moderation queue used unfriendly notification of no posts/topics (Bug #11291)</li>
 		<li>[Fix] Array in Oracle DBAL not always set (Bug #11475)</li>
@@ -224,11 +224,11 @@ p a {
 		<li>[Fix] Reload confirm screen for selecting new forum for global topic type change if not postable forum is chosen (Bug #11711)</li>
 		<li>[Fix] Correctly show system default color for disabled options in Internet Explorer which does not support disabled option fields</li>
 		<li>[Fix] Update query for custom profiles in user management used wrong order for left/right delimiter (affecting mssql) (Bug #11781)</li>
+		<li>[Fix] Inconsistent display of more smileys link fixed (Bug #11801)</li>
+		<li>[Fix] Outbox messages are no always neither new nor unread post-conversion (Bug #11461)</li>
 		<li>[Feature] Replaced outdated jabber class with the one from the flyspray project</li>
-		<li>Limit maximum number of allowed characters in messages to 60.000 by default. Admins should increase their PHP time limits if they want to raise this tremedously.</li>
 		<li>[Feature] The converter no longer relies on the smiley ID to decide if it should be displayed on the posting page</li>
-		<li>[Fix] Inconsistent display of more smileys link fixed (Bug #11801)</li>
-		<li>[Fix] Outbox messages are no always neither new nor unread post-conversion(Bug #11461)</li>
+		<li>Limit maximum number of allowed characters in messages to 60.000 by default. Admins should increase their PHP time limits if they want to raise this tremedously.</li>
 		<li>Some changes to the conversion documentation</li>
 	</ul>
 
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php
index de4ea19438..76d91c5324 100644
--- a/phpBB/includes/acp/acp_jabber.php
+++ b/phpBB/includes/acp/acp_jabber.php
@@ -58,13 +58,13 @@ class acp_jabber
 
 				if (!$jabber->connect())
 				{
-					trigger_error($user->lang['ERR_JAB_CONNECT'] . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
+					trigger_error($user->lang['ERR_JAB_CONNECT'] . '<br /><br />' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
 				// We'll try to authorise using this account
 				if (!$jabber->login())
 				{
-					trigger_error($user->lang['ERR_JAB_AUTH'] . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
+					trigger_error($user->lang['ERR_JAB_AUTH'] . '<br /><br />' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
 				$jabber->disconnect();
diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php
index a1a5dbaf3a..24dc3ebabf 100644
--- a/phpBB/includes/acp/acp_update.php
+++ b/phpBB/includes/acp/acp_update.php
@@ -33,7 +33,7 @@ class acp_update
 
 		if ($info === false)
 		{
-			trigger_error($errstr . adm_back_link($this->u_action));
+			trigger_error($errstr, E_USER_WARNING);
 		}
 
 		$info = explode("\n", $info);
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
index 4b9928089e..566eff65c5 100644
--- a/phpBB/includes/functions_jabber.php
+++ b/phpBB/includes/functions_jabber.php
@@ -192,15 +192,15 @@ class jabber
 	{
 		if (@function_exists('dns_get_record'))
 		{
-			$record = dns_get_record("_xmpp-client._tcp.$server", DNS_SRV);
-			if (!empty($record))
+			$record = @dns_get_record("_xmpp-client._tcp.$server", DNS_SRV);
+			if (!empty($record) && !empty($record[0]['target']))
 			{
 				$server = $record[0]['target'];
 			}
 		}
 		else
 		{
-			$this->add_to_log('Warning: dns_get_record function not found. GTalk will not work.');
+			$this->add_to_log('Warning: dns_get_record() function not found. GTalk will not work.');
 		}
 
 		$server = $use_ssl ? 'ssl://' . $server : $server;
@@ -225,7 +225,7 @@ class jabber
 	{
 		if ($this->enable_logging && sizeof($this->log_array))
 		{
-			return '<br /><br />' . implode("<br /><br />", $this->log_array);
+			return implode("<br /><br />", $this->log_array);
 		}
 
 		return '';
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 8cdbc492c4..1b9fbf22ce 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -130,7 +130,7 @@ $lang = array_merge($lang, array(
 	'acl_f_read'		=> array('lang' => 'Can read forum', 'cat' => 'post'),
 	'acl_f_post'		=> array('lang' => 'Can start new topics', 'cat' => 'post'),
 	'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
-	'acl_f_icons'		=> array('lang' => 'Can use post icons', 'cat' => 'post'),
+	'acl_f_icons'		=> array('lang' => 'Can use topic/post icons', 'cat' => 'post'),
 	'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
 	'acl_f_sticky'		=> array('lang' => 'Can post stickies', 'cat' => 'post'),
 
@@ -191,7 +191,7 @@ $lang = array_merge($lang, array(
 	'acl_a_forumdel'	=> array('lang' => 'Can delete forums', 'cat' => 'forums'),
 	'acl_a_prune'		=> array('lang' => 'Can prune forums', 'cat' => 'forums'),
 
-	'acl_a_icons'		=> array('lang' => 'Can alter topic icons and smilies', 'cat' => 'posting'),
+	'acl_a_icons'		=> array('lang' => 'Can alter topic/post icons and smilies', 'cat' => 'posting'),
 	'acl_a_words'		=> array('lang' => 'Can alter word censors', 'cat' => 'posting'),
 	'acl_a_bbcode'		=> array('lang' => 'Can define BBCode tags', 'cat' => 'posting'),
 	'acl_a_attach'		=> array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'),
diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index 96fa57857e..bda83dcc82 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -3,12 +3,14 @@
 <p class="right<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p>
 <!-- IF U_MCP --><p>{CURRENT_TIME} <br />[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ELSEIF S_USER_LOGGED_IN --><p>{CURRENT_TIME}</p><!-- ENDIF -->
 
+<!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) -->
 <ul class="linklist">
 	<!-- IF S_DISPLAY_SEARCH -->
 		<li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_USER_LOGGED_IN --> &bull; <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> &bull; <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
 	<!-- ENDIF -->
 	<!-- IF S_USER_LOGGED_IN and not S_IS_BOT --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
 </ul>
+<!-- ENDIF -->
 
 <!-- INCLUDE forumlist_body.html -->
 
@@ -18,7 +20,7 @@
 		<fieldset class="quick-login">
 			<label for="username">{L_USERNAME}:</label>&nbsp;<input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" />  
 			<label for="password">{L_PASSWORD}:</label>&nbsp;<input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" /> | 
-			<label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" class="checkbox" /></label> <input type="submit" name="login" value="{L_LOGIN}" class="button2" />
+			<label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label> <input type="submit" name="login" value="{L_LOGIN}" class="button2" />
 		</fieldset>
 	</form>
 <!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
index 077362e306..3a0979585d 100644
--- a/phpBB/styles/prosilver/template/jumpbox.html
+++ b/phpBB/styles/prosilver/template/jumpbox.html
@@ -18,7 +18,7 @@
 		<fieldset class="jumpbox">
 	<!-- ENDIF -->
 			<label for="f" accesskey="j"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->: </label>
-			<select name="f" id="f" onchange="if(this.options[this.selectedIndex].value != -1){ forms['jumpbox'].submit() }">
+			<select name="f" id="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">
 			<!-- BEGIN jumpbox_forums -->
 				<!-- IF jumpbox_forums.S_FORUM_COUNT == 1 --><option value="-1">------------------</option><!-- ENDIF -->
 				<option value="{jumpbox_forums.FORUM_ID}"{jumpbox_forums.SELECTED}><!-- BEGIN level -->&nbsp; &nbsp;<!-- END level -->{jumpbox_forums.FORUM_NAME}</option>
diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html
index 8174a2ddc1..d4ccc8740e 100644
--- a/phpBB/styles/prosilver/template/login_body.html
+++ b/phpBB/styles/prosilver/template/login_body.html
@@ -32,8 +32,8 @@
 		
 		<!-- IF S_DISPLAY_FULL_LOGIN -->
 		<dl>
-			<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" class="checkbox" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
-			<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" class="checkbox" /> {L_HIDE_ME}</label></dd>
+			<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
+			<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 97021d53d3..ab50f0017d 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -95,8 +95,8 @@
 				<dl>
 					<dt><label for="password">{L_PASSWORD}:</label></dt>
 					<dd><input type="password" tabindex="2" id="password" name="password" size="25" maxlength="25" class="inputbox autowidth" /></dd>
-					<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="3" class="checkbox" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
-					<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="4" class="checkbox" /> {L_HIDE_ME}</label></dd>
+					<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="3" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
+					<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="4" /> {L_HIDE_ME}</label></dd>
 				</dl>
 				<dl>
 					<dt>&nbsp;</dt>
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html
index a29f59166b..0fd3011254 100644
--- a/phpBB/styles/prosilver/template/viewonline_body.html
+++ b/phpBB/styles/prosilver/template/viewonline_body.html
@@ -4,7 +4,7 @@
 <p>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> &bull; <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a><!-- ENDIF --></p>
 
 <ul class="linklist">
-	<li class="rightside pagination"><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> <!-- IF PAGINATION --> &bull; <span>{PAGINATION}</span><!-- ENDIF --></li>
+	<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>
 </ul>
 
 <div class="forumbg">
@@ -49,7 +49,7 @@
 <!-- IF LEGEND --><p><em>{L_LEGEND}: {LEGEND}</em></p><!-- ENDIF -->
 
 <ul class="linklist">
-	<li class="rightside pagination"><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> <!-- IF PAGINATION --> &bull; <span>{PAGINATION}</span><!-- ENDIF --></li>
+	<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>
 </ul>
 
 <!-- INCLUDE jumpbox.html -->
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 017d9bcb51..e533b8f070 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -895,7 +895,7 @@ fieldset.fields2 dl:hover dt label {
 }
 
 /* Quick-login on index page */
-fieldset.quick-login input {
+fieldset.quick-login input.inputbox {
 	background-color: #F2F3F3;
 }
 
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 272fd920ba..8031f52b81 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -153,6 +153,10 @@ fieldset.quick-login {
 }
 
 fieldset.quick-login input {
+	width: auto;
+}
+
+fieldset.quick-login input.inputbox {
 	width: 15%;
 	vertical-align: middle;
 	margin-right: 5px;
@@ -287,11 +291,6 @@ fieldset.submit-buttons input {
 	color: #4b4b4b;
 }
 
-input.checkbox {
-	width: auto !important;
-	background-color: transparent !important;
-}
-
 input.inputbox	{ width: 85%; }
 input.medium	{ width: 50%; }
 input.narrow	{ width: 25%; }
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index e3a2557fc5..cceb5682f5 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -34,7 +34,7 @@ html>body dd label input { vertical-align: text-bottom; }	/* Align checkboxes/ra
 
 /* Nice method for clearing floated blocks without having to insert any extra markup (like spacer above)
    From http://www.positioniseverything.net/easyclearing.html */
-#tabs:after, #minitabs:after, .post:after, .navbar:after, fieldset dl:after, ul.topiclist dl:after, ul.linklist:after, dl.polls:after {
+#tabs:after, #minitabs:after, .post:after, .navbar:after, fieldset dd:after, fieldset dl:after, ul.topiclist dl:after, ul.linklist:after, dl.polls:after {
 	content: "."; 
 	display: block; 
 	height: 0; 
diff --git a/phpBB/styles/subsilver2/template/jumpbox.html b/phpBB/styles/subsilver2/template/jumpbox.html
index 2f54ebc488..d56823868b 100644
--- a/phpBB/styles/subsilver2/template/jumpbox.html
+++ b/phpBB/styles/subsilver2/template/jumpbox.html
@@ -4,7 +4,7 @@
 
 	<table cellspacing="0" cellpadding="0" border="0">
 	<tr>
-		<td nowrap="nowrap"><span class="gensmall"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->:</span>&nbsp;<select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ forms['jumpbox'].submit() }">
+		<td nowrap="nowrap"><span class="gensmall"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->:</span>&nbsp;<select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">
 
 		<!-- BEGIN jumpbox_forums -->
 			<!-- IF jumpbox_forums.S_FORUM_COUNT eq 2 --><option value="-1">------------------</option><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/mcp_jumpbox.html b/phpBB/styles/subsilver2/template/mcp_jumpbox.html
index 95a5926f72..43b20d236d 100644
--- a/phpBB/styles/subsilver2/template/mcp_jumpbox.html
+++ b/phpBB/styles/subsilver2/template/mcp_jumpbox.html
@@ -2,7 +2,7 @@
 
 <form name="jumpbox" method="post" action="{S_JUMPBOX_ACTION}">
 
-	<span class="gensmall">{L_JUMP_TO}:</span>&nbsp;<select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.jumpbox.current_f.value){ forms['jumpbox'].submit() }">
+	<span class="gensmall">{L_JUMP_TO}:</span>&nbsp;<select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.jumpbox.current_f.value){ document.forms['jumpbox'].submit() }">
 
 <!-- IF S_ENABLE_SELECT_ALL -->
 	<option value="0">{L_ALL_FORUMS}</option>
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index f0223a2b6f..0c659cee8e 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -360,21 +360,6 @@ td.profile {
 	padding: 4px;
 }
 
-.rowgood {
-	background-color: #C2D6CD;
-	padding: 4px;
-}
-
-.rowneutral {
-	background-color: #CAC1D7;
-	padding: 4px;
-}
-
-.rowbad {
-	background-color: #D7C1C3;
-	padding: 4px;
-}
-
 .spacer {
 	background-color: #D1D7DC;
 }
author	Meik Sievertsen <acydburn@phpbb.com>	2007-05-29 16:07:42 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2007-05-29 16:07:42 +0000
commit	88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a (patch)
tree	9a3d7fbc187b6f90429aabae40326b523440de23
parent	8385b34222d421a258b934f459e9c6d869f80576 (diff)
download	forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar.gz forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar.bz2 forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.tar.xz forums-88e9dee7e8e2b8dc2b11df0a2d0598fd7606530a.zip