added same meta info from main to detail and mediamanager; fixed mediamanager link for older DW versions

This commit is contained in:
Anika Henke 2011-11-20 17:50:41 +00:00
parent 77a8b9e10b
commit 94d4f70f67
3 changed files with 13 additions and 4 deletions

View file

@ -8,6 +8,7 @@
// must be run from within DokuWiki
if (!defined('DOKU_INC')) die();
@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */
?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@ -20,7 +21,9 @@ if (!defined('DOKU_INC')) die();
[<?php echo strip_tags($conf['title'])?>]
</title>
<?php tpl_metaheaders()?>
<link rel="shortcut icon" href="<?php echo ml('favicon.ico') ?>" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<?php echo tpl_favicon(array('favicon', 'mobile')) ?>
<?php _tpl_include('meta.html') ?>
</head>
<body>
@ -77,7 +80,7 @@ if (!defined('DOKU_INC')) die();
<?php
$imgNS = getNS($IMG);
$authNS = auth_quickaclcheck("$imgNS:*");
if ($authNS >= AUTH_UPLOAD) {
if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) {
$mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG));
echo '<a href="'.$mmURL.'">'.$lang['img_manager'].'</a><br />';
}

View file

@ -19,7 +19,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
<title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title>
<?php tpl_metaheaders() ?>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<?php echo _tpl_favicon(array('favicon', 'mobile')) /* DW versions > 2011-07-31 can use the core function tpl_favicon() */ ?>
<?php echo tpl_favicon(array('favicon', 'mobile')) ?>
<?php _tpl_include('meta.html') ?>
</head>

View file

@ -4,6 +4,10 @@
*
* @author Andreas Gohr <andi@splitbrain.org>
*/
// must be run from within DokuWiki
if (!defined('DOKU_INC')) die();
@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */
?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>"
@ -15,7 +19,9 @@
[<?php echo strip_tags($conf['title'])?>]
</title>
<?php tpl_metaheaders()?>
<link rel="shortcut icon" href="<?php echo ml('favicon.ico') ?>" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<?php echo tpl_favicon(array('favicon', 'mobile')) ?>
<?php _tpl_include('meta.html') ?>
</head>
<body>