Browse Source

Revert "update SITE_TITLE customization to work without needing to be pre-defined, make it compatible with unread count now being at start of title"

This reverts commit 8d051fa0769922df69ac737eee9d13dff67095a9.
Andrew Dolgov 7 years ago
parent
commit
9972b7cdd7
6 changed files with 6 additions and 13 deletions
  1. 1 1
      config.php-dist
  2. 0 7
      include/functions.php
  3. 1 1
      index.php
  4. 2 2
      js/tt-rss.js
  5. 1 1
      prefs.php
  6. 1 1
      register.php

+ 1 - 1
config.php-dist

@@ -186,7 +186,7 @@
 	// Users may enable other user plugins from Preferences/Plugins but may not
 	// disable plugins specified in this list.
 
-    define('SITE_TITLE', 'Tiny Tiny RSS');
+    define('PAGE_TITLE','Tiny Tiny RSS');
     // Change this value to customize the HTML page title
 
 	define('CONFIG_VERSION', 26);

+ 0 - 7
include/functions.php

@@ -4085,11 +4085,4 @@
 		return $max_ts;
 	}
 
-    function get_site_title() {
-        $original_title = "Tiny Tiny RSS";
-        if (defined("SITE_TITLE")) {
-            return SITE_TITLE;
-        }
-        return $original_title;
-    }
 ?>

+ 1 - 1
index.php

@@ -53,7 +53,7 @@
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-    <title><?php echo get_site_title() ?></title>
+    <title><?php echo PAGE_TITLE ?></title>
 
 	<?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
 	<?php echo stylesheet_tag("tt-rss.css"); ?>

+ 2 - 2
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(tmp.indexOf(")") + 1);
+       tmp = tmp.substr(0,tmp.lastIndexOf('('));
     }
 
 	if (global_unread > 0) {

+ 1 - 1
prefs.php

@@ -23,7 +23,7 @@
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-	<title><?php echo get_site_title() ?> : <?php echo __("Preferences") ?></title>
+	<title><?php echo PAGE_TITLE ?> : <?php echo __("Preferences") ?></title>
 
 	<?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
 	<?php echo stylesheet_tag("tt-rss.css"); ?>

+ 1 - 1
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 get_site_title() ?> registration slots</title>
+			<title><?php echo PAGE_TITLE ?> registration slots</title>
 			<link rel=\"self\" href=\"".htmlspecialchars(SELF_URL_PATH . "/register.php?format=feed")."\"/>
 			<link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH)."\"/>";