diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-04-15 13:45:45 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-04-15 13:45:45 +0200 |
| commit | ae7c596cf4e6a0a09ebcf01fe8ae98789360c5be (patch) | |
| tree | f156252e404e9893922cb5d984fdc646644b6c17 /lib/tpl/dokuwiki/mediamanager.php | |
| parent | f41c79d730286e8e8c95deb88a4c876e08e278a2 (diff) | |
| parent | 026b314868ee80aca644bf4107f78d8e8052b43e (diff) | |
| download | rpg-ae7c596cf4e6a0a09ebcf01fe8ae98789360c5be.tar.gz rpg-ae7c596cf4e6a0a09ebcf01fe8ae98789360c5be.tar.bz2 | |
Merge branch 'master' into htmlmail
* master: (382 commits)
Romanian language update
Marathi language update
Arabic Language Update
when there's not enough space for images, make sure they stay proportional (might be FS#2480)
added minimal RTL print styles (part of FS#2185)
moved plugins' rtl.css to their style.css counterpart (part of FS#2185)
removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary
removed comments from accidentally commented lines in tpl_includeFile()
removed obsolete template file
added tpl_includeFile() to core
Make getTitle method in remote interface public
Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors.
BG: language update
Korean language update
fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447)
deleted very old (and unused) images
added accidentally removed '<?php' back in (was in 57fc5edd)
wrapped X-UA-Compatible meta tag with conditional comments
added explanation to todo in _forms.css
removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950)
...
Conflicts:
inc/auth.php
inc/load.php
Diffstat (limited to 'lib/tpl/dokuwiki/mediamanager.php')
| -rw-r--r-- | lib/tpl/dokuwiki/mediamanager.php | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php new file mode 100644 index 000000000..1f3b9661b --- /dev/null +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -0,0 +1,47 @@ +<?php +/** + * DokuWiki Media Manager Popup + * + * @author Andreas Gohr <andi@splitbrain.org> + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ +// 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="<?php echo $lang['direction'] ?>" class="popup"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]--> + <title> + <?php echo hsc($lang['mediaselect'])?> + [<?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')) ?> + <?php tpl_includeFile('meta.html') ?> +</head> + +<body> + <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]--> + <div id="media__manager" class="dokuwiki"> + <?php html_msgarea() ?> + <div id="mediamgr__aside"><div class="pad"> + <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> + + <div id="mediamgr__content"><div class="pad"> + <?php tpl_mediaContent() ?> + </div></div> + </div> + <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]--> +</body> +</html> |