Changeset 5123 for trunk/admin/themes/default

Timestamp:

Mar 13, 2010, 1:00:52 AM (15 years ago)

Author:

plg

Message:

feature 1502: based on Dotclear model, P@t has reorganized the way Piwigo
manages template/theme in a simpler "theme only level" architecture. It
supports multiple level inheritance.

Location:

trunk/admin/themes

Files:

• . (added)
• default (added)
• default/content.css (copied) (copied from trunk/admin/template/goto/content.css)
• default/default-colors.css (copied) (copied from trunk/admin/template/goto/default-colors.css)
• default/default-layout.css (copied) (copied from trunk/admin/template/goto/default-layout.css) (1 diff)
• default/fix-ie5-ie6.css (copied) (copied from trunk/admin/template/goto/fix-ie5-ie6.css)
• default/icon (copied) (copied from trunk/admin/template/goto/icon)
• default/index.php (added)
• default/layout.css (copied) (copied from trunk/admin/template/goto/layout.css)
• default/local-layout.css (copied) (copied from trunk/admin/template/goto/local-layout.css)
• default/local_head.tpl (added)
• default/menubar.css (copied) (copied from trunk/admin/template/goto/menubar.css)
• default/picture.css (copied) (copied from trunk/admin/template/goto/picture.css)
• default/print.css (copied) (copied from trunk/admin/template/goto/print.css)
• default/template (added)
• default/template/admin.tpl (copied) (copied from trunk/admin/template/goto/admin.tpl) (1 diff)
• default/template/advanced_feature.tpl (copied) (copied from trunk/admin/template/goto/advanced_feature.tpl)
• default/template/cat_list.tpl (copied) (copied from trunk/admin/template/goto/cat_list.tpl) (1 diff)
• default/template/cat_modify.tpl (copied) (copied from trunk/admin/template/goto/cat_modify.tpl)
• default/template/cat_move.tpl (copied) (copied from trunk/admin/template/goto/cat_move.tpl)
• default/template/cat_options.tpl (copied) (copied from trunk/admin/template/goto/cat_options.tpl)
• default/template/cat_perm.tpl (copied) (copied from trunk/admin/template/goto/cat_perm.tpl)
• default/template/check_integrity.tpl (copied) (copied from trunk/admin/template/goto/check_integrity.tpl)
• default/template/comments.tpl (copied) (copied from trunk/admin/template/goto/comments.tpl)
• default/template/configuration.tpl (copied) (copied from trunk/admin/template/goto/configuration.tpl)
• default/template/double_select.tpl (copied) (copied from trunk/admin/template/goto/double_select.tpl)
• default/template/element_set_global.tpl (copied) (copied from trunk/admin/template/goto/element_set_global.tpl)
• default/template/element_set_ranks.tpl (copied) (copied from trunk/admin/template/goto/element_set_ranks.tpl) (1 diff)
• default/template/element_set_unit.tpl (copied) (copied from trunk/admin/template/goto/element_set_unit.tpl)
• default/template/extend_for_templates.tpl (copied) (copied from trunk/admin/template/goto/extend_for_templates.tpl)
• default/template/footer.tpl (copied) (copied from trunk/admin/template/goto/footer.tpl)
• default/template/group_list.tpl (copied) (copied from trunk/admin/template/goto/group_list.tpl)
• default/template/group_perm.tpl (copied) (copied from trunk/admin/template/goto/group_perm.tpl)
• default/template/header.tpl (copied) (copied from trunk/admin/template/goto/header.tpl) (3 diffs)
• default/template/history.tpl (copied) (copied from trunk/admin/template/goto/history.tpl)
• default/template/include (copied) (copied from trunk/admin/template/goto/include)
• default/template/include/autosize.inc.tpl (modified) (1 diff)
• default/template/include/datepicker.inc.tpl (modified) (3 diffs)
• default/template/include/dbselect.inc.tpl (modified) (1 diff)
• default/template/include/resize.inc.tpl (modified) (1 diff)
• default/template/install.tpl (copied) (copied from trunk/admin/template/goto/install.tpl) (1 diff)
• default/template/intro.tpl (copied) (copied from trunk/admin/template/goto/intro.tpl) (1 diff)
• default/template/maintenance.tpl (copied) (copied from trunk/admin/template/goto/maintenance.tpl)
• default/template/menubar.tpl (copied) (copied from trunk/admin/template/goto/menubar.tpl) (1 diff)
• default/template/navigation_bar.tpl (copied) (copied from trunk/admin/template/goto/navigation_bar.tpl)
• default/template/notification_by_mail.tpl (copied) (copied from trunk/admin/template/goto/notification_by_mail.tpl)
• default/template/permalinks.tpl (copied) (copied from trunk/admin/template/goto/permalinks.tpl)
• default/template/photos_add_direct.tpl (copied) (copied from trunk/admin/template/goto/photos_add_direct.tpl) (1 diff)
• default/template/photos_add_settings.tpl (copied) (copied from trunk/admin/template/goto/photos_add_settings.tpl)
• default/template/picture_modify.tpl (copied) (copied from trunk/admin/template/goto/picture_modify.tpl) (1 diff)
• default/template/plugins_list.tpl (copied) (copied from trunk/admin/template/goto/plugins_list.tpl)
• default/template/plugins_new.tpl (copied) (copied from trunk/admin/template/goto/plugins_new.tpl) (1 diff)
• default/template/plugins_update.tpl (copied) (copied from trunk/admin/template/goto/plugins_update.tpl) (1 diff)
• default/template/popuphelp.tpl (copied) (copied from trunk/admin/template/goto/popuphelp.tpl)
• default/template/profile.tpl (copied) (copied from trunk/admin/template/goto/profile.tpl)
• default/template/profile_content.tpl (copied) (copied from trunk/admin/template/goto/profile_content.tpl)
• default/template/rating.tpl (copied) (copied from trunk/admin/template/goto/rating.tpl)
• default/template/site_manager.tpl (copied) (copied from trunk/admin/template/goto/site_manager.tpl)
• default/template/site_update.tpl (copied) (copied from trunk/admin/template/goto/site_update.tpl)
• default/template/stats.tpl (copied) (copied from trunk/admin/template/goto/stats.tpl)
• default/template/tabsheet.tpl (copied) (copied from trunk/admin/template/goto/tabsheet.tpl)
• default/template/tags.tpl (copied) (copied from trunk/admin/template/goto/tags.tpl)
• default/template/thumbnail.tpl (copied) (copied from trunk/admin/template/goto/thumbnail.tpl)
• default/template/upgrade.tpl (copied) (copied from trunk/admin/template/goto/upgrade.tpl) (1 diff)
• default/template/upload.tpl (copied) (copied from trunk/admin/template/goto/upload.tpl)
• default/template/user_list.tpl (copied) (copied from trunk/admin/template/goto/user_list.tpl) (1 diff)
• default/template/user_perm.tpl (copied) (copied from trunk/admin/template/goto/user_perm.tpl)
• default/theme.css (added)
• default/themeconf.inc.php (added)
• default/thumbnails.css (copied) (copied from trunk/admin/template/goto/thumbnails.css)

