Merge branch 'master' of git://github.com/richbeales/Tiny-Tiny-RSS into richbeales-master

12 years ago · 707ad6ddf7
parent 3972bf5981 8d051fa076
commit 707ad6ddf7
6 changed files with 18 additions and 4 deletions
--- 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).
--- 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;
+    }
 ?>
--- a/index.php
+++ b/index.php
@ -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"); ?>
--- 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;
--- a/prefs.php
+++ b/prefs.php
@ -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"); ?>
--- 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)."\"/>";