summaryrefslogtreecommitdiff
path: root/inc/template.php
diff options
context:
space:
mode:
authorKate Arzamastseva <pshns@ukr.net>2011-06-22 23:16:31 +0300
committerKate Arzamastseva <pshns@ukr.net>2011-06-22 23:16:31 +0300
commit6b467722ce67ad489326798250cc5312efa70dcd (patch)
tree4c10cde57ab5494eed7571944c5602a3f67f6d70 /inc/template.php
parent030dd1d963bb7a0ab824b823d777a58fc105b1e5 (diff)
downloadrpg-6b467722ce67ad489326798250cc5312efa70dcd.tar.gz
rpg-6b467722ce67ad489326798250cc5312efa70dcd.tar.bz2
mediamanager fixes
Diffstat (limited to 'inc/template.php')
-rw-r--r--inc/template.php14
1 files changed, 10 insertions, 4 deletions
diff --git a/inc/template.php b/inc/template.php
index 69ed61f7e..5d29f6950 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1163,8 +1163,9 @@ function tpl_fileDetails(){
global $NS;
global $IMG;
- $image = $_REQUEST['image'];
+ if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
if (!isset($IMG) && !isset($image)) return '';
+ if (isset($NS) && getNS($image) != $NS) return '';
$opened_tab = $_REQUEST['tab_details'];
if (!$opened_tab) $opened_tab = 'view';
@@ -1422,15 +1423,20 @@ function tpl_getFavicon($abs=false) {
*/
function tpl_media() {
//
- global $DEL, $NS, $IMG, $AUTH, $JUMPTO;
+ global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $lang;
require_once(DOKU_INC.'lib/exe/mediamanager.php');
echo '<div class="mediamanager" id="id-mediamanager">';
echo '<div class="mediamanager-slider" id="id-mediamanager-layout">';
echo '<div id="id-mediamanager-layout-namespaces" class="layout" style="width: 25%;">';
html_msgarea();
- echo hsc('Namespaces:');
- echo '<br /><br />';
+ echo '<div class="mediamanager-tabs">';
+ echo '<a href="#" class="selected">'.hsc($lang['namespaces']).'</a>';
+ echo '<div class="clearer"></div>';
+ echo '</div>';
+ echo '<div class="background-container">';
+ echo hsc($lang['namespaces']);
+ echo '</div>';
echo '<div class="scroll-container">';
tpl_mediaTree(true);
echo '</div>';