diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/html.php | 9 | ||||
| -rw-r--r-- | inc/media.php | 27 | ||||
| -rw-r--r-- | inc/template.php | 4 |
3 files changed, 11 insertions, 29 deletions
diff --git a/inc/html.php b/inc/html.php index 66bc83127..8cf22de82 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1006,8 +1006,9 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false) { $l_sum = ($l_info['sum']) ? '<span class="sum">'.hsc($l_info['sum']).'</span>' : ''; if ($l_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $l_minor = 'class="minor"'; + $l_head_title = ($media) ? dformat($l_rev) : $id.' ['.dformat($l_rev).']'; $l_head = '<a class="wikilink1" href="'.$ml_or_wl($id,"rev=$l_rev").'">'. - $id.' ['.dformat($l_rev).']</a>'. + $l_head_title.'</a>'. '<br />'.$l_user.' '.$l_sum; } @@ -1023,8 +1024,9 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false) { $r_sum = ($r_info['sum']) ? '<span class="sum">'.hsc($r_info['sum']).'</span>' : ''; if ($r_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"'; + $r_head_title = ($media) ? dformat($r_rev) : $id.' ['.dformat($r_rev).']'; $r_head = '<a class="wikilink1" href="'.$ml_or_wl($id,"rev=$r_rev").'">'. - $id.' ['.dformat($r_rev).']</a>'. + $r_head_title.'</a>'. '<br />'.$r_user.' '.$r_sum; }elseif($_rev = @filemtime($media_or_wikiFN($id))){ $_info = getRevisionInfo($id,$_rev,true, $media); @@ -1038,8 +1040,9 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false) { $_sum = ($_info['sum']) ? '<span class="sum">'.hsc($_info['sum']).'</span>' : ''; if ($_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"'; + $r_head_title = ($media) ? dformat($_rev) : $id.' ['.dformat($_rev).']'; $r_head = '<a class="wikilink1" href="'.$ml_or_wl($id).'">'. - $id.' ['.dformat($_rev).']</a> '. + $r_head_title.'</a> '. '('.$lang['current'].')'. '<br />'.$_user.' '.$_sum; }else{ diff --git a/inc/media.php b/inc/media.php index b6ee3cb03..e4beb3115 100644 --- a/inc/media.php +++ b/inc/media.php @@ -125,12 +125,14 @@ function media_metaform($id,$auth){ $p['class'] = 'edit'; $p['id'] = 'meta__'.$key; $p['name'] = 'meta['.$field[0].']'; + $p_attrs = array('class' => 'edit'); $form->addElement('<div class="row">'); if($field[2] == 'text'){ - $form->addElement(form_makeField('text', $p['name'], $value, ($lang[$field[1]]) ? $lang[$field[1]] : $field[1] . ':', $p['id'], $p['class'])); + $form->addElement(form_makeField('text', $p['name'], $value, ($lang[$field[1]]) ? $lang[$field[1]] : $field[1] . ':', $p['id'], $p['class'], $p_attrs)); }else{ $att = buildAttributes($p); + $form->addElement('<label for="meta__'.$key.'">'.$lang[$field[1]].'</label>'); $form->addElement("<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>'); } $form->addElement('</div>'); @@ -853,26 +855,6 @@ function media_preview_buttons($image, $auth, $rev=false) { echo '<ul class="actions">'; - $more = ''; - if ($rev) { - $more = "rev=$rev"; - } else { - $t = @filemtime(mediaFN($image)); - $more = "t=$t"; - } - $link = ml($image,$more,true,'&'); - - if (@file_exists(mediaFN($image, $rev))) { - - // view original file button - $form = new Doku_Form(array('action'=>$link, 'method'=>'get', 'target' => '_blank')); - $form->addHidden('sectok', null); - $form->addElement(form_makeButton('submit','',$lang['mediaview'])); - echo '<li>'; - $form->printForm(); - echo '</li>'; - } - if($auth >= AUTH_DELETE && !$rev && @file_exists(mediaFN($image))){ // delete button @@ -1484,12 +1466,11 @@ function media_printimgdetail($item, $fullscreen=false){ $p['height'] = $h; } $p['alt'] = $item['id']; - $p['class'] = 'thumb'; $att = buildAttributes($p); // output if ($fullscreen) { - echo '<a name="'.($index ? 'd' : 'l').'_:'.$item['id'].'" class="image'.$index.'" title="'.$item['id'].'" href="'. + echo '<a name="'.($index ? 'd' : 'l').'_:'.$item['id'].'" class="image '.($index ? 'tiny' : 'thumb').'" href="'. media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']), 'tab_details' => 'view')).'">'; echo '<span><img src="'.$src.'" '.$att.' /></span>'; echo '</a>'; diff --git a/inc/template.php b/inc/template.php index aeb446b5b..ffe5b84b4 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1142,8 +1142,7 @@ function tpl_mediaFileList(){ if (!$opened_tab || !in_array($opened_tab, array('files', 'upload', 'search'))) $opened_tab = 'files'; if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload'; - // FIXME: define lang - echo '<h2 class="a11y">' . sprintf($lang['filelist_desc'], $NS) . '</h2>'; + echo '<h2 class="a11y">' . $lang['mediaselect'] . '</h2>'; media_tabs_files($opened_tab); @@ -1519,7 +1518,6 @@ function tpl_media() { echo '</div>'; echo '<div class="panel filelist">'; - echo '<h2 class="a11y">'.$lang['mediaselect'].'</h2>'; tpl_mediaFileList(); echo '</div>'; |