From 94add30314d7c0ed51fa78304ca342d0273b366c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 01:22:32 +0100
Subject: [PATCH] media manager: added a few newlines to the output
---
inc/html.php | 7 ++-
inc/media.php | 93 ++++++++++++++++----------------
inc/template.php | 48 ++++++++---------
lib/tpl/default/mediamanager.css | 3 ++
4 files changed, 76 insertions(+), 75 deletions(-)
diff --git a/inc/html.php b/inc/html.php
index 8cf22de82..7f5a46b93 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1830,14 +1830,13 @@ function html_flashobject($swf,$width,$height,$params=null,$flashvars=null,$atts
}
function html_tabs($tabs, $current_tab = null) {
- echo '<ul class="tabs">';
+ echo '<ul class="tabs">'.NL;
foreach($tabs as $id => $tab) {
html_tab($tab['href'], $tab['caption'], $id === $current_tab);
}
- echo '</ul>';
- echo '<div class="clearer"></div>';
+ echo '</ul>'.NL;
}
/**
* Prints a single tab
@@ -1859,7 +1858,7 @@ function html_tab($href, $caption, $selected=false) {
}
$tab .= hsc($caption)
. '</' . ($selected ? 'strong' : 'a') . '>'
- . '</li>';
+ . '</li>'.NL;
echo $tab;
}
diff --git a/inc/media.php b/inc/media.php
index e4beb3115..560abc3bc 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -135,11 +135,11 @@ function media_metaform($id,$auth){
$form->addElement('<label for="meta__'.$key.'">'.$lang[$field[1]].'</label>');
$form->addElement("<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>');
}
- $form->addElement('</div>');
+ $form->addElement('</div>'.NL);
}
$form->addElement('<div class="buttons">');
$form->addElement(form_makeButton('submit', '', $lang['btn_save'], array('accesskey' => 's', 'name' => 'mediado[save]')));
- $form->addElement('</div>');
+ $form->addElement('</div>'.NL);
$form->printForm();
}
@@ -578,9 +578,9 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
if ($fullscreenview) {
$view = $_REQUEST['list'];
if ($view == 'rows') {
- echo '<ul class="rows">';
+ echo '<ul class="rows">'.NL;
} else {
- echo '<ul class="thumbs">';
+ echo '<ul class="thumbs">'.NL;
}
}
foreach($data as $item){
@@ -590,7 +590,7 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
media_printfile_thumbs($item,$auth,$jump);
}
}
- if ($fullscreenview) echo '</ul>';
+ if ($fullscreenview) echo '</ul>'.NL;
}
}
if (!$fullscreenview) media_searchform($ns);
@@ -656,7 +656,7 @@ function media_tab_files_options(){
$form->addHidden('sectok', null);
$form->addHidden('ns', $NS);
$form->addHidden('do', 'media');
- $form->addElement('<ul>');
+ $form->addElement('<ul>'.NL);
foreach(array('list' => array('listType', array('thumbs', 'rows')),
'sort' => array('sortBy', array('name', 'date'), $sort))
as $group => $content) {
@@ -677,12 +677,12 @@ function media_tab_files_options(){
$content[0] . '__' . $option,
$option, $attrs));
}
- $form->addElement('</li>');
+ $form->addElement('</li>'.NL);
}
$form->addElement('<li>');
$form->addElement(form_makeButton('submit', '', $lang['btn_apply']));
- $form->addElement('</li>');
- $form->addElement('</ul>');
+ $form->addElement('</li>'.NL);
+ $form->addElement('</ul>'.NL);
$form->printForm();
}
@@ -730,12 +730,12 @@ function media_tab_upload($ns,$auth=null,$jump='') {
global $lang;
if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
- echo '<div class="upload">';
+ echo '<div class="upload">'.NL;
if ($auth >= AUTH_UPLOAD) {
echo '<p>' . $lang['mediaupload'] . '</p>';
}
media_uploadform($ns, $auth, true);
- echo '</div>';
+ echo '</div>'.NL;
}
/**
@@ -749,13 +749,13 @@ function media_tab_search($ns,$auth=null) {
$do = $_REQUEST['mediado'];
$query = $_REQUEST['q'];
if (!$query) $query = '';
- echo '<div class="search">';
+ echo '<div class="search">'.NL;
media_searchform($ns, $query, true);
if ($do == 'searchlist') {
media_searchlist($query,$ns,$auth,true,_media_get_sort_type());
}
- echo '</div>';
+ echo '</div>'.NL;
}
/**
@@ -774,7 +774,7 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
media_details($image, $auth, $rev, $meta);
} else {
- echo '<div class="nothing">'.$lang['media_perm_read'].'</div>';
+ echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
}
}
@@ -821,13 +821,12 @@ function media_tab_history($image, $ns, $auth=null) {
* @author Kate Arzamastseva <pshns@ukr.net>
*/
function media_preview($image, $auth, $rev=false, $meta=false) {
- global $lang;
-
- echo '<div class="image">';
$size = media_image_preview_size($image, $rev, $meta);
if ($size) {
+ echo '<div class="image">';
+
$more = array();
if ($rev) {
$more['rev'] = $rev;
@@ -840,9 +839,9 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
$more['h'] = $size[1];
$src = ml($image, $more);
echo '<img src="'.$src.'" alt="" style="max-width: '.$size[0].'px;" />';
- }
- echo '</div>';
+ echo '</div>'.NL;
+ }
}
/**
@@ -853,7 +852,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
function media_preview_buttons($image, $auth, $rev=false) {
global $lang, $conf;
- echo '<ul class="actions">';
+ echo '<ul class="actions">'.NL;
if($auth >= AUTH_DELETE && !$rev && @file_exists(mediaFN($image))){
@@ -863,7 +862,7 @@ function media_preview_buttons($image, $auth, $rev=false) {
$form->addElement(form_makeButton('submit','',$lang['btn_delete']));
echo '<li>';
$form->printForm();
- echo '</li>';
+ echo '</li>'.NL;
}
$auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
@@ -875,7 +874,7 @@ function media_preview_buttons($image, $auth, $rev=false) {
$form->addElement(form_makeButton('submit','',$lang['media_update']));
echo '<li>';
$form->printForm();
- echo '</li>';
+ echo '</li>'.NL;
}
if($auth >= AUTH_UPLOAD && $rev && $conf['mediarevisions'] && @file_exists(mediaFN($image, $rev))){
@@ -888,10 +887,10 @@ function media_preview_buttons($image, $auth, $rev=false) {
$form->addElement(form_makeButton('submit','',$lang['media_restore']));
echo '<li>';
$form->printForm();
- echo '</li>';
+ echo '</li>'.NL;
}
- echo '</ul>';
+ echo '</ul>'.NL;
}
/**
@@ -977,17 +976,17 @@ function media_details($image, $auth, $rev=false, $meta=false) {
if (!$meta) $meta = new JpegMeta(mediaFN($image, $rev));
$tags = media_file_tags($meta);
- echo '<dl>';
+ echo '<dl>'.NL;
foreach($tags as $tag){
if ($tag['value']) {
$value = cleanText($tag['value']);
echo '<dt>'.$lang[$tag['tag'][1]].':</dt><dd>';
if ($tag['tag'][2] == 'date') echo dformat($value);
else echo hsc($value);
- echo '</dd>';
+ echo '</dd>'.NL;
}
}
- echo '</dl>';
+ echo '</dl>'.NL;
}
/**
@@ -1090,7 +1089,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
$form->addHidden('mediado', 'diff');
$form->printForm();
- echo '<div id="mediamanager__diff" >';
+ echo NL.'<div id="mediamanager__diff" >'.NL;
}
if ($difftype == 'opacity' || $difftype == 'portions') {
@@ -1118,7 +1117,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
echo '<td>';
media_preview($image, $auth, $r_rev, $r_meta);
echo '</td>';
- echo '</tr>';
+ echo '</tr>'.NL;
echo '<tr class="actions">';
echo '<td>';
@@ -1128,7 +1127,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
echo '<td>';
media_preview_buttons($image, $auth, $r_rev);
echo '</td>';
- echo '</tr>';
+ echo '</tr>'.NL;
$l_tags = media_file_tags($l_meta);
$r_tags = media_file_tags($r_meta);
@@ -1145,7 +1144,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
echo '<tr>';
foreach(array($l_tags,$r_tags) as $tags){
- echo '<td>';
+ echo '<td>'.NL;
echo '<dl class="img_tags">';
foreach($tags as $tag){
@@ -1163,13 +1162,13 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
}
echo '</dd>';
}
- echo '</dl>';
+ echo '</dl>'.NL;
echo '</td>';
}
- echo '</tr>';
+ echo '</tr>'.NL;
- echo '</table>';
+ echo '</table>'.NL;
if ($is_img && !$fromajax) echo '</div>';
}
@@ -1298,16 +1297,16 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort=''){
if ($fullscreen) {
$view = $_REQUEST['view'];
if ($view == 'list') {
- echo '<ul class="mediamanager-list" id="mediamanager__file_list">';
+ echo '<ul class="mediamanager-list" id="mediamanager__file_list">'.NL;
} else {
- echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
+ echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">'.NL;
}
}
foreach($evdata['data'] as $item){
if (!$fullscreen) media_printfile($item,$item['perm'],'',true);
else media_printfile_thumbs($item,$item['perm'],false,true);
}
- if ($fullscreen) echo '</ul>';
+ if ($fullscreen) echo '</ul>'.NL;
}
}
@@ -1399,7 +1398,7 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
$file = utf8_decodeFN($item['file']);
// output
- echo '<li><dl>';
+ echo '<li><dl>'.NL;
echo '<dt>';
if($item['isimg']) {
@@ -1412,28 +1411,28 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
echo media_printicon($item['id']);
echo '</a>';
}
- echo '</dt>';
+ echo '</dt>'.NL;
if (!$display_namespace) {
$name = hsc($file);
} else {
$name = hsc($item['id']);
}
echo '<dd class="name"><a href="'.media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
- 'tab_details' => 'view')).'" name="h_:'.$item['id'].'">'.$name.'</a></dd>';
+ 'tab_details' => 'view')).'" name="h_:'.$item['id'].'">'.$name.'</a></dd>'.NL;
if($item['isimg']){
$size = '';
$size .= (int) $item['meta']->getField('File.Width');
$size .= '×';
$size .= (int) $item['meta']->getField('File.Height');
- echo '<dd class="size">'.$size.'</dd>';
+ echo '<dd class="size">'.$size.'</dd>'.NL;
} else {
- echo '<dd class="size"> </dd>';
+ echo '<dd class="size"> </dd>'.NL;
}
$date = dformat($item['mtime']);
- echo '<dd class="date">'.$date.'</dd>';
+ echo '<dd class="date">'.$date.'</dd>'.NL;
$filesize = filesize_h($item['size']);
- echo '<dd class="filesize">'.$filesize.'</dd>';
+ echo '<dd class="filesize">'.$filesize.'</dd>'.NL;
echo '</dl></li>'.NL;
}
@@ -1592,9 +1591,9 @@ function media_uploadform($ns, $auth, $fullscreen = false){
$form->addElement(form_makeCloseTag('p'));
}
- echo '<div id="mediamanager__uploader">';
+ echo NL.'<div id="mediamanager__uploader">'.NL;
html_form('upload', $form);
- echo '</div>';
+ echo '</div>'.NL;
}
/**
@@ -1611,7 +1610,7 @@ function media_searchform($ns,$query='',$fullscreen=false){
if (!$fullscreen) $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
else $params['action'] = media_managerURL(array(), '&');
$form = new Doku_Form($params);
- if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>');
+ if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>'.NL);
$form->addHidden('ns', $ns);
if (!$fullscreen) $form->addHidden('do', 'searchlist');
else $form->addHidden('mediado', 'searchlist');
diff --git a/inc/template.php b/inc/template.php
index ffe5b84b4..77d52fece 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1142,21 +1142,21 @@ function tpl_mediaFileList(){
if (!$opened_tab || !in_array($opened_tab, array('files', 'upload', 'search'))) $opened_tab = 'files';
if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
- echo '<h2 class="a11y">' . $lang['mediaselect'] . '</h2>';
+ echo '<h2 class="a11y">' . $lang['mediaselect'] . '</h2>'.NL;
media_tabs_files($opened_tab);
- echo '<div class="panelHeader">';
+ echo '<div class="panelHeader">'.NL;
echo '<h3>';
printf($lang['media_' . $opened_tab],
hsc($ns ? $ns : '['.$lang['mediaroot'].']'));
- echo '</h3>';
+ echo '</h3>'.NL;
if ($opened_tab === 'search' || $opened_tab === 'files') {
media_tab_files_options();
}
- echo '</div>';
+ echo '</div>'.NL;
- echo '<div class="panelContent">';
+ echo '<div class="panelContent">'.NL;
if ($opened_tab == 'files') {
media_tab_files($NS,$AUTH,$JUMPTO);
} elseif ($opened_tab == 'upload') {
@@ -1164,7 +1164,7 @@ function tpl_mediaFileList(){
} elseif ($opened_tab == 'search') {
media_tab_search($NS,$AUTH);
}
- echo '</div>';
+ echo '</div>'.NL;
}
/**
@@ -1206,9 +1206,9 @@ function tpl_mediaFileDetails($image, $rev){
$class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
$class = 'select mediafile mf_'.$class;
printf($lang['media_' . $opened_tab], $class, $image);
- echo '</h3></div>';
+ echo '</h3></div>'.NL;
- echo '<div class="panelContent">';
+ echo '<div class="panelContent">'.NL;
if ($opened_tab == 'view') {
media_tab_view($image, $NS, $AUTH, $rev);
@@ -1220,7 +1220,7 @@ function tpl_mediaFileDetails($image, $rev){
media_tab_history($image,$NS,$AUTH);
}
- echo '</div>';
+ echo '</div>'.NL;
}
/**
@@ -1502,31 +1502,31 @@ function tpl_media() {
if (isset($JUMPTO)) $image = $JUMPTO;
if (isset($REV) && !$JUMPTO) $rev = $REV;
- echo '<h1>'.$lang['btn_media'].'</h1>';
- echo '<div id="mediamanager__page">';
-
- echo '<div class="panel namespaces">';
+ echo '<h1>'.$lang['btn_media'].'</h1>'.NL;
+ echo '<div id="mediamanager__page">'.NL;
html_msgarea();
- echo '<h2>'.$lang['namespaces'].'</h2>';
+
+ echo '<div class="panel namespaces">'.NL;
+ echo '<h2>'.$lang['namespaces'].'</h2>'.NL;
echo '<div class="panelHeader">';
echo $lang['media_namespaces'];
- echo '</div>';
+ echo '</div>'.NL;
- echo '<div class="panelContent" id="media__tree">';
+ echo '<div class="panelContent" id="media__tree">'.NL;
media_nstree($NS);
- echo '</div>';
- echo '</div>';
+ echo '</div>'.NL;
+ echo '</div>'.NL;
- echo '<div class="panel filelist">';
+ echo '<div class="panel filelist">'.NL;
tpl_mediaFileList();
- echo '</div>';
+ echo '</div>'.NL;
- echo '<div class="panel file">';
- echo '<h2 class="a11y">'.$lang['media_file'].'</h2>';
+ echo '<div class="panel file">'.NL;
+ echo '<h2 class="a11y">'.$lang['media_file'].'</h2>'.NL;
tpl_mediaFileDetails($image, $rev);
- echo '</div>';
+ echo '</div>'.NL;
- echo '</div>';
+ echo '</div>'.NL;
}
//Setup VIM: ex: et ts=4 :
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index d098686f0..f21c936f8 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -130,6 +130,9 @@
font-size: 90%;
margin-right: -0.4em;
}
+#mediamanager__page .panelHeader form.options label span span{
+ display: none;
+}
#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
padding: .4em .7em;
line-height: 1;
--
GitLab