diff options
| -rw-r--r-- | inc/media.php | 4 | ||||
| -rw-r--r-- | inc/template.php | 14 | ||||
| -rw-r--r-- | lib/tpl/default/_mediamanager.css | 9 |
3 files changed, 7 insertions, 20 deletions
diff --git a/inc/media.php b/inc/media.php index 8ff0a7d14..c53e1f5fc 100644 --- a/inc/media.php +++ b/inc/media.php @@ -832,6 +832,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) { $size = media_image_preview_size($image, $rev, $meta); if ($size) { + global $lang; echo '<div class="image">'; $more = array(); @@ -845,7 +846,10 @@ function media_preview($image, $auth, $rev=false, $meta=false) { $more['w'] = $size[0]; $more['h'] = $size[1]; $src = ml($image, $more); + + echo '<a href="'.$src.'" target="_blank" title="'.$lang['mediaview'].'">'; echo '<img src="'.$src.'" alt="" style="max-width: '.$size[0].'px;" />'; + echo '</a>'; echo '</div>'.NL; } diff --git a/inc/template.php b/inc/template.php index 9d1609fd3..024bf985c 100644 --- a/inc/template.php +++ b/inc/template.php @@ -970,9 +970,10 @@ function tpl_img($maxwidth=0,$maxheight=0,$link=true,$params=null){ * Default action for TPL_IMG_DISPLAY */ function _tpl_img_action($data, $param=NULL) { + global $lang; $p = buildAttributes($data['params']); - if($data['url']) print '<a href="'.hsc($data['url']).'">'; + if($data['url']) print '<a href="'.hsc($data['url']).'" title="'.$lang['mediaview'].'">'; print '<img '.$p.'/>'; if($data['url']) print '</a>'; return true; @@ -1202,16 +1203,7 @@ function tpl_mediaFileDetails($image, $rev){ media_tabs_details($image, $opened_tab); - echo '<div class="panelHeader">'; - - // view button - if($opened_tab === 'view'){ - $link = ml($image,array('rev'=>$rev),true); - echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/magnifier.png" '. - 'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>'; - } - - echo '<h3>'; + echo '<div class="panelHeader"><h3>'; list($ext,$mime,$dl) = mimetype($image,false); $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext); $class = 'select mediafile mf_'.$class; diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 9b1ece8d7..68fa2e97f 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -102,15 +102,6 @@ margin: 0 0 3px; } -#mediamanager__page .file .panelHeader h3 { - margin-right: 18px; -} - -#mediamanager__page .file .panelHeader img.btn { - float: right; - width: 16px; -} - #mediamanager__page .panelHeader form.options { float: right; margin-top: -3px; |