Merge remote-tracking branch 'upstream/pull/2109'

[rails.git] / app / views / notes / _note.gpx.builder

diff --git a/app/views/notes/_note.gpx.builder b/app/views/notes/_note.gpx.builder
index 22d9283ef7a8aff3a8b8c0af4df3225864ae5db3..f6bb39d27dc1347883785c5a76546fa42ecb12d2 100644 (file)
--- a/app/views/notes/_note.gpx.builder
+++ b/app/views/notes/_note.gpx.builder
@@ -1,18 +1,27 @@
 xml.wpt("lon" => note.lon, "lat" => note.lat) do
 xml.wpt("lon" => note.lon, "lat" => note.lat) do

+  xml.time note.created_at.to_s(:iso8601)
+  xml.name t("browse.note.title", :id => note.id)
+

   xml.desc do
   xml.desc do

-    xml.cdata! render(:partial => "description", :object => note, :formats => [ :html ])
+    xml.cdata! render(:partial => "description", :object => note, :formats => [:html])

   end
 
   end
 

-  xml.extension do
-    if note.status = "open"
-      xml.closed "0"
-    else
-      xml.closed "1"
-    end
+  xml.link("href" => browse_note_url(note, :only_path => false))

 
 

+  xml.extensions do

     xml.id note.id
     xml.url note_url(note, :format => params[:format])
     xml.id note.id
     xml.url note_url(note, :format => params[:format])

-    xml.comment_url comment_note_url(note, :format => params[:format])
-    xml.close_url close_note_url(note, :format => params[:format])
+
+    if note.closed?
+      xml.reopen_url reopen_note_url(note, :format => params[:format])
+    else
+      xml.comment_url comment_note_url(note, :format => params[:format])
+      xml.close_url close_note_url(note, :format => params[:format])
+    end
+
+    xml.date_created note.created_at
+    xml.status note.status
+
+    xml.date_closed note.closed_at if note.closed?

   end
 end
   end
 end