infobox uses semi-transparent overlay

diff --git a/functions.js b/functions.js
index ad6a95f95164757566f37b0e8617c9114926d44f..8245c71a16205b6036d7a9523508c696920f957d 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -78,7 +78,7 @@ var notify_last_doc = false;
 function hide_notify() {
        if (notify_last_doc) {
                var n = notify_last_doc.getElementById("notify");               
-               if (navigator.userAgent.match("Firefox")) {
+               if (browser.isNS) {
                        if (notify_opacity >= 0) {
                                notify_opacity = notify_opacity - 0.2;
                                n.style.opacity = notify_opacity;
@@ -1049,3 +1049,4 @@ function toggleSubmitNotEmpty(e, submit_id) {
                exception_error("toggleSubmitNotEmpty", e);
        }
 }
+

diff --git a/images/overlay.png b/images/overlay.png
new file mode 100644 (file)
index 0000000..e3a0a77
Binary files /dev/null and b/images/overlay.png differ

diff --git a/prefs.js b/prefs.js
index aa0d0a2e1371efc05b8b885d7bb871c418855284..2c15ae924f48ac8bcd150dd5cbbc5eac9a099fb5 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -608,11 +608,11 @@ function removeSelectedFeeds() {
 
        if (sel_rows.length > 0) {
 
-               var ok = confirm("Unsubscribe selected feeds?");
+               var ok = confirm("Unsubscribe from selected feeds?");
 
                if (ok) {
 
-                       notify("Removing selected feeds...");
+                       notify("Unsubscribing from selected feeds...");
        
                        xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=remove&ids="+
                                param_escape(sel_rows.toString()), true);
@@ -1214,7 +1214,7 @@ function localPiggieFunction(enable) {
                var piggie = document.getElementById("piggie");
                piggie.style.display = "block";
 
-               if (navigator.userAgent.match("Firefox") && Math.random(1) > 0.5) {     
+               if (browser.isNS && Math.random(1) > 0.5) {     
                        piggie2_callback();
                } else {
                        piggie_callback();

diff --git a/tt-rss.css b/tt-rss.css
index 09678ec427e507fb208808cf0eb85e28e38aa9b7..dfb3ae41afb801d801f15a842d2f46a3915c1a2a 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -538,9 +538,10 @@ div.helpResponse {
        border-color : #88b0f0;
        font-size : small;
        position : relative;
-       bottom : 2px;
-       right : 2px;
-       padding-bottom : 5px;
+       top : 30%;
+       left : 30%;
+       width : 30%;
+       padding-bottom : 5px;   
        background-image : url("images/prefs-content.png");
        background-position : top left;
        background-repeat : repeat-x;
@@ -548,12 +549,13 @@ div.helpResponse {
 }
 
 #infoBoxShadow {
-       background-image : url("images/shadow.png");
-       position : absolute;
-       left : 35%;
-       top : 30%;
-                 width : 30%;
+       background-image : url("images/overlay.png");
+       left : 0;
+       top : 0;
+       height : 100%;
+       width : 100%;
        z-index : 3;
+       position : absolute;
        display : none;
 }
 

diff --git a/tt-rss.js b/tt-rss.js
index f82bb773ccf32b872f8115fe25725262918c06fd..3faf59d4f6c4bbaf5aa42fc325799f78206b3c5b 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -494,7 +494,7 @@ function quickMenuGo(opid) {
                                return;
                        }
        
-                       if (confirm("Unsubscribe current feed?")) {
+                       if (confirm("Unsubscribe from current feed?")) {
                                qfdDelete(actid);
                        }
                

diff --git a/tt-rss.php b/tt-rss.php
index 0cd2bb85a510e385856b0050b3fd03730a3f3b75..c4879ff7ac584f0dd0c9c0cefa3697eaface521f 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -229,7 +229,7 @@ window.onload = init;
                                <option disabled>--------</option>
                                <option style="color : #5050aa" disabled>Feed actions:</option>
                                <option id="qmcAddFeed">&nbsp;&nbsp;Subscribe to feed</option>
-                               <option id="qmcRemoveFeed">&nbsp;&nbsp;Unsubscribe this feed</option>
+                               <option id="qmcRemoveFeed">&nbsp;&nbsp;Unsubscribe</option>
                                <!-- <option>Edit this feed</option> -->
                                <option disabled>--------</option>
                                <option style="color : #5050aa" disabled>All feeds:</option>