adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1426 fixed : admin help popup use gallery theme instead of admin theme

Browse Source 
merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.0@4894 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2010-02-15 21:40:52 +00:00
parent 58c91bb5f3
commit 213eb3b736
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/template/goto/popuphelp.tpl
+12
View File
@@ -0,0 +1,12 @@
<div id="content" class="content">
{$HELP_CONTENT}
</div> <!-- content -->
<ul class="categoryActions">
<li>
<a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
<img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/exit.png" class="button" alt="exit">
</a>
</li>
</ul>
include/common.inc.php
+2 -1
View File
@@ -168,7 +168,8 @@ if (is_a_guest())
}
// template instance
if ( defined('IN_ADMIN') and IN_ADMIN )
if (( defined('IN_ADMIN') and IN_ADMIN )
or (defined('PWG_HELP') and PWG_HELP))
{// Admin template
list($user['admin_template'], $user['admin_theme']) =
explode ('/', $conf['admin_layout']);
popuphelp.php
+1
View File
@@ -26,6 +26,7 @@
// +-----------------------------------------------------------------------+
define('PHPWG_ROOT_PATH','./');
define('PWG_HELP', true);
include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
// +-----------------------------------------------------------------------+
template/yoga/popuphelp.tpl
-13
View File
@@ -1,13 +0,0 @@
{* $Id$ *}
<div id="content" class="content">
{$HELP_CONTENT}
</div> <!-- content -->
<ul class="categoryActions">
<li>
<a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
<img src="{$ROOT_URL}{$themeconf.icon_dir}/exit.png" class="button" alt="exit">
</a>
</li>
</ul>