fix article starring/publishing on MSIE (closes #139)

diff --git a/functions.php b/functions.php
index 364024ba03d4fc0be8984f179e27be49bc307a76..56b4a3c9a45413ded4e6e51635a3bfac22801115 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3546,14 +3546,14 @@
                if ($num_starred > 0) $class .= "Unread";
 
                printFeedEntry(-1, $class, __("Starred articles"), $num_starred, 
-                       "images/mark_set.png", $link);
+                       "images/mark_set.gif", $link);
 
                $class = "virt";
 
                if ($num_published > 0) $class .= "Unread";
 
                printFeedEntry(-2, $class, __("Published articles"), $num_published, 
-                       "images/pub_set.png", $link);
+                       "images/pub_set.gif", $link);
 
                if (get_pref($link, 'ENABLE_FEED_CATS')) {
                        print "</ul>";
@@ -4253,23 +4253,23 @@
                                }
        
                                if ($line["marked"] == "t" || $line["marked"] == "1") {
-                                       $marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_set.png\" 
+                                       $marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_set.gif\" 
                                                class=\"markedPic\"
-                                               alt=\"Reset mark\" onclick='javascript:tMark($id)'>";
+                                               alt=\"Unstar article\" onclick='javascript:tMark($id)'>";
                                } else {
-                                       $marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_unset.png\" 
+                                       $marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_unset.gif\" 
                                                class=\"markedPic\"
-                                               alt=\"Set mark\" onclick='javascript:tMark($id)'>";
+                                               alt=\"Star article\" onclick='javascript:tMark($id)'>";
                                }
 
                                if ($line["published"] == "t" || $line["published"] == "1") {
-                                       $published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_set.png\" 
+                                       $published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_set.gif\" 
                                                class=\"markedPic\"
-                                               alt=\"Unpublish\" onclick='javascript:tPub($id)'>";
+                                               alt=\"Unpublish article\" onclick='javascript:tPub($id)'>";
                                } else {
-                                       $published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_unset.png\" 
+                                       $published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_unset.gif\" 
                                                class=\"markedPic\"
-                                               alt=\"Publish\" onclick='javascript:tPub($id)'>";
+                                               alt=\"Publish article\" onclick='javascript:tPub($id)'>";
                                }
 
 #                              $content_link = "<a target=\"_new\" href=\"".$line["link"]."\">" .

diff --git a/images/mark_set.gif b/images/mark_set.gif
new file mode 100644 (file)
index 0000000..aae4809
Binary files /dev/null and b/images/mark_set.gif differ

diff --git a/images/mark_set.png b/images/mark_set.png
deleted file mode 100644 (file)
index b35655c..0000000
Binary files a/images/mark_set.png and /dev/null differ

diff --git a/images/mark_unset.gif b/images/mark_unset.gif
new file mode 100644 (file)
index 0000000..bfa07c9
Binary files /dev/null and b/images/mark_unset.gif differ

diff --git a/images/mark_unset.png b/images/mark_unset.png
deleted file mode 100644 (file)
index bf9059a..0000000
Binary files a/images/mark_unset.png and /dev/null differ

diff --git a/images/pub_set.gif b/images/pub_set.gif
new file mode 100644 (file)
index 0000000..e57bc94
Binary files /dev/null and b/images/pub_set.gif differ

diff --git a/images/pub_set.png b/images/pub_set.png
deleted file mode 100644 (file)
index fa0f586..0000000
Binary files a/images/pub_set.png and /dev/null differ

diff --git a/images/pub_unset.gif b/images/pub_unset.gif
new file mode 100644 (file)
index 0000000..e470e8e
Binary files /dev/null and b/images/pub_unset.gif differ

diff --git a/images/pub_unset.png b/images/pub_unset.png
deleted file mode 100644 (file)
index 10faf25..0000000
Binary files a/images/pub_unset.png and /dev/null differ

diff --git a/localized_js.php b/localized_js.php
index 77b9ea2f50c3cadff4dd326d15fcd7fe61df09b7..1f2c7c1710c8aa42904ef5f98846d9c559ca91a4 100644 (file)
--- a/localized_js.php
+++ b/localized_js.php
@@ -119,6 +119,13 @@ print T_js_decl("Entered passwords do not match.");
 print T_js_decl("No articles found to mark");
 print T_js_decl("Mark %d article(s) as read?");
 print T_js_decl("No article is selected.");
