Merge remote-tracking branch 'upstream/master'

author Richard Beales <rich@richbeales.net>

Tue, 19 Mar 2013 18:19:07 +0000 (18:19 +0000)

committer Richard Beales <rich@richbeales.net>

Tue, 19 Mar 2013 18:19:07 +0000 (18:19 +0000)
author Richard Beales <rich@richbeales.net>
Tue, 19 Mar 2013 18:19:07 +0000 (18:19 +0000)
committer Richard Beales <rich@richbeales.net>
Tue, 19 Mar 2013 18:19:07 +0000 (18:19 +0000)
diff --git a/config.php-dist b/config.php-dist

index eaaaa3d6984dbe6debdb000edfe1d4082566db23..a742cf9afb3299ac7c05543c5ff01b98d4bbdd10 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -181,6 +181,9 @@
         // Users may enable other user plugins from Preferences/Plugins but may not
         // disable plugins specified in this list.
  
+    define('PAGE_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/index.php b/index.php

index 68d6fc753eef0c63d1ab92f512eb5efa47aa257e..840959a18638f281486d3c9c734569ef7fe874f6 100644 (file)
--- a/index.php
+++ b/index.php
@@ -55,7 +55,7 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html>
  <head>
-       <title>Tiny Tiny RSS</title>
+    <title><?php echo PAGE_TITLE ?></title>
         <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
         <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
         <link rel="stylesheet" type="text/css" href="cdm.css?<?php echo $dt_add ?>"/>
diff --git a/js/tt-rss.js b/js/tt-rss.js

index e9bc9d412d615213036a03bf1af762b753f01b8b..3b96566f904977494fd89cf02d573611c1f2b280 100644 (file)
--- 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(0,tmp.lastIndexOf('('));
+    }
  
         if (global_unread > 0) {
                 tmp = tmp + " (" + global_unread + ")";
diff --git a/mobile/index.php b/mobile/index.php

index edbf586e05af01133b9ee3d42e87cd69965d2014..aad2d28845e0724c4481d5e54cbb369594142693 100644 (file)
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -19,7 +19,7 @@
  
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-<title>Tiny Tiny RSS</title>
+<title><?php echo PAGE_TITLE ?></title>
  <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
  <link rel="apple-touch-icon" href="../lib/iui/iui-logo-touch-icon.png" />
  <meta name="apple-touch-fullscreen" content="YES" />
diff --git a/prefs.php b/prefs.php

index a47d00bce29416fd2d6421b2aaa5dd4818a58932..0b9cb3cf2fd57e07fd6f068d47438c3dc5f75c29 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -25,7 +25,7 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html>
  <head>
-       <title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
+       <title><?php echo PAGE_TITLE ?> : <?php echo __("Preferences") ?></title>
         <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
         <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
  
diff --git a/register.php b/register.php

index b0c9bd95fa86fdd69dd6ed5a527d4f66a1dad105..d61bcfa29aa0c5ff77877c5271bc2ed99d443504 100644 (file)
--- 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 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)."\"/>";
author	Richard Beales <rich@richbeales.net>
	Tue, 19 Mar 2013 18:19:07 +0000 (18:19 +0000)
committer	Richard Beales <rich@richbeales.net>
	Tue, 19 Mar 2013 18:19:07 +0000 (18:19 +0000)
config.php-dist		patch \| blob \| blame \| history
index.php		patch \| blob \| blame \| history
js/tt-rss.js		patch \| blob \| blame \| history
mobile/index.php		patch \| blob \| blame \| history
prefs.php		patch \| blob \| blame \| history
register.php		patch \| blob \| blame \| history