From e302d67fb601311046a86f685e4d745f7d8a7e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Tue, 18 Apr 2017 13:24:33 +0200 Subject: [PATCH] Remove references to removed options In commit cb7cc643bf8e0ff0a632314222134a32ded8ae21 the other options were removed, as discussed. This commit now removes references to these options from the codebase. SPR-754 --- Template.php | 4 ++-- main.php | 6 +++--- tpl/favicon_tiles.php | 10 +++++----- tpl/nav-usertools-buttons.php | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Template.php b/Template.php index 7eae3ae..df7ef52 100644 --- a/Template.php +++ b/Template.php @@ -181,7 +181,7 @@ class Template { 'img', array( '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, ), 0, 0 @@ -190,7 +190,7 @@ class Template { 'img', array( '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, ), 32, 32 diff --git a/main.php b/main.php index 25e0d4d..ea4794e 100755 --- a/main.php +++ b/main.php @@ -20,7 +20,7 @@ if (empty($JSINFO['template'])) { } $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; /* */ ?> @@ -118,7 +118,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; - + ?>
'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 ); @@ -29,7 +29,7 @@ foreach(array(57, 60, 72, 76, 114, 120, 144, 152, 180) as $size) { array( 'rel' => 'apple-touch-icon', '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 ); @@ -42,7 +42,7 @@ foreach(array(32, 96, 192) as $size) { array( 'rel' => 'icon', '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 ); @@ -54,7 +54,7 @@ foreach(array(70, 310) as $size) { 'meta', array( '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 ); @@ -66,7 +66,7 @@ foreach(array(array(310, 150)) as $size) { 'meta', array( '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] ); diff --git a/tpl/nav-usertools-buttons.php b/tpl/nav-usertools-buttons.php index 1caff4c..c780267 100755 --- a/tpl/nav-usertools-buttons.php +++ b/tpl/nav-usertools-buttons.php @@ -32,11 +32,11 @@ $class = 'opentask opentasks'; break; } - $linktarget = tpl_getConf('tasks_page'); + $doInner = "".tpl_getLang('prefix_tasks_user')." ".count($tasks).""; if($linktarget){ if (substr($linktarget, 0, 1) !== ':') { - $linktarget = tpl_getConf('user_ns'). $_SERVER['REMOTE_USER'] .':' . $linktarget; + $linktarget = 'user:' . $_SERVER['REMOTE_USER'] .':' . 'dashboard'; } if($num == 0){ echo '
  • '.$doInner.'
    • ';