trunk/admin/themes/default/default-layout.css

@@ -697 +697 @@
         }
 }
+
+/* Set the width of the menubar for the galery */
+#menubar {
+  width: 18em;
+}
+.content {
+  margin-left: 20em;  /* = #menubar width + 2em */
+}
+/* Set minimum width of the page before getting a scrollbar */
+/* IE5 and IE6 don't get that */
+BODY {
+  min-width: 60em;  /* ~ 3* #menubar width */
+}
+BODY#thePopuphelpPage {
+  min-width: 0;
+}
+
+/* Set some sizes according to your maximum thumbnail width and height */
+.content UL.thumbnails SPAN,
+.content UL.thumbnails SPAN.wrap2 A,
+.content UL.thumbnails LABEL,
+.content DIV.thumbnailCategory DIV.illustration {
+  width: 140px;      /* max thumbnail width + 2px */
+}
+.content UL.thumbnails SPAN.wrap2,
+.content DIV.thumbnailCategory DIV.description {
+  height: 140px;    /* max thumbnail height + 2px */
+}
+
+
+/* Category thumbnails on main page */
+.content UL.thumbnailCategories LI {
+  width: 49.7%;    /* 49.7% for 2 per line, 33.2% for 3 per line*/
+}
+
+/* Set defaults for thumbnails legend */
+.content UL.thumbnails SPAN.thumbLegend {
+  display: block;  /* display: none; if you don't want legend */
+  height: 4em;    /* legend height (don't set auto to be Gecko friendly)*/
+}

