aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes/default
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--admin/themes/default/content.css (renamed from admin/template/goto/content.css)0
-rw-r--r--admin/themes/default/default-colors.css (renamed from admin/template/goto/default-colors.css)0
-rw-r--r--admin/themes/default/default-layout.css (renamed from admin/template/goto/default-layout.css)40
-rw-r--r--admin/themes/default/fix-ie5-ie6.css (renamed from admin/template/goto/fix-ie5-ie6.css)0
-rw-r--r--admin/themes/default/icon/cat_move.png (renamed from admin/template/goto/icon/cat_move.png)bin581 -> 581 bytes
-rw-r--r--admin/themes/default/icon/category_children.png (renamed from admin/template/goto/icon/category_children.png)bin962 -> 962 bytes
-rw-r--r--admin/themes/default/icon/category_delete.png (renamed from admin/template/goto/icon/category_delete.png)bin960 -> 960 bytes
-rw-r--r--admin/themes/default/icon/category_edit.png (renamed from admin/template/goto/icon/category_edit.png)bin1312 -> 1312 bytes
-rw-r--r--admin/themes/default/icon/category_elements.png (renamed from admin/template/goto/icon/category_elements.png)bin1044 -> 1044 bytes
-rw-r--r--admin/themes/default/icon/category_jump-to.png (renamed from admin/template/goto/icon/category_jump-to.png)bin942 -> 942 bytes
-rw-r--r--admin/themes/default/icon/category_permissions.png (renamed from admin/template/goto/icon/category_permissions.png)bin960 -> 960 bytes
-rw-r--r--admin/themes/default/icon/category_representant_random.png (renamed from admin/template/goto/icon/category_representant_random.png)bin1575 -> 1575 bytes
-rw-r--r--admin/themes/default/icon/check.png (renamed from admin/template/goto/icon/check.png)bin510 -> 510 bytes
-rw-r--r--admin/themes/default/icon/datepicker.png (renamed from admin/template/goto/icon/datepicker.png)bin517 -> 517 bytes
-rw-r--r--admin/themes/default/icon/delete.png (renamed from admin/template/goto/icon/delete.png)bin425 -> 425 bytes
-rw-r--r--admin/themes/default/icon/edit_s.png (renamed from admin/template/goto/icon/edit_s.png)bin817 -> 817 bytes
-rw-r--r--admin/themes/default/icon/errors.png (renamed from admin/template/goto/icon/errors.png)bin1224 -> 1224 bytes
-rw-r--r--admin/themes/default/icon/exit.png (renamed from admin/template/goto/icon/exit.png)bin816 -> 816 bytes
-rw-r--r--admin/themes/default/icon/fcbkcomplete_close.gif (renamed from admin/template/goto/icon/fcbkcomplete_close.gif)bin90 -> 90 bytes
-rw-r--r--admin/themes/default/icon/help.png (renamed from admin/template/goto/icon/help.png)bin774 -> 774 bytes
-rw-r--r--admin/themes/default/icon/home.png (renamed from admin/template/goto/icon/home.png)bin726 -> 726 bytes
-rw-r--r--admin/themes/default/icon/index.php (renamed from admin/template/goto/icon/index.php)0
-rw-r--r--admin/themes/default/icon/infos.png (renamed from admin/template/goto/icon/infos.png)bin701 -> 701 bytes
-rw-r--r--admin/themes/default/icon/note.png (renamed from admin/template/goto/icon/note.png)bin1332 -> 1332 bytes
-rw-r--r--admin/themes/default/icon/page_end.png (renamed from admin/template/goto/icon/page_end.png)bin777 -> 777 bytes
-rw-r--r--admin/themes/default/icon/page_top.png (renamed from admin/template/goto/icon/page_top.png)bin482 -> 482 bytes
-rw-r--r--admin/themes/default/icon/permissions.png (renamed from admin/template/goto/icon/permissions.png)bin421 -> 421 bytes
-rw-r--r--admin/themes/default/icon/plug_activate.png (renamed from admin/template/goto/icon/plug_activate.png)bin432 -> 432 bytes
-rw-r--r--admin/themes/default/icon/plug_activate_grey.png (renamed from admin/template/goto/icon/plug_activate_grey.png)bin388 -> 388 bytes
-rw-r--r--admin/themes/default/icon/plug_deactivate.png (renamed from admin/template/goto/icon/plug_deactivate.png)bin475 -> 475 bytes
-rw-r--r--admin/themes/default/icon/plug_deactivate_grey.png (renamed from admin/template/goto/icon/plug_deactivate_grey.png)bin399 -> 399 bytes
-rw-r--r--admin/themes/default/icon/plug_delete.png (renamed from admin/template/goto/icon/plug_delete.png)bin425 -> 425 bytes
-rw-r--r--admin/themes/default/icon/plug_delete_grey.png (renamed from admin/template/goto/icon/plug_delete_grey.png)bin436 -> 436 bytes
-rw-r--r--admin/themes/default/icon/plug_install.png (renamed from admin/template/goto/icon/plug_install.png)bin417 -> 417 bytes
-rw-r--r--admin/themes/default/icon/plug_install_grey.png (renamed from admin/template/goto/icon/plug_install_grey.png)bin376 -> 376 bytes
-rw-r--r--admin/themes/default/icon/plug_uninstall.png (renamed from admin/template/goto/icon/plug_uninstall.png)bin429 -> 429 bytes
-rw-r--r--admin/themes/default/icon/plug_uninstall_grey.png (renamed from admin/template/goto/icon/plug_uninstall_grey.png)bin387 -> 387 bytes
-rw-r--r--admin/themes/default/icon/plugin_active.gif (renamed from admin/template/goto/icon/plugin_active.gif)bin108 -> 108 bytes
-rw-r--r--admin/themes/default/icon/plugin_inactive.gif (renamed from admin/template/goto/icon/plugin_inactive.gif)bin107 -> 107 bytes
-rw-r--r--admin/themes/default/icon/preferences.png (renamed from admin/template/goto/icon/preferences.png)bin768 -> 768 bytes
-rw-r--r--admin/themes/default/icon/ranks.png (renamed from admin/template/goto/icon/ranks.png)bin772 -> 772 bytes
-rw-r--r--admin/themes/default/icon/ranks_grey.png (renamed from admin/template/goto/icon/ranks_grey.png)bin762 -> 762 bytes
-rw-r--r--admin/themes/default/icon/sync_metadata.png (renamed from admin/template/goto/icon/sync_metadata.png)bin1877 -> 1877 bytes
-rw-r--r--admin/themes/default/icon/sync_metadata_pink.png (renamed from admin/template/goto/icon/sync_metadata_pink.png)bin1949 -> 1949 bytes
-rw-r--r--admin/themes/default/icon/toggle_is_default_group.png (renamed from admin/template/goto/icon/toggle_is_default_group.png)bin664 -> 664 bytes
-rw-r--r--admin/themes/default/icon/uncheck.png (renamed from admin/template/goto/icon/uncheck.png)bin303 -> 303 bytes
-rw-r--r--admin/themes/default/icon/validate_s.png (renamed from admin/template/goto/icon/validate_s.png)bin492 -> 492 bytes
-rw-r--r--admin/themes/default/icon/virt_category.png (renamed from admin/template/goto/icon/virt_category.png)bin1094 -> 1094 bytes
-rw-r--r--admin/themes/default/index.php (renamed from admin/template/goto/index.php)0
-rw-r--r--admin/themes/default/layout.css (renamed from admin/template/goto/layout.css)0
-rw-r--r--admin/themes/default/local-layout.css (renamed from admin/template/goto/local-layout.css)0
-rw-r--r--admin/themes/default/local_head.tpl3
-rw-r--r--admin/themes/default/menubar.css (renamed from admin/template/goto/menubar.css)0
-rw-r--r--admin/themes/default/picture.css (renamed from admin/template/goto/picture.css)0
-rw-r--r--admin/themes/default/print.css (renamed from admin/template/goto/print.css)0
-rw-r--r--admin/themes/default/template/admin.tpl (renamed from admin/template/goto/admin.tpl)6
-rw-r--r--admin/themes/default/template/advanced_feature.tpl (renamed from admin/template/goto/advanced_feature.tpl)0
-rw-r--r--admin/themes/default/template/cat_list.tpl (renamed from admin/template/goto/cat_list.tpl)6
-rw-r--r--admin/themes/default/template/cat_modify.tpl (renamed from admin/template/goto/cat_modify.tpl)0
-rw-r--r--admin/themes/default/template/cat_move.tpl (renamed from admin/template/goto/cat_move.tpl)0
-rw-r--r--admin/themes/default/template/cat_options.tpl (renamed from admin/template/goto/cat_options.tpl)0
-rw-r--r--admin/themes/default/template/cat_perm.tpl (renamed from admin/template/goto/cat_perm.tpl)0
-rw-r--r--admin/themes/default/template/check_integrity.tpl (renamed from admin/template/goto/check_integrity.tpl)0
-rw-r--r--admin/themes/default/template/comments.tpl (renamed from admin/template/goto/comments.tpl)0
-rw-r--r--admin/themes/default/template/configuration.tpl (renamed from admin/template/goto/configuration.tpl)0
-rw-r--r--admin/themes/default/template/double_select.tpl (renamed from admin/template/goto/double_select.tpl)0
-rw-r--r--admin/themes/default/template/element_set_global.tpl (renamed from admin/template/goto/element_set_global.tpl)0
-rw-r--r--admin/themes/default/template/element_set_ranks.tpl (renamed from admin/template/goto/element_set_ranks.tpl)6
-rw-r--r--admin/themes/default/template/element_set_unit.tpl (renamed from admin/template/goto/element_set_unit.tpl)0
-rw-r--r--admin/themes/default/template/extend_for_templates.tpl (renamed from admin/template/goto/extend_for_templates.tpl)0
-rw-r--r--admin/themes/default/template/footer.tpl (renamed from admin/template/goto/footer.tpl)0
-rw-r--r--admin/themes/default/template/group_list.tpl (renamed from admin/template/goto/group_list.tpl)0
-rw-r--r--admin/themes/default/template/group_perm.tpl (renamed from admin/template/goto/group_perm.tpl)0
-rw-r--r--admin/themes/default/template/header.tpl77
-rw-r--r--admin/themes/default/template/history.tpl (renamed from admin/template/goto/history.tpl)0
-rw-r--r--admin/themes/default/template/include/autosize.inc.tpl (renamed from template/default/include/autosize.inc.tpl)4
-rw-r--r--admin/themes/default/template/include/datepicker.inc.tpl24
-rw-r--r--admin/themes/default/template/include/dbselect.inc.tpl (renamed from admin/template/goto/include/dbselect.inc.tpl)6
-rw-r--r--admin/themes/default/template/include/install.inc.tpl (renamed from admin/template/goto/include/install.inc.tpl)0
-rw-r--r--admin/themes/default/template/include/resize.inc.tpl (renamed from template/default/include/resize.inc.tpl)6
-rw-r--r--admin/themes/default/template/install.tpl (renamed from admin/template/goto/install.tpl)30
-rw-r--r--admin/themes/default/template/intro.tpl (renamed from admin/template/goto/intro.tpl)4
-rw-r--r--admin/themes/default/template/maintenance.tpl (renamed from admin/template/goto/maintenance.tpl)0
-rw-r--r--admin/themes/default/template/menubar.tpl (renamed from admin/template/goto/menubar.tpl)6
-rw-r--r--admin/themes/default/template/navigation_bar.tpl (renamed from admin/template/goto/navigation_bar.tpl)0
-rw-r--r--admin/themes/default/template/notification_by_mail.tpl (renamed from admin/template/goto/notification_by_mail.tpl)0
-rw-r--r--admin/themes/default/template/permalinks.tpl (renamed from admin/template/goto/permalinks.tpl)0
-rw-r--r--admin/themes/default/template/photos_add_direct.tpl (renamed from admin/template/goto/photos_add_direct.tpl)2
-rw-r--r--admin/themes/default/template/photos_add_settings.tpl (renamed from admin/template/goto/photos_add_settings.tpl)0
-rw-r--r--admin/themes/default/template/picture_modify.tpl (renamed from admin/template/goto/picture_modify.tpl)2
-rw-r--r--admin/themes/default/template/plugins_list.tpl (renamed from admin/template/goto/plugins_list.tpl)0
-rw-r--r--admin/themes/default/template/plugins_new.tpl (renamed from admin/template/goto/plugins_new.tpl)4
-rw-r--r--admin/themes/default/template/plugins_update.tpl (renamed from admin/template/goto/plugins_update.tpl)4
-rw-r--r--admin/themes/default/template/popuphelp.tpl (renamed from admin/template/goto/popuphelp.tpl)0
-rw-r--r--admin/themes/default/template/profile.tpl (renamed from admin/template/goto/profile.tpl)0
-rw-r--r--admin/themes/default/template/profile_content.tpl (renamed from admin/template/goto/profile_content.tpl)0
-rw-r--r--admin/themes/default/template/rating.tpl (renamed from admin/template/goto/rating.tpl)0
-rw-r--r--admin/themes/default/template/site_manager.tpl (renamed from admin/template/goto/site_manager.tpl)0
-rw-r--r--admin/themes/default/template/site_update.tpl (renamed from admin/template/goto/site_update.tpl)0
-rw-r--r--admin/themes/default/template/stats.tpl (renamed from admin/template/goto/stats.tpl)0
-rw-r--r--admin/themes/default/template/tabsheet.tpl (renamed from admin/template/goto/tabsheet.tpl)0
-rw-r--r--admin/themes/default/template/tags.tpl (renamed from admin/template/goto/tags.tpl)0
-rw-r--r--admin/themes/default/template/thumbnail.tpl (renamed from admin/template/goto/thumbnail.tpl)0
-rw-r--r--admin/themes/default/template/upgrade.tpl (renamed from admin/template/goto/upgrade.tpl)11
-rw-r--r--admin/themes/default/template/upload.tpl (renamed from admin/template/goto/upload.tpl)0
-rw-r--r--admin/themes/default/template/user_list.tpl (renamed from admin/template/goto/user_list.tpl)8
-rw-r--r--admin/themes/default/template/user_perm.tpl (renamed from admin/template/goto/user_perm.tpl)0
-rw-r--r--admin/themes/default/theme.css10
-rw-r--r--admin/themes/default/themeconf.inc.php8
-rw-r--r--admin/themes/default/thumbnails.css (renamed from admin/template/goto/thumbnails.css)0
110 files changed, 226 insertions, 41 deletions
diff --git a/admin/template/goto/content.css b/admin/themes/default/content.css
index 61ab73b83..61ab73b83 100644
--- a/admin/template/goto/content.css
+++ b/admin/themes/default/content.css
diff --git a/admin/template/goto/default-colors.css b/admin/themes/default/default-colors.css
index e45863bd3..e45863bd3 100644
--- a/admin/template/goto/default-colors.css
+++ b/admin/themes/default/default-colors.css
diff --git a/admin/template/goto/default-layout.css b/admin/themes/default/default-layout.css
index 56cb22ab6..a14f6632b 100644
--- a/admin/template/goto/default-layout.css
+++ b/admin/themes/default/default-layout.css
@@ -695,4 +695,44 @@ html, body {height:100%; margin:0; padding:0;}
#tiptip_holder.tip_top #tiptip_arrow_inner {
border-top-color: rgba(20,20,20,0.92);
}
+}
+
+/* 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)*/
} \ No newline at end of file
diff --git a/admin/template/goto/fix-ie5-ie6.css b/admin/themes/default/fix-ie5-ie6.css
index 078206d1d..078206d1d 100644
--- a/admin/template/goto/fix-ie5-ie6.css
+++ b/admin/themes/default/fix-ie5-ie6.css
diff --git a/admin/template/goto/icon/cat_move.png b/admin/themes/default/icon/cat_move.png
index 9d6939cfc..9d6939cfc 100644
--- a/admin/template/goto/icon/cat_move.png
+++ b/admin/themes/default/icon/cat_move.png
Binary files differ
diff --git a/admin/template/goto/icon/category_children.png b/admin/themes/default/icon/category_children.png
index d2c4edd1f..d2c4edd1f 100644
--- a/admin/template/goto/icon/category_children.png
+++ b/admin/themes/default/icon/category_children.png
Binary files differ
diff --git a/admin/template/goto/icon/category_delete.png b/admin/themes/default/icon/category_delete.png
index b27ef62d3..b27ef62d3 100644
--- a/admin/template/goto/icon/category_delete.png
+++ b/admin/themes/default/icon/category_delete.png
Binary files differ
diff --git a/admin/template/goto/icon/category_edit.png b/admin/themes/default/icon/category_edit.png
index 3ace19daf..3ace19daf 100644
--- a/admin/template/goto/icon/category_edit.png
+++ b/admin/themes/default/icon/category_edit.png
Binary files differ
diff --git a/admin/template/goto/icon/category_elements.png b/admin/themes/default/icon/category_elements.png
index c5e3f9292..c5e3f9292 100644
--- a/admin/template/goto/icon/category_elements.png
+++ b/admin/themes/default/icon/category_elements.png
Binary files differ
diff --git a/admin/template/goto/icon/category_jump-to.png b/admin/themes/default/icon/category_jump-to.png
index 765bc119f..765bc119f 100644
--- a/admin/template/goto/icon/category_jump-to.png
+++ b/admin/themes/default/icon/category_jump-to.png
Binary files differ
diff --git a/admin/template/goto/icon/category_permissions.png b/admin/themes/default/icon/category_permissions.png
index 055d9e58d..055d9e58d 100644
--- a/admin/template/goto/icon/category_permissions.png
+++ b/admin/themes/default/icon/category_permissions.png
Binary files differ
diff --git a/admin/template/goto/icon/category_representant_random.png b/admin/themes/default/icon/category_representant_random.png
index 26fe7016a..26fe7016a 100644
--- a/admin/template/goto/icon/category_representant_random.png
+++ b/admin/themes/default/icon/category_representant_random.png
Binary files differ
diff --git a/admin/template/goto/icon/check.png b/admin/themes/default/icon/check.png
index 708003a2b..708003a2b 100644
--- a/admin/template/goto/icon/check.png
+++ b/admin/themes/default/icon/check.png
Binary files differ
diff --git a/admin/template/goto/icon/datepicker.png b/admin/themes/default/icon/datepicker.png
index 72e836b93..72e836b93 100644
--- a/admin/template/goto/icon/datepicker.png
+++ b/admin/themes/default/icon/datepicker.png
Binary files differ
diff --git a/admin/template/goto/icon/delete.png b/admin/themes/default/icon/delete.png
index 285e53e19..285e53e19 100644
--- a/admin/template/goto/icon/delete.png
+++ b/admin/themes/default/icon/delete.png
Binary files differ
diff --git a/admin/template/goto/icon/edit_s.png b/admin/themes/default/icon/edit_s.png
index efb639947..efb639947 100644
--- a/admin/template/goto/icon/edit_s.png
+++ b/admin/themes/default/icon/edit_s.png
Binary files differ
diff --git a/admin/template/goto/icon/errors.png b/admin/themes/default/icon/errors.png
index e26d8c6e5..e26d8c6e5 100644
--- a/admin/template/goto/icon/errors.png
+++ b/admin/themes/default/icon/errors.png
Binary files differ
diff --git a/admin/template/goto/icon/exit.png b/admin/themes/default/icon/exit.png
index 685cc44b5..685cc44b5 100644
--- a/admin/template/goto/icon/exit.png
+++ b/admin/themes/default/icon/exit.png
Binary files differ
diff --git a/admin/template/goto/icon/fcbkcomplete_close.gif b/admin/themes/default/icon/fcbkcomplete_close.gif
index cc2199248..cc2199248 100644
--- a/admin/template/goto/icon/fcbkcomplete_close.gif
+++ b/admin/themes/default/icon/fcbkcomplete_close.gif
Binary files differ
diff --git a/admin/template/goto/icon/help.png b/admin/themes/default/icon/help.png
index cd1d20919..cd1d20919 100644
--- a/admin/template/goto/icon/help.png
+++ b/admin/themes/default/icon/help.png
Binary files differ
diff --git a/admin/template/goto/icon/home.png b/admin/themes/default/icon/home.png
index 81b6bddb7..81b6bddb7 100644
--- a/admin/template/goto/icon/home.png
+++ b/admin/themes/default/icon/home.png
Binary files differ
diff --git a/admin/template/goto/icon/index.php b/admin/themes/default/icon/index.php
index 871b52b6a..871b52b6a 100644
--- a/admin/template/goto/icon/index.php
+++ b/admin/themes/default/icon/index.php
diff --git a/admin/template/goto/icon/infos.png b/admin/themes/default/icon/infos.png
index d98031df4..d98031df4 100644
--- a/admin/template/goto/icon/infos.png
+++ b/admin/themes/default/icon/infos.png
Binary files differ
diff --git a/admin/template/goto/icon/note.png b/admin/themes/default/icon/note.png
index 9ef1af537..9ef1af537 100644
--- a/admin/template/goto/icon/note.png
+++ b/admin/themes/default/icon/note.png
Binary files differ
diff --git a/admin/template/goto/icon/page_end.png b/admin/themes/default/icon/page_end.png
index ac7b25ab8..ac7b25ab8 100644
--- a/admin/template/goto/icon/page_end.png
+++ b/admin/themes/default/icon/page_end.png
Binary files differ
diff --git a/admin/template/goto/icon/page_top.png b/admin/themes/default/icon/page_top.png
index 30c58edd7..30c58edd7 100644
--- a/admin/template/goto/icon/page_top.png
+++ b/admin/themes/default/icon/page_top.png
Binary files differ
diff --git a/admin/template/goto/icon/permissions.png b/admin/themes/default/icon/permissions.png
index 370ddddeb..370ddddeb 100644
--- a/admin/template/goto/icon/permissions.png
+++ b/admin/themes/default/icon/permissions.png
Binary files differ
diff --git a/admin/template/goto/icon/plug_activate.png b/admin/themes/default/icon/plug_activate.png
index feb97a1c9..feb97a1c9 100644
--- a/admin/template/goto/icon/plug_activate.png
+++ b/admin/themes/default/icon/plug_activate.png
Binary files differ
diff --git a/admin/template/goto/icon/plug_activate_grey.png b/admin/themes/default/icon/plug_activate_grey.png
index bf2a9be53..bf2a9be53 100644
--- a/admin/template/goto/icon/plug_activate_grey.png
+++ b/admin/themes/default/icon/plug_activate_grey.png
Binary files differ
diff --git a/admin/template/goto/icon/plug_deactivate.png b/admin/themes/default/icon/plug_deactivate.png
index 8401ad8b9..8401ad8b9 100644
--- a/admin/template/goto/icon/plug_deactivate.png
+++ b/admin/themes/default/icon/plug_deactivate.png
Binary files differ
diff --git a/admin/template/goto/icon/plug_deactivate_grey.png b/admin/themes/default/icon/plug_deactivate_grey.png
index a7e55e669..a7e55e669 100644
--- a/admin/template/goto/icon/plug_deactivate_grey.png
+++ b/admin/themes/default/icon/plug_deactivate_grey.png
Binary files differ
diff --git a/admin/template/goto/icon/plug_delete.png b/admin/themes/default/icon/plug_delete.png
index 285e53e19..285e53e19 100644
--- a/admin/template/goto/icon/plug_delete.png
+++ b/admin/themes/default/icon/plug_delete.png
Binary files differ
diff --git a/admin/template/goto/icon/plug_delete_grey.png b/admin/themes/default/icon/plug_delete_grey.png
index d3d070bfc..d3d070bfc 100644
--- a/admin/template/goto/icon/plug_delete_grey.png
+++ b/admin/themes/default/icon/plug_delete_grey.png
Binary files differ
diff --git a/admin/template/goto/icon/plug_install.png b/admin/themes/default/icon/plug_install.png
index bef78e171..bef78e171 100644
--- a/admin/template/goto/icon/plug_install.png
+++ b/admin/themes/default/icon/plug_install.png
Binary files differ
diff --git a/admin/template/goto/icon/plug_install_grey.png b/admin/themes/default/icon/plug_install_grey.png
index 3bd56be3c..3bd56be3c 100644
--- a/admin/template/goto/icon/plug_install_grey.png
+++ b/admin/themes/default/icon/plug_install_grey.png
Binary files differ
diff --git a/admin/template/goto/icon/plug_uninstall.png b/admin/themes/default/icon/plug_uninstall.png
index 9fd420ad7..9fd420ad7 100644
--- a/admin/template/goto/icon/plug_uninstall.png
+++ b/admin/themes/default/icon/plug_uninstall.png
Binary files differ
diff --git a/admin/template/goto/icon/plug_uninstall_grey.png b/admin/themes/default/icon/plug_uninstall_grey.png
index 4d6291cee..4d6291cee 100644
--- a/admin/template/goto/icon/plug_uninstall_grey.png
+++ b/admin/themes/default/icon/plug_uninstall_grey.png
Binary files differ
diff --git a/admin/template/goto/icon/plugin_active.gif b/admin/themes/default/icon/plugin_active.gif
index fe49227da..fe49227da 100644
--- a/admin/template/goto/icon/plugin_active.gif
+++ b/admin/themes/default/icon/plugin_active.gif
Binary files differ
diff --git a/admin/template/goto/icon/plugin_inactive.gif b/admin/themes/default/icon/plugin_inactive.gif
index 19d551865..19d551865 100644
--- a/admin/template/goto/icon/plugin_inactive.gif
+++ b/admin/themes/default/icon/plugin_inactive.gif
Binary files differ
diff --git a/admin/template/goto/icon/preferences.png b/admin/themes/default/icon/preferences.png
index 8634b5159..8634b5159 100644
--- a/admin/template/goto/icon/preferences.png
+++ b/admin/themes/default/icon/preferences.png
Binary files differ
diff --git a/admin/template/goto/icon/ranks.png b/admin/themes/default/icon/ranks.png
index 47710e87f..47710e87f 100644
--- a/admin/template/goto/icon/ranks.png
+++ b/admin/themes/default/icon/ranks.png
Binary files differ
diff --git a/admin/template/goto/icon/ranks_grey.png b/admin/themes/default/icon/ranks_grey.png
index f9757b998..f9757b998 100644
--- a/admin/template/goto/icon/ranks_grey.png
+++ b/admin/themes/default/icon/ranks_grey.png
Binary files differ
diff --git a/admin/template/goto/icon/sync_metadata.png b/admin/themes/default/icon/sync_metadata.png
index c527e2b04..c527e2b04 100644
--- a/admin/template/goto/icon/sync_metadata.png
+++ b/admin/themes/default/icon/sync_metadata.png
Binary files differ
diff --git a/admin/template/goto/icon/sync_metadata_pink.png b/admin/themes/default/icon/sync_metadata_pink.png
index 954c69612..954c69612 100644
--- a/admin/template/goto/icon/sync_metadata_pink.png
+++ b/admin/themes/default/icon/sync_metadata_pink.png
Binary files differ
diff --git a/admin/template/goto/icon/toggle_is_default_group.png b/admin/themes/default/icon/toggle_is_default_group.png
index 7ddce0076..7ddce0076 100644
--- a/admin/template/goto/icon/toggle_is_default_group.png
+++ b/admin/themes/default/icon/toggle_is_default_group.png
Binary files differ
diff --git a/admin/template/goto/icon/uncheck.png b/admin/themes/default/icon/uncheck.png
index df08cb8fe..df08cb8fe 100644
--- a/admin/template/goto/icon/uncheck.png
+++ b/admin/themes/default/icon/uncheck.png
Binary files differ
diff --git a/admin/template/goto/icon/validate_s.png b/admin/themes/default/icon/validate_s.png
index adea3d580..adea3d580 100644
--- a/admin/template/goto/icon/validate_s.png
+++ b/admin/themes/default/icon/validate_s.png
Binary files differ
diff --git a/admin/template/goto/icon/virt_category.png b/admin/themes/default/icon/virt_category.png
index 7957ec77c..7957ec77c 100644
--- a/admin/template/goto/icon/virt_category.png
+++ b/admin/themes/default/icon/virt_category.png
Binary files differ
diff --git a/admin/template/goto/index.php b/admin/themes/default/index.php
index 871b52b6a..871b52b6a 100644
--- a/admin/template/goto/index.php
+++ b/admin/themes/default/index.php
diff --git a/admin/template/goto/layout.css b/admin/themes/default/layout.css
index 5a7d5c4df..5a7d5c4df 100644
--- a/admin/template/goto/layout.css
+++ b/admin/themes/default/layout.css
diff --git a/admin/template/goto/local-layout.css b/admin/themes/default/local-layout.css
index e8136ac6d..e8136ac6d 100644
--- a/admin/template/goto/local-layout.css
+++ b/admin/themes/default/local-layout.css
diff --git a/admin/themes/default/local_head.tpl b/admin/themes/default/local_head.tpl
new file mode 100644
index 000000000..dd2ebc552
--- /dev/null
+++ b/admin/themes/default/local_head.tpl
@@ -0,0 +1,3 @@
+<!--[if lt IE 7]>
+ <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/default/fix-ie5-ie6.css">
+<![endif]-->
diff --git a/admin/template/goto/menubar.css b/admin/themes/default/menubar.css
index c0c51db29..c0c51db29 100644
--- a/admin/template/goto/menubar.css
+++ b/admin/themes/default/menubar.css
diff --git a/admin/template/goto/picture.css b/admin/themes/default/picture.css
index 13b0ca6ef..13b0ca6ef 100644
--- a/admin/template/goto/picture.css
+++ b/admin/themes/default/picture.css
diff --git a/admin/template/goto/print.css b/admin/themes/default/print.css
index 88c9ef4a1..88c9ef4a1 100644
--- a/admin/template/goto/print.css
+++ b/admin/themes/default/print.css
diff --git a/admin/template/goto/admin.tpl b/admin/themes/default/template/admin.tpl
index ac25b3990..8de4f69ea 100644
--- a/admin/template/goto/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -1,6 +1,6 @@
-{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">
jQuery().ready(function(){ldelim}
diff --git a/admin/template/goto/advanced_feature.tpl b/admin/themes/default/template/advanced_feature.tpl
index 76209387c..76209387c 100644
--- a/admin/template/goto/advanced_feature.tpl
+++ b/admin/themes/default/template/advanced_feature.tpl
diff --git a/admin/template/goto/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index 379306592..30b517a7b 100644
--- a/admin/template/goto/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.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.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">
jQuery().ready(function(){ldelim}
diff --git a/admin/template/goto/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index 1878da75c..1878da75c 100644
--- a/admin/template/goto/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
diff --git a/admin/template/goto/cat_move.tpl b/admin/themes/default/template/cat_move.tpl
index f8a83c584..f8a83c584 100644
--- a/admin/template/goto/cat_move.tpl
+++ b/admin/themes/default/template/cat_move.tpl
diff --git a/admin/template/goto/cat_options.tpl b/admin/themes/default/template/cat_options.tpl
index 9c25c1ef0..9c25c1ef0 100644
--- a/admin/template/goto/cat_options.tpl
+++ b/admin/themes/default/template/cat_options.tpl
diff --git a/admin/template/goto/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl
index fb239e79f..fb239e79f 100644
--- a/admin/template/goto/cat_perm.tpl
+++ b/admin/themes/default/template/cat_perm.tpl
diff --git a/admin/template/goto/check_integrity.tpl b/admin/themes/default/template/check_integrity.tpl
index 7cf566123..7cf566123 100644
--- a/admin/template/goto/check_integrity.tpl
+++ b/admin/themes/default/template/check_integrity.tpl
diff --git a/admin/template/goto/comments.tpl b/admin/themes/default/template/comments.tpl
index b7ac21ba4..b7ac21ba4 100644
--- a/admin/template/goto/comments.tpl
+++ b/admin/themes/default/template/comments.tpl
diff --git a/admin/template/goto/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 065a2ad76..065a2ad76 100644
--- a/admin/template/goto/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
diff --git a/admin/template/goto/double_select.tpl b/admin/themes/default/template/double_select.tpl
index ee9704419..ee9704419 100644
--- a/admin/template/goto/double_select.tpl
+++ b/admin/themes/default/template/double_select.tpl
diff --git a/admin/template/goto/element_set_global.tpl b/admin/themes/default/template/element_set_global.tpl
index fffea3f09..fffea3f09 100644
--- a/admin/template/goto/element_set_global.tpl
+++ b/admin/themes/default/template/element_set_global.tpl
diff --git a/admin/template/goto/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl
index ab4416b05..6fed3fb19 100644
--- a/admin/template/goto/element_set_ranks.tpl
+++ b/admin/themes/default/template/element_set_ranks.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.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}
<script type="text/javascript">
diff --git a/admin/template/goto/element_set_unit.tpl b/admin/themes/default/template/element_set_unit.tpl
index 4e188590b..4e188590b 100644
--- a/admin/template/goto/element_set_unit.tpl
+++ b/admin/themes/default/template/element_set_unit.tpl
diff --git a/admin/template/goto/extend_for_templates.tpl b/admin/themes/default/template/extend_for_templates.tpl
index 0d093c3bf..0d093c3bf 100644
--- a/admin/template/goto/extend_for_templates.tpl
+++ b/admin/themes/default/template/extend_for_templates.tpl
diff --git a/admin/template/goto/footer.tpl b/admin/themes/default/template/footer.tpl
index e8709b59f..e8709b59f 100644
--- a/admin/template/goto/footer.tpl
+++ b/admin/themes/default/template/footer.tpl
diff --git a/admin/template/goto/group_list.tpl b/admin/themes/default/template/group_list.tpl
index 6b32da66b..6b32da66b 100644
--- a/admin/template/goto/group_list.tpl
+++ b/admin/themes/default/template/group_list.tpl
diff --git a/admin/template/goto/group_perm.tpl b/admin/themes/default/template/group_perm.tpl
index 1dded1291..1dded1291 100644
--- a/admin/template/goto/group_perm.tpl
+++ b/admin/themes/default/template/group_perm.tpl
diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl
new file mode 100644
index 000000000..57ae04fa4
--- /dev/null
+++ b/admin/themes/default/template/header.tpl
@@ -0,0 +1,77 @@
+{*
+
+ Warning : This is the admin pages header only
+ don't confuse with the public page header
+
+*}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="{$lang_info.code}" dir="{$lang_info.direction}">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}">
+<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}{$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}
+
+{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]>
+<script type="text/javascript" src="{$ROOT_URL}themes/default/js/pngfix.js"></script>
+<![endif]-->
+
+{if not empty($head_elements)}
+{foreach from=$head_elements item=elt}
+{$elt}
+{/foreach}
+{/if}
+
+</head>
+
+<body id="{$BODY_ID}">
+
+<div id="the_page">
+
+<div id="pwgHead">
+ <h1>
+ <a href="{$U_RETURN}" title="Visit Gallery">
+ <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/home.png" alt="{'Home'|@translate}">
+ {$GALLERY_TITLE}
+ </a>
+ </h1>
+
+ <div id="headActions">
+ Hello {$USERNAME} :
+ <a href="{$U_RETURN}" title="Visit Gallery">Visit Gallery</a> |
+ <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}{$themeconf.admin_icon_dir}/help.png" class="button" alt="(?)"></a>
+ </div>
+</div>
+
+<div style="clear:both;"></div>
+
+{if not empty($header_msgs)}
+<div class="header_msgs">
+ {foreach from=$header_msgs item=elt}
+ {$elt}
+ {/foreach}
+</div>
+{/if}
+
+<div id="theHeader">{*$PAGE_BANNER*}</div>
+
+{if not empty($header_notes)}
+<div class="header_notes">
+ {foreach from=$header_notes item=elt}
+ {$elt}
+ {/foreach}
+</div>
+{/if}
+
+<div id="pwgMain"> \ No newline at end of file
diff --git a/admin/template/goto/history.tpl b/admin/themes/default/template/history.tpl
index 5d0cd771e..5d0cd771e 100644
--- a/admin/template/goto/history.tpl
+++ b/admin/themes/default/template/history.tpl
diff --git a/template/default/include/autosize.inc.tpl b/admin/themes/default/template/include/autosize.inc.tpl
index 5529d07bd..8f5c78c70 100644
--- a/template/default/include/autosize.inc.tpl
+++ b/admin/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/admin/themes/default/template/include/datepicker.inc.tpl b/admin/themes/default/template/include/datepicker.inc.tpl
new file mode 100644
index 000000000..f010febcf
--- /dev/null
+++ b/admin/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.admin_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/dbselect.inc.tpl b/admin/themes/default/template/include/dbselect.inc.tpl
index 30db7400a..009452c1e 100644
--- a/admin/template/goto/include/dbselect.inc.tpl
+++ b/admin/themes/default/template/include/dbselect.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/admin/template/goto/include/install.inc.tpl b/admin/themes/default/template/include/install.inc.tpl
index b153f0f30..b153f0f30 100644
--- a/admin/template/goto/include/install.inc.tpl
+++ b/admin/themes/default/template/include/install.inc.tpl
diff --git a/template/default/include/resize.inc.tpl b/admin/themes/default/template/include/resize.inc.tpl
index aebb9f6c5..30a637563 100644
--- a/template/default/include/resize.inc.tpl
+++ b/admin/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/admin/template/goto/install.tpl b/admin/themes/default/template/install.tpl
index 28609c366..ce3d8d906 100644
--- a/admin/template/goto/install.tpl
+++ b/admin/themes/default/template/install.tpl
@@ -5,12 +5,32 @@
<meta http-equiv="Content-Type" content="text/html; charset={$T_CONTENT_ENCODING}">
<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 {
width: 800px;
diff --git a/admin/template/goto/intro.tpl b/admin/themes/default/template/intro.tpl
index 01cfda5af..86c65c0a3 100644
--- a/admin/template/goto/intro.tpl
+++ b/admin/themes/default/template/intro.tpl
@@ -1,5 +1,5 @@
-{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">
jQuery().ready(function(){ldelim}
diff --git a/admin/template/goto/maintenance.tpl b/admin/themes/default/template/maintenance.tpl
index 2208b5baa..2208b5baa 100644
--- a/admin/template/goto/maintenance.tpl
+++ b/admin/themes/default/template/maintenance.tpl
diff --git a/admin/template/goto/menubar.tpl b/admin/themes/default/template/menubar.tpl
index d77c2dbac..552880b45 100644
--- a/admin/template/goto/menubar.tpl
+++ b/admin/themes/default/template/menubar.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-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}
<script type="text/javascript">
diff --git a/admin/template/goto/navigation_bar.tpl b/admin/themes/default/template/navigation_bar.tpl
index 82c66bd15..82c66bd15 100644
--- a/admin/template/goto/navigation_bar.tpl
+++ b/admin/themes/default/template/navigation_bar.tpl
diff --git a/admin/template/goto/notification_by_mail.tpl b/admin/themes/default/template/notification_by_mail.tpl
index 3ffccd544..3ffccd544 100644
--- a/admin/template/goto/notification_by_mail.tpl
+++ b/admin/themes/default/template/notification_by_mail.tpl
diff --git a/admin/template/goto/permalinks.tpl b/admin/themes/default/template/permalinks.tpl
index ef5c7f802..ef5c7f802 100644
--- a/admin/template/goto/permalinks.tpl
+++ b/admin/themes/default/template/permalinks.tpl
diff --git a/admin/template/goto/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 5715d358e..9f59c11a7 100644
--- a/admin/template/goto/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -1,4 +1,4 @@
-{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}
<script>
diff --git a/admin/template/goto/photos_add_settings.tpl b/admin/themes/default/template/photos_add_settings.tpl
index 10e4633dd..10e4633dd 100644
--- a/admin/template/goto/photos_add_settings.tpl
+++ b/admin/themes/default/template/photos_add_settings.tpl
diff --git a/admin/template/goto/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 77f1671a6..be5fa94a4 100644
--- a/admin/template/goto/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -2,7 +2,7 @@
{include file='include/dbselect.inc.tpl'}
{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">
$(document).ready(function() {
diff --git a/admin/template/goto/plugins_list.tpl b/admin/themes/default/template/plugins_list.tpl
index 8743d6b6d..8743d6b6d 100644
--- a/admin/template/goto/plugins_list.tpl
+++ b/admin/themes/default/template/plugins_list.tpl
diff --git a/admin/template/goto/plugins_new.tpl b/admin/themes/default/template/plugins_new.tpl
index 6b106b87e..4bc7700b0 100644
--- a/admin/template/goto/plugins_new.tpl
+++ b/admin/themes/default/template/plugins_new.tpl
@@ -1,5 +1,5 @@
-{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">
jQuery().ready(function(){ldelim}
diff --git a/admin/template/goto/plugins_update.tpl b/admin/themes/default/template/plugins_update.tpl
index d6fc71662..312fb3ba8 100644
--- a/admin/template/goto/plugins_update.tpl
+++ b/admin/themes/default/template/plugins_update.tpl
@@ -1,5 +1,5 @@
-{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">
jQuery().ready(function(){ldelim}
diff --git a/admin/template/goto/popuphelp.tpl b/admin/themes/default/template/popuphelp.tpl
index 950e3ca0e..950e3ca0e 100644
--- a/admin/template/goto/popuphelp.tpl
+++ b/admin/themes/default/template/popuphelp.tpl
diff --git a/admin/template/goto/profile.tpl b/admin/themes/default/template/profile.tpl
index 6eac82e44..6eac82e44 100644
--- a/admin/template/goto/profile.tpl
+++ b/admin/themes/default/template/profile.tpl
diff --git a/admin/template/goto/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
index fd8841a4e..fd8841a4e 100644
--- a/admin/template/goto/profile_content.tpl
+++ b/admin/themes/default/template/profile_content.tpl
diff --git a/admin/template/goto/rating.tpl b/admin/themes/default/template/rating.tpl
index d7d3a85c9..d7d3a85c9 100644
--- a/admin/template/goto/rating.tpl
+++ b/admin/themes/default/template/rating.tpl
diff --git a/admin/template/goto/site_manager.tpl b/admin/themes/default/template/site_manager.tpl
index 678f177fb..678f177fb 100644
--- a/admin/template/goto/site_manager.tpl
+++ b/admin/themes/default/template/site_manager.tpl
diff --git a/admin/template/goto/site_update.tpl b/admin/themes/default/template/site_update.tpl
index 90a2562cf..90a2562cf 100644
--- a/admin/template/goto/site_update.tpl
+++ b/admin/themes/default/template/site_update.tpl
diff --git a/admin/template/goto/stats.tpl b/admin/themes/default/template/stats.tpl
index 692a3a6c5..692a3a6c5 100644
--- a/admin/template/goto/stats.tpl
+++ b/admin/themes/default/template/stats.tpl
diff --git a/admin/template/goto/tabsheet.tpl b/admin/themes/default/template/tabsheet.tpl
index 00b3f3c54..00b3f3c54 100644
--- a/admin/template/goto/tabsheet.tpl
+++ b/admin/themes/default/template/tabsheet.tpl
diff --git a/admin/template/goto/tags.tpl b/admin/themes/default/template/tags.tpl
index 3db8417a6..3db8417a6 100644
--- a/admin/template/goto/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
diff --git a/admin/template/goto/thumbnail.tpl b/admin/themes/default/template/thumbnail.tpl
index 653f07cc3..653f07cc3 100644
--- a/admin/template/goto/thumbnail.tpl
+++ b/admin/themes/default/template/thumbnail.tpl
diff --git a/admin/template/goto/upgrade.tpl b/admin/themes/default/template/upgrade.tpl
index a5424c9e6..29b723ef1 100644
--- a/admin/template/goto/upgrade.tpl
+++ b/admin/themes/default/template/upgrade.tpl
@@ -5,10 +5,13 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<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">
.content {
diff --git a/admin/template/goto/upload.tpl b/admin/themes/default/template/upload.tpl
index cc56d9a02..cc56d9a02 100644
--- a/admin/template/goto/upload.tpl
+++ b/admin/themes/default/template/upload.tpl
diff --git a/admin/template/goto/user_list.tpl b/admin/themes/default/template/user_list.tpl
index ed68a719a..9eb14fa84 100644
--- a/admin/template/goto/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -218,10 +218,10 @@
<tr>
<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>
</tr>
diff --git a/admin/template/goto/user_perm.tpl b/admin/themes/default/template/user_perm.tpl
index d1ecdca9a..d1ecdca9a 100644
--- a/admin/template/goto/user_perm.tpl
+++ b/admin/themes/default/template/user_perm.tpl
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
new file mode 100644
index 000000000..3283e29a5
--- /dev/null
+++ b/admin/themes/default/theme.css
@@ -0,0 +1,10 @@
+
+/* template css */
+/*@import "menubar.css";*/
+@import "content.css";
+@import "thumbnails.css";
+@import "default-layout.css";
+/* Override properties with import local file */
+@import "local-layout.css";
+
+@import "default-colors.css";
diff --git a/admin/themes/default/themeconf.inc.php b/admin/themes/default/themeconf.inc.php
new file mode 100644
index 000000000..36352b2b2
--- /dev/null
+++ b/admin/themes/default/themeconf.inc.php
@@ -0,0 +1,8 @@
+<?php
+$themeconf = array(
+ 'theme' => 'default',
+ 'icon_dir' => 'themes/default/icon',
+ 'admin_icon_dir' => 'admin/themes/default/icon',
+ 'mime_icon_dir' => 'themes/default/icon/mimetypes/',
+);
+?>
diff --git a/admin/template/goto/thumbnails.css b/admin/themes/default/thumbnails.css
index 432854e4b..432854e4b 100644
--- a/admin/template/goto/thumbnails.css
+++ b/admin/themes/default/thumbnails.css