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

Merge pull request #1436 from cyberalien/ticket/11563

Browse source 
Fix subPanels() in forum_fn.js
This commit is contained in:
Nathan Guse 2013-07-13 10:49:04 -07:00
commit 9d86385a36
5 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
phpBB/styles/prosilver/template/forum_fn.js
View file

@ -106,7 +106,24 @@ function dE(n, s, type) {
/**
* Alternate display of subPanels
*/
function subPanels(p) {
jQuery(document).ready(function() {
jQuery('.sub-panels').each(function() {
var panels = [],
childNodes = jQuery('a[data-subpanel]', this).each(function() {
panels.push(this.getAttribute('data-subpanel'));
}),
show_panel = this.getAttribute('data-show-panel');
if (panels.length) {
subPanels(show_panel);
childNodes.click(function () {
subPanels(this.getAttribute('data-subpanel'));
return false;
});
}
function subPanels(p) {
var i, e, t;
if (typeof(p) === 'string') {
@ -131,7 +148,9 @@ function subPanels(p) {
}
}
}
}
}
});
});
/**
* Call print preview

23
phpBB/styles/prosilver/template/mcp_topic.html
View file

@ -3,33 +3,24 @@
<div class="tabs-container">
<h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}{L_COLON} {TOPIC_TITLE}</a></h2>
<script type="text/javascript">
// <![CDATA[
var panels = new Array('display-panel', 'split-panel', 'merge-panel');
<!-- IF S_MERGE_VIEW -->
var show_panel = 'merge-panel';
<!-- DEFINE $SHOW_PANEL = 'merge-panel' -->
<!-- ELSEIF S_SPLIT_VIEW -->
var show_panel = 'split-panel';
<!-- DEFINE $SHOW_PANEL = 'split-panel' -->
<!-- ELSE -->
var show_panel = 'display-panel';
<!-- DEFINE $SHOW_PANEL = 'display-panel' -->
<!-- ENDIF -->
onload_functions.push('subPanels()');
// ]]>
</script>
<div id="minitabs">
<div id="minitabs" class="sub-panels" data-show-panel="{$SHOW_PANEL}">
<ul>
<li id="display-panel-tab"<!-- IF not S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->>
<a href="#minitabs" onclick="subPanels('display-panel'); return false;"><span>{L_DISPLAY_OPTIONS}</span></a>
<a href="#minitabs" data-subpanel="display-panel"><span>{L_DISPLAY_OPTIONS}</span></a>
</li>
<li id="split-panel-tab">
<a href="#minitabs" onclick="subPanels('split-panel'); return false;"><span>{L_SPLIT_TOPIC}</span></a>
<a href="#minitabs" data-subpanel="split-panel"><span>{L_SPLIT_TOPIC}</span></a>
</li>
<li id="merge-panel-tab"<!-- IF S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->>
<a href="#minitabs" onclick="subPanels('merge-panel'); return false;"><span>{L_MERGE_POSTS}</span></a>
<a href="#minitabs" data-subpanel="merge-panel"><span>{L_MERGE_POSTS}</span></a>
</li>
</ul>
</div>

3
phpBB/styles/prosilver/template/posting_buttons.html
View file

@ -32,9 +32,6 @@
<!-- END custom_tags -->
}
var panels = new Array('options-panel', 'attach-panel', 'poll-panel');
var show_panel = 'options-panel';
function change_palette()
{
dE('colour_palette');

8
phpBB/styles/prosilver/template/posting_editor.html
View file

@ -185,11 +185,11 @@
<!-- ENDIF -->
<!-- IF not S_PRIVMSGS and not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->
<div id="tabs">
<div id="tabs" class="sub-panels" data-show-panel="options-panel">
<ul>
<li id="options-panel-tab" class="activetab"><a href="#tabs" onclick="subPanels('options-panel'); return false;"><span>{L_OPTIONS}</span></a></li>
<!-- IF S_SHOW_ATTACH_BOX --><li id="attach-panel-tab"><a href="#tabs" onclick="subPanels('attach-panel'); return false;"><span>{L_ADD_ATTACHMENT}</span></a></li><!-- ENDIF -->
<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --><li id="poll-panel-tab"><a href="#tabs" onclick="subPanels('poll-panel'); return false;"><span>{L_ADD_POLL}</span></a></li><!-- ENDIF -->
<li id="options-panel-tab" class="activetab"><a href="#tabs" data-subpanel="options-panel"><span>{L_OPTIONS}</span></a></li>
<!-- IF S_SHOW_ATTACH_BOX --><li id="attach-panel-tab"><a href="#tabs" data-subpanel="attach-panel"><span>{L_ADD_ATTACHMENT}</span></a></li><!-- ENDIF -->
<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --><li id="poll-panel-tab"><a href="#tabs" data-subpanel="poll-panel"><span>{L_ADD_POLL}</span></a></li><!-- ENDIF -->
</ul>
</div>
<!-- ENDIF -->

7
phpBB/styles/prosilver/template/posting_layout.html
View file

@ -79,12 +79,5 @@
<!-- IF S_DISPLAY_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
</form>
<!-- IF not S_PRIVMSGS -->
<script type="text/javascript">
// <![CDATA[
subPanels(show_panel);
// ]]>
</script>
<!-- ENDIF -->
<!-- INCLUDE overall_footer.html -->