diff options
| author | Andrew Dolgov <[email protected]> | 2013-03-22 09:36:47 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-03-22 09:36:47 +0400 |
| commit | 707ad6ddf7b199e202fc39f61ffd08a4bc5bacc1 (patch) | |
| tree | e5ebbb40023ccb6da991a649acc22c7ff89e6b37 | |
| parent | 3972bf598195efba3e73ae1fef3faceabeb50308 (diff) | |
| parent | 8d051fa0769922df69ac737eee9d13dff67095a9 (diff) | |
Merge branch 'master' of git://github.com/richbeales/Tiny-Tiny-RSS into richbeales-master
| -rw-r--r-- | config.php-dist | 3 | ||||
| -rw-r--r-- | include/functions.php | 7 | ||||
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | js/tt-rss.js | 6 | ||||
| -rw-r--r-- | prefs.php | 2 | ||||
| -rw-r--r-- | register.php | 2 |
6 files changed, 18 insertions, 4 deletions
diff --git a/config.php-dist b/config.php-dist index a5a7fc3e2..176949fd9 100644 --- a/config.php-dist +++ b/config.php-dist @@ -183,6 +183,9 @@ // Users may enable other user plugins from Preferences/Plugins but may not // disable plugins specified in this list. + define('SITE_TITLE', 'Tiny Tiny RSS'); + // Change this value to customize the HTML page title + define('CONFIG_VERSION', 26); // Expected config version. Please update this option in config.php // if necessary (after migrating all new options from this file). diff --git a/include/functions.php b/include/functions.php index 17fe18546..0e2a922ba 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; + } ?> @@ -53,7 +53,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> <head> - <title>Tiny Tiny RSS</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 eaa1f3daf..91aff8b68 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -178,7 +178,11 @@ function search() { } function updateTitle() { - var tmp = "Tiny Tiny RSS"; + var tmp = document.title; + if (tmp.indexOf(")") > 0) + { + tmp = tmp.substr(tmp.indexOf(")") + 1); + } if (global_unread > 0) { tmp = "(" + global_unread + ") " + tmp; @@ -23,7 +23,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> <head> - <title>Tiny Tiny RSS : <?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 0dc91e96e..0d714c225 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>Tiny Tiny RSS 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)."\"/>"; |