Replace all flat_cat by flat.

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

7 files changed, 24 insertions, 24 deletions

diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php
index b95284746..4f9b15b4b 100644
--- a/include/functions_url.inc.php
+++ b/include/functions_url.inc.php
@@ -269,7 +269,7 @@ function add_well_known_params_in_url($url, $params)
     }
   }
 
-  if (isset($params['flat_cat']))
+  if (isset($params['flat']))
   {
     $url.= '/flat';
   }
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index 869bb34b8..399347659 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -275,7 +275,7 @@ else
     case 'picture':
     {
       //access a picture only by id, file or id-file without given section
-      $page['flat_cat'] = true;
+      $page['flat'] = true;
       break;
     }
     case 'index':
@@ -314,7 +314,7 @@ while (isset($tokens[$i]))
       'flat' == $tokens[$i])
   {
     // indicate a special list of images
-    $page['flat_cat'] = true;
+    $page['flat'] = true;
   }
 
   if (preg_match('/^(posted|created)/', $tokens[$i] ))
@@ -396,7 +396,7 @@ if ('categories' == $page['section'])
         'title'             =>
           get_cat_display_name($result['name'], '', false),
         'thumbnails_include' =>
-          (($result['nb_images'] > 0) or (isset($page['flat_cat'])))
+          (($result['nb_images'] > 0) or (isset($page['flat'])))
           ? 'include/category_default.inc.php'
           : 'include/category_cats.inc.php'
         )
@@ -406,12 +406,12 @@ if ('categories' == $page['section'])
   {
     $page['title'] = $lang['no_category'];
     $page['thumbnails_include'] =
-      (isset($page['flat_cat']))
+      (isset($page['flat']))
           ? 'include/category_default.inc.php'
           : 'include/category_cats.inc.php';
   }
 
-  if (isset($page['flat_cat']))
+  if (isset($page['flat']))
   {
     $page['title'] = $lang['recent_pics_cat'].' : '.$page['title'] ;
   }
@@ -421,7 +421,7 @@ if ('categories' == $page['section'])
       (!isset($page['chronology_field'])) and
       (
         (isset($page['category'])) or
-        (isset($page['flat_cat']))
+        (isset($page['flat']))
       )
     )
   {
@@ -430,7 +430,7 @@ if ('categories' == $page['section'])
       $conf[ 'order_by' ] = ' ORDER BY '.$result['image_order'];
     }
 
