adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-12 03:33:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fix typing error in index.tpl

Browse Source 
- 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
This commit is contained in:
rvelices
2008-09-09 09:53:31 +00:00
parent 26474d349f
commit 9aec2fb5e7
11 changed files with 56 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/template/yoga/admin.tpl
+14
View File
@@ -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}&nbsp;</span></dt>
admin/template/yoga/header.tpl
+2 -1
View File
@@ -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]>
admin/template/yoga/theme/admin/themeconf.inc.php
+2 -16
View File
@@ -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' => '',
);
?>