Wigo becomes "goto".

Admin tpl files are moved.

git-svn-id: http://piwigo.org/svn/trunk@2530 68402e56-0260-453c-a942-63ccdbb3a9ee

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=';
 

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']))

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';

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(

admin/cat_options.php

@@ -141,8 +141,8 @@ UPDATE '.CATEGORIES_TABLE.'
 
 $template->set_filenames(
   array(
-    'cat_options' => 'admin/cat_options.tpl',
+    'cat_options' => 'cat_options.tpl',
-    'double_select' => 'admin/double_select.tpl'
+    'double_select' => 'double_select.tpl'
     )
   );
 

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(

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();

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();

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';
 

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';

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';
 

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';
 

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(

admin/group_perm.php

@@ -123,8 +123,8 @@ SELECT cat_id
 
 $template->set_filenames(
   array(
-    'group_perm' => 'admin/group_perm.tpl',
+    'group_perm' => 'group_perm.tpl',
-    'double_select' => 'admin/double_select.tpl'
+    'double_select' => 'double_select.tpl'
     )
   );
 

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();

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)
       {

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');
   }
 }
 

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);
 

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=';
 

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');
 ?>

admin/notification_by_mail.php

@@ -574,8 +574,8 @@ $template->set_filenames
 (
   array
   (
-    'double_select' => 'admin/double_select.tpl',
+    'double_select' => 'double_select.tpl',
-    'notification_by_mail'=>'admin/notification_by_mail.tpl'
+    'notification_by_mail'=>'notification_by_mail.tpl'
   )
 );
 

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

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'
     )
   );
 

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;

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;

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'];
 

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');
 ?>

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(

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                         |

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)
 {

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();

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(