diff options
author | plegall <plg@piwigo.org> | 2010-03-13 00:00:52 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2010-03-13 00:00:52 +0000 |
commit | 14778ce673277f2df41f963aa70df1cbed427294 (patch) | |
tree | 8c723d4d9827876dbf19d2bd581405fc50910860 | |
parent | c396f08708d431c6f7e8656eaca4fd8e440fdd39 (diff) |
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.
git-svn-id: http://piwigo.org/svn/trunk@5123 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | admin.php | 8 | ||||
-rw-r--r-- | admin/extend_for_templates.php | 2 | ||||
-rw-r--r-- | admin/include/functions_notification_by_mail.inc.php | 6 | ||||
-rw-r--r-- | admin/template/goto/header.tpl | 86 | ||||
-rw-r--r-- | admin/template/goto/include/datepicker.inc.tpl | 24 | ||||
-rw-r--r-- | admin/template/goto/theme/clear/themeconf.inc.php | 15 | ||||
-rw-r--r-- | admin/template/goto/theme/roma/themeconf.inc.php | 15 | ||||
-rw-r--r-- | admin/themes/clear/icon/cat_move.png (renamed from admin/template/goto/theme/clear/icon/cat_move.png) | bin | 515 -> 515 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/category_children.png (renamed from admin/template/goto/theme/clear/icon/category_children.png) | bin | 1554 -> 1554 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/category_delete.png (renamed from admin/template/goto/theme/clear/icon/category_delete.png) | bin | 1752 -> 1752 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/category_edit.png (renamed from admin/template/goto/theme/clear/icon/category_edit.png) | bin | 1606 -> 1606 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/category_elements.png (renamed from admin/template/goto/theme/clear/icon/category_elements.png) | bin | 1681 -> 1681 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/category_jump-to.png (renamed from admin/template/goto/theme/clear/icon/category_jump-to.png) | bin | 1604 -> 1604 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/category_permissions.png (renamed from admin/template/goto/theme/clear/icon/category_permissions.png) | bin | 1839 -> 1839 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/category_representant_random.png (renamed from admin/template/goto/theme/clear/icon/category_representant_random.png) | bin | 3171 -> 3171 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/check.png (renamed from admin/template/goto/theme/clear/icon/check.png) | bin | 367 -> 367 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/collapse.gif (renamed from admin/template/goto/theme/clear/icon/collapse.gif) | bin | 878 -> 878 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/datepicker.png (renamed from admin/template/goto/theme/clear/icon/datepicker.png) | bin | 475 -> 475 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/delete.png (renamed from admin/template/goto/theme/clear/icon/delete.png) | bin | 778 -> 778 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/edit_s.png (renamed from admin/template/goto/theme/clear/icon/edit_s.png) | bin | 585 -> 585 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/errors.png (renamed from admin/template/goto/theme/clear/icon/errors.png) | bin | 3249 -> 3249 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/exit.png (renamed from admin/template/goto/theme/clear/icon/exit.png) | bin | 1432 -> 1432 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/expand.gif (renamed from admin/template/goto/theme/clear/icon/expand.gif) | bin | 900 -> 900 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/help.png (renamed from admin/template/goto/theme/clear/icon/help.png) | bin | 1994 -> 1994 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/index.php (renamed from admin/template/goto/theme/clear/icon/index.php) | 0 | ||||
-rw-r--r-- | admin/themes/clear/icon/infos.png (renamed from admin/template/goto/theme/clear/icon/infos.png) | bin | 2250 -> 2250 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/note.png (renamed from admin/template/goto/theme/clear/icon/note.png) | bin | 1862 -> 1862 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/page_end.png (renamed from admin/template/goto/theme/clear/icon/page_end.png) | bin | 536 -> 536 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/page_top.png (renamed from admin/template/goto/theme/clear/icon/page_top.png) | bin | 555 -> 555 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/permissions.png (renamed from admin/template/goto/theme/clear/icon/permissions.png) | bin | 373 -> 373 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plug_activate.png (renamed from admin/template/goto/theme/clear/icon/plug_activate.png) | bin | 410 -> 410 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plug_activate_grey.png (renamed from admin/template/goto/theme/clear/icon/plug_activate_grey.png) | bin | 364 -> 364 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plug_deactivate.png (renamed from admin/template/goto/theme/clear/icon/plug_deactivate.png) | bin | 441 -> 441 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plug_deactivate_grey.png (renamed from admin/template/goto/theme/clear/icon/plug_deactivate_grey.png) | bin | 371 -> 371 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plug_delete.png (renamed from admin/template/goto/theme/clear/icon/plug_delete.png) | bin | 386 -> 386 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plug_delete_grey.png (renamed from admin/template/goto/theme/clear/icon/plug_delete_grey.png) | bin | 386 -> 386 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plug_install.png (renamed from admin/template/goto/theme/clear/icon/plug_install.png) | bin | 386 -> 386 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plug_install_grey.png (renamed from admin/template/goto/theme/clear/icon/plug_install_grey.png) | bin | 344 -> 344 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plug_uninstall.png (renamed from admin/template/goto/theme/clear/icon/plug_uninstall.png) | bin | 406 -> 406 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plug_uninstall_grey.png (renamed from admin/template/goto/theme/clear/icon/plug_uninstall_grey.png) | bin | 363 -> 363 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plugin_active.gif (renamed from admin/template/goto/theme/clear/icon/plugin_active.gif) | bin | 135 -> 135 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/plugin_inactive.gif (renamed from admin/template/goto/theme/clear/icon/plugin_inactive.gif) | bin | 134 -> 134 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/preferences.png (renamed from admin/template/goto/theme/clear/icon/preferences.png) | bin | 714 -> 714 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/ranks.png (renamed from admin/template/goto/theme/clear/icon/ranks.png) | bin | 423 -> 423 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/ranks_grey.png (renamed from admin/template/goto/theme/clear/icon/ranks_grey.png) | bin | 421 -> 421 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/sync_metadata.png (renamed from admin/template/goto/theme/clear/icon/sync_metadata.png) | bin | 1530 -> 1530 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/sync_metadata_pink.png (renamed from admin/template/goto/theme/clear/icon/sync_metadata_pink.png) | bin | 1639 -> 1639 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/toggle_is_default_group.png (renamed from admin/template/goto/theme/clear/icon/toggle_is_default_group.png) | bin | 624 -> 624 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/uncheck.png (renamed from admin/template/goto/theme/clear/icon/uncheck.png) | bin | 213 -> 213 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/validate_s.png (renamed from admin/template/goto/theme/clear/icon/validate_s.png) | bin | 315 -> 315 bytes | |||
-rw-r--r-- | admin/themes/clear/icon/virt_category.png (renamed from admin/template/goto/theme/clear/icon/virt_category.png) | bin | 796 -> 796 bytes | |||
-rw-r--r-- | admin/themes/clear/images/external_active.png (renamed from admin/template/goto/theme/clear/images/external_active.png) | bin | 571 -> 571 bytes | |||
-rw-r--r-- | admin/themes/clear/images/external_inactive.png (renamed from admin/template/goto/theme/clear/images/external_inactive.png) | bin | 578 -> 578 bytes | |||
-rw-r--r-- | admin/themes/clear/images/piwigo_logo_214x100.png (renamed from admin/template/goto/theme/clear/images/piwigo_logo_214x100.png) | bin | 12154 -> 12154 bytes | |||
-rw-r--r-- | admin/themes/clear/images/quickLocalSync.png (renamed from admin/template/goto/theme/clear/images/quickLocalSync.png) | bin | 8084 -> 8084 bytes | |||
-rw-r--r-- | admin/themes/clear/images/resizable-e.gif (renamed from admin/template/goto/theme/clear/images/resizable-e.gif) | bin | 928 -> 928 bytes | |||
-rw-r--r-- | admin/themes/clear/images/resizable-n.gif (renamed from admin/template/goto/theme/clear/images/resizable-n.gif) | bin | 905 -> 905 bytes | |||
-rw-r--r-- | admin/themes/clear/images/resizable-ne.gif (renamed from admin/template/goto/theme/clear/images/resizable-ne.gif) | bin | 871 -> 871 bytes | |||
-rw-r--r-- | admin/themes/clear/images/resizable-nw.gif (renamed from admin/template/goto/theme/clear/images/resizable-nw.gif) | bin | 869 -> 869 bytes | |||
-rw-r--r-- | admin/themes/clear/images/resizable-s.gif (renamed from admin/template/goto/theme/clear/images/resizable-s.gif) | bin | 902 -> 902 bytes | |||
-rw-r--r-- | admin/themes/clear/images/resizable-se.gif (renamed from admin/template/goto/theme/clear/images/resizable-se.gif) | bin | 869 -> 869 bytes | |||
-rw-r--r-- | admin/themes/clear/images/resizable-sw.gif (renamed from admin/template/goto/theme/clear/images/resizable-sw.gif) | bin | 870 -> 870 bytes | |||
-rw-r--r-- | admin/themes/clear/images/resizable-w.gif (renamed from admin/template/goto/theme/clear/images/resizable-w.gif) | bin | 912 -> 912 bytes | |||
-rw-r--r-- | admin/themes/clear/images/transparent.gif (renamed from admin/template/goto/theme/clear/images/transparent.gif) | bin | 43 -> 43 bytes | |||
-rw-r--r-- | admin/themes/clear/index.php (renamed from admin/template/goto/theme/clear/index.php) | 0 | ||||
-rw-r--r-- | admin/themes/clear/mail-css.tpl (renamed from admin/template/goto/theme/clear/mail-css.tpl) | 2 | ||||
-rw-r--r-- | admin/themes/clear/theme.css (renamed from admin/template/goto/theme/clear/theme.css) | 0 | ||||
-rw-r--r-- | admin/themes/clear/themeconf.inc.php | 12 | ||||
-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) | bin | 581 -> 581 bytes | |||
-rw-r--r-- | admin/themes/default/icon/category_children.png (renamed from admin/template/goto/icon/category_children.png) | bin | 962 -> 962 bytes | |||
-rw-r--r-- | admin/themes/default/icon/category_delete.png (renamed from admin/template/goto/icon/category_delete.png) | bin | 960 -> 960 bytes | |||
-rw-r--r-- | admin/themes/default/icon/category_edit.png (renamed from admin/template/goto/icon/category_edit.png) | bin | 1312 -> 1312 bytes | |||
-rw-r--r-- | admin/themes/default/icon/category_elements.png (renamed from admin/template/goto/icon/category_elements.png) | bin | 1044 -> 1044 bytes | |||
-rw-r--r-- | admin/themes/default/icon/category_jump-to.png (renamed from admin/template/goto/icon/category_jump-to.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | admin/themes/default/icon/category_permissions.png (renamed from admin/template/goto/icon/category_permissions.png) | bin | 960 -> 960 bytes | |||
-rw-r--r-- | admin/themes/default/icon/category_representant_random.png (renamed from admin/template/goto/icon/category_representant_random.png) | bin | 1575 -> 1575 bytes | |||
-rw-r--r-- | admin/themes/default/icon/check.png (renamed from admin/template/goto/icon/check.png) | bin | 510 -> 510 bytes | |||
-rw-r--r-- | admin/themes/default/icon/datepicker.png (renamed from admin/template/goto/icon/datepicker.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | admin/themes/default/icon/delete.png (renamed from admin/template/goto/icon/delete.png) | bin | 425 -> 425 bytes | |||
-rw-r--r-- | admin/themes/default/icon/edit_s.png (renamed from admin/template/goto/icon/edit_s.png) | bin | 817 -> 817 bytes | |||
-rw-r--r-- | admin/themes/default/icon/errors.png (renamed from admin/template/goto/icon/errors.png) | bin | 1224 -> 1224 bytes | |||
-rw-r--r-- | admin/themes/default/icon/exit.png (renamed from admin/template/goto/icon/exit.png) | bin | 816 -> 816 bytes | |||
-rw-r--r-- | admin/themes/default/icon/fcbkcomplete_close.gif (renamed from admin/template/goto/icon/fcbkcomplete_close.gif) | bin | 90 -> 90 bytes | |||
-rw-r--r-- | admin/themes/default/icon/help.png (renamed from admin/template/goto/icon/help.png) | bin | 774 -> 774 bytes | |||
-rw-r--r-- | admin/themes/default/icon/home.png (renamed from admin/template/goto/icon/home.png) | bin | 726 -> 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) | bin | 701 -> 701 bytes | |||
-rw-r--r-- | admin/themes/default/icon/note.png (renamed from admin/template/goto/icon/note.png) | bin | 1332 -> 1332 bytes | |||
-rw-r--r-- | admin/themes/default/icon/page_end.png (renamed from admin/template/goto/icon/page_end.png) | bin | 777 -> 777 bytes | |||
-rw-r--r-- | admin/themes/default/icon/page_top.png (renamed from admin/template/goto/icon/page_top.png) | bin | 482 -> 482 bytes | |||
-rw-r--r-- | admin/themes/default/icon/permissions.png (renamed from admin/template/goto/icon/permissions.png) | bin | 421 -> 421 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plug_activate.png (renamed from admin/template/goto/icon/plug_activate.png) | bin | 432 -> 432 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plug_activate_grey.png (renamed from admin/template/goto/icon/plug_activate_grey.png) | bin | 388 -> 388 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plug_deactivate.png (renamed from admin/template/goto/icon/plug_deactivate.png) | bin | 475 -> 475 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plug_deactivate_grey.png (renamed from admin/template/goto/icon/plug_deactivate_grey.png) | bin | 399 -> 399 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plug_delete.png (renamed from admin/template/goto/icon/plug_delete.png) | bin | 425 -> 425 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plug_delete_grey.png (renamed from admin/template/goto/icon/plug_delete_grey.png) | bin | 436 -> 436 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plug_install.png (renamed from admin/template/goto/icon/plug_install.png) | bin | 417 -> 417 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plug_install_grey.png (renamed from admin/template/goto/icon/plug_install_grey.png) | bin | 376 -> 376 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plug_uninstall.png (renamed from admin/template/goto/icon/plug_uninstall.png) | bin | 429 -> 429 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plug_uninstall_grey.png (renamed from admin/template/goto/icon/plug_uninstall_grey.png) | bin | 387 -> 387 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plugin_active.gif (renamed from admin/template/goto/icon/plugin_active.gif) | bin | 108 -> 108 bytes | |||
-rw-r--r-- | admin/themes/default/icon/plugin_inactive.gif (renamed from admin/template/goto/icon/plugin_inactive.gif) | bin | 107 -> 107 bytes | |||
-rw-r--r-- | admin/themes/default/icon/preferences.png (renamed from admin/template/goto/icon/preferences.png) | bin | 768 -> 768 bytes | |||
-rw-r--r-- | admin/themes/default/icon/ranks.png (renamed from admin/template/goto/icon/ranks.png) | bin | 772 -> 772 bytes | |||
-rw-r--r-- | admin/themes/default/icon/ranks_grey.png (renamed from admin/template/goto/icon/ranks_grey.png) | bin | 762 -> 762 bytes | |||
-rw-r--r-- | admin/themes/default/icon/sync_metadata.png (renamed from admin/template/goto/icon/sync_metadata.png) | bin | 1877 -> 1877 bytes | |||
-rw-r--r-- | admin/themes/default/icon/sync_metadata_pink.png (renamed from admin/template/goto/icon/sync_metadata_pink.png) | bin | 1949 -> 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) | bin | 664 -> 664 bytes | |||
-rw-r--r-- | admin/themes/default/icon/uncheck.png (renamed from admin/template/goto/icon/uncheck.png) | bin | 303 -> 303 bytes | |||
-rw-r--r-- | admin/themes/default/icon/validate_s.png (renamed from admin/template/goto/icon/validate_s.png) | bin | 492 -> 492 bytes | |||
-rw-r--r-- | admin/themes/default/icon/virt_category.png (renamed from admin/template/goto/icon/virt_category.png) | bin | 1094 -> 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.tpl | 3 | ||||
-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.tpl | 77 | ||||
-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.tpl | 24 | ||||
-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.css | 10 | ||||
-rw-r--r-- | admin/themes/default/themeconf.inc.php | 8 | ||||
-rw-r--r-- | admin/themes/default/thumbnails.css (renamed from admin/template/goto/thumbnails.css) | 0 | ||||
-rw-r--r-- | admin/themes/roma/images/active_tab.png (renamed from admin/template/goto/theme/roma/images/active_tab.png) | bin | 2696 -> 2696 bytes | |||
-rw-r--r-- | admin/themes/roma/images/active_tab2.png (renamed from admin/template/goto/theme/roma/images/active_tab2.png) | bin | 658 -> 658 bytes | |||
-rw-r--r-- | admin/themes/roma/images/active_tab3.png (renamed from admin/template/goto/theme/roma/images/active_tab3.png) | bin | 106 -> 106 bytes | |||
-rw-r--r-- | admin/themes/roma/images/bottom-left-bg.jpg (renamed from admin/template/goto/theme/roma/images/bottom-left-bg.jpg) | bin | 9014 -> 9014 bytes | |||
-rw-r--r-- | admin/themes/roma/images/external_active.png (renamed from admin/template/goto/theme/roma/images/external_active.png) | bin | 598 -> 598 bytes | |||
-rw-r--r-- | admin/themes/roma/images/external_inactive.png (renamed from admin/template/goto/theme/roma/images/external_inactive.png) | bin | 578 -> 578 bytes | |||
-rw-r--r-- | admin/themes/roma/images/fillet.png (renamed from admin/template/goto/theme/roma/images/fillet.png) | bin | 153 -> 153 bytes | |||
-rw-r--r-- | admin/themes/roma/images/header_msgs-bg.gif (renamed from admin/template/goto/theme/roma/images/header_msgs-bg.gif) | bin | 44 -> 44 bytes | |||
-rw-r--r-- | admin/themes/roma/images/inactive_tab.png (renamed from admin/template/goto/theme/roma/images/inactive_tab.png) | bin | 2248 -> 2248 bytes | |||
-rw-r--r-- | admin/themes/roma/images/inactive_tab2.png (renamed from admin/template/goto/theme/roma/images/inactive_tab2.png) | bin | 589 -> 589 bytes | |||
-rw-r--r-- | admin/themes/roma/images/inactive_tab3.png (renamed from admin/template/goto/theme/roma/images/inactive_tab3.png) | bin | 109 -> 109 bytes | |||
-rw-r--r-- | admin/themes/roma/images/menuBoxBottom_new.png (renamed from admin/template/goto/theme/roma/images/menuBoxBottom_new.png) | bin | 1310 -> 1310 bytes | |||
-rw-r--r-- | admin/themes/roma/images/menuBoxTop_new.png (renamed from admin/template/goto/theme/roma/images/menuBoxTop_new.png) | bin | 1653 -> 1653 bytes | |||
-rw-r--r-- | admin/themes/roma/images/menubar-detail.png (renamed from admin/template/goto/theme/roma/images/menubar-detail.png) | bin | 226 -> 226 bytes | |||
-rw-r--r-- | admin/themes/roma/images/menubar-top.png (renamed from admin/template/goto/theme/roma/images/menubar-top.png) | bin | 1532 -> 1532 bytes | |||
-rw-r--r-- | admin/themes/roma/images/piwigo_logo_sombre_214x100.png (renamed from admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png) | bin | 12154 -> 12154 bytes | |||
-rw-r--r-- | admin/themes/roma/images/quickLocalSync_hover.png (renamed from admin/template/goto/theme/roma/images/quickLocalSync_hover.png) | bin | 34102 -> 34102 bytes | |||
-rw-r--r-- | admin/themes/roma/images/quickLocalSync_inactiv.png (renamed from admin/template/goto/theme/roma/images/quickLocalSync_inactiv.png) | bin | 17397 -> 17397 bytes | |||
-rw-r--r-- | admin/themes/roma/images/resizable-e.gif (renamed from admin/template/goto/theme/roma/images/resizable-e.gif) | bin | 218 -> 218 bytes | |||
-rw-r--r-- | admin/themes/roma/images/resizable-n.gif (renamed from admin/template/goto/theme/roma/images/resizable-n.gif) | bin | 198 -> 198 bytes | |||
-rw-r--r-- | admin/themes/roma/images/resizable-ne.gif (renamed from admin/template/goto/theme/roma/images/resizable-ne.gif) | bin | 280 -> 280 bytes | |||
-rw-r--r-- | admin/themes/roma/images/resizable-nw.gif (renamed from admin/template/goto/theme/roma/images/resizable-nw.gif) | bin | 278 -> 278 bytes | |||
-rw-r--r-- | admin/themes/roma/images/resizable-s.gif (renamed from admin/template/goto/theme/roma/images/resizable-s.gif) | bin | 196 -> 196 bytes | |||
-rw-r--r-- | admin/themes/roma/images/resizable-se.gif (renamed from admin/template/goto/theme/roma/images/resizable-se.gif) | bin | 278 -> 278 bytes | |||
-rw-r--r-- | admin/themes/roma/images/resizable-sw.gif (renamed from admin/template/goto/theme/roma/images/resizable-sw.gif) | bin | 279 -> 279 bytes | |||
-rw-r--r-- | admin/themes/roma/images/resizable-w.gif (renamed from admin/template/goto/theme/roma/images/resizable-w.gif) | bin | 211 -> 211 bytes | |||
-rw-r--r-- | admin/themes/roma/images/top-left-bg.jpg (renamed from admin/template/goto/theme/roma/images/top-left-bg.jpg) | bin | 17092 -> 17092 bytes | |||
-rw-r--r-- | admin/themes/roma/images/transparent.gif (renamed from admin/template/goto/theme/roma/images/transparent.gif) | bin | 43 -> 43 bytes | |||
-rw-r--r-- | admin/themes/roma/index.php (renamed from admin/template/goto/theme/roma/index.php) | 0 | ||||
-rw-r--r-- | admin/themes/roma/mail-css.tpl (renamed from admin/template/goto/theme/roma/mail-css.tpl) | 2 | ||||
-rw-r--r-- | admin/themes/roma/theme.css (renamed from admin/template/goto/theme/roma/theme.css) | 0 | ||||
-rw-r--r-- | admin/themes/roma/themeconf.inc.php | 11 | ||||
-rw-r--r-- | admin/user_list.php | 10 | ||||
-rw-r--r-- | include/common.inc.php | 8 | ||||
-rw-r--r-- | include/config_default.inc.php | 5 | ||||
-rw-r--r-- | include/functions.inc.php | 22 | ||||
-rw-r--r-- | include/functions_mail.inc.php | 76 | ||||
-rw-r--r-- | include/functions_user.inc.php | 10 | ||||
-rw-r--r-- | include/template.class.php | 64 | ||||
-rw-r--r-- | install.php | 2 | ||||
-rw-r--r-- | install/db/84-database.php | 75 | ||||
-rw-r--r-- | install/php5_apache_configuration.php | 7 | ||||
-rw-r--r-- | install/piwigo_structure-mysql.sql | 2 | ||||
-rw-r--r-- | install/piwigo_structure-pdo-sqlite.sql | 2 | ||||
-rw-r--r-- | install/piwigo_structure-pgsql.sql | 2 | ||||
-rw-r--r-- | install/piwigo_structure-sqlite.sql | 2 | ||||
-rw-r--r-- | profile.php | 11 | ||||
-rw-r--r-- | template-common/csshover.htc | 120 | ||||
-rw-r--r-- | template-common/default-layout.css | 41 | ||||
-rw-r--r-- | template-common/inputfix.htc | 42 | ||||
-rw-r--r-- | template-common/tooltipfix.htc | 31 | ||||
-rw-r--r-- | template/default/include/datepicker.inc.tpl | 24 | ||||
-rw-r--r-- | template/yoga/theme/Sylvia/themeconf.inc.php | 14 | ||||
-rw-r--r-- | template/yoga/theme/clear/themeconf.inc.php | 10 | ||||
-rw-r--r-- | template/yoga/theme/dark/themeconf.inc.php | 10 | ||||
-rw-r--r-- | template/yoga/theme/p0w0/themeconf.inc.php | 10 | ||||
-rw-r--r-- | themes/Sylvia/icon/add_tag.png (renamed from template/yoga/theme/Sylvia/icon/add_tag.png) | bin | 193 -> 193 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/caddie_add.png (renamed from template/yoga/theme/Sylvia/icon/caddie_add.png) | bin | 679 -> 679 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/calendar.png (renamed from template/yoga/theme/Sylvia/icon/calendar.png) | bin | 798 -> 798 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/calendar_created.png (renamed from template/yoga/theme/Sylvia/icon/calendar_created.png) | bin | 1155 -> 1155 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/category_edit.png (renamed from template/yoga/theme/Sylvia/icon/category_edit.png) | bin | 1312 -> 1312 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/datepicker.png (renamed from template/yoga/theme/Sylvia/icon/datepicker.png) | bin | 430 -> 430 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/dec_period.png (renamed from template/yoga/theme/Sylvia/icon/dec_period.png) | bin | 637 -> 637 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/dec_period_unactive.png (renamed from template/yoga/theme/Sylvia/icon/dec_period_unactive.png) | bin | 1002 -> 1002 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/del_favorite.png (renamed from template/yoga/theme/Sylvia/icon/del_favorite.png) | bin | 872 -> 872 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/delete.png (renamed from template/yoga/theme/Sylvia/icon/delete.png) | bin | 425 -> 425 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/edit.png (renamed from template/yoga/icon/edit.png) | bin | 970 -> 970 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/errors.png (renamed from template/yoga/theme/Sylvia/icon/errors.png) | bin | 1224 -> 1224 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/exit.png (renamed from template/yoga/theme/Sylvia/icon/exit.png) | bin | 816 -> 816 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/favicon.ico (renamed from template-common/favicon.ico) | bin | 1406 -> 1406 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/favorite.png (renamed from template/yoga/theme/Sylvia/icon/favorite.png) | bin | 901 -> 901 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/first.png (renamed from template/yoga/theme/Sylvia/icon/first.png) | bin | 880 -> 880 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/first_unactive.png (renamed from template/yoga/theme/Sylvia/icon/first_unactive.png) | bin | 893 -> 893 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/flat.png (renamed from template/yoga/theme/Sylvia/icon/flat.png) | bin | 462 -> 462 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/help.png (renamed from template/yoga/theme/Sylvia/icon/help.png) | bin | 774 -> 774 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/home.png (renamed from template/yoga/theme/Sylvia/icon/home.png) | bin | 726 -> 726 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/inc_period.png (renamed from template/yoga/theme/Sylvia/icon/inc_period.png) | bin | 635 -> 635 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/inc_period_unactive.png (renamed from template/yoga/theme/Sylvia/icon/inc_period_unactive.png) | bin | 987 -> 987 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/index.php (renamed from template-common/index.php) | 0 | ||||
-rw-r--r-- | themes/Sylvia/icon/infos.png (renamed from template/yoga/theme/Sylvia/icon/infos.png) | bin | 1349 -> 1349 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/last.png (renamed from template/yoga/theme/Sylvia/icon/last.png) | bin | 858 -> 858 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/last_unactive.png (renamed from template/yoga/theme/Sylvia/icon/last_unactive.png) | bin | 857 -> 857 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/left.png (renamed from template/yoga/theme/Sylvia/icon/left.png) | bin | 618 -> 618 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/left_unactive.png (renamed from template/yoga/theme/Sylvia/icon/left_unactive.png) | bin | 604 -> 604 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/lost_password.png (renamed from template/yoga/theme/Sylvia/icon/lost_password.png) | bin | 1052 -> 1052 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/metadata.png (renamed from template/yoga/theme/Sylvia/icon/metadata.png) | bin | 1866 -> 1866 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/metadata_grey.png (renamed from template/yoga/theme/Sylvia/icon/metadata_grey.png) | bin | 1764 -> 1764 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/mimetypes/avi.png (renamed from template/yoga/theme/Sylvia/icon/mimetypes/avi.png) | bin | 3002 -> 3002 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/mimetypes/index.php (renamed from template/index.php) | 0 | ||||
-rw-r--r-- | themes/Sylvia/icon/mimetypes/mp3.png (renamed from template/yoga/theme/Sylvia/icon/mimetypes/mp3.png) | bin | 1350 -> 1350 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/mimetypes/mpg.png (renamed from template/yoga/theme/Sylvia/icon/mimetypes/mpg.png) | bin | 3041 -> 3041 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/mimetypes/ogg.png (renamed from template/yoga/theme/Sylvia/icon/mimetypes/ogg.png) | bin | 1312 -> 1312 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/mimetypes/zip.png (renamed from template/yoga/theme/Sylvia/icon/mimetypes/zip.png) | bin | 1753 -> 1753 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/normal_mode.png (renamed from template/yoga/theme/Sylvia/icon/normal_mode.png) | bin | 677 -> 677 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/note.png (renamed from template/yoga/theme/Sylvia/icon/note.png) | bin | 1332 -> 1332 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/pause.png (renamed from template/yoga/theme/Sylvia/icon/pause.png) | bin | 577 -> 577 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/pause_selected.png (renamed from template/yoga/theme/Sylvia/icon/pause_selected.png) | bin | 577 -> 577 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/pause_unactive.png (renamed from template/yoga/theme/Sylvia/icon/pause_unactive.png) | bin | 579 -> 579 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/play.png (renamed from template/yoga/theme/Sylvia/icon/play.png) | bin | 367 -> 367 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/preferences.png (renamed from template/yoga/theme/Sylvia/icon/preferences.png) | bin | 768 -> 768 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/rating-stars.gif (renamed from template/yoga/theme/Sylvia/icon/rating-stars.gif) | bin | 171 -> 171 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/rating-stars.png (renamed from template/yoga/theme/Sylvia/icon/rating-stars.png) | bin | 521 -> 521 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/recent.png (renamed from template/yoga/theme/Sylvia/icon/recent.png) | bin | 703 -> 703 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/recent_by_child.png (renamed from template/yoga/theme/Sylvia/icon/recent_by_child.png) | bin | 777 -> 777 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/recent_s.png (renamed from template/yoga/theme/Sylvia/icon/recent_s.png) | bin | 956 -> 956 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/recent_s_by_child.png (renamed from template/yoga/theme/Sylvia/icon/recent_s_by_child.png) | bin | 1203 -> 1203 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/register.png (renamed from template/yoga/theme/Sylvia/icon/register.png) | bin | 802 -> 802 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/remove_s.png (renamed from template/yoga/theme/Sylvia/icon/remove_s.png) | bin | 383 -> 383 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/representative.png (renamed from template/yoga/theme/Sylvia/icon/representative.png) | bin | 1055 -> 1055 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/right.png (renamed from template/yoga/theme/Sylvia/icon/right.png) | bin | 612 -> 612 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/right_unactive.png (renamed from template/yoga/theme/Sylvia/icon/right_unactive.png) | bin | 611 -> 611 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/save.png (renamed from template/yoga/theme/Sylvia/icon/save.png) | bin | 771 -> 771 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/save_selected.png (renamed from template/yoga/theme/Sylvia/icon/save_selected.png) | bin | 700 -> 700 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/search_rules.png (renamed from template/yoga/theme/Sylvia/icon/search_rules.png) | bin | 960 -> 960 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/slideshow.png (renamed from template/yoga/theme/Sylvia/icon/slideshow.png) | bin | 803 -> 803 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/slideshow_selected.png (renamed from template/yoga/theme/Sylvia/icon/slideshow_selected.png) | bin | 829 -> 829 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/start_filter.png (renamed from template/yoga/theme/Sylvia/icon/start_filter.png) | bin | 1218 -> 1218 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/start_repeat.png (renamed from template/yoga/theme/Sylvia/icon/start_repeat.png) | bin | 954 -> 954 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/start_repeat_grey.png (renamed from template/yoga/theme/Sylvia/icon/start_repeat_grey.png) | bin | 943 -> 943 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/start_slideshow.png (renamed from template/yoga/theme/Sylvia/icon/start_slideshow.png) | bin | 829 -> 829 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/stop_filter.png (renamed from template/yoga/theme/Sylvia/icon/stop_filter.png) | bin | 852 -> 852 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/stop_repeat.png (renamed from template/yoga/theme/Sylvia/icon/stop_repeat.png) | bin | 987 -> 987 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/stop_repeat_pink.png (renamed from template/yoga/theme/Sylvia/icon/stop_repeat_pink.png) | bin | 941 -> 941 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/stop_selected.png (renamed from template/yoga/theme/Sylvia/icon/stop_selected.png) | bin | 559 -> 559 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/stop_slideshow.png (renamed from template/yoga/theme/Sylvia/icon/stop_slideshow.png) | bin | 454 -> 454 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/stop_unactive.png (renamed from template/yoga/theme/Sylvia/icon/stop_unactive.png) | bin | 561 -> 561 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/tag_cloud.png (renamed from template/yoga/theme/Sylvia/icon/tag_cloud.png) | bin | 856 -> 856 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/tag_cloud_grey.png (renamed from template/yoga/theme/Sylvia/icon/tag_cloud_grey.png) | bin | 827 -> 827 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/tag_letters.png (renamed from template/yoga/theme/Sylvia/icon/tag_letters.png) | bin | 1324 -> 1324 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/tag_letters_grey.png (renamed from template/yoga/theme/Sylvia/icon/tag_letters_grey.png) | bin | 1005 -> 1005 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/tag_letters_pink.png (renamed from template/yoga/theme/Sylvia/icon/tag_letters_pink.png) | bin | 1007 -> 1007 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/up.png (renamed from template/yoga/theme/Sylvia/icon/up.png) | bin | 606 -> 606 bytes | |||
-rw-r--r-- | themes/Sylvia/icon/validate_s.png (renamed from template/yoga/theme/Sylvia/icon/validate_s.png) | bin | 492 -> 492 bytes | |||
-rw-r--r-- | themes/Sylvia/images/bottom-left-bg.jpg (renamed from template/yoga/theme/Sylvia/images/bottom-left-bg.jpg) | bin | 9014 -> 9014 bytes | |||
-rw-r--r-- | themes/Sylvia/images/cat_bottom-left.gif (renamed from template/yoga/theme/Sylvia/images/cat_bottom-left.gif) | bin | 1548 -> 1548 bytes | |||
-rw-r--r-- | themes/Sylvia/images/cat_bottom-right.gif (renamed from template/yoga/theme/Sylvia/images/cat_bottom-right.gif) | bin | 2209 -> 2209 bytes | |||
-rw-r--r-- | themes/Sylvia/images/cat_top-left.gif (renamed from template/yoga/theme/Sylvia/images/cat_top-left.gif) | bin | 1006 -> 1006 bytes | |||
-rw-r--r-- | themes/Sylvia/images/cat_top-right.gif (renamed from template/yoga/theme/Sylvia/images/cat_top-right.gif) | bin | 3449 -> 3449 bytes | |||
-rw-r--r-- | themes/Sylvia/images/fillet.gif (renamed from template/yoga/theme/Sylvia/images/fillet.gif) | bin | 809 -> 809 bytes | |||
-rw-r--r-- | themes/Sylvia/images/header_msgs-bg.gif (renamed from template/yoga/theme/Sylvia/images/header_msgs-bg.gif) | bin | 44 -> 44 bytes | |||
-rw-r--r-- | themes/Sylvia/images/menuBox_bottom.gif (renamed from template/yoga/theme/Sylvia/images/menuBox_bottom.gif) | bin | 1347 -> 1347 bytes | |||
-rw-r--r-- | themes/Sylvia/images/menuBox_sides.gif (renamed from template/yoga/theme/Sylvia/images/menuBox_sides.gif) | bin | 838 -> 838 bytes | |||
-rw-r--r-- | themes/Sylvia/images/menuBox_top.gif (renamed from template/yoga/theme/Sylvia/images/menuBox_top.gif) | bin | 1320 -> 1320 bytes | |||
-rw-r--r-- | themes/Sylvia/images/menuId_bottom.gif (renamed from template/yoga/theme/Sylvia/images/menuId_bottom.gif) | bin | 831 -> 831 bytes | |||
-rw-r--r-- | themes/Sylvia/images/menuId_sides.gif (renamed from template/yoga/theme/Sylvia/images/menuId_sides.gif) | bin | 79 -> 79 bytes | |||
-rw-r--r-- | themes/Sylvia/images/menuId_top.gif (renamed from template/yoga/theme/Sylvia/images/menuId_top.gif) | bin | 894 -> 894 bytes | |||
-rw-r--r-- | themes/Sylvia/images/top-left-bg.jpg (renamed from template/yoga/theme/Sylvia/images/top-left-bg.jpg) | bin | 17092 -> 17092 bytes | |||
-rw-r--r-- | themes/Sylvia/images/transparent.gif (renamed from template/yoga/theme/Sylvia/images/transparent.gif) | bin | 85 -> 85 bytes | |||
-rw-r--r-- | themes/Sylvia/index.php (renamed from template/yoga/icon/admin/index.php) | 0 | ||||
-rw-r--r-- | themes/Sylvia/local_head.tpl | 3 | ||||
-rw-r--r-- | themes/Sylvia/mail-css.tpl (renamed from template/yoga/theme/Sylvia/mail-css.tpl) | 2 | ||||
-rw-r--r-- | themes/Sylvia/theme-ie.css (renamed from template/yoga/theme/Sylvia/theme-ie.css) | 0 | ||||
-rw-r--r-- | themes/Sylvia/theme.css (renamed from template/yoga/theme/Sylvia/theme.css) | 0 | ||||
-rw-r--r-- | themes/Sylvia/themeconf.inc.php | 8 | ||||
-rw-r--r-- | themes/clear/index.php (renamed from template/yoga/icon/index.php) | 0 | ||||
-rw-r--r-- | themes/clear/mail-css.tpl (renamed from template/yoga/theme/clear/mail-css.tpl) | 0 | ||||
-rw-r--r-- | themes/clear/theme.css (renamed from template/yoga/theme/clear/theme.css) | 0 | ||||
-rw-r--r-- | themes/clear/themeconf.inc.php | 6 | ||||
-rw-r--r-- | themes/dark/images/index.php (renamed from template/yoga/icon/mimetypes/index.php) | 0 | ||||
-rw-r--r-- | themes/dark/images/tableh1_bg.png (renamed from template/yoga/theme/dark/images/tableh1_bg.png) | bin | 271 -> 271 bytes | |||
-rw-r--r-- | themes/dark/images/tableh2_bg.png (renamed from template/yoga/theme/dark/images/tableh2_bg.png) | bin | 307 -> 307 bytes | |||
-rw-r--r-- | themes/dark/index.php (renamed from template/yoga/index.php) | 0 | ||||
-rw-r--r-- | themes/dark/mail-css.tpl (renamed from template/yoga/theme/dark/mail-css.tpl) | 2 | ||||
-rw-r--r-- | themes/dark/theme.css (renamed from template/yoga/theme/dark/theme.css) | 0 | ||||
-rw-r--r-- | themes/dark/themeconf.inc.php | 6 | ||||
-rw-r--r-- | themes/default/content.css (renamed from template/yoga/content.css) | 0 | ||||
-rw-r--r-- | themes/default/default-colors.css (renamed from template/yoga/default-colors.css) | 0 | ||||
-rw-r--r-- | themes/default/default-layout.css (renamed from template/yoga/default-layout.css) | 40 | ||||
-rw-r--r-- | themes/default/fix-ie5-ie6.css (renamed from template/yoga/fix-ie5-ie6.css) | 0 | ||||
-rw-r--r-- | themes/default/fix-ie7.css (renamed from template/yoga/fix-ie7.css) | 0 | ||||
-rw-r--r-- | themes/default/fix-khtml.css (renamed from template/yoga/fix-khtml.css) | 0 | ||||
-rw-r--r-- | themes/default/icon/add_tag.png (renamed from template/yoga/icon/add_tag.png) | bin | 59 -> 59 bytes | |||
-rw-r--r-- | themes/default/icon/admin/errors.png (renamed from template/yoga/icon/admin/errors.png) | bin | 3249 -> 3249 bytes | |||
-rw-r--r-- | themes/default/icon/admin/index.php (renamed from template/yoga/mail/index.php) | 0 | ||||
-rw-r--r-- | themes/default/icon/admin/infos.png (renamed from template/yoga/icon/admin/infos.png) | bin | 2250 -> 2250 bytes | |||
-rw-r--r-- | themes/default/icon/caddie_add.png (renamed from template/yoga/icon/caddie_add.png) | bin | 1186 -> 1186 bytes | |||
-rw-r--r-- | themes/default/icon/calendar.png (renamed from template/yoga/icon/calendar.png) | bin | 844 -> 844 bytes | |||
-rw-r--r-- | themes/default/icon/calendar_created.png (renamed from template/yoga/icon/calendar_created.png) | bin | 1230 -> 1230 bytes | |||
-rw-r--r-- | themes/default/icon/category_children.png (renamed from template/yoga/icon/category_children.png) | bin | 1554 -> 1554 bytes | |||
-rw-r--r-- | themes/default/icon/category_edit.png (renamed from template/yoga/icon/category_edit.png) | bin | 1606 -> 1606 bytes | |||
-rw-r--r-- | themes/default/icon/category_representant_random.png (renamed from template/yoga/icon/category_representant_random.png) | bin | 3171 -> 3171 bytes | |||
-rw-r--r-- | themes/default/icon/datepicker.png (renamed from template/yoga/icon/datepicker.png) | bin | 1047 -> 1047 bytes | |||
-rw-r--r-- | themes/default/icon/dec_period.png (renamed from template/yoga/icon/dec_period.png) | bin | 1230 -> 1230 bytes | |||
-rw-r--r-- | themes/default/icon/dec_period_unactive.png (renamed from template/yoga/icon/dec_period_unactive.png) | bin | 1042 -> 1042 bytes | |||
-rw-r--r-- | themes/default/icon/del_all_favorites.png (renamed from template/yoga/icon/del_all_favorites.png) | bin | 1424 -> 1424 bytes | |||
-rw-r--r-- | themes/default/icon/del_favorite.png (renamed from template/yoga/icon/del_favorite.png) | bin | 1424 -> 1424 bytes | |||
-rw-r--r-- | themes/default/icon/delete.png (renamed from template/yoga/icon/delete.png) | bin | 778 -> 778 bytes | |||
-rw-r--r-- | themes/default/icon/edit.png (renamed from template/yoga/theme/Sylvia/icon/edit.png) | bin | 970 -> 970 bytes | |||
-rw-r--r-- | themes/default/icon/exit.png (renamed from template/yoga/icon/exit.png) | bin | 1432 -> 1432 bytes | |||
-rw-r--r-- | themes/default/icon/favicon.ico | bin | 0 -> 1406 bytes | |||
-rw-r--r-- | themes/default/icon/favorite.png (renamed from template/yoga/icon/favorite.png) | bin | 1457 -> 1457 bytes | |||
-rw-r--r-- | themes/default/icon/first.png (renamed from template/yoga/icon/first.png) | bin | 1645 -> 1645 bytes | |||
-rw-r--r-- | themes/default/icon/first_unactive.png (renamed from template/yoga/icon/first_unactive.png) | bin | 1573 -> 1573 bytes | |||
-rw-r--r-- | themes/default/icon/flat.png (renamed from template/yoga/icon/flat.png) | bin | 754 -> 754 bytes | |||
-rw-r--r-- | themes/default/icon/help.png (renamed from template/yoga/icon/help.png) | bin | 1994 -> 1994 bytes | |||
-rw-r--r-- | themes/default/icon/home.png (renamed from template/yoga/icon/home.png) | bin | 1591 -> 1591 bytes | |||
-rw-r--r-- | themes/default/icon/inc_period.png (renamed from template/yoga/icon/inc_period.png) | bin | 1209 -> 1209 bytes | |||
-rw-r--r-- | themes/default/icon/inc_period_unactive.png (renamed from template/yoga/icon/inc_period_unactive.png) | bin | 1039 -> 1039 bytes | |||
-rw-r--r-- | themes/default/icon/index.php (renamed from template/yoga/mail/text/html/images/index.php) | 0 | ||||
-rw-r--r-- | themes/default/icon/last.png (renamed from template/yoga/icon/last.png) | bin | 1642 -> 1642 bytes | |||
-rw-r--r-- | themes/default/icon/last_unactive.png (renamed from template/yoga/icon/last_unactive.png) | bin | 1556 -> 1556 bytes | |||
-rw-r--r-- | themes/default/icon/left.png (renamed from template/yoga/icon/left.png) | bin | 1644 -> 1644 bytes | |||
-rw-r--r-- | themes/default/icon/left_unactive.png (renamed from template/yoga/icon/left_unactive.png) | bin | 1574 -> 1574 bytes | |||
-rw-r--r-- | themes/default/icon/lost_password.png (renamed from template/yoga/icon/lost_password.png) | bin | 1717 -> 1717 bytes | |||
-rw-r--r-- | themes/default/icon/metadata.png (renamed from template/yoga/icon/metadata.png) | bin | 1520 -> 1520 bytes | |||
-rw-r--r-- | themes/default/icon/mimetypes/avi.png (renamed from template/yoga/icon/mimetypes/avi.png) | bin | 4284 -> 4284 bytes | |||
-rw-r--r-- | themes/default/icon/mimetypes/index.php (renamed from template/yoga/mail/text/html/index.php) | 0 | ||||
-rw-r--r-- | themes/default/icon/mimetypes/mp3.png (renamed from template/yoga/icon/mimetypes/mp3.png) | bin | 3902 -> 3902 bytes | |||
-rw-r--r-- | themes/default/icon/mimetypes/mpg.png (renamed from template/yoga/icon/mimetypes/mpg.png) | bin | 4271 -> 4271 bytes | |||
-rw-r--r-- | themes/default/icon/mimetypes/ogg.png (renamed from template/yoga/icon/mimetypes/ogg.png) | bin | 4063 -> 4063 bytes | |||
-rw-r--r-- | themes/default/icon/mimetypes/zip.png (renamed from template/yoga/icon/mimetypes/zip.png) | bin | 3721 -> 3721 bytes | |||
-rw-r--r-- | themes/default/icon/normal_mode.png (renamed from template/yoga/icon/normal_mode.png) | bin | 360 -> 360 bytes | |||
-rw-r--r-- | themes/default/icon/note.png (renamed from template/yoga/icon/note.png) | bin | 1862 -> 1862 bytes | |||
-rw-r--r-- | themes/default/icon/pause.png (renamed from template/yoga/icon/pause.png) | bin | 1597 -> 1597 bytes | |||
-rw-r--r-- | themes/default/icon/play.png (renamed from template/yoga/icon/play.png) | bin | 1568 -> 1568 bytes | |||
-rw-r--r-- | themes/default/icon/preferences.png (renamed from template/yoga/icon/preferences.png) | bin | 1606 -> 1606 bytes | |||
-rw-r--r-- | themes/default/icon/rating-stars.gif (renamed from template/yoga/icon/rating-stars.gif) | bin | 251 -> 251 bytes | |||
-rw-r--r-- | themes/default/icon/recent.png (renamed from template/yoga/icon/recent.png) | bin | 757 -> 757 bytes | |||
-rw-r--r-- | themes/default/icon/recent_by_child.png (renamed from template/yoga/icon/recent_by_child.png) | bin | 738 -> 738 bytes | |||
-rw-r--r-- | themes/default/icon/register.png (renamed from template/yoga/icon/register.png) | bin | 1445 -> 1445 bytes | |||
-rw-r--r-- | themes/default/icon/remove_s.png (renamed from template/yoga/icon/remove_s.png) | bin | 451 -> 451 bytes | |||
-rw-r--r-- | themes/default/icon/representative.png (renamed from template/yoga/icon/representative.png) | bin | 1556 -> 1556 bytes | |||
-rw-r--r-- | themes/default/icon/right.png (renamed from template/yoga/icon/right.png) | bin | 1661 -> 1661 bytes | |||
-rw-r--r-- | themes/default/icon/right_unactive.png (renamed from template/yoga/icon/right_unactive.png) | bin | 1556 -> 1556 bytes | |||
-rw-r--r-- | themes/default/icon/save.png (renamed from template/yoga/icon/save.png) | bin | 961 -> 961 bytes | |||
-rw-r--r-- | themes/default/icon/search_rules.png (renamed from template/yoga/icon/search_rules.png) | bin | 1509 -> 1509 bytes | |||
-rw-r--r-- | themes/default/icon/start_filter.png (renamed from template/yoga/icon/start_filter.png) | bin | 1064 -> 1064 bytes | |||
-rw-r--r-- | themes/default/icon/start_repeat.png (renamed from template/yoga/icon/start_repeat.png) | bin | 1691 -> 1691 bytes | |||
-rw-r--r-- | themes/default/icon/start_slideshow.png (renamed from template/yoga/icon/start_slideshow.png) | bin | 1344 -> 1344 bytes | |||
-rw-r--r-- | themes/default/icon/stop_filter.png (renamed from template/yoga/icon/stop_filter.png) | bin | 1083 -> 1083 bytes | |||
-rw-r--r-- | themes/default/icon/stop_repeat.png (renamed from template/yoga/icon/stop_repeat.png) | bin | 1683 -> 1683 bytes | |||
-rw-r--r-- | themes/default/icon/stop_slideshow.png (renamed from template/yoga/icon/stop_slideshow.png) | bin | 1149 -> 1149 bytes | |||
-rw-r--r-- | themes/default/icon/tag_cloud.png (renamed from template/yoga/icon/tag_cloud.png) | bin | 1165 -> 1165 bytes | |||
-rw-r--r-- | themes/default/icon/tag_letters.png (renamed from template/yoga/icon/tag_letters.png) | bin | 882 -> 882 bytes | |||
-rw-r--r-- | themes/default/icon/up.png (renamed from template/yoga/icon/up.png) | bin | 1641 -> 1641 bytes | |||
-rw-r--r-- | themes/default/icon/validate_s.png (renamed from template/yoga/icon/validate_s.png) | bin | 315 -> 315 bytes | |||
-rw-r--r-- | themes/default/index.php (renamed from template/yoga/mail/text/index.php) | 0 | ||||
-rw-r--r-- | themes/default/js/datepicker.js (renamed from template-common/datepicker.js) | 0 | ||||
-rw-r--r-- | themes/default/js/jquery.js (renamed from template-common/lib/jquery.js) | 0 | ||||
-rw-r--r-- | themes/default/js/jquery.packed.js (renamed from template-common/lib/jquery.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/jquery.tablednd.js (renamed from template-common/lib/jquery.tablednd.js) | 0 | ||||
-rw-r--r-- | themes/default/js/plugins/jquery.autogrow-textarea.js (renamed from template-common/lib/plugins/jquery.autogrow-textarea.js) | 0 | ||||
-rw-r--r-- | themes/default/js/plugins/jquery.cluetip.js (renamed from template-common/lib/plugins/jquery.cluetip.js) | 0 | ||||
-rw-r--r-- | themes/default/js/plugins/jquery.cluetip.packed.js (renamed from template-common/lib/plugins/jquery.cluetip.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/plugins/jquery.fcbkcomplete.js (renamed from template-common/lib/plugins/jquery.fcbkcomplete.js) | 0 | ||||
-rw-r--r-- | themes/default/js/plugins/jquery.tipTip.minified.js (renamed from template-common/lib/plugins/jquery.tipTip.minified.js) | 0 | ||||
-rw-r--r-- | themes/default/js/pngfix.js (renamed from template-common/pngfix.js) | 0 | ||||
-rw-r--r-- | themes/default/js/rating.js (renamed from template/yoga/rating.js) | 0 | ||||
-rw-r--r-- | themes/default/js/scripts.js (renamed from template-common/scripts.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.blind.js (renamed from template-common/lib/ui/effects.blind.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.bounce.js (renamed from template-common/lib/ui/effects.bounce.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.clip.js (renamed from template-common/lib/ui/effects.clip.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.core.js (renamed from template-common/lib/ui/effects.core.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.drop.js (renamed from template-common/lib/ui/effects.drop.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.explode.js (renamed from template-common/lib/ui/effects.explode.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.fold.js (renamed from template-common/lib/ui/effects.fold.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.highlight.js (renamed from template-common/lib/ui/effects.highlight.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.pulsate.js (renamed from template-common/lib/ui/effects.pulsate.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.scale.js (renamed from template-common/lib/ui/effects.scale.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.shake.js (renamed from template-common/lib/ui/effects.shake.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.slide.js (renamed from template-common/lib/ui/effects.slide.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/effects.transfer.js (renamed from template-common/lib/ui/effects.transfer.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-ar.js (renamed from template-common/lib/ui/i18n/ui.datepicker-ar.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-bg.js (renamed from template-common/lib/ui/i18n/ui.datepicker-bg.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-ca.js (renamed from template-common/lib/ui/i18n/ui.datepicker-ca.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-cs.js (renamed from template-common/lib/ui/i18n/ui.datepicker-cs.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-da.js (renamed from template-common/lib/ui/i18n/ui.datepicker-da.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-de.js (renamed from template-common/lib/ui/i18n/ui.datepicker-de.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-es.js (renamed from template-common/lib/ui/i18n/ui.datepicker-es.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-fi.js (renamed from template-common/lib/ui/i18n/ui.datepicker-fi.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-fr.js (renamed from template-common/lib/ui/i18n/ui.datepicker-fr.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-he.js (renamed from template-common/lib/ui/i18n/ui.datepicker-he.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-hu.js (renamed from template-common/lib/ui/i18n/ui.datepicker-hu.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-hy.js (renamed from template-common/lib/ui/i18n/ui.datepicker-hy.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-id.js (renamed from template-common/lib/ui/i18n/ui.datepicker-id.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-is.js (renamed from template-common/lib/ui/i18n/ui.datepicker-is.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-it.js (renamed from template-common/lib/ui/i18n/ui.datepicker-it.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-ja.js (renamed from template-common/lib/ui/i18n/ui.datepicker-ja.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-ko.js (renamed from template-common/lib/ui/i18n/ui.datepicker-ko.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-lt.js (renamed from template-common/lib/ui/i18n/ui.datepicker-lt.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-lv.js (renamed from template-common/lib/ui/i18n/ui.datepicker-lv.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-nl.js (renamed from template-common/lib/ui/i18n/ui.datepicker-nl.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-no.js (renamed from template-common/lib/ui/i18n/ui.datepicker-no.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-pl.js (renamed from template-common/lib/ui/i18n/ui.datepicker-pl.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-pt-BR.js (renamed from template-common/lib/ui/i18n/ui.datepicker-pt-BR.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-ro.js (renamed from template-common/lib/ui/i18n/ui.datepicker-ro.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-ru.js (renamed from template-common/lib/ui/i18n/ui.datepicker-ru.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-sk.js (renamed from template-common/lib/ui/i18n/ui.datepicker-sk.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-sv.js (renamed from template-common/lib/ui/i18n/ui.datepicker-sv.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-th.js (renamed from template-common/lib/ui/i18n/ui.datepicker-th.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-tr.js (renamed from template-common/lib/ui/i18n/ui.datepicker-tr.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-uk.js (renamed from template-common/lib/ui/i18n/ui.datepicker-uk.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-zh-CN.js (renamed from template-common/lib/ui/i18n/ui.datepicker-zh-CN.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/i18n/ui.datepicker-zh-TW.js (renamed from template-common/lib/ui/i18n/ui.datepicker-zh-TW.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/jquery.ui.all.js (renamed from template-common/lib/ui/jquery.ui.all.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.blind.min.js (renamed from template-common/lib/ui/minified/effects.blind.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.bounce.min.js (renamed from template-common/lib/ui/minified/effects.bounce.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.clip.min.js (renamed from template-common/lib/ui/minified/effects.clip.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.core.min.js (renamed from template-common/lib/ui/minified/effects.core.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.drop.min.js (renamed from template-common/lib/ui/minified/effects.drop.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.explode.min.js (renamed from template-common/lib/ui/minified/effects.explode.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.fold.min.js (renamed from template-common/lib/ui/minified/effects.fold.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.highlight.min.js (renamed from template-common/lib/ui/minified/effects.highlight.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.pulsate.min.js (renamed from template-common/lib/ui/minified/effects.pulsate.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.scale.min.js (renamed from template-common/lib/ui/minified/effects.scale.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.shake.min.js (renamed from template-common/lib/ui/minified/effects.shake.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.slide.min.js (renamed from template-common/lib/ui/minified/effects.slide.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/effects.transfer.min.js (renamed from template-common/lib/ui/minified/effects.transfer.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/ui.accordion.min.js (renamed from template-common/lib/ui/minified/ui.accordion.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/ui.core.min.js (renamed from template-common/lib/ui/minified/ui.core.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/ui.datepicker.min.js (renamed from template-common/lib/ui/minified/ui.datepicker.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/ui.dialog.min.js (renamed from template-common/lib/ui/minified/ui.dialog.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/ui.draggable.min.js (renamed from template-common/lib/ui/minified/ui.draggable.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/ui.droppable.min.js (renamed from template-common/lib/ui/minified/ui.droppable.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/ui.resizable.min.js (renamed from template-common/lib/ui/minified/ui.resizable.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/ui.selectable.min.js (renamed from template-common/lib/ui/minified/ui.selectable.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/ui.slider.min.js (renamed from template-common/lib/ui/minified/ui.slider.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/ui.sortable.min.js (renamed from template-common/lib/ui/minified/ui.sortable.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/minified/ui.tabs.min.js (renamed from template-common/lib/ui/minified/ui.tabs.min.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.blind.packed.js (renamed from template-common/lib/ui/packed/effects.blind.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.bounce.packed.js (renamed from template-common/lib/ui/packed/effects.bounce.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.clip.packed.js (renamed from template-common/lib/ui/packed/effects.clip.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.core.packed.js (renamed from template-common/lib/ui/packed/effects.core.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.drop.packed.js (renamed from template-common/lib/ui/packed/effects.drop.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.explode.packed.js (renamed from template-common/lib/ui/packed/effects.explode.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.fold.packed.js (renamed from template-common/lib/ui/packed/effects.fold.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.highlight.packed.js (renamed from template-common/lib/ui/packed/effects.highlight.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.pulsate.packed.js (renamed from template-common/lib/ui/packed/effects.pulsate.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.scale.packed.js (renamed from template-common/lib/ui/packed/effects.scale.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.shake.packed.js (renamed from template-common/lib/ui/packed/effects.shake.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.slide.packed.js (renamed from template-common/lib/ui/packed/effects.slide.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/effects.transfer.packed.js (renamed from template-common/lib/ui/packed/effects.transfer.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/ui.accordion.packed.js (renamed from template-common/lib/ui/packed/ui.accordion.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/ui.core.packed.js (renamed from template-common/lib/ui/packed/ui.core.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/ui.datepicker.packed.js (renamed from template-common/lib/ui/packed/ui.datepicker.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/ui.dialog.packed.js (renamed from template-common/lib/ui/packed/ui.dialog.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/ui.draggable.packed.js (renamed from template-common/lib/ui/packed/ui.draggable.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/ui.droppable.packed.js (renamed from template-common/lib/ui/packed/ui.droppable.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/ui.resizable.packed.js (renamed from template-common/lib/ui/packed/ui.resizable.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/ui.selectable.packed.js (renamed from template-common/lib/ui/packed/ui.selectable.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/ui.slider.packed.js (renamed from template-common/lib/ui/packed/ui.slider.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/ui.sortable.packed.js (renamed from template-common/lib/ui/packed/ui.sortable.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/packed/ui.tabs.packed.js (renamed from template-common/lib/ui/packed/ui.tabs.packed.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/theme/ui.datepicker.css (renamed from template-common/lib/ui/theme/ui.datepicker.css) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/ui.accordion.js (renamed from template-common/lib/ui/ui.accordion.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/ui.core.js (renamed from template-common/lib/ui/ui.core.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/ui.datepicker.js (renamed from template-common/lib/ui/ui.datepicker.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/ui.dialog.js (renamed from template-common/lib/ui/ui.dialog.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/ui.draggable.js (renamed from template-common/lib/ui/ui.draggable.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/ui.droppable.js (renamed from template-common/lib/ui/ui.droppable.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/ui.resizable.js (renamed from template-common/lib/ui/ui.resizable.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/ui.selectable.js (renamed from template-common/lib/ui/ui.selectable.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/ui.slider.js (renamed from template-common/lib/ui/ui.slider.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/ui.sortable.js (renamed from template-common/lib/ui/ui.sortable.js) | 0 | ||||
-rw-r--r-- | themes/default/js/ui/ui.tabs.js (renamed from template-common/lib/ui/ui.tabs.js) | 0 | ||||
-rw-r--r-- | themes/default/layout.css (renamed from template/yoga/layout.css) | 0 | ||||
-rw-r--r-- | themes/default/local_head.tpl | 12 | ||||
-rw-r--r-- | themes/default/mail/index.php (renamed from template/yoga/mail/text/plain/index.php) | 0 | ||||
-rw-r--r-- | themes/default/mail/text/html/images/footer-bg.jpg (renamed from template/yoga/mail/text/html/images/footer-bg.jpg) | bin | 9014 -> 9014 bytes | |||
-rw-r--r-- | themes/default/mail/text/html/images/footer-bg.png (renamed from template/yoga/mail/text/html/images/footer-bg.png) | bin | 15656 -> 15656 bytes | |||
-rw-r--r-- | themes/default/mail/text/html/images/header-bg.png (renamed from template/yoga/mail/text/html/images/header-bg.png) | bin | 30525 -> 30525 bytes | |||
-rw-r--r-- | themes/default/mail/text/html/images/index.php (renamed from template/yoga/theme/Sylvia/icon/index.php) | 0 | ||||
-rw-r--r-- | themes/default/mail/text/html/images/mailbody-bg.png (renamed from template/yoga/mail/text/html/images/mailbody-bg.png) | bin | 924 -> 924 bytes | |||
-rw-r--r-- | themes/default/mail/text/html/index.php (renamed from template/yoga/theme/Sylvia/icon/mimetypes/index.php) | 0 | ||||
-rw-r--r-- | themes/default/mail/text/index.php (renamed from template/yoga/theme/Sylvia/index.php) | 0 | ||||
-rw-r--r-- | themes/default/mail/text/plain/index.php (renamed from template/yoga/theme/clear/index.php) | 0 | ||||
-rw-r--r-- | themes/default/menubar.css (renamed from template/yoga/menubar.css) | 0 | ||||
-rw-r--r-- | themes/default/not-ie.css (renamed from template/yoga/not-ie.css) | 0 | ||||
-rw-r--r-- | themes/default/picture.css (renamed from template/yoga/picture.css) | 0 | ||||
-rw-r--r-- | themes/default/print.css (renamed from template/yoga/print.css) | 0 | ||||
-rw-r--r-- | themes/default/template/about.tpl (renamed from template/default/about.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/comment_list.tpl (renamed from template/default/comment_list.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/comments.tpl (renamed from template/default/comments.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/footer.tpl (renamed from template/default/footer.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/header.tpl (renamed from template/default/header.tpl) | 34 | ||||
-rw-r--r-- | themes/default/template/identification.tpl (renamed from template/default/identification.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/include/autosize.inc.tpl (renamed from admin/template/goto/include/autosize.inc.tpl) | 4 | ||||
-rw-r--r-- | themes/default/template/include/datepicker.inc.tpl | 24 | ||||
-rw-r--r-- | themes/default/template/include/resize.inc.tpl (renamed from admin/template/goto/include/resize.inc.tpl) | 6 | ||||
-rw-r--r-- | themes/default/template/index.tpl (renamed from template/default/index.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/index.php (renamed from template/yoga/theme/dark/images/index.php) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/html/cat_group_info.tpl (renamed from template/default/mail/text/html/cat_group_info.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/html/footer.tpl (renamed from template/default/mail/text/html/footer.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/html/global-mail-css.tpl (renamed from template/default/mail/text/html/global-mail-css.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/html/header.tpl (renamed from template/default/mail/text/html/header.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/html/index.php (renamed from template/yoga/theme/dark/index.php) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/html/notification_by_mail.tpl (renamed from template/default/mail/text/html/notification_by_mail.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/index.php (renamed from template/yoga/theme/index.php) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/plain/cat_group_info.tpl (renamed from template/default/mail/text/plain/cat_group_info.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/plain/footer.tpl (renamed from template/default/mail/text/plain/footer.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/plain/header.tpl (renamed from template/default/mail/text/plain/header.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/plain/index.php (renamed from template/yoga/theme/p0w0/images/index.php) | 0 | ||||
-rw-r--r-- | themes/default/template/mail/text/plain/notification_by_mail.tpl (renamed from template/default/mail/text/plain/notification_by_mail.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/mainpage_categories.tpl (renamed from template/default/mainpage_categories.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/menubar.tpl (renamed from template/default/menubar.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/menubar_categories.tpl (renamed from template/default/menubar_categories.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/menubar_identification.tpl (renamed from template/default/menubar_identification.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/menubar_links.tpl (renamed from template/default/menubar_links.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/menubar_menu.tpl (renamed from template/default/menubar_menu.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/menubar_specials.tpl (renamed from template/default/menubar_specials.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/menubar_tags.tpl (renamed from template/default/menubar_tags.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/month_calendar.tpl (renamed from template/default/month_calendar.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/navigation_bar.tpl (renamed from template/default/navigation_bar.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/nbm.tpl (renamed from template/default/nbm.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/notification.tpl (renamed from template/default/notification.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/password.tpl (renamed from template/default/password.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/picture.tpl (renamed from template/default/picture.tpl) | 2 | ||||
-rw-r--r-- | themes/default/template/picture_content.tpl (renamed from template/default/picture_content.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/picture_nav_buttons.tpl (renamed from template/default/picture_nav_buttons.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/profile.tpl (renamed from template/default/profile.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/profile_content.tpl (renamed from template/default/profile_content.tpl) | 2 | ||||
-rw-r--r-- | themes/default/template/redirect.tpl (renamed from template/default/redirect.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/register.tpl (renamed from template/default/register.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/search.tpl (renamed from template/default/search.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/search_rules.tpl (renamed from template/default/search_rules.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/slideshow.tpl (renamed from template/default/slideshow.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/tags.tpl (renamed from template/default/tags.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/thumbnails.tpl (renamed from template/default/thumbnails.tpl) | 0 | ||||
-rw-r--r-- | themes/default/template/upload.tpl (renamed from template/default/upload.tpl) | 0 | ||||
-rw-r--r-- | themes/default/theme.css | 12 | ||||
-rw-r--r-- | themes/default/themeconf.inc.php | 7 | ||||
-rw-r--r-- | themes/default/thumbnails.css (renamed from template/yoga/thumbnails.css) | 0 | ||||
-rw-r--r-- | themes/index.php (renamed from template/yoga/theme/p0w0/index.php) | 0 | ||||
-rw-r--r-- | themes/p0w0/images/button-bg.png (renamed from template/yoga/theme/p0w0/images/button-bg.png) | bin | 233 -> 233 bytes | |||
-rw-r--r-- | themes/p0w0/images/index.php (renamed from template/yoga/theme/wipi/images/index.php) | 0 | ||||
-rw-r--r-- | themes/p0w0/index.php (renamed from template/yoga/theme/wipi/index.php) | 0 | ||||
-rw-r--r-- | themes/p0w0/mail-css.tpl (renamed from template/yoga/theme/p0w0/mail-css.tpl) | 2 | ||||
-rw-r--r-- | themes/p0w0/theme.css (renamed from template/yoga/theme/p0w0/theme.css) | 0 | ||||
-rw-r--r-- | themes/p0w0/themeconf.inc.php | 6 | ||||
-rw-r--r-- | themes/wipi/images/index.php | 30 | ||||
-rw-r--r-- | themes/wipi/images/tableh1_bg.png (renamed from template/yoga/theme/wipi/images/tableh1_bg.png) | bin | 142 -> 142 bytes | |||
-rw-r--r-- | themes/wipi/images/tableh2_bg.png (renamed from template/yoga/theme/wipi/images/tableh2_bg.png) | bin | 141 -> 141 bytes | |||
-rw-r--r-- | themes/wipi/index.php | 30 | ||||
-rw-r--r-- | themes/wipi/mail-css.tpl (renamed from template/yoga/theme/wipi/mail-css.tpl) | 2 | ||||
-rw-r--r-- | themes/wipi/theme.css (renamed from template/yoga/theme/wipi/theme.css) | 0 | ||||
-rw-r--r-- | themes/wipi/themeconf.inc.php (renamed from template/yoga/theme/wipi/themeconf.inc.php) | 8 | ||||
-rw-r--r-- | upgrade.php | 2 |
615 files changed, 652 insertions, 648 deletions
@@ -62,26 +62,26 @@ SELECT // theme changer if (isset($_GET['change_theme'])) { - $admin_themes = array('goto/roma', 'goto/clear'); + $admin_themes = array('roma', 'clear'); $new_admin_theme = array_pop( array_diff( $admin_themes, - array($conf['admin_layout']) + array($conf['admin_theme']) ) ); $query = ' DELETE FROM '.CONFIG_TABLE.' - WHERE param = "admin_layout" + WHERE param = "admin_theme" ;'; pwg_query($query); $query = ' INSERT INTO '.CONFIG_TABLE.' - SET param = "admin_layout" + SET param = "admin_theme" , value = "'.$new_admin_theme.'" ;'; pwg_query($query); diff --git a/admin/extend_for_templates.php b/admin/extend_for_templates.php index 92c70e6a9..97f374a54 100644 --- a/admin/extend_for_templates.php +++ b/admin/extend_for_templates.php @@ -111,7 +111,7 @@ $flip_templates = array_flip($eligible_templates); $available_templates = array_merge( array('N/A' => '----------'), - get_dirs(PHPWG_ROOT_PATH.'template')); + get_dirs(PHPWG_ROOT_PATH.'theme')); // +-----------------------------------------------------------------------+ // | selected templates | diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php index 35a83f616..5771c4d1d 100644 --- a/admin/include/functions_notification_by_mail.inc.php +++ b/admin/include/functions_notification_by_mail.inc.php @@ -256,11 +256,8 @@ function set_user_on_env_nbm(&$nbm_user, $is_action_send) if ($is_action_send) { - $nbm_user['template'] = $user['template']; $nbm_user['theme'] = $user['theme']; - $env_nbm['mail_template'] = - get_mail_template($env_nbm['email_format'], - array('template' => $nbm_user['template'], 'theme' => $nbm_user['theme'])); + $env_nbm['mail_template'] = get_mail_template($env_nbm['email_format'], $nbm_user['theme']); $env_nbm['mail_template']->set_filename('notification_by_mail', 'notification_by_mail.tpl'); } } @@ -435,7 +432,6 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su 'email_format' => $env_nbm['email_format'], 'content' => $env_nbm['mail_template']->parse('notification_by_mail', true), 'content_format' => $env_nbm['email_format'], - 'template' => $nbm_user['template'], 'theme' => $nbm_user['theme'] ) )) diff --git a/admin/template/goto/header.tpl b/admin/template/goto/header.tpl deleted file mode 100644 index 5c71f42e0..000000000 --- a/admin/template/goto/header.tpl +++ /dev/null @@ -1,86 +0,0 @@ -{* - - 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}template-common/favicon.ico"> - -<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css"> -<!--[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> -<![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="admin/template/goto/icon/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}admin/template/goto/icon/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/include/datepicker.inc.tpl b/admin/template/goto/include/datepicker.inc.tpl deleted file mode 100644 index 9d1055c20..000000000 --- a/admin/template/goto/include/datepicker.inc.tpl +++ /dev/null @@ -1,24 +0,0 @@ - -{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"} - -{assign var="datepicker_language" value="template-common/lib/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}template-common/lib/ui/theme/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}admin/template/{$themeconf.template}/icon/datepicker.png", - day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date); -} -</script> diff --git a/admin/template/goto/theme/clear/themeconf.inc.php b/admin/template/goto/theme/clear/themeconf.inc.php deleted file mode 100644 index 868b4f61c..000000000 --- a/admin/template/goto/theme/clear/themeconf.inc.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php
-if (!function_exists('selected_admin_menu'))
-{
- include_once(PHPWG_ROOT_PATH.'admin/include/functions_themes.inc.php');
-}
-$themeconf = array(
- 'template' => 'goto',
- 'theme' => 'clear',
- 'icon_dir' => 'template/yoga/icon',
- 'admin_icon_dir' => 'admin/template/goto/theme/clear/icon',
- 'mime_icon_dir' => 'template/yoga/icon/mimetypes',
- 'selected_admin_menu' => selected_admin_menu(),
- 'local_head' => '',
-);
-?>
diff --git a/admin/template/goto/theme/roma/themeconf.inc.php b/admin/template/goto/theme/roma/themeconf.inc.php deleted file mode 100644 index 9e731144b..000000000 --- a/admin/template/goto/theme/roma/themeconf.inc.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -if (!function_exists('selected_admin_menu')) -{ - include_once(PHPWG_ROOT_PATH.'admin/include/functions_themes.inc.php'); -} -$themeconf = array( - 'template' => 'goto', /* Goto Admin template */ - 'theme' => 'roma', /* "roma" is the foundation theme of Piwigo */ - 'icon_dir' => 'template/yoga/icon', - 'admin_icon_dir' => 'admin/template/goto/icon', - 'mime_icon_dir' => 'template/yoga/icon/mimetypes/', - 'selected_admin_menu' => selected_admin_menu(), - 'local_head' => '', -); -?> diff --git a/admin/template/goto/theme/clear/icon/cat_move.png b/admin/themes/clear/icon/cat_move.png Binary files differindex 5788ab439..5788ab439 100644 --- a/admin/template/goto/theme/clear/icon/cat_move.png +++ b/admin/themes/clear/icon/cat_move.png diff --git a/admin/template/goto/theme/clear/icon/category_children.png b/admin/themes/clear/icon/category_children.png Binary files differindex 7205c3f61..7205c3f61 100644 --- a/admin/template/goto/theme/clear/icon/category_children.png +++ b/admin/themes/clear/icon/category_children.png diff --git a/admin/template/goto/theme/clear/icon/category_delete.png b/admin/themes/clear/icon/category_delete.png Binary files differindex da796da11..da796da11 100644 --- a/admin/template/goto/theme/clear/icon/category_delete.png +++ b/admin/themes/clear/icon/category_delete.png diff --git a/admin/template/goto/theme/clear/icon/category_edit.png b/admin/themes/clear/icon/category_edit.png Binary files differindex 0f3b619ed..0f3b619ed 100644 --- a/admin/template/goto/theme/clear/icon/category_edit.png +++ b/admin/themes/clear/icon/category_edit.png diff --git a/admin/template/goto/theme/clear/icon/category_elements.png b/admin/themes/clear/icon/category_elements.png Binary files differindex 1d367b38f..1d367b38f 100644 --- a/admin/template/goto/theme/clear/icon/category_elements.png +++ b/admin/themes/clear/icon/category_elements.png diff --git a/admin/template/goto/theme/clear/icon/category_jump-to.png b/admin/themes/clear/icon/category_jump-to.png Binary files differindex 62db1f4ee..62db1f4ee 100644 --- a/admin/template/goto/theme/clear/icon/category_jump-to.png +++ b/admin/themes/clear/icon/category_jump-to.png diff --git a/admin/template/goto/theme/clear/icon/category_permissions.png b/admin/themes/clear/icon/category_permissions.png Binary files differindex 4780841ae..4780841ae 100644 --- a/admin/template/goto/theme/clear/icon/category_permissions.png +++ b/admin/themes/clear/icon/category_permissions.png diff --git a/admin/template/goto/theme/clear/icon/category_representant_random.png b/admin/themes/clear/icon/category_representant_random.png Binary files differindex dfa69846f..dfa69846f 100644 --- a/admin/template/goto/theme/clear/icon/category_representant_random.png +++ b/admin/themes/clear/icon/category_representant_random.png diff --git a/admin/template/goto/theme/clear/icon/check.png b/admin/themes/clear/icon/check.png Binary files differindex d9abf2763..d9abf2763 100644 --- a/admin/template/goto/theme/clear/icon/check.png +++ b/admin/themes/clear/icon/check.png diff --git a/admin/template/goto/theme/clear/icon/collapse.gif b/admin/themes/clear/icon/collapse.gif Binary files differindex 6bf0b0657..6bf0b0657 100644 --- a/admin/template/goto/theme/clear/icon/collapse.gif +++ b/admin/themes/clear/icon/collapse.gif diff --git a/admin/template/goto/theme/clear/icon/datepicker.png b/admin/themes/clear/icon/datepicker.png Binary files differindex 45a6b4874..45a6b4874 100644 --- a/admin/template/goto/theme/clear/icon/datepicker.png +++ b/admin/themes/clear/icon/datepicker.png diff --git a/admin/template/goto/theme/clear/icon/delete.png b/admin/themes/clear/icon/delete.png Binary files differindex af10be03e..af10be03e 100644 --- a/admin/template/goto/theme/clear/icon/delete.png +++ b/admin/themes/clear/icon/delete.png diff --git a/admin/template/goto/theme/clear/icon/edit_s.png b/admin/themes/clear/icon/edit_s.png Binary files differindex e4951d22f..e4951d22f 100644 --- a/admin/template/goto/theme/clear/icon/edit_s.png +++ b/admin/themes/clear/icon/edit_s.png diff --git a/admin/template/goto/theme/clear/icon/errors.png b/admin/themes/clear/icon/errors.png Binary files differindex 3c8a37df5..3c8a37df5 100644 --- a/admin/template/goto/theme/clear/icon/errors.png +++ b/admin/themes/clear/icon/errors.png diff --git a/admin/template/goto/theme/clear/icon/exit.png b/admin/themes/clear/icon/exit.png Binary files differindex 2aafbb4cb..2aafbb4cb 100644 --- a/admin/template/goto/theme/clear/icon/exit.png +++ b/admin/themes/clear/icon/exit.png diff --git a/admin/template/goto/theme/clear/icon/expand.gif b/admin/themes/clear/icon/expand.gif Binary files differindex 96261b426..96261b426 100644 --- a/admin/template/goto/theme/clear/icon/expand.gif +++ b/admin/themes/clear/icon/expand.gif diff --git a/admin/template/goto/theme/clear/icon/help.png b/admin/themes/clear/icon/help.png Binary files differindex c76f68292..c76f68292 100644 --- a/admin/template/goto/theme/clear/icon/help.png +++ b/admin/themes/clear/icon/help.png diff --git a/admin/template/goto/theme/clear/icon/index.php b/admin/themes/clear/icon/index.php index b54047f4e..b54047f4e 100644 --- a/admin/template/goto/theme/clear/icon/index.php +++ b/admin/themes/clear/icon/index.php diff --git a/admin/template/goto/theme/clear/icon/infos.png b/admin/themes/clear/icon/infos.png Binary files differindex dc8c8a457..dc8c8a457 100644 --- a/admin/template/goto/theme/clear/icon/infos.png +++ b/admin/themes/clear/icon/infos.png diff --git a/admin/template/goto/theme/clear/icon/note.png b/admin/themes/clear/icon/note.png Binary files differindex 5849f791b..5849f791b 100644 --- a/admin/template/goto/theme/clear/icon/note.png +++ b/admin/themes/clear/icon/note.png diff --git a/admin/template/goto/theme/clear/icon/page_end.png b/admin/themes/clear/icon/page_end.png Binary files differindex c8f54fb91..c8f54fb91 100644 --- a/admin/template/goto/theme/clear/icon/page_end.png +++ b/admin/themes/clear/icon/page_end.png diff --git a/admin/template/goto/theme/clear/icon/page_top.png b/admin/themes/clear/icon/page_top.png Binary files differindex 8b18f13c3..8b18f13c3 100644 --- a/admin/template/goto/theme/clear/icon/page_top.png +++ b/admin/themes/clear/icon/page_top.png diff --git a/admin/template/goto/theme/clear/icon/permissions.png b/admin/themes/clear/icon/permissions.png Binary files differindex 9109a851b..9109a851b 100644 --- a/admin/template/goto/theme/clear/icon/permissions.png +++ b/admin/themes/clear/icon/permissions.png diff --git a/admin/template/goto/theme/clear/icon/plug_activate.png b/admin/themes/clear/icon/plug_activate.png Binary files differindex 4505e0f48..4505e0f48 100644 --- a/admin/template/goto/theme/clear/icon/plug_activate.png +++ b/admin/themes/clear/icon/plug_activate.png diff --git a/admin/template/goto/theme/clear/icon/plug_activate_grey.png b/admin/themes/clear/icon/plug_activate_grey.png Binary files differindex 05a2d4e45..05a2d4e45 100644 --- a/admin/template/goto/theme/clear/icon/plug_activate_grey.png +++ b/admin/themes/clear/icon/plug_activate_grey.png diff --git a/admin/template/goto/theme/clear/icon/plug_deactivate.png b/admin/themes/clear/icon/plug_deactivate.png Binary files differindex 579b87355..579b87355 100644 --- a/admin/template/goto/theme/clear/icon/plug_deactivate.png +++ b/admin/themes/clear/icon/plug_deactivate.png diff --git a/admin/template/goto/theme/clear/icon/plug_deactivate_grey.png b/admin/themes/clear/icon/plug_deactivate_grey.png Binary files differindex 87d5f6b14..87d5f6b14 100644 --- a/admin/template/goto/theme/clear/icon/plug_deactivate_grey.png +++ b/admin/themes/clear/icon/plug_deactivate_grey.png diff --git a/admin/template/goto/theme/clear/icon/plug_delete.png b/admin/themes/clear/icon/plug_delete.png Binary files differindex dd9bb1b4a..dd9bb1b4a 100644 --- a/admin/template/goto/theme/clear/icon/plug_delete.png +++ b/admin/themes/clear/icon/plug_delete.png diff --git a/admin/template/goto/theme/clear/icon/plug_delete_grey.png b/admin/themes/clear/icon/plug_delete_grey.png Binary files differindex 3706aadc5..3706aadc5 100644 --- a/admin/template/goto/theme/clear/icon/plug_delete_grey.png +++ b/admin/themes/clear/icon/plug_delete_grey.png diff --git a/admin/template/goto/theme/clear/icon/plug_install.png b/admin/themes/clear/icon/plug_install.png Binary files differindex e5fb66000..e5fb66000 100644 --- a/admin/template/goto/theme/clear/icon/plug_install.png +++ b/admin/themes/clear/icon/plug_install.png diff --git a/admin/template/goto/theme/clear/icon/plug_install_grey.png b/admin/themes/clear/icon/plug_install_grey.png Binary files differindex d0fd9565d..d0fd9565d 100644 --- a/admin/template/goto/theme/clear/icon/plug_install_grey.png +++ b/admin/themes/clear/icon/plug_install_grey.png diff --git a/admin/template/goto/theme/clear/icon/plug_uninstall.png b/admin/themes/clear/icon/plug_uninstall.png Binary files differindex 37a45feb0..37a45feb0 100644 --- a/admin/template/goto/theme/clear/icon/plug_uninstall.png +++ b/admin/themes/clear/icon/plug_uninstall.png diff --git a/admin/template/goto/theme/clear/icon/plug_uninstall_grey.png b/admin/themes/clear/icon/plug_uninstall_grey.png Binary files differindex c51cb754b..c51cb754b 100644 --- a/admin/template/goto/theme/clear/icon/plug_uninstall_grey.png +++ b/admin/themes/clear/icon/plug_uninstall_grey.png diff --git a/admin/template/goto/theme/clear/icon/plugin_active.gif b/admin/themes/clear/icon/plugin_active.gif Binary files differindex 5134d95a7..5134d95a7 100644 --- a/admin/template/goto/theme/clear/icon/plugin_active.gif +++ b/admin/themes/clear/icon/plugin_active.gif diff --git a/admin/template/goto/theme/clear/icon/plugin_inactive.gif b/admin/themes/clear/icon/plugin_inactive.gif Binary files differindex 9a3c80617..9a3c80617 100644 --- a/admin/template/goto/theme/clear/icon/plugin_inactive.gif +++ b/admin/themes/clear/icon/plugin_inactive.gif diff --git a/admin/template/goto/theme/clear/icon/preferences.png b/admin/themes/clear/icon/preferences.png Binary files differindex 30393347b..30393347b 100644 --- a/admin/template/goto/theme/clear/icon/preferences.png +++ b/admin/themes/clear/icon/preferences.png diff --git a/admin/template/goto/theme/clear/icon/ranks.png b/admin/themes/clear/icon/ranks.png Binary files differindex f48b394aa..f48b394aa 100644 --- a/admin/template/goto/theme/clear/icon/ranks.png +++ b/admin/themes/clear/icon/ranks.png diff --git a/admin/template/goto/theme/clear/icon/ranks_grey.png b/admin/themes/clear/icon/ranks_grey.png Binary files differindex 18478fc1f..18478fc1f 100644 --- a/admin/template/goto/theme/clear/icon/ranks_grey.png +++ b/admin/themes/clear/icon/ranks_grey.png diff --git a/admin/template/goto/theme/clear/icon/sync_metadata.png b/admin/themes/clear/icon/sync_metadata.png Binary files differindex cb62824a3..cb62824a3 100644 --- a/admin/template/goto/theme/clear/icon/sync_metadata.png +++ b/admin/themes/clear/icon/sync_metadata.png diff --git a/admin/template/goto/theme/clear/icon/sync_metadata_pink.png b/admin/themes/clear/icon/sync_metadata_pink.png Binary files differindex 6597ef254..6597ef254 100644 --- a/admin/template/goto/theme/clear/icon/sync_metadata_pink.png +++ b/admin/themes/clear/icon/sync_metadata_pink.png diff --git a/admin/template/goto/theme/clear/icon/toggle_is_default_group.png b/admin/themes/clear/icon/toggle_is_default_group.png Binary files differindex 0d58e79e7..0d58e79e7 100644 --- a/admin/template/goto/theme/clear/icon/toggle_is_default_group.png +++ b/admin/themes/clear/icon/toggle_is_default_group.png diff --git a/admin/template/goto/theme/clear/icon/uncheck.png b/admin/themes/clear/icon/uncheck.png Binary files differindex 2f7df3503..2f7df3503 100644 --- a/admin/template/goto/theme/clear/icon/uncheck.png +++ b/admin/themes/clear/icon/uncheck.png diff --git a/admin/template/goto/theme/clear/icon/validate_s.png b/admin/themes/clear/icon/validate_s.png Binary files differindex 400bf8a24..400bf8a24 100644 --- a/admin/template/goto/theme/clear/icon/validate_s.png +++ b/admin/themes/clear/icon/validate_s.png diff --git a/admin/template/goto/theme/clear/icon/virt_category.png b/admin/themes/clear/icon/virt_category.png Binary files differindex 15f4f2267..15f4f2267 100644 --- a/admin/template/goto/theme/clear/icon/virt_category.png +++ b/admin/themes/clear/icon/virt_category.png diff --git a/admin/template/goto/theme/clear/images/external_active.png b/admin/themes/clear/images/external_active.png Binary files differindex 9bbccfa96..9bbccfa96 100644 --- a/admin/template/goto/theme/clear/images/external_active.png +++ b/admin/themes/clear/images/external_active.png diff --git a/admin/template/goto/theme/clear/images/external_inactive.png b/admin/themes/clear/images/external_inactive.png Binary files differindex 5ed8db208..5ed8db208 100644 --- a/admin/template/goto/theme/clear/images/external_inactive.png +++ b/admin/themes/clear/images/external_inactive.png diff --git a/admin/template/goto/theme/clear/images/piwigo_logo_214x100.png b/admin/themes/clear/images/piwigo_logo_214x100.png Binary files differindex 92770a0d8..92770a0d8 100644 --- a/admin/template/goto/theme/clear/images/piwigo_logo_214x100.png +++ b/admin/themes/clear/images/piwigo_logo_214x100.png diff --git a/admin/template/goto/theme/clear/images/quickLocalSync.png b/admin/themes/clear/images/quickLocalSync.png Binary files differindex daf75e696..daf75e696 100644 --- a/admin/template/goto/theme/clear/images/quickLocalSync.png +++ b/admin/themes/clear/images/quickLocalSync.png diff --git a/admin/template/goto/theme/clear/images/resizable-e.gif b/admin/themes/clear/images/resizable-e.gif Binary files differindex 32d05b9ca..32d05b9ca 100644 --- a/admin/template/goto/theme/clear/images/resizable-e.gif +++ b/admin/themes/clear/images/resizable-e.gif diff --git a/admin/template/goto/theme/clear/images/resizable-n.gif b/admin/themes/clear/images/resizable-n.gif Binary files differindex 6a62dc8e2..6a62dc8e2 100644 --- a/admin/template/goto/theme/clear/images/resizable-n.gif +++ b/admin/themes/clear/images/resizable-n.gif diff --git a/admin/template/goto/theme/clear/images/resizable-ne.gif b/admin/themes/clear/images/resizable-ne.gif Binary files differindex 09ad9fc81..09ad9fc81 100644 --- a/admin/template/goto/theme/clear/images/resizable-ne.gif +++ b/admin/themes/clear/images/resizable-ne.gif diff --git a/admin/template/goto/theme/clear/images/resizable-nw.gif b/admin/themes/clear/images/resizable-nw.gif Binary files differindex c33bd0fcc..c33bd0fcc 100644 --- a/admin/template/goto/theme/clear/images/resizable-nw.gif +++ b/admin/themes/clear/images/resizable-nw.gif diff --git a/admin/template/goto/theme/clear/images/resizable-s.gif b/admin/themes/clear/images/resizable-s.gif Binary files differindex b1d72c5ce..b1d72c5ce 100644 --- a/admin/template/goto/theme/clear/images/resizable-s.gif +++ b/admin/themes/clear/images/resizable-s.gif diff --git a/admin/template/goto/theme/clear/images/resizable-se.gif b/admin/themes/clear/images/resizable-se.gif Binary files differindex ad6bd1fbc..ad6bd1fbc 100644 --- a/admin/template/goto/theme/clear/images/resizable-se.gif +++ b/admin/themes/clear/images/resizable-se.gif diff --git a/admin/template/goto/theme/clear/images/resizable-sw.gif b/admin/themes/clear/images/resizable-sw.gif Binary files differindex 5bf25ce07..5bf25ce07 100644 --- a/admin/template/goto/theme/clear/images/resizable-sw.gif +++ b/admin/themes/clear/images/resizable-sw.gif diff --git a/admin/template/goto/theme/clear/images/resizable-w.gif b/admin/themes/clear/images/resizable-w.gif Binary files differindex e4ed876e7..e4ed876e7 100644 --- a/admin/template/goto/theme/clear/images/resizable-w.gif +++ b/admin/themes/clear/images/resizable-w.gif diff --git a/admin/template/goto/theme/clear/images/transparent.gif b/admin/themes/clear/images/transparent.gif Binary files differindex f419cd417..f419cd417 100644 --- a/admin/template/goto/theme/clear/images/transparent.gif +++ b/admin/themes/clear/images/transparent.gif diff --git a/admin/template/goto/theme/clear/index.php b/admin/themes/clear/index.php index e8cc580ab..e8cc580ab 100644 --- a/admin/template/goto/theme/clear/index.php +++ b/admin/themes/clear/index.php diff --git a/admin/template/goto/theme/clear/mail-css.tpl b/admin/themes/clear/mail-css.tpl index b94f17f17..cfe148b39 100644 --- a/admin/template/goto/theme/clear/mail-css.tpl +++ b/admin/themes/clear/mail-css.tpl @@ -6,7 +6,7 @@ body {ldelim} background-color:#111; color:#69c;} #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
#copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
color: #69c;}
-h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/tableh1_bg.png);}
+h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);}
img {ldelim} margin: 16px; padding:15px;border:1px solid #eee; -moz-border-radius: 4px; border-radius: 4px 4px; }
img:hover {ldelim} border:1px solid #69c; -moz-border-radius: 4px; border-radius: 4px 4px; }
a {ldelim} color: #69c; background: transparent; }
diff --git a/admin/template/goto/theme/clear/theme.css b/admin/themes/clear/theme.css index ed9a57a6e..ed9a57a6e 100644 --- a/admin/template/goto/theme/clear/theme.css +++ b/admin/themes/clear/theme.css diff --git a/admin/themes/clear/themeconf.inc.php b/admin/themes/clear/themeconf.inc.php new file mode 100644 index 000000000..de1d34209 --- /dev/null +++ b/admin/themes/clear/themeconf.inc.php @@ -0,0 +1,12 @@ +<?php
+if (!function_exists('selected_admin_menu'))
+{
+ include_once(PHPWG_ROOT_PATH.'admin/include/functions_themes.inc.php');
+}
+$themeconf = array(
+ 'theme' => 'clear',
+ 'parent' => 'default',
+ 'admin_icon_dir' => 'admin/themes/clear/icon',
+ 'selected_admin_menu' => selected_admin_menu(),
+);
+?>
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 Binary files differindex 9d6939cfc..9d6939cfc 100644 --- a/admin/template/goto/icon/cat_move.png +++ b/admin/themes/default/icon/cat_move.png diff --git a/admin/template/goto/icon/category_children.png b/admin/themes/default/icon/category_children.png Binary files differindex d2c4edd1f..d2c4edd1f 100644 --- a/admin/template/goto/icon/category_children.png +++ b/admin/themes/default/icon/category_children.png diff --git a/admin/template/goto/icon/category_delete.png b/admin/themes/default/icon/category_delete.png Binary files differindex b27ef62d3..b27ef62d3 100644 --- a/admin/template/goto/icon/category_delete.png +++ b/admin/themes/default/icon/category_delete.png diff --git a/admin/template/goto/icon/category_edit.png b/admin/themes/default/icon/category_edit.png Binary files differindex 3ace19daf..3ace19daf 100644 --- a/admin/template/goto/icon/category_edit.png +++ b/admin/themes/default/icon/category_edit.png diff --git a/admin/template/goto/icon/category_elements.png b/admin/themes/default/icon/category_elements.png Binary files differindex c5e3f9292..c5e3f9292 100644 --- a/admin/template/goto/icon/category_elements.png +++ b/admin/themes/default/icon/category_elements.png diff --git a/admin/template/goto/icon/category_jump-to.png b/admin/themes/default/icon/category_jump-to.png Binary files differindex 765bc119f..765bc119f 100644 --- a/admin/template/goto/icon/category_jump-to.png +++ b/admin/themes/default/icon/category_jump-to.png diff --git a/admin/template/goto/icon/category_permissions.png b/admin/themes/default/icon/category_permissions.png Binary files differindex 055d9e58d..055d9e58d 100644 --- a/admin/template/goto/icon/category_permissions.png +++ b/admin/themes/default/icon/category_permissions.png diff --git a/admin/template/goto/icon/category_representant_random.png b/admin/themes/default/icon/category_representant_random.png Binary files differindex 26fe7016a..26fe7016a 100644 --- a/admin/template/goto/icon/category_representant_random.png +++ b/admin/themes/default/icon/category_representant_random.png diff --git a/admin/template/goto/icon/check.png b/admin/themes/default/icon/check.png Binary files differindex 708003a2b..708003a2b 100644 --- a/admin/template/goto/icon/check.png +++ b/admin/themes/default/icon/check.png diff --git a/admin/template/goto/icon/datepicker.png b/admin/themes/default/icon/datepicker.png Binary files differindex 72e836b93..72e836b93 100644 --- a/admin/template/goto/icon/datepicker.png +++ b/admin/themes/default/icon/datepicker.png diff --git a/admin/template/goto/icon/delete.png b/admin/themes/default/icon/delete.png Binary files differindex 285e53e19..285e53e19 100644 --- a/admin/template/goto/icon/delete.png +++ b/admin/themes/default/icon/delete.png diff --git a/admin/template/goto/icon/edit_s.png b/admin/themes/default/icon/edit_s.png Binary files differindex efb639947..efb639947 100644 --- a/admin/template/goto/icon/edit_s.png +++ b/admin/themes/default/icon/edit_s.png diff --git a/admin/template/goto/icon/errors.png b/admin/themes/default/icon/errors.png Binary files differindex e26d8c6e5..e26d8c6e5 100644 --- a/admin/template/goto/icon/errors.png +++ b/admin/themes/default/icon/errors.png diff --git a/admin/template/goto/icon/exit.png b/admin/themes/default/icon/exit.png Binary files differindex 685cc44b5..685cc44b5 100644 --- a/admin/template/goto/icon/exit.png +++ b/admin/themes/default/icon/exit.png diff --git a/admin/template/goto/icon/fcbkcomplete_close.gif b/admin/themes/default/icon/fcbkcomplete_close.gif Binary files differindex cc2199248..cc2199248 100644 --- a/admin/template/goto/icon/fcbkcomplete_close.gif +++ b/admin/themes/default/icon/fcbkcomplete_close.gif diff --git a/admin/template/goto/icon/help.png b/admin/themes/default/icon/help.png Binary files differindex cd1d20919..cd1d20919 100644 --- a/admin/template/goto/icon/help.png +++ b/admin/themes/default/icon/help.png diff --git a/admin/template/goto/icon/home.png b/admin/themes/default/icon/home.png Binary files differindex 81b6bddb7..81b6bddb7 100644 --- a/admin/template/goto/icon/home.png +++ b/admin/themes/default/icon/home.png 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 Binary files differindex d98031df4..d98031df4 100644 --- a/admin/template/goto/icon/infos.png +++ b/admin/themes/default/icon/infos.png diff --git a/admin/template/goto/icon/note.png b/admin/themes/default/icon/note.png Binary files differindex 9ef1af537..9ef1af537 100644 --- a/admin/template/goto/icon/note.png +++ b/admin/themes/default/icon/note.png diff --git a/admin/template/goto/icon/page_end.png b/admin/themes/default/icon/page_end.png Binary files differindex ac7b25ab8..ac7b25ab8 100644 --- a/admin/template/goto/icon/page_end.png +++ b/admin/themes/default/icon/page_end.png diff --git a/admin/template/goto/icon/page_top.png b/admin/themes/default/icon/page_top.png Binary files differindex 30c58edd7..30c58edd7 100644 --- a/admin/template/goto/icon/page_top.png +++ b/admin/themes/default/icon/page_top.png diff --git a/admin/template/goto/icon/permissions.png b/admin/themes/default/icon/permissions.png Binary files differindex 370ddddeb..370ddddeb 100644 --- a/admin/template/goto/icon/permissions.png +++ b/admin/themes/default/icon/permissions.png diff --git a/admin/template/goto/icon/plug_activate.png b/admin/themes/default/icon/plug_activate.png Binary files differindex feb97a1c9..feb97a1c9 100644 --- a/admin/template/goto/icon/plug_activate.png +++ b/admin/themes/default/icon/plug_activate.png diff --git a/admin/template/goto/icon/plug_activate_grey.png b/admin/themes/default/icon/plug_activate_grey.png Binary files differindex bf2a9be53..bf2a9be53 100644 --- a/admin/template/goto/icon/plug_activate_grey.png +++ b/admin/themes/default/icon/plug_activate_grey.png diff --git a/admin/template/goto/icon/plug_deactivate.png b/admin/themes/default/icon/plug_deactivate.png Binary files differindex 8401ad8b9..8401ad8b9 100644 --- a/admin/template/goto/icon/plug_deactivate.png +++ b/admin/themes/default/icon/plug_deactivate.png diff --git a/admin/template/goto/icon/plug_deactivate_grey.png b/admin/themes/default/icon/plug_deactivate_grey.png Binary files differindex a7e55e669..a7e55e669 100644 --- a/admin/template/goto/icon/plug_deactivate_grey.png +++ b/admin/themes/default/icon/plug_deactivate_grey.png diff --git a/admin/template/goto/icon/plug_delete.png b/admin/themes/default/icon/plug_delete.png Binary files differindex 285e53e19..285e53e19 100644 --- a/admin/template/goto/icon/plug_delete.png +++ b/admin/themes/default/icon/plug_delete.png diff --git a/admin/template/goto/icon/plug_delete_grey.png b/admin/themes/default/icon/plug_delete_grey.png Binary files differindex d3d070bfc..d3d070bfc 100644 --- a/admin/template/goto/icon/plug_delete_grey.png +++ b/admin/themes/default/icon/plug_delete_grey.png diff --git a/admin/template/goto/icon/plug_install.png b/admin/themes/default/icon/plug_install.png Binary files differindex bef78e171..bef78e171 100644 --- a/admin/template/goto/icon/plug_install.png +++ b/admin/themes/default/icon/plug_install.png diff --git a/admin/template/goto/icon/plug_install_grey.png b/admin/themes/default/icon/plug_install_grey.png Binary files differindex 3bd56be3c..3bd56be3c 100644 --- a/admin/template/goto/icon/plug_install_grey.png +++ b/admin/themes/default/icon/plug_install_grey.png diff --git a/admin/template/goto/icon/plug_uninstall.png b/admin/themes/default/icon/plug_uninstall.png Binary files differindex 9fd420ad7..9fd420ad7 100644 --- a/admin/template/goto/icon/plug_uninstall.png +++ b/admin/themes/default/icon/plug_uninstall.png diff --git a/admin/template/goto/icon/plug_uninstall_grey.png b/admin/themes/default/icon/plug_uninstall_grey.png Binary files differindex 4d6291cee..4d6291cee 100644 --- a/admin/template/goto/icon/plug_uninstall_grey.png +++ b/admin/themes/default/icon/plug_uninstall_grey.png diff --git a/admin/template/goto/icon/plugin_active.gif b/admin/themes/default/icon/plugin_active.gif Binary files differindex fe49227da..fe49227da 100644 --- a/admin/template/goto/icon/plugin_active.gif +++ b/admin/themes/default/icon/plugin_active.gif diff --git a/admin/template/goto/icon/plugin_inactive.gif b/admin/themes/default/icon/plugin_inactive.gif Binary files differindex 19d551865..19d551865 100644 --- a/admin/template/goto/icon/plugin_inactive.gif +++ b/admin/themes/default/icon/plugin_inactive.gif diff --git a/admin/template/goto/icon/preferences.png b/admin/themes/default/icon/preferences.png Binary files differindex 8634b5159..8634b5159 100644 --- a/admin/template/goto/icon/preferences.png +++ b/admin/themes/default/icon/preferences.png diff --git a/admin/template/goto/icon/ranks.png b/admin/themes/default/icon/ranks.png Binary files differindex 47710e87f..47710e87f 100644 --- a/admin/template/goto/icon/ranks.png +++ b/admin/themes/default/icon/ranks.png diff --git a/admin/template/goto/icon/ranks_grey.png b/admin/themes/default/icon/ranks_grey.png Binary files differindex f9757b998..f9757b998 100644 --- a/admin/template/goto/icon/ranks_grey.png +++ b/admin/themes/default/icon/ranks_grey.png diff --git a/admin/template/goto/icon/sync_metadata.png b/admin/themes/default/icon/sync_metadata.png Binary files differindex c527e2b04..c527e2b04 100644 --- a/admin/template/goto/icon/sync_metadata.png +++ b/admin/themes/default/icon/sync_metadata.png diff --git a/admin/template/goto/icon/sync_metadata_pink.png b/admin/themes/default/icon/sync_metadata_pink.png Binary files differindex 954c69612..954c69612 100644 --- a/admin/template/goto/icon/sync_metadata_pink.png +++ b/admin/themes/default/icon/sync_metadata_pink.png diff --git a/admin/template/goto/icon/toggle_is_default_group.png b/admin/themes/default/icon/toggle_is_default_group.png Binary files differindex 7ddce0076..7ddce0076 100644 --- a/admin/template/goto/icon/toggle_is_default_group.png +++ b/admin/themes/default/icon/toggle_is_default_group.png diff --git a/admin/template/goto/icon/uncheck.png b/admin/themes/default/icon/uncheck.png Binary files differindex df08cb8fe..df08cb8fe 100644 --- a/admin/template/goto/icon/uncheck.png +++ b/admin/themes/default/icon/uncheck.png diff --git a/admin/template/goto/icon/validate_s.png b/admin/themes/default/icon/validate_s.png Binary files differindex adea3d580..adea3d580 100644 --- a/admin/template/goto/icon/validate_s.png +++ b/admin/themes/default/icon/validate_s.png diff --git a/admin/template/goto/icon/virt_category.png b/admin/themes/default/icon/virt_category.png Binary files differindex 7957ec77c..7957ec77c 100644 --- a/admin/template/goto/icon/virt_category.png +++ b/admin/themes/default/icon/virt_category.png 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 diff --git a/admin/template/goto/theme/roma/images/active_tab.png b/admin/themes/roma/images/active_tab.png Binary files differindex f0fbcfae3..f0fbcfae3 100644 --- a/admin/template/goto/theme/roma/images/active_tab.png +++ b/admin/themes/roma/images/active_tab.png diff --git a/admin/template/goto/theme/roma/images/active_tab2.png b/admin/themes/roma/images/active_tab2.png Binary files differindex 29ffdeedc..29ffdeedc 100644 --- a/admin/template/goto/theme/roma/images/active_tab2.png +++ b/admin/themes/roma/images/active_tab2.png diff --git a/admin/template/goto/theme/roma/images/active_tab3.png b/admin/themes/roma/images/active_tab3.png Binary files differindex b84c40c11..b84c40c11 100644 --- a/admin/template/goto/theme/roma/images/active_tab3.png +++ b/admin/themes/roma/images/active_tab3.png diff --git a/admin/template/goto/theme/roma/images/bottom-left-bg.jpg b/admin/themes/roma/images/bottom-left-bg.jpg Binary files differindex 3d8a5eed2..3d8a5eed2 100644 --- a/admin/template/goto/theme/roma/images/bottom-left-bg.jpg +++ b/admin/themes/roma/images/bottom-left-bg.jpg diff --git a/admin/template/goto/theme/roma/images/external_active.png b/admin/themes/roma/images/external_active.png Binary files differindex 03c50fbf5..03c50fbf5 100644 --- a/admin/template/goto/theme/roma/images/external_active.png +++ b/admin/themes/roma/images/external_active.png diff --git a/admin/template/goto/theme/roma/images/external_inactive.png b/admin/themes/roma/images/external_inactive.png Binary files differindex 918640316..918640316 100644 --- a/admin/template/goto/theme/roma/images/external_inactive.png +++ b/admin/themes/roma/images/external_inactive.png diff --git a/admin/template/goto/theme/roma/images/fillet.png b/admin/themes/roma/images/fillet.png Binary files differindex c56a51aeb..c56a51aeb 100644 --- a/admin/template/goto/theme/roma/images/fillet.png +++ b/admin/themes/roma/images/fillet.png diff --git a/admin/template/goto/theme/roma/images/header_msgs-bg.gif b/admin/themes/roma/images/header_msgs-bg.gif Binary files differindex 0879e1b79..0879e1b79 100644 --- a/admin/template/goto/theme/roma/images/header_msgs-bg.gif +++ b/admin/themes/roma/images/header_msgs-bg.gif diff --git a/admin/template/goto/theme/roma/images/inactive_tab.png b/admin/themes/roma/images/inactive_tab.png Binary files differindex 8834859ab..8834859ab 100644 --- a/admin/template/goto/theme/roma/images/inactive_tab.png +++ b/admin/themes/roma/images/inactive_tab.png diff --git a/admin/template/goto/theme/roma/images/inactive_tab2.png b/admin/themes/roma/images/inactive_tab2.png Binary files differindex 8d4183b94..8d4183b94 100644 --- a/admin/template/goto/theme/roma/images/inactive_tab2.png +++ b/admin/themes/roma/images/inactive_tab2.png diff --git a/admin/template/goto/theme/roma/images/inactive_tab3.png b/admin/themes/roma/images/inactive_tab3.png Binary files differindex 2b22c8eb1..2b22c8eb1 100644 --- a/admin/template/goto/theme/roma/images/inactive_tab3.png +++ b/admin/themes/roma/images/inactive_tab3.png diff --git a/admin/template/goto/theme/roma/images/menuBoxBottom_new.png b/admin/themes/roma/images/menuBoxBottom_new.png Binary files differindex 4df220e7c..4df220e7c 100644 --- a/admin/template/goto/theme/roma/images/menuBoxBottom_new.png +++ b/admin/themes/roma/images/menuBoxBottom_new.png diff --git a/admin/template/goto/theme/roma/images/menuBoxTop_new.png b/admin/themes/roma/images/menuBoxTop_new.png Binary files differindex c8cecd2b1..c8cecd2b1 100644 --- a/admin/template/goto/theme/roma/images/menuBoxTop_new.png +++ b/admin/themes/roma/images/menuBoxTop_new.png diff --git a/admin/template/goto/theme/roma/images/menubar-detail.png b/admin/themes/roma/images/menubar-detail.png Binary files differindex d7f4f2480..d7f4f2480 100644 --- a/admin/template/goto/theme/roma/images/menubar-detail.png +++ b/admin/themes/roma/images/menubar-detail.png diff --git a/admin/template/goto/theme/roma/images/menubar-top.png b/admin/themes/roma/images/menubar-top.png Binary files differindex 3da3bcad3..3da3bcad3 100644 --- a/admin/template/goto/theme/roma/images/menubar-top.png +++ b/admin/themes/roma/images/menubar-top.png diff --git a/admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png b/admin/themes/roma/images/piwigo_logo_sombre_214x100.png Binary files differindex 106f20add..106f20add 100644 --- a/admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png +++ b/admin/themes/roma/images/piwigo_logo_sombre_214x100.png diff --git a/admin/template/goto/theme/roma/images/quickLocalSync_hover.png b/admin/themes/roma/images/quickLocalSync_hover.png Binary files differindex a8b9ed98b..a8b9ed98b 100644 --- a/admin/template/goto/theme/roma/images/quickLocalSync_hover.png +++ b/admin/themes/roma/images/quickLocalSync_hover.png diff --git a/admin/template/goto/theme/roma/images/quickLocalSync_inactiv.png b/admin/themes/roma/images/quickLocalSync_inactiv.png Binary files differindex b26b23027..b26b23027 100644 --- a/admin/template/goto/theme/roma/images/quickLocalSync_inactiv.png +++ b/admin/themes/roma/images/quickLocalSync_inactiv.png diff --git a/admin/template/goto/theme/roma/images/resizable-e.gif b/admin/themes/roma/images/resizable-e.gif Binary files differindex 36451a670..36451a670 100644 --- a/admin/template/goto/theme/roma/images/resizable-e.gif +++ b/admin/themes/roma/images/resizable-e.gif diff --git a/admin/template/goto/theme/roma/images/resizable-n.gif b/admin/themes/roma/images/resizable-n.gif Binary files differindex fe11bf420..fe11bf420 100644 --- a/admin/template/goto/theme/roma/images/resizable-n.gif +++ b/admin/themes/roma/images/resizable-n.gif diff --git a/admin/template/goto/theme/roma/images/resizable-ne.gif b/admin/themes/roma/images/resizable-ne.gif Binary files differindex 4819fdf1c..4819fdf1c 100644 --- a/admin/template/goto/theme/roma/images/resizable-ne.gif +++ b/admin/themes/roma/images/resizable-ne.gif diff --git a/admin/template/goto/theme/roma/images/resizable-nw.gif b/admin/themes/roma/images/resizable-nw.gif Binary files differindex 7f128dac2..7f128dac2 100644 --- a/admin/template/goto/theme/roma/images/resizable-nw.gif +++ b/admin/themes/roma/images/resizable-nw.gif diff --git a/admin/template/goto/theme/roma/images/resizable-s.gif b/admin/themes/roma/images/resizable-s.gif Binary files differindex 908576c9b..908576c9b 100644 --- a/admin/template/goto/theme/roma/images/resizable-s.gif +++ b/admin/themes/roma/images/resizable-s.gif diff --git a/admin/template/goto/theme/roma/images/resizable-se.gif b/admin/themes/roma/images/resizable-se.gif Binary files differindex 0db439888..0db439888 100644 --- a/admin/template/goto/theme/roma/images/resizable-se.gif +++ b/admin/themes/roma/images/resizable-se.gif diff --git a/admin/template/goto/theme/roma/images/resizable-sw.gif b/admin/themes/roma/images/resizable-sw.gif Binary files differindex e983320f6..e983320f6 100644 --- a/admin/template/goto/theme/roma/images/resizable-sw.gif +++ b/admin/themes/roma/images/resizable-sw.gif diff --git a/admin/template/goto/theme/roma/images/resizable-w.gif b/admin/themes/roma/images/resizable-w.gif Binary files differindex fe2a79034..fe2a79034 100644 --- a/admin/template/goto/theme/roma/images/resizable-w.gif +++ b/admin/themes/roma/images/resizable-w.gif diff --git a/admin/template/goto/theme/roma/images/top-left-bg.jpg b/admin/themes/roma/images/top-left-bg.jpg Binary files differindex 98aa1d6a5..98aa1d6a5 100644 --- a/admin/template/goto/theme/roma/images/top-left-bg.jpg +++ b/admin/themes/roma/images/top-left-bg.jpg diff --git a/admin/template/goto/theme/roma/images/transparent.gif b/admin/themes/roma/images/transparent.gif Binary files differindex e565824aa..e565824aa 100644 --- a/admin/template/goto/theme/roma/images/transparent.gif +++ b/admin/themes/roma/images/transparent.gif diff --git a/admin/template/goto/theme/roma/index.php b/admin/themes/roma/index.php index 871b52b6a..871b52b6a 100644 --- a/admin/template/goto/theme/roma/index.php +++ b/admin/themes/roma/index.php diff --git a/admin/template/goto/theme/roma/mail-css.tpl b/admin/themes/roma/mail-css.tpl index a99f13c5a..a8da286b3 100644 --- a/admin/template/goto/theme/roma/mail-css.tpl +++ b/admin/themes/roma/mail-css.tpl @@ -5,7 +5,7 @@ body {ldelim} background-color:#111; color:#69c;} #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;} #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom; color: #69c;} -h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/tableh1_bg.png);} +h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);} img {ldelim} margin: 16px; padding:15px;border:1px solid #eee; -moz-border-radius: 4px; border-radius: 4px 4px; } img:hover {ldelim} border:1px solid #69c; -moz-border-radius: 4px; border-radius: 4px 4px; } a {ldelim} color: #69c; background: transparent; } diff --git a/admin/template/goto/theme/roma/theme.css b/admin/themes/roma/theme.css index 81af6c627..81af6c627 100644 --- a/admin/template/goto/theme/roma/theme.css +++ b/admin/themes/roma/theme.css diff --git a/admin/themes/roma/themeconf.inc.php b/admin/themes/roma/themeconf.inc.php new file mode 100644 index 000000000..1260576ab --- /dev/null +++ b/admin/themes/roma/themeconf.inc.php @@ -0,0 +1,11 @@ +<?php +if (!function_exists('selected_admin_menu')) +{ + include_once(PHPWG_ROOT_PATH.'admin/include/functions_themes.inc.php'); +} +$themeconf = array( + 'theme' => 'roma', + 'parent' => 'default', + 'selected_admin_menu' => selected_admin_menu(), +); +?> diff --git a/admin/user_list.php b/admin/user_list.php index b69bac20e..e677f49d1 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -385,7 +385,7 @@ DELETE FROM '.USER_GROUP_TABLE.' $dbfields = array('primary' => array('user_id'), 'update' => array()); $formfields = - array('nb_image_line', 'nb_line_page', 'template', 'language', + array('nb_image_line', 'nb_line_page', 'theme', 'language', 'recent_period', 'maxwidth', 'expand', 'show_nb_comments', 'show_nb_hits', 'maxheight', 'status', 'enabled_high', 'level'); @@ -583,16 +583,16 @@ else } // Template Options -$template->assign('template_options', get_pwg_themes()); -$template->assign('template_selected', - isset($_POST['pref_submit']) ? $_POST['template'] : get_default_template()); +$template->assign('theme_options', get_pwg_themes()); +$template->assign('theme_selected', + isset($_POST['pref_submit']) ? $_POST['theme'] : get_default_theme()); // Language options $template->assign('language_options', get_languages()); $template->assign('language_selected', isset($_POST['pref_submit']) ? $_POST['language'] : get_default_language()); -Log::getInstance()->debug($status); +//Log::getInstance()->debug($status); // Status options foreach (get_enums(USER_INFOS_TABLE, 'status') as $status) { diff --git a/include/common.inc.php b/include/common.inc.php index 814eaaf40..9a5ccac90 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -158,15 +158,11 @@ if (is_a_guest()) if (( defined('IN_ADMIN') and IN_ADMIN ) or (defined('PWG_HELP') and PWG_HELP)) {// Admin template - list($user['admin_template'], $user['admin_theme']) = - explode ('/', $conf['admin_layout']); - $template = new Template(PHPWG_ROOT_PATH.'admin/template/' - . $user['admin_template'], $user['admin_theme'] ); + $template = new Template(PHPWG_ROOT_PATH.'admin/themes', $conf['admin_theme']); } else { // Classic template - $template = new Template(PHPWG_ROOT_PATH.'template/' - . $user['template'], $user['theme'] ); + $template = new Template(PHPWG_ROOT_PATH.'themes', $user['theme'] ); } if (isset($user['internal_status']['guest_must_be_guest']) diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 0ad708777..dcf94dc84 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -335,6 +335,9 @@ $conf['insensitive_case_logon'] = false; // 'filename' $conf['uniqueness_mode'] = 'md5sum'; +// Define default theme for your gallery +$conf['default_theme'] = 'Sylvia'; + // +-----------------------------------------------------------------------+ // | metadata | // +-----------------------------------------------------------------------+ @@ -676,7 +679,7 @@ $conf['rss_feed_author'] = 'Piwigo notifier'; // | Set admin layout | // +-----------------------------------------------------------------------+ -$conf['admin_layout'] = 'goto/roma'; +$conf['admin_theme'] = 'roma'; // should we load the active plugins ? true=Yes, false=No $conf['enable_plugins']=true; diff --git a/include/functions.inc.php b/include/functions.inc.php index 6659d582e..7eee41d57 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -611,12 +611,11 @@ function redirect_html( $url , $msg = '', $refresh_time = 0) load_language('common.lang'); trigger_action('loading_lang'); load_language('local.lang', '', array('no_fallback'=>true) ); - list($tmpl, $thm) = explode('/', get_default_template()); - $template = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm); + $template = new Template(PHPWG_ROOT_PATH.'themes', get_default_theme()); } else { - $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme']); + $template = new Template(PHPWG_ROOT_PATH.'themes', $user['theme']); } if (empty($msg)) @@ -710,24 +709,21 @@ function url_is_remote($url) } /** - * returns available template/theme + * returns available themes */ function get_pwg_themes() { global $conf; $themes = array(); - $template_dir = PHPWG_ROOT_PATH.'template'; + $template_dir = PHPWG_ROOT_PATH.'themes'; - foreach (get_dirs($template_dir) as $template) + foreach (get_dirs($template_dir) as $theme) { - if ( $template != 'default' ) - { - foreach (get_dirs($template_dir.'/'.$template.'/theme') as $theme) - { - array_push($themes, $template.'/'.$theme); - } - } + if ( $theme != 'default' ) + { + array_push($themes, $theme); + } } // plugins want remove some themes based on user status maybe? diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php index c550d6857..b55d55366 100644 --- a/include/functions_mail.inc.php +++ b/include/functions_mail.inc.php @@ -152,12 +152,12 @@ function get_strict_email_list($email_list) /** * Returns an completed array template/theme - * completed with get_default_template() + * completed with get_default_theme() * * @params: * - args: incompleted array of template/theme - * o template: template to use [default get_default_template()] - * o theme: template to use [default get_default_template()] + * o template: template to use [default get_default_theme()] + * o theme: template to use [default get_default_theme()] */ function get_array_template_theme($args = array()) { @@ -167,7 +167,7 @@ function get_array_template_theme($args = array()) if (empty($args['template']) or empty($args['theme'])) { - list($res['template'], $res['theme']) = explode('/', get_default_template()); + list($res['template'], $res['theme']) = explode('/', get_default_theme()); } if (!empty($args['template'])) @@ -189,15 +189,18 @@ function get_array_template_theme($args = array()) * @params: * - email_format: mail format * - args: function params of mail function: - * o template: template to use [default get_default_template()] - * o theme: template to use [default get_default_template()] + * o template: template to use [default get_default_theme()] + * o theme: template to use [default get_default_theme()] */ -function & get_mail_template($email_format, $args = array()) +function & get_mail_template($email_format, $theme='') { - $args = get_array_template_theme($args); + if (empty($theme)) + { + $theme = get_default_theme(); + } + + $mail_template = new Template(PHPWG_ROOT_PATH.'themes', $theme, 'template/mail/'.$email_format); - $mail_template = new Template(PHPWG_ROOT_PATH.'template/'.$args['template'], $args['theme']); - $mail_template->set_template_dir(PHPWG_ROOT_PATH.'template/'.$args['template'].'/mail/'.$email_format); return $mail_template; } @@ -417,7 +420,7 @@ function pwg_mail_group( $query = ' SELECT - distinct language, template + distinct language, theme FROM '.USER_GROUP_TABLE.' as ug INNER JOIN '.USERS_TABLE.' as u ON '.$conf['user_fields']['id'].' = ug.user_id @@ -442,8 +445,6 @@ WHERE $list = array(); while ($row = pwg_db_fetch_assoc($result)) { - $row['template_theme'] = $row['template']; - list($row['template'], $row['theme']) = explode('/', $row['template_theme']); $list[] = $row; } @@ -461,7 +462,7 @@ WHERE '.$conf['user_fields']['email'].' IS NOT NULL AND group_id = '.$group_id.' AND language = \''.$elem['language'].'\' - AND template = \''.$elem['template_theme'].'\' + AND theme = \''.$elem['theme'].'\' ;'; $result = pwg_query($query); @@ -481,7 +482,7 @@ WHERE { switch_lang_to($elem['language']); - $mail_template = get_mail_template($email_format, $elem); + $mail_template = get_mail_template($email_format, $elem['theme']); $mail_template->set_filename($tpl_shortname, $tpl_shortname.'.tpl'); $mail_template->assign( @@ -497,7 +498,6 @@ WHERE 'email_format' => $email_format, 'content' => $mail_template->parse($tpl_shortname, true), 'content_format' => $email_format, - 'template' => $elem['template'], 'theme' => $elem['theme'] ) ) and $return; @@ -524,8 +524,7 @@ WHERE * o content: content of mail [default value ''] * o content_format: format of mail content [default value 'text/plain'] * o email_format: global mail format [default value $conf_mail['default_email_format']] - * o template: template to use [default get_default_template()] - * o theme: template to use [default get_default_template()] + * o theme: template to use [default get_default_theme()] * * @return boolean (Ok or not) */ @@ -584,7 +583,10 @@ function pwg_mail($to, $args = array()) $args['Bcc'][] = $conf_mail['formated_email_webmaster']; } - $args = array_merge($args, get_array_template_theme($args)); + if (empty($args['theme'])) + { + $args['theme'] = get_default_theme(); + } $headers = 'From: '.$args['from']."\n"; $headers.= 'Reply-To: '.$args['from']."\n"; @@ -617,19 +619,19 @@ function pwg_mail($to, $args = array()) foreach (array_unique($content_type_list) as $content_type) { // key compose of indexes witch allow ti cache mail data - $cache_key = $content_type.'-'.$lang_info['code'].'-'.$args['template'].'-'.$args['theme']; + $cache_key = $content_type.'-'.$lang_info['code'].'-'.$args['theme']; if (!isset($conf_mail[$cache_key])) { - if (!isset($conf_mail[$cache_key]['template'])) + if (!isset($conf_mail[$cache_key]['theme'])) { - $conf_mail[$cache_key]['template'] = get_mail_template($content_type); + $conf_mail[$cache_key]['theme'] = get_mail_template($content_type); } - $conf_mail[$cache_key]['template']->set_filename('mail_header', 'header.tpl'); - $conf_mail[$cache_key]['template']->set_filename('mail_footer', 'footer.tpl'); + $conf_mail[$cache_key]['theme']->set_filename('mail_header', 'header.tpl'); + $conf_mail[$cache_key]['theme']->set_filename('mail_footer', 'footer.tpl'); - $conf_mail[$cache_key]['template']->assign( + $conf_mail[$cache_key]['theme']->assign( array( //Header 'BOUNDARY_KEY' => $conf_mail['boundary_key'], @@ -652,36 +654,37 @@ function pwg_mail($to, $args = array()) if ($content_type == 'text/html') { - if (is_file($conf_mail[$cache_key]['template']->get_template_dir().'/global-mail-css.tpl')) + /* + if (is_file($conf_mail[$cache_key]['theme']->get_template_dir().'/global-mail-css.tpl')) { - $conf_mail[$cache_key]['template']->set_filename('css', 'global-mail-css.tpl'); - $conf_mail[$cache_key]['template']->assign_var_from_handle('GLOBAL_MAIL_CSS', 'css'); + $conf_mail[$cache_key]['theme']->set_filename('css', 'global-mail-css.tpl'); + $conf_mail[$cache_key]['theme']->assign_var_from_handle('GLOBAL_MAIL_CSS', 'css'); } + */ - $root_abs_path = dirname(dirname(__FILE__)); - - $file = $root_abs_path.'/template/'.$args['template'].'/theme/'.$args['theme'].'/mail-css.tpl'; + $file = PHPWG_ROOT_PATH.'themes/'.$args['theme'].'/mail-css.tpl'; if (is_file($file)) { - $conf_mail[$cache_key]['template']->set_filename('css', $file); - $conf_mail[$cache_key]['template']->assign_var_from_handle('MAIL_CSS', 'css'); + $conf_mail[$cache_key]['theme']->set_filename('css', realpath($file)); + $conf_mail[$cache_key]['theme']->assign_var_from_handle('MAIL_CSS', 'css'); } - + /* $file = $root_abs_path.'/template-common/local-mail-css.tpl'; if (is_file($file)) { $conf_mail[$cache_key]['template']->set_filename('css', $file); $conf_mail[$cache_key]['template']->assign_var_from_handle('LOCAL_MAIL_CSS', 'css'); } + */ } // what are displayed on the header of each mail ? $conf_mail[$cache_key]['header'] = - $conf_mail[$cache_key]['template']->parse('mail_header', true); + $conf_mail[$cache_key]['theme']->parse('mail_header', true); // what are displayed on the footer of each mail ? $conf_mail[$cache_key]['footer'] = - $conf_mail[$cache_key]['template']->parse('mail_footer', true); + $conf_mail[$cache_key]['theme']->parse('mail_footer', true); } // Header @@ -714,7 +717,6 @@ function pwg_mail($to, $args = array()) $content.= "\n".'-----='.$conf_mail['boundary_key'].'--'."\n"; } - //~ // Close boundary //~ $content.= "\n".'-----='.$conf_mail['boundary_key'].'--'."\n"; diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 3a4d17549..f3eb0b172 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -245,7 +245,11 @@ function build_user( $user_id, $use_cache ) // calculation of the number of picture to display per page $user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page']; - list($user['template'], $user['theme']) = explode('/', $user['template']); + // Check user theme + if (!file_exists(PHPWG_ROOT_PATH.'themes/'.$user['theme'].'/themeconf.inc.php')) + { + $user['theme'] = $conf['default_theme']; + } return $user; } @@ -841,9 +845,9 @@ function get_default_user_value($value_name, $sos_value) * Returns the default template value * */ -function get_default_template() +function get_default_theme() { - return get_default_user_value('template', PHPWG_DEFAULT_TEMPLATE); + return get_default_user_value('theme', PHPWG_DEFAULT_TEMPLATE); } /* diff --git a/include/template.class.php b/include/template.class.php index 2fb4ac7d8..c31c50d2e 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -52,7 +52,7 @@ class Template { // used by html_head smarty block to add content before </head> var $html_head_elements = array(); - function Template($root = ".", $theme= "") + function Template($root = ".", $theme= "", $path = "template") { global $conf, $lang_info; @@ -77,16 +77,14 @@ class Template { $this->smarty->register_prefilter( array('Template', 'prefilter_language') ); } + $this->smarty->template_dir = array(); if ( !empty($theme) ) { - include($root.'/theme/'.$theme.'/themeconf.inc.php'); - $this->smarty->assign('themeconf', $themeconf); + $this->set_theme($root, $theme, $path); } $this->smarty->assign('lang_info', $lang_info); - $this->set_template_dir($root); - if (!defined('IN_ADMIN') and isset($conf['extents_for_templates'])) { $tpl_extents = unserialize($conf['extents_for_templates']); @@ -95,32 +93,38 @@ class Template { } /** - * Sets the template root directory for this Template object. - * Revised from Piwigo 2.1 to add modeling support + * Load theme's parameters. */ + function set_theme($root, $theme, $path) + { + $this->set_template_dir($root.'/'.$theme.'/'.$path); + + include($root.'/'.$theme.'/themeconf.inc.php'); + + if (isset($themeconf['parent'])) + { + $this->set_theme($root, $themeconf['parent'], $path); + } + + $tpl_var = array('name' => $themeconf['theme']); + if (file_exists($root.'/'.$theme.'/local_head.tpl')) + { + $tpl_var['local_head'] = realpath($root.'/'.$theme.'/local_head.tpl'); + } + $this->smarty->append('themes', $tpl_var); + $this->smarty->append('themeconf', $themeconf, true); + } + function set_template_dir($dir) { - $modeling = $this->get_themeconf('modeling'); - if (!defined('IN_ADMIN') and ($modeling !== false)) - { // Modeling is active only on gallery side and never in admin - // Set the normal directory - $this->smarty->template_dir = array($dir); - // Modeling by theme parameter - $model = './template/' . $modeling; - if ( $model != './template/' and is_dir($model)) - { - $this->smarty->template_dir[] = $model; - } - // Default template directory - $this->smarty->template_dir[] = './template/default'; - } - else - { - $this->smarty->template_dir = $dir; - } - $real_dir = realpath($dir); - $compile_id = crc32( $real_dir===false ? $dir : $real_dir); - $this->smarty->compile_id = base_convert($compile_id, 10, 36 ); + $this->smarty->template_dir[] = $dir; + + if (!isset($this->smarty->compile_id)) + { + $real_dir = realpath($dir); + $compile_id = crc32( $real_dir===false ? $dir : $real_dir); + $this->smarty->compile_id = base_convert($compile_id, 10, 36 ); + } } /** @@ -196,6 +200,8 @@ class Template { */ function set_extents($filename_array, $dir='', $overwrite=true) { + global $user; + if (!is_array($filename_array)) { return false; @@ -220,7 +226,7 @@ class Template { } if ((stripos(implode('',array_keys($_GET)), '/'.$param) !== false or $param == 'N/A') - and (preg_match('/'.preg_quote($tpl,'/').'$/', $this->get_template_dir()) or $tpl == 'N/A') + and ($tpl == $user['theme'] or $tpl == 'N/A') and (!isset($this->extents[$handle]) or $overwrite) and file_exists($dir . $filename)) { diff --git a/install.php b/install.php index f686e414e..46943814c 100644 --- a/install.php +++ b/install.php @@ -218,7 +218,7 @@ if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<')) //----------------------------------------------------- template initialization include( PHPWG_ROOT_PATH .'include/template.class.php'); -$template = new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma'); +$template = new Template(PHPWG_ROOT_PATH.'admin/themes', 'roma'); $template->set_filenames( array('install' => 'install.tpl') ); if (!isset($step)) { diff --git a/install/db/84-database.php b/install/db/84-database.php new file mode 100644 index 000000000..499a81400 --- /dev/null +++ b/install/db/84-database.php @@ -0,0 +1,75 @@ +<?php +// +-----------------------------------------------------------------------+ +// | Piwigo - a PHP based picture gallery | +// +-----------------------------------------------------------------------+ +// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org | +// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | +// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | +// +-----------------------------------------------------------------------+ +// | This program is free software; you can redistribute it and/or modify | +// | it under the terms of the GNU General Public License as published by | +// | the Free Software Foundation | +// | | +// | This program is distributed in the hope that it will be useful, but | +// | WITHOUT ANY WARRANTY; without even the implied warranty of | +// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | +// | General Public License for more details. | +// | | +// | You should have received a copy of the GNU General Public License | +// | along with this program; if not, write to the Free Software | +// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | +// | USA. | +// +-----------------------------------------------------------------------+ + +if (!defined('PHPWG_ROOT_PATH')) +{ + die('Hacking attempt!'); +} + +$upgrade_description = 'Update default template to default theme.'; + +$query = ' +ALTER TABLE '.USER_INFOS_TABLE.' + CHANGE COLUMN template theme varchar(255) NOT NULL default \'Sylvia\' +;'; + +pwg_query($query); + +$query = ' +SELECT user_id, theme + FROM '.USER_INFOS_TABLE.' +;'; + +$result = pwg_query($query); + +$users = array(); +while ($row = pwg_db_fetch_assoc($result)) +{ + list($user_template, $user_theme) = explode('/', $row['theme']); + + if ($user_template != 'yoga') + { + $user_theme = 'Sylvia'; // We can find better! + } + array_push($users, array( + 'user_id' => $row['user_id'], + 'theme' => $user_theme + ) + ); +} + +mass_updates( + USER_INFOS_TABLE, + array( + 'primary' => array('user_id'), + 'update' => array('theme') + ), + $users + ); + +echo +"\n" +. $upgrade_description +."\n" +; +?>
\ No newline at end of file diff --git a/install/php5_apache_configuration.php b/install/php5_apache_configuration.php index fce474082..6f9a4744a 100644 --- a/install/php5_apache_configuration.php +++ b/install/php5_apache_configuration.php @@ -75,10 +75,9 @@ function openPage() <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="template-common/favicon.ico"> -<link rel="stylesheet" type="text/css" href="admin/template/goto/layout.css"> -<link rel="stylesheet" type="text/css" href="admin/template/goto/default-colors.css"> -<link rel="stylesheet" type="text/css" href="admin/template/goto/theme/roma/theme.css"> +<link rel="shortcut icon" type="image/x-icon" href="themes/default/icon/favicon.ico"> +<link rel="stylesheet" type="text/css" href="admin/themes/roma/default-colors.css"> +<link rel="stylesheet" type="text/css" href="admin/themes/roma/theme.css"> <style type="text/css"> .content { width: 800px; diff --git a/install/piwigo_structure-mysql.sql b/install/piwigo_structure-mysql.sql index 559addfc4..13d46ab5c 100644 --- a/install/piwigo_structure-mysql.sql +++ b/install/piwigo_structure-mysql.sql @@ -388,7 +388,7 @@ CREATE TABLE `piwigo_user_infos` ( `show_nb_comments` enum('true','false') NOT NULL default 'false', `show_nb_hits` enum('true','false') NOT NULL default 'false', `recent_period` tinyint(3) unsigned NOT NULL default '7', - `template` varchar(255) NOT NULL default 'yoga/Sylvia', + `theme` varchar(255) NOT NULL default 'Sylvia', `registration_date` datetime NOT NULL default '0000-00-00 00:00:00', `enabled_high` enum('true','false') NOT NULL default 'true', `level` tinyint unsigned NOT NULL default '0', diff --git a/install/piwigo_structure-pdo-sqlite.sql b/install/piwigo_structure-pdo-sqlite.sql index 8528ef01b..56022d66a 100644 --- a/install/piwigo_structure-pdo-sqlite.sql +++ b/install/piwigo_structure-pdo-sqlite.sql @@ -449,7 +449,7 @@ CREATE TABLE piwigo_user_infos "show_nb_comments" BOOLEAN default false, "show_nb_hits" BOOLEAN default false, "recent_period" INTEGER default 7 NOT NULL, - "template" VARCHAR(255) default 'yoga/Sylvia' NOT NULL, + "theme" VARCHAR(255) default 'Sylvia' NOT NULL, "registration_date" TIMESTAMP NOT NULL, "enabled_high" BOOLEAN default true, "level" INTEGER default 0 NOT NULL, diff --git a/install/piwigo_structure-pgsql.sql b/install/piwigo_structure-pgsql.sql index ec61ce0db..ae32d52d6 100644 --- a/install/piwigo_structure-pgsql.sql +++ b/install/piwigo_structure-pgsql.sql @@ -547,7 +547,7 @@ CREATE TABLE "piwigo_user_infos" "show_nb_comments" BOOLEAN default false, "show_nb_hits" BOOLEAN default false, "recent_period" INTEGER default 7 NOT NULL, - "template" VARCHAR(255) default 'yoga/Sylvia' NOT NULL, + "theme" VARCHAR(255) default 'Sylvia' NOT NULL, "registration_date" TIMESTAMP NOT NULL, "enabled_high" BOOLEAN default true, "level" INTEGER default 0 NOT NULL, diff --git a/install/piwigo_structure-sqlite.sql b/install/piwigo_structure-sqlite.sql index 8528ef01b..56022d66a 100644 --- a/install/piwigo_structure-sqlite.sql +++ b/install/piwigo_structure-sqlite.sql @@ -449,7 +449,7 @@ CREATE TABLE piwigo_user_infos "show_nb_comments" BOOLEAN default false, "show_nb_hits" BOOLEAN default false, "recent_period" INTEGER default 7 NOT NULL, - "template" VARCHAR(255) default 'yoga/Sylvia' NOT NULL, + "theme" VARCHAR(255) default 'Sylvia' NOT NULL, "registration_date" TIMESTAMP NOT NULL, "enabled_high" BOOLEAN default true, "level" INTEGER default 0 NOT NULL, diff --git a/profile.php b/profile.php index 489b0bd90..b678a8709 100644 --- a/profile.php +++ b/profile.php @@ -202,7 +202,7 @@ function save_profile_from_post($userdata, &$errors) // update user "additional" informations (specific to Piwigo) $fields = array( 'nb_image_line', 'nb_line_page', 'language', 'maxwidth', 'maxheight', - 'expand', 'show_nb_comments', 'show_nb_hits', 'recent_period', 'template' + 'expand', 'show_nb_comments', 'show_nb_hits', 'recent_period', 'theme' ); $data = array(); @@ -257,14 +257,13 @@ function load_profile_in_template($url_action, $url_redirect, $userdata) 'F_ACTION'=>$url_action, )); - foreach (get_pwg_themes() as $pwg_template) + foreach (get_pwg_themes() as $pwg_theme) { - if (isset($_POST['submit']) - or $userdata['template'].'/'.$userdata['theme'] == $pwg_template) + if (isset($_POST['submit']) or $userdata['theme'] == $pwg_theme) { - $template->assign('template_selection', $pwg_template); + $template->assign('template_selection', $pwg_theme); } - $template_options[$pwg_template] = $pwg_template; + $template_options[$pwg_theme] = $pwg_theme; } $template->assign('template_options', $template_options); diff --git a/template-common/csshover.htc b/template-common/csshover.htc deleted file mode 100644 index 14f88576c..000000000 --- a/template-common/csshover.htc +++ /dev/null @@ -1,120 +0,0 @@ -<attach event="ondocumentready" handler="parseStylesheets" /> -<script> -/** - * Whatever:hover - V1.42.060206 - hover & active - * ------------------------------------------------------------ - * (c) 2005 - Peter Nederlof - * Peterned - http://www.xs4all.nl/~peterned/ - * License - http://creativecommons.org/licenses/LGPL/2.1/ - * - * Whatever:hover is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * Whatever:hover is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * Credits and thanks to: - * Arnoud Berendsen, Martin Reurings, Robert Hanson - * - * howto: body { behavior:url("csshover.htc"); } - * ------------------------------------------------------------ - */ - -var csshoverReg = /(^|\s)(([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active)/i, -currentSheet, doc = window.document, hoverEvents = [], activators = { - onhover:{on:'onmouseover', off:'onmouseout'}, - onactive:{on:'onmousedown', off:'onmouseup'} -} - -function parseStylesheets() { - if(!/MSIE (5|6)/.test(navigator.userAgent)) return; - window.attachEvent('onunload', unhookHoverEvents); - var sheets = doc.styleSheets, l = sheets.length; - for(var i=0; i<l; i++) - parseStylesheet(sheets[i]); -} - function parseStylesheet(sheet) { - if(sheet.imports) { - try { - var imports = sheet.imports, l = imports.length; - for(var i=0; i<l; i++) parseStylesheet(sheet.imports[i]); - } catch(securityException){} - } - - try { - var rules = (currentSheet = sheet).rules, l = rules.length; - for(var j=0; j<l; j++) parseCSSRule(rules[j]); - } catch(securityException){} - } - - function parseCSSRule(rule) { - var select = rule.selectorText, style = rule.style.cssText; - if(!csshoverReg.test(select) || !style) return; - - var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1'); - var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo); - var className = (/\.([a-z0-9_-]*on(hover|active))/i).exec(newSelect)[1]; - var affected = select.replace(/:(hover|active).*$/, ''); - var elements = getElementsBySelect(affected); - if(elements.length == 0) return; - - currentSheet.addRule(newSelect, style); - for(var i=0; i<elements.length; i++) - new HoverElement(elements[i], className, activators[pseudo]); - } - -function HoverElement(node, className, events) { - if(!node.hovers) node.hovers = {}; - if(node.hovers[className]) return; - node.hovers[className] = true; - hookHoverEvent(node, events.on, function() { node.className += ' ' + className; }); - hookHoverEvent(node, events.off, function() { node.className = node.className.replace(new RegExp('\\s+'+className, 'g'),''); }); -} - function hookHoverEvent(node, type, handler) { - node.attachEvent(type, handler); - hoverEvents[hoverEvents.length] = { - node:node, type:type, handler:handler - }; - } - - function unhookHoverEvents() { - for(var e,i=0; i<hoverEvents.length; i++) { - e = hoverEvents[i]; - e.node.detachEvent(e.type, e.handler); - } - } - -function getElementsBySelect(rule) { - var parts, nodes = [doc]; - parts = rule.split(' '); - for(var i=0; i<parts.length; i++) { - nodes = getSelectedNodes(parts[i], nodes); - } return nodes; -} - function getSelectedNodes(select, elements) { - var result, node, nodes = []; - var identify = (/\#([a-z0-9_-]+)/i).exec(select); - if(identify) { - var element = doc.getElementById(identify[1]); - return element? [element]:nodes; - } - - var classname = (/\.([a-z0-9_-]+)/i).exec(select); - var tagName = select.replace(/(\.|\#|\:)[a-z0-9_-]+/i, ''); - var classReg = classname? new RegExp('\\b' + classname[1] + '\\b'):false; - for(var i=0; i<elements.length; i++) { - result = tagName? elements[i].all.tags(tagName):elements[i].all; - for(var j=0; j<result.length; j++) { - node = result[j]; - if(classReg && !classReg.test(node.className)) continue; - nodes[nodes.length] = node; - } - } - - return nodes; - } -</script>
\ No newline at end of file diff --git a/template-common/default-layout.css b/template-common/default-layout.css deleted file mode 100644 index a1eaa1ef6..000000000 --- a/template-common/default-layout.css +++ /dev/null @@ -1,41 +0,0 @@ - -/* 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)*/ -} - diff --git a/template-common/inputfix.htc b/template-common/inputfix.htc deleted file mode 100644 index e99d2b2c7..000000000 --- a/template-common/inputfix.htc +++ /dev/null @@ -1,42 +0,0 @@ -<public:attach event="oncontentready" onevent="fixElements()" /> - -<script langage=javascript> - -function setFocusStyle() -{ - window.event.srcElement.className += ' focus'; -} - -function setBlurStyle() -{ - window.event.srcElement.className = window.event.srcElement.className.replace( ' focus', ' nofocus'); -} - -function setClassFromType() -{ - this.className += ' ' + this.type; -} - -function fixElements() -{ - for ( var i=0; i<this.elements.length; i++ ) - { - var elem=this.elements[i]; - switch ( elem.tagName ) - { - case "INPUT": - elem.className += ' ' + elem.type; - if ( (elem.type != "radio") && (elem.type != "checkbox") ) - { /* setting focus/nofocus on those is a mess to handle in css */ - elem.attachEvent( 'onfocus', setFocusStyle ); - elem.attachEvent( 'onblur', setBlurStyle ); - } - break; - case "SELECT": - case "TEXTAREA": - elem.attachEvent( 'onfocus', setFocusStyle ); - elem.attachEvent( 'onblur', setBlurStyle ); - } - } -} -</script> diff --git a/template-common/tooltipfix.htc b/template-common/tooltipfix.htc deleted file mode 100644 index 4ce943af1..000000000 --- a/template-common/tooltipfix.htc +++ /dev/null @@ -1,31 +0,0 @@ -<public:attach event="onmouseover" onevent="montrer()" /> -<public:attach event="onmouseout" onevent="cacher()" /> - -<script langage=javascript> -var thisImg = this; -var thisTitle = this.title; -var thisAlt = this.alt; -var thisA = this.parentNode; -var aTitle = thisA.title; - -function montrer() -{ - if (aTitle) - { - thisAlt=thisImg.alt; - thisImg.alt=aTitle; - thisImg.title=aTitle; - } - return; -} - -function cacher() { - if (thisAlt) - { - thisImg.alt=thisAlt; - thisImg.title=thisTitle; - } - return; -} -</script> - diff --git a/template/default/include/datepicker.inc.tpl b/template/default/include/datepicker.inc.tpl deleted file mode 100644 index cd502e91e..000000000 --- a/template/default/include/datepicker.inc.tpl +++ /dev/null @@ -1,24 +0,0 @@ - -{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"} - -{assign var="datepicker_language" value="template-common/lib/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}template-common/lib/ui/theme/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/template/yoga/theme/Sylvia/themeconf.inc.php b/template/yoga/theme/Sylvia/themeconf.inc.php deleted file mode 100644 index 3c99c66cd..000000000 --- a/template/yoga/theme/Sylvia/themeconf.inc.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php -$themeconf = array( - 'template' => 'yoga', - 'theme' => 'Sylvia', - 'icon_dir' => 'template/yoga/theme/Sylvia/icon', - 'admin_icon_dir' => 'template/yoga/icon/admin', - 'mime_icon_dir' => 'template/yoga/theme/Sylvia/icon/mimetypes/', - 'local_head' => ' -<!--[if IE]> - <link rel="stylesheet" href="template/yoga/theme/Sylvia/theme-ie.css" type="text/css"> -<![endif]--> - ', -); -?> diff --git a/template/yoga/theme/clear/themeconf.inc.php b/template/yoga/theme/clear/themeconf.inc.php deleted file mode 100644 index 4858b7b50..000000000 --- a/template/yoga/theme/clear/themeconf.inc.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php -$themeconf = array( - 'template' => 'yoga', - 'theme' => 'clear', - 'icon_dir' => 'template/yoga/icon', - 'admin_icon_dir' => 'template/yoga/icon/admin', - 'mime_icon_dir' => 'template/yoga/icon/mimetypes/', - 'local_head' => '', -); -?> diff --git a/template/yoga/theme/dark/themeconf.inc.php b/template/yoga/theme/dark/themeconf.inc.php deleted file mode 100644 index d59843ba8..000000000 --- a/template/yoga/theme/dark/themeconf.inc.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php -$themeconf = array( - 'template' => 'yoga', - 'theme' => 'dark', - 'icon_dir' => 'template/yoga/icon', - 'admin_icon_dir' => 'template/yoga/icon/admin', - 'mime_icon_dir' => 'template/yoga/icon/mimetypes/', - 'local_head' => '', -); -?> diff --git a/template/yoga/theme/p0w0/themeconf.inc.php b/template/yoga/theme/p0w0/themeconf.inc.php deleted file mode 100644 index 063a60bc8..000000000 --- a/template/yoga/theme/p0w0/themeconf.inc.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php -$themeconf = array( - 'template' => 'yoga', - 'theme' => 'p0w0', - 'icon_dir' => 'template/yoga/icon', - 'admin_icon_dir' => 'template/yoga/icon/admin', - 'mime_icon_dir' => 'template/yoga/icon/mimetypes/', - 'local_head' => '', -); -?> diff --git a/template/yoga/theme/Sylvia/icon/add_tag.png b/themes/Sylvia/icon/add_tag.png Binary files differindex 66042aadf..66042aadf 100644 --- a/template/yoga/theme/Sylvia/icon/add_tag.png +++ b/themes/Sylvia/icon/add_tag.png diff --git a/template/yoga/theme/Sylvia/icon/caddie_add.png b/themes/Sylvia/icon/caddie_add.png Binary files differindex 14dfc5684..14dfc5684 100644 --- a/template/yoga/theme/Sylvia/icon/caddie_add.png +++ b/themes/Sylvia/icon/caddie_add.png diff --git a/template/yoga/theme/Sylvia/icon/calendar.png b/themes/Sylvia/icon/calendar.png Binary files differindex 0044c1e93..0044c1e93 100644 --- a/template/yoga/theme/Sylvia/icon/calendar.png +++ b/themes/Sylvia/icon/calendar.png diff --git a/template/yoga/theme/Sylvia/icon/calendar_created.png b/themes/Sylvia/icon/calendar_created.png Binary files differindex 607fc0a4a..607fc0a4a 100644 --- a/template/yoga/theme/Sylvia/icon/calendar_created.png +++ b/themes/Sylvia/icon/calendar_created.png diff --git a/template/yoga/theme/Sylvia/icon/category_edit.png b/themes/Sylvia/icon/category_edit.png Binary files differindex 3ace19daf..3ace19daf 100644 --- a/template/yoga/theme/Sylvia/icon/category_edit.png +++ b/themes/Sylvia/icon/category_edit.png diff --git a/template/yoga/theme/Sylvia/icon/datepicker.png b/themes/Sylvia/icon/datepicker.png Binary files differindex 3d0e015f6..3d0e015f6 100644 --- a/template/yoga/theme/Sylvia/icon/datepicker.png +++ b/themes/Sylvia/icon/datepicker.png diff --git a/template/yoga/theme/Sylvia/icon/dec_period.png b/themes/Sylvia/icon/dec_period.png Binary files differindex 6a9d2bfa7..6a9d2bfa7 100644 --- a/template/yoga/theme/Sylvia/icon/dec_period.png +++ b/themes/Sylvia/icon/dec_period.png diff --git a/template/yoga/theme/Sylvia/icon/dec_period_unactive.png b/themes/Sylvia/icon/dec_period_unactive.png Binary files differindex 5cb58ba8e..5cb58ba8e 100644 --- a/template/yoga/theme/Sylvia/icon/dec_period_unactive.png +++ b/themes/Sylvia/icon/dec_period_unactive.png diff --git a/template/yoga/theme/Sylvia/icon/del_favorite.png b/themes/Sylvia/icon/del_favorite.png Binary files differindex bea4720cf..bea4720cf 100644 --- a/template/yoga/theme/Sylvia/icon/del_favorite.png +++ b/themes/Sylvia/icon/del_favorite.png diff --git a/template/yoga/theme/Sylvia/icon/delete.png b/themes/Sylvia/icon/delete.png Binary files differindex 285e53e19..285e53e19 100644 --- a/template/yoga/theme/Sylvia/icon/delete.png +++ b/themes/Sylvia/icon/delete.png diff --git a/template/yoga/icon/edit.png b/themes/Sylvia/icon/edit.png Binary files differindex 9c755cda1..9c755cda1 100644 --- a/template/yoga/icon/edit.png +++ b/themes/Sylvia/icon/edit.png diff --git a/template/yoga/theme/Sylvia/icon/errors.png b/themes/Sylvia/icon/errors.png Binary files differindex e26d8c6e5..e26d8c6e5 100644 --- a/template/yoga/theme/Sylvia/icon/errors.png +++ b/themes/Sylvia/icon/errors.png diff --git a/template/yoga/theme/Sylvia/icon/exit.png b/themes/Sylvia/icon/exit.png Binary files differindex 685cc44b5..685cc44b5 100644 --- a/template/yoga/theme/Sylvia/icon/exit.png +++ b/themes/Sylvia/icon/exit.png diff --git a/template-common/favicon.ico b/themes/Sylvia/icon/favicon.ico Binary files differindex d7a1d89fd..d7a1d89fd 100644 --- a/template-common/favicon.ico +++ b/themes/Sylvia/icon/favicon.ico diff --git a/template/yoga/theme/Sylvia/icon/favorite.png b/themes/Sylvia/icon/favorite.png Binary files differindex 2caa31687..2caa31687 100644 --- a/template/yoga/theme/Sylvia/icon/favorite.png +++ b/themes/Sylvia/icon/favorite.png diff --git a/template/yoga/theme/Sylvia/icon/first.png b/themes/Sylvia/icon/first.png Binary files differindex de15054a1..de15054a1 100644 --- a/template/yoga/theme/Sylvia/icon/first.png +++ b/themes/Sylvia/icon/first.png diff --git a/template/yoga/theme/Sylvia/icon/first_unactive.png b/themes/Sylvia/icon/first_unactive.png Binary files differindex 2eca53a3c..2eca53a3c 100644 --- a/template/yoga/theme/Sylvia/icon/first_unactive.png +++ b/themes/Sylvia/icon/first_unactive.png diff --git a/template/yoga/theme/Sylvia/icon/flat.png b/themes/Sylvia/icon/flat.png Binary files differindex 291156950..291156950 100644 --- a/template/yoga/theme/Sylvia/icon/flat.png +++ b/themes/Sylvia/icon/flat.png diff --git a/template/yoga/theme/Sylvia/icon/help.png b/themes/Sylvia/icon/help.png Binary files differindex cd1d20919..cd1d20919 100644 --- a/template/yoga/theme/Sylvia/icon/help.png +++ b/themes/Sylvia/icon/help.png diff --git a/template/yoga/theme/Sylvia/icon/home.png b/themes/Sylvia/icon/home.png Binary files differindex 81b6bddb7..81b6bddb7 100644 --- a/template/yoga/theme/Sylvia/icon/home.png +++ b/themes/Sylvia/icon/home.png diff --git a/template/yoga/theme/Sylvia/icon/inc_period.png b/themes/Sylvia/icon/inc_period.png Binary files differindex 72860d6db..72860d6db 100644 --- a/template/yoga/theme/Sylvia/icon/inc_period.png +++ b/themes/Sylvia/icon/inc_period.png diff --git a/template/yoga/theme/Sylvia/icon/inc_period_unactive.png b/themes/Sylvia/icon/inc_period_unactive.png Binary files differindex f28f986c2..f28f986c2 100644 --- a/template/yoga/theme/Sylvia/icon/inc_period_unactive.png +++ b/themes/Sylvia/icon/inc_period_unactive.png diff --git a/template-common/index.php b/themes/Sylvia/icon/index.php index 871b52b6a..871b52b6a 100644 --- a/template-common/index.php +++ b/themes/Sylvia/icon/index.php diff --git a/template/yoga/theme/Sylvia/icon/infos.png b/themes/Sylvia/icon/infos.png Binary files differindex 00695cb8f..00695cb8f 100644 --- a/template/yoga/theme/Sylvia/icon/infos.png +++ b/themes/Sylvia/icon/infos.png diff --git a/template/yoga/theme/Sylvia/icon/last.png b/themes/Sylvia/icon/last.png Binary files differindex 89ec3f8da..89ec3f8da 100644 --- a/template/yoga/theme/Sylvia/icon/last.png +++ b/themes/Sylvia/icon/last.png diff --git a/template/yoga/theme/Sylvia/icon/last_unactive.png b/themes/Sylvia/icon/last_unactive.png Binary files differindex 76f47f5b0..76f47f5b0 100644 --- a/template/yoga/theme/Sylvia/icon/last_unactive.png +++ b/themes/Sylvia/icon/last_unactive.png diff --git a/template/yoga/theme/Sylvia/icon/left.png b/themes/Sylvia/icon/left.png Binary files differindex 2d2ff0b08..2d2ff0b08 100644 --- a/template/yoga/theme/Sylvia/icon/left.png +++ b/themes/Sylvia/icon/left.png diff --git a/template/yoga/theme/Sylvia/icon/left_unactive.png b/themes/Sylvia/icon/left_unactive.png Binary files differindex 0b5abd707..0b5abd707 100644 --- a/template/yoga/theme/Sylvia/icon/left_unactive.png +++ b/themes/Sylvia/icon/left_unactive.png diff --git a/template/yoga/theme/Sylvia/icon/lost_password.png b/themes/Sylvia/icon/lost_password.png Binary files differindex 012ba4b28..012ba4b28 100644 --- a/template/yoga/theme/Sylvia/icon/lost_password.png +++ b/themes/Sylvia/icon/lost_password.png diff --git a/template/yoga/theme/Sylvia/icon/metadata.png b/themes/Sylvia/icon/metadata.png Binary files differindex 25da864c3..25da864c3 100644 --- a/template/yoga/theme/Sylvia/icon/metadata.png +++ b/themes/Sylvia/icon/metadata.png diff --git a/template/yoga/theme/Sylvia/icon/metadata_grey.png b/themes/Sylvia/icon/metadata_grey.png Binary files differindex 9463f1980..9463f1980 100644 --- a/template/yoga/theme/Sylvia/icon/metadata_grey.png +++ b/themes/Sylvia/icon/metadata_grey.png diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/avi.png b/themes/Sylvia/icon/mimetypes/avi.png Binary files differindex b5dde0869..b5dde0869 100644 --- a/template/yoga/theme/Sylvia/icon/mimetypes/avi.png +++ b/themes/Sylvia/icon/mimetypes/avi.png diff --git a/template/index.php b/themes/Sylvia/icon/mimetypes/index.php index 871b52b6a..871b52b6a 100644 --- a/template/index.php +++ b/themes/Sylvia/icon/mimetypes/index.php diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/mp3.png b/themes/Sylvia/icon/mimetypes/mp3.png Binary files differindex cb1288596..cb1288596 100644 --- a/template/yoga/theme/Sylvia/icon/mimetypes/mp3.png +++ b/themes/Sylvia/icon/mimetypes/mp3.png diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/mpg.png b/themes/Sylvia/icon/mimetypes/mpg.png Binary files differindex 4dc09c28b..4dc09c28b 100644 --- a/template/yoga/theme/Sylvia/icon/mimetypes/mpg.png +++ b/themes/Sylvia/icon/mimetypes/mpg.png diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/ogg.png b/themes/Sylvia/icon/mimetypes/ogg.png Binary files differindex 978b235f9..978b235f9 100644 --- a/template/yoga/theme/Sylvia/icon/mimetypes/ogg.png +++ b/themes/Sylvia/icon/mimetypes/ogg.png diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/zip.png b/themes/Sylvia/icon/mimetypes/zip.png Binary files differindex 7d76f9a60..7d76f9a60 100644 --- a/template/yoga/theme/Sylvia/icon/mimetypes/zip.png +++ b/themes/Sylvia/icon/mimetypes/zip.png diff --git a/template/yoga/theme/Sylvia/icon/normal_mode.png b/themes/Sylvia/icon/normal_mode.png Binary files differindex a141c5523..a141c5523 100644 --- a/template/yoga/theme/Sylvia/icon/normal_mode.png +++ b/themes/Sylvia/icon/normal_mode.png diff --git a/template/yoga/theme/Sylvia/icon/note.png b/themes/Sylvia/icon/note.png Binary files differindex 9ef1af537..9ef1af537 100644 --- a/template/yoga/theme/Sylvia/icon/note.png +++ b/themes/Sylvia/icon/note.png diff --git a/template/yoga/theme/Sylvia/icon/pause.png b/themes/Sylvia/icon/pause.png Binary files differindex 2bb742f24..2bb742f24 100644 --- a/template/yoga/theme/Sylvia/icon/pause.png +++ b/themes/Sylvia/icon/pause.png diff --git a/template/yoga/theme/Sylvia/icon/pause_selected.png b/themes/Sylvia/icon/pause_selected.png Binary files differindex 2bb742f24..2bb742f24 100644 --- a/template/yoga/theme/Sylvia/icon/pause_selected.png +++ b/themes/Sylvia/icon/pause_selected.png diff --git a/template/yoga/theme/Sylvia/icon/pause_unactive.png b/themes/Sylvia/icon/pause_unactive.png Binary files differindex c756d2aa3..c756d2aa3 100644 --- a/template/yoga/theme/Sylvia/icon/pause_unactive.png +++ b/themes/Sylvia/icon/pause_unactive.png diff --git a/template/yoga/theme/Sylvia/icon/play.png b/themes/Sylvia/icon/play.png Binary files differindex be1b8eeb6..be1b8eeb6 100644 --- a/template/yoga/theme/Sylvia/icon/play.png +++ b/themes/Sylvia/icon/play.png diff --git a/template/yoga/theme/Sylvia/icon/preferences.png b/themes/Sylvia/icon/preferences.png Binary files differindex 8634b5159..8634b5159 100644 --- a/template/yoga/theme/Sylvia/icon/preferences.png +++ b/themes/Sylvia/icon/preferences.png diff --git a/template/yoga/theme/Sylvia/icon/rating-stars.gif b/themes/Sylvia/icon/rating-stars.gif Binary files differindex 4059e0329..4059e0329 100644 --- a/template/yoga/theme/Sylvia/icon/rating-stars.gif +++ b/themes/Sylvia/icon/rating-stars.gif diff --git a/template/yoga/theme/Sylvia/icon/rating-stars.png b/themes/Sylvia/icon/rating-stars.png Binary files differindex dba59ef00..dba59ef00 100644 --- a/template/yoga/theme/Sylvia/icon/rating-stars.png +++ b/themes/Sylvia/icon/rating-stars.png diff --git a/template/yoga/theme/Sylvia/icon/recent.png b/themes/Sylvia/icon/recent.png Binary files differindex 75567d689..75567d689 100644 --- a/template/yoga/theme/Sylvia/icon/recent.png +++ b/themes/Sylvia/icon/recent.png diff --git a/template/yoga/theme/Sylvia/icon/recent_by_child.png b/themes/Sylvia/icon/recent_by_child.png Binary files differindex faf5c4d5c..faf5c4d5c 100644 --- a/template/yoga/theme/Sylvia/icon/recent_by_child.png +++ b/themes/Sylvia/icon/recent_by_child.png diff --git a/template/yoga/theme/Sylvia/icon/recent_s.png b/themes/Sylvia/icon/recent_s.png Binary files differindex 90b190523..90b190523 100644 --- a/template/yoga/theme/Sylvia/icon/recent_s.png +++ b/themes/Sylvia/icon/recent_s.png diff --git a/template/yoga/theme/Sylvia/icon/recent_s_by_child.png b/themes/Sylvia/icon/recent_s_by_child.png Binary files differindex 842a513c4..842a513c4 100644 --- a/template/yoga/theme/Sylvia/icon/recent_s_by_child.png +++ b/themes/Sylvia/icon/recent_s_by_child.png diff --git a/template/yoga/theme/Sylvia/icon/register.png b/themes/Sylvia/icon/register.png Binary files differindex 677c7b9e9..677c7b9e9 100644 --- a/template/yoga/theme/Sylvia/icon/register.png +++ b/themes/Sylvia/icon/register.png diff --git a/template/yoga/theme/Sylvia/icon/remove_s.png b/themes/Sylvia/icon/remove_s.png Binary files differindex 012efc1ad..012efc1ad 100644 --- a/template/yoga/theme/Sylvia/icon/remove_s.png +++ b/themes/Sylvia/icon/remove_s.png diff --git a/template/yoga/theme/Sylvia/icon/representative.png b/themes/Sylvia/icon/representative.png Binary files differindex 02a914da1..02a914da1 100644 --- a/template/yoga/theme/Sylvia/icon/representative.png +++ b/themes/Sylvia/icon/representative.png diff --git a/template/yoga/theme/Sylvia/icon/right.png b/themes/Sylvia/icon/right.png Binary files differindex 6ede2ff93..6ede2ff93 100644 --- a/template/yoga/theme/Sylvia/icon/right.png +++ b/themes/Sylvia/icon/right.png diff --git a/template/yoga/theme/Sylvia/icon/right_unactive.png b/themes/Sylvia/icon/right_unactive.png Binary files differindex 483cd7989..483cd7989 100644 --- a/template/yoga/theme/Sylvia/icon/right_unactive.png +++ b/themes/Sylvia/icon/right_unactive.png diff --git a/template/yoga/theme/Sylvia/icon/save.png b/themes/Sylvia/icon/save.png Binary files differindex 56515f42e..56515f42e 100644 --- a/template/yoga/theme/Sylvia/icon/save.png +++ b/themes/Sylvia/icon/save.png diff --git a/template/yoga/theme/Sylvia/icon/save_selected.png b/themes/Sylvia/icon/save_selected.png Binary files differindex 24aeee308..24aeee308 100644 --- a/template/yoga/theme/Sylvia/icon/save_selected.png +++ b/themes/Sylvia/icon/save_selected.png diff --git a/template/yoga/theme/Sylvia/icon/search_rules.png b/themes/Sylvia/icon/search_rules.png Binary files differindex cc23092a0..cc23092a0 100644 --- a/template/yoga/theme/Sylvia/icon/search_rules.png +++ b/themes/Sylvia/icon/search_rules.png diff --git a/template/yoga/theme/Sylvia/icon/slideshow.png b/themes/Sylvia/icon/slideshow.png Binary files differindex 9263fdcbc..9263fdcbc 100644 --- a/template/yoga/theme/Sylvia/icon/slideshow.png +++ b/themes/Sylvia/icon/slideshow.png diff --git a/template/yoga/theme/Sylvia/icon/slideshow_selected.png b/themes/Sylvia/icon/slideshow_selected.png Binary files differindex 1ab04e0d4..1ab04e0d4 100644 --- a/template/yoga/theme/Sylvia/icon/slideshow_selected.png +++ b/themes/Sylvia/icon/slideshow_selected.png diff --git a/template/yoga/theme/Sylvia/icon/start_filter.png b/themes/Sylvia/icon/start_filter.png Binary files differindex f8611cd83..f8611cd83 100644 --- a/template/yoga/theme/Sylvia/icon/start_filter.png +++ b/themes/Sylvia/icon/start_filter.png diff --git a/template/yoga/theme/Sylvia/icon/start_repeat.png b/themes/Sylvia/icon/start_repeat.png Binary files differindex fc58db189..fc58db189 100644 --- a/template/yoga/theme/Sylvia/icon/start_repeat.png +++ b/themes/Sylvia/icon/start_repeat.png diff --git a/template/yoga/theme/Sylvia/icon/start_repeat_grey.png b/themes/Sylvia/icon/start_repeat_grey.png Binary files differindex d135b913d..d135b913d 100644 --- a/template/yoga/theme/Sylvia/icon/start_repeat_grey.png +++ b/themes/Sylvia/icon/start_repeat_grey.png diff --git a/template/yoga/theme/Sylvia/icon/start_slideshow.png b/themes/Sylvia/icon/start_slideshow.png Binary files differindex 1ab04e0d4..1ab04e0d4 100644 --- a/template/yoga/theme/Sylvia/icon/start_slideshow.png +++ b/themes/Sylvia/icon/start_slideshow.png diff --git a/template/yoga/theme/Sylvia/icon/stop_filter.png b/themes/Sylvia/icon/stop_filter.png Binary files differindex 145e64cc8..145e64cc8 100644 --- a/template/yoga/theme/Sylvia/icon/stop_filter.png +++ b/themes/Sylvia/icon/stop_filter.png diff --git a/template/yoga/theme/Sylvia/icon/stop_repeat.png b/themes/Sylvia/icon/stop_repeat.png Binary files differindex f91f44843..f91f44843 100644 --- a/template/yoga/theme/Sylvia/icon/stop_repeat.png +++ b/themes/Sylvia/icon/stop_repeat.png diff --git a/template/yoga/theme/Sylvia/icon/stop_repeat_pink.png b/themes/Sylvia/icon/stop_repeat_pink.png Binary files differindex 9c71c7d06..9c71c7d06 100644 --- a/template/yoga/theme/Sylvia/icon/stop_repeat_pink.png +++ b/themes/Sylvia/icon/stop_repeat_pink.png diff --git a/template/yoga/theme/Sylvia/icon/stop_selected.png b/themes/Sylvia/icon/stop_selected.png Binary files differindex 3262bbfeb..3262bbfeb 100644 --- a/template/yoga/theme/Sylvia/icon/stop_selected.png +++ b/themes/Sylvia/icon/stop_selected.png diff --git a/template/yoga/theme/Sylvia/icon/stop_slideshow.png b/themes/Sylvia/icon/stop_slideshow.png Binary files differindex b76c73be7..b76c73be7 100644 --- a/template/yoga/theme/Sylvia/icon/stop_slideshow.png +++ b/themes/Sylvia/icon/stop_slideshow.png diff --git a/template/yoga/theme/Sylvia/icon/stop_unactive.png b/themes/Sylvia/icon/stop_unactive.png Binary files differindex 99dccf926..99dccf926 100644 --- a/template/yoga/theme/Sylvia/icon/stop_unactive.png +++ b/themes/Sylvia/icon/stop_unactive.png diff --git a/template/yoga/theme/Sylvia/icon/tag_cloud.png b/themes/Sylvia/icon/tag_cloud.png Binary files differindex 988e5415a..988e5415a 100644 --- a/template/yoga/theme/Sylvia/icon/tag_cloud.png +++ b/themes/Sylvia/icon/tag_cloud.png diff --git a/template/yoga/theme/Sylvia/icon/tag_cloud_grey.png b/themes/Sylvia/icon/tag_cloud_grey.png Binary files differindex 90e32bc60..90e32bc60 100644 --- a/template/yoga/theme/Sylvia/icon/tag_cloud_grey.png +++ b/themes/Sylvia/icon/tag_cloud_grey.png diff --git a/template/yoga/theme/Sylvia/icon/tag_letters.png b/themes/Sylvia/icon/tag_letters.png Binary files differindex eaab2ff4a..eaab2ff4a 100644 --- a/template/yoga/theme/Sylvia/icon/tag_letters.png +++ b/themes/Sylvia/icon/tag_letters.png diff --git a/template/yoga/theme/Sylvia/icon/tag_letters_grey.png b/themes/Sylvia/icon/tag_letters_grey.png Binary files differindex 9ec2fcfd4..9ec2fcfd4 100644 --- a/template/yoga/theme/Sylvia/icon/tag_letters_grey.png +++ b/themes/Sylvia/icon/tag_letters_grey.png diff --git a/template/yoga/theme/Sylvia/icon/tag_letters_pink.png b/themes/Sylvia/icon/tag_letters_pink.png Binary files differindex 21d5faba9..21d5faba9 100644 --- a/template/yoga/theme/Sylvia/icon/tag_letters_pink.png +++ b/themes/Sylvia/icon/tag_letters_pink.png diff --git a/template/yoga/theme/Sylvia/icon/up.png b/themes/Sylvia/icon/up.png Binary files differindex c997af2f5..c997af2f5 100644 --- a/template/yoga/theme/Sylvia/icon/up.png +++ b/themes/Sylvia/icon/up.png diff --git a/template/yoga/theme/Sylvia/icon/validate_s.png b/themes/Sylvia/icon/validate_s.png Binary files differindex adea3d580..adea3d580 100644 --- a/template/yoga/theme/Sylvia/icon/validate_s.png +++ b/themes/Sylvia/icon/validate_s.png diff --git a/template/yoga/theme/Sylvia/images/bottom-left-bg.jpg b/themes/Sylvia/images/bottom-left-bg.jpg Binary files differindex 3d8a5eed2..3d8a5eed2 100644 --- a/template/yoga/theme/Sylvia/images/bottom-left-bg.jpg +++ b/themes/Sylvia/images/bottom-left-bg.jpg diff --git a/template/yoga/theme/Sylvia/images/cat_bottom-left.gif b/themes/Sylvia/images/cat_bottom-left.gif Binary files differindex 2a042897d..2a042897d 100644 --- a/template/yoga/theme/Sylvia/images/cat_bottom-left.gif +++ b/themes/Sylvia/images/cat_bottom-left.gif diff --git a/template/yoga/theme/Sylvia/images/cat_bottom-right.gif b/themes/Sylvia/images/cat_bottom-right.gif Binary files differindex 901f31d52..901f31d52 100644 --- a/template/yoga/theme/Sylvia/images/cat_bottom-right.gif +++ b/themes/Sylvia/images/cat_bottom-right.gif diff --git a/template/yoga/theme/Sylvia/images/cat_top-left.gif b/themes/Sylvia/images/cat_top-left.gif Binary files differindex 1ea57346e..1ea57346e 100644 --- a/template/yoga/theme/Sylvia/images/cat_top-left.gif +++ b/themes/Sylvia/images/cat_top-left.gif diff --git a/template/yoga/theme/Sylvia/images/cat_top-right.gif b/themes/Sylvia/images/cat_top-right.gif Binary files differindex 7eb5c491e..7eb5c491e 100644 --- a/template/yoga/theme/Sylvia/images/cat_top-right.gif +++ b/themes/Sylvia/images/cat_top-right.gif diff --git a/template/yoga/theme/Sylvia/images/fillet.gif b/themes/Sylvia/images/fillet.gif Binary files differindex 6da64117b..6da64117b 100644 --- a/template/yoga/theme/Sylvia/images/fillet.gif +++ b/themes/Sylvia/images/fillet.gif diff --git a/template/yoga/theme/Sylvia/images/header_msgs-bg.gif b/themes/Sylvia/images/header_msgs-bg.gif Binary files differindex 0879e1b79..0879e1b79 100644 --- a/template/yoga/theme/Sylvia/images/header_msgs-bg.gif +++ b/themes/Sylvia/images/header_msgs-bg.gif diff --git a/template/yoga/theme/Sylvia/images/menuBox_bottom.gif b/themes/Sylvia/images/menuBox_bottom.gif Binary files differindex 72c91b117..72c91b117 100644 --- a/template/yoga/theme/Sylvia/images/menuBox_bottom.gif +++ b/themes/Sylvia/images/menuBox_bottom.gif diff --git a/template/yoga/theme/Sylvia/images/menuBox_sides.gif b/themes/Sylvia/images/menuBox_sides.gif Binary files differindex 853772da3..853772da3 100644 --- a/template/yoga/theme/Sylvia/images/menuBox_sides.gif +++ b/themes/Sylvia/images/menuBox_sides.gif diff --git a/template/yoga/theme/Sylvia/images/menuBox_top.gif b/themes/Sylvia/images/menuBox_top.gif Binary files differindex 3c80b3cf9..3c80b3cf9 100644 --- a/template/yoga/theme/Sylvia/images/menuBox_top.gif +++ b/themes/Sylvia/images/menuBox_top.gif diff --git a/template/yoga/theme/Sylvia/images/menuId_bottom.gif b/themes/Sylvia/images/menuId_bottom.gif Binary files differindex e6d1faa1d..e6d1faa1d 100644 --- a/template/yoga/theme/Sylvia/images/menuId_bottom.gif +++ b/themes/Sylvia/images/menuId_bottom.gif diff --git a/template/yoga/theme/Sylvia/images/menuId_sides.gif b/themes/Sylvia/images/menuId_sides.gif Binary files differindex 68923cba2..68923cba2 100644 --- a/template/yoga/theme/Sylvia/images/menuId_sides.gif +++ b/themes/Sylvia/images/menuId_sides.gif diff --git a/template/yoga/theme/Sylvia/images/menuId_top.gif b/themes/Sylvia/images/menuId_top.gif Binary files differindex 5243a4097..5243a4097 100644 --- a/template/yoga/theme/Sylvia/images/menuId_top.gif +++ b/themes/Sylvia/images/menuId_top.gif diff --git a/template/yoga/theme/Sylvia/images/top-left-bg.jpg b/themes/Sylvia/images/top-left-bg.jpg Binary files differindex 98aa1d6a5..98aa1d6a5 100644 --- a/template/yoga/theme/Sylvia/images/top-left-bg.jpg +++ b/themes/Sylvia/images/top-left-bg.jpg diff --git a/template/yoga/theme/Sylvia/images/transparent.gif b/themes/Sylvia/images/transparent.gif Binary files differindex 2fb4189a1..2fb4189a1 100644 --- a/template/yoga/theme/Sylvia/images/transparent.gif +++ b/themes/Sylvia/images/transparent.gif diff --git a/template/yoga/icon/admin/index.php b/themes/Sylvia/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/icon/admin/index.php +++ b/themes/Sylvia/index.php diff --git a/themes/Sylvia/local_head.tpl b/themes/Sylvia/local_head.tpl new file mode 100644 index 000000000..932b5d2da --- /dev/null +++ b/themes/Sylvia/local_head.tpl @@ -0,0 +1,3 @@ +<!--[if IE]> + <link rel="stylesheet" href="{$ROOT_URL}themes/Sylvia/theme-ie.css" type="text/css"> +<![endif]--> diff --git a/template/yoga/theme/Sylvia/mail-css.tpl b/themes/Sylvia/mail-css.tpl index 9924ab4a7..df0f7067f 100644 --- a/template/yoga/theme/Sylvia/mail-css.tpl +++ b/themes/Sylvia/mail-css.tpl @@ -5,7 +5,7 @@ body {ldelim} background-color:#111; color:#666;} #content {ldelim} } #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.jpg) no-repeat scroll left bottom; min-height: 220px; height: 220px; width: 100%; min-width: 100%; padding: 10px 100px 30px 100px; } -h2 {ldelim} color:#f70;background: transparent url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/fillet.gif) repeat-x scroll left bottom; padding-bottom: 5px;} +h2 {ldelim} color:#f70;background: transparent url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/fillet.gif) repeat-x scroll left bottom; padding-bottom: 5px;} img {ldelim} margin: 16px; border: 16px solid #444; -moz-border-radius: 4px; border-radius: 4px 4px; } img:hover {ldelim} padding: 15px; border: 0; background-color:#222;-moz-border-radius: 4px; border-radius: 4px 4px; } a {ldelim} color: #f70; background-color: transparent; border:0; text-decoration: none;} diff --git a/template/yoga/theme/Sylvia/theme-ie.css b/themes/Sylvia/theme-ie.css index e92e5b34d..e92e5b34d 100644 --- a/template/yoga/theme/Sylvia/theme-ie.css +++ b/themes/Sylvia/theme-ie.css diff --git a/template/yoga/theme/Sylvia/theme.css b/themes/Sylvia/theme.css index b4182391e..b4182391e 100644 --- a/template/yoga/theme/Sylvia/theme.css +++ b/themes/Sylvia/theme.css diff --git a/themes/Sylvia/themeconf.inc.php b/themes/Sylvia/themeconf.inc.php new file mode 100644 index 000000000..97af90564 --- /dev/null +++ b/themes/Sylvia/themeconf.inc.php @@ -0,0 +1,8 @@ +<?php +$themeconf = array( + 'theme' => 'Sylvia', + 'parent' => 'default', + 'icon_dir' => 'themes/Sylvia/icon', + 'mime_icon_dir' => 'themes/Sylvia/icon/mimetypes/', +); +?> diff --git a/template/yoga/icon/index.php b/themes/clear/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/icon/index.php +++ b/themes/clear/index.php diff --git a/template/yoga/theme/clear/mail-css.tpl b/themes/clear/mail-css.tpl index 298926540..298926540 100644 --- a/template/yoga/theme/clear/mail-css.tpl +++ b/themes/clear/mail-css.tpl diff --git a/template/yoga/theme/clear/theme.css b/themes/clear/theme.css index c407e95de..c407e95de 100644 --- a/template/yoga/theme/clear/theme.css +++ b/themes/clear/theme.css diff --git a/themes/clear/themeconf.inc.php b/themes/clear/themeconf.inc.php new file mode 100644 index 000000000..771a5be7b --- /dev/null +++ b/themes/clear/themeconf.inc.php @@ -0,0 +1,6 @@ +<?php +$themeconf = array( + 'theme' => 'clear', + 'parent' => 'default', +); +?> diff --git a/template/yoga/icon/mimetypes/index.php b/themes/dark/images/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/icon/mimetypes/index.php +++ b/themes/dark/images/index.php diff --git a/template/yoga/theme/dark/images/tableh1_bg.png b/themes/dark/images/tableh1_bg.png Binary files differindex c7785d0f6..c7785d0f6 100644 --- a/template/yoga/theme/dark/images/tableh1_bg.png +++ b/themes/dark/images/tableh1_bg.png diff --git a/template/yoga/theme/dark/images/tableh2_bg.png b/themes/dark/images/tableh2_bg.png Binary files differindex d8c29f93d..d8c29f93d 100644 --- a/template/yoga/theme/dark/images/tableh2_bg.png +++ b/themes/dark/images/tableh2_bg.png diff --git a/template/yoga/index.php b/themes/dark/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/index.php +++ b/themes/dark/index.php diff --git a/template/yoga/theme/dark/mail-css.tpl b/themes/dark/mail-css.tpl index a3dce91a8..26b51578b 100644 --- a/template/yoga/theme/dark/mail-css.tpl +++ b/themes/dark/mail-css.tpl @@ -5,7 +5,7 @@ body {ldelim} background-color:#444; color:#fff;} #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;} #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom; color: #69c;} -h2 {ldelim} background-color: #333;color:#fff48e;background-image: url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/tableh1_bg.png);} +h2 {ldelim} background-color: #333;color:#fff48e;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);} img {ldelim} margin: 16px; border: 16px solid #111; -moz-border-radius: 4px; border-radius: 4px 4px; } img:hover {ldelim} padding: 15px; border: 1px solid yellow;background-color:#444;-moz-border-radius: 4px; border-radius: 4px 4px; } a {ldelim} color: #fff48e; background: transparent;border-bottom:1px dotted #005e89; } diff --git a/template/yoga/theme/dark/theme.css b/themes/dark/theme.css index eea9562cb..eea9562cb 100644 --- a/template/yoga/theme/dark/theme.css +++ b/themes/dark/theme.css diff --git a/themes/dark/themeconf.inc.php b/themes/dark/themeconf.inc.php new file mode 100644 index 000000000..48ed9577c --- /dev/null +++ b/themes/dark/themeconf.inc.php @@ -0,0 +1,6 @@ +<?php +$themeconf = array( + 'theme' => 'dark', + 'parent' => 'default', +); +?> diff --git a/template/yoga/content.css b/themes/default/content.css index 11023f104..11023f104 100644 --- a/template/yoga/content.css +++ b/themes/default/content.css diff --git a/template/yoga/default-colors.css b/themes/default/default-colors.css index cc094cf0e..cc094cf0e 100644 --- a/template/yoga/default-colors.css +++ b/themes/default/default-colors.css diff --git a/template/yoga/default-layout.css b/themes/default/default-layout.css index ada2ba518..fda1c4f6e 100644 --- a/template/yoga/default-layout.css +++ b/themes/default/default-layout.css @@ -272,3 +272,43 @@ TABLE.tagLetterContent { IMG.ui-datepicker-trigger { cursor : pointer; } + +/* 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)*/ +} diff --git a/template/yoga/fix-ie5-ie6.css b/themes/default/fix-ie5-ie6.css index 54018fea1..54018fea1 100644 --- a/template/yoga/fix-ie5-ie6.css +++ b/themes/default/fix-ie5-ie6.css diff --git a/template/yoga/fix-ie7.css b/themes/default/fix-ie7.css index 70ddf7e8b..70ddf7e8b 100644 --- a/template/yoga/fix-ie7.css +++ b/themes/default/fix-ie7.css diff --git a/template/yoga/fix-khtml.css b/themes/default/fix-khtml.css index a0377886c..a0377886c 100644 --- a/template/yoga/fix-khtml.css +++ b/themes/default/fix-khtml.css diff --git a/template/yoga/icon/add_tag.png b/themes/default/icon/add_tag.png Binary files differindex 9051a1d26..9051a1d26 100644 --- a/template/yoga/icon/add_tag.png +++ b/themes/default/icon/add_tag.png diff --git a/template/yoga/icon/admin/errors.png b/themes/default/icon/admin/errors.png Binary files differindex 3c8a37df5..3c8a37df5 100644 --- a/template/yoga/icon/admin/errors.png +++ b/themes/default/icon/admin/errors.png diff --git a/template/yoga/mail/index.php b/themes/default/icon/admin/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/mail/index.php +++ b/themes/default/icon/admin/index.php diff --git a/template/yoga/icon/admin/infos.png b/themes/default/icon/admin/infos.png Binary files differindex dc8c8a457..dc8c8a457 100644 --- a/template/yoga/icon/admin/infos.png +++ b/themes/default/icon/admin/infos.png diff --git a/template/yoga/icon/caddie_add.png b/themes/default/icon/caddie_add.png Binary files differindex eb20f4e06..eb20f4e06 100644 --- a/template/yoga/icon/caddie_add.png +++ b/themes/default/icon/caddie_add.png diff --git a/template/yoga/icon/calendar.png b/themes/default/icon/calendar.png Binary files differindex e0a44a13d..e0a44a13d 100644 --- a/template/yoga/icon/calendar.png +++ b/themes/default/icon/calendar.png diff --git a/template/yoga/icon/calendar_created.png b/themes/default/icon/calendar_created.png Binary files differindex 14a84c43c..14a84c43c 100644 --- a/template/yoga/icon/calendar_created.png +++ b/themes/default/icon/calendar_created.png diff --git a/template/yoga/icon/category_children.png b/themes/default/icon/category_children.png Binary files differindex 7205c3f61..7205c3f61 100644 --- a/template/yoga/icon/category_children.png +++ b/themes/default/icon/category_children.png diff --git a/template/yoga/icon/category_edit.png b/themes/default/icon/category_edit.png Binary files differindex 0f3b619ed..0f3b619ed 100644 --- a/template/yoga/icon/category_edit.png +++ b/themes/default/icon/category_edit.png diff --git a/template/yoga/icon/category_representant_random.png b/themes/default/icon/category_representant_random.png Binary files differindex dfa69846f..dfa69846f 100644 --- a/template/yoga/icon/category_representant_random.png +++ b/themes/default/icon/category_representant_random.png diff --git a/template/yoga/icon/datepicker.png b/themes/default/icon/datepicker.png Binary files differindex bbb299207..bbb299207 100644 --- a/template/yoga/icon/datepicker.png +++ b/themes/default/icon/datepicker.png diff --git a/template/yoga/icon/dec_period.png b/themes/default/icon/dec_period.png Binary files differindex 107cd16ec..107cd16ec 100644 --- a/template/yoga/icon/dec_period.png +++ b/themes/default/icon/dec_period.png diff --git a/template/yoga/icon/dec_period_unactive.png b/themes/default/icon/dec_period_unactive.png Binary files differindex 5bc67affd..5bc67affd 100644 --- a/template/yoga/icon/dec_period_unactive.png +++ b/themes/default/icon/dec_period_unactive.png diff --git a/template/yoga/icon/del_all_favorites.png b/themes/default/icon/del_all_favorites.png Binary files differindex cfc609749..cfc609749 100644 --- a/template/yoga/icon/del_all_favorites.png +++ b/themes/default/icon/del_all_favorites.png diff --git a/template/yoga/icon/del_favorite.png b/themes/default/icon/del_favorite.png Binary files differindex cfc609749..cfc609749 100644 --- a/template/yoga/icon/del_favorite.png +++ b/themes/default/icon/del_favorite.png diff --git a/template/yoga/icon/delete.png b/themes/default/icon/delete.png Binary files differindex af10be03e..af10be03e 100644 --- a/template/yoga/icon/delete.png +++ b/themes/default/icon/delete.png diff --git a/template/yoga/theme/Sylvia/icon/edit.png b/themes/default/icon/edit.png Binary files differindex 9c755cda1..9c755cda1 100644 --- a/template/yoga/theme/Sylvia/icon/edit.png +++ b/themes/default/icon/edit.png diff --git a/template/yoga/icon/exit.png b/themes/default/icon/exit.png Binary files differindex 2aafbb4cb..2aafbb4cb 100644 --- a/template/yoga/icon/exit.png +++ b/themes/default/icon/exit.png diff --git a/themes/default/icon/favicon.ico b/themes/default/icon/favicon.ico Binary files differnew file mode 100644 index 000000000..d7a1d89fd --- /dev/null +++ b/themes/default/icon/favicon.ico diff --git a/template/yoga/icon/favorite.png b/themes/default/icon/favorite.png Binary files differindex 58befd9e3..58befd9e3 100644 --- a/template/yoga/icon/favorite.png +++ b/themes/default/icon/favorite.png diff --git a/template/yoga/icon/first.png b/themes/default/icon/first.png Binary files differindex 2b8db1cff..2b8db1cff 100644 --- a/template/yoga/icon/first.png +++ b/themes/default/icon/first.png diff --git a/template/yoga/icon/first_unactive.png b/themes/default/icon/first_unactive.png Binary files differindex f0c0364f2..f0c0364f2 100644 --- a/template/yoga/icon/first_unactive.png +++ b/themes/default/icon/first_unactive.png diff --git a/template/yoga/icon/flat.png b/themes/default/icon/flat.png Binary files differindex 43584e825..43584e825 100644 --- a/template/yoga/icon/flat.png +++ b/themes/default/icon/flat.png diff --git a/template/yoga/icon/help.png b/themes/default/icon/help.png Binary files differindex c76f68292..c76f68292 100644 --- a/template/yoga/icon/help.png +++ b/themes/default/icon/help.png diff --git a/template/yoga/icon/home.png b/themes/default/icon/home.png Binary files differindex cce450d85..cce450d85 100644 --- a/template/yoga/icon/home.png +++ b/themes/default/icon/home.png diff --git a/template/yoga/icon/inc_period.png b/themes/default/icon/inc_period.png Binary files differindex 28fef3d1b..28fef3d1b 100644 --- a/template/yoga/icon/inc_period.png +++ b/themes/default/icon/inc_period.png diff --git a/template/yoga/icon/inc_period_unactive.png b/themes/default/icon/inc_period_unactive.png Binary files differindex f45507dce..f45507dce 100644 --- a/template/yoga/icon/inc_period_unactive.png +++ b/themes/default/icon/inc_period_unactive.png diff --git a/template/yoga/mail/text/html/images/index.php b/themes/default/icon/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/mail/text/html/images/index.php +++ b/themes/default/icon/index.php diff --git a/template/yoga/icon/last.png b/themes/default/icon/last.png Binary files differindex 12e1367a7..12e1367a7 100644 --- a/template/yoga/icon/last.png +++ b/themes/default/icon/last.png diff --git a/template/yoga/icon/last_unactive.png b/themes/default/icon/last_unactive.png Binary files differindex 90469d5c4..90469d5c4 100644 --- a/template/yoga/icon/last_unactive.png +++ b/themes/default/icon/last_unactive.png diff --git a/template/yoga/icon/left.png b/themes/default/icon/left.png Binary files differindex 63d306c9c..63d306c9c 100644 --- a/template/yoga/icon/left.png +++ b/themes/default/icon/left.png diff --git a/template/yoga/icon/left_unactive.png b/themes/default/icon/left_unactive.png Binary files differindex 0aefc64e4..0aefc64e4 100644 --- a/template/yoga/icon/left_unactive.png +++ b/themes/default/icon/left_unactive.png diff --git a/template/yoga/icon/lost_password.png b/themes/default/icon/lost_password.png Binary files differindex ad6d71422..ad6d71422 100644 --- a/template/yoga/icon/lost_password.png +++ b/themes/default/icon/lost_password.png diff --git a/template/yoga/icon/metadata.png b/themes/default/icon/metadata.png Binary files differindex d5d8fa6dc..d5d8fa6dc 100644 --- a/template/yoga/icon/metadata.png +++ b/themes/default/icon/metadata.png diff --git a/template/yoga/icon/mimetypes/avi.png b/themes/default/icon/mimetypes/avi.png Binary files differindex 065f0b282..065f0b282 100644 --- a/template/yoga/icon/mimetypes/avi.png +++ b/themes/default/icon/mimetypes/avi.png diff --git a/template/yoga/mail/text/html/index.php b/themes/default/icon/mimetypes/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/mail/text/html/index.php +++ b/themes/default/icon/mimetypes/index.php diff --git a/template/yoga/icon/mimetypes/mp3.png b/themes/default/icon/mimetypes/mp3.png Binary files differindex afb7e1b0a..afb7e1b0a 100644 --- a/template/yoga/icon/mimetypes/mp3.png +++ b/themes/default/icon/mimetypes/mp3.png diff --git a/template/yoga/icon/mimetypes/mpg.png b/themes/default/icon/mimetypes/mpg.png Binary files differindex f7dbd2388..f7dbd2388 100644 --- a/template/yoga/icon/mimetypes/mpg.png +++ b/themes/default/icon/mimetypes/mpg.png diff --git a/template/yoga/icon/mimetypes/ogg.png b/themes/default/icon/mimetypes/ogg.png Binary files differindex ead3f62c3..ead3f62c3 100644 --- a/template/yoga/icon/mimetypes/ogg.png +++ b/themes/default/icon/mimetypes/ogg.png diff --git a/template/yoga/icon/mimetypes/zip.png b/themes/default/icon/mimetypes/zip.png Binary files differindex 1f08fe1a3..1f08fe1a3 100644 --- a/template/yoga/icon/mimetypes/zip.png +++ b/themes/default/icon/mimetypes/zip.png diff --git a/template/yoga/icon/normal_mode.png b/themes/default/icon/normal_mode.png Binary files differindex 92d27a234..92d27a234 100644 --- a/template/yoga/icon/normal_mode.png +++ b/themes/default/icon/normal_mode.png diff --git a/template/yoga/icon/note.png b/themes/default/icon/note.png Binary files differindex 5849f791b..5849f791b 100644 --- a/template/yoga/icon/note.png +++ b/themes/default/icon/note.png diff --git a/template/yoga/icon/pause.png b/themes/default/icon/pause.png Binary files differindex 6a3928c51..6a3928c51 100644 --- a/template/yoga/icon/pause.png +++ b/themes/default/icon/pause.png diff --git a/template/yoga/icon/play.png b/themes/default/icon/play.png Binary files differindex dfde7e96a..dfde7e96a 100644 --- a/template/yoga/icon/play.png +++ b/themes/default/icon/play.png diff --git a/template/yoga/icon/preferences.png b/themes/default/icon/preferences.png Binary files differindex 0f3b619ed..0f3b619ed 100644 --- a/template/yoga/icon/preferences.png +++ b/themes/default/icon/preferences.png diff --git a/template/yoga/icon/rating-stars.gif b/themes/default/icon/rating-stars.gif Binary files differindex 535443e06..535443e06 100644 --- a/template/yoga/icon/rating-stars.gif +++ b/themes/default/icon/rating-stars.gif diff --git a/template/yoga/icon/recent.png b/themes/default/icon/recent.png Binary files differindex 78c1428ca..78c1428ca 100644 --- a/template/yoga/icon/recent.png +++ b/themes/default/icon/recent.png diff --git a/template/yoga/icon/recent_by_child.png b/themes/default/icon/recent_by_child.png Binary files differindex 48e2b4bf7..48e2b4bf7 100644 --- a/template/yoga/icon/recent_by_child.png +++ b/themes/default/icon/recent_by_child.png diff --git a/template/yoga/icon/register.png b/themes/default/icon/register.png Binary files differindex d1dd3c834..d1dd3c834 100644 --- a/template/yoga/icon/register.png +++ b/themes/default/icon/register.png diff --git a/template/yoga/icon/remove_s.png b/themes/default/icon/remove_s.png Binary files differindex c78c38f17..c78c38f17 100644 --- a/template/yoga/icon/remove_s.png +++ b/themes/default/icon/remove_s.png diff --git a/template/yoga/icon/representative.png b/themes/default/icon/representative.png Binary files differindex f1141d91b..f1141d91b 100644 --- a/template/yoga/icon/representative.png +++ b/themes/default/icon/representative.png diff --git a/template/yoga/icon/right.png b/themes/default/icon/right.png Binary files differindex f998098e4..f998098e4 100644 --- a/template/yoga/icon/right.png +++ b/themes/default/icon/right.png diff --git a/template/yoga/icon/right_unactive.png b/themes/default/icon/right_unactive.png Binary files differindex cf2f9614c..cf2f9614c 100644 --- a/template/yoga/icon/right_unactive.png +++ b/themes/default/icon/right_unactive.png diff --git a/template/yoga/icon/save.png b/themes/default/icon/save.png Binary files differindex b4b9da08b..b4b9da08b 100644 --- a/template/yoga/icon/save.png +++ b/themes/default/icon/save.png diff --git a/template/yoga/icon/search_rules.png b/themes/default/icon/search_rules.png Binary files differindex 300186647..300186647 100644 --- a/template/yoga/icon/search_rules.png +++ b/themes/default/icon/search_rules.png diff --git a/template/yoga/icon/start_filter.png b/themes/default/icon/start_filter.png Binary files differindex 3d81a4d2e..3d81a4d2e 100644 --- a/template/yoga/icon/start_filter.png +++ b/themes/default/icon/start_filter.png diff --git a/template/yoga/icon/start_repeat.png b/themes/default/icon/start_repeat.png Binary files differindex 74272979e..74272979e 100644 --- a/template/yoga/icon/start_repeat.png +++ b/themes/default/icon/start_repeat.png diff --git a/template/yoga/icon/start_slideshow.png b/themes/default/icon/start_slideshow.png Binary files differindex 9733eb445..9733eb445 100644 --- a/template/yoga/icon/start_slideshow.png +++ b/themes/default/icon/start_slideshow.png diff --git a/template/yoga/icon/stop_filter.png b/themes/default/icon/stop_filter.png Binary files differindex 1ff012e96..1ff012e96 100644 --- a/template/yoga/icon/stop_filter.png +++ b/themes/default/icon/stop_filter.png diff --git a/template/yoga/icon/stop_repeat.png b/themes/default/icon/stop_repeat.png Binary files differindex f1cc1b564..f1cc1b564 100644 --- a/template/yoga/icon/stop_repeat.png +++ b/themes/default/icon/stop_repeat.png diff --git a/template/yoga/icon/stop_slideshow.png b/themes/default/icon/stop_slideshow.png Binary files differindex 7b8d3ac26..7b8d3ac26 100644 --- a/template/yoga/icon/stop_slideshow.png +++ b/themes/default/icon/stop_slideshow.png diff --git a/template/yoga/icon/tag_cloud.png b/themes/default/icon/tag_cloud.png Binary files differindex 79d7bc250..79d7bc250 100644 --- a/template/yoga/icon/tag_cloud.png +++ b/themes/default/icon/tag_cloud.png diff --git a/template/yoga/icon/tag_letters.png b/themes/default/icon/tag_letters.png Binary files differindex d452db7ec..d452db7ec 100644 --- a/template/yoga/icon/tag_letters.png +++ b/themes/default/icon/tag_letters.png diff --git a/template/yoga/icon/up.png b/themes/default/icon/up.png Binary files differindex 0c9cda5b1..0c9cda5b1 100644 --- a/template/yoga/icon/up.png +++ b/themes/default/icon/up.png diff --git a/template/yoga/icon/validate_s.png b/themes/default/icon/validate_s.png Binary files differindex 400bf8a24..400bf8a24 100644 --- a/template/yoga/icon/validate_s.png +++ b/themes/default/icon/validate_s.png diff --git a/template/yoga/mail/text/index.php b/themes/default/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/mail/text/index.php +++ b/themes/default/index.php diff --git a/template-common/datepicker.js b/themes/default/js/datepicker.js index 743cf65cd..743cf65cd 100644 --- a/template-common/datepicker.js +++ b/themes/default/js/datepicker.js diff --git a/template-common/lib/jquery.js b/themes/default/js/jquery.js index 109701084..109701084 100644 --- a/template-common/lib/jquery.js +++ b/themes/default/js/jquery.js diff --git a/template-common/lib/jquery.packed.js b/themes/default/js/jquery.packed.js index f99269ee9..f99269ee9 100644 --- a/template-common/lib/jquery.packed.js +++ b/themes/default/js/jquery.packed.js diff --git a/template-common/lib/jquery.tablednd.js b/themes/default/js/jquery.tablednd.js index d4c9fec29..d4c9fec29 100644 --- a/template-common/lib/jquery.tablednd.js +++ b/themes/default/js/jquery.tablednd.js diff --git a/template-common/lib/plugins/jquery.autogrow-textarea.js b/themes/default/js/plugins/jquery.autogrow-textarea.js index 2e85b98af..2e85b98af 100644 --- a/template-common/lib/plugins/jquery.autogrow-textarea.js +++ b/themes/default/js/plugins/jquery.autogrow-textarea.js diff --git a/template-common/lib/plugins/jquery.cluetip.js b/themes/default/js/plugins/jquery.cluetip.js index 83727910c..83727910c 100644 --- a/template-common/lib/plugins/jquery.cluetip.js +++ b/themes/default/js/plugins/jquery.cluetip.js diff --git a/template-common/lib/plugins/jquery.cluetip.packed.js b/themes/default/js/plugins/jquery.cluetip.packed.js index 99b15f30c..99b15f30c 100644 --- a/template-common/lib/plugins/jquery.cluetip.packed.js +++ b/themes/default/js/plugins/jquery.cluetip.packed.js diff --git a/template-common/lib/plugins/jquery.fcbkcomplete.js b/themes/default/js/plugins/jquery.fcbkcomplete.js index 86b3b6ab2..86b3b6ab2 100644 --- a/template-common/lib/plugins/jquery.fcbkcomplete.js +++ b/themes/default/js/plugins/jquery.fcbkcomplete.js diff --git a/template-common/lib/plugins/jquery.tipTip.minified.js b/themes/default/js/plugins/jquery.tipTip.minified.js index 62b7cfde0..62b7cfde0 100644 --- a/template-common/lib/plugins/jquery.tipTip.minified.js +++ b/themes/default/js/plugins/jquery.tipTip.minified.js diff --git a/template-common/pngfix.js b/themes/default/js/pngfix.js index 549761a1d..549761a1d 100644 --- a/template-common/pngfix.js +++ b/themes/default/js/pngfix.js diff --git a/template/yoga/rating.js b/themes/default/js/rating.js index 9b8370e93..9b8370e93 100644 --- a/template/yoga/rating.js +++ b/themes/default/js/rating.js diff --git a/template-common/scripts.js b/themes/default/js/scripts.js index d4595435b..d4595435b 100644 --- a/template-common/scripts.js +++ b/themes/default/js/scripts.js diff --git a/template-common/lib/ui/effects.blind.js b/themes/default/js/ui/effects.blind.js index 62d86ef14..62d86ef14 100644 --- a/template-common/lib/ui/effects.blind.js +++ b/themes/default/js/ui/effects.blind.js diff --git a/template-common/lib/ui/effects.bounce.js b/themes/default/js/ui/effects.bounce.js index 646133261..646133261 100644 --- a/template-common/lib/ui/effects.bounce.js +++ b/themes/default/js/ui/effects.bounce.js diff --git a/template-common/lib/ui/effects.clip.js b/themes/default/js/ui/effects.clip.js index 1775f8359..1775f8359 100644 --- a/template-common/lib/ui/effects.clip.js +++ b/themes/default/js/ui/effects.clip.js diff --git a/template-common/lib/ui/effects.core.js b/themes/default/js/ui/effects.core.js index efd0d50b0..efd0d50b0 100644 --- a/template-common/lib/ui/effects.core.js +++ b/themes/default/js/ui/effects.core.js diff --git a/template-common/lib/ui/effects.drop.js b/themes/default/js/ui/effects.drop.js index 604ac8d8b..604ac8d8b 100644 --- a/template-common/lib/ui/effects.drop.js +++ b/themes/default/js/ui/effects.drop.js diff --git a/template-common/lib/ui/effects.explode.js b/themes/default/js/ui/effects.explode.js index 31efd2f54..31efd2f54 100644 --- a/template-common/lib/ui/effects.explode.js +++ b/themes/default/js/ui/effects.explode.js diff --git a/template-common/lib/ui/effects.fold.js b/themes/default/js/ui/effects.fold.js index 5ed1188f6..5ed1188f6 100644 --- a/template-common/lib/ui/effects.fold.js +++ b/themes/default/js/ui/effects.fold.js diff --git a/template-common/lib/ui/effects.highlight.js b/themes/default/js/ui/effects.highlight.js index 828d059ab..828d059ab 100644 --- a/template-common/lib/ui/effects.highlight.js +++ b/themes/default/js/ui/effects.highlight.js diff --git a/template-common/lib/ui/effects.pulsate.js b/themes/default/js/ui/effects.pulsate.js index 6459d1868..6459d1868 100644 --- a/template-common/lib/ui/effects.pulsate.js +++ b/themes/default/js/ui/effects.pulsate.js diff --git a/template-common/lib/ui/effects.scale.js b/themes/default/js/ui/effects.scale.js index ec15cf853..ec15cf853 100644 --- a/template-common/lib/ui/effects.scale.js +++ b/themes/default/js/ui/effects.scale.js diff --git a/template-common/lib/ui/effects.shake.js b/themes/default/js/ui/effects.shake.js index dc9f59710..dc9f59710 100644 --- a/template-common/lib/ui/effects.shake.js +++ b/themes/default/js/ui/effects.shake.js diff --git a/template-common/lib/ui/effects.slide.js b/themes/default/js/ui/effects.slide.js index 350f599e9..350f599e9 100644 --- a/template-common/lib/ui/effects.slide.js +++ b/themes/default/js/ui/effects.slide.js diff --git a/template-common/lib/ui/effects.transfer.js b/themes/default/js/ui/effects.transfer.js index 82bab6d89..82bab6d89 100644 --- a/template-common/lib/ui/effects.transfer.js +++ b/themes/default/js/ui/effects.transfer.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-ar.js b/themes/default/js/ui/i18n/ui.datepicker-ar.js index b60587891..b60587891 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-ar.js +++ b/themes/default/js/ui/i18n/ui.datepicker-ar.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-bg.js b/themes/default/js/ui/i18n/ui.datepicker-bg.js index a73884ef2..a73884ef2 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-bg.js +++ b/themes/default/js/ui/i18n/ui.datepicker-bg.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-ca.js b/themes/default/js/ui/i18n/ui.datepicker-ca.js index ad47af0bb..ad47af0bb 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-ca.js +++ b/themes/default/js/ui/i18n/ui.datepicker-ca.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-cs.js b/themes/default/js/ui/i18n/ui.datepicker-cs.js index 334ae2f46..334ae2f46 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-cs.js +++ b/themes/default/js/ui/i18n/ui.datepicker-cs.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-da.js b/themes/default/js/ui/i18n/ui.datepicker-da.js index 8ad1e2cc3..8ad1e2cc3 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-da.js +++ b/themes/default/js/ui/i18n/ui.datepicker-da.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-de.js b/themes/default/js/ui/i18n/ui.datepicker-de.js index f9299c815..f9299c815 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-de.js +++ b/themes/default/js/ui/i18n/ui.datepicker-de.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-es.js b/themes/default/js/ui/i18n/ui.datepicker-es.js index 0a699afe7..0a699afe7 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-es.js +++ b/themes/default/js/ui/i18n/ui.datepicker-es.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-fi.js b/themes/default/js/ui/i18n/ui.datepicker-fi.js index 3a0943fd7..3a0943fd7 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-fi.js +++ b/themes/default/js/ui/i18n/ui.datepicker-fi.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-fr.js b/themes/default/js/ui/i18n/ui.datepicker-fr.js index 02edda29d..02edda29d 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-fr.js +++ b/themes/default/js/ui/i18n/ui.datepicker-fr.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-he.js b/themes/default/js/ui/i18n/ui.datepicker-he.js index 38e0a03e2..38e0a03e2 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-he.js +++ b/themes/default/js/ui/i18n/ui.datepicker-he.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-hu.js b/themes/default/js/ui/i18n/ui.datepicker-hu.js index ee102acd0..ee102acd0 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-hu.js +++ b/themes/default/js/ui/i18n/ui.datepicker-hu.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-hy.js b/themes/default/js/ui/i18n/ui.datepicker-hy.js index 1ffbeaae0..1ffbeaae0 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-hy.js +++ b/themes/default/js/ui/i18n/ui.datepicker-hy.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-id.js b/themes/default/js/ui/i18n/ui.datepicker-id.js index e5246c85d..e5246c85d 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-id.js +++ b/themes/default/js/ui/i18n/ui.datepicker-id.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-is.js b/themes/default/js/ui/i18n/ui.datepicker-is.js index 68c1a07d4..68c1a07d4 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-is.js +++ b/themes/default/js/ui/i18n/ui.datepicker-is.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-it.js b/themes/default/js/ui/i18n/ui.datepicker-it.js index f3e691e5e..f3e691e5e 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-it.js +++ b/themes/default/js/ui/i18n/ui.datepicker-it.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-ja.js b/themes/default/js/ui/i18n/ui.datepicker-ja.js index a6a5f45ce..a6a5f45ce 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-ja.js +++ b/themes/default/js/ui/i18n/ui.datepicker-ja.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-ko.js b/themes/default/js/ui/i18n/ui.datepicker-ko.js index 53ede9142..53ede9142 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-ko.js +++ b/themes/default/js/ui/i18n/ui.datepicker-ko.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-lt.js b/themes/default/js/ui/i18n/ui.datepicker-lt.js index a8a6aa1a4..a8a6aa1a4 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-lt.js +++ b/themes/default/js/ui/i18n/ui.datepicker-lt.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-lv.js b/themes/default/js/ui/i18n/ui.datepicker-lv.js index 12c32f83c..12c32f83c 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-lv.js +++ b/themes/default/js/ui/i18n/ui.datepicker-lv.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-nl.js b/themes/default/js/ui/i18n/ui.datepicker-nl.js index 938dc5ef6..938dc5ef6 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-nl.js +++ b/themes/default/js/ui/i18n/ui.datepicker-nl.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-no.js b/themes/default/js/ui/i18n/ui.datepicker-no.js index d81f6bb2e..d81f6bb2e 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-no.js +++ b/themes/default/js/ui/i18n/ui.datepicker-no.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-pl.js b/themes/default/js/ui/i18n/ui.datepicker-pl.js index 0ce38bea8..0ce38bea8 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-pl.js +++ b/themes/default/js/ui/i18n/ui.datepicker-pl.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-pt-BR.js b/themes/default/js/ui/i18n/ui.datepicker-pt-BR.js index e3ac652b3..e3ac652b3 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-pt-BR.js +++ b/themes/default/js/ui/i18n/ui.datepicker-pt-BR.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-ro.js b/themes/default/js/ui/i18n/ui.datepicker-ro.js index ec4033cc7..ec4033cc7 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-ro.js +++ b/themes/default/js/ui/i18n/ui.datepicker-ro.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-ru.js b/themes/default/js/ui/i18n/ui.datepicker-ru.js index 62752c7f5..62752c7f5 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-ru.js +++ b/themes/default/js/ui/i18n/ui.datepicker-ru.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-sk.js b/themes/default/js/ui/i18n/ui.datepicker-sk.js index a023ffa77..a023ffa77 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-sk.js +++ b/themes/default/js/ui/i18n/ui.datepicker-sk.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-sv.js b/themes/default/js/ui/i18n/ui.datepicker-sv.js index 47c4b24e4..47c4b24e4 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-sv.js +++ b/themes/default/js/ui/i18n/ui.datepicker-sv.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-th.js b/themes/default/js/ui/i18n/ui.datepicker-th.js index 3c2a02b5e..3c2a02b5e 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-th.js +++ b/themes/default/js/ui/i18n/ui.datepicker-th.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-tr.js b/themes/default/js/ui/i18n/ui.datepicker-tr.js index 5817b2ac0..5817b2ac0 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-tr.js +++ b/themes/default/js/ui/i18n/ui.datepicker-tr.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-uk.js b/themes/default/js/ui/i18n/ui.datepicker-uk.js index 1043d7cd8..1043d7cd8 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-uk.js +++ b/themes/default/js/ui/i18n/ui.datepicker-uk.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-zh-CN.js b/themes/default/js/ui/i18n/ui.datepicker-zh-CN.js index e3a69dc6d..e3a69dc6d 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-zh-CN.js +++ b/themes/default/js/ui/i18n/ui.datepicker-zh-CN.js diff --git a/template-common/lib/ui/i18n/ui.datepicker-zh-TW.js b/themes/default/js/ui/i18n/ui.datepicker-zh-TW.js index 9cb49b72b..9cb49b72b 100644 --- a/template-common/lib/ui/i18n/ui.datepicker-zh-TW.js +++ b/themes/default/js/ui/i18n/ui.datepicker-zh-TW.js diff --git a/template-common/lib/ui/jquery.ui.all.js b/themes/default/js/ui/jquery.ui.all.js index cf19f30a9..cf19f30a9 100644 --- a/template-common/lib/ui/jquery.ui.all.js +++ b/themes/default/js/ui/jquery.ui.all.js diff --git a/template-common/lib/ui/minified/effects.blind.min.js b/themes/default/js/ui/minified/effects.blind.min.js index 42694154e..42694154e 100644 --- a/template-common/lib/ui/minified/effects.blind.min.js +++ b/themes/default/js/ui/minified/effects.blind.min.js diff --git a/template-common/lib/ui/minified/effects.bounce.min.js b/themes/default/js/ui/minified/effects.bounce.min.js index 083aefff2..083aefff2 100644 --- a/template-common/lib/ui/minified/effects.bounce.min.js +++ b/themes/default/js/ui/minified/effects.bounce.min.js diff --git a/template-common/lib/ui/minified/effects.clip.min.js b/themes/default/js/ui/minified/effects.clip.min.js index 3ee699912..3ee699912 100644 --- a/template-common/lib/ui/minified/effects.clip.min.js +++ b/themes/default/js/ui/minified/effects.clip.min.js diff --git a/template-common/lib/ui/minified/effects.core.min.js b/themes/default/js/ui/minified/effects.core.min.js index 4b6203057..4b6203057 100644 --- a/template-common/lib/ui/minified/effects.core.min.js +++ b/themes/default/js/ui/minified/effects.core.min.js diff --git a/template-common/lib/ui/minified/effects.drop.min.js b/themes/default/js/ui/minified/effects.drop.min.js index ba3544ee4..ba3544ee4 100644 --- a/template-common/lib/ui/minified/effects.drop.min.js +++ b/themes/default/js/ui/minified/effects.drop.min.js diff --git a/template-common/lib/ui/minified/effects.explode.min.js b/themes/default/js/ui/minified/effects.explode.min.js index 89e6f528e..89e6f528e 100644 --- a/template-common/lib/ui/minified/effects.explode.min.js +++ b/themes/default/js/ui/minified/effects.explode.min.js diff --git a/template-common/lib/ui/minified/effects.fold.min.js b/themes/default/js/ui/minified/effects.fold.min.js index bbe9846e8..bbe9846e8 100644 --- a/template-common/lib/ui/minified/effects.fold.min.js +++ b/themes/default/js/ui/minified/effects.fold.min.js diff --git a/template-common/lib/ui/minified/effects.highlight.min.js b/themes/default/js/ui/minified/effects.highlight.min.js index bc20b6eea..bc20b6eea 100644 --- a/template-common/lib/ui/minified/effects.highlight.min.js +++ b/themes/default/js/ui/minified/effects.highlight.min.js diff --git a/template-common/lib/ui/minified/effects.pulsate.min.js b/themes/default/js/ui/minified/effects.pulsate.min.js index e1e49b0fa..e1e49b0fa 100644 --- a/template-common/lib/ui/minified/effects.pulsate.min.js +++ b/themes/default/js/ui/minified/effects.pulsate.min.js diff --git a/template-common/lib/ui/minified/effects.scale.min.js b/themes/default/js/ui/minified/effects.scale.min.js index 5b6a336eb..5b6a336eb 100644 --- a/template-common/lib/ui/minified/effects.scale.min.js +++ b/themes/default/js/ui/minified/effects.scale.min.js diff --git a/template-common/lib/ui/minified/effects.shake.min.js b/themes/default/js/ui/minified/effects.shake.min.js index fd035edc9..fd035edc9 100644 --- a/template-common/lib/ui/minified/effects.shake.min.js +++ b/themes/default/js/ui/minified/effects.shake.min.js diff --git a/template-common/lib/ui/minified/effects.slide.min.js b/themes/default/js/ui/minified/effects.slide.min.js index db1b24edc..db1b24edc 100644 --- a/template-common/lib/ui/minified/effects.slide.min.js +++ b/themes/default/js/ui/minified/effects.slide.min.js diff --git a/template-common/lib/ui/minified/effects.transfer.min.js b/themes/default/js/ui/minified/effects.transfer.min.js index 64096cb67..64096cb67 100644 --- a/template-common/lib/ui/minified/effects.transfer.min.js +++ b/themes/default/js/ui/minified/effects.transfer.min.js diff --git a/template-common/lib/ui/minified/ui.accordion.min.js b/themes/default/js/ui/minified/ui.accordion.min.js index e656881d3..e656881d3 100644 --- a/template-common/lib/ui/minified/ui.accordion.min.js +++ b/themes/default/js/ui/minified/ui.accordion.min.js diff --git a/template-common/lib/ui/minified/ui.core.min.js b/themes/default/js/ui/minified/ui.core.min.js index 633465af5..633465af5 100644 --- a/template-common/lib/ui/minified/ui.core.min.js +++ b/themes/default/js/ui/minified/ui.core.min.js diff --git a/template-common/lib/ui/minified/ui.datepicker.min.js b/themes/default/js/ui/minified/ui.datepicker.min.js index ea2c13daf..ea2c13daf 100644 --- a/template-common/lib/ui/minified/ui.datepicker.min.js +++ b/themes/default/js/ui/minified/ui.datepicker.min.js diff --git a/template-common/lib/ui/minified/ui.dialog.min.js b/themes/default/js/ui/minified/ui.dialog.min.js index dac92ce8b..dac92ce8b 100644 --- a/template-common/lib/ui/minified/ui.dialog.min.js +++ b/themes/default/js/ui/minified/ui.dialog.min.js diff --git a/template-common/lib/ui/minified/ui.draggable.min.js b/themes/default/js/ui/minified/ui.draggable.min.js index 9f43db60b..9f43db60b 100644 --- a/template-common/lib/ui/minified/ui.draggable.min.js +++ b/themes/default/js/ui/minified/ui.draggable.min.js diff --git a/template-common/lib/ui/minified/ui.droppable.min.js b/themes/default/js/ui/minified/ui.droppable.min.js index bd984b121..bd984b121 100644 --- a/template-common/lib/ui/minified/ui.droppable.min.js +++ b/themes/default/js/ui/minified/ui.droppable.min.js diff --git a/template-common/lib/ui/minified/ui.resizable.min.js b/themes/default/js/ui/minified/ui.resizable.min.js index ee688bcf0..ee688bcf0 100644 --- a/template-common/lib/ui/minified/ui.resizable.min.js +++ b/themes/default/js/ui/minified/ui.resizable.min.js diff --git a/template-common/lib/ui/minified/ui.selectable.min.js b/themes/default/js/ui/minified/ui.selectable.min.js index b63f55a44..b63f55a44 100644 --- a/template-common/lib/ui/minified/ui.selectable.min.js +++ b/themes/default/js/ui/minified/ui.selectable.min.js diff --git a/template-common/lib/ui/minified/ui.slider.min.js b/themes/default/js/ui/minified/ui.slider.min.js index 209d8338f..209d8338f 100644 --- a/template-common/lib/ui/minified/ui.slider.min.js +++ b/themes/default/js/ui/minified/ui.slider.min.js diff --git a/template-common/lib/ui/minified/ui.sortable.min.js b/themes/default/js/ui/minified/ui.sortable.min.js index 4c4c87265..4c4c87265 100644 --- a/template-common/lib/ui/minified/ui.sortable.min.js +++ b/themes/default/js/ui/minified/ui.sortable.min.js diff --git a/template-common/lib/ui/minified/ui.tabs.min.js b/themes/default/js/ui/minified/ui.tabs.min.js index 39e8edae9..39e8edae9 100644 --- a/template-common/lib/ui/minified/ui.tabs.min.js +++ b/themes/default/js/ui/minified/ui.tabs.min.js diff --git a/template-common/lib/ui/packed/effects.blind.packed.js b/themes/default/js/ui/packed/effects.blind.packed.js index 47c1f6ee4..47c1f6ee4 100644 --- a/template-common/lib/ui/packed/effects.blind.packed.js +++ b/themes/default/js/ui/packed/effects.blind.packed.js diff --git a/template-common/lib/ui/packed/effects.bounce.packed.js b/themes/default/js/ui/packed/effects.bounce.packed.js index d1cc78c04..d1cc78c04 100644 --- a/template-common/lib/ui/packed/effects.bounce.packed.js +++ b/themes/default/js/ui/packed/effects.bounce.packed.js diff --git a/template-common/lib/ui/packed/effects.clip.packed.js b/themes/default/js/ui/packed/effects.clip.packed.js index 925218295..925218295 100644 --- a/template-common/lib/ui/packed/effects.clip.packed.js +++ b/themes/default/js/ui/packed/effects.clip.packed.js diff --git a/template-common/lib/ui/packed/effects.core.packed.js b/themes/default/js/ui/packed/effects.core.packed.js index 9d13af062..9d13af062 100644 --- a/template-common/lib/ui/packed/effects.core.packed.js +++ b/themes/default/js/ui/packed/effects.core.packed.js diff --git a/template-common/lib/ui/packed/effects.drop.packed.js b/themes/default/js/ui/packed/effects.drop.packed.js index ff9373d35..ff9373d35 100644 --- a/template-common/lib/ui/packed/effects.drop.packed.js +++ b/themes/default/js/ui/packed/effects.drop.packed.js diff --git a/template-common/lib/ui/packed/effects.explode.packed.js b/themes/default/js/ui/packed/effects.explode.packed.js index d82346710..d82346710 100644 --- a/template-common/lib/ui/packed/effects.explode.packed.js +++ b/themes/default/js/ui/packed/effects.explode.packed.js diff --git a/template-common/lib/ui/packed/effects.fold.packed.js b/themes/default/js/ui/packed/effects.fold.packed.js index 35d4a4170..35d4a4170 100644 --- a/template-common/lib/ui/packed/effects.fold.packed.js +++ b/themes/default/js/ui/packed/effects.fold.packed.js diff --git a/template-common/lib/ui/packed/effects.highlight.packed.js b/themes/default/js/ui/packed/effects.highlight.packed.js index 523849a2e..523849a2e 100644 --- a/template-common/lib/ui/packed/effects.highlight.packed.js +++ b/themes/default/js/ui/packed/effects.highlight.packed.js diff --git a/template-common/lib/ui/packed/effects.pulsate.packed.js b/themes/default/js/ui/packed/effects.pulsate.packed.js index 895b7b22d..895b7b22d 100644 --- a/template-common/lib/ui/packed/effects.pulsate.packed.js +++ b/themes/default/js/ui/packed/effects.pulsate.packed.js diff --git a/template-common/lib/ui/packed/effects.scale.packed.js b/themes/default/js/ui/packed/effects.scale.packed.js index 8ec5fb862..8ec5fb862 100644 --- a/template-common/lib/ui/packed/effects.scale.packed.js +++ b/themes/default/js/ui/packed/effects.scale.packed.js diff --git a/template-common/lib/ui/packed/effects.shake.packed.js b/themes/default/js/ui/packed/effects.shake.packed.js index 27087ba2c..27087ba2c 100644 --- a/template-common/lib/ui/packed/effects.shake.packed.js +++ b/themes/default/js/ui/packed/effects.shake.packed.js diff --git a/template-common/lib/ui/packed/effects.slide.packed.js b/themes/default/js/ui/packed/effects.slide.packed.js index c4559bfd8..c4559bfd8 100644 --- a/template-common/lib/ui/packed/effects.slide.packed.js +++ b/themes/default/js/ui/packed/effects.slide.packed.js diff --git a/template-common/lib/ui/packed/effects.transfer.packed.js b/themes/default/js/ui/packed/effects.transfer.packed.js index 284fcf37b..284fcf37b 100644 --- a/template-common/lib/ui/packed/effects.transfer.packed.js +++ b/themes/default/js/ui/packed/effects.transfer.packed.js diff --git a/template-common/lib/ui/packed/ui.accordion.packed.js b/themes/default/js/ui/packed/ui.accordion.packed.js index bf3a65504..bf3a65504 100644 --- a/template-common/lib/ui/packed/ui.accordion.packed.js +++ b/themes/default/js/ui/packed/ui.accordion.packed.js diff --git a/template-common/lib/ui/packed/ui.core.packed.js b/themes/default/js/ui/packed/ui.core.packed.js index eab7ba37c..eab7ba37c 100644 --- a/template-common/lib/ui/packed/ui.core.packed.js +++ b/themes/default/js/ui/packed/ui.core.packed.js diff --git a/template-common/lib/ui/packed/ui.datepicker.packed.js b/themes/default/js/ui/packed/ui.datepicker.packed.js index 3aa592136..3aa592136 100644 --- a/template-common/lib/ui/packed/ui.datepicker.packed.js +++ b/themes/default/js/ui/packed/ui.datepicker.packed.js diff --git a/template-common/lib/ui/packed/ui.dialog.packed.js b/themes/default/js/ui/packed/ui.dialog.packed.js index cd10d9f1b..cd10d9f1b 100644 --- a/template-common/lib/ui/packed/ui.dialog.packed.js +++ b/themes/default/js/ui/packed/ui.dialog.packed.js diff --git a/template-common/lib/ui/packed/ui.draggable.packed.js b/themes/default/js/ui/packed/ui.draggable.packed.js index e2ddd379e..e2ddd379e 100644 --- a/template-common/lib/ui/packed/ui.draggable.packed.js +++ b/themes/default/js/ui/packed/ui.draggable.packed.js diff --git a/template-common/lib/ui/packed/ui.droppable.packed.js b/themes/default/js/ui/packed/ui.droppable.packed.js index 496e477f0..496e477f0 100644 --- a/template-common/lib/ui/packed/ui.droppable.packed.js +++ b/themes/default/js/ui/packed/ui.droppable.packed.js diff --git a/template-common/lib/ui/packed/ui.resizable.packed.js b/themes/default/js/ui/packed/ui.resizable.packed.js index f54998ba4..f54998ba4 100644 --- a/template-common/lib/ui/packed/ui.resizable.packed.js +++ b/themes/default/js/ui/packed/ui.resizable.packed.js diff --git a/template-common/lib/ui/packed/ui.selectable.packed.js b/themes/default/js/ui/packed/ui.selectable.packed.js index a397c5184..a397c5184 100644 --- a/template-common/lib/ui/packed/ui.selectable.packed.js +++ b/themes/default/js/ui/packed/ui.selectable.packed.js diff --git a/template-common/lib/ui/packed/ui.slider.packed.js b/themes/default/js/ui/packed/ui.slider.packed.js index 9d269f0c1..9d269f0c1 100644 --- a/template-common/lib/ui/packed/ui.slider.packed.js +++ b/themes/default/js/ui/packed/ui.slider.packed.js diff --git a/template-common/lib/ui/packed/ui.sortable.packed.js b/themes/default/js/ui/packed/ui.sortable.packed.js index 668e8803d..668e8803d 100644 --- a/template-common/lib/ui/packed/ui.sortable.packed.js +++ b/themes/default/js/ui/packed/ui.sortable.packed.js diff --git a/template-common/lib/ui/packed/ui.tabs.packed.js b/themes/default/js/ui/packed/ui.tabs.packed.js index 20da11c44..20da11c44 100644 --- a/template-common/lib/ui/packed/ui.tabs.packed.js +++ b/themes/default/js/ui/packed/ui.tabs.packed.js diff --git a/template-common/lib/ui/theme/ui.datepicker.css b/themes/default/js/ui/theme/ui.datepicker.css index 567f8c97b..567f8c97b 100644 --- a/template-common/lib/ui/theme/ui.datepicker.css +++ b/themes/default/js/ui/theme/ui.datepicker.css diff --git a/template-common/lib/ui/ui.accordion.js b/themes/default/js/ui/ui.accordion.js index e469c3a61..e469c3a61 100644 --- a/template-common/lib/ui/ui.accordion.js +++ b/themes/default/js/ui/ui.accordion.js diff --git a/template-common/lib/ui/ui.core.js b/themes/default/js/ui/ui.core.js index 5493e0aeb..5493e0aeb 100644 --- a/template-common/lib/ui/ui.core.js +++ b/themes/default/js/ui/ui.core.js diff --git a/template-common/lib/ui/ui.datepicker.js b/themes/default/js/ui/ui.datepicker.js index 0ce166efd..0ce166efd 100644 --- a/template-common/lib/ui/ui.datepicker.js +++ b/themes/default/js/ui/ui.datepicker.js diff --git a/template-common/lib/ui/ui.dialog.js b/themes/default/js/ui/ui.dialog.js index fdd5b26df..fdd5b26df 100644 --- a/template-common/lib/ui/ui.dialog.js +++ b/themes/default/js/ui/ui.dialog.js diff --git a/template-common/lib/ui/ui.draggable.js b/themes/default/js/ui/ui.draggable.js index 0402f0e5c..0402f0e5c 100644 --- a/template-common/lib/ui/ui.draggable.js +++ b/themes/default/js/ui/ui.draggable.js diff --git a/template-common/lib/ui/ui.droppable.js b/themes/default/js/ui/ui.droppable.js index 8e7be33c5..8e7be33c5 100644 --- a/template-common/lib/ui/ui.droppable.js +++ b/themes/default/js/ui/ui.droppable.js diff --git a/template-common/lib/ui/ui.resizable.js b/themes/default/js/ui/ui.resizable.js index 6172d6cb8..6172d6cb8 100644 --- a/template-common/lib/ui/ui.resizable.js +++ b/themes/default/js/ui/ui.resizable.js diff --git a/template-common/lib/ui/ui.selectable.js b/themes/default/js/ui/ui.selectable.js index 08f99cf4a..08f99cf4a 100644 --- a/template-common/lib/ui/ui.selectable.js +++ b/themes/default/js/ui/ui.selectable.js diff --git a/template-common/lib/ui/ui.slider.js b/themes/default/js/ui/ui.slider.js index f466a69b2..f466a69b2 100644 --- a/template-common/lib/ui/ui.slider.js +++ b/themes/default/js/ui/ui.slider.js diff --git a/template-common/lib/ui/ui.sortable.js b/themes/default/js/ui/ui.sortable.js index 5460850b4..5460850b4 100644 --- a/template-common/lib/ui/ui.sortable.js +++ b/themes/default/js/ui/ui.sortable.js diff --git a/template-common/lib/ui/ui.tabs.js b/themes/default/js/ui/ui.tabs.js index d914b3e4f..d914b3e4f 100644 --- a/template-common/lib/ui/ui.tabs.js +++ b/themes/default/js/ui/ui.tabs.js diff --git a/template/yoga/layout.css b/themes/default/layout.css index d12ecbacc..d12ecbacc 100644 --- a/template/yoga/layout.css +++ b/themes/default/layout.css diff --git a/themes/default/local_head.tpl b/themes/default/local_head.tpl new file mode 100644 index 000000000..908a880ae --- /dev/null +++ b/themes/default/local_head.tpl @@ -0,0 +1,12 @@ +{* 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}themes/default/fix-khtml.css"> +<!--[if lt IE 7]> + <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie5-ie6.css"> +<![endif]--> +<!--[if gt IE 6]> + <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie7.css"> +<![endif]--> +<!--[if !IE]> <--> + <link rel="stylesheet" href="{$ROOT_URL}themes/default/not-ie.css" type="text/css"> +<!--> <![endif]--> +<link rel="stylesheet" type="text/css" media="print" href="{$ROOT_URL}themes/default/print.css"> diff --git a/template/yoga/mail/text/plain/index.php b/themes/default/mail/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/mail/text/plain/index.php +++ b/themes/default/mail/index.php diff --git a/template/yoga/mail/text/html/images/footer-bg.jpg b/themes/default/mail/text/html/images/footer-bg.jpg Binary files differindex 3d8a5eed2..3d8a5eed2 100644 --- a/template/yoga/mail/text/html/images/footer-bg.jpg +++ b/themes/default/mail/text/html/images/footer-bg.jpg diff --git a/template/yoga/mail/text/html/images/footer-bg.png b/themes/default/mail/text/html/images/footer-bg.png Binary files differindex fd3c2925f..fd3c2925f 100644 --- a/template/yoga/mail/text/html/images/footer-bg.png +++ b/themes/default/mail/text/html/images/footer-bg.png diff --git a/template/yoga/mail/text/html/images/header-bg.png b/themes/default/mail/text/html/images/header-bg.png Binary files differindex 1770a3ddc..1770a3ddc 100644 --- a/template/yoga/mail/text/html/images/header-bg.png +++ b/themes/default/mail/text/html/images/header-bg.png diff --git a/template/yoga/theme/Sylvia/icon/index.php b/themes/default/mail/text/html/images/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/theme/Sylvia/icon/index.php +++ b/themes/default/mail/text/html/images/index.php diff --git a/template/yoga/mail/text/html/images/mailbody-bg.png b/themes/default/mail/text/html/images/mailbody-bg.png Binary files differindex 722a24f63..722a24f63 100644 --- a/template/yoga/mail/text/html/images/mailbody-bg.png +++ b/themes/default/mail/text/html/images/mailbody-bg.png diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/index.php b/themes/default/mail/text/html/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/theme/Sylvia/icon/mimetypes/index.php +++ b/themes/default/mail/text/html/index.php diff --git a/template/yoga/theme/Sylvia/index.php b/themes/default/mail/text/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/theme/Sylvia/index.php +++ b/themes/default/mail/text/index.php diff --git a/template/yoga/theme/clear/index.php b/themes/default/mail/text/plain/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/theme/clear/index.php +++ b/themes/default/mail/text/plain/index.php diff --git a/template/yoga/menubar.css b/themes/default/menubar.css index 27eb1ac38..27eb1ac38 100644 --- a/template/yoga/menubar.css +++ b/themes/default/menubar.css diff --git a/template/yoga/not-ie.css b/themes/default/not-ie.css index c5bd7adef..c5bd7adef 100644 --- a/template/yoga/not-ie.css +++ b/themes/default/not-ie.css diff --git a/template/yoga/picture.css b/themes/default/picture.css index ef2f23213..ef2f23213 100644 --- a/template/yoga/picture.css +++ b/themes/default/picture.css diff --git a/template/yoga/print.css b/themes/default/print.css index 8252f7e44..8252f7e44 100644 --- a/template/yoga/print.css +++ b/themes/default/print.css 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 diff --git a/themes/default/theme.css b/themes/default/theme.css new file mode 100644 index 000000000..2411eb469 --- /dev/null +++ b/themes/default/theme.css @@ -0,0 +1,12 @@ + +/* template css */ +@import "menubar.css"; +@import "content.css"; +@import "thumbnails.css"; +@import "picture.css"; +@import "default-layout.css"; +/* Override properties with import local file */ +@import "local-layout.css"; + +@import "default-colors.css"; + diff --git a/themes/default/themeconf.inc.php b/themes/default/themeconf.inc.php new file mode 100644 index 000000000..0386fc4c6 --- /dev/null +++ b/themes/default/themeconf.inc.php @@ -0,0 +1,7 @@ +<?php +$themeconf = array( + 'theme' => 'default', + 'icon_dir' => 'themes/default/icon', + 'mime_icon_dir' => 'themes/default/icon/mimetypes/', +); +?> diff --git a/template/yoga/thumbnails.css b/themes/default/thumbnails.css index 5ed9544c9..5ed9544c9 100644 --- a/template/yoga/thumbnails.css +++ b/themes/default/thumbnails.css diff --git a/template/yoga/theme/p0w0/index.php b/themes/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/theme/p0w0/index.php +++ b/themes/index.php diff --git a/template/yoga/theme/p0w0/images/button-bg.png b/themes/p0w0/images/button-bg.png Binary files differindex 1ea3b3bd0..1ea3b3bd0 100644 --- a/template/yoga/theme/p0w0/images/button-bg.png +++ b/themes/p0w0/images/button-bg.png diff --git a/template/yoga/theme/wipi/images/index.php b/themes/p0w0/images/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/theme/wipi/images/index.php +++ b/themes/p0w0/images/index.php diff --git a/template/yoga/theme/wipi/index.php b/themes/p0w0/index.php index 871b52b6a..871b52b6a 100644 --- a/template/yoga/theme/wipi/index.php +++ b/themes/p0w0/index.php diff --git a/template/yoga/theme/p0w0/mail-css.tpl b/themes/p0w0/mail-css.tpl index d1e27460a..be4e4c22e 100644 --- a/template/yoga/theme/p0w0/mail-css.tpl +++ b/themes/p0w0/mail-css.tpl @@ -5,7 +5,7 @@ body {ldelim} background-color:#cde; color:#369;} #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;} #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom; color: #69c;} -h2 {ldelim} color:#fff;background: #369 url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/button-bg.png);} +h2 {ldelim} color:#fff;background: #369 url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/button-bg.png);} img {ldelim} margin:16px;padding:15px;border:1px solid #69c;background-color:#eef;-moz-border-radius:4px; border-radius:4px 4px; } img:hover {ldelim} border: 1px solid #c60; -moz-border-radius:4px; border-radius:4px 4px; } a {ldelim} color: #f92; background: transparent; } diff --git a/template/yoga/theme/p0w0/theme.css b/themes/p0w0/theme.css index 06f922082..06f922082 100644 --- a/template/yoga/theme/p0w0/theme.css +++ b/themes/p0w0/theme.css diff --git a/themes/p0w0/themeconf.inc.php b/themes/p0w0/themeconf.inc.php new file mode 100644 index 000000000..63d6fda12 --- /dev/null +++ b/themes/p0w0/themeconf.inc.php @@ -0,0 +1,6 @@ +<?php +$themeconf = array( + 'theme' => 'p0w0', + 'parent' => 'default', +); +?> diff --git a/themes/wipi/images/index.php b/themes/wipi/images/index.php new file mode 100644 index 000000000..871b52b6a --- /dev/null +++ b/themes/wipi/images/index.php @@ -0,0 +1,30 @@ +<?php +// +-----------------------------------------------------------------------+ +// | Piwigo - a PHP based picture gallery | +// +-----------------------------------------------------------------------+ +// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org | +// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | +// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | +// +-----------------------------------------------------------------------+ +// | This program is free software; you can redistribute it and/or modify | +// | it under the terms of the GNU General Public License as published by | +// | the Free Software Foundation | +// | | +// | This program is distributed in the hope that it will be useful, but | +// | WITHOUT ANY WARRANTY; without even the implied warranty of | +// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | +// | General Public License for more details. | +// | | +// | You should have received a copy of the GNU General Public License | +// | along with this program; if not, write to the Free Software | +// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | +// | USA. | +// +-----------------------------------------------------------------------+ + +// Recursive call +$url = '../'; +header( 'Request-URI: '.$url ); +header( 'Content-Location: '.$url ); +header( 'Location: '.$url ); +exit(); +?> diff --git a/template/yoga/theme/wipi/images/tableh1_bg.png b/themes/wipi/images/tableh1_bg.png Binary files differindex 8163e23bf..8163e23bf 100644 --- a/template/yoga/theme/wipi/images/tableh1_bg.png +++ b/themes/wipi/images/tableh1_bg.png diff --git a/template/yoga/theme/wipi/images/tableh2_bg.png b/themes/wipi/images/tableh2_bg.png Binary files differindex be06ee428..be06ee428 100644 --- a/template/yoga/theme/wipi/images/tableh2_bg.png +++ b/themes/wipi/images/tableh2_bg.png diff --git a/themes/wipi/index.php b/themes/wipi/index.php new file mode 100644 index 000000000..871b52b6a --- /dev/null +++ b/themes/wipi/index.php @@ -0,0 +1,30 @@ +<?php +// +-----------------------------------------------------------------------+ +// | Piwigo - a PHP based picture gallery | +// +-----------------------------------------------------------------------+ +// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org | +// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | +// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | +// +-----------------------------------------------------------------------+ +// | This program is free software; you can redistribute it and/or modify | +// | it under the terms of the GNU General Public License as published by | +// | the Free Software Foundation | +// | | +// | This program is distributed in the hope that it will be useful, but | +// | WITHOUT ANY WARRANTY; without even the implied warranty of | +// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | +// | General Public License for more details. | +// | | +// | You should have received a copy of the GNU General Public License | +// | along with this program; if not, write to the Free Software | +// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | +// | USA. | +// +-----------------------------------------------------------------------+ + +// Recursive call +$url = '../'; +header( 'Request-URI: '.$url ); +header( 'Content-Location: '.$url ); +header( 'Location: '.$url ); +exit(); +?> diff --git a/template/yoga/theme/wipi/mail-css.tpl b/themes/wipi/mail-css.tpl index a99f13c5a..a8da286b3 100644 --- a/template/yoga/theme/wipi/mail-css.tpl +++ b/themes/wipi/mail-css.tpl @@ -5,7 +5,7 @@ body {ldelim} background-color:#111; color:#69c;} #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;} #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom; color: #69c;} -h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/tableh1_bg.png);} +h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);} img {ldelim} margin: 16px; padding:15px;border:1px solid #eee; -moz-border-radius: 4px; border-radius: 4px 4px; } img:hover {ldelim} border:1px solid #69c; -moz-border-radius: 4px; border-radius: 4px 4px; } a {ldelim} color: #69c; background: transparent; } diff --git a/template/yoga/theme/wipi/theme.css b/themes/wipi/theme.css index 670d3a57d..670d3a57d 100644 --- a/template/yoga/theme/wipi/theme.css +++ b/themes/wipi/theme.css diff --git a/template/yoga/theme/wipi/themeconf.inc.php b/themes/wipi/themeconf.inc.php index 6644a7590..384e22769 100644 --- a/template/yoga/theme/wipi/themeconf.inc.php +++ b/themes/wipi/themeconf.inc.php @@ -1,11 +1,7 @@ <?php $themeconf = array( - 'template' => 'yoga', - 'theme' => 'wipi', - 'icon_dir' => 'template/yoga/icon', - 'admin_icon_dir' => 'template/yoga/icon/admin', - 'mime_icon_dir' => 'template/yoga/icon/mimetypes/', - 'local_head' => '', + 'theme' => 'wipi', + 'parent' => 'default', ); if ( !isset($lang['Theme: wipi']) ) { diff --git a/upgrade.php b/upgrade.php index ec379432d..b661d5b84 100644 --- a/upgrade.php +++ b/upgrade.php @@ -190,7 +190,7 @@ if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<')) // +-----------------------------------------------------------------------+ include( PHPWG_ROOT_PATH .'include/template.class.php'); -$template = new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma'); +$template = new Template(PHPWG_ROOT_PATH.'admin/themes', 'roma'); $template->set_filenames(array('upgrade'=>'upgrade.tpl')); $template->assign(array( 'RELEASE' => PHPWG_VERSION, |