From 026d14a9c6bccdf50efdbf2e662c2ab1b72af2c3 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 19 Sep 2011 10:22:06 +0100 Subject: [PATCH] media manager: moved some html out of lang.php and fixed namespace in middle panel --- inc/lang/en/lang.php | 12 ++++++------ inc/template.php | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index b68ca4730..2ee6240b9 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -343,12 +343,12 @@ $lang['media_list_rows'] = '<span>Show list as</span> list'; $lang['media_sort_name'] = '<span>Sort by</span> name'; $lang['media_sort_date'] = '<span>Sort by</span> date'; $lang['media_namespaces'] = 'Choose namespace'; -$lang['media_files'] = 'Media files in <strong>%s</strong>'; -$lang['media_upload'] = 'Upload to <strong>%s</strong>'; -$lang['media_search'] = 'Search in <strong>%s</strong>'; -$lang['media_view'] = '<strong class="%s">%s</strong>'; -$lang['media_edit'] = 'Edit <strong class="%s">%s</strong>'; -$lang['media_history'] = 'History of <strong class="%s">%s</strong>'; +$lang['media_files'] = 'Media files in %s'; +$lang['media_upload'] = 'Upload to %s'; +$lang['media_search'] = 'Search in %s'; +$lang['media_view'] = '%s'; +$lang['media_edit'] = 'Edit %s'; +$lang['media_history'] = 'History of %s'; $lang['media_meta_edited'] = 'metadata edited'; $lang['media_perm_read'] = 'Sorry, you don\'t have enough rights to read files.'; $lang['media_perm_upload'] = 'Sorry, you don\'t have enough rights to upload files.'; diff --git a/inc/template.php b/inc/template.php index 77d52fece..718fbd125 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1148,8 +1148,8 @@ function tpl_mediaFileList(){ echo '<div class="panelHeader">'.NL; echo '<h3>'; - printf($lang['media_' . $opened_tab], - hsc($ns ? $ns : '['.$lang['mediaroot'].']')); + $tabTitle = ($NS) ? $NS : '['.$lang['mediaroot'].']'; + printf($lang['media_' . $opened_tab], '<strong>'.$tabTitle.'</strong>'); echo '</h3>'.NL; if ($opened_tab === 'search' || $opened_tab === 'files') { media_tab_files_options(); @@ -1205,7 +1205,8 @@ function tpl_mediaFileDetails($image, $rev){ list($ext,$mime,$dl) = mimetype($image,false); $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext); $class = 'select mediafile mf_'.$class; - printf($lang['media_' . $opened_tab], $class, $image); + $tabTitle = '<strong class="'.$class.'">'.$image.'</strong>'; + printf($lang['media_' . $opened_tab], $tabTitle); echo '</h3></div>'.NL; echo '<div class="panelContent">'.NL; -- GitLab