summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--inc/html.php9
-rw-r--r--inc/media.php27
-rw-r--r--inc/template.php4
-rw-r--r--lib/tpl/default/mediamanager.css73
4 files changed, 40 insertions, 73 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>';
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 21167af05..d098686f0 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -75,6 +75,7 @@
font-weight: normal;
background-color: __background_alt__;
color: __text__;
+ line-height: 1.5em;
}
#mediamanager__page .namespaces ul {
@@ -117,7 +118,7 @@
}
#mediamanager__page .panelHeader ul li.listType {
- padding-left: 27px;
+ padding: 0 3px 0 27px;
background: url('../../images/icon-list.png') 0 1px no-repeat;
}
#mediamanager__page .panelHeader ul li.sortBy {
@@ -127,6 +128,7 @@
#mediamanager__page .panelHeader form.options .ui-buttonset label{
font-size: 90%;
+ margin-right: -0.4em;
}
#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
padding: .4em .7em;
@@ -158,37 +160,26 @@
padding: 5px;
vertical-align: top;
text-align: center;
- zoom: 1;
position: relative;
line-height: 1.2;
}
-
* html #mediamanager__page .filelist .thumbs li {
display: inline;
+ zoom: 1;
}
-
*+html #mediamanager__page .filelist .thumbs li {
display: inline;
}
-#mediamanager__page .filelist .thumbs li .image,
-#mediamanager__page .filelist .thumbs li .image0 {
- width: 100%;
- height: 90px;
- display: block;
- overflow: hidden;
-}
-
-#mediamanager__page .filelist .thumbs li .image1 {
- display: none;
-}
-
-#mediamanager__page .filelist .thumbs li .image,
-#mediamanager__page .filelist .thumbs li .image0 {
+#mediamanager__page .filelist .thumbs li .image {
vertical-align: middle;
display: table-cell;
width: 100px;
height: 90px;
+ overflow: hidden;
+}
+#mediamanager__page .filelist .thumbs li .tiny {
+ display: none;
}
#mediamanager__page .filelist .thumbs li .name,
@@ -200,12 +191,10 @@
width: 90px;
white-space: nowrap;
}
-
#mediamanager__page .filelist .thumbs li .name {
padding: 5px 0;
font-weight: bold;
}
-
#mediamanager__page .filelist .thumbs li .date {
font-style: italic;
white-space: normal;
@@ -214,10 +203,6 @@
/* rows */
#mediamanager__page .filelist .rows li {
- overflow: hidden;
-}
-
-#mediamanager__page .filelist .rows li {
list-style: none;
display: block;
position: relative;
@@ -226,14 +211,14 @@
margin-bottom: 3px;
background-color: __background__;
color: __text__;
+ overflow: hidden;
}
#mediamanager__page .filelist .rows li:nth-child(2n+1) {
background-color: __background_neu__;
}
-#mediamanager__page .filelist .rows li .image,
-#mediamanager__page .filelist .rows li .image1 {
+#mediamanager__page .filelist .rows li .image {
width: 10%;
display: block;
overflow: hidden;
@@ -241,11 +226,21 @@
height: 40px;
text-align: center;
}
-
-#mediamanager__page .filelist .rows li .image0 {
+#mediamanager__page .filelist .rows li .thumb {
display: none;
}
+#mediamanager__page .filelist .rows li .image span {
+ vertical-align: middle;
+ text-align: center;
+ display: table-cell;
+ width: 100px;
+ height: 40px;
+}
+#mediamanager__page .filelist .rows .icon {
+ margin-top: 12px;
+}
+
#mediamanager__page .filelist .rows li .name,
#mediamanager__page .filelist .rows li .size,
#mediamanager__page .filelist .rows li .filesize,
@@ -260,31 +255,16 @@
width: 30%;
font-weight: bold;
}
-
#mediamanager__page .filelist .rows li .size,
#mediamanager__page .filelist .rows li .filesize {
width: 15%;
}
-
#mediamanager__page .filelist .rows li .date {
width: 20%;
font-style: italic;
white-space: normal;
}
-#mediamanager__page .filelist .rows .icon {
- margin-top: 12px;
-}
-
-#mediamanager__page .filelist .rows li .image span,
-#mediamanager__page .filelist .rows li .image1 span {
- vertical-align: middle;
- text-align: center;
- display: table-cell;
- width: 100px;
- height: 40px;
-}
-
/*____________ Upload panel ____________*/
#mediamanager__page div.upload {
@@ -300,7 +280,7 @@
#mediamanager__page .file ul.actions {
text-align: center;
- margin-bottom: 5px;
+ margin: 0 0 5px;
list-style: none;
}
#mediamanager__page .file ul.actions li {
@@ -410,8 +390,13 @@
#mediamanager__form_diffview {
margin-bottom: 10px;
+ display: block;
}
+
+
+
+
#mediamanager__diff_layout {
position: relative;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 16:11:36 +0000