aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorvdigital <vdigital@piwigo.org>2009-07-04 21:26:42 +0000
committervdigital <vdigital@piwigo.org>2009-07-04 21:26:42 +0000
commit1a5cf312ed50453f107a30be9c8b07d970369b70 (patch)
tree02f8b79c6b7ba586c7995a02c6cb7efd35685cb9 /admin
parentb102907b51e838c4b51f0bb0acbe1ba5fb4dbb08 (diff)
merge r3521 from branch 2.0 to trunk
New(minor): Add Logout from admin menu (net cafe or office shared desktop) - saqwild request git-svn-id: http://piwigo.org/svn/trunk@3522 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin.php1
-rw-r--r--admin/template/goto/admin.tpl1
2 files changed, 2 insertions, 0 deletions
diff --git a/admin.php b/admin.php
index 04536a4a5..bc69f7321 100644
--- a/admin.php
+++ b/admin.php
@@ -95,6 +95,7 @@ $template->assign(
'U_PERMALINKS'=> $link_start.'permalinks',
'U_RETURN'=> make_index_url(),
'U_ADMIN'=> PHPWG_ROOT_PATH.'admin.php',
+ 'U_LOGOUT'=> PHPWG_ROOT_PATH.'index.php?act=logout',
'U_PLUGINS'=> $link_start.'plugins_list',
)
);
diff --git a/admin/template/goto/admin.tpl b/admin/template/goto/admin.tpl
index 37225a373..6fd39dc0c 100644
--- a/admin/template/goto/admin.tpl
+++ b/admin/template/goto/admin.tpl
@@ -19,6 +19,7 @@ jQuery().ready(function(){ldelim}
<li><a href="{$U_RETURN}">{'home'|@translate}</a></li>
<li><a href="{$U_FAQ}">{'instructions'|@translate}</a></li>
<li><a href="{$U_ADMIN}" title="{'hint_admin'|@translate}">{'admin'|@translate}</a></li>
+ <li><a href="{$U_LOGOUT}">{'logout'|@translate}</a></li>
{if isset($pwgmenu)}
<li class="external"><a class="external" href="{$pwgmenu.WIKI}" onclick="window.open(this.href, '');
return false;">{'WIKI / DOC'|@translate}</a></li>