diff options
| author | rvelices <rv-github@modusoptimus.com> | 2008-09-09 09:53:31 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2008-09-09 09:53:31 +0000 |
| commit | 9aec2fb5e728a37026adc0d5246e1cfe7d226cb9 (patch) | |
| tree | 61cd3a69456a91747317de8db797db56e01157f7 /admin | |
| parent | 26474d349f6f03b3f74beb91ef680f0c634e05d5 (diff) | |
- fix typing error in index.tpl
- added template smarty function known_script (e.g.{known_script id="x" src"y.js"}) - useful to avoid double inclusion of a script such as prototype,jquery,... when a template and plugin need it independently (see the use in admin.tpl for example)
- removed unused themeconf.template_dir
git-svn-id: http://piwigo.org/svn/trunk@2513 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/template/yoga/admin.tpl | 14 | ||||
| -rw-r--r-- | admin/template/yoga/header.tpl | 3 | ||||
| -rw-r--r-- | admin/template/yoga/theme/admin/themeconf.inc.php | 18 |
3 files changed, 18 insertions, 17 deletions
diff --git a/admin/template/yoga/admin.tpl b/admin/template/yoga/admin.tpl index e1d30f36e..7aae91c39 100644 --- a/admin/template/yoga/admin.tpl +++ b/admin/template/yoga/admin.tpl @@ -1,4 +1,18 @@ {* $Id$ *} +{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"} +{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.core.packed.js" } +{known_script id="jquery.ui.accordion" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.accordion.packed.js" } + +<script type="text/javascript"> +jQuery().ready(function(){ldelim} + jQuery('#menubar').accordion({ldelim} + header: "dt.rdion", + event: "click", + active: {$themeconf.selected_admin_menu} + }); +}); +</script> + <div id="menubar"> <dl class="first"> <dt class="rdion"><span>{'Links'|@translate} </span></dt> diff --git a/admin/template/yoga/header.tpl b/admin/template/yoga/header.tpl index b6169df99..607f31529 100644 --- a/admin/template/yoga/header.tpl +++ b/admin/template/yoga/header.tpl @@ -3,7 +3,7 @@ Warning : This is the admin pages header only - don't be confusing with the public page header + don't confuse with the public page header *} <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" @@ -22,6 +22,7 @@ <link rel="stylesheet" type="text/css" media="print" href="{$ROOT_URL}template/{$themeconf.template}/print.css"> <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css"> <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css"> +{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js" now=1} {*jQuery is always available by default*} {$themeconf.local_head} <script type="text/javascript" src="{$ROOT_URL}template-common/scripts.js"></script> <!--[if lt IE 7]> diff --git a/admin/template/yoga/theme/admin/themeconf.inc.php b/admin/template/yoga/theme/admin/themeconf.inc.php index 8ba054ec9..61c090ebf 100644 --- a/admin/template/yoga/theme/admin/themeconf.inc.php +++ b/admin/template/yoga/theme/admin/themeconf.inc.php @@ -51,24 +51,10 @@ function selected_admin_menu() $themeconf = array( 'template' => 'yoga', 'theme' => 'admin', - 'template_dir' => 'admin/template/yoga', 'icon_dir' => 'template/yoga/icon', 'admin_icon_dir' => 'template/yoga/icon/admin', 'mime_icon_dir' => 'template/yoga/icon/mimetypes/', - 'local_head' => ' -<!-- New template location for admin --> -<!-- Admin Accordion Menus --> - <script type="text/javascript" src="template-common/lib/jquery.packed.js"></script> - <script type="text/javascript" src="template-common/lib/ui/ui.core.packed.js"></script> - <script type="text/javascript" src="template-common/lib/ui/ui.accordion.packed.js"></script> - <script type="text/javascript"> - jQuery().ready(function(){ - jQuery(\'#menubar\').accordion({ - header: "dt.rdion", - event: "click", - active: '. selected_admin_menu() . ' - }); - }); - </script>' + 'selected_admin_menu' => selected_admin_menu(), + 'local_head' => '', ); ?> |