diff --git a/admin.php b/admin.php index d914ad7ca..aaf9b40ca 100644 --- a/admin.php +++ b/admin.php @@ -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 - -*} - - - - - -{$GALLERY_TITLE} :: {$PAGE_TITLE} - - - - - - -{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} - - - -{if not empty($head_elements)} -{foreach from=$head_elements item=elt} -{$elt} -{/foreach} -{/if} - - - - - -
- -
-

- - {'Home'|@translate} - {$GALLERY_TITLE} - -

- -
- Hello {$USERNAME} : - Visit Gallery | - Change Theme | - {'Logout'|@translate} - (?) -
-
- -
- -{if not empty($header_msgs)} -
- {foreach from=$header_msgs item=elt} - {$elt} - {/foreach} -
-{/if} - -
{*$PAGE_BANNER*}
- -{if not empty($header_notes)} -
- {foreach from=$header_notes item=elt} - {$elt} - {/foreach} -
-{/if} - -
\ 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} - -{/html_head} - - 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 @@ - '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 @@ - '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 similarity index 100% rename from admin/template/goto/theme/clear/icon/cat_move.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/category_children.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/category_delete.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/category_edit.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/category_elements.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/category_jump-to.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/category_permissions.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/category_representant_random.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/check.png rename to admin/themes/clear/icon/check.png diff --git a/admin/template/goto/theme/clear/icon/collapse.gif b/admin/themes/clear/icon/collapse.gif similarity index 100% rename from admin/template/goto/theme/clear/icon/collapse.gif rename to admin/themes/clear/icon/collapse.gif diff --git a/admin/template/goto/theme/clear/icon/datepicker.png b/admin/themes/clear/icon/datepicker.png similarity index 100% rename from admin/template/goto/theme/clear/icon/datepicker.png rename to admin/themes/clear/icon/datepicker.png diff --git a/admin/template/goto/theme/clear/icon/delete.png b/admin/themes/clear/icon/delete.png similarity index 100% rename from admin/template/goto/theme/clear/icon/delete.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/edit_s.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/errors.png rename to admin/themes/clear/icon/errors.png diff --git a/admin/template/goto/theme/clear/icon/exit.png b/admin/themes/clear/icon/exit.png similarity index 100% rename from admin/template/goto/theme/clear/icon/exit.png rename to admin/themes/clear/icon/exit.png diff --git a/admin/template/goto/theme/clear/icon/expand.gif b/admin/themes/clear/icon/expand.gif similarity index 100% rename from admin/template/goto/theme/clear/icon/expand.gif rename to admin/themes/clear/icon/expand.gif diff --git a/admin/template/goto/theme/clear/icon/help.png b/admin/themes/clear/icon/help.png similarity index 100% rename from admin/template/goto/theme/clear/icon/help.png rename to admin/themes/clear/icon/help.png diff --git a/admin/template/goto/theme/clear/icon/index.php b/admin/themes/clear/icon/index.php similarity index 100% rename from admin/template/goto/theme/clear/icon/index.php rename to admin/themes/clear/icon/index.php diff --git a/admin/template/goto/theme/clear/icon/infos.png b/admin/themes/clear/icon/infos.png similarity index 100% rename from admin/template/goto/theme/clear/icon/infos.png rename to admin/themes/clear/icon/infos.png diff --git a/admin/template/goto/theme/clear/icon/note.png b/admin/themes/clear/icon/note.png similarity index 100% rename from admin/template/goto/theme/clear/icon/note.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/page_end.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/page_top.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/permissions.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plug_activate.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plug_activate_grey.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plug_deactivate.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plug_deactivate_grey.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plug_delete.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plug_delete_grey.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plug_install.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plug_install_grey.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plug_uninstall.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plug_uninstall_grey.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plugin_active.gif rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/plugin_inactive.gif rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/preferences.png rename to admin/themes/clear/icon/preferences.png diff --git a/admin/template/goto/theme/clear/icon/ranks.png b/admin/themes/clear/icon/ranks.png similarity index 100% rename from admin/template/goto/theme/clear/icon/ranks.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/ranks_grey.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/sync_metadata.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/sync_metadata_pink.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/toggle_is_default_group.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/uncheck.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/validate_s.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/icon/virt_category.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/external_active.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/external_inactive.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/piwigo_logo_214x100.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/quickLocalSync.png rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/resizable-e.gif rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/resizable-n.gif rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/resizable-ne.gif rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/resizable-nw.gif rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/resizable-s.gif rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/resizable-se.gif rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/resizable-sw.gif rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/resizable-w.gif rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/images/transparent.gif rename to admin/themes/clear/images/transparent.gif diff --git a/admin/template/goto/theme/clear/index.php b/admin/themes/clear/index.php similarity index 100% rename from admin/template/goto/theme/clear/index.php rename to admin/themes/clear/index.php diff --git a/admin/template/goto/theme/clear/mail-css.tpl b/admin/themes/clear/mail-css.tpl similarity index 91% rename from admin/template/goto/theme/clear/mail-css.tpl rename to 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 similarity index 100% rename from admin/template/goto/theme/clear/theme.css rename to 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 @@ + '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 similarity index 100% rename from admin/template/goto/content.css rename to admin/themes/default/content.css diff --git a/admin/template/goto/default-colors.css b/admin/themes/default/default-colors.css similarity index 100% rename from admin/template/goto/default-colors.css rename to admin/themes/default/default-colors.css diff --git a/admin/template/goto/default-layout.css b/admin/themes/default/default-layout.css similarity index 93% rename from admin/template/goto/default-layout.css rename to 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 similarity index 100% rename from admin/template/goto/fix-ie5-ie6.css rename to 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 similarity index 100% rename from admin/template/goto/icon/cat_move.png rename to 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 similarity index 100% rename from admin/template/goto/icon/category_children.png rename to 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 similarity index 100% rename from admin/template/goto/icon/category_delete.png rename to 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 similarity index 100% rename from admin/template/goto/icon/category_edit.png rename to 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 similarity index 100% rename from admin/template/goto/icon/category_elements.png rename to 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 similarity index 100% rename from admin/template/goto/icon/category_jump-to.png rename to 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 similarity index 100% rename from admin/template/goto/icon/category_permissions.png rename to 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 similarity index 100% rename from admin/template/goto/icon/category_representant_random.png rename to admin/themes/default/icon/category_representant_random.png diff --git a/admin/template/goto/icon/check.png b/admin/themes/default/icon/check.png similarity index 100% rename from admin/template/goto/icon/check.png rename to admin/themes/default/icon/check.png diff --git a/admin/template/goto/icon/datepicker.png b/admin/themes/default/icon/datepicker.png similarity index 100% rename from admin/template/goto/icon/datepicker.png rename to admin/themes/default/icon/datepicker.png diff --git a/admin/template/goto/icon/delete.png b/admin/themes/default/icon/delete.png similarity index 100% rename from admin/template/goto/icon/delete.png rename to admin/themes/default/icon/delete.png diff --git a/admin/template/goto/icon/edit_s.png b/admin/themes/default/icon/edit_s.png similarity index 100% rename from admin/template/goto/icon/edit_s.png rename to admin/themes/default/icon/edit_s.png diff --git a/admin/template/goto/icon/errors.png b/admin/themes/default/icon/errors.png similarity index 100% rename from admin/template/goto/icon/errors.png rename to admin/themes/default/icon/errors.png diff --git a/admin/template/goto/icon/exit.png b/admin/themes/default/icon/exit.png similarity index 100% rename from admin/template/goto/icon/exit.png rename to admin/themes/default/icon/exit.png diff --git a/admin/template/goto/icon/fcbkcomplete_close.gif b/admin/themes/default/icon/fcbkcomplete_close.gif similarity index 100% rename from admin/template/goto/icon/fcbkcomplete_close.gif rename to admin/themes/default/icon/fcbkcomplete_close.gif diff --git a/admin/template/goto/icon/help.png b/admin/themes/default/icon/help.png similarity index 100% rename from admin/template/goto/icon/help.png rename to admin/themes/default/icon/help.png diff --git a/admin/template/goto/icon/home.png b/admin/themes/default/icon/home.png similarity index 100% rename from admin/template/goto/icon/home.png rename to admin/themes/default/icon/home.png diff --git a/admin/template/goto/icon/index.php b/admin/themes/default/icon/index.php similarity index 100% rename from admin/template/goto/icon/index.php rename to admin/themes/default/icon/index.php diff --git a/admin/template/goto/icon/infos.png b/admin/themes/default/icon/infos.png similarity index 100% rename from admin/template/goto/icon/infos.png rename to admin/themes/default/icon/infos.png diff --git a/admin/template/goto/icon/note.png b/admin/themes/default/icon/note.png similarity index 100% rename from admin/template/goto/icon/note.png rename to admin/themes/default/icon/note.png diff --git a/admin/template/goto/icon/page_end.png b/admin/themes/default/icon/page_end.png similarity index 100% rename from admin/template/goto/icon/page_end.png rename to 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 similarity index 100% rename from admin/template/goto/icon/page_top.png rename to admin/themes/default/icon/page_top.png diff --git a/admin/template/goto/icon/permissions.png b/admin/themes/default/icon/permissions.png similarity index 100% rename from admin/template/goto/icon/permissions.png rename to admin/themes/default/icon/permissions.png diff --git a/admin/template/goto/icon/plug_activate.png b/admin/themes/default/icon/plug_activate.png similarity index 100% rename from admin/template/goto/icon/plug_activate.png rename to 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 similarity index 100% rename from admin/template/goto/icon/plug_activate_grey.png rename to 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 similarity index 100% rename from admin/template/goto/icon/plug_deactivate.png rename to 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 similarity index 100% rename from admin/template/goto/icon/plug_deactivate_grey.png rename to 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 similarity index 100% rename from admin/template/goto/icon/plug_delete.png rename to 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 similarity index 100% rename from admin/template/goto/icon/plug_delete_grey.png rename to 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 similarity index 100% rename from admin/template/goto/icon/plug_install.png rename to 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 similarity index 100% rename from admin/template/goto/icon/plug_install_grey.png rename to 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 similarity index 100% rename from admin/template/goto/icon/plug_uninstall.png rename to 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 similarity index 100% rename from admin/template/goto/icon/plug_uninstall_grey.png rename to 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 similarity index 100% rename from admin/template/goto/icon/plugin_active.gif rename to 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 similarity index 100% rename from admin/template/goto/icon/plugin_inactive.gif rename to admin/themes/default/icon/plugin_inactive.gif diff --git a/admin/template/goto/icon/preferences.png b/admin/themes/default/icon/preferences.png similarity index 100% rename from admin/template/goto/icon/preferences.png rename to admin/themes/default/icon/preferences.png diff --git a/admin/template/goto/icon/ranks.png b/admin/themes/default/icon/ranks.png similarity index 100% rename from admin/template/goto/icon/ranks.png rename to admin/themes/default/icon/ranks.png diff --git a/admin/template/goto/icon/ranks_grey.png b/admin/themes/default/icon/ranks_grey.png similarity index 100% rename from admin/template/goto/icon/ranks_grey.png rename to 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 similarity index 100% rename from admin/template/goto/icon/sync_metadata.png rename to 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 similarity index 100% rename from admin/template/goto/icon/sync_metadata_pink.png rename to 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 similarity index 100% rename from admin/template/goto/icon/toggle_is_default_group.png rename to 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 similarity index 100% rename from admin/template/goto/icon/uncheck.png rename to admin/themes/default/icon/uncheck.png diff --git a/admin/template/goto/icon/validate_s.png b/admin/themes/default/icon/validate_s.png similarity index 100% rename from admin/template/goto/icon/validate_s.png rename to 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 similarity index 100% rename from admin/template/goto/icon/virt_category.png rename to admin/themes/default/icon/virt_category.png diff --git a/admin/template/goto/index.php b/admin/themes/default/index.php similarity index 100% rename from admin/template/goto/index.php rename to admin/themes/default/index.php diff --git a/admin/template/goto/layout.css b/admin/themes/default/layout.css similarity index 100% rename from admin/template/goto/layout.css rename to admin/themes/default/layout.css diff --git a/admin/template/goto/local-layout.css b/admin/themes/default/local-layout.css similarity index 100% rename from admin/template/goto/local-layout.css rename to 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 @@ + diff --git a/admin/template/goto/menubar.css b/admin/themes/default/menubar.css similarity index 100% rename from admin/template/goto/menubar.css rename to admin/themes/default/menubar.css diff --git a/admin/template/goto/picture.css b/admin/themes/default/picture.css similarity index 100% rename from admin/template/goto/picture.css rename to admin/themes/default/picture.css diff --git a/admin/template/goto/print.css b/admin/themes/default/print.css similarity index 100% rename from admin/template/goto/print.css rename to admin/themes/default/print.css diff --git a/admin/template/goto/admin.tpl b/admin/themes/default/template/admin.tpl similarity index 91% rename from admin/template/goto/admin.tpl rename to 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" } + + +{if not empty($head_elements)} +{foreach from=$head_elements item=elt} +{$elt} +{/foreach} +{/if} + + + + + +
+ +
+

