From e6461e58aacf60774b05e8a0689c4c63eda05e17 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Sun, 22 Apr 2012 19:48:43 +0530
Subject: [PATCH] html structure

---
 manifests/templates/shipList.html | 84 +++++++++++++++++--------------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/manifests/templates/shipList.html b/manifests/templates/shipList.html
index b63b777..fa8e7c6 100644
--- a/manifests/templates/shipList.html
+++ b/manifests/templates/shipList.html
@@ -25,53 +25,59 @@ $(function() {
             <div id="status">
 No of results: {{ no_of_results }} &nbsp; displaying page {{ page }} of {{ no_of_pages }} &nbsp; Results per page: {{ page_size }}
             </div>
-            <div id="leftCol">
+            <div id="formDiv">
                 <form id="shipFilterForm" action="" method="GET">
-                    <label for="id_sort">Sort By:</label>
-                    <select id="id_sort" name="sort">
-                        <option value="number" {% ifequal params.sort "number" %} selected="selected" {% endifequal %}>Ship Number Ascending</option>
-                        <option value="-number" {% ifequal params.sort "-number" %} selected="selected" {% endifequal %}>Ship Number Descending</option> 
-                        <option value="date" {% ifequal params.sort "date" %} selected="selected" {% endifequal %}>Date Ascending</option>
-                        <option value="-date" {% ifequal params.sort "-date" %} selected="selected" {% endifequal %}>Date Descending</option>
-                        <option value="ship_name_trans" {% ifequal params.sort "ship_name_trans" %} selected="selected" {% endifequal %}>Ship Name Ascending</option>
-                        <option value="-ship_name_trans" {% ifequal params.sort "-ship_name_trans" %} selected="selected" {% endifequal %}>Ship Name Descending</option>
-                        <option value="port" {% ifequal params.sort "port" %} selected="selected" {% endifequal %}>Port Name Ascending</option>
-                        <option value="-port" {% ifequal params.sort "-port" %} selected="selected" {% endifequal %}>Port Name Descending</option>
-                    </select><br />
+                    <fieldset>
+                        <label for="id_sort">Sort By:</label>
+                        <select id="id_sort" name="sort">
+                            <option value="number" {% ifequal params.sort "number" %} selected="selected" {% endifequal %}>Ship Number Ascending</option>
+                            <option value="-number" {% ifequal params.sort "-number" %} selected="selected" {% endifequal %}>Ship Number Descending</option> 
+                            <option value="date" {% ifequal params.sort "date" %} selected="selected" {% endifequal %}>Date Ascending</option>
+                            <option value="-date" {% ifequal params.sort "-date" %} selected="selected" {% endifequal %}>Date Descending</option>
+                            <option value="ship_name_trans" {% ifequal params.sort "ship_name_trans" %} selected="selected" {% endifequal %}>Ship Name Ascending</option>
+                            <option value="-ship_name_trans" {% ifequal params.sort "-ship_name_trans" %} selected="selected" {% endifequal %}>Ship Name Descending</option>
+                            <option value="port" {% ifequal params.sort "port" %} selected="selected" {% endifequal %}>Port Name Ascending</option>
+                            <option value="-port" {% ifequal params.sort "-port" %} selected="selected" {% endifequal %}>Port Name Descending</option>
+                        </select>
+                    </fieldset>
 
-                    <label for="id_start_date">Start Date:</label>
-                    <input type="date" name="start_date" value="{{ params.start_date }}" id="id_start_date" /> <br />
+                    <fieldset>
+                        <label for="id_start_date">Start Date:</label>
+                        <input type="date" name="start_date" value="{{ params.start_date }}" id="id_start_date" />
 
-                    <label for="id_end_date">End Date:</label>
-                    <input type="date" name="end_date" value="{{ params.end_date }}" id="id_end_date" /> <br />
+                        <label for="id_end_date">End Date:</label>
+                        <input type="date" name="end_date" value="{{ params.end_date }}" id="id_end_date" />
+                    </fieldset>
 
-                    <label for="id_bill_type">Bill Type:</label>                    
-                    <select name="bill_type" id="id_bill_type">
-                        <option value="">-----</option>
-                        <option value="Import" {% ifequal params.bill_type "Import" %} selected="selected" {% endifequal %}>Import</option>
-                        <option value="Export" {% ifequal params.bill_type "Export" %} selected="selected" {% endifequal %}>Export</option>
-                        <option value="Rexport" {% ifequal params.bill_type "Rexport" %} selected="selected" {% endifequal %}>Rexport</option>
-                    </select><br />
-
-                    <label for="id_ship_name">Ship Name:</label>
-                    <input type="text" name="ship_name" value="{{ params.ship_name }}" id="id_ship_name" /> <br />
-
-                    <label for="id_port">Port:</label>
-                    <input type="text" name="port" id="id_port" value="{{ params.port }}" /><br />
-
-                    <label for="id_captain">Captain:</label>
-                    <input type="text" name="captain" id="id_captain" value="{{ params.captain }}" /><br />
-
-                    <label for="id_owner">Owner:</label>
-                    <input type="text" name="owner" id="id_owner" value="{{ params.owner }}" /><br />
-
-                    <label for="id_goods">Goods:</label>
-                    <input type="text" name="goods" id="id_goods" value="{{ params.goods }}" /><br />
+                    <fieldset>
+                        <label for="id_bill_type">Bill Type:</label>                    
+                        <select name="bill_type" id="id_bill_type">
+                            <option value="">-----</option>
+                            <option value="Import" {% ifequal params.bill_type "Import" %} selected="selected" {% endifequal %}>Import</option>
+                            <option value="Export" {% ifequal params.bill_type "Export" %} selected="selected" {% endifequal %}>Export</option>
+                            <option value="Rexport" {% ifequal params.bill_type "Rexport" %} selected="selected" {% endifequal %}>Rexport</option>
+                        </select>
                     
+
+                        <label for="id_ship_name">Ship Name:</label>
+                        <input type="text" name="ship_name" value="{{ params.ship_name }}" id="id_ship_name" />
+
+                        <label for="id_port">Port:</label>
+                        <input type="text" name="port" id="id_port" value="{{ params.port }}" />
+
+                        <label for="id_captain">Captain:</label>
+                        <input type="text" name="captain" id="id_captain" value="{{ params.captain }}" />
+
+                        <label for="id_owner">Owner:</label>
+                        <input type="text" name="owner" id="id_owner" value="{{ params.owner }}" />
+
+                        <label for="id_goods">Goods:</label>
+                        <input type="text" name="goods" id="id_goods" value="{{ params.goods }}" />
+                    </fieldset>
                     <input type="submit" value="Submit" />
                 </form>
             </div>
-            <div id="rightCol">
+            <div id="tableDiv">
                <table>
                     <thead>
                         <td>Ship Number</td>