[geeklog-hg] geeklog: Breadcrumb root name can now be something besides the s...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Wed Jun 20 10:19:42 EDT 2012
changeset 8723:2af51c8a18ca
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/2af51c8a18ca
user: Tom <websitemaster at cogeco.net>
date: Wed Jun 20 10:12:32 2012 -0400
description:
Breadcrumb root name can now be something besides the site name (feature request #0001454)
diffstat:
language/english.php | 6 ++++--
language/english_utf-8.php | 6 ++++--
public_html/admin/install/config-install.php | 2 +-
public_html/docs/english/config.html | 4 ++++
sql/updates/mssql_1.8.1_to_2.0.0.php | 3 +++
sql/updates/mysql_1.8.1_to_2.0.0.php | 3 +++
sql/updates/pgsql_1.8.1_to_2.0.0.php | 3 +++
system/lib-topic.php | 16 ++++++++++++++--
8 files changed, 36 insertions(+), 7 deletions(-)
diffs (142 lines):
diff -r 5d3951a9d14a -r 2af51c8a18ca language/english.php
--- a/language/english.php Tue Jun 19 00:19:32 2012 +0900
+++ b/language/english.php Wed Jun 20 10:12:32 2012 -0400
@@ -910,7 +910,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2017,7 +2018,8 @@
'multiple_breadcrumbs' => "Multiple Breadcrumbs",
'disable_breadcrumbs_topics' => "Disable Topic Breadcrumbs",
'disable_breadcrumbs_articles' => "Disable Article Breadcrumbs",
- 'disable_breadcrumbs_plugins' => "Disable Plugins Breadcrumbs"
+ 'disable_breadcrumbs_plugins' => "Disable Plugins Breadcrumbs",
+ 'breadcrumb_root_site_name' => "Site Name as Breadcrumb Root?"
);
$LANG_configsubgroups['Core'] = array(
diff -r 5d3951a9d14a -r 2af51c8a18ca language/english_utf-8.php
--- a/language/english_utf-8.php Tue Jun 19 00:19:32 2012 +0900
+++ b/language/english_utf-8.php Wed Jun 20 10:12:32 2012 -0400
@@ -910,7 +910,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2017,7 +2018,8 @@
'multiple_breadcrumbs' => "Multiple Breadcrumbs",
'disable_breadcrumbs_topics' => "Disable Topic Breadcrumbs",
'disable_breadcrumbs_articles' => "Disable Article Breadcrumbs",
- 'disable_breadcrumbs_plugins' => "Disable Plugins Breadcrumbs"
+ 'disable_breadcrumbs_plugins' => "Disable Plugins Breadcrumbs",
+ 'breadcrumb_root_site_name' => "Site Name as Breadcrumb Root?"
);
$LANG_configsubgroups['Core'] = array(
diff -r 5d3951a9d14a -r 2af51c8a18ca public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php Tue Jun 19 00:19:32 2012 +0900
+++ b/public_html/admin/install/config-install.php Wed Jun 20 10:12:32 2012 -0400
@@ -428,7 +428,7 @@
$c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
$c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
$c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2030, TRUE, $me, 45);
-
+ $c->add('breadcrumb_root_site_name', 0, 'select', 7, 45, 0, 2040, TRUE, $me, 45);
}
?>
diff -r 5d3951a9d14a -r 2af51c8a18ca public_html/docs/english/config.html
--- a/public_html/docs/english/config.html Tue Jun 19 00:19:32 2012 +0900
+++ b/public_html/docs/english/config.html Wed Jun 20 10:12:32 2012 -0400
@@ -1676,6 +1676,10 @@
<td valign="top"><a name="desc_disable_breadcrumbs_plugins">disable_breadcrumbs_plugins</a></td>
<td valign="top">false</td>
<td valign="top">Set this to <code>true</code> to disable all breadcrumbs that are displayed by plugins.</td></tr>
+<tr>
+ <td valign="top"><a name="desc_breadcrumb_root_site_name">breadcrumb_root_site_name</a></td>
+ <td valign="top">false</td>
+ <td valign="top">Set this to <code>true</code> to use the site name as the name of the breadcrumb root.</td></tr>
</table>
<h2><a name="db-config.php">db-config.php</a></h2>
diff -r 5d3951a9d14a -r 2af51c8a18ca sql/updates/mssql_1.8.1_to_2.0.0.php
--- a/sql/updates/mssql_1.8.1_to_2.0.0.php Tue Jun 19 00:19:32 2012 +0900
+++ b/sql/updates/mssql_1.8.1_to_2.0.0.php Wed Jun 20 10:12:32 2012 -0400
@@ -124,6 +124,9 @@
// Microsummary
$c->del('microsummary_short', 'Core');
+ // Breadcrumb Root Site Name
+ $c->add('breadcrumb_root_site_name', 0, 'select', 7, 45, 0, 2040, TRUE, $me, 45);
+
return true;
}
diff -r 5d3951a9d14a -r 2af51c8a18ca sql/updates/mysql_1.8.1_to_2.0.0.php
--- a/sql/updates/mysql_1.8.1_to_2.0.0.php Tue Jun 19 00:19:32 2012 +0900
+++ b/sql/updates/mysql_1.8.1_to_2.0.0.php Wed Jun 20 10:12:32 2012 -0400
@@ -121,6 +121,9 @@
// Microsummary
$c->del('microsummary_short', 'Core');
+
+ // Breadcrumb Root Site Name
+ $c->add('breadcrumb_root_site_name', 0, 'select', 7, 45, 0, 2040, TRUE, $me, 45);
return true;
}
diff -r 5d3951a9d14a -r 2af51c8a18ca sql/updates/pgsql_1.8.1_to_2.0.0.php
--- a/sql/updates/pgsql_1.8.1_to_2.0.0.php Tue Jun 19 00:19:32 2012 +0900
+++ b/sql/updates/pgsql_1.8.1_to_2.0.0.php Wed Jun 20 10:12:32 2012 -0400
@@ -123,6 +123,9 @@
// Microsummary
$c->del('microsummary_short', 'Core');
+
+ // Breadcrumb Root Site Name
+ $c->add('breadcrumb_root_site_name', 0, 'select', 7, 45, 0, 2040, TRUE, $me, 45);
return true;
}
diff -r 5d3951a9d14a -r 2af51c8a18ca system/lib-topic.php
--- a/system/lib-topic.php Tue Jun 19 00:19:32 2012 +0900
+++ b/system/lib-topic.php Wed Jun 20 10:12:32 2012 -0400
@@ -1333,13 +1333,25 @@
} else {
$breadcrumb_a[]['id'] = TOPIC_ROOT;
end($breadcrumb_a);
- $breadcrumb_a[key($breadcrumb_a)]['title'] = $_CONF['site_name'];
+
+ if ($_CONF['breadcrumb_root_site_name']) {
+ $rootname = $_CONF['site_name'];
+ } else {
+ $rootname = $LANG27['breadcrumb_root'];
+ }
+ $breadcrumb_a[key($breadcrumb_a)]['title'] = $rootname;
}
}
} else {
$breadcrumb_a[]['id'] = TOPIC_ROOT;
end($breadcrumb_a);
- $breadcrumb_a[key($breadcrumb_a)]['title'] = $_CONF['site_name'];
+
+ if ($_CONF['breadcrumb_root_site_name']) {
+ $rootname = $_CONF['site_name'];
+ } else {
+ $rootname = $LANG27['breadcrumb_root'];
+ }
+ $breadcrumb_a[key($breadcrumb_a)]['title'] = $rootname;
}
$retval = '';
More information about the geeklog-cvs
mailing list