[Rt-commit] [svn] r834 - in RTx-Atom: . html/Atom/0.3/Elements html/Atom/0.3/Get html/Atom/0.3/NoAuth html/Atom/0.3/Search

[autrijus at pallas.eruditorum.org]

Author: autrijus
Date: Wed May  5 17:41:03 2004
New Revision: 834

Modified:
   RTx-Atom/   (props changed)
   RTx-Atom/html/Atom/0.3/Elements/Entry
   RTx-Atom/html/Atom/0.3/Elements/Link
   RTx-Atom/html/Atom/0.3/Get/index
   RTx-Atom/html/Atom/0.3/NoAuth/spec.html
   RTx-Atom/html/Atom/0.3/Search/index
Log:
 ----------------------------------------------------------------------
 r4471 at not:  autrijus | 2004-05-05T21:39:27.752873Z
 
 * According to the atom spec, <link> should appear in the <entry>
   level, not inside the <content> level.
 ----------------------------------------------------------------------
 r4472 at not:  autrijus | 2004-05-05T21:40:42.200571Z
 
 * Normalize upward links; use the '_' prefix to distinguish it from
   member links.
 ----------------------------------------------------------------------


Modified: RTx-Atom/html/Atom/0.3/Elements/Entry
==============================================================================
--- RTx-Atom/html/Atom/0.3/Elements/Entry	(original)
+++ RTx-Atom/html/Atom/0.3/Elements/Entry	Wed May  5 17:41:03 2004
@@ -3,7 +3,7 @@
 % if ($IsChild) {
     <& $ShowLink, Relation => "service.edit", URI => "$FeedURI/$entry{Id}", Title => $entry{Name}, IsChild => $IsChild &>
 % } elsif ("$BaseURI/$Path" =~ m{^(.+)/}) {
-    <& $ShowLink, Relation => "service.feed", URI => "$1?", Title => "Up" &>
+    <& $ShowLink, Relation => "service.feed", URI => "$1?", Title => "_Up" &>
 % }
 % if ($entry{HTML_URI}) {
     <& $ShowLink, Type => 'text/html', URI => "$RT::WebURL$entry{HTML_URI}", Title => $entry{Name} &>

Modified: RTx-Atom/html/Atom/0.3/Elements/Link
==============================================================================
--- RTx-Atom/html/Atom/0.3/Elements/Link	(original)
+++ RTx-Atom/html/Atom/0.3/Elements/Link	Wed May  5 17:41:03 2004
@@ -2,6 +2,7 @@
 <link rel="<% $Relation %>" type="<% $Type %>" href="<% $URI %>" title="<% $Title %>" />
 % return if $session{AtomClient};
 % $URI =~ s/\?$/?rows=10/g;
+% $Title =~ s/^_//;
 % $Title = loc($Class) . ' - ' . loc($Title);
 <html:link rel="<% $Relation %>" type="<% $Type %>" href="<% $URI %>" title="<% $Title %>" />
 % return unless length $Text;

Modified: RTx-Atom/html/Atom/0.3/Get/index
==============================================================================
--- RTx-Atom/html/Atom/0.3/Get/index	(original)
+++ RTx-Atom/html/Atom/0.3/Get/index	Wed May  5 17:41:03 2004
@@ -9,7 +9,8 @@
   <& $ShowEntry, %ARGS, Object => $obj, IsChild => 0 &>
   <content type="text/xml" mode="xml">
     <% $xml|n %>
-    <html:dl>
+  </content>
+  <html:dl>
 % foreach my $key (keys %$struct) {
 %   my $value = $struct->{$key};
 %   my $is_feed = ref($value);
@@ -20,8 +21,7 @@
       <html:dd><% $text %></html:dd>
 %   }
 % }
-    </html:dl>
-  </content>
+  </html:dl>
 </entry>
 <%INIT>
 my $obj = $CollectionClass->new($session{CurrentUser})->NewItem;
@@ -37,7 +37,7 @@
 delete $session{CurrentUser}{LangHandle};
 
 require XML::Simple;
-my $xs = XML::Simple->new(RootName => 'head', NoIndent => 0);
+my $xs = XML::Simple->new(RootName => 'body', NoIndent => 0);
 my $xml = $xs->XMLout($struct);
 $xml =~ s/"Not set"/""/g;
 $xml =~ s/" "/"\n"/g;

Modified: RTx-Atom/html/Atom/0.3/NoAuth/spec.html
==============================================================================
--- RTx-Atom/html/Atom/0.3/NoAuth/spec.html	(original)
+++ RTx-Atom/html/Atom/0.3/NoAuth/spec.html	Wed May  5 17:41:03 2004
@@ -13,5 +13,5 @@
 );
 
 seek $fh, 0, 0;
-$r->print(<$fh>);
+print <$fh>;
 </%INIT>

Modified: RTx-Atom/html/Atom/0.3/Search/index
==============================================================================
--- RTx-Atom/html/Atom/0.3/Search/index	(original)
+++ RTx-Atom/html/Atom/0.3/Search/index	Wed May  5 17:41:03 2004
@@ -18,7 +18,7 @@
     (<&|/l, $TotalFound&>[_1] Total</&>)
 % }
   </tagline>
-  <& $ShowLink, Relation => "service.feed", URI => $BaseURI, Title => "Homepage" &>
+  <& $ShowLink, Relation => "service.feed", URI => $BaseURI, Title => "_Up" &>
   <& $ShowLink, Relation => "service.post", URI => "$FeedURI!add", Title => $Type &>
 % # XXX - The URI below is incorrect; should point to collection URL
   <& $ShowLink, Type => 'text/html', URI => $RT::WebURL, Title => $Type &>