Changeset 1800

Timestamp:

Feb 11, 2007, 12:09:37 AM (17 years ago)

Author:

rub

Message:

Replace all flat_cat by flat.

Location:

trunk

Files:

• include/functions_url.inc.php (modified) (1 diff)
• include/section_init.inc.php (modified) (7 diffs)
• index.php (modified) (4 diffs)
• language/en_UK.iso-8859-1/common.lang.php (modified) (2 diffs)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (2 diffs)
• template/yoga/icon/flat.png (moved) (moved from trunk/template/yoga/icon/flat_cat.png)
• template/yoga/index.tpl (modified) (1 diff)

trunk/include/functions_url.inc.php

@@ -270 +270 @@
   }
 
-  if (isset($params['flat_cat']))
+  if (isset($params['flat']))
   {
     $url.= '/flat';

trunk/include/section_init.inc.php

@@ -276 +276 @@
     {
       //access a picture only by id, file or id-file without given section
-      $page['flat_cat'] = true;
+      $page['flat'] = true;
       break;
     }
@@ -315 +315 @@
   {
     // indicate a special list of images
-    $page['flat_cat'] = true;
+    $page['flat'] = true;
   }
 
@@ -397 +397 @@
           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'
@@ -407 +407 @@
     $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'] ;
@@ -422 +422 @@
       (
         (isset($page['category'])) or
-        (isset($page['flat_cat']))
+        (isset($page['flat']))
       )
     )
@@ -431 +431 @@
     }
 
-    if (isset($page['flat_cat']))
+    if (isset($page['flat']))
     {
       // flat recent categories mode
@@ -743 +743 @@
 // 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'] )
 {

trunk/index.php

@@ -107 +107 @@
 }
 
-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') )
-      )
-    );
-}
-
-if (!isset($page['flat_cat']) and 'categories' == $page['section'])
-{
-  $template->assign_block_vars(
-    'flat_cat',
-    array(
-      'URL' => duplicate_index_url(array('flat_cat' => ''), array('start', 'chronology_field'))
+      'URL' => duplicate_index_url( array(), array('chronology_field', 'start', 'flat') )
+      )
+    );
+}
+
+if (!isset($page['flat']) and 'categories' == $page['section'])
+{
+  $template->assign_block_vars(
+    'flat',
+    array(
+      'URL' => duplicate_index_url(array('flat' => ''), array('start', 'chronology_field'))
       )
     );
@@ -138 +138 @@
     'mode_created',
     array(
-      'URL' => duplicate_index_url( $chronology_params, array('start', 'flat_cat') )
+      'URL' => duplicate_index_url( $chronology_params, array('start', 'flat') )
       )
     );
@@ -146 +146 @@
     'mode_posted',
     array(
-      'URL' => duplicate_index_url( $chronology_params, array('start', 'flat_cat') )
+      'URL' => duplicate_index_url( $chronology_params, array('start', 'flat') )
       )
     );
@@ -162 +162 @@
   $url = duplicate_index_url(
             array('chronology_field'=>$chronology_field ),
-            array('chronology_date', 'start', 'flat_cat')
+            array('chronology_date', 'start', 'flat')
           );
   $template->assign_block_vars(

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -3 +3 @@
 // | 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)
@@ -490 +490 @@
 $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';

trunk/language/fr_FR.iso-8859-1/common.lang.php

@@ -3 +3 @@
 // | 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)
@@ -490 +490 @@
 $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';

trunk/template/yoga/index.tpl

@@ -32 +32 @@
       <!-- 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 -->