2 files changed, 35 insertions, 16 deletions

diff --git a/inc/media.php b/inc/media.php
index b4b62d2c5..c16665b13 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -697,7 +697,7 @@ function media_tab_view($image, $ns, $auth=null) {
 
     echo '<div class="mediamanager-tab-detail-view">';
     echo '<div class="background-container">';
-    echo $lang['media_view'];
+    echo $image;
     echo '</div>';
 
     echo '<div class="scroll-container">';
@@ -880,17 +880,17 @@ function media_diff($image, $ns, $auth) {
         $revs = getRevisions($image, 0, 1, 8192, true);
         $l_rev = $revs[0];
     }
-    echo '<table><tr><td>';
+    echo '<ul class="mediamanager-table-50"><li><div>';
     media_preview($image, $auth, $l_rev);
-    echo '</td>';
-    echo '<td>';
+    echo '</div></li>';
+    echo '<li><div>';
     media_preview($image, $auth, $r_rev);
-    echo '</td></tr><tr><td>';
+    echo '</div></li><li><div>';
     media_details($image, $auth, $l_rev);
-    echo '</td>';
-    echo '<td>';
+    echo '</div></li>';
+    echo '<li><div>';
     media_details($image, $auth, $r_rev);
-    echo '</td></tr></table>';
+    echo '</div></li></ul>';
 }
 
 /**
@@ -1045,7 +1045,14 @@ function media_printfile_thumbs($item,$auth,$jump){
 
     // output
     echo '<li><div>';
-    if($item['isimg']) media_printimgdetail($item, true);
+    if($item['isimg']) {
+        media_printimgdetail($item, true);
+    } else {
+        echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
+            media_managerURL(array('image' => hsc($item['id']))).'">';
+        echo '<img src="'.DOKU_BASE.'lib/images/icon-file.png" width="90px" />';
+        echo '</a>';
+    }
     echo '<a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name=
         "h_:'.$item['id'].'" class="info" >'.hsc($file).'</a>';
     if($item['isimg']){
@@ -1054,6 +1061,8 @@ function media_printfile_thumbs($item,$auth,$jump){
         $info .= '&#215;';
         $info .= (int) $item['meta']->getField('File.Height');
         echo '<span class="info">'.$info.'</span>';
+    } else {
+        echo '<span class="info">&nbsp;</span>';
     }
     $info = '<i>'.dformat($item['mtime']).'</i>';
     echo '<span class="info">'.$info.'</span>';
@@ -1073,21 +1082,25 @@ function media_printimgdetail($item, $fullscreen=false){
     $w = (int) $item['meta']->getField('File.Width');
     $h = (int) $item['meta']->getField('File.Height');
     if($w>$size || $h>$size){
-        $ratio = $item['meta']->getResizeRatio($size);
+        if (!$fullscreen) {
+            $ratio = $item['meta']->getResizeRatio($size);
+        } else {
+            $ratio = $item['meta']->getResizeRatio($size,$size);
+        }
         $w = floor($w * $ratio);
         $h = floor($h * $ratio);
     }
     $src = ml($item['id'],array('w'=>$w,'h'=>$h));
     $p = array();
     $p['width']  = $w;
-    $p['height'] = $h;
+    if (!$fullscreen) $p['height'] = $h;
     $p['alt']    = $item['id'];
     $p['class']  = 'thumb';
     $att = buildAttributes($p);
 
     // output
     if ($fullscreen) {
-        echo '<a name="d_:'.$item['id'].'" class="image" href="'.
+        echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
             media_managerURL(array('image' => hsc($item['id']))).'">';
         echo '<img src="'.$src.'" '.$att.' />';
         echo '</a>';
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>';