-    if (isset($page['flat_cat']))
+    if (isset($page['flat']))
     {
       // flat recent categories mode
         $query = '
@@ -742,7 +742,7 @@ SELECT id,file
 
 // add meta robots noindex, nofollow to avoid unnecesary robot crawls
 $page['meta_robots']=array();
-if ( isset($page['chronology_field']) or isset($page['flat_cat'])
+if ( isset($page['chronology_field']) or isset($page['flat'])
       or 'list'==$page['section'] or 'recent_pics'==$page['section'] )
 {
   $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
diff --git a/index.php b/index.php
index 6762b8df9..6ce62cc8a 100644
--- a/index.php
+++ b/index.php
@@ -106,22 +106,22 @@ if (isset($page['cat_nb_images']) and $page['cat_nb_images'] > 0)
   $template_title.= ' ['.$page['cat_nb_images'].']';
 }
 
-if (isset($page['flat_cat']) or isset($page['chronology_field']))
+if (isset($page['flat']) or isset($page['chronology_field']))
 {
   $template->assign_block_vars(
     'mode_normal',
     array(
-      'URL' => duplicate_index_url( array(), array('chronology_field', 'start', 'flat_cat') )
+      'URL' => duplicate_index_url( array(), array('chronology_field', 'start', 'flat') )
       )
     );
 }
 
-if (!isset($page['flat_cat']) and 'categories' == $page['section'])
+if (!isset($page['flat']) and 'categories' == $page['section'])
 {
   $template->assign_block_vars(
-    'flat_cat',
+    'flat',
     array(
-      'URL' => duplicate_index_url(array('flat_cat' => ''), array('start', 'chronology_field'))
+      'URL' => duplicate_index_url(array('flat' => ''), array('start', 'chronology_field'))
       )
     );
 }
@@ -137,7 +137,7 @@ if (!isset($page['chronology_field']))
   $template->assign_block_vars(
     'mode_created',
     array(
-      'URL' => duplicate_index_url( $chronology_params, array('start', 'flat_cat') )
+      'URL' => duplicate_index_url( $chronology_params, array('start', 'flat') )
       )
     );
 
@@ -145,7 +145,7 @@ if (!isset($page['chronology_field']))
   $template->assign_block_vars(
     'mode_posted',
     array(
-      'URL' => duplicate_index_url( $chronology_params, array('start', 'flat_cat') )
+      'URL' => duplicate_index_url( $chronology_params, array('start', 'flat') )
       )
     );
 }
@@ -161,7 +161,7 @@ else
   }
   $url = duplicate_index_url(
             array('chronology_field'=>$chronology_field ),
-            array('chronology_date', 'start', 'flat_cat')
+            array('chronology_date', 'start', 'flat')
           );
   $template->assign_block_vars(
     'mode_'.$chronology_field,
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index ad03a30ff..7baaee2f6 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -489,7 +489,7 @@ $lang['maxheight'] = 'Maximum height of the pictures';
 $lang['maxheight_error'] = 'Maximum height must be a number superior to 50';
 $lang['maxwidth'] = 'Maximum width of the pictures';
 $lang['maxwidth_error'] = 'Maximum width must be a number superior to 50';
-$lang['flat_cat_hint'] = 'flat display elements of categories and sub-categories';
+$lang['flat_hint'] = 'flat display elements of categories and sub-categories';
 $lang['start_filter_hint'] = 'displays only recent elements';
 $lang['stop_filter_hint'] = 'return to display all elements';
 $lang['mode_created_hint'] = 'displays a calendar by creation date';
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index 647f5fdc9..dc6cd2b38 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/language/fr_FR.iso-8859-1/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -489,7 +489,7 @@ $lang['maxheight'] = 'Hauteur maximum des images';
 $lang['maxheight_error'] = 'La hauteur maximum des images doit être supérieure à 50';
 $lang['maxwidth'] = 'Largeur maximum des images';
 $lang['maxwidth_error'] = 'La largeur des images doit être supérieure à 50';
-$lang['flat_cat_hint'] = 'affiche à plat les éléments des catégories et des sous-catégories';
+$lang['flat_hint'] = 'affiche à plat les éléments des catégories et des sous-catégories';
 $lang['start_filter_hint'] = 'afficher que les éléments récents';
 $lang['stop_filter_hint'] = 'retourner à l\'affichage de tous les éléments';
 $lang['mode_created_hint'] = 'afficher un calendrier par date de création';
diff --git a/template/yoga/icon/flat_cat.png b/template/yoga/icon/flat.png
index 43584e825..43584e825 100644
--- a/template/yoga/icon/flat_cat.png
+++ b/template/yoga/icon/flat.png
diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl
index 0fef1363f..c5ae1fbea 100644
--- a/template/yoga/index.tpl
+++ b/template/yoga/index.tpl
@@ -31,9 +31,9 @@
       <li><a href="{mode_normal.URL}" title="{lang:mode_normal_hint}"><img src="{pwg_root}{themeconf:icon_dir}/normal_mode.png" class="button" alt="{lang:mode_normal_hint}"></a></li>
       <!-- END mode_normal -->
 
-      <!-- BEGIN flat_cat -->
-      <li><a href="{flat_cat.URL}" title="{lang:flat_cat_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/flat_cat.png" class="button" alt="{lang:flat_cat_hint}"></a></li>
-      <!-- END flat_cat -->
+      <!-- BEGIN flat -->
+      <li><a href="{flat.URL}" title="{lang:flat_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/flat.png" class="button" alt="{lang:flat_hint}"></a></li>
+      <!-- END flat -->
 
       <!-- BEGIN mode_posted -->
       <li><a href="{mode_posted.URL}" title="{lang:mode_posted_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:mode_posted_hint}"></a></li>