makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7696 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-05-29 16:07:42 +00:00
parent 8385b34222
commit 88e9dee7e8
16 changed files with 32 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/docs/CHANGELOG.html
View file

@ -187,7 +187,7 @@ p a {
<ul class="menu"> <ul class="menu">
<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li> <li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>
<li>[Fix] Tiny language and grammar changes</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] 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] Moderation queue used unfriendly notification of no posts/topics (Bug #11291)</li>
<li>[Fix] Array in Oracle DBAL not always set (Bug #11475)</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] 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] 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] Update query for custom profiles in user management used wrong order for left/right delimiter (affecting mssql) (Bug #11781)</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] 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>[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>[Feature] The converter no longer relies on the smiley ID to decide if it should be displayed on the posting page</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> <li>Some changes to the conversion documentation</li>
</ul> </ul>

4
phpBB/includes/acp/acp_jabber.php
View file

@ -58,13 +58,13 @@ class acp_jabber
if (!$jabber->connect()) 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 // We'll try to authorise using this account
if (!$jabber->login()) 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(); $jabber->disconnect();

2
phpBB/includes/acp/acp_update.php
View file

@ -33,7 +33,7 @@ class acp_update
if ($info === false) if ($info === false)
{ {
trigger_error($errstr . adm_back_link($this->u_action)); trigger_error($errstr, E_USER_WARNING);
} }
$info = explode("\n", $info); $info = explode("\n", $info);

8
phpBB/includes/functions_jabber.php
View file

@ -192,15 +192,15 @@ class jabber
{ {
if (@function_exists('dns_get_record')) if (@function_exists('dns_get_record'))
{ {
$record = dns_get_record("_xmpp-client._tcp.$server", DNS_SRV); $record = @dns_get_record("_xmpp-client._tcp.$server", DNS_SRV);
if (!empty($record)) if (!empty($record) && !empty($record[0]['target']))
{ {
$server = $record[0]['target']; $server = $record[0]['target'];
} }
} }
else 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; $server = $use_ssl ? 'ssl://' . $server : $server;
@ -225,7 +225,7 @@ class jabber
{ {
if ($this->enable_logging && sizeof($this->log_array)) 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 ''; return '';

4
phpBB/language/en/acp/permissions_phpbb.php
View file

@ -130,7 +130,7 @@ $lang = array_merge($lang, array(
'acl_f_read' => array('lang' => 'Can read forum', 'cat' => 'post'), 'acl_f_read' => array('lang' => 'Can read forum', 'cat' => 'post'),
'acl_f_post' => array('lang' => 'Can start new topics', '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_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_announce' => array('lang' => 'Can post announcements', 'cat' => 'post'),
'acl_f_sticky' => array('lang' => 'Can post stickies', '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_forumdel' => array('lang' => 'Can delete forums', 'cat' => 'forums'),
'acl_a_prune' => array('lang' => 'Can prune 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_words' => array('lang' => 'Can alter word censors', 'cat' => 'posting'),
'acl_a_bbcode' => array('lang' => 'Can define BBCode tags', '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'), 'acl_a_attach' => array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'),

4
phpBB/styles/prosilver/template/index_body.html
View file

@ -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> <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 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"> <ul class="linklist">
<!-- IF S_DISPLAY_SEARCH --> <!-- 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> <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 --> <!-- 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 --> <!-- 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> </ul>
<!-- ENDIF -->
<!-- INCLUDE forumlist_body.html --> <!-- INCLUDE forumlist_body.html -->
@ -18,7 +20,7 @@
<fieldset class="quick-login"> <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="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="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> </fieldset>
</form> </form>
<!-- ENDIF --> <!-- ENDIF -->

2
phpBB/styles/prosilver/template/jumpbox.html
View file

@ -18,7 +18,7 @@
<fieldset class="jumpbox"> <fieldset class="jumpbox">
<!-- ENDIF --> <!-- 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> <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 --> <!-- BEGIN jumpbox_forums -->
<!-- IF jumpbox_forums.S_FORUM_COUNT == 1 --><option value="-1">------------------</option><!-- ENDIF --> <!-- 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> <option value="{jumpbox_forums.FORUM_ID}"{jumpbox_forums.SELECTED}><!-- BEGIN level -->&nbsp; &nbsp;<!-- END level -->{jumpbox_forums.FORUM_NAME}</option>

4
phpBB/styles/prosilver/template/login_body.html
View file

@ -32,8 +32,8 @@
<!-- IF S_DISPLAY_FULL_LOGIN --> <!-- IF S_DISPLAY_FULL_LOGIN -->
<dl> <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 --> <!-- 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" class="checkbox" /> {L_HIDE_ME}</label></dd> <dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<dl> <dl>

4
phpBB/styles/prosilver/template/viewforum_body.html
View file

@ -95,8 +95,8 @@
<dl> <dl>
<dt><label for="password">{L_PASSWORD}:</label></dt> <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> <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 --> <!-- 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" class="checkbox" /> {L_HIDE_ME}</label></dd> <dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="4" /> {L_HIDE_ME}</label></dd>
</dl> </dl>
<dl> <dl>
<dt>&nbsp;</dt> <dt>&nbsp;</dt>

4
phpBB/styles/prosilver/template/viewonline_body.html
View file

@ -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> <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"> <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> </ul>
<div class="forumbg"> <div class="forumbg">
@ -49,7 +49,7 @@
<!-- IF LEGEND --><p><em>{L_LEGEND}: {LEGEND}</em></p><!-- ENDIF --> <!-- IF LEGEND --><p><em>{L_LEGEND}: {LEGEND}</em></p><!-- ENDIF -->
<ul class="linklist"> <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> </ul>
<!-- INCLUDE jumpbox.html --> <!-- INCLUDE jumpbox.html -->

2
phpBB/styles/prosilver/theme/colours.css
View file

@ -895,7 +895,7 @@ fieldset.fields2 dl:hover dt label {
} }
/* Quick-login on index page */ /* Quick-login on index page */
fieldset.quick-login input { fieldset.quick-login input.inputbox {
background-color: #F2F3F3; background-color: #F2F3F3;
} }

9
phpBB/styles/prosilver/theme/forms.css
View file

@ -153,6 +153,10 @@ fieldset.quick-login {
} }
fieldset.quick-login input { fieldset.quick-login input {
width: auto;
}
fieldset.quick-login input.inputbox {
width: 15%; width: 15%;
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
@ -287,11 +291,6 @@ fieldset.submit-buttons input {
color: #4b4b4b; color: #4b4b4b;
} }
input.checkbox {
width: auto !important;
background-color: transparent !important;
}
input.inputbox { width: 85%; } input.inputbox { width: 85%; }
input.medium { width: 50%; } input.medium { width: 50%; }
input.narrow { width: 25%; } input.narrow { width: 25%; }

2
phpBB/styles/prosilver/theme/tweaks.css
View file

@ -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) /* Nice method for clearing floated blocks without having to insert any extra markup (like spacer above)
From http://www.positioniseverything.net/easyclearing.html */ 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: "."; content: ".";
display: block; display: block;
height: 0; height: 0;

2
phpBB/styles/subsilver2/template/jumpbox.html
View file

@ -4,7 +4,7 @@
<table cellspacing="0" cellpadding="0" border="0"> <table cellspacing="0" cellpadding="0" border="0">
<tr> <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 --> <!-- BEGIN jumpbox_forums -->
<!-- IF jumpbox_forums.S_FORUM_COUNT eq 2 --><option value="-1">------------------</option><!-- ENDIF --> <!-- IF jumpbox_forums.S_FORUM_COUNT eq 2 --><option value="-1">------------------</option><!-- ENDIF -->

2
phpBB/styles/subsilver2/template/mcp_jumpbox.html
View file

@ -2,7 +2,7 @@
<form name="jumpbox" method="post" action="{S_JUMPBOX_ACTION}"> <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 --> <!-- IF S_ENABLE_SELECT_ALL -->
<option value="0">{L_ALL_FORUMS}</option> <option value="0">{L_ALL_FORUMS}</option>

15
phpBB/styles/subsilver2/theme/stylesheet.css
View file

@ -360,21 +360,6 @@ td.profile {
padding: 4px; padding: 4px;
} }
.rowgood {
background-color: #C2D6CD;
padding: 4px;
}
.rowneutral {
background-color: #CAC1D7;
padding: 4px;
}
.rowbad {
background-color: #D7C1C3;
padding: 4px;
}
.spacer { .spacer {
background-color: #D1D7DC; background-color: #D1D7DC;
} }