mirror of
https://github.com/Hutchy68/pivot.git
synced 2024-11-21 18:09:03 +01:00
Fixes
This commit is contained in:
Tom Hutchison
parent
c7887308c0
commit
25daa36056
299
Pivot.skin.php
299
Pivot.skin.php
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Skin file for Pivot
|
||||
* Skin file for Pivot
|
||||
*
|
||||
* @file
|
||||
* @ingroup Skins
|
||||
@ -97,11 +97,11 @@ class pivotTemplate extends BaseTemplate {
|
||||
<div class="inner-wrap">
|
||||
<?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "<div class='fixed'>";?>
|
||||
<nav class="tab-bar">
|
||||
<section class="left-small show-for-small">
|
||||
<section id="left-nav-aside" class="left-small show-for-small">
|
||||
<a class="left-off-canvas-toggle"><span id="menu-user"><i class="fa fa-navicon fa-lg"></i></span></a>
|
||||
</section>
|
||||
|
||||
<section class="middle tab-bar-section">
|
||||
<section id="middle-nav" class="middle tab-bar-section">
|
||||
<h1 class="title"><a href="<?php echo $this->data['nav_urls']['mainpage']['href']; ?>">
|
||||
<span class="show-for-medium-up"><?php echo $wgPivotFeatures['wikiNameDesktop']; ?></span>
|
||||
<span class="show-for-small-only">
|
||||
@ -111,8 +111,8 @@ class pivotTemplate extends BaseTemplate {
|
||||
<?php echo $wgPivotFeatures['wikiName']; ?></span></a></h1>
|
||||
</section>
|
||||
|
||||
<section class="right-small">
|
||||
<a class="right-off-canvas-toggle"><span id="menu-user"><i class="fa fa-user fa-lg"></i></span></a>
|
||||
<section id="right-nav-aside" class="right-small">
|
||||
<a class="right-off-canvas-toggle"><span id="menu-user"><i class="fa <?php if ($wgUser->isLoggedIn()): ?>fa-user<?php else: ?>fa-navicon<?php endif; ?> fa-lg"></i></span></a>
|
||||
</section>
|
||||
</nav>
|
||||
<?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "</div>";?>
|
||||
@ -120,10 +120,10 @@ class pivotTemplate extends BaseTemplate {
|
||||
<ul class="off-canvas-list">
|
||||
|
||||
<li class="has-form">
|
||||
<form action="/w/index.php" id="searchform" class="mw-search">
|
||||
<form action="/w/index.php" id="searchform-offcanvas" class="mw-search">
|
||||
<div class="row collapse">
|
||||
<div class="small-12 columns">
|
||||
<input type="search" name="search" placeholder="Search" title="Search [alt-shift-f]" accesskey="f" id="searchInput" autocomplete="off">
|
||||
<input type="search" name="search" placeholder="Search" title="Search [alt-shift-f]" accesskey="f" id="searchInput-offcanvas" autocomplete="off">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@ -138,158 +138,161 @@ class pivotTemplate extends BaseTemplate {
|
||||
<?php } ?>
|
||||
<li><label></i>Toolbox</label></li>
|
||||
<?php foreach ( $this->getToolbox() as $key => $item ) { echo $this->makeListItem($key, $item); } ?>
|
||||
</ul>
|
||||
</aside>
|
||||
|
||||
<aside class="right-off-canvas-menu">
|
||||
<ul class="off-canvas-list">
|
||||
<?php if ($wgUser->isLoggedIn()): ?>
|
||||
<li id="personal-tools"><label>Personal</label></li>
|
||||
<?php foreach ( $this->getPersonalTools() as $key => $item ) { echo $this->makeListItem($key, $item); } ?>
|
||||
<?php else: ?>
|
||||
<?php if (isset($this->data['personal_urls']['anonlogin'])): ?>
|
||||
<li><a href="<?php echo $this->data['personal_urls']['anonlogin']['href']; ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
|
||||
<?php elseif (isset($this->data['personal_urls']['login'])): ?>
|
||||
<li><a href="<?php echo htmlspecialchars($this->data['personal_urls']['login']['href']); ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
|
||||
<?php else: ?>
|
||||
<li><?php echo Linker::link(Title::newFromText('Special:UserLogin'), wfMessage( 'login' )->text()); ?></li>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
</ul>
|
||||
</aside>
|
||||
<aside class="right-off-canvas-menu">
|
||||
<ul class="off-canvas-list">
|
||||
<?php if ($wgUser->isLoggedIn()): ?>
|
||||
<li id="personal-tools"><label>Personal</label></li>
|
||||
<?php foreach ( $this->getPersonalTools() as $key => $item ) { echo $this->makeListItem($key, $item); } ?>
|
||||
<?php else: ?>
|
||||
<?php if (isset($this->data['personal_urls']['anonlogin'])): ?>
|
||||
<li><a href="<?php echo $this->data['personal_urls']['anonlogin']['href']; ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
|
||||
<?php elseif (isset($this->data['personal_urls']['login'])): ?>
|
||||
<li><a href="<?php echo htmlspecialchars($this->data['personal_urls']['login']['href']); ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
|
||||
<?php else: ?>
|
||||
<li><?php echo Linker::link(Title::newFromText('Special:UserLogin'), wfMessage( 'login' )->text()); ?></li>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
</ul>
|
||||
</aside>
|
||||
|
||||
<section class="main-section" <?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "style='margin-top:2.8125em'"; ?>>
|
||||
|
||||
<div id="page-content">
|
||||
|
||||
<div id="mw-js-message" style="display:none;"></div>
|
||||
<section id="main-section" class="main-section" <?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "style='margin-top:2.8125em'"; ?>>
|
||||
|
||||
<div id="page-content">
|
||||
|
||||
<div id="mw-js-message" style="display:none;"></div>
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div id="sidebar" class="large-2 medium-3 columns hide-for-small">
|
||||
<ul class="side-nav">
|
||||
<li class="name logo">
|
||||
<a href="<?php echo $this->data['nav_urls']['mainpage']['href']; ?>">
|
||||
<img alt="<?php echo $this->text('sitename'); ?>" src="<?php echo $this->text('logopath') ?>" style="max-width: 100%;height:auto;display: inline-block; vertical-align:middle;text-align:center;"></a>
|
||||
</li>
|
||||
<li class="has-form">
|
||||
<form action="/w/index.php" id="searchform" class="mw-search">
|
||||
<div class="row collapse">
|
||||
<div class="small-12 columns">
|
||||
<input type="search" name="search" placeholder="Search" title="Search [alt-shift-f]" accesskey="f" id="searchInput" autocomplete="off">
|
||||
<div class="row">
|
||||
|
||||
<div id="sidebar" class="large-2 medium-3 columns hide-for-small">
|
||||
<ul class="side-nav">
|
||||
<li class="name logo">
|
||||
<a href="<?php echo $this->data['nav_urls']['mainpage']['href']; ?>">
|
||||
<img alt="<?php echo $this->text('sitename'); ?>" src="<?php echo $this->text('logopath') ?>" style="max-width: 100%;height:auto;display: inline-block; vertical-align:middle;text-align:center;"></a>
|
||||
</li>
|
||||
<li class="has-form">
|
||||
<form action="/w/index.php" id="searchform" class="mw-search">
|
||||
<div class="row collapse">
|
||||
<div class="small-12 columns">
|
||||
<input type="search" name="search" placeholder="Search" title="Search [alt-shift-f]" accesskey="f" id="searchInput" autocomplete="off">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</li>
|
||||
|
||||
<?php foreach ( $this->getSidebar() as $boxName => $box ) { if ( ($box['header'] != wfMessage( 'toolbox' )->text()) ) { ?>
|
||||
<li id='<?php echo Sanitizer::escapeId( $box['id'] ) ?>'<?php echo Linker::tooltip( $box['id'] ) ?>>
|
||||
<li><label><?php echo htmlspecialchars( $box['header'] ); ?></label></li>
|
||||
<?php if ( is_array( $box['content'] ) ) { ?>
|
||||
<?php foreach ( $box['content'] as $key => $item ) { echo $this->makeListItem( $key, $item ); } ?>
|
||||
<?php } } ?>
|
||||
<?php } ?>
|
||||
<li><label>Toolbox</label></li>
|
||||
<?php foreach ( $this->getToolbox() as $key => $item ) { echo $this->makeListItem($key, $item); } ?>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div id="p-cactions" class="large-10 medium-9 columns">
|
||||
|
||||
<div class="row">
|
||||
<div class="large-12 columns">
|
||||
<!--[if lt IE 9]>
|
||||
<div id="siteNotice" class="sitenotice panel radius"><?php echo $this->text('sitename') . ' '. wfMessage( 'pivot-browsermsg' )->text(); ?></div>
|
||||
<![endif]-->
|
||||
|
||||
<?php if ( $this->data['sitenotice'] ) { ?><div id="siteNotice" class="sitenotice panel radius"><?php $this->html( 'sitenotice' ); ?></div><?php } ?>
|
||||
<?php if ( $this->data['newtalk'] ) { ?><div id="usermessage" class="newtalk panel radius"><?php $this->html( 'newtalk' ); ?></div><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</li>
|
||||
|
||||
<?php foreach ( $this->getSidebar() as $boxName => $box ) { if ( ($box['header'] != wfMessage( 'toolbox' )->text()) ) { ?>
|
||||
<li id='<?php echo Sanitizer::escapeId( $box['id'] ) ?>'<?php echo Linker::tooltip( $box['id'] ) ?>>
|
||||
<li><label><?php echo htmlspecialchars( $box['header'] ); ?></label></li>
|
||||
<?php if ( is_array( $box['content'] ) ) { ?>
|
||||
<?php foreach ( $box['content'] as $key => $item ) { echo $this->makeListItem( $key, $item ); } ?>
|
||||
<?php } } ?>
|
||||
<?php } ?>
|
||||
<li><label>Toolbox</label></li>
|
||||
<?php foreach ( $this->getToolbox() as $key => $item ) { echo $this->makeListItem($key, $item); } ?>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div id="p-cactions" class="large-10 medium-9 columns">
|
||||
|
||||
<div class="row">
|
||||
<div class="large-12 columns">
|
||||
<!--[if lt IE 9]>
|
||||
<div id="siteNotice" class="sitenotice panel radius"><?php echo $this->text('sitename') . ' '. wfMessage( 'pivot-browsermsg' )->text(); ?></div>
|
||||
<![endif]-->
|
||||
|
||||
<?php if ($wgUser->isLoggedIn() || $wgPivotFeatures['showActionsForAnon']): ?>
|
||||
<a href="#" data-options="align:left" data-dropdown="drop1" class="button secondary small radius pull-right" id="drop"><i class="fa fa-navicon fa-lg"><span id="page-actions" class="show-for-medium-up"> <?php echo wfMessage( 'actions' )->text() ?></span></i></a>
|
||||
<ul id="drop1" class="tiny content f-dropdown" data-dropdown-content>
|
||||
<?php foreach( $this->data['content_actions'] as $key => $item ) { echo preg_replace(array('/\sprimary="1"/','/\scontext="[a-z]+"/','/\srel="archives"/'),'',$this->makeListItem($key, $item)); } ?>
|
||||
<?php wfRunHooks( SkinTemplateToolboxEnd, array( &$this, true ) ); ?>
|
||||
</ul>
|
||||
<?php if ($wgUser->isLoggedIn()): ?>
|
||||
<div id="echo-notifications"></div>
|
||||
<?php endif; ?>
|
||||
<?php endif;
|
||||
$namespace = str_replace('_', ' ', $this->getSkin()->getTitle()->getNsText());
|
||||
$displaytitle = $this->data['title'];
|
||||
if (!empty($namespace)) {
|
||||
$pagetitle = $this->getSkin()->getTitle();
|
||||
$newtitle = str_replace($namespace.':', '', $pagetitle);
|
||||
$displaytitle = str_replace($pagetitle, $newtitle, $displaytitle);
|
||||
?><h4 class="namespace label"><?php print $namespace; ?></h4><?php } ?>
|
||||
<h2 class="title"><?php print $displaytitle; ?></h2>
|
||||
<?php if ($wgPivotFeatures['useAddThisShare'] != false) { ?>
|
||||
<!-- Go to www.addthis.com/dashboard to customize your tools -->
|
||||
<div class="addthis_sharing_toolbox show-for-large-up"></div>
|
||||
<!-- Go to www.addthis.com/dashboard to customize your tools -->
|
||||
<?php } ?>
|
||||
<?php if ( $this->data['isarticle'] ) { ?><h3 id="tagline"><?php $this->msg( 'tagline' ) ?></h3><?php } ?>
|
||||
<h5 class="subtitle"><?php $this->html('subtitle') ?></h5>
|
||||
<div class="clear_both"></div>
|
||||
<?php
|
||||
switch ($wgPivotFeatures['usePivotTabs']) {
|
||||
case 'true':
|
||||
echo $body;
|
||||
ob_flush();
|
||||
break;
|
||||
default:
|
||||
$this->html('bodytext');
|
||||
break;
|
||||
}
|
||||
?>
|
||||
<div id="categories" class="row">
|
||||
<div class="small-12 columns">
|
||||
<div class="group"><?php $this->html('catlinks'); ?></div>
|
||||
<?php $this->html('dataAfterContent'); ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer class="row">
|
||||
|
||||
<?php if ( $this->data['sitenotice'] ) { ?><div id="siteNotice" class="sitenotice panel radius"><?php $this->html( 'sitenotice' ); ?></div><?php } ?>
|
||||
<?php if ( $this->data['newtalk'] ) { ?><div id="usermessage" class="newtalk panel radius"><?php $this->html( 'newtalk' ); ?></div><?php } ?>
|
||||
<div id="footer">
|
||||
<div id="footer-left" class="<?php echo $footerLeftClass;?>">
|
||||
<ul id="footer-left">
|
||||
<?php foreach ( $this->getFooterLinks( "flat" ) as $key ) { ?>
|
||||
<li id="footer-<?php echo $key ?>"><?php $this->html( $key ) ?></li>
|
||||
<?php } ?>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="footer-right-icons" class="<?php echo $footerRightClass;?>">
|
||||
<ul id="footer-right">
|
||||
<li class="social-follow">
|
||||
<?php if ($wgPivotFeatures['useAddThisFollow'] != false) { ?>
|
||||
<div class="social-links">
|
||||
<!-- Go to www.addthis.com/dashboard to customize your tools -->
|
||||
<div class="addthis_horizontal_follow_toolbox show-for-large-up"></div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
</li>
|
||||
<?php foreach ( $this->getFooterIcons( $poweredbyType ) as $blockName => $footerIcons ) { ?>
|
||||
<li class="<?php echo $blockName ?>"><?php foreach ( $footerIcons as $icon ) { ?>
|
||||
<?php echo $this->getSkin()->makeFooterIcon( $icon, $poweredbyMakeType ); ?>
|
||||
<?php } ?>
|
||||
</li>
|
||||
<?php } ?>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</section>
|
||||
|
||||
<?php if ($wgUser->isLoggedIn() || $wgPivotFeatures['showActionsForAnon']): ?>
|
||||
<a href="#" data-options="align:left" data-dropdown="drop1" class="button secondary small radius pull-right" id="drop"><i class="fa fa-navicon fa-lg"><span id="page-actions" class="show-for-medium-up"> <?php echo wfMessage( 'actions' )->text() ?></span></i></a>
|
||||
<ul id="drop1" class="tiny content f-dropdown" data-dropdown-content>
|
||||
<?php foreach( $this->data['content_actions'] as $key => $item ) { echo preg_replace(array('/\sprimary="1"/','/\scontext="[a-z]+"/','/\srel="archives"/'),'',$this->makeListItem($key, $item)); } ?>
|
||||
<?php wfRunHooks( SkinTemplateToolboxEnd, array( &$this, true ) ); ?>
|
||||
</ul>
|
||||
<?php if ($wgUser->isLoggedIn()): ?>
|
||||
<div id="echo-notifications"></div>
|
||||
<?php endif; ?>
|
||||
<?php endif;
|
||||
$namespace = str_replace('_', ' ', $this->getSkin()->getTitle()->getNsText());
|
||||
$displaytitle = $this->data['title'];
|
||||
if (!empty($namespace)) {
|
||||
$pagetitle = $this->getSkin()->getTitle();
|
||||
$newtitle = str_replace($namespace.':', '', $pagetitle);
|
||||
$displaytitle = str_replace($pagetitle, $newtitle, $displaytitle);
|
||||
?><h4 class="namespace label"><?php print $namespace; ?></h4><?php } ?>
|
||||
<h2 class="title"><?php print $displaytitle; ?></h2>
|
||||
<!-- Go to www.addthis.com/dashboard to customize your tools -->
|
||||
<div class="addthis_sharing_toolbox show-for-large-up"></div>
|
||||
<!-- Go to www.addthis.com/dashboard to customize your tools -->
|
||||
<!-- moved to resource loader <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-50f7269b339fed7f" async="async"></script> -->
|
||||
<?php if ( $this->data['isarticle'] ) { ?><h3 id="tagline"><?php $this->msg( 'tagline' ) ?></h3><?php } ?>
|
||||
<h5 class="subtitle"><?php $this->html('subtitle') ?></h5>
|
||||
<div class="clear_both"></div>
|
||||
<?php
|
||||
switch ($wgPivotFeatures['usePivotTabs']) {
|
||||
case 'true':
|
||||
echo $body;
|
||||
ob_flush();
|
||||
break;
|
||||
default:
|
||||
$this->html('bodytext');
|
||||
break;
|
||||
}
|
||||
?>
|
||||
<div class="row">
|
||||
<div class="small-12 columns">
|
||||
<div class="group"><?php $this->html('catlinks'); ?></div>
|
||||
<?php $this->html('dataAfterContent'); ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer class="row">
|
||||
</div>
|
||||
</div>
|
||||
<a class="exit-off-canvas"></a>
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
<div id="footer-left" class="<?php echo $footerLeftClass;?>">
|
||||
<ul id="footer-left">
|
||||
<?php foreach ( $this->getFooterLinks( "flat" ) as $key ) { ?>
|
||||
<li id="footer-<?php echo $key ?>"><?php $this->html( $key ) ?></li>
|
||||
<?php } ?>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="footer-right-icons" class="<?php echo $footerRightClass;?>">
|
||||
<ul id="footer-right">
|
||||
<li class="social-follow">
|
||||
<?php if ($wgPivotFeatures['addThisFollow'] != false) { ?>
|
||||
<div class="social-links">
|
||||
<!-- Go to www.addthis.com/dashboard to customize your tools -->
|
||||
<div class="addthis_horizontal_follow_toolbox show-for-large-up"></div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
</li>
|
||||
<?php foreach ( $this->getFooterIcons( $poweredbyType ) as $blockName => $footerIcons ) { ?>
|
||||
<li class="<?php echo $blockName ?>"><?php foreach ( $footerIcons as $icon ) { ?>
|
||||
<?php echo $this->getSkin()->makeFooterIcon( $icon, $poweredbyMakeType ); ?>
|
||||
<?php } ?>
|
||||
</li>
|
||||
<?php } ?>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</section>
|
||||
</div>
|
||||
<a class="exit-off-canvas"></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php $this->printTrail(); ?>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user