diff --git a/inc/media.php b/inc/media.php index f316bc34e7bff3af2e37383287a760a839dae7bb..b2d608860bb5a9cfe030e94ca8d49ea483fc3ada 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1093,21 +1093,22 @@ function media_printfile_thumbs($item,$auth,$jump){ echo '<img src="'.DOKU_BASE.'lib/images/icon-file.png" width="90px" />'; echo '</a>'; } + //echo '<input type=checkbox />'; echo '<a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name= - "h_:'.$item['id'].'" class="info" >'.hsc($file).'</a>'; + "h_:'.$item['id'].'" class="name">'.hsc($file).'</a>'; if($item['isimg']){ - $info = ''; - $info .= (int) $item['meta']->getField('File.Width'); - $info .= '×'; - $info .= (int) $item['meta']->getField('File.Height'); - echo '<span class="info">'.$info.'</span>'; + $size = ''; + $size .= (int) $item['meta']->getField('File.Width'); + $size .= '×'; + $size .= (int) $item['meta']->getField('File.Height'); + echo '<span class="size">'.$size.'</span>'; } else { - echo '<span class="info"> </span>'; + echo '<span class="size"> </span>'; } - $info = '<i>'.dformat($item['mtime']).'</i>'; - echo '<span class="info">'.$info.'</span>'; - $info = filesize_h($item['size']); - echo '<span class="info">'.$info.'</span>'; + $date = dformat($item['mtime']); + echo '<span class="date">'.$date.'</span>'; + $filesize = filesize_h($item['size']); + echo '<span class="filesize">'.$filesize.'</span>'; echo '<div class="clearer"></div>'; echo '</div></li>'.NL; } diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index 7a85f3c8bfff6316178d0365b174aa8595d432cb..cceecf7fe84fc81eb7c95df359907272ddf8f0e4 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -24,11 +24,6 @@ overflow-y: auto; } -.mediamanager .clearer { - font-size: 0; - line-height: 0; -} - .mediamanager .mediamanager-slider { width: auto; } @@ -154,10 +149,15 @@ form.meta textarea.edit { display: -moz-inline-stack; text-align: center; zoom: 1; - *display: inline; - _height: 130px; position: relative; } +* html .mediamanager-thumbs li { + display: inline; +} +*+html .mediamanager-thumbs li { + display: inline; + _height: 130px; +} .mediamanager-thumbs li .image { width: 100%; @@ -166,23 +166,23 @@ form.meta textarea.edit { overflow: hidden; } -.mediamanager-thumbs li .info { +.mediamanager-thumbs li .name, +.mediamanager-thumbs li .size, +.mediamanager-thumbs li .filesize, +.mediamanager-thumbs li .date { display: block; overflow: hidden; } .mediamanager-thumbs li input[type=checkbox] { - /*position: absolute; - left: 100%; - top: 100%; - margin-left: -20px; - margin-top: -20px;*/ display: none; + float: left; + margin: 3px; } .mediamanager-thumbs li:hover input[type=checkbox], .mediamanager-thumbs li input[type=checkbox]:checked { - display: inline; + display: block; } .mediamanager-list li { @@ -210,19 +210,25 @@ form.meta textarea.edit { width: 100%; } -.mediamanager-list li .info { +.mediamanager-list li .name, +.mediamanager-list li .size, +.mediamanager-list li .filesize +.mediamanager-list li .date { overflow: hidden; float: left; width: 19%; margin-left: 1%; } +.mediamanager-list li .date, +.mediamanager-thumbs li .date { + font-style: italic; +} + .mediamanager-list li input[type=checkbox] { - position: absolute; - left: 100%; - margin-left: -20px; - margin-top: 3px; display: none; + float: left; + margin: 3px; } .mediamanager-list li:hover input[type=checkbox], @@ -247,7 +253,9 @@ form.meta textarea.edit { padding: 2px; vertical-align: top; zoom: 1; - *display: inline; +} +* html .mediamanager-table-50 li { + display: inline; } .mediamanager-preview {