diff options
Diffstat (limited to 'inc/template.php')
| -rw-r--r-- | inc/template.php | 106 |
1 files changed, 59 insertions, 47 deletions
diff --git a/inc/template.php b/inc/template.php index 96e0668c2..c70e407d6 100644 --- a/inc/template.php +++ b/inc/template.php @@ -480,10 +480,15 @@ function tpl_actionlink($type,$pre='',$suf='',$inner='',$return=false){ $linktarget = wl($id, $params); } $caption = $lang['btn_' . $type]; + $akey = $addTitle = ''; + if($accesskey){ + $akey = 'accesskey="'.$accesskey.'" '; + $addTitle = ' ['.strtoupper($accesskey).']'; + } $out = tpl_link($linktarget, $pre.(($inner)?$inner:$caption).$suf, 'class="action ' . $type . '" ' . - 'accesskey="' . $accesskey . '" rel="nofollow" ' . - 'title="' . hsc($caption) . '"', 1); + $akey . 'rel="nofollow" ' . + 'title="' . hsc($caption).$addTitle . '"', 1); } if ($return) return $out; echo $out; @@ -626,10 +631,6 @@ function tpl_get_action($type) { return false; } break; - case 'subscribens': - // Superseded by subscribe/subscription - return ''; - break; case 'media': break; default: @@ -1136,29 +1137,35 @@ function tpl_mediaFileList(){ global $AUTH; global $NS; global $JUMPTO; + global $lang; $opened_tab = $_REQUEST['tab_files']; 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>'.NL; + media_tabs_files($opened_tab); + echo '<div class="panelHeader">'.NL; + echo '<h3>'; + $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(); + } + echo '</div>'.NL; + + echo '<div class="panelContent">'.NL; if ($opened_tab == 'files') { - echo '<div id="mediamanager__files">'; media_tab_files($NS,$AUTH,$JUMPTO); - echo '</div>'; - } elseif ($opened_tab == 'upload') { - echo '<div id="mediamanager__files">'; media_tab_upload($NS,$AUTH,$JUMPTO); - echo '</div>'; - } elseif ($opened_tab == 'search') { - echo '<div id="mediamanager__files">'; media_tab_search($NS,$AUTH); - echo '</div>'; } - + echo '</div>'.NL; } /** @@ -1170,7 +1177,7 @@ function tpl_mediaFileList(){ * @author Kate Arzamastseva <pshns@ukr.net> */ function tpl_mediaFileDetails($image, $rev){ - global $AUTH, $NS, $conf, $DEL; + global $AUTH, $NS, $conf, $DEL, $lang; $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']); if (!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return ''; @@ -1195,21 +1202,31 @@ function tpl_mediaFileDetails($image, $rev){ media_tabs_details($image, $opened_tab); + 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; + $tabTitle = '<strong class="'.$class.'">'.$image.'</strong>'; + if ($opened_tab === 'view' && $rev) { + printf($lang['media_viewold'], $tabTitle, dformat($rev)); + } else { + printf($lang['media_' . $opened_tab], $tabTitle); + } + echo '</h3></div>'.NL; + + echo '<div class="panelContent">'.NL; + if ($opened_tab == 'view') { - echo '<div id="mediamanager__details">'; media_tab_view($image, $NS, $AUTH, $rev); - echo '</div>'; } elseif ($opened_tab == 'edit' && !$removed) { - echo '<div id="mediamanager__details">'; media_tab_edit($image, $NS, $AUTH); - echo '</div>'; } elseif ($opened_tab == 'history' && $conf['mediarevisions']) { - echo '<div id="mediamanager__details">'; media_tab_history($image,$NS,$AUTH); - echo '</div>'; } + + echo '</div>'.NL; } /** @@ -1482,45 +1499,40 @@ function tpl_favicon($types=array('favicon')) { * @author Kate Arzamastseva <pshns@ukr.net> */ function tpl_media() { - // global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen, $conf; $fullscreen = true; - require_once(DOKU_INC.'lib/exe/mediamanager.php'); + require_once DOKU_INC.'lib/exe/mediamanager.php'; if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']); if (isset($IMG)) $image = $IMG; if (isset($JUMPTO)) $image = $JUMPTO; if (isset($REV) && !$JUMPTO) $rev = $REV; - echo '<div id="mediamanager__page">'; - echo '<h1>'.$lang['btn_media'].'</h1>'; - echo '<div id="mediamanager__layout">'; - - echo '<div id="mediamanager__layout_namespaces" class="layout-resizable" >'; + echo '<div id="mediamanager__page">'.NL; + echo '<h1>'.$lang['btn_media'].'</h1>'.NL; html_msgarea(); - echo '<div class="mediamanager-tabs">'; - echo '<a href="#" class="selected">'.hsc($lang['namespaces']).'</a>'; - echo '<div class="clearer"></div>'; - echo '</div>'; - echo '<div class="background-container">'; - echo hsc($lang['namespaces']); - echo '</div>'; - echo '<div class="scroll-container">'; - tpl_mediaTree(); - echo '</div>'; - echo '</div>'; - echo '<div id="mediamanager__layout_list" class="layout-resizable" >'; + echo '<div class="panel namespaces">'.NL; + echo '<h2>'.$lang['namespaces'].'</h2>'.NL; + echo '<div class="panelHeader">'; + echo $lang['media_namespaces']; + echo '</div>'.NL; + + echo '<div class="panelContent" id="media__tree">'.NL; + media_nstree($NS); + echo '</div>'.NL; + echo '</div>'.NL; + + echo '<div class="panel filelist">'.NL; tpl_mediaFileList(); - echo '</div>'; + echo '</div>'.NL; - echo '<div id="mediamanager__layout_detail" class="layout" >'; + 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 class="clearer"></div>'; - echo '</div>'; - echo '</div>'; + echo '</div>'.NL; } //Setup VIM: ex: et ts=4 : |