+ + {'Home'|@translate} + {$GALLERY_TITLE} + +

+ +
+ Hello {$USERNAME} : + Visit Gallery | + Change Theme | + {'Logout'|@translate} + (?) +
+
+ +
+ +{if not empty($header_msgs)} +
+ {foreach from=$header_msgs item=elt} + {$elt} + {/foreach} +
+{/if} + +
{*$PAGE_BANNER*}
+ +{if not empty($header_notes)} +
+ {foreach from=$header_notes item=elt} + {$elt} + {/foreach} +
+{/if} + +
\ No newline at end of file diff --git a/admin/template/goto/history.tpl b/admin/themes/default/template/history.tpl similarity index 100% rename from admin/template/goto/history.tpl rename to admin/themes/default/template/history.tpl diff --git a/admin/template/goto/include/autosize.inc.tpl b/admin/themes/default/template/include/autosize.inc.tpl similarity index 58% rename from admin/template/goto/include/autosize.inc.tpl rename to admin/themes/default/template/include/autosize.inc.tpl index 5529d07bd..8f5c78c70 100644 --- a/admin/template/goto/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} + +{/html_head} + + diff --git a/admin/template/goto/include/dbselect.inc.tpl b/admin/themes/default/template/include/dbselect.inc.tpl similarity index 59% rename from admin/template/goto/include/dbselect.inc.tpl rename to 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 similarity index 100% rename from admin/template/goto/include/install.inc.tpl rename to admin/themes/default/template/include/install.inc.tpl diff --git a/admin/template/goto/include/resize.inc.tpl b/admin/themes/default/template/include/resize.inc.tpl similarity index 57% rename from admin/template/goto/include/resize.inc.tpl rename to admin/themes/default/template/include/resize.inc.tpl index aebb9f6c5..30a637563 100644 --- a/admin/template/goto/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 similarity index 84% rename from admin/template/goto/install.tpl rename to 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 @@ - - - - -{include file="include/install.inc.tpl"} + + +{foreach from=$themes item=theme} +{if isset($theme.local_head)}{include file=$theme.local_head}{/if} + +{/foreach} + + {literal} + + - + {if not empty($head_elements)} diff --git a/template/default/identification.tpl b/themes/default/template/identification.tpl similarity index 100% rename from template/default/identification.tpl rename to themes/default/template/identification.tpl diff --git a/template/default/include/autosize.inc.tpl b/themes/default/template/include/autosize.inc.tpl similarity index 58% rename from template/default/include/autosize.inc.tpl rename to themes/default/template/include/autosize.inc.tpl index 5529d07bd..8f5c78c70 100644 --- a/template/default/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} + +{/html_head} + + diff --git a/template/default/include/resize.inc.tpl b/themes/default/template/include/resize.inc.tpl similarity index 57% rename from template/default/include/resize.inc.tpl rename to themes/default/template/include/resize.inc.tpl index aebb9f6c5..30a637563 100644 --- a/template/default/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 similarity index 100% rename from template/default/index.tpl rename to themes/default/template/index.tpl diff --git a/template/yoga/theme/dark/images/index.php b/themes/default/template/mail/index.php similarity index 100% rename from template/yoga/theme/dark/images/index.php rename to 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 similarity index 100% rename from template/default/mail/text/html/cat_group_info.tpl rename to 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 similarity index 100% rename from template/default/mail/text/html/footer.tpl rename to 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 similarity index 100% rename from template/default/mail/text/html/global-mail-css.tpl rename to 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 similarity index 100% rename from template/default/mail/text/html/header.tpl rename to 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 similarity index 100% rename from template/yoga/theme/dark/index.php rename to 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 similarity index 100% rename from template/default/mail/text/html/notification_by_mail.tpl rename to 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 similarity index 100% rename from template/yoga/theme/index.php rename to 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 similarity index 100% rename from template/default/mail/text/plain/cat_group_info.tpl rename to 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 similarity index 100% rename from template/default/mail/text/plain/footer.tpl rename to 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 similarity index 100% rename from template/default/mail/text/plain/header.tpl rename to 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 similarity index 100% rename from template/yoga/theme/p0w0/images/index.php rename to 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 similarity index 100% rename from template/default/mail/text/plain/notification_by_mail.tpl rename to 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 similarity index 100% rename from template/default/mainpage_categories.tpl rename to themes/default/template/mainpage_categories.tpl diff --git a/template/default/menubar.tpl b/themes/default/template/menubar.tpl similarity index 100% rename from template/default/menubar.tpl rename to themes/default/template/menubar.tpl diff --git a/template/default/menubar_categories.tpl b/themes/default/template/menubar_categories.tpl similarity index 100% rename from template/default/menubar_categories.tpl rename to themes/default/template/menubar_categories.tpl diff --git a/template/default/menubar_identification.tpl b/themes/default/template/menubar_identification.tpl similarity index 100% rename from template/default/menubar_identification.tpl rename to themes/default/template/menubar_identification.tpl diff --git a/template/default/menubar_links.tpl b/themes/default/template/menubar_links.tpl similarity index 100% rename from template/default/menubar_links.tpl rename to themes/default/template/menubar_links.tpl diff --git a/template/default/menubar_menu.tpl b/themes/default/template/menubar_menu.tpl similarity index 100% rename from template/default/menubar_menu.tpl rename to themes/default/template/menubar_menu.tpl diff --git a/template/default/menubar_specials.tpl b/themes/default/template/menubar_specials.tpl similarity index 100% rename from template/default/menubar_specials.tpl rename to themes/default/template/menubar_specials.tpl diff --git a/template/default/menubar_tags.tpl b/themes/default/template/menubar_tags.tpl similarity index 100% rename from template/default/menubar_tags.tpl rename to themes/default/template/menubar_tags.tpl diff --git a/template/default/month_calendar.tpl b/themes/default/template/month_calendar.tpl similarity index 100% rename from template/default/month_calendar.tpl rename to themes/default/template/month_calendar.tpl diff --git a/template/default/navigation_bar.tpl b/themes/default/template/navigation_bar.tpl similarity index 100% rename from template/default/navigation_bar.tpl rename to themes/default/template/navigation_bar.tpl diff --git a/template/default/nbm.tpl b/themes/default/template/nbm.tpl similarity index 100% rename from template/default/nbm.tpl rename to themes/default/template/nbm.tpl diff --git a/template/default/notification.tpl b/themes/default/template/notification.tpl similarity index 100% rename from template/default/notification.tpl rename to themes/default/template/notification.tpl diff --git a/template/default/password.tpl b/themes/default/template/password.tpl similarity index 100% rename from template/default/password.tpl rename to themes/default/template/password.tpl diff --git a/template/default/picture.tpl b/themes/default/template/picture.tpl similarity index 98% rename from template/default/picture.tpl rename to 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( {/if} {/foreach} - +