mediamanager icons

2 files changed, 37 insertions, 4 deletions

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index de3d03dfe..62cc1e7bb 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -329,7 +329,11 @@ var dw_mediamanager = {
         if ($link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false;
 
         $content = jQuery('#mediamanager__layout_detail');
-        jQuery('.scroll-container', $content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
+        if (jQuery('.scroll-container', $content).length) {
+            jQuery('.scroll-container', $content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
+        } else {
+            jQuery($content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
+        }
 
         params = '';
 
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index e87473687..df2b961b6 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -134,7 +134,7 @@ form.meta textarea.edit {
 }
 *+html .mediamanager-thumbs li {
     display: inline;
-    _height: 130px;
+    height: 130px;
 }
 
 .mediamanager-thumbs li .image {
@@ -144,12 +144,20 @@ form.meta textarea.edit {
     overflow: hidden;
 }
 
+.mediamanager-thumbs li .image div {
+    vertical-align: middle;
+    display: table-cell;
+    width: 100px;
+    height: 90px;
+}
+
 .mediamanager-thumbs li .name,
 .mediamanager-thumbs li .size,
 .mediamanager-thumbs li .filesize,
 .mediamanager-thumbs li .date {
     display: block;
     overflow: hidden;
+    white-space: nowrap;
 }
 
 .mediamanager-thumbs li input[type=checkbox] {
@@ -186,6 +194,7 @@ form.meta textarea.edit {
 
 .mediamanager-list li .image img {
     width: 100%;
+    vertical-align: middle;
 }
 
 .mediamanager-list li .name,
@@ -196,11 +205,26 @@ form.meta textarea.edit {
     float: left;
     width: 19%;
     margin-left: 1%;
+    white-space: nowrap;
 }
 
 .mediamanager-list li .date,
 .mediamanager-thumbs li .date {
     font-style: italic;
+    white-space: normal;
+}
+
+.mediamanager-list .icon {
+    max-width: 16px;
+    max-height: 16px;
+}
+
+.mediamanager-list li .image div {
+    vertical-align: middle;
+    text-align: center;
+    display: table-cell;
+    width: 100px;
+    height: 40px;
 }
 
 .mediamanager-list li input[type=checkbox] {
@@ -231,8 +255,9 @@ form.meta textarea.edit {
     padding: 2px;
     vertical-align: top;
     zoom: 1;
-    color: black !important;
+    color: black;
 }
+
 * html .mediamanager-table-50 li {
     display: inline;
 }
@@ -252,4 +277,8 @@ form.meta textarea.edit {
 
 .mediamanager div.upload {
     padding-bottom: 0.5em;
-}
\ No newline at end of file
+}
+
+.background-container .icon {
+    margin-right: 5px;
+}