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

…theme git-svn-id: http://piwigo.org/svn/trunk@4893 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Feb 15, 2010 · 6992b27 · 6992b27
1 parent c1d6177
commit 6992b27
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/admin/template/goto/popuphelp.tpl b/admin/template/goto/popuphelp.tpl
@@ -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>
+
diff --git a/include/common.inc.php b/include/common.inc.php
@@ -155,7 +155,8 @@ function sanitize_mysql_kv(&$v, $k)
 }
 
 // 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']);

diff --git a/popuphelp.php b/popuphelp.php
@@ -26,6 +26,7 @@
 // +-----------------------------------------------------------------------+
 
 define('PHPWG_ROOT_PATH','./');
+define('PWG_HELP', true);
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
 
 // +-----------------------------------------------------------------------+

diff --git a/template/yoga/popuphelp.tpl b/template/yoga/popuphelp.tpl