From bfbf54c16d2a0a4b4593396052fe860b5d8ddb5f Mon Sep 17 00:00:00 2001
From: Franklin Hu <franklin@twitter.com>
Date: Mon, 23 Jul 2012 10:46:21 -0700
Subject: [PATCH 1/2] Fix span details modal on static trace page, remove
 unnecessary code

---
 .../src/main/resources/templates/show.mustache         | 10 ----------
 .../src/main/resources/templates/static.mustache       |  3 +++
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/zipkin-finatra/src/main/resources/templates/show.mustache b/zipkin-finatra/src/main/resources/templates/show.mustache
index 6a2d7a01fd6..ede8d4ad222 100644
--- a/zipkin-finatra/src/main/resources/templates/show.mustache
+++ b/zipkin-finatra/src/main/resources/templates/show.mustache
@@ -30,16 +30,6 @@
 <div id="annotation-modal" class="trace-desc-body annotation-list modal">
 </div>
 
-<div class="modal hide" id="export-trace-modal">
-  <div class="modal-header">
-    <a class="close" data-dismiss="modal" href="#export-trace-modal">×</a>
-    <h3>Keep this JSON data somewhere safe</h3>
-  </div>
-  <div class="modal-body">
-    <p id="export-trace-data"></p>
-  </div>
-</div>
-
 <script type="text/javascript">
   $(document).ready(function() {
     {{inlineJs}}
diff --git a/zipkin-finatra/src/main/resources/templates/static.mustache b/zipkin-finatra/src/main/resources/templates/static.mustache
index 7ee1d6c6918..ff5b2a7cb9a 100644
--- a/zipkin-finatra/src/main/resources/templates/static.mustache
+++ b/zipkin-finatra/src/main/resources/templates/static.mustache
@@ -14,6 +14,9 @@
   </div>
 </div>
 
+<div id="annotation-modal" class="trace-desc-body annotation-list modal">
+</div>
+
 <script type="text/javascript">
   $(document).ready(function() {
     {{inlineJs}}

From 2ce7618f5982737e8cc36e1852ee88cd9bcfb164 Mon Sep 17 00:00:00 2001
From: Franklin Hu <franklin@twitter.com>
Date: Mon, 23 Jul 2012 11:35:46 -0700
Subject: [PATCH 2/2] Sort annotations when dumping to json

---
 .../src/main/scala/com/twitter/zipkin/adapter/JsonAdapter.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zipkin-finatra/src/main/scala/com/twitter/zipkin/adapter/JsonAdapter.scala b/zipkin-finatra/src/main/scala/com/twitter/zipkin/adapter/JsonAdapter.scala
index b542cc97c3e..54af3435ea2 100644
--- a/zipkin-finatra/src/main/scala/com/twitter/zipkin/adapter/JsonAdapter.scala
+++ b/zipkin-finatra/src/main/scala/com/twitter/zipkin/adapter/JsonAdapter.scala
@@ -58,7 +58,7 @@ object JsonAdapter extends Adapter {
       s.serviceNames,
       s.firstAnnotation.get.timestamp,
       s.duration.get,
-      s.annotations,
+      s.annotations.sortWith((a,b) => a.timestamp < b.timestamp),
       s.binaryAnnotations.map(JsonAdapter(_)))
   }