Changeset 5938 for branches

Timestamp:

Apr 22, 2010, 3:11:32 PM (14 years ago)

Author:

laurent.duretz

Message:

Issue 1521 : report trunk on branch 2.0

Location:

branches/2.0

Files:

• include/config_default.inc.php (modified) (2 diffs)
• include/functions_html.inc.php (modified) (2 diffs)
• include/section_init.inc.php (modified) (2 diffs)
• picture.php (modified) (1 diff)
• template/yoga/picture.tpl (modified) (1 diff)

branches/2.0/include/config_default.inc.php

@@ -43 +43 @@
 // |                                 misc                                  |
 // +-----------------------------------------------------------------------+
-
-// home_page : relative url of your homepage. Empty by default. It points to the index of the gallery.
-$conf['home_page'] = '';
 
 // order_by : how to change the order of display for images in a category ?
@@ -329 +326 @@
 // 'filename'
 $conf['uniqueness_mode'] = 'md5sum';
+
+// home_page : relative url of the homepage. Empty by default.
+// It points to the index of the gallery.
+// This parameter is used if home page is not index.php of the gallery.
+// We suggest avoid the names "index.htm" or "index.html" if you set $conf['php_extension_in_urls'] to false.
+$conf['home_page'] = '';
 
 // +-----------------------------------------------------------------------+

branches/2.0/include/functions_html.inc.php

@@ -240 +240 @@
   global $conf;
 
-  $output = '<a href="'.PHPWG_ROOT_PATH.$conf['home_page'].'">'.l10n('no_category').'</a>';
+  $output = '';
+  $is_first = true;
 
   foreach ($cat_informations as $cat)
@@ -254 +255 @@
       );
 
-    $output.= $conf['level_separator'];
+    if ($is_first)
+    {
+      $is_first=false;
+    }
+    else
+    {
+      $output.= $conf['level_separator'];
+    }
 
     if ( !isset($url) )

branches/2.0/include/section_init.inc.php

@@ -221 +221 @@
 if ('categories' == $page['section'])
 {
+  $page['title'] = '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('home').'</a>';
+
   if (isset($page['category']))
   {
@@ -233 +235 @@
             ),
         'title'             =>
-          get_cat_display_name($page['category']['upper_names'], '', false),
-        )
-      );
-  }
-  else
-  {
-    $page['title'] = '<a href="'.PHPWG_ROOT_PATH.$conf['home_page'].'">'.l10n('no_category').'</a>';
+          $page['title'].$conf['level_separator'].get_cat_display_name($page['category']['upper_names'], '', false),
+        )
+      );
   }
 

branches/2.0/picture.php

@@ -693 +693 @@
     'LEVEL_SEPARATOR' => $conf['level_separator'],
 
-    'U_HOME' => make_index_url(),
     'U_UP' => $url_up,
     'U_METADATA' => $url_metadata,

branches/2.0/template/yoga/picture.tpl

@@ -30 +30 @@
 <div id="imageHeaderBar">
   <div class="browsePath">
-    <a href="{$U_HOME}" rel="home">{'home'|@translate}</a>
-    {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
+    {$SECTION_TITLE}
     {$LEVEL_SEPARATOR}{$current.TITLE}
   </div>