Merge remote-tracking branch 'upstream/master'

diff --git a/classes/feeds.php b/classes/feeds.php
index b5010a05f65a210929d510909027d88097d9e62d..d6cd2a255393f5d0c1fe794eb2531453b1fe95ec 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -388,6 +388,8 @@ class Feeds extends Handler_Protected {
                                        $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.svg\" alt=\"\">";
                                }
 
+                               $entry_site_url = $line["site_url"];
+
                                if (!get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {
 
                                        if (get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
@@ -474,7 +476,7 @@ class Feeds extends Handler_Protected {
                                        unset($line["tag_cache"]);
 
                                        $line["content"] = sanitize($this->link, $line["content_preview"],
-                                                       false, false, $feed_site_url);
+                                                       false, false, $entry_site_url);
 
                                        foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_CDM) as $p) {
                                                $line = $p->hook_render_article_cdm($line);
@@ -614,8 +616,6 @@ class Feeds extends Handler_Protected {
                                                }
                                        }
 
-                                       $feed_site_url = $line["site_url"];
-
                                        $reply['content'] .= "<span id=\"CWRAP-$id\">";
                                        $reply['content'] .= $line["content"];
                                        $reply['content'] .= "</span>";

diff --git a/classes/pref/users.php b/classes/pref/users.php
index 0d7ca3c6e231fd2c599fd260fa6a729cc2894163..d36ed29f7b8f8d4a4ba7133d6308027e0f044bf2 100644 (file)
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -214,7 +214,7 @@ class Pref_Users extends Handler_Protected {
                        }
 
                        db_query($this->link, "UPDATE ttrss_users SET $pass_query_part login = '$login',
-                               access_level = '$access_level', email = '$email', otp_enabled = 'false'
+                               access_level = '$access_level', email = '$email', otp_enabled = false
                                WHERE id = '$uid'");
 
                }

diff --git a/js/functions.js b/js/functions.js
index e00690c1c2e6130f3372764d37204dd695fbf9d7..be78294df0d22a149668d24e2c8a6144aa9050ef 100644 (file)
--- a/js/functions.js
+++ b/js/functions.js
@@ -212,6 +212,11 @@ function notify_real(msg, no_hide, n_type) {
 
 //     msg = "<img src='images/live_com_loading.gif'> " + msg;
 
+       if (no_hide) {
+               msg += " (<a href='#' onclick=\"notify('')\">X</a>)";
+       }
+
+
        nb.innerHTML = msg;
 
        if (!no_hide) {

diff --git a/js/prefs.js b/js/prefs.js
index 676fb914ae196b636f7ca9935df48746175ea359..e6257e1fb261f4b3f7077962c123ce4d2085f6fa 100644 (file)
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -547,7 +547,7 @@ function resetSelectedUserPass() {
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) {
-                                       notify_info(transport.responseText);
+                                       notify_info(transport.responseText, true);
                                } });
 
                }

diff --git a/plugins/googlereadertheme/init.css b/plugins/googlereadertheme/init.css
new file mode 100644 (file)
index 0000000..8d5c8ce
--- /dev/null
+++ b/plugins/googlereadertheme/init.css
@@ -0,0 +1,73 @@
+/* fix dijit */
+:focus {
+   outline: none;
+}
+input[type="search"] {
+   -webkit-appearance: none;
+}
+.claro .dijitToolbar .dijitButton .dijitButtonNode,
+.claro .dijitToolbar .dijitDropDownButton .dijitButtonNode,
+.claro .dijitToolbar .dijitComboButton .dijitButtonNode,
+.claro .dijitToolbar .dijitToggleButton .dijitButtonNode,
+.claro .dijitToolbar .dijitComboBox .dijitButtonNode {
+   -moz-transition: background-color, border-color, color;
+   -webkit-transition-property: background-color, border-color, color;
+   transition: background-color, border-color, color;
+}
+
+
+/* some style */
+body#ttrssMain,
+a,
+.titleWrap .title  {
+   color: #444;
+}
+a:hover,
+.Unread .titleWrap .title,
+.Selected .titleWrap .title,
+html div.cdmContent a {
+   color: #15c;
+}
+#feeds-holder,
+#content-wrap,
+#headlines-frame {
+   border: none;
+}
+#ttrssMain #headlines-toolbar,
+#ttrssMain .dijitToolbar,
+#ttrssMain .cdmHeader {
+   background: #fff;
+   border-color: transparent;
+}
+#ttrssMain #headlines-toolbar {
+   border-color: #ebebeb;
+}
+#ttrssMain .cdm {
+   margin: 5px 25px 10px 5px;
+   border: 1px solid #ddd !important;
+   box-shadow: 0 0 4px rgba(0,0,0,.1);
+   background: #fff !important;
+}
+#ttrssMain .cdm.Selected {
+   border-left-color: #4d90f0 !important;
+   background: #fff !important;
+}
+#ttrssMain .cdmFeedTitle {
+   border-color: #ebebeb;
+   background: #fff;
+   font-size: 1.2em;
+   font-weight: bold;
+}
+#headlines-frame .cdmFooter {
+   border-top: 1px solid #ebebeb;
+   background: #fafafa;
+}
+
+.titleWrap .title {
+   font-size: 1.5em;
+   font-weight: bold;
+}
+div.cdmHeader span.hlFeed {
+   padding-top: .5em;
+}
+

diff --git a/plugins/googlereadertheme/init.php b/plugins/googlereadertheme/init.php
new file mode 100644 (file)
index 0000000..4ee4a4b
--- /dev/null
+++ b/plugins/googlereadertheme/init.php
@@ -0,0 +1,27 @@
+<?php
+class GoogleReaderTheme extends Plugin {
+
+       private $link;
+       private $host;
+
+       function about() {
+               return array(1.0,
+                       "Make tt-rss look similar to Google Reader",
+                       "levito");
+       }
+
+       function init($host) {
+               $this->link = $host->get_link();
+               $this->host = $host;
+
+               if ($_SESSION["uid"]) {
+                       // force-enable combined mode
+                       set_pref($this->link, "COMBINED_DISPLAY_MODE", true, $_SESSION["uid"]);
+               }
+       }
+
+       function get_css() {
+               return file_get_contents(dirname(__FILE__) . "/init.css");
+       }
+}
+?>