[Rt-commit] r3383 - in rt/branches/3.5-TESTING: . html/Elements html/Search

[glasser at bestpractical.com]

Author: glasser
Date: Mon Jul  4 17:35:33 2005
New Revision: 3383

Modified:
   rt/branches/3.5-TESTING/   (props changed)
   rt/branches/3.5-TESTING/html/Elements/Header
   rt/branches/3.5-TESTING/html/Search/Results.html
   rt/branches/3.5-TESTING/html/Search/Results.rdf
Log:
 r36250 at tin-foil:  glasser | 2005-07-04 18:33:35 -0300
  * RSS AutoDiscovery.  (Also, put some more /> into header links, since we're
    claiming to be XHTML.  And use a more accurate Content-Type for the RSS file
    (which probably wants to be renamed, anyway).) 


Modified: rt/branches/3.5-TESTING/html/Elements/Header
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/Header	(original)
+++ rt/branches/3.5-TESTING/html/Elements/Header	Mon Jul  4 17:35:33 2005
@@ -53,8 +53,11 @@
 % if ($Refresh > 0) {
     <meta http-equiv="refresh" content="<%$Refresh%>" />
 % }
-<link rel="shortcut icon" href="<%$RT::WebImagesURL%>/favicon.png" type="image/png">
-<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/css/main.css" type="text/css">
+<link rel="shortcut icon" href="<%$RT::WebImagesURL%>/favicon.png" type="image/png" />
+<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/css/main.css" type="text/css" />
+% if ($RSSAutoDiscovery) {
+    <link rel="alternate" href="<%$RSSAutoDiscovery%>" type="application/rss+xml" title="RSS RT Search" />
+% }
 <script type="text/javascript" src="<%$RT::WebPath%>/rt.js"></script>
 <& /Elements/Callback, _CallbackName => 'Head', %ARGS &>
   </head>
@@ -104,4 +107,5 @@
 $ShowBar => 1
 #$LoggedIn => 1
 $URL => undef
+$RSSAutoDiscovery => undef
 </%ARGS>

Modified: rt/branches/3.5-TESTING/html/Search/Results.html
==============================================================================
--- rt/branches/3.5-TESTING/html/Search/Results.html	(original)
+++ rt/branches/3.5-TESTING/html/Search/Results.html	Mon Jul  4 17:35:33 2005
@@ -43,7 +43,8 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<& /Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'} &>
+<& /Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'}, 
+    RSSAutoDiscovery => $RSSFeedURL &>
 <& /Ticket/Elements/Tabs, 
     current_tab => "Search/Results.html".$QueryString, 
     Title => $title,
@@ -80,8 +81,8 @@
 <a href="<%$RT::WebPath%>/Search/Bulk.html<%$QueryString%>"><&|/l&>Update multiple tickets</&></a><br/>
 <a href="<%$RT::WebPath%>/Search/Results.html<%$QueryString%>"><&|/l&>Bookmarkable link</&></a><br/>
 <a href="<%$RT::WebPath%>/Search/Results.tsv<%$QueryString%>"><&|/l&>spreadsheet</&></a> |
-<a href="<%$RT::WebPath%>/Search/Results.rdf<%$QueryString%>"><&|/l&>RSS</&></a> |
-<a href="<%$RT::WebPath%>/Tools/Offline.html<%$QueryString%>"><&|/l&>Work offline</&></a><br/>
+<a href="<%$RSSFeedURL%>"><&|/l&>RSS</&></a> |
+<a href="<%$RT::WebPath%>/Tools/Offline.html<%$ShortQueryString%>"><&|/l&>Work offline</&></a><br/>
 <form method="get" action="<%$RT::WebPath%>/Search/Chart.html"><&|/l&>chart</&>
 % my @vars = (Query => $Query, Format => $Format,  Rows => $Rows, OrderBy => $OrderBy,  Order => $Order);
 %while (my $var = shift (@vars)) {
@@ -150,7 +151,8 @@
                                OrderBy => $OrderBy,
                                Order => $Order,
                                Page => $Page);
-
+my $ShortQueryString = "?".$m->comp('/Elements/QueryString', Query => $Query);
+my $RSSFeedURL = "$RT::WebPath/Search/Results.rdf$ShortQueryString";
 
 if ($ARGS{'TicketsRefreshInterval'}) {
 	$session{'tickets_refresh_interval'} = $ARGS{'TicketsRefreshInterval'};

Modified: rt/branches/3.5-TESTING/html/Search/Results.rdf
==============================================================================
--- rt/branches/3.5-TESTING/html/Search/Results.rdf	(original)
+++ rt/branches/3.5-TESTING/html/Search/Results.rdf	Mon Jul  4 17:35:33 2005
@@ -47,7 +47,7 @@
 
 my $Tickets = RT::Tickets->new($session{'CurrentUser'});
 $Tickets->FromSQL($ARGS{'Query'});
-$r->content_type('application/rdf+xml');
+$r->content_type('application/rss+xml');