diff --git a/backend.php b/backend.php
index b7249f1a4..77bd9b215 100644
--- a/backend.php
+++ b/backend.php
@@ -197,6 +197,7 @@
print "
Tiny Tiny RSS : Article $id
+
";
}
@@ -233,6 +234,10 @@
}
+/* print ""; */
+
if ($addheader) {
print "";
}
@@ -417,6 +422,8 @@
} else if ($unread <= 0) {
feedr.className = feedr.className.replace(\"Unread\", \"\");
}
+
+ //p_notify('');
";
if ($addheader) {
diff --git a/functions.js b/functions.js
index f0d76769d..90245a192 100644
--- a/functions.js
+++ b/functions.js
@@ -50,13 +50,31 @@ function delay(gap) {
}
}
+function p_notify(msg) {
+
+ var n = parent.document.getElementById("notify");
+ var nb = parent.document.getElementById("notify_body");
+
+ if (!n || !nb) return;
+
+ nb.innerHTML = msg;
+
+ if (msg.length == 0) {
+ n.style.display = "none";
+ } else {
+ n.style.display = "block";
+ }
+
+}
+
function notify(msg) {
var n = document.getElementById("notify");
+ var nb = document.getElementById("notify_body");
- if (!n) return;
+ if (!n || !nb) return;
- n.innerHTML = msg;
+ nb.innerHTML = msg;
if (msg.length == 0) {
n.style.display = "none";
diff --git a/images/close.png b/images/close.png
new file mode 100644
index 000000000..046c4a7e2
Binary files /dev/null and b/images/close.png differ
diff --git a/images/close.svg b/images/close.svg
new file mode 100644
index 000000000..88685edd4
--- /dev/null
+++ b/images/close.svg
@@ -0,0 +1,75 @@
+
+
+
diff --git a/prefs.php b/prefs.php
index 974101b1c..80270fe75 100644
--- a/prefs.php
+++ b/prefs.php
@@ -20,7 +20,9 @@
-
+ |
+ |
|
Return to main
diff --git a/tt-rss.css b/tt-rss.css
index c53571361..879e021bc 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -116,7 +116,7 @@ table.main td.toolbar {
display : none;
background : white;
-moz-border-radius : 5px;
- padding : 3px 10px 3px 10px;
+ padding : 2px 5px 2px 5px;
width : 300px;
}
diff --git a/tt-rss.js b/tt-rss.js
index b2adeb1ce..37150ba7a 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -209,6 +209,8 @@ function viewCurrentFeed(skip, subop) {
function viewfeed(feed, skip, subop) {
+// notify("Loading headlines...");
+
enableHotkeys();
var searchbox = document.getElementById("searchbox");
@@ -290,7 +292,7 @@ function viewfeed(feed, skip, subop) {
ftitle_d.innerHTML = ftitle_s.innerHTML;
- notify("");
+// notify("");
}
diff --git a/tt-rss.php b/tt-rss.php
index 385ea487e..bd43dacd6 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -21,7 +21,11 @@
|
diff --git a/viewfeed.js b/viewfeed.js
index 6866c278c..6d73da886 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -25,6 +25,8 @@ if (!xmlhttp_rpc && typeof XMLHttpRequest!='undefined') {
function view(id, feed_id) {
+// p_notify("Loading article...");
+
enableHotkeys();
var crow = document.getElementById("RROW-" + id);
@@ -71,9 +73,8 @@ function view(id, feed_id) {
}
}
-function toggleMark(id, toggle) {
-// notify("Toggle mark: " + id + ", " + toggle);
+function toggleMark(id, toggle) {
if (!xmlhttp_ready(xmlhttp_rpc)) {
printLockingError();
|