EH22/dokuwiki-template-sprintdoc-modified
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove references to removed options

Browse source 
In commit cb7cc643bf the other options
were removed, as discussed.

This commit now removes references to these options from the codebase.

SPR-754
This commit is contained in:
Michael Große 2017-04-18 13:24:33 +02:00
commit e302d67fb6
No known key found for this signature in database
GPG key ID: 7E31028FBFEACC79
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Template.php
View file

@ -181,7 +181,7 @@ class Template {
'img', 'img',
array( array(
'class' => 'mobile-hide', 'class' => 'mobile-hide',
'src' => array(tpl_getConf('logo'), 'wiki:logo-wide.png', 'wiki:logo.png'), 'src' => array('wiki:logo-wide.png', 'wiki:logo.png'),
'alt' => $title, 'alt' => $title,
), ),
0, 0 0, 0
@ -190,7 +190,7 @@ class Template {
'img', 'img',
array( array(
'class' => 'mobile-only', 'class' => 'mobile-only',
'src' => array('wiki:logo-32x32.png', 'wiki:favicon.png', 'wiki:logo-square.png', 'wiki:logo.png', tpl_getConf('logo')), 'src' => array('wiki:logo-32x32.png', 'wiki:favicon.png', 'wiki:logo-square.png', 'wiki:logo.png'),
'alt' => $title, 'alt' => $title,
), ),
32, 32 32, 32

6
main.php
View file

@ -20,7 +20,7 @@ if (empty($JSINFO['template'])) {
} }
$JSINFO['template']['sprintdoc'] = array('sidebar_toggle_elements' => tpl_getConf('sidebar_sections')); $JSINFO['template']['sprintdoc'] = array('sidebar_toggle_elements' => tpl_getConf('sidebar_sections'));
$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && !empty($_SERVER['REMOTE_USER']) ); $showTools = true;
$showSidebar = true; /* */ $showSidebar = true; /* */
?> ?>
<html class="edge no-js" lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>"> <html class="edge no-js" lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>">
@ -118,7 +118,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
</a> </a>
</div> </div>
<?php if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))){ <?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@ -126,7 +126,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* upload your logo into the data/media folder (root of the media manager) and replace 'logo.png' in der template config accordingly: */ /* upload your logo into the data/media folder (root of the media manager) and replace 'logo.png' in der template config accordingly: */
include('tpl/main-sidebar-logo.php'); include('tpl/main-sidebar-logo.php');
} ?> ?>
<div class="main-title"> <div class="main-title">
<?php if ($conf['title']): <?php if ($conf['title']):

10
tpl/favicon_tiles.php
View file

@ -17,7 +17,7 @@ echo Template::getResizedImgTag(
'link', 'link',
array( array(
'rel' => 'shortcut icon', 'rel' => 'shortcut icon',
'href' => array('wiki:favicon.ico', 'wiki:favicon.png', tpl_getConf('logo')) 'href' => array('wiki:favicon.ico', 'wiki:favicon.png')
), ),
0, 0 // no scaling 0, 0 // no scaling
); );
@ -29,7 +29,7 @@ foreach(array(57, 60, 72, 76, 114, 120, 144, 152, 180) as $size) {
array( array(
'rel' => 'apple-touch-icon', 'rel' => 'apple-touch-icon',
'sizes' => $size . 'x' . $size, 'sizes' => $size . 'x' . $size,
'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png', tpl_getConf('logo')) 'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png')
), ),
$size, $size $size, $size
); );
@ -42,7 +42,7 @@ foreach(array(32, 96, 192) as $size) {
array( array(
'rel' => 'icon', 'rel' => 'icon',
'sizes' => $size . 'x' . $size, 'sizes' => $size . 'x' . $size,
'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png', tpl_getConf('logo')) 'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png')
), ),
$size, $size $size, $size
); );
@ -54,7 +54,7 @@ foreach(array(70, 310) as $size) {
'meta', 'meta',
array( array(
'name' => 'msapplication-square' . $size . 'x' . $size . 'logo', 'name' => 'msapplication-square' . $size . 'x' . $size . 'logo',
'content' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png', tpl_getConf('logo')) 'content' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png')
), ),
$size, $size $size, $size
); );
@ -66,7 +66,7 @@ foreach(array(array(310, 150)) as $size) {
'meta', 'meta',
array( array(
'name' => 'msapplication-wide' . $size[0] . 'x' . $size[1] . 'logo', 'name' => 'msapplication-wide' . $size[0] . 'x' . $size[1] . 'logo',
'content' => array('wiki:logo-' . $size[0] . 'x' . $size[1] . '.png', 'wiki:logo-wide.png', 'wiki:logo.png', tpl_getConf('logo')) 'content' => array('wiki:logo-' . $size[0] . 'x' . $size[1] . '.png', 'wiki:logo-wide.png', 'wiki:logo.png')
), ),
$size[0], $size[1] $size[0], $size[1]
); );

4
tpl/nav-usertools-buttons.php
View file

@ -32,11 +32,11 @@
$class = 'opentask opentasks'; $class = 'opentask opentasks';
break; break;
} }
$linktarget = tpl_getConf('tasks_page');
$doInner = "<span class=\"prefix\">".tpl_getLang('prefix_tasks_user')." </span><span class=\"num\">".count($tasks)."</span>"; $doInner = "<span class=\"prefix\">".tpl_getLang('prefix_tasks_user')." </span><span class=\"num\">".count($tasks)."</span>";
if($linktarget){ if($linktarget){
if (substr($linktarget, 0, 1) !== ':') { if (substr($linktarget, 0, 1) !== ':') {
$linktarget = tpl_getConf('user_ns'). $_SERVER['REMOTE_USER'] .':' . $linktarget; $linktarget = 'user:' . $_SERVER['REMOTE_USER'] .':' . 'dashboard';
} }
if($num == 0){ if($num == 0){
echo '<li class="user-task '.$class.'"><strong>'.$doInner.'</strong></li>'; echo '<li class="user-task '.$class.'"><strong>'.$doInner.'</strong></li>';