+print T_js_decl("Star article");
+print T_js_decl("Unstar article");
+print T_js_decl("Please wait...");
+print T_js_decl("Publish article");
+print T_js_decl("Unpublish article");
+#print T_js_decl(
+#print T_js_decl(
 #print T_js_decl(
 #print T_js_decl(
 #print T_js_decl(

diff --git a/viewfeed.js b/viewfeed.js
index c7a85fdb60b404d5c446c2d0aca5dc99b3af73f2..2984b4bc6c0437d687af863926cb0f20a73b2786 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -345,8 +345,8 @@ function tMark_afh_off(effect) {
                debug("tMark_afh_off : " + elem.id);
 
                if (elem) {
-                       elem.src = "images/mark_unset.png";
-                       elem.alt = "Set mark";
+                       elem.src = elem.src.replace("mark_set", "mark_unset");
+                       elem.alt = __("Star article");
                        Element.show(elem);
                }
 
@@ -362,8 +362,8 @@ function tPub_afh_off(effect) {
                debug("tPub_afh_off : " + elem.id);
 
                if (elem) {
-                       elem.src = "images/pub_unset.png";
-                       elem.alt = "Publish";
+                       elem.src = elem.src.replace("pub_set", "pub_unset");
+                       elem.alt = __("Publish article");
                        Element.show(elem);
                }
 
@@ -372,7 +372,7 @@ function tPub_afh_off(effect) {
        }
 }
 
-function toggleMark(id) {
+function toggleMark(id, client_only, no_effects) {
 
        try {
 
@@ -395,9 +395,9 @@ function toggleMark(id) {
                var vfeedu = document.getElementById("FEEDU--1");
                var crow = document.getElementById("RROW-" + id);
        
-               if (mark_img.alt != "Reset mark") {
-                       mark_img.src = "images/mark_set.png";
-                       mark_img.alt = "Reset mark";
+               if (mark_img.src.match("mark_unset")) {
+                       mark_img.src = mark_img.src.replace("mark_unset", "mark_set");
+                       mark_img.alt = __("Unstar article");
                        query = query + "&mark=1";
        
 /*                     if (vfeedu && crow.className.match("Unread")) {
@@ -406,18 +406,18 @@ function toggleMark(id) {
        
                } else {
                        //mark_img.src = "images/mark_unset.png";
-                       mark_img.alt = "Please wait...";
+                       mark_img.alt = __("Please wait...");
                        query = query + "&mark=0";
        
 /*                     if (vfeedu && crow.className.match("Unread")) {
                                vfeedu.innerHTML = (+vfeedu.innerHTML) - 1;
                        } */
        
-                       if (document.getElementById("headlinesList")) {
+                       if (document.getElementById("headlinesList") && !no_effects) {
                                Effect.Puff(mark_img, {duration : 0.25, afterFinish: tMark_afh_off});
                        } else { 
-                               mark_img.src = "images/mark_unset.png";
-                               mark_img.alt = "Set mark";
+                               mark_img.src = mark_img.src.replace("mark_set", "mark_unset");
+                               mark_img.alt = __("Star article");
                        }
                }
        
@@ -440,18 +440,20 @@ function toggleMark(id) {
        
                //new Ajax.Request(query); */
 
-               debug(query);
+               if (!client_only) {
+                       debug(query);
 
-               xmlhttp_rpc.open("GET", query, true);
-               xmlhttp_rpc.onreadystatechange=all_counters_callback;
-               xmlhttp_rpc.send(null);
+                       xmlhttp_rpc.open("GET", query, true);
+                       xmlhttp_rpc.onreadystatechange=all_counters_callback;
+                       xmlhttp_rpc.send(null);
+               }
 
        } catch (e) {
                exception_error("toggleMark", e);
        }
 }
 
-function togglePub(id) {
+function togglePub(id, client_only, no_effects) {
 
        try {
 
@@ -474,9 +476,9 @@ function togglePub(id) {
                var vfeedu = document.getElementById("FEEDU--2");
                var crow = document.getElementById("RROW-" + id);
        
-               if (mark_img.alt != "Unpublish") {
-                       mark_img.src = "images/pub_set.png";
-                       mark_img.alt = "Unpublish";
+               if (mark_img.src.match("pub_unset")) {
+                       mark_img.src = mark_img.src.replace("pub_unset", "pub_set");
+                       mark_img.alt = __("Unpublish article");
                        query = query + "&pub=1";
        
 /*                     if (vfeedu && crow.className.match("Unread")) {
@@ -485,18 +487,18 @@ function togglePub(id) {
        
                } else {
                        //mark_img.src = "images/pub_unset.png";
-                       mark_img.alt = "Please wait...";
+                       mark_img.alt = __("Please wait...");
                        query = query + "&pub=0";
        
 /*                     if (vfeedu && crow.className.match("Unread")) {
                                vfeedu.innerHTML = (+vfeedu.innerHTML) - 1;
                        } */
 
-                       if (document.getElementById("headlinesList")) {
+                       if (document.getElementById("headlinesList") && !no_effects) {
                                Effect.Puff(mark_img, {duration : 0.25, afterFinish: tPub_afh_off});
                        } else { 
-                               mark_img.src = "images/pub_unset.png";
-                               mark_img.alt = "Publish";
+                               mark_img.src = mark_img.src.replace("pub_set", "pub_unset");
+                               mark_img.alt = __("Publish article");
                        }
                }
        
@@ -519,9 +521,11 @@ function togglePub(id) {
        
                new Ajax.Request(query); */
 
-               xmlhttp_rpc.open("GET", query, true);
-               xmlhttp_rpc.onreadystatechange=all_counters_callback;
-               xmlhttp_rpc.send(null);
+               if (!client_only) {
+                       xmlhttp_rpc.open("GET", query, true);
+                       xmlhttp_rpc.onreadystatechange=all_counters_callback;
+                       xmlhttp_rpc.send(null);
+               }
 
        } catch (e) {
 
@@ -737,30 +741,7 @@ function selectionToggleMarked(cdm_mode) {
                }
 
                for (i = 0; i < rows.length; i++) {
-                       var row = document.getElementById("RROW-" + rows[i]);
-                       var mark_img = document.getElementById("FMPIC-" + rows[i]);
-
-                       if (row && mark_img) {
-
-                               if (mark_img.alt == "Set mark") {
-                                       mark_img.src = "images/mark_set.png";
-                                       mark_img.alt = "Reset mark";
-                                       //mark_img.setAttribute('onclick', 
-                                       //      'javascript:toggleMark('+rows[i]+', false)');
-               
-                               } else {
-                                       mark_img.src = "images/mark_unset.png";
-                                       mark_img.alt = "Set mark";
-
-                                       //mark_img.alt = "Please wait...";
-
-                                       //mark_img.setAttribute('onclick', 
-                                       //      'javascript:toggleMark('+rows[i]+', true)');
-
-                                       //Effect.Puff(mark_img, {duration : 0.25, afterFinish: tMark_afh_off});
-
-                               }
-                       }
+                       toggleMark(rows[i], true, true);
                }
 
                if (rows.length > 0) {
@@ -808,27 +789,7 @@ function selectionTogglePublished(cdm_mode) {
                }
 
                for (i = 0; i < rows.length; i++) {
-                       var row = document.getElementById("RROW-" + rows[i]);
-                       var mark_img = document.getElementById("FPPIC-" + rows[i]);
-
-                       if (row && mark_img) {
-
-                               if (mark_img.alt == "Publish") {
-                                       mark_img.src = "images/pub_set.png";
-                                       mark_img.alt = "Unpublish";
-//                                     mark_img.setAttribute('onclick', 
-//                                             'javascript:togglePub('+rows[i]+', false)');
-
-                               } else {
-                                       mark_img.src = "images/pub_unset.png";
-                                       mark_img.alt = "Publish";
-//                                     mark_img.setAttribute('onclick', 
-//                                             'javascript:togglePub('+rows[i]+', true)');
-
-//                                     Effect.Puff(mark_img, {duration : 0.25, afterFinish: tPub_afh_off});
-
-                               }
-                       }
+                       togglePub(rows[i], true, true);
                }
 
                if (rows.length > 0) {