49 files changed, 39 insertions, 33 deletions
diff --git a/template/default/about.tpl b/themes/default/template/about.tpl
index 370e3ccc3..370e3ccc3 100644
--- a/template/default/about.tpl
+++ b/themes/default/template/about.tpl
diff --git a/template/default/comment_list.tpl b/themes/default/template/comment_list.tpl
index f431a1cd5..f431a1cd5 100644
--- a/template/default/comment_list.tpl
+++ b/themes/default/template/comment_list.tpl
diff --git a/template/default/comments.tpl b/themes/default/template/comments.tpl
index 68941e03d..68941e03d 100644
--- a/template/default/comments.tpl
+++ b/themes/default/template/comments.tpl
diff --git a/template/default/footer.tpl b/themes/default/template/footer.tpl
index 89c034965..89c034965 100644
--- a/template/default/footer.tpl
+++ b/themes/default/template/footer.tpl
diff --git a/template/default/header.tpl b/themes/default/template/header.tpl
index 74bc82b13..07c020405 100644
--- a/template/default/header.tpl
+++ b/themes/default/template/header.tpl
@@ -20,7 +20,7 @@
 {if (isset($REVERSE) and $REVERSE and $PAGE_TITLE == l10n('home'))}
 <title>{$GALLERY_TITLE} | {$PAGE_TITLE}</title>{else}
 <title>{$PAGE_TITLE} | {$GALLERY_TITLE}</title>{/if}
-<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="start" title="{'Home'|@translate}" href="{$U_HOME}" >
 <link rel="search" title="{'Search'|@translate}" href="{$ROOT_URL}search.php" >
@@ -30,36 +30,18 @@
 {if isset($last.U_IMG)    }<link rel="last" title="{'Last'|@translate}" href="{$last.U_IMG}" >{/if}
 {if isset($U_UP)          }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if}
 
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/layout.css">
-{* the next css is used to fix khtml (Konqueror/Safari) issue the "text/nonsense" prevents gecko based browsers to load it *}
-<link rel="stylesheet" type="text/nonsense" href="{$ROOT_URL}template/{$themeconf.template}/fix-khtml.css">
-<!--[if lt IE 7]>
-	<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/fix-ie5-ie6.css">
-<![endif]-->
-<!--[if gt IE 6]>
-	<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/fix-ie7.css">
-<![endif]-->
-<!--[if !IE]> <-->
-	<link rel="stylesheet" href="{$ROOT_URL}template/{$themeconf.template}/not-ie.css" type="text/css">
-<!--> <![endif]-->
-<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}template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
-{$themeconf.local_head}
+{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}themes/{$theme.name}/theme.css">
+{/foreach}
+
 {if isset($U_PREFETCH)          }<link rel="prefetch" href="{$U_PREFETCH}">{/if}
 
 {if not empty($page_refresh)    }<meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">{/if}
 
-<script type="text/javascript" src="{$ROOT_URL}template-common/scripts.js"></script>
+<script type="text/javascript" src="{$ROOT_URL}{$themeconf.js_dir}/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}{$themeconf.js_dir}/pngfix.js"></script>
 <![endif]-->
 
 {if not empty($head_elements)}
diff --git a/template/default/identification.tpl b/themes/default/template/identification.tpl
index b63415e7b..b63415e7b 100644
--- a/template/default/identification.tpl
+++ b/themes/default/template/identification.tpl
diff --git a/admin/template/goto/include/autosize.inc.tpl b/themes/default/template/include/autosize.inc.tpl
index 5529d07bd..8f5c78c70 100644
--- a/admin/template/goto/include/autosize.inc.tpl
+++ b/themes/default/template/include/autosize.inc.tpl
@@ -1,5 +1,5 @@
-{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 *}
 {literal}
