Misc finatra fixes

- Fix span details modal on static trace page
- Remove unnecessary code
- Sort span annotations by timestamp when dumping to json

Author: @franklinhu
Fixes #80
URL: #80

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}}

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}}

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(_)))
   }