diff options
| author | nikrou <nikrou@piwigo.org> | 2010-02-15 21:40:52 +0000 |
|---|---|---|
| committer | nikrou <nikrou@piwigo.org> | 2010-02-15 21:40:52 +0000 |
| commit | 213eb3b7367472633667c538fb2add7b14f4b012 (patch) | |
| tree | 11733b1904e6d0109b2b596a46a43bc1bd3035ff | |
| parent | 58c91bb5f35f15bde6fb4858ee81c4e137ad7d41 (diff) | |
Bug 1426 fixed : admin help popup use gallery theme instead of admin theme
merge from trunk
git-svn-id: http://piwigo.org/svn/branches/2.0@4894 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/template/goto/popuphelp.tpl | 12 | ||||
| -rw-r--r-- | include/common.inc.php | 3 | ||||
| -rw-r--r-- | popuphelp.php | 1 | ||||
| -rw-r--r-- | template/yoga/popuphelp.tpl | 13 |
4 files changed, 15 insertions, 14 deletions
diff --git a/admin/template/goto/popuphelp.tpl b/admin/template/goto/popuphelp.tpl new file mode 100644 index 000000000..950e3ca0e --- /dev/null +++ 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 index 9575338a5..7b892cbbc 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -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']); diff --git a/popuphelp.php b/popuphelp.php index 1f2a8ec44..4cb68327d 100644 --- 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 deleted file mode 100644 index ff810c680..000000000 --- a/template/yoga/popuphelp.tpl +++ /dev/null @@ -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> - |