aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlaurent.duretz <laurent.duretz@piwigo.org>2010-03-22 11:09:32 +0000
committerlaurent.duretz <laurent.duretz@piwigo.org>2010-03-22 11:09:32 +0000
commitd6cc2b0a0a0e5c5bd60e2d31d17ac5c15c54ad95 (patch)
tree9d97d716323de5a13b09e750b4aa101b751eaed6
parent9b86ed4be790ed27039623c8aefdb274b95ddc8b (diff)
Issue 1521 : Integration of LinkRoot plugin in Piwigo core
git-svn-id: http://piwigo.org/svn/branches/2.0@5254 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/config_default.inc.php5
-rw-r--r--include/functions_html.inc.php15
-rw-r--r--include/section_init.inc.php4
3 files changed, 10 insertions, 14 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 06009c290..4609c67b8 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -43,6 +43,9 @@
// | 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 ?
//
// There are several fields that can order the display :
@@ -744,4 +747,4 @@ $conf['local_data_dir'] = dirname(dirname(__FILE__)).'/_data';
// where should the API add photos?
$conf['upload_dir'] = PHPWG_ROOT_PATH.'upload';
-?> \ No newline at end of file
+?>
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 462bfe222..afdf41952 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -239,8 +239,8 @@ function get_cat_display_name($cat_informations,
{
global $conf;
- $output = '';
- $is_first = true;
+ $output = '<a href="'.PHPWG_ROOT_PATH.$conf['home_page'].'">'.l10n('no_category').'</a>';
+
foreach ($cat_informations as $cat)
{
is_array($cat) or trigger_error(
@@ -253,14 +253,7 @@ function get_cat_display_name($cat_informations,
'get_cat_display_name'
);
- if ($is_first)
- {
- $is_first = false;
- }
- else
- {
- $output.= $conf['level_separator'];
- }
+ $output.= $conf['level_separator'];
if ( !isset($url) )
{
@@ -814,4 +807,4 @@ function register_default_menubar_blocks( $menu_ref_arr )
$menu->register_block( new RegisteredBlock( 'mbIdentification', 'identification', 'piwigo') );
}
-?> \ No newline at end of file
+?>
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index c7725cbbf..6264d0c28 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -238,7 +238,7 @@ if ('categories' == $page['section'])
}
else
{
- $page['title'] = l10n('no_category');
+ $page['title'] = '<a href="'.PHPWG_ROOT_PATH.$conf['home_page'].'">'.l10n('no_category').'</a>';
}
if
@@ -601,4 +601,4 @@ if ( 'categories'==$page['section'] and isset($page['category']) )
}
trigger_action('loc_end_section_init');
-?> \ No newline at end of file
+?>