diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/media.php | 45 | ||||
| -rw-r--r-- | inc/template.php | 2 |
2 files changed, 23 insertions, 24 deletions
diff --git a/inc/media.php b/inc/media.php index 1bcb6a7b2..b4b62d2c5 100644 --- a/inc/media.php +++ b/inc/media.php @@ -546,7 +546,7 @@ function media_tabs_files($selected=false){ $tab .= ' class="'.$class.'" >'.$lang['media_searchtab'].'</a>'; echo $tab; - echo '<div class="mediamanager-clear"> </div>'; + echo '<div class="clearer"></div>'; echo '</div>'; } @@ -581,7 +581,7 @@ function media_tabs_details($selected=false){ $tab .= ' class="'.$class.'" >'.$lang['media_historytab'].'</a>'; echo $tab; - echo '<div class="mediamanager-clear"> </div>'; + echo '<div class="clearer"></div>'; echo '</div>'; } @@ -606,7 +606,7 @@ function media_tab_files_options(){ echo '<div class="mediamanager-block-sort">'.$lang['media_sort']; //select echo '</div>'; - echo '<div class="mediamanager-clear"> </div>'; + echo '<div class="clearer"></div>'; echo '</div>'; } @@ -628,13 +628,12 @@ function media_tab_files($ns,$auth=null,$jump='') { echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL; }else{ if ($view == 'list') { - echo '<div class="mediamanager-files-list-tab">'; - echo '</div>'; + echo '<ul class="mediamanager-file-list mediamanager-list" id="id-mediamanager-file-list">'; } else { - echo '<div class="mediamanager-files-thumbnails-tab">'; - media_filelist($ns,$auth,$jump,'thumbs'); - echo '</div>'; + echo '<ul class="mediamanager-file-list mediamanager-thumbs" id="id-mediamanager-file-list">'; } + media_filelist($ns,$auth,$jump,'thumbs'); + echo '</ul>'; } echo '</div>'; echo '</div>'; @@ -1044,24 +1043,24 @@ function media_printfile_thumbs($item,$auth,$jump){ // Prepare filename $file = utf8_decodeFN($item['file']); - // Prepare info - $info = ''; + // output + echo '<li><div>'; + if($item['isimg']) media_printimgdetail($item, true); + echo '<a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name= + "h_:'.$item['id'].'" class="info" >'.hsc($file).'</a>'; if($item['isimg']){ + $info = ''; $info .= (int) $item['meta']->getField('File.Width'); $info .= '×'; $info .= (int) $item['meta']->getField('File.Height'); - $info .= '<br/>'; - } - $info .= '<i>'.dformat($item['mtime']).'</i><br/>'; - $info .= filesize_h($item['size']); - - // output - echo '<div class="float-image" >'; - if($item['isimg']) media_printimgdetail($item, true); - echo '<br/><a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name= - "h_:'.$item['id'].'" >'.hsc($file).'</a><br/>'; - echo '<span>'.$info.'</span><br/>'; - echo '</div>'.NL; + echo '<span class="info">'.$info.'</span>'; + } + $info = '<i>'.dformat($item['mtime']).'</i>'; + echo '<span class="info">'.$info.'</span>'; + $info = filesize_h($item['size']); + echo '<span class="info">'.$info.'</span>'; + echo '<div class="clearer"></div>'; + echo '</div></li>'.NL; } /** @@ -1088,7 +1087,7 @@ function media_printimgdetail($item, $fullscreen=false){ // output if ($fullscreen) { - echo '<a name="d_:'.$item['id'].'" href="'. + echo '<a name="d_:'.$item['id'].'" class="image" 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 31320c876..69ed61f7e 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1441,7 +1441,7 @@ function tpl_media() { echo '<div id="id-mediamanager-layout-detail" class="layout" style="width: 30%;">'; tpl_fileDetails(); echo '</div>'; - echo '<div class="mediamanager-clear"> </div>'; + echo '<div class="clearer"></div>'; echo '</div>'; echo '</div>'; } |