remove modalbox; use dijit.Dialog; further dojo-related updates

[tt-rss.git] / functions.php

diff --git a/functions.php b/functions.php
index 44f5af4dcd324fe57b20d174e807988e9a9e5e72..67e3087ec5b2d102f6a805fe4f1501d00d938d5c 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -4115,7 +4115,7 @@
                        $feed_id, $is_cat, $search, $match_on,
                        $search_mode, $view_mode) {
 
-                       print "<div class=\"headlinesSubToolbar\">";
+#                      print "<div class=\"headlinesSubToolbar\">";
 
                        $page_prev_link = "javascript:viewFeedGoPage(-1)";
                        $page_next_link = "javascript:viewFeedGoPage(1)";
@@ -4246,7 +4246,7 @@
 
                        print "</ul>";
 
-                       print "</div>";
+#                      print "</div>";
                }
 
        function printCategoryHeader($link, $cat_id, $hidden = false, $can_browse = true, 
@@ -5060,8 +5060,10 @@
 
                /// STOP //////////////////////////////////////////////////////////////////////////////////
 
+               print "<toolbar><![CDATA[";
+
                if (!$offset) {
-                       print "<div id=\"headlinesContainer\" $rtl_tag>";
+//                     print "<div id=\"headlinesContainer\" $rtl_tag>";
 
                        if (!$result) {
                                print "<div align='center'>".__("Could not display feed (query failed). Please check label match syntax or local configuration.")."</div>";
@@ -5072,11 +5074,13 @@
                                print_headline_subtoolbar($link, $feed_site_url, $feed_title,
                                        $feed, $cat_view, $search, $match_on, $search_mode, $view_mode);
 
-                               print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
+//                             print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
 
                        }
                }
 
+               print "]]></toolbar><content><![CDATA[";
+
                $headlines_count = db_num_rows($result);
 
                if (db_num_rows($result) > 0) {
@@ -5537,10 +5541,12 @@
                        }
                }
 
-               if (!$offset) {
-                       if ($headlines_count > 0) print "</div>";
-                       print "</div>";
-               }
+#              if (!$offset) {
+#                      if ($headlines_count > 0) print "</div>";
+#                      print "</div>";
+#              }
+
+               print "]]></content>";
 
                return array($topmost_article_ids, $headlines_count, $feed, $disable_cache, $vgroup_last_feed);
        }