trunk/admin/themes/default/template/admin.tpl

@@ -1 @@
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.core.packed.js" }
-{known_script id="jquery.ui.accordion" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.accordion.packed.js" }
-{known_script id="jquery.tipTip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.tipTip.minified.js" }
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
+{known_script id="jquery.ui.accordion" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.accordion.packed.js" }
+{known_script id="jquery.tipTip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.tipTip.minified.js" }
 
 <script type="text/javascript">

trunk/admin/themes/default/template/cat_list.tpl

@@ -1 @@
-{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/packed/ui.core.packed.js" }
-{known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.sortable.packed.js" }
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
+{known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js" }
 
 <script type="text/javascript">

trunk/admin/themes/default/template/element_set_ranks.tpl

@@ -1 @@
-{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/packed/ui.core.packed.js" }
-{known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.sortable.packed.js" }
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
+{known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js" }
 
 {literal}

trunk/admin/themes/default/template/header.tpl

@@ -12 +12 @@
 <meta name="generator" content="Piwigo (aka PWG), see piwigo.org">
 <title>{$GALLERY_TITLE} :: {$PAGE_TITLE}</title>
-<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">
 
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css">
+{foreach from=$themes item=theme}
+{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.name}/theme.css">
+{/foreach}
+
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=1} {*jQuery is always available by default*}
+
+<script type="text/javascript" src="{$ROOT_URL}themes/default/js/scripts.js"></script>
 <!--[if lt IE 7]>
-  <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/fix-ie5-ie6.css">
-<![endif]-->
-<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]>
-<style>
-  {* only because we need {$ROOT_URL} otherwise use fix-ie5-ie6.css *}
-  BODY {ldelim} behavior:url("{$ROOT_URL}template-common/csshover.htc"); }
-  A IMG, .button, .icon {ldelim}
-    behavior:url("{$ROOT_URL}template-common/tooltipfix.htc");
-  }
-  FORM {ldelim} behavior: url("{$ROOT_URL}template-common/inputfix.htc"); }
-</style>
-<script type="text/javascript" src="{$ROOT_URL}template-common/pngfix.js"></script>
+<script type="text/javascript" src="{$ROOT_URL}themes/default/js/pngfix.js"></script>
 <![endif]-->
 
@@ -50 +41 @@
   <h1>
     <a href="{$U_RETURN}" title="Visit Gallery">
-      <img src="admin/template/goto/icon/home.png" alt="{'Home'|@translate}">
+      <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/home.png" alt="{'Home'|@translate}">
       {$GALLERY_TITLE}
     </a>
@@ -60 +51 @@
     <a href="{$U_CHANGE_THEME}" title="Switch to clear theme for administration">Change Theme</a> |
     <a href="{$U_LOGOUT}">{'Logout'|@translate}</a>
-    <a href="{$U_FAQ}" title="{'Instructions'|@translate}" id="instructions"><img style="padding-left:10px;" src="{$ROOT_URL}admin/template/goto/icon/help.png" class="button" alt="(?)"></a>
+    <a href="{$U_FAQ}" title="{'Instructions'|@translate}" id="instructions"><img style="padding-left:10px;" src="{$ROOT_URL}{$themeconf.admin_icon_dir}/help.png" class="button" alt="(?)"></a>
   </div>
 </div>

trunk/admin/themes/default/template/include/autosize.inc.tpl

@@ -1 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.autogrow" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.autogrow-textarea.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.autogrow" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.autogrow-textarea.js"}
 
 {* Auto size and auto grow textarea *}

trunk/admin/themes/default/template/include/datepicker.inc.tpl

@@ -1 +1 @@
 
-{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/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.datepicker" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.datepicker.packed.js"}
-{known_script id="datepicker.js" src=$ROOT_URL|@cat:"template-common/datepicker.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
+{known_script id="jquery.ui.datepicker" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.datepicker.packed.js"}
+{known_script id="datepicker.js" src=$ROOT_URL|@cat:"themes/default/js/datepicker.js"}
 
-{assign var="datepicker_language" value="template-common/lib/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"}
+{assign var="datepicker_language" value="themes/default/js/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"}
 
 {if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
@@ -12 +12 @@
 
 {html_head}
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template-common/lib/ui/theme/ui.datepicker.css">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/js/ui/themes/ui.datepicker.css">
 {/html_head}
 
@@ -19 +19 @@
 {ldelim}
   return pwg_common_initialization_datepicker(
-    "{$ROOT_URL}admin/template/{$themeconf.template}/icon/datepicker.png",
+    "{$ROOT_URL}{$themeconf.admin_icon_dir}/datepicker.png",
     day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date);
 }

trunk/admin/themes/default/template/include/dbselect.inc.tpl

@@ -1 @@
-{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/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.resizable.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
+{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.resizable.packed.js"}
 
 {* Resize possible *}

trunk/admin/themes/default/template/include/resize.inc.tpl

@@ -1 @@
-{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/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.resizable.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
+{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.resizable.packed.js"}
 
 {* Resize possible *}

trunk/admin/themes/default/template/install.tpl

@@ -6 +6 @@
 <meta http-equiv="Content-script-type" content="text/javascript">
 <meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.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">
-{include file="include/install.inc.tpl"}
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">
+
+{foreach from=$themes item=theme}
+{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.name}/theme.css">
+{/foreach}
+
+<script type="text/javascript" src="themes/default/js/jquery.packed.js"></script>
 {literal}
+<script type="text/javascript">
+$(function() {
+    $option_selected = $('#dblayer option:selected').attr('value');
+    if ($option_selected=='sqlite' || $option_selected=='pdo-sqlite') {
+       $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().hide();
+    }
+    $('#dblayer').change(function() {
+        $db = this;
+        if ($db.value=='sqlite' || $db.value=='pdo-sqlite') {
+           $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().hide();
+        } else {
+           $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().show();
+        }
+      });
+  });
+</script>
+
 <style type="text/css">
 .content {

trunk/admin/themes/default/template/intro.tpl

@@ -1 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
 
 <script type="text/javascript">

trunk/admin/themes/default/template/menubar.tpl

@@ -1 @@
-{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/packed/ui.core.packed.js" }
-{known_script id="jquery-tablednd" src=$ROOT_URL|@cat:"template-common/lib/jquery.tablednd.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
+{known_script id="jquery-tablednd" src=$ROOT_URL|@cat:"themes/default/js/jquery.tablednd.js"}
 
 {literal}

trunk/admin/themes/default/template/photos_add_direct.tpl

@@ -1 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
 
 {literal}

trunk/admin/themes/default/template/picture_modify.tpl

@@ -3 +3 @@
 {include file='include/datepicker.inc.tpl'}
 
-{known_script id="jquery.fcbkcomplete" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.fcbkcomplete.js"}
+{known_script id="jquery.fcbkcomplete" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.fcbkcomplete.js"}
 {literal}
 <script type="text/javascript">

trunk/admin/themes/default/template/plugins_new.tpl

@@ -1 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
 
 <script type="text/javascript">

trunk/admin/themes/default/template/plugins_update.tpl

@@ -1 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
 
 <script type="text/javascript">

trunk/admin/themes/default/template/upgrade.tpl

@@ -6 +6 @@
 <meta http-equiv="Content-script-type" content="text/javascript">
 <meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.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">
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">
+
+{foreach from=$themes item=theme}
+{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.name}/theme.css">
+{/foreach}
+
 {literal}
 <style type="text/css">

trunk/admin/themes/default/template/user_list.tpl

@@ -219 +219 @@
     <td>{'Interface theme'|@translate}</td>
     <td>
-      <label><input type="radio" name="template_action" value="leave" checked="checked"> {'leave'|@translate}</label>
-      <label><input type="radio" name="template_action" value="set" id="template_action_set"> {'set to'|@translate}</label>
-      <select onchange="document.getElementById('template_action_set').checked = true;" name="template" size="1">
-        {html_options values=$template_options output=$template_options selected=$template_selected}
+      <label><input type="radio" name="theme_action" value="leave" checked="checked"> {'leave'|@translate}</label>
+      <label><input type="radio" name="theme_action" value="set" id="theme_action_set"> {'set to'|@translate}</label>
+      <select onchange="document.getElementById('theme_action_set').checked = true;" name="theme" size="1">
+        {html_options values=$theme_options output=$theme_options selected=$theme_selected}
       </select>
     </td>