4 files changed, 13 insertions, 49 deletions
diff --git a/python/Dawn/templates/blotter.html b/python/Dawn/templates/blotter.html
index 96d28f79..1016f0ef 100644
--- a/python/Dawn/templates/blotter.html
+++ b/python/Dawn/templates/blotter.html
@@ -20,7 +20,7 @@
   </thead>
   {% for trade in trades %}
   <tr>
-    <td><a href="{{url_for('trade_manage', tradeid=trade.id)}}">{{trade.dealid}}</a></td>
+    <td><a href="{{url_for('trade_manage', tradeid=trade.id, kind='bond')}}">{{trade.dealid}}</a></td>
     <td>{{trade.trade_date}}</td>
     <td>{{trade.settle_date}}</td>
     <td>{% if trade.buysell %}Buy{% else %}Sell{% endif %}</td>
diff --git a/python/Dawn/templates/cds_blotter.html b/python/Dawn/templates/cds_blotter.html
index f0ce8d44..afa22586 100644
--- a/python/Dawn/templates/cds_blotter.html
+++ b/python/Dawn/templates/cds_blotter.html
@@ -17,7 +17,7 @@
   </thead>
   {% for trade in trades %}
   <tr>
-    <td><a href="{{url_for('cds_trade_manage', tradeid=trade.id)}}">{{trade.dealid}}</a></td>
+    <td><a href="{{url_for('trade_manage', tradeid=trade.id, kind='cds')}}">{{trade.dealid}}</a></td>
     <td>{{trade.trade_date}}</td>
     <td>{{trade.protection}}</td>
     <td>{{trade.security_desc}}</td>
diff --git a/python/Dawn/templates/cds_trade_entry.html b/python/Dawn/templates/cds_trade_entry.html
deleted file mode 100644
index 84971a29..00000000
--- a/python/Dawn/templates/cds_trade_entry.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
-    </head>
-  <body style="max-width:1024px; margin:0 auto">
-    <datalist id="index_list"></datalist>
-    <form method="POST" class="form-horizontal"
-          action="{{url_for('cds_trade_manage', tradeid=trade_id)}}" enctype="multipart/form-data">
-      {% for field in form if field.type != 'BooleanField' %}
-      <div class="form-group {% if field.id in errors %}has-error{% endif %}">
-        {% if field.type != 'CSRFTokenField' %}
-        <label class="control-label col-md-2" for="{{ field.id }}">
-          {{ field.label.text }}
-        </label>
-        {% endif %}
-        <div class="col-md-3">
-          {{ field(class_="form-control") }}
-        </div>
-        {% if field.id in errors %}
-        <div class="col-md-3">
-          {{errors[field.id][0]}}
-        </div>{% endif %}
-      </div>
-      {% endfor %}
-      <div class="form-group">
-        <div class="col-md-offset-2 col-md-3">
-          <div class="checkbox">
-            <label>
-              <input id="upload_globeop" name="upload_globeop" type="checkbox" value="y">Upload to globeop?
-            </label>
-          </div>
-        </div>
-      </div>
-      <div class="form-group">
-        <div class="col-md-offset-2 col-md-3">
-          <button type="submit" class="btn btn-default">Submit</button>
-        </div>
-      </div>
-    </form>
-    <script type="text/javascript" src="{{ url_for('static', filename='utils.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename='dawn.js') }}"></script>
-  </body>
-</html>
diff --git a/python/Dawn/templates/trade_entry.html b/python/Dawn/templates/trade_entry.html
index abc59550..303a7423 100644
--- a/python/Dawn/templates/trade_entry.html
+++ b/python/Dawn/templates/trade_entry.html
@@ -5,10 +5,11 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
     </head>
   <body style="max-width:1024px; margin:0 auto">
+    <datalist id="index_list"></datalist>
     <form method="POST" class="form-horizontal"
-          action="{{url_for('trade_manage', tradeid=trade_id)}}" enctype="multipart/form-data">
+          action="{{action_url}}" enctype="multipart/form-data">
       {% for field in form if field.type != 'BooleanField' %}
-      <div class="form-group">
+      <div class="form-group {% if field.id in form.errors %}has-error{% endif %}">
         {% if field.type != 'CSRFTokenField' %}
         <label class="control-label col-md-2" for="{{ field.id }}">
           {{ field.label.text }}
@@ -17,6 +18,10 @@
         <div class="col-md-3">
           {{ field(class_="form-control") }}
         </div>
+        {% if field.id in form.errors %}
+        <div class="col-md-3">
+          {{form.errors[field.id][0]}}
+        </div>{% endif %}
       </div>
       {% endfor %}
       <div class="form-group">
@@ -34,5 +39,9 @@
         </div>
       </div>
     </form>
+    {% if 'cds' in action_url %}
+    <script type="text/javascript" src="{{ url_for('static', filename='utils.js') }}"></script>
+    <script type="text/javascript" src="{{ url_for('static', filename='dawn.js') }}"></script>
+    {% endif %}
   </body>
 </html>