summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Beales <[email protected]>2013-03-21 20:24:26 +0000
committerRichard Beales <[email protected]>2013-03-21 20:24:26 +0000
commit8d051fa0769922df69ac737eee9d13dff67095a9 (patch)
treed0c8711902382f89d9afb4a0205fac20bf85f862
parentc489ae913d1778a9cdab45092bf0015e74300909 (diff)
update SITE_TITLE customization to work without needing to be pre-defined, make it compatible with unread count now being at start of title
-rw-r--r--config.php-dist2
-rw-r--r--include/functions.php7
-rw-r--r--index.php2
-rw-r--r--js/tt-rss.js4
-rw-r--r--prefs.php2
-rw-r--r--register.php2
6 files changed, 13 insertions, 6 deletions
diff --git a/config.php-dist b/config.php-dist
index 4414e77d3..176949fd9 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -183,7 +183,7 @@
// Users may enable other user plugins from Preferences/Plugins but may not
// disable plugins specified in this list.
- define('PAGE_TITLE','Tiny Tiny RSS');
+ define('SITE_TITLE', 'Tiny Tiny RSS');
// Change this value to customize the HTML page title
define('CONFIG_VERSION', 26);
diff --git a/include/functions.php b/include/functions.php
index 5d5550059..879a03e3f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -4098,4 +4098,11 @@
return $max_ts;
}
+ function get_site_title() {
+ $original_title = "Tiny Tiny RSS";
+ if (defined("SITE_TITLE")) {
+ return SITE_TITLE;
+ }
+ return $original_title;
+ }
?>
diff --git a/index.php b/index.php
index 5a37c0e98..4669a2080 100644
--- a/index.php
+++ b/index.php
@@ -53,7 +53,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
- <title><?php echo PAGE_TITLE ?></title>
+ <title><?php echo get_site_title() ?></title>
<?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
<?php echo stylesheet_tag("tt-rss.css"); ?>
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 1d6540dbb..91aff8b68 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -179,9 +179,9 @@ function search() {
function updateTitle() {
var tmp = document.title;
- if (tmp.indexOf('(')>0)
+ if (tmp.indexOf(")") > 0)
{
- tmp = tmp.substr(0,tmp.lastIndexOf('('));
+ tmp = tmp.substr(tmp.indexOf(")") + 1);
}
if (global_unread > 0) {
diff --git a/prefs.php b/prefs.php
index 9c59d6c4d..0d27a6e81 100644
--- a/prefs.php
+++ b/prefs.php
@@ -23,7 +23,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
- <title><?php echo PAGE_TITLE ?> : <?php echo __("Preferences") ?></title>
+ <title><?php echo get_site_title() ?> : <?php echo __("Preferences") ?></title>
<?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
<?php echo stylesheet_tag("tt-rss.css"); ?>
diff --git a/register.php b/register.php
index d7ba7da5f..69a3dbf50 100644
--- a/register.php
+++ b/register.php
@@ -27,7 +27,7 @@
print '<?xml version="1.0" encoding="utf-8"?>';
print "<feed xmlns=\"http://www.w3.org/2005/Atom\">
<id>".htmlspecialchars(SELF_URL_PATH . "/register.php")."</id>
- <title><?php echo PAGE_TITLE ?> registration slots</title>
+ <title><?php echo get_site_title() ?> registration slots</title>
<link rel=\"self\" href=\"".htmlspecialchars(SELF_URL_PATH . "/register.php?format=feed")."\"/>
<link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH)."\"/>";