Merge remote-tracking branch 'upstream/master'

author Richard Beales <rich@richbeales.net>

Thu, 21 Mar 2013 18:57:21 +0000 (18:57 +0000)

committer Richard Beales <rich@richbeales.net>

Thu, 21 Mar 2013 18:57:21 +0000 (18:57 +0000)
author Richard Beales <rich@richbeales.net>
Thu, 21 Mar 2013 18:57:21 +0000 (18:57 +0000)
committer Richard Beales <rich@richbeales.net>
Thu, 21 Mar 2013 18:57:21 +0000 (18:57 +0000)
diff --combined index.php

index fd99dcca5b6aa3d5afe0ed924d84717872fc734d,bf8eafe768c628f5d5cd2fd31c17e3ffb7e01003..5a37c0e988a719282e4cda9363cdeb936162ddf8
--- 1/index.php
--- 2/index.php
+++ b/index.php
@@@ -53,7 -53,7 +53,7 @@@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html>
   <head>
- -      <title>Tiny Tiny RSS</title>
+ +    <title><?php echo PAGE_TITLE ?></title>
   
         <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
         <?php echo stylesheet_tag("tt-rss.css"); ?>
@@@ -72,6 -72,7 +72,7 @@@
         </style>
   
         <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
+       <link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png" />
   
         <?php
         foreach (array("lib/prototype.js",
diff --combined js/tt-rss.js

index c80e8737db8fb5cb54665cf46ef15373f04a31c9,eaa1f3daf30852b3f913afb12e7eb6b1dbbb8363..1d6540dbb47e90c8b6a94551cda23d9e49bbf7e2
--- 1/js/tt-rss.js
--- 2/js/tt-rss.js
+++ b/js/tt-rss.js
@@@ -178,14 -178,10 +178,14 @@@ 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 + ")";
+               tmp = "(" + global_unread + ") " + tmp;
         }
   
         if (window.fluid) {
@@@ -450,6 -446,12 +450,12 @@@ function parse_runtime_info(data) 
                         return;
                 }
   
+               if (k == "dep_ts" && parseInt(getInitParam("dep_ts")) > 0) {
+                       if (parseInt(getInitParam("dep_ts")) < parseInt(v)) {
+                               window.location.reload();
+                       }
+               }
+ 
                 if (k == "daemon_is_running" && v != 1) {
                         notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not running.</span>", true);
                         return;
@@@ -790,6 -792,14 +796,14 @@@ function hotkey_handler(e) 
                 case "collapse_sidebar":
                         collapse_feedlist();
                         return false;
+               case "toggle_embed_original":
+                       if (typeof embedOriginalArticle != "undefined") {
+                               if (getActiveArticleId())
+                                       embedOriginalArticle(getActiveArticleId());
+                       } else {
+                               alert(__("Please enable embed_original plugin first."));
+                       }
+                       return false;
                 case "toggle_widescreen":
                         if (!isCdmMode()) {
                                 _widescreen_mode = !_widescreen_mode;
@@@ -932,6 -942,8 +946,8 @@@ function handle_rpc_json(transport, sch
   
   function switchPanelMode(wide) {
         try {
+               if (isCdmMode()) return;
+ 
                 article_id = getActiveArticleId();
   
                 if (wide) {
diff --combined prefs.php

index 55a8d3afd8ef8daf2301fd08168758e49dc13df1,0715f26e48aa73a82411649932df4054b3ac8ed9..9c59d6c4d6f651cc2fe1a54116b712a111e1bc33
--- 1/prefs.php
--- 2/prefs.php
+++ b/prefs.php
@@@ -23,7 -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 PAGE_TITLE ?> : <?php echo __("Preferences") ?></title>
   
         <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
         <?php echo stylesheet_tag("tt-rss.css"); ?>
@@@ -31,6 -31,7 +31,7 @@@
         <?php print_user_stylesheet($link) ?>
   
         <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
+       <link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png" />
   
         <?php
         foreach (array("lib/prototype.js",
author	Richard Beales <rich@richbeales.net>
	Thu, 21 Mar 2013 18:57:21 +0000 (18:57 +0000)
committer	Richard Beales <rich@richbeales.net>
	Thu, 21 Mar 2013 18:57:21 +0000 (18:57 +0000)
		1	2
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
js/tt-rss.js	patch \|	diff1 \|	diff2 \|	blob \| history
prefs.php	patch \|	diff1 \|	diff2 \|	blob \| history