mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into ticket/10734

Browse Source 
Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
This commit is contained in:
Shibu Lijack
2012-04-10 21:46:14 +05:30
parent daee253403 41e03164c1
commit fd55c8664a
125 changed files with 3795 additions and 5220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/styles/prosilver/style.cfg
View File

@@ -8,7 +8,6 @@
#
# At the left is the name, please do not change this
# At the right the value is entered
# For on/off options the valid values are on, off, 1, 0, true and false
#
# Values get trimmed, if you want to add a space in front or at the end of
# the value, then enclose the value with single or double quotes.
@@ -20,3 +19,10 @@
name = prosilver
copyright = © phpBB Group, 2007
version = 3.1.0-dev
# Defining a different template bitfield
# template_bitfield = lNg=
# Parent style
# Set value to empty or to this style's name if this style does not have a parent style
parent = prosilver

11
phpBB/styles/prosilver/template/ajax.js
View File

@@ -66,6 +66,17 @@ $('[data-ajax]').each(function() {
});
/**
* This simply appends #preview to the action of the
* QR action when you click the Full Editor & Preview button
*/
$('#qr_full_editor').click(function() {
$('#qr_postform').attr('action', function(i, val) {
return val + '#preview';
});
});
/**
* This AJAXifies the quick-mod tools. The reason it cannot be a standard

2
phpBB/styles/prosilver/template/editor.js
View File

@@ -219,7 +219,7 @@ function addquote(post_id, username, l_wrote)
// Get text selection - not only the post content :(
// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
if (window.getSelection && !is_ie)
if (window.getSelection && !is_ie && !window.opera)
{
theSelection = window.getSelection().toString();
}

2
phpBB/styles/prosilver/template/mcp_topic.html
View File

@@ -1,5 +1,6 @@
<!-- INCLUDE mcp_header.html -->
<div class="tabs-container">
<h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2>
<script type="text/javascript">
@@ -34,6 +35,7 @@ onload_functions.push('subPanels()');
</li>
</ul>
</div>
</div>
<form id="mcp" method="post" action="{S_MCP_ACTION}">

4
phpBB/styles/prosilver/template/mcp_warn_front.html
View File

@@ -55,7 +55,7 @@
</tbody>
</table>
<!-- ELSE -->
<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
<p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF -->
</div>
@@ -88,7 +88,7 @@
</tbody>
</table>
<!-- ELSE -->
<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
<p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF -->
</div>

2
phpBB/styles/prosilver/template/mcp_warn_list.html
View File

@@ -53,7 +53,7 @@
</li>
</ul>
<!-- ELSE -->
<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
<p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF -->
</div>

5
phpBB/styles/prosilver/template/overall_footer.html
View File

@@ -19,7 +19,7 @@
</div>
</div>
<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
<div class="copyright">{CREDIT_LINE}
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
@@ -52,7 +52,8 @@
<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js"></script>
<script type="text/javascript" src="{T_TEMPLATE_PATH}/ajax.js"></script>
<!-- INCLUDEJS template/ajax.js -->
{SCRIPTS}
</body>
</html>

4
phpBB/styles/prosilver/template/overall_header.html
View File

@@ -22,10 +22,6 @@
Based on style: prosilver (this is the default phpBB3 style)
Original author: Tom Beddard ( http://www.subBlue.com/ )
Modified by:
NOTE: This page was generated by phpBB, the free open-source bulletin board package.
The phpBB Group is not responsible for the content of this page and forum. For more information
about phpBB please visit http://www.phpbb.com
-->
<script type="text/javascript">

6
phpBB/styles/prosilver/template/quickreply_editor.html
View File

@@ -1,4 +1,4 @@
<form method="post" action="{U_QR_ACTION}">
<form method="post" action="{U_QR_ACTION}" id="qr_postform">
<div class="panel">
<div class="inner">
<h2>{L_QUICKREPLY}</h2>
@@ -14,8 +14,8 @@
<fieldset class="submit-buttons">
{S_FORM_TOKEN}
{QR_HIDDEN_FIELDS}
<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
<input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" data-ajax="false" />&nbsp;
<input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" data-ajax="false" id="qr_full_editor" />&nbsp;
<input type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
</fieldset>
</div>
</div>

3
phpBB/styles/prosilver/template/simple_footer.html
View File

@@ -1,6 +1,6 @@
</div>
<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
<div class="copyright">{CREDIT_LINE}
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
</div>
@@ -8,6 +8,7 @@
<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
{SCRIPTS}
</body>
</html>

30
phpBB/styles/prosilver/template/template.cfg
View File

@@ -1,30 +0,0 @@
#
# phpBB Template Configuration File
#
# @package phpBB3
# @copyright (c) 2006 phpBB Group
# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
#
#
# At the left is the name, please do not change this
# At the right the value is entered
# For on/off options the valid values are on, off, 1, 0, true and false
#
# Values get trimmed, if you want to add a space in front or at the end of
# the value, then enclose the value with single or double quotes.
# Single and double quotes do not need to be escaped.
#
#
# General Information about this template
name = prosilver
copyright = &copy; phpBB Group, 2007
version = 3.1.0-dev
# Defining a different template bitfield
template_bitfield = lNg=
# Template inheritance
# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
# Set value to empty to ignore template inheritance
inherit_from = prosilver

8
phpBB/styles/prosilver/theme/common.css
View File

@@ -355,7 +355,7 @@ ul.rightside {
/* Table styles
----------------------------------------*/
table.table1 {
/* See tweaks.css */
width: 100%;
}
#ucp-main table.table1 {
@@ -548,7 +548,7 @@ li.pagination {
border: 1px solid transparent;
position: fixed;
display: none;
top: 100px;
top: 40%;
left: 35%;
width: 30%;
z-index: 50;
@@ -667,3 +667,7 @@ p.rules a {
.hidden {
display: none;
}
.smilies {
vertical-align: text-bottom;
}

16
phpBB/styles/prosilver/theme/cp.css
View File

@@ -97,6 +97,22 @@ ul.cplist {
width: 100%;
}
.tabs-container h2 {
float: left;
margin-bottom: 0px;
}
.tabs-container #minitabs {
float: right;
margin-top: 19px;
}
.tabs-container:after {
display: block;
clear: both;
content: '';
}
/* CP tabbed menu
----------------------------------------*/
#tabs {

21
phpBB/styles/prosilver/theme/theme.cfg
View File

@@ -1,21 +0,0 @@
#
# phpBB Theme Configuration File
#
# @package phpBB3
# @copyright (c) 2006 phpBB Group
# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
#
#
# At the left is the name, please do not change this
# At the right the value is entered
# For on/off options the valid values are on, off, 1, 0, true and false
#
# Values get trimmed, if you want to add a space in front or at the end of
# the value, then enclose the value with single or double quotes.
# Single and double quotes do not need to be escaped.
#
# General Information about this theme
name = prosilver
copyright = &copy; phpBB Group, 2007
version = 3.1.0-dev

10
phpBB/styles/prosilver/theme/tweaks.css
View File

@@ -4,8 +4,9 @@ These style definitions are IE 7 and 8 specific
tweaks required due to its poor CSS support.
-------------------------------------------------*/
table.table1 {
width: 100%;
/* Clear float fix for IE7 */
.inner {
zoom: 1;
}
/* Align checkboxes/radio buttons nicely */
@@ -28,9 +29,4 @@ dl.details dd {
/* Headerbar height fix for IE7 */
#site-description p {
*margin-bottom: 1.0em;
}
/* Clear float fix for IE7 */
.inner {
zoom: 1;
}