blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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"

Browse source 
This reverts commit 8d051fa076.
This commit is contained in:
Andrew Dolgov 2013-03-23 09:48:15 +04:00
parent b68dce191f
commit 9972b7cdd7
6 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.php-dist
View file

@ -186,7 +186,7 @@
// Users may enable other user plugins from Preferences/Plugins but may not // Users may enable other user plugins from Preferences/Plugins but may not
// disable plugins specified in this list. // 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 // Change this value to customize the HTML page title
define('CONFIG_VERSION', 26); define('CONFIG_VERSION', 26);

7
include/functions.php
View file

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

2
index.php
View file

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

4
js/tt-rss.js
View file

@ -179,9 +179,9 @@ function search() {
function updateTitle() { function updateTitle() {
var tmp = document.title; 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) { if (global_unread > 0) {

2
prefs.php
View file

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

2
register.php
View file

@ -27,7 +27,7 @@
print '<?xml version="1.0" encoding="utf-8"?>'; print '<?xml version="1.0" encoding="utf-8"?>';
print "<feed xmlns=\"http://www.w3.org/2005/Atom\"> print "<feed xmlns=\"http://www.w3.org/2005/Atom\">
<id>".htmlspecialchars(SELF_URL_PATH . "/register.php")."</id> <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=\"self\" href=\"".htmlspecialchars(SELF_URL_PATH . "/register.php?format=feed")."\"/>
<link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH)."\"/>"; <link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH)."\"/>";