Browse Source

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

master
Anika Henke 13 years ago
parent
commit
94d4f70f67
  1. 7
      detail.php
  2. 2
      main.php
  3. 8
      mediamanager.php

7
detail.php

@ -8,6 +8,7 @@
// must be run from within DokuWiki // must be run from within DokuWiki
if (!defined('DOKU_INC')) die(); 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" ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "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'])?>] [<?php echo strip_tags($conf['title'])?>]
</title> </title>
<?php tpl_metaheaders()?> <?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> </head>
<body> <body>
@ -77,7 +80,7 @@ if (!defined('DOKU_INC')) die();
<?php <?php
$imgNS = getNS($IMG); $imgNS = getNS($IMG);
$authNS = auth_quickaclcheck("$imgNS:*"); $authNS = auth_quickaclcheck("$imgNS:*");
if ($authNS >= AUTH_UPLOAD) {
if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) {
$mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG));
echo '<a href="'.$mmURL.'">'.$lang['img_manager'].'</a><br />'; echo '<a href="'.$mmURL.'">'.$lang['img_manager'].'</a><br />';
} }

2
main.php

@ -19,7 +19,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
<title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title> <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title>
<?php tpl_metaheaders() ?> <?php tpl_metaheaders() ?>
<meta name="viewport" content="width=device-width,initial-scale=1" /> <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') ?> <?php _tpl_include('meta.html') ?>
</head> </head>

8
mediamanager.php

@ -4,6 +4,10 @@
* *
* @author Andreas Gohr <andi@splitbrain.org> * @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" ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>"
@ -15,7 +19,9 @@
[<?php echo strip_tags($conf['title'])?>] [<?php echo strip_tags($conf['title'])?>]
</title> </title>
<?php tpl_metaheaders()?> <?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> </head>
<body> <body>

Loading…
Cancel
Save