summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKate Arzamastseva <pshns@ukr.net>2011-06-20 10:51:48 +0300
committerKate Arzamastseva <pshns@ukr.net>2011-06-20 10:51:48 +0300
commitb9eb2e61ea959c1f8b3a5c58ad50a0f9c8c855ad (patch)
treef4fc070d2debe3015271189916f98737fc175e0e
parent1eeeced2339756132a78e5f1893cb3677c0f6529 (diff)
downloadrpg-b9eb2e61ea959c1f8b3a5c58ad50a0f9c8c855ad.tar.gz
rpg-b9eb2e61ea959c1f8b3a5c58ad50a0f9c8c855ad.tar.bz2
media manager button
-rw-r--r--inc/lang/en/lang.php5
-rw-r--r--inc/template.php2
-rw-r--r--lib/tpl/default/main.php1
3 files changed, 6 insertions, 2 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 5dca273c3..dbd3ae9be 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -49,6 +49,7 @@ $lang['btn_draftdel'] = 'Delete draft';
$lang['btn_revert'] = 'Restore';
$lang['btn_register'] = 'Register';
$lang['btn_apply'] = 'Apply';
+$lang['btn_media'] = 'Media Manager';
$lang['loggedinas'] = 'Logged in as';
$lang['user'] = 'Username';
@@ -327,12 +328,12 @@ $lang['media_searchtab'] = 'Search';
$lang['media_viewtab'] = 'View';
$lang['media_edittab'] = 'Edit';
$lang['media_historytab'] = 'History';
-$lang['media_thumbsview'] = 'Thumnails';
+$lang['media_thumbsview'] = 'Thumbnails';
$lang['media_listview'] = 'List';
$lang['media_sort'] = 'Sort';
$lang['media_search'] = 'Search';
$lang['media_view'] = 'View';
$lang['media_edit'] = 'Edit';
-$lang['media_history'] = 'These are the older revisons of the file.';
+$lang['media_history'] = 'These are the older revisions of the file.';
//Setup VIM: ex: et ts=2 :
diff --git a/inc/template.php b/inc/template.php
index 1fb5490f5..31320c876 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -630,6 +630,8 @@ function tpl_get_action($type) {
// Superseded by subscribe/subscription
return '';
break;
+ case 'media':
+ break;
default:
return '[unknown %s type]';
break;
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 94c2322aa..698793ecd 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -117,6 +117,7 @@ if (!defined('DOKU_INC')) die();
</div>
<div class="bar-right" id="bar__bottomright">
<?php tpl_button('subscribe')?>
+ <?php tpl_button('media')?>
<?php tpl_button('admin')?>
<?php tpl_button('profile')?>
<?php tpl_button('login')?>