diff options
-rw-r--r-- | admin/advanced_feature.php | 2 | ||||
-rw-r--r-- | admin/cat_list.php | 2 | ||||
-rw-r--r-- | admin/cat_modify.php | 2 | ||||
-rw-r--r-- | admin/cat_move.php | 2 | ||||
-rw-r--r-- | admin/cat_options.php | 4 | ||||
-rw-r--r-- | admin/cat_perm.php | 2 | ||||
-rw-r--r-- | admin/comments.php | 2 | ||||
-rw-r--r-- | admin/configuration.php | 2 | ||||
-rw-r--r-- | admin/element_set_global.php | 2 | ||||
-rw-r--r-- | admin/element_set_ranks.php | 2 | ||||
-rw-r--r-- | admin/element_set_unit.php | 2 | ||||
-rw-r--r-- | admin/extend_for_templates.php | 2 | ||||
-rw-r--r-- | admin/group_list.php | 2 | ||||
-rw-r--r-- | admin/group_perm.php | 4 | ||||
-rw-r--r-- | admin/history.php | 2 | ||||
-rw-r--r-- | admin/include/check_integrity.class.php | 2 | ||||
-rw-r--r-- | admin/include/functions_notification_by_mail.inc.php | 2 | ||||
-rw-r--r-- | admin/include/tabsheet.class.php | 2 | ||||
-rw-r--r-- | admin/maintenance.php | 2 | ||||
-rw-r--r-- | admin/menubar.php | 2 | ||||
-rw-r--r-- | admin/notification_by_mail.php | 4 | ||||
-rw-r--r-- | admin/permalinks.php | 2 | ||||
-rw-r--r-- | admin/picture_modify.php | 2 | ||||
-rw-r--r-- | admin/plugins_list.php | 2 | ||||
-rw-r--r-- | admin/plugins_new.php | 2 | ||||
-rw-r--r-- | admin/plugins_update.php | 2 | ||||
-rw-r--r-- | admin/profile.php | 2 | ||||
-rw-r--r-- | admin/rating.php | 2 | ||||
-rw-r--r-- | admin/site_manager.php | 2 | ||||
-rw-r--r-- | admin/site_update.php | 2 | ||||
-rw-r--r-- | admin/stats.php | 2 | ||||
-rw-r--r-- | admin/tags.php | 2 | ||||
-rw-r--r-- | admin/template/goto/admin.tpl (renamed from admin/template/wigo/admin.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/advanced_feature.tpl (renamed from admin/template/wigo/admin/advanced_feature.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/cat_list.tpl (renamed from admin/template/wigo/admin/cat_list.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/cat_modify.tpl (renamed from admin/template/wigo/admin/cat_modify.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/cat_move.tpl (renamed from admin/template/wigo/admin/cat_move.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/cat_options.tpl (renamed from admin/template/wigo/admin/cat_options.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/cat_perm.tpl (renamed from admin/template/wigo/admin/cat_perm.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/check_integrity.tpl (renamed from admin/template/wigo/admin/check_integrity.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/comments.tpl (renamed from admin/template/wigo/admin/comments.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/configuration.tpl (renamed from admin/template/wigo/admin/configuration.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/double_select.tpl (renamed from admin/template/wigo/admin/double_select.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/element_set_global.tpl (renamed from admin/template/wigo/admin/element_set_global.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/element_set_ranks.tpl (renamed from admin/template/wigo/admin/element_set_ranks.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/element_set_unit.tpl (renamed from admin/template/wigo/admin/element_set_unit.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/extend_for_templates.tpl (renamed from admin/template/wigo/admin/extend_for_templates.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/group_list.tpl (renamed from admin/template/wigo/admin/group_list.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/group_perm.tpl (renamed from admin/template/wigo/admin/group_perm.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/history.tpl (renamed from admin/template/wigo/admin/history.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/index.php (renamed from admin/template/wigo/admin/index.php) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/intro.tpl (renamed from admin/template/wigo/admin/intro.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/maintenance.tpl (renamed from admin/template/wigo/admin/maintenance.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/menubar.tpl (renamed from admin/template/wigo/admin/menubar.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/notification_by_mail.tpl (renamed from admin/template/wigo/admin/notification_by_mail.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/permalinks.tpl (renamed from admin/template/wigo/admin/permalinks.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/picture_modify.tpl (renamed from admin/template/wigo/admin/picture_modify.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/plugins_list.tpl (renamed from admin/template/wigo/admin/plugins_list.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/plugins_new.tpl (renamed from admin/template/wigo/admin/plugins_new.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/plugins_update.tpl (renamed from admin/template/wigo/admin/plugins_update.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/profile.tpl (renamed from admin/template/wigo/admin/profile.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/rating.tpl (renamed from admin/template/wigo/admin/rating.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/site_manager.tpl (renamed from admin/template/wigo/admin/site_manager.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/site_update.tpl (renamed from admin/template/wigo/admin/site_update.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/stats.tpl (renamed from admin/template/wigo/admin/stats.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/tabsheet.tpl (renamed from admin/template/wigo/admin/tabsheet.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/tags.tpl (renamed from admin/template/wigo/admin/tags.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/thumbnail.tpl (renamed from admin/template/wigo/admin/thumbnail.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/upload.tpl (renamed from admin/template/wigo/admin/upload.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/user_list.tpl (renamed from admin/template/wigo/admin/user_list.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/admin/user_perm.tpl (renamed from admin/template/wigo/admin/user_perm.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/content.css (renamed from admin/template/wigo/content.css) | 0 | ||||
-rw-r--r-- | admin/template/goto/default-colors.css (renamed from admin/template/wigo/default-colors.css) | 0 | ||||
-rw-r--r-- | admin/template/goto/default-layout.css (renamed from admin/template/wigo/default-layout.css) | 0 | ||||
-rw-r--r-- | admin/template/goto/fix-ie5-ie6.css (renamed from admin/template/wigo/fix-ie5-ie6.css) | 0 | ||||
-rw-r--r-- | admin/template/goto/footer.tpl (renamed from admin/template/wigo/footer.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/header.tpl (renamed from admin/template/wigo/header.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/icon/category_children.png | bin | 0 -> 1554 bytes | |||
-rw-r--r-- | admin/template/goto/icon/category_delete.png | bin | 0 -> 1613 bytes | |||
-rw-r--r-- | admin/template/goto/icon/category_edit.png | bin | 0 -> 1606 bytes | |||
-rw-r--r-- | admin/template/goto/icon/category_elements.png | bin | 0 -> 1681 bytes | |||
-rw-r--r-- | admin/template/goto/icon/category_jump-to.png | bin | 0 -> 1604 bytes | |||
-rw-r--r-- | admin/template/goto/icon/category_permissions.png | bin | 0 -> 1839 bytes | |||
-rw-r--r-- | admin/template/goto/icon/category_representant_random.png | bin | 0 -> 3171 bytes | |||
-rw-r--r-- | admin/template/goto/icon/check.png | bin | 0 -> 367 bytes | |||
-rw-r--r-- | admin/template/goto/icon/del_favorite.png | bin | 0 -> 1424 bytes | |||
-rw-r--r-- | admin/template/goto/icon/delete.png | bin | 0 -> 778 bytes | |||
-rw-r--r-- | admin/template/goto/icon/edit_s.png | bin | 0 -> 585 bytes | |||
-rw-r--r-- | admin/template/goto/icon/errors.png | bin | 0 -> 3249 bytes | |||
-rw-r--r-- | admin/template/goto/icon/exit.png | bin | 0 -> 1432 bytes | |||
-rw-r--r-- | admin/template/goto/icon/help.png | bin | 0 -> 1994 bytes | |||
-rw-r--r-- | admin/template/goto/icon/index.php (renamed from admin/template/wigo/index.php) | 0 | ||||
-rw-r--r-- | admin/template/goto/icon/infos.png | bin | 0 -> 2250 bytes | |||
-rw-r--r-- | admin/template/goto/icon/note.png | bin | 0 -> 1862 bytes | |||
-rw-r--r-- | admin/template/goto/icon/page_end.png | bin | 0 -> 536 bytes | |||
-rw-r--r-- | admin/template/goto/icon/page_top.png | bin | 0 -> 555 bytes | |||
-rw-r--r-- | admin/template/goto/icon/permissions.png | bin | 0 -> 729 bytes | |||
-rw-r--r-- | admin/template/goto/icon/plugin_active.gif | bin | 0 -> 108 bytes | |||
-rw-r--r-- | admin/template/goto/icon/plugin_inactive.gif | bin | 0 -> 107 bytes | |||
-rw-r--r-- | admin/template/goto/icon/preferences.png | bin | 0 -> 1606 bytes | |||
-rw-r--r-- | admin/template/goto/icon/remove_s.png | bin | 0 -> 451 bytes | |||
-rw-r--r-- | admin/template/goto/icon/sync_metadata.png | bin | 0 -> 1797 bytes | |||
-rw-r--r-- | admin/template/goto/icon/toggle_is_default_group.png | bin | 0 -> 571 bytes | |||
-rw-r--r-- | admin/template/goto/icon/uncheck.png | bin | 0 -> 213 bytes | |||
-rw-r--r-- | admin/template/goto/icon/validate_s.png | bin | 0 -> 315 bytes | |||
-rw-r--r-- | admin/template/goto/icon/virt_category.png | bin | 0 -> 796 bytes | |||
-rw-r--r-- | admin/template/goto/index.php | 30 | ||||
-rw-r--r-- | admin/template/goto/intro.tpl (renamed from admin/template/wigo/intro.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/layout.css (renamed from admin/template/wigo/layout.css) | 0 | ||||
-rw-r--r-- | admin/template/goto/local-layout.css (renamed from admin/template/wigo/local-layout.css) | 0 | ||||
-rw-r--r-- | admin/template/goto/menubar.css (renamed from admin/template/wigo/menubar.css) | 0 | ||||
-rw-r--r-- | admin/template/goto/picture.css (renamed from admin/template/wigo/picture.css) | 0 | ||||
-rw-r--r-- | admin/template/goto/print.css (renamed from admin/template/wigo/print.css) | 0 | ||||
-rw-r--r-- | admin/template/goto/profile_content.tpl (renamed from admin/template/wigo/profile_content.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/theme/roma/images/active_tab.png (renamed from admin/template/wigo/theme/roma/images/active_tab.png) | bin | 678 -> 678 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/active_tab2.png (renamed from admin/template/wigo/theme/roma/images/active_tab2.png) | bin | 593 -> 593 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/bottom-left-bg.png (renamed from admin/template/wigo/theme/roma/images/bottom-left-bg.png) | bin | 22748 -> 22748 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/external_active.png (renamed from admin/template/wigo/theme/roma/images/external_active.png) | bin | 578 -> 578 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/external_inactive.png (renamed from admin/template/wigo/theme/roma/images/external_inactive.png) | bin | 598 -> 598 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/fillet.png (renamed from admin/template/wigo/theme/roma/images/fillet.png) | bin | 153 -> 153 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/inactive_tab.png (renamed from admin/template/wigo/theme/roma/images/inactive_tab.png) | bin | 410 -> 410 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/inactive_tab2.png (renamed from admin/template/wigo/theme/roma/images/inactive_tab2.png) | bin | 416 -> 416 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/menuBoxBottom_new.png (renamed from admin/template/wigo/theme/roma/images/menuBoxBottom_new.png) | bin | 1292 -> 1292 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/menuBoxTop_new.png (renamed from admin/template/wigo/theme/roma/images/menuBoxTop_new.png) | bin | 1635 -> 1635 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/menubar-detail.png (renamed from admin/template/wigo/theme/roma/images/menubar-detail.png) | bin | 208 -> 208 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/menubar-top.png (renamed from admin/template/wigo/theme/roma/images/menubar-top.png) | bin | 1514 -> 1514 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png (renamed from admin/template/wigo/theme/roma/images/piwigo_logo_sombre_214x100.png) | bin | 12154 -> 12154 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/images/top-left-bg.png (renamed from admin/template/wigo/theme/roma/images/top-left-bg.png) | bin | 48511 -> 48511 bytes | |||
-rw-r--r-- | admin/template/goto/theme/roma/index.php (renamed from admin/template/wigo/theme/roma/index.php) | 0 | ||||
-rw-r--r-- | admin/template/goto/theme/roma/mail-css.tpl (renamed from admin/template/wigo/theme/roma/mail-css.tpl) | 0 | ||||
-rw-r--r-- | admin/template/goto/theme/roma/theme.css (renamed from admin/template/wigo/theme/roma/theme.css) | 0 | ||||
-rw-r--r-- | admin/template/goto/theme/roma/themeconf.inc.php (renamed from admin/template/wigo/theme/roma/themeconf.inc.php) | 6 | ||||
-rw-r--r-- | admin/template/goto/thumbnails.css (renamed from admin/template/wigo/thumbnails.css) | 0 | ||||
-rw-r--r-- | admin/thumbnail.php | 2 | ||||
-rw-r--r-- | admin/upload.php | 2 | ||||
-rw-r--r-- | admin/user_list.php | 2 | ||||
-rw-r--r-- | admin/user_perm.php | 4 | ||||
-rw-r--r-- | include/config_default.inc.php | 2 |
138 files changed, 74 insertions, 44 deletions
diff --git a/admin/advanced_feature.php b/admin/advanced_feature.php index da3452e84..6d277bf3f 100644 --- a/admin/advanced_feature.php +++ b/admin/advanced_feature.php @@ -85,7 +85,7 @@ $advanced_features = // | Template init | // +-----------------------------------------------------------------------+ -$template->set_filename('advanced_feature', 'admin/advanced_feature.tpl'); +$template->set_filename('advanced_feature', 'advanced_feature.tpl'); $start_url = get_root_url().'admin.php?page=advanced_feature&action='; diff --git a/admin/cat_list.php b/admin/cat_list.php index 2fa4ee25f..a12cd5717 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -150,7 +150,7 @@ if (isset($_GET['parent_id'])) // +-----------------------------------------------------------------------+ // | template initialization | // +-----------------------------------------------------------------------+ -$template->set_filename('categories', 'admin/cat_list.tpl'); +$template->set_filename('categories', 'cat_list.tpl'); $form_action = PHPWG_ROOT_PATH.'admin.php?page=cat_list'; if (isset($_GET['parent_id'])) diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 5d788b8c2..6f313f9ea 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -221,7 +221,7 @@ $navigation = get_cat_display_name_cache( $form_action = get_root_url().'admin.php?page=cat_modify&cat_id='.$_GET['cat_id']; //----------------------------------------------------- template initialization -$template->set_filename( 'categories', 'admin/cat_modify.tpl'); +$template->set_filename( 'categories', 'cat_modify.tpl'); $base_url = get_root_url().'admin.php?page='; $cat_list_url = $base_url.'cat_list'; diff --git a/admin/cat_move.php b/admin/cat_move.php index 412b1412f..107534d33 100644 --- a/admin/cat_move.php +++ b/admin/cat_move.php @@ -61,7 +61,7 @@ if (isset($_POST['submit'])) // +-----------------------------------------------------------------------+ // | template initialization | // +-----------------------------------------------------------------------+ -$template->set_filename('cat_move', 'admin/cat_move.tpl'); +$template->set_filename('cat_move', 'cat_move.tpl'); $template->assign( array( diff --git a/admin/cat_options.php b/admin/cat_options.php index 810534f0b..3100d59b0 100644 --- a/admin/cat_options.php +++ b/admin/cat_options.php @@ -141,8 +141,8 @@ UPDATE '.CATEGORIES_TABLE.' $template->set_filenames( array( - 'cat_options' => 'admin/cat_options.tpl', - 'double_select' => 'admin/double_select.tpl' + 'cat_options' => 'cat_options.tpl', + 'double_select' => 'double_select.tpl' ) ); diff --git a/admin/cat_perm.php b/admin/cat_perm.php index 45eb15937..59f3dab1a 100644 --- a/admin/cat_perm.php +++ b/admin/cat_perm.php @@ -193,7 +193,7 @@ SELECT user_id, cat_id // | template initialization | // +-----------------------------------------------------------------------+ -$template->set_filename('cat_perm', 'admin/cat_perm.tpl'); +$template->set_filename('cat_perm', 'cat_perm.tpl'); $template->assign( array( diff --git a/admin/comments.php b/admin/comments.php index 200451989..ca380caca 100644 --- a/admin/comments.php +++ b/admin/comments.php @@ -116,7 +116,7 @@ DELETE // | template init | // +-----------------------------------------------------------------------+ -$template->set_filenames(array('comments'=>'admin/comments.tpl')); +$template->set_filenames(array('comments'=>'comments.tpl')); // TabSheet initialization waiting_tabsheet(); diff --git a/admin/configuration.php b/admin/configuration.php index 8e69d9c16..c363f9361 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -164,7 +164,7 @@ WHERE param = \''.$row['param'].'\' } //----------------------------------------------------- template initialization -$template->set_filename('config', 'admin/configuration.tpl'); +$template->set_filename('config', 'configuration.tpl'); // TabSheet $tabsheet = new tabsheet(); diff --git a/admin/element_set_global.php b/admin/element_set_global.php index 20daf4dff..4b22f112f 100644 --- a/admin/element_set_global.php +++ b/admin/element_set_global.php @@ -200,7 +200,7 @@ SELECT id // | template init | // +-----------------------------------------------------------------------+ $template->set_filenames( - array('element_set_global' => 'admin/element_set_global.tpl')); + array('element_set_global' => 'element_set_global.tpl')); $base_url = get_root_url().'admin.php'; diff --git a/admin/element_set_ranks.php b/admin/element_set_ranks.php index 9f4a086ee..4c856264d 100644 --- a/admin/element_set_ranks.php +++ b/admin/element_set_ranks.php @@ -103,7 +103,7 @@ if (isset($_POST['submit'])) // | template init | // +-----------------------------------------------------------------------+ $template->set_filenames( - array('element_set_ranks' => 'admin/element_set_ranks.tpl') + array('element_set_ranks' => 'element_set_ranks.tpl') ); $base_url = get_root_url().'admin.php'; diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php index 28b1cd828..b4eeebb1a 100644 --- a/admin/element_set_unit.php +++ b/admin/element_set_unit.php @@ -126,7 +126,7 @@ SELECT id, date_creation // +-----------------------------------------------------------------------+ $template->set_filenames( - array('element_set_unit' => 'admin/element_set_unit.tpl')); + array('element_set_unit' => 'element_set_unit.tpl')); $base_url = PHPWG_ROOT_PATH.'admin.php'; diff --git a/admin/extend_for_templates.php b/admin/extend_for_templates.php index 00b83c3d9..04fd0177f 100644 --- a/admin/extend_for_templates.php +++ b/admin/extend_for_templates.php @@ -181,7 +181,7 @@ foreach ($new_extensions as $file) } $template->set_filenames(array('extend_for_templates' - => 'admin/extend_for_templates.tpl')); + => 'extend_for_templates.tpl')); $base_url = PHPWG_ROOT_PATH.'admin.php?page=extend_for_templates'; diff --git a/admin/group_list.php b/admin/group_list.php index 323674bc1..09462025e 100644 --- a/admin/group_list.php +++ b/admin/group_list.php @@ -149,7 +149,7 @@ UPDATE '.GROUPS_TABLE.' // | template init | // +-----------------------------------------------------------------------+ -$template->set_filenames(array('group_list' => 'admin/group_list.tpl')); +$template->set_filenames(array('group_list' => 'group_list.tpl')); $template->assign( array( diff --git a/admin/group_perm.php b/admin/group_perm.php index 430730001..af43c6d5e 100644 --- a/admin/group_perm.php +++ b/admin/group_perm.php @@ -123,8 +123,8 @@ SELECT cat_id $template->set_filenames( array( - 'group_perm' => 'admin/group_perm.tpl', - 'double_select' => 'admin/double_select.tpl' + 'group_perm' => 'group_perm.tpl', + 'double_select' => 'double_select.tpl' ) ); diff --git a/admin/history.php b/admin/history.php index c064e7516..02b321055 100644 --- a/admin/history.php +++ b/admin/history.php @@ -151,7 +151,7 @@ INSERT INTO '.SEARCH_TABLE.' // | template init | // +-----------------------------------------------------------------------+ -$template->set_filename('history', 'admin/history.tpl'); +$template->set_filename('history', 'history.tpl'); // TabSheet initialization history_tabsheet(); diff --git a/admin/include/check_integrity.class.php b/admin/include/check_integrity.class.php index b6f3ddd6a..97d29bb76 100644 --- a/admin/include/check_integrity.class.php +++ b/admin/include/check_integrity.class.php @@ -184,7 +184,7 @@ class check_integrity if (isset($this->retrieve_list) and count($this->retrieve_list) > 0) { - $template->set_filenames(array('check_integrity' => 'admin/check_integrity.tpl')); + $template->set_filenames(array('check_integrity' => 'check_integrity.tpl')); foreach ($this->retrieve_list as $i => $c13y) { diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php index c7c9f1942..683b1d55b 100644 --- a/admin/include/functions_notification_by_mail.inc.php +++ b/admin/include/functions_notification_by_mail.inc.php @@ -261,7 +261,7 @@ function set_user_on_env_nbm(&$nbm_user, $is_action_send) $env_nbm['mail_template'] = get_mail_template($env_nbm['email_format'], array('template' => $nbm_user['template'], 'theme' => $nbm_user['theme'])); - $env_nbm['mail_template']->set_filename('notification_by_mail', 'admin/notification_by_mail.tpl'); + $env_nbm['mail_template']->set_filename('notification_by_mail', 'notification_by_mail.tpl'); } } diff --git a/admin/include/tabsheet.class.php b/admin/include/tabsheet.class.php index c295f0ae0..77452a81d 100644 --- a/admin/include/tabsheet.class.php +++ b/admin/include/tabsheet.class.php @@ -126,7 +126,7 @@ class tabsheet { global $template; - $template->set_filename('tabsheet', 'admin/tabsheet.tpl'); + $template->set_filename('tabsheet', 'tabsheet.tpl'); $template->assign('tabsheet', $this->sheets); $template->assign('tabsheet_selected', $this->selected); diff --git a/admin/maintenance.php b/admin/maintenance.php index 69268cf2c..946fcf916 100644 --- a/admin/maintenance.php +++ b/admin/maintenance.php @@ -115,7 +115,7 @@ DELETE // | template init | // +-----------------------------------------------------------------------+ -$template->set_filenames(array('maintenance'=>'admin/maintenance.tpl')); +$template->set_filenames(array('maintenance'=>'maintenance.tpl')); $start_url = get_root_url().'admin.php?page=maintenance&action='; diff --git a/admin/menubar.php b/admin/menubar.php index bdd761762..9873fb8f6 100644 --- a/admin/menubar.php +++ b/admin/menubar.php @@ -157,6 +157,6 @@ foreach ($mb_conf as $id => $pos ) ) ); } -$template->set_filename( 'menubar_admin_content', 'admin/menubar.tpl' ); +$template->set_filename( 'menubar_admin_content', 'menubar.tpl' ); $template->assign_var_from_handle( 'ADMIN_CONTENT', 'menubar_admin_content'); ?> diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php index fc0a2d637..829637ea1 100644 --- a/admin/notification_by_mail.php +++ b/admin/notification_by_mail.php @@ -574,8 +574,8 @@ $template->set_filenames ( array ( - 'double_select' => 'admin/double_select.tpl', - 'notification_by_mail'=>'admin/notification_by_mail.tpl' + 'double_select' => 'double_select.tpl', + 'notification_by_mail'=>'notification_by_mail.tpl' ) ); diff --git a/admin/permalinks.php b/admin/permalinks.php index ecae18965..645e65b61 100644 --- a/admin/permalinks.php +++ b/admin/permalinks.php @@ -104,7 +104,7 @@ DELETE FROM '.OLD_PERMALINKS_TABLE.' } -$template->set_filename('permalinks', 'admin/permalinks.tpl' ); +$template->set_filename('permalinks', 'permalinks.tpl' ); $query = ' SELECT diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 2fbaf901b..d9437eb20 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -194,7 +194,7 @@ $selected_tags = array_from_query($query, 'tag_id'); $template->set_filenames( array( - 'picture_modify' => 'admin/picture_modify.tpl' + 'picture_modify' => 'picture_modify.tpl' ) ); diff --git a/admin/plugins_list.php b/admin/plugins_list.php index ca8033164..ddae73ce3 100644 --- a/admin/plugins_list.php +++ b/admin/plugins_list.php @@ -28,7 +28,7 @@ if( !defined("PHPWG_ROOT_PATH") ) include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php'); -$template->set_filenames(array('plugins' => 'admin/plugins_list.tpl')); +$template->set_filenames(array('plugins' => 'plugins_list.tpl')); $order = isset($_GET['order']) ? $_GET['order'] : 'name'; $base_url = get_root_url().'admin.php?page='.$page['page'].'&order='.$order; diff --git a/admin/plugins_new.php b/admin/plugins_new.php index 31171b443..19d2be9a4 100644 --- a/admin/plugins_new.php +++ b/admin/plugins_new.php @@ -28,7 +28,7 @@ if( !defined("PHPWG_ROOT_PATH") ) include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php'); -$template->set_filenames(array('plugins' => 'admin/plugins_new.tpl')); +$template->set_filenames(array('plugins' => 'plugins_new.tpl')); $order = isset($_GET['order']) ? $_GET['order'] : 'date'; $base_url = get_root_url().'admin.php?page='.$page['page'].'&order='.$order; diff --git a/admin/plugins_update.php b/admin/plugins_update.php index bdb8c5b9d..3c274b14f 100644 --- a/admin/plugins_update.php +++ b/admin/plugins_update.php @@ -28,7 +28,7 @@ if( !defined("PHPWG_ROOT_PATH") ) include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php'); -$template->set_filenames(array('plugins' => 'admin/plugins_update.tpl')); +$template->set_filenames(array('plugins' => 'plugins_update.tpl')); $base_url = get_root_url().'admin.php?page='.$page['page']; diff --git a/admin/profile.php b/admin/profile.php index 7c4244494..643f6cca5 100644 --- a/admin/profile.php +++ b/admin/profile.php @@ -41,6 +41,6 @@ load_profile_in_template( ); $page['errors'] = array_merge($page['errors'], $errors); -$template->set_filename('profile', 'admin/profile.tpl'); +$template->set_filename('profile', 'profile.tpl'); $template->assign_var_from_handle('ADMIN_CONTENT', 'profile'); ?> diff --git a/admin/rating.php b/admin/rating.php index 11ed82cb4..53ec75a7f 100644 --- a/admin/rating.php +++ b/admin/rating.php @@ -111,7 +111,7 @@ list($nb_images) = mysql_fetch_row(pwg_query($query)); // | template init | // +-----------------------------------------------------------------------+ -$template->set_filename('rating', 'admin/rating.tpl'); +$template->set_filename('rating', 'rating.tpl'); $template->assign( array( diff --git a/admin/site_manager.php b/admin/site_manager.php index def9fe579..b965b26e8 100644 --- a/admin/site_manager.php +++ b/admin/site_manager.php @@ -72,7 +72,7 @@ function remote_output($url) // +-----------------------------------------------------------------------+ // | template init | // +-----------------------------------------------------------------------+ -$template->set_filenames(array('site_manager'=>'admin/site_manager.tpl')); +$template->set_filenames(array('site_manager'=>'site_manager.tpl')); // +-----------------------------------------------------------------------+ // | new site creation form | diff --git a/admin/site_update.php b/admin/site_update.php index ba406afe4..5576e83f2 100644 --- a/admin/site_update.php +++ b/admin/site_update.php @@ -830,7 +830,7 @@ SELECT id // +-----------------------------------------------------------------------+ // | template initialization | // +-----------------------------------------------------------------------+ -$template->set_filenames(array('update'=>'admin/site_update.tpl')); +$template->set_filenames(array('update'=>'site_update.tpl')); $result_title = ''; if (isset($simulate) and $simulate) { diff --git a/admin/stats.php b/admin/stats.php index 9892127c8..d1d0aa418 100644 --- a/admin/stats.php +++ b/admin/stats.php @@ -371,7 +371,7 @@ if (isset($page['day'])) $period_label = l10n('Hour'); } -$template->set_filename('stats', 'admin/stats.tpl'); +$template->set_filename('stats', 'stats.tpl'); // TabSheet initialization history_tabsheet(); diff --git a/admin/tags.php b/admin/tags.php index 36e668a3d..34524726f 100644 --- a/admin/tags.php +++ b/admin/tags.php @@ -185,7 +185,7 @@ SELECT id // | template init | // +-----------------------------------------------------------------------+ -$template->set_filenames(array('tags' => 'admin/tags.tpl')); +$template->set_filenames(array('tags' => 'tags.tpl')); $template->assign( array( diff --git a/admin/template/wigo/admin.tpl b/admin/template/goto/admin.tpl index 7aba18541..7aba18541 100644 --- a/admin/template/wigo/admin.tpl +++ b/admin/template/goto/admin.tpl diff --git a/admin/template/wigo/admin/advanced_feature.tpl b/admin/template/goto/admin/advanced_feature.tpl index 4b9035d27..4b9035d27 100644 --- a/admin/template/wigo/admin/advanced_feature.tpl +++ b/admin/template/goto/admin/advanced_feature.tpl diff --git a/admin/template/wigo/admin/cat_list.tpl b/admin/template/goto/admin/cat_list.tpl index b408a5a50..b408a5a50 100644 --- a/admin/template/wigo/admin/cat_list.tpl +++ b/admin/template/goto/admin/cat_list.tpl diff --git a/admin/template/wigo/admin/cat_modify.tpl b/admin/template/goto/admin/cat_modify.tpl index b1b46a36f..b1b46a36f 100644 --- a/admin/template/wigo/admin/cat_modify.tpl +++ b/admin/template/goto/admin/cat_modify.tpl diff --git a/admin/template/wigo/admin/cat_move.tpl b/admin/template/goto/admin/cat_move.tpl index 2ca670e20..2ca670e20 100644 --- a/admin/template/wigo/admin/cat_move.tpl +++ b/admin/template/goto/admin/cat_move.tpl diff --git a/admin/template/wigo/admin/cat_options.tpl b/admin/template/goto/admin/cat_options.tpl index 2cad2afed..2cad2afed 100644 --- a/admin/template/wigo/admin/cat_options.tpl +++ b/admin/template/goto/admin/cat_options.tpl diff --git a/admin/template/wigo/admin/cat_perm.tpl b/admin/template/goto/admin/cat_perm.tpl index 858ff3723..858ff3723 100644 --- a/admin/template/wigo/admin/cat_perm.tpl +++ b/admin/template/goto/admin/cat_perm.tpl diff --git a/admin/template/wigo/admin/check_integrity.tpl b/admin/template/goto/admin/check_integrity.tpl index 3d1bfb5d1..3d1bfb5d1 100644 --- a/admin/template/wigo/admin/check_integrity.tpl +++ b/admin/template/goto/admin/check_integrity.tpl diff --git a/admin/template/wigo/admin/comments.tpl b/admin/template/goto/admin/comments.tpl index 5ceef17b1..5ceef17b1 100644 --- a/admin/template/wigo/admin/comments.tpl +++ b/admin/template/goto/admin/comments.tpl diff --git a/admin/template/wigo/admin/configuration.tpl b/admin/template/goto/admin/configuration.tpl index 8bd9ecaf6..8bd9ecaf6 100644 --- a/admin/template/wigo/admin/configuration.tpl +++ b/admin/template/goto/admin/configuration.tpl diff --git a/admin/template/wigo/admin/double_select.tpl b/admin/template/goto/admin/double_select.tpl index aeed8500a..aeed8500a 100644 --- a/admin/template/wigo/admin/double_select.tpl +++ b/admin/template/goto/admin/double_select.tpl diff --git a/admin/template/wigo/admin/element_set_global.tpl b/admin/template/goto/admin/element_set_global.tpl index fc5a92e70..fc5a92e70 100644 --- a/admin/template/wigo/admin/element_set_global.tpl +++ b/admin/template/goto/admin/element_set_global.tpl diff --git a/admin/template/wigo/admin/element_set_ranks.tpl b/admin/template/goto/admin/element_set_ranks.tpl index 31e614480..31e614480 100644 --- a/admin/template/wigo/admin/element_set_ranks.tpl +++ b/admin/template/goto/admin/element_set_ranks.tpl diff --git a/admin/template/wigo/admin/element_set_unit.tpl b/admin/template/goto/admin/element_set_unit.tpl index 40e1c1863..40e1c1863 100644 --- a/admin/template/wigo/admin/element_set_unit.tpl +++ b/admin/template/goto/admin/element_set_unit.tpl diff --git a/admin/template/wigo/admin/extend_for_templates.tpl b/admin/template/goto/admin/extend_for_templates.tpl index 2e9c4766b..2e9c4766b 100644 --- a/admin/template/wigo/admin/extend_for_templates.tpl +++ b/admin/template/goto/admin/extend_for_templates.tpl diff --git a/admin/template/wigo/admin/group_list.tpl b/admin/template/goto/admin/group_list.tpl index a1d9f74f6..a1d9f74f6 100644 --- a/admin/template/wigo/admin/group_list.tpl +++ b/admin/template/goto/admin/group_list.tpl diff --git a/admin/template/wigo/admin/group_perm.tpl b/admin/template/goto/admin/group_perm.tpl index 1dded1291..1dded1291 100644 --- a/admin/template/wigo/admin/group_perm.tpl +++ b/admin/template/goto/admin/group_perm.tpl diff --git a/admin/template/wigo/admin/history.tpl b/admin/template/goto/admin/history.tpl index f3c3575b6..f3c3575b6 100644 --- a/admin/template/wigo/admin/history.tpl +++ b/admin/template/goto/admin/history.tpl diff --git a/admin/template/wigo/admin/index.php b/admin/template/goto/admin/index.php index c15b15795..c15b15795 100644 --- a/admin/template/wigo/admin/index.php +++ b/admin/template/goto/admin/index.php diff --git a/admin/template/wigo/admin/intro.tpl b/admin/template/goto/admin/intro.tpl index 457e50644..457e50644 100644 --- a/admin/template/wigo/admin/intro.tpl +++ b/admin/template/goto/admin/intro.tpl diff --git a/admin/template/wigo/admin/maintenance.tpl b/admin/template/goto/admin/maintenance.tpl index b37ec864e..b37ec864e 100644 --- a/admin/template/wigo/admin/maintenance.tpl +++ b/admin/template/goto/admin/maintenance.tpl diff --git a/admin/template/wigo/admin/menubar.tpl b/admin/template/goto/admin/menubar.tpl index 29f546e16..29f546e16 100644 --- a/admin/template/wigo/admin/menubar.tpl +++ b/admin/template/goto/admin/menubar.tpl diff --git a/admin/template/wigo/admin/notification_by_mail.tpl b/admin/template/goto/admin/notification_by_mail.tpl index ef11e52d1..ef11e52d1 100644 --- a/admin/template/wigo/admin/notification_by_mail.tpl +++ b/admin/template/goto/admin/notification_by_mail.tpl diff --git a/admin/template/wigo/admin/permalinks.tpl b/admin/template/goto/admin/permalinks.tpl index 2e28fe538..2e28fe538 100644 --- a/admin/template/wigo/admin/permalinks.tpl +++ b/admin/template/goto/admin/permalinks.tpl diff --git a/admin/template/wigo/admin/picture_modify.tpl b/admin/template/goto/admin/picture_modify.tpl index f6243acb9..f6243acb9 100644 --- a/admin/template/wigo/admin/picture_modify.tpl +++ b/admin/template/goto/admin/picture_modify.tpl diff --git a/admin/template/wigo/admin/plugins_list.tpl b/admin/template/goto/admin/plugins_list.tpl index 99d3234c9..99d3234c9 100644 --- a/admin/template/wigo/admin/plugins_list.tpl +++ b/admin/template/goto/admin/plugins_list.tpl diff --git a/admin/template/wigo/admin/plugins_new.tpl b/admin/template/goto/admin/plugins_new.tpl index bfa9dde5c..bfa9dde5c 100644 --- a/admin/template/wigo/admin/plugins_new.tpl +++ b/admin/template/goto/admin/plugins_new.tpl diff --git a/admin/template/wigo/admin/plugins_update.tpl b/admin/template/goto/admin/plugins_update.tpl index 77173f92e..77173f92e 100644 --- a/admin/template/wigo/admin/plugins_update.tpl +++ b/admin/template/goto/admin/plugins_update.tpl diff --git a/admin/template/wigo/admin/profile.tpl b/admin/template/goto/admin/profile.tpl index f6326319c..f6326319c 100644 --- a/admin/template/wigo/admin/profile.tpl +++ b/admin/template/goto/admin/profile.tpl diff --git a/admin/template/wigo/admin/rating.tpl b/admin/template/goto/admin/rating.tpl index aa91892dc..aa91892dc 100644 --- a/admin/template/wigo/admin/rating.tpl +++ b/admin/template/goto/admin/rating.tpl diff --git a/admin/template/wigo/admin/site_manager.tpl b/admin/template/goto/admin/site_manager.tpl index eec993b63..eec993b63 100644 --- a/admin/template/wigo/admin/site_manager.tpl +++ b/admin/template/goto/admin/site_manager.tpl diff --git a/admin/template/wigo/admin/site_update.tpl b/admin/template/goto/admin/site_update.tpl index ad4f99e0f..ad4f99e0f 100644 --- a/admin/template/wigo/admin/site_update.tpl +++ b/admin/template/goto/admin/site_update.tpl diff --git a/admin/template/wigo/admin/stats.tpl b/admin/template/goto/admin/stats.tpl index f7556bc2f..f7556bc2f 100644 --- a/admin/template/wigo/admin/stats.tpl +++ b/admin/template/goto/admin/stats.tpl diff --git a/admin/template/wigo/admin/tabsheet.tpl b/admin/template/goto/admin/tabsheet.tpl index 61c6f206a..61c6f206a 100644 --- a/admin/template/wigo/admin/tabsheet.tpl +++ b/admin/template/goto/admin/tabsheet.tpl diff --git a/admin/template/wigo/admin/tags.tpl b/admin/template/goto/admin/tags.tpl index b2ce57341..b2ce57341 100644 --- a/admin/template/wigo/admin/tags.tpl +++ b/admin/template/goto/admin/tags.tpl diff --git a/admin/template/wigo/admin/thumbnail.tpl b/admin/template/goto/admin/thumbnail.tpl index fff7b3dff..fff7b3dff 100644 --- a/admin/template/wigo/admin/thumbnail.tpl +++ b/admin/template/goto/admin/thumbnail.tpl diff --git a/admin/template/wigo/admin/upload.tpl b/admin/template/goto/admin/upload.tpl index 986a2cf93..986a2cf93 100644 --- a/admin/template/wigo/admin/upload.tpl +++ b/admin/template/goto/admin/upload.tpl diff --git a/admin/template/wigo/admin/user_list.tpl b/admin/template/goto/admin/user_list.tpl index 0f6c1ab95..0f6c1ab95 100644 --- a/admin/template/wigo/admin/user_list.tpl +++ b/admin/template/goto/admin/user_list.tpl diff --git a/admin/template/wigo/admin/user_perm.tpl b/admin/template/goto/admin/user_perm.tpl index 3183c82e7..3183c82e7 100644 --- a/admin/template/wigo/admin/user_perm.tpl +++ b/admin/template/goto/admin/user_perm.tpl diff --git a/admin/template/wigo/content.css b/admin/template/goto/content.css index d9bfedb3a..d9bfedb3a 100644 --- a/admin/template/wigo/content.css +++ b/admin/template/goto/content.css diff --git a/admin/template/wigo/default-colors.css b/admin/template/goto/default-colors.css index 277454a11..277454a11 100644 --- a/admin/template/wigo/default-colors.css +++ b/admin/template/goto/default-colors.css diff --git a/admin/template/wigo/default-layout.css b/admin/template/goto/default-layout.css index ac2388bdb..ac2388bdb 100644 --- a/admin/template/wigo/default-layout.css +++ b/admin/template/goto/default-layout.css diff --git a/admin/template/wigo/fix-ie5-ie6.css b/admin/template/goto/fix-ie5-ie6.css index 0ff151542..0ff151542 100644 --- a/admin/template/wigo/fix-ie5-ie6.css +++ b/admin/template/goto/fix-ie5-ie6.css diff --git a/admin/template/wigo/footer.tpl b/admin/template/goto/footer.tpl index 0ae5dde2c..0ae5dde2c 100644 --- a/admin/template/wigo/footer.tpl +++ b/admin/template/goto/footer.tpl diff --git a/admin/template/wigo/header.tpl b/admin/template/goto/header.tpl index 607f31529..607f31529 100644 --- a/admin/template/wigo/header.tpl +++ b/admin/template/goto/header.tpl diff --git a/admin/template/goto/icon/category_children.png b/admin/template/goto/icon/category_children.png Binary files differnew file mode 100644 index 000000000..7205c3f61 --- /dev/null +++ b/admin/template/goto/icon/category_children.png diff --git a/admin/template/goto/icon/category_delete.png b/admin/template/goto/icon/category_delete.png Binary files differnew file mode 100644 index 000000000..74bea69ed --- /dev/null +++ b/admin/template/goto/icon/category_delete.png diff --git a/admin/template/goto/icon/category_edit.png b/admin/template/goto/icon/category_edit.png Binary files differnew file mode 100644 index 000000000..0f3b619ed --- /dev/null +++ b/admin/template/goto/icon/category_edit.png diff --git a/admin/template/goto/icon/category_elements.png b/admin/template/goto/icon/category_elements.png Binary files differnew file mode 100644 index 000000000..1d367b38f --- /dev/null +++ b/admin/template/goto/icon/category_elements.png diff --git a/admin/template/goto/icon/category_jump-to.png b/admin/template/goto/icon/category_jump-to.png Binary files differnew file mode 100644 index 000000000..62db1f4ee --- /dev/null +++ b/admin/template/goto/icon/category_jump-to.png diff --git a/admin/template/goto/icon/category_permissions.png b/admin/template/goto/icon/category_permissions.png Binary files differnew file mode 100644 index 000000000..4780841ae --- /dev/null +++ b/admin/template/goto/icon/category_permissions.png diff --git a/admin/template/goto/icon/category_representant_random.png b/admin/template/goto/icon/category_representant_random.png Binary files differnew file mode 100644 index 000000000..dfa69846f --- /dev/null +++ b/admin/template/goto/icon/category_representant_random.png diff --git a/admin/template/goto/icon/check.png b/admin/template/goto/icon/check.png Binary files differnew file mode 100644 index 000000000..d9abf2763 --- /dev/null +++ b/admin/template/goto/icon/check.png diff --git a/admin/template/goto/icon/del_favorite.png b/admin/template/goto/icon/del_favorite.png Binary files differnew file mode 100644 index 000000000..cfc609749 --- /dev/null +++ b/admin/template/goto/icon/del_favorite.png diff --git a/admin/template/goto/icon/delete.png b/admin/template/goto/icon/delete.png Binary files differnew file mode 100644 index 000000000..af10be03e --- /dev/null +++ b/admin/template/goto/icon/delete.png diff --git a/admin/template/goto/icon/edit_s.png b/admin/template/goto/icon/edit_s.png Binary files differnew file mode 100644 index 000000000..e4951d22f --- /dev/null +++ b/admin/template/goto/icon/edit_s.png diff --git a/admin/template/goto/icon/errors.png b/admin/template/goto/icon/errors.png Binary files differnew file mode 100644 index 000000000..3c8a37df5 --- /dev/null +++ b/admin/template/goto/icon/errors.png diff --git a/admin/template/goto/icon/exit.png b/admin/template/goto/icon/exit.png Binary files differnew file mode 100644 index 000000000..2aafbb4cb --- /dev/null +++ b/admin/template/goto/icon/exit.png diff --git a/admin/template/goto/icon/help.png b/admin/template/goto/icon/help.png Binary files differnew file mode 100644 index 000000000..c76f68292 --- /dev/null +++ b/admin/template/goto/icon/help.png diff --git a/admin/template/wigo/index.php b/admin/template/goto/icon/index.php index c15b15795..c15b15795 100644 --- a/admin/template/wigo/index.php +++ b/admin/template/goto/icon/index.php diff --git a/admin/template/goto/icon/infos.png b/admin/template/goto/icon/infos.png Binary files differnew file mode 100644 index 000000000..dc8c8a457 --- /dev/null +++ b/admin/template/goto/icon/infos.png diff --git a/admin/template/goto/icon/note.png b/admin/template/goto/icon/note.png Binary files differnew file mode 100644 index 000000000..5849f791b --- /dev/null +++ b/admin/template/goto/icon/note.png diff --git a/admin/template/goto/icon/page_end.png b/admin/template/goto/icon/page_end.png Binary files differnew file mode 100644 index 000000000..c8f54fb91 --- /dev/null +++ b/admin/template/goto/icon/page_end.png diff --git a/admin/template/goto/icon/page_top.png b/admin/template/goto/icon/page_top.png Binary files differnew file mode 100644 index 000000000..8b18f13c3 --- /dev/null +++ b/admin/template/goto/icon/page_top.png diff --git a/admin/template/goto/icon/permissions.png b/admin/template/goto/icon/permissions.png Binary files differnew file mode 100644 index 000000000..33091eb85 --- /dev/null +++ b/admin/template/goto/icon/permissions.png diff --git a/admin/template/goto/icon/plugin_active.gif b/admin/template/goto/icon/plugin_active.gif Binary files differnew file mode 100644 index 000000000..fe49227da --- /dev/null +++ b/admin/template/goto/icon/plugin_active.gif diff --git a/admin/template/goto/icon/plugin_inactive.gif b/admin/template/goto/icon/plugin_inactive.gif Binary files differnew file mode 100644 index 000000000..19d551865 --- /dev/null +++ b/admin/template/goto/icon/plugin_inactive.gif diff --git a/admin/template/goto/icon/preferences.png b/admin/template/goto/icon/preferences.png Binary files differnew file mode 100644 index 000000000..0f3b619ed --- /dev/null +++ b/admin/template/goto/icon/preferences.png diff --git a/admin/template/goto/icon/remove_s.png b/admin/template/goto/icon/remove_s.png Binary files differnew file mode 100644 index 000000000..c78c38f17 --- /dev/null +++ b/admin/template/goto/icon/remove_s.png diff --git a/admin/template/goto/icon/sync_metadata.png b/admin/template/goto/icon/sync_metadata.png Binary files differnew file mode 100644 index 000000000..03570ead6 --- /dev/null +++ b/admin/template/goto/icon/sync_metadata.png diff --git a/admin/template/goto/icon/toggle_is_default_group.png b/admin/template/goto/icon/toggle_is_default_group.png Binary files differnew file mode 100644 index 000000000..9eaa3c601 --- /dev/null +++ b/admin/template/goto/icon/toggle_is_default_group.png diff --git a/admin/template/goto/icon/uncheck.png b/admin/template/goto/icon/uncheck.png Binary files differnew file mode 100644 index 000000000..2f7df3503 --- /dev/null +++ b/admin/template/goto/icon/uncheck.png diff --git a/admin/template/goto/icon/validate_s.png b/admin/template/goto/icon/validate_s.png Binary files differnew file mode 100644 index 000000000..400bf8a24 --- /dev/null +++ b/admin/template/goto/icon/validate_s.png diff --git a/admin/template/goto/icon/virt_category.png b/admin/template/goto/icon/virt_category.png Binary files differnew file mode 100644 index 000000000..15f4f2267 --- /dev/null +++ b/admin/template/goto/icon/virt_category.png diff --git a/admin/template/goto/index.php b/admin/template/goto/index.php new file mode 100644 index 000000000..c15b15795 --- /dev/null +++ b/admin/template/goto/index.php @@ -0,0 +1,30 @@ +<?php +// +-----------------------------------------------------------------------+ +// | Piwigo - a PHP based picture gallery | +// +-----------------------------------------------------------------------+ +// | Copyright(C) 2008 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/admin/template/wigo/intro.tpl b/admin/template/goto/intro.tpl index 457e50644..457e50644 100644 --- a/admin/template/wigo/intro.tpl +++ b/admin/template/goto/intro.tpl diff --git a/admin/template/wigo/layout.css b/admin/template/goto/layout.css index 5a7d5c4df..5a7d5c4df 100644 --- a/admin/template/wigo/layout.css +++ b/admin/template/goto/layout.css diff --git a/admin/template/wigo/local-layout.css b/admin/template/goto/local-layout.css index e8136ac6d..e8136ac6d 100644 --- a/admin/template/wigo/local-layout.css +++ b/admin/template/goto/local-layout.css diff --git a/admin/template/wigo/menubar.css b/admin/template/goto/menubar.css index c0c51db29..c0c51db29 100644 --- a/admin/template/wigo/menubar.css +++ b/admin/template/goto/menubar.css diff --git a/admin/template/wigo/picture.css b/admin/template/goto/picture.css index 839760053..839760053 100644 --- a/admin/template/wigo/picture.css +++ b/admin/template/goto/picture.css diff --git a/admin/template/wigo/print.css b/admin/template/goto/print.css index 88c9ef4a1..88c9ef4a1 100644 --- a/admin/template/wigo/print.css +++ b/admin/template/goto/print.css diff --git a/admin/template/wigo/profile_content.tpl b/admin/template/goto/profile_content.tpl index 9cabf0a51..9cabf0a51 100644 --- a/admin/template/wigo/profile_content.tpl +++ b/admin/template/goto/profile_content.tpl diff --git a/admin/template/wigo/theme/roma/images/active_tab.png b/admin/template/goto/theme/roma/images/active_tab.png Binary files differindex a0c6e5ce5..a0c6e5ce5 100644 --- a/admin/template/wigo/theme/roma/images/active_tab.png +++ b/admin/template/goto/theme/roma/images/active_tab.png diff --git a/admin/template/wigo/theme/roma/images/active_tab2.png b/admin/template/goto/theme/roma/images/active_tab2.png Binary files differindex 560c27a56..560c27a56 100644 --- a/admin/template/wigo/theme/roma/images/active_tab2.png +++ b/admin/template/goto/theme/roma/images/active_tab2.png diff --git a/admin/template/wigo/theme/roma/images/bottom-left-bg.png b/admin/template/goto/theme/roma/images/bottom-left-bg.png Binary files differindex ce611dfed..ce611dfed 100644 --- a/admin/template/wigo/theme/roma/images/bottom-left-bg.png +++ b/admin/template/goto/theme/roma/images/bottom-left-bg.png diff --git a/admin/template/wigo/theme/roma/images/external_active.png b/admin/template/goto/theme/roma/images/external_active.png Binary files differindex 918640316..918640316 100644 --- a/admin/template/wigo/theme/roma/images/external_active.png +++ b/admin/template/goto/theme/roma/images/external_active.png diff --git a/admin/template/wigo/theme/roma/images/external_inactive.png b/admin/template/goto/theme/roma/images/external_inactive.png Binary files differindex 03c50fbf5..03c50fbf5 100644 --- a/admin/template/wigo/theme/roma/images/external_inactive.png +++ b/admin/template/goto/theme/roma/images/external_inactive.png diff --git a/admin/template/wigo/theme/roma/images/fillet.png b/admin/template/goto/theme/roma/images/fillet.png Binary files differindex dd63b2e49..dd63b2e49 100644 --- a/admin/template/wigo/theme/roma/images/fillet.png +++ b/admin/template/goto/theme/roma/images/fillet.png diff --git a/admin/template/wigo/theme/roma/images/inactive_tab.png b/admin/template/goto/theme/roma/images/inactive_tab.png Binary files differindex a9eabe672..a9eabe672 100644 --- a/admin/template/wigo/theme/roma/images/inactive_tab.png +++ b/admin/template/goto/theme/roma/images/inactive_tab.png diff --git a/admin/template/wigo/theme/roma/images/inactive_tab2.png b/admin/template/goto/theme/roma/images/inactive_tab2.png Binary files differindex 63b66476a..63b66476a 100644 --- a/admin/template/wigo/theme/roma/images/inactive_tab2.png +++ b/admin/template/goto/theme/roma/images/inactive_tab2.png diff --git a/admin/template/wigo/theme/roma/images/menuBoxBottom_new.png b/admin/template/goto/theme/roma/images/menuBoxBottom_new.png Binary files differindex 66b91a5e4..66b91a5e4 100644 --- a/admin/template/wigo/theme/roma/images/menuBoxBottom_new.png +++ b/admin/template/goto/theme/roma/images/menuBoxBottom_new.png diff --git a/admin/template/wigo/theme/roma/images/menuBoxTop_new.png b/admin/template/goto/theme/roma/images/menuBoxTop_new.png Binary files differindex c74e6c2c7..c74e6c2c7 100644 --- a/admin/template/wigo/theme/roma/images/menuBoxTop_new.png +++ b/admin/template/goto/theme/roma/images/menuBoxTop_new.png diff --git a/admin/template/wigo/theme/roma/images/menubar-detail.png b/admin/template/goto/theme/roma/images/menubar-detail.png Binary files differindex d78ebe7f8..d78ebe7f8 100644 --- a/admin/template/wigo/theme/roma/images/menubar-detail.png +++ b/admin/template/goto/theme/roma/images/menubar-detail.png diff --git a/admin/template/wigo/theme/roma/images/menubar-top.png b/admin/template/goto/theme/roma/images/menubar-top.png Binary files differindex d122f5dca..d122f5dca 100644 --- a/admin/template/wigo/theme/roma/images/menubar-top.png +++ b/admin/template/goto/theme/roma/images/menubar-top.png diff --git a/admin/template/wigo/theme/roma/images/piwigo_logo_sombre_214x100.png b/admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png Binary files differindex 106f20add..106f20add 100644 --- a/admin/template/wigo/theme/roma/images/piwigo_logo_sombre_214x100.png +++ b/admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png diff --git a/admin/template/wigo/theme/roma/images/top-left-bg.png b/admin/template/goto/theme/roma/images/top-left-bg.png Binary files differindex 9f1711826..9f1711826 100644 --- a/admin/template/wigo/theme/roma/images/top-left-bg.png +++ b/admin/template/goto/theme/roma/images/top-left-bg.png diff --git a/admin/template/wigo/theme/roma/index.php b/admin/template/goto/theme/roma/index.php index 547a117bf..547a117bf 100644 --- a/admin/template/wigo/theme/roma/index.php +++ b/admin/template/goto/theme/roma/index.php diff --git a/admin/template/wigo/theme/roma/mail-css.tpl b/admin/template/goto/theme/roma/mail-css.tpl index 5b3e53c3d..5b3e53c3d 100644 --- a/admin/template/wigo/theme/roma/mail-css.tpl +++ b/admin/template/goto/theme/roma/mail-css.tpl diff --git a/admin/template/wigo/theme/roma/theme.css b/admin/template/goto/theme/roma/theme.css index d2fe4ae1a..d2fe4ae1a 100644 --- a/admin/template/wigo/theme/roma/theme.css +++ b/admin/template/goto/theme/roma/theme.css diff --git a/admin/template/wigo/theme/roma/themeconf.inc.php b/admin/template/goto/theme/roma/themeconf.inc.php index 00c86776d..690e3e4b9 100644 --- a/admin/template/wigo/theme/roma/themeconf.inc.php +++ b/admin/template/goto/theme/roma/themeconf.inc.php @@ -48,10 +48,10 @@ function selected_admin_menu() } $themeconf = array( - 'template' => 'wigo', - 'theme' => 'roma', + 'template' => 'goto', /* Goto Admin template */ + 'theme' => 'roma', /* "roma" is the foundation theme of Piwigo */ 'icon_dir' => 'template/yoga/icon', - 'admin_icon_dir' => 'template/yoga/icon/admin', + '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/wigo/thumbnails.css b/admin/template/goto/thumbnails.css index 536034810..536034810 100644 --- a/admin/template/wigo/thumbnails.css +++ b/admin/template/goto/thumbnails.css diff --git a/admin/thumbnail.php b/admin/thumbnail.php index a68395ce4..b2ca11740 100644 --- a/admin/thumbnail.php +++ b/admin/thumbnail.php @@ -160,7 +160,7 @@ if (!function_exists('gd_info')) // +-----------------------------------------------------------------------+ // | template initialization | // +-----------------------------------------------------------------------+ -$template->set_filenames( array('thumbnail'=>'admin/thumbnail.tpl') ); +$template->set_filenames( array('thumbnail'=>'thumbnail.tpl') ); $template->assign(array( 'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=thumbnail', diff --git a/admin/upload.php b/admin/upload.php index 6e258f05a..7cc457302 100644 --- a/admin/upload.php +++ b/admin/upload.php @@ -135,7 +135,7 @@ DELETE } //----------------------------------------------------- template initialization -$template->set_filenames(array('upload'=>'admin/upload.tpl')); +$template->set_filenames(array('upload'=>'upload.tpl')); // TabSheet initialization waiting_tabsheet(); diff --git a/admin/user_list.php b/admin/user_list.php index 635424b6a..8f0430ee5 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -465,7 +465,7 @@ while ($row = mysql_fetch_array($result)) // | template init | // +-----------------------------------------------------------------------+ -$template->set_filenames(array('user_list'=>'admin/user_list.tpl')); +$template->set_filenames(array('user_list'=>'user_list.tpl')); $base_url = PHPWG_ROOT_PATH.'admin.php?page=user_list'; diff --git a/admin/user_perm.php b/admin/user_perm.php index f7002455a..5f84af608 100644 --- a/admin/user_perm.php +++ b/admin/user_perm.php @@ -117,8 +117,8 @@ SELECT cat_id $template->set_filenames( array( - 'user_perm' => 'admin/user_perm.tpl', - 'double_select' => 'admin/double_select.tpl' + 'user_perm' => 'user_perm.tpl', + 'double_select' => 'double_select.tpl' ) ); diff --git a/include/config_default.inc.php b/include/config_default.inc.php index b0544ea0e..f89d0a54a 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -617,7 +617,7 @@ $conf['recent_post_dates'] = array( // | Set admin layout | // +-----------------------------------------------------------------------+ -$conf['admin_layout'] = 'wigo/roma'; +$conf['admin_layout'] = 'goto/roma'; // should we load the active plugins ? true=Yes, false=No $conf['enable_plugins']=true; |