diff options
| author | Anika Henke <anika@selfthinker.org> | 2013-11-02 13:10:14 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2013-11-02 13:10:14 +0000 |
| commit | c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01 (patch) | |
| tree | 96e8dc34468a325596a5f94c85e38374fbc4b9ba /lib/tpl/default/mediamanager.php | |
| parent | 71c1143e8785954ea00a62aeb755ca7d8fa47e56 (diff) | |
| parent | 38d74b12176722ce52dc1905c13816a78a2551ee (diff) | |
| download | rpg-c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01.tar.gz rpg-c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into video-audio
Conflicts:
inc/parser/xhtml.php
Diffstat (limited to 'lib/tpl/default/mediamanager.php')
| -rw-r--r-- | lib/tpl/default/mediamanager.php | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/lib/tpl/default/mediamanager.php b/lib/tpl/default/mediamanager.php deleted file mode 100644 index 35b526a32..000000000 --- a/lib/tpl/default/mediamanager.php +++ /dev/null @@ -1,45 +0,0 @@ -<?php -/** - * DokuWiki Default Template - * - * This is the template for the media manager popup - * - * @link http://dokuwiki.org/templates - * @author Andreas Gohr <andi@splitbrain.org> - */ - -// must be run from within DokuWiki -if (!defined('DOKU_INC')) die(); - -?> -<!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']?>" lang="<?php echo $conf['lang']?>" dir="ltr"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title> - <?php echo hsc($lang['mediaselect'])?> - [<?php echo strip_tags($conf['title'])?>] - </title> - <?php tpl_metaheaders()?> - <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" /> -</head> - -<body> -<div id="media__manager" class="dokuwiki"> - <div id="media__left"> - <?php html_msgarea()?> - <h1><?php echo hsc($lang['mediaselect'])?></h1> - - <?php /* keep the id! additional elements are inserted via JS here */?> - <div id="media__opts"></div> - - <?php tpl_mediaTree() ?> - </div> - - <div id="media__right"> - <?php tpl_mediaContent() ?> - </div> -</div> -</body> -</html> |