diff --git a/themes/default/template/include/datepicker.inc.tpl b/themes/default/template/include/datepicker.inc.tpl
new file mode 100644
index 000000000..92cb8cbcd
--- /dev/null
+++ b/themes/default/template/include/datepicker.inc.tpl
@@ -0,0 +1,24 @@
+
+{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="themes/default/js/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"}
+
+{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
+{known_script id="jquery.ui.datepicker-$lang_info.code" src=$ROOT_URL|@cat:$datepicker_language}
+{/if}
+
+{html_head}
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/js/ui/themes/ui.datepicker.css">
+{/html_head}
+
+<script type="text/javascript">
+function pwg_initialization_datepicker(day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date)
+{ldelim}
+  return pwg_common_initialization_datepicker(
+    "{$ROOT_URL}{$themeconf.icon_dir}/datepicker.png",
+    day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date);
+}
+</script>
diff --git a/admin/template/goto/include/resize.inc.tpl b/themes/default/template/include/resize.inc.tpl
index aebb9f6c5..30a637563 100644
--- a/admin/template/goto/include/resize.inc.tpl
+++ b/themes/default/template/include/resize.inc.tpl
@@ -1,6 +1,6 @@
-{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 *}
 {literal}
diff --git a/template/default/index.tpl b/themes/default/template/index.tpl
index 6bad8e319..6bad8e319 100644
--- a/template/default/index.tpl
+++ b/themes/default/template/index.tpl
diff --git a/template/yoga/theme/dark/images/index.php b/themes/default/template/mail/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/dark/images/index.php
+++ b/themes/default/template/mail/index.php
diff --git a/template/default/mail/text/html/cat_group_info.tpl b/themes/default/template/mail/text/html/cat_group_info.tpl
index a0c703bb0..a0c703bb0 100644
--- a/template/default/mail/text/html/cat_group_info.tpl
+++ b/themes/default/template/mail/text/html/cat_group_info.tpl
diff --git a/template/default/mail/text/html/footer.tpl b/themes/default/template/mail/text/html/footer.tpl
index 92e69b089..92e69b089 100644
--- a/template/default/mail/text/html/footer.tpl
+++ b/themes/default/template/mail/text/html/footer.tpl
diff --git a/template/default/mail/text/html/global-mail-css.tpl b/themes/default/template/mail/text/html/global-mail-css.tpl
index 5c8e87a54..5c8e87a54 100644
--- a/template/default/mail/text/html/global-mail-css.tpl
+++ b/themes/default/template/mail/text/html/global-mail-css.tpl
diff --git a/template/default/mail/text/html/header.tpl b/themes/default/template/mail/text/html/header.tpl
index 9ab46693c..9ab46693c 100644
--- a/template/default/mail/text/html/header.tpl
+++ b/themes/default/template/mail/text/html/header.tpl
diff --git a/template/yoga/theme/dark/index.php b/themes/default/template/mail/text/html/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/dark/index.php
+++ b/themes/default/template/mail/text/html/index.php
diff --git a/template/default/mail/text/html/notification_by_mail.tpl b/themes/default/template/mail/text/html/notification_by_mail.tpl
index 5a0115e2f..5a0115e2f 100644
--- a/template/default/mail/text/html/notification_by_mail.tpl
+++ b/themes/default/template/mail/text/html/notification_by_mail.tpl
diff --git a/template/yoga/theme/index.php b/themes/default/template/mail/text/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/index.php
+++ b/themes/default/template/mail/text/index.php
diff --git a/template/default/mail/text/plain/cat_group_info.tpl b/themes/default/template/mail/text/plain/cat_group_info.tpl
index 59604846e..59604846e 100644
--- a/template/default/mail/text/plain/cat_group_info.tpl
+++ b/themes/default/template/mail/text/plain/cat_group_info.tpl
diff --git a/template/default/mail/text/plain/footer.tpl b/themes/default/template/mail/text/plain/footer.tpl
index c386f0962..c386f0962 100644
--- a/template/default/mail/text/plain/footer.tpl
+++ b/themes/default/template/mail/text/plain/footer.tpl
diff --git a/template/default/mail/text/plain/header.tpl b/themes/default/template/mail/text/plain/header.tpl
index 6fcc863d2..6fcc863d2 100644
--- a/template/default/mail/text/plain/header.tpl
+++ b/themes/default/template/mail/text/plain/header.tpl
diff --git a/template/yoga/theme/p0w0/images/index.php b/themes/default/template/mail/text/plain/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/p0w0/images/index.php
+++ b/themes/default/template/mail/text/plain/index.php
diff --git a/template/default/mail/text/plain/notification_by_mail.tpl b/themes/default/template/mail/text/plain/notification_by_mail.tpl
index b1928853f..b1928853f 100644
--- a/template/default/mail/text/plain/notification_by_mail.tpl
+++ b/themes/default/template/mail/text/plain/notification_by_mail.tpl
diff --git a/template/default/mainpage_categories.tpl b/themes/default/template/mainpage_categories.tpl
index 0a88d3534..0a88d3534 100644
--- a/template/default/mainpage_categories.tpl
+++ b/themes/default/template/mainpage_categories.tpl
diff --git a/template/default/menubar.tpl b/themes/default/template/menubar.tpl
index 8b1e8f4b6..8b1e8f4b6 100644
--- a/template/default/menubar.tpl
+++ b/themes/default/template/menubar.tpl
diff --git a/template/default/menubar_categories.tpl b/themes/default/template/menubar_categories.tpl
index 02a9b6668..02a9b6668 100644
--- a/template/default/menubar_categories.tpl
+++ b/themes/default/template/menubar_categories.tpl
diff --git a/template/default/menubar_identification.tpl b/themes/default/template/menubar_identification.tpl
index 2717e1019..2717e1019 100644
--- a/template/default/menubar_identification.tpl
+++ b/themes/default/template/menubar_identification.tpl
diff --git a/template/default/menubar_links.tpl b/themes/default/template/menubar_links.tpl
index a945bd0d6..a945bd0d6 100644
--- a/template/default/menubar_links.tpl
+++ b/themes/default/template/menubar_links.tpl
diff --git a/template/default/menubar_menu.tpl b/themes/default/template/menubar_menu.tpl
index 0d6541b97..0d6541b97 100644
--- a/template/default/menubar_menu.tpl
+++ b/themes/default/template/menubar_menu.tpl
diff --git a/template/default/menubar_specials.tpl b/themes/default/template/menubar_specials.tpl
index 1f00a2dc9..1f00a2dc9 100644
--- a/template/default/menubar_specials.tpl
+++ b/themes/default/template/menubar_specials.tpl
diff --git a/template/default/menubar_tags.tpl b/themes/default/template/menubar_tags.tpl
index 220175008..220175008 100644
--- a/template/default/menubar_tags.tpl
+++ b/themes/default/template/menubar_tags.tpl
diff --git a/template/default/month_calendar.tpl b/themes/default/template/month_calendar.tpl
index 45d6079e1..45d6079e1 100644
--- a/template/default/month_calendar.tpl
+++ b/themes/default/template/month_calendar.tpl
diff --git a/template/default/navigation_bar.tpl b/themes/default/template/navigation_bar.tpl
index 82c66bd15..82c66bd15 100644
--- a/template/default/navigation_bar.tpl
+++ b/themes/default/template/navigation_bar.tpl
diff --git a/template/default/nbm.tpl b/themes/default/template/nbm.tpl
index 646335813..646335813 100644
--- a/template/default/nbm.tpl
+++ b/themes/default/template/nbm.tpl
diff --git a/template/default/notification.tpl b/themes/default/template/notification.tpl
index 8f6dcb680..8f6dcb680 100644
--- a/template/default/notification.tpl
+++ b/themes/default/template/notification.tpl
diff --git a/template/default/password.tpl b/themes/default/template/password.tpl
index 1e0471bd5..1e0471bd5 100644
--- a/template/default/password.tpl
+++ b/themes/default/template/password.tpl
diff --git a/template/default/picture.tpl b/themes/default/template/picture.tpl
index 9499a546d..885d31112 100644
--- a/template/default/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -190,7 +190,7 @@ y.callService(
 			  <input type="submit" name="rate" value="{$mark}" class="rateButton" title="{$mark}">
 			{/if}
 			{/foreach}
-			<script type="text/javascript" src="{$ROOT_URL}template/{$themeconf.template}/rating.js"></script>
+			<script type="text/javascript" src="{$ROOT_URL}themes/default/js/rating.js"></script>
 			<script type="text/javascript">
 			makeNiceRatingForm( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}', image_id: {$current.id},
 			updateRateText: "{'update_rate'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
diff --git a/template/default/picture_content.tpl b/themes/default/template/picture_content.tpl
index 384a9ce1a..384a9ce1a 100644
--- a/template/default/picture_content.tpl
+++ b/themes/default/template/picture_content.tpl
diff --git a/template/default/picture_nav_buttons.tpl b/themes/default/template/picture_nav_buttons.tpl
index 06b236a88..06b236a88 100644
--- a/template/default/picture_nav_buttons.tpl
+++ b/themes/default/template/picture_nav_buttons.tpl
diff --git a/template/default/profile.tpl b/themes/default/template/profile.tpl
index b94c3967c..b94c3967c 100644
--- a/template/default/profile.tpl
+++ b/themes/default/template/profile.tpl
diff --git a/template/default/profile_content.tpl b/themes/default/template/profile_content.tpl
index e6736f078..876a2a8a8 100644
--- a/template/default/profile_content.tpl
+++ b/themes/default/template/profile_content.tpl
@@ -59,7 +59,7 @@
         <span class="property">
           <label for="template">{'Interface theme'|@translate}</label>
         </span>
-        {html_options name=template options=$template_options selected=$template_selection}
+        {html_options name=theme options=$template_options selected=$template_selection}
       </li>
       <li>
         <span class="property">
diff --git a/template/default/redirect.tpl b/themes/default/template/redirect.tpl
index aa90953ec..aa90953ec 100644
--- a/template/default/redirect.tpl
+++ b/themes/default/template/redirect.tpl
diff --git a/template/default/register.tpl b/themes/default/template/register.tpl
index 7e5a31d70..7e5a31d70 100644
--- a/template/default/register.tpl
+++ b/themes/default/template/register.tpl
diff --git a/template/default/search.tpl b/themes/default/template/search.tpl
index 57f799e75..57f799e75 100644
--- a/template/default/search.tpl
+++ b/themes/default/template/search.tpl
diff --git a/template/default/search_rules.tpl b/themes/default/template/search_rules.tpl
index 28b2e423f..28b2e423f 100644
--- a/template/default/search_rules.tpl
+++ b/themes/default/template/search_rules.tpl
diff --git a/template/default/slideshow.tpl b/themes/default/template/slideshow.tpl
index a310935a2..a310935a2 100644
--- a/template/default/slideshow.tpl
+++ b/themes/default/template/slideshow.tpl
diff --git a/template/default/tags.tpl b/themes/default/template/tags.tpl
index 95891df0e..95891df0e 100644
--- a/template/default/tags.tpl
+++ b/themes/default/template/tags.tpl
diff --git a/template/default/thumbnails.tpl b/themes/default/template/thumbnails.tpl
index 1061f77cd..1061f77cd 100644
--- a/template/default/thumbnails.tpl
+++ b/themes/default/template/thumbnails.tpl
diff --git a/template/default/upload.tpl b/themes/default/template/upload.tpl
index 00f17be89..00f17be89 100644
--- a/template/default/upload.tpl
+++ b/themes/default/template/upload.tpl