Table width fixed for small screen.

DeemOpen · Feb 19, 2016 · 96c52c0 · 96c52c0
1 parent 57fe5dd
commit 96c52c0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 29 deletions.
diff --git a/src/main/resources/templates/search.ftl.html b/src/main/resources/templates/search.ftl.html
@@ -23,13 +23,14 @@ <h3>Search Testcase</h3>
         <#if testCaseLst??>
         <div class="row">
             <div class="col-md-12">
-                <table id="testcase-ele" class="table table-striped table-bordered" width="100%" cellspacing="0">
+                <table id="testcase-ele" class="table table-striped table-bordered wrap-table" width="100%" cellspacing="0">
                     <thead>
                         <tr>
-                            <th>Testcase ID</th>
-                            <th>Test Folder</th>
+                            <th width="5%">Testcase ID</th>
+                            <th width="15%">Product</th>
+                            <th width="15%">Test Folder</th>
                             <th>Test Name</th>
-                            <th>Product</th>
+                            <th>Description</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -38,15 +39,16 @@ <h3>Search Testcase</h3>
                             <td>
                                 ${tc.id?c}
                             </td>
+                            <td>
+                                ${tc.product}
+                            </td>
                             <td>
                                 <a href="/testcase?nodeId=${tc.folderId.id?c}">
                                     ${tc.folderId.name}
                                 </a>
                             </td>
                             <td><a href="/testcase_edit?testcaseId=${tc.id?c}">${tc.name}</a></td>
-                            <td>
-                                ${tc.product}
-                            </td>
+                            <td>${tc.description?html}</td>
                         </tr>
                         </#list>
 

diff --git a/src/main/resources/templates/testplan_run.ftl.html b/src/main/resources/templates/testplan_run.ftl.html
@@ -46,17 +46,12 @@ <h3>Run Test Plan</h3>
                 <table id="testplanrun-ele" class="table table-striped table-bordered" width="100%" cellspacing="0">
                     <thead>
                         <tr>
-                            <th class="no-sort"><input type="checkbox" id="checkAll"/> </th>
+                            <th><input type="checkbox" id="checkAll"/> </th>
                             <th>Test Id</th>
                             <th>Test Folder</th>
                             <th>Test Name</th>
-                            <th>Product</th>
-                            <th>Assigned</th>
-                            <th>Priority</th>
+                            <th>Info</th>
                             <th>Comments</th>
-                            <th>Bug</th>
-                            <th>Environment</th>
-                            <th>Run</th>
                             <th>By</th>
                             <th>Status</th>
                         </tr>
@@ -68,36 +63,49 @@ <h3>Run Test Plan</h3>
                         <td class="no-sort">
                             <input type="checkbox" name="testcaseChk" value="${tc.id?c}"/>
                         </td>
-                        <td style="white-space: nowrap">
+                        <td>
                             <a href="#" class="teststepShow" id="${tc.id?c}">${tc.id?c} &nbsp;<i class="fa fa-sort-desc"></i></a>
                         </td>
                         <td>
                             <a href="/testcase?nodeId=${tc.folderId.id?c}">
                                 ${tc.folderId.name}
                             </a>
                         </td>
-                        <td style="word-break:break-all;"><a href="/testcase_edit?testcaseId=${tc.id?c}">${tc.name}</a></td>
-                        <td>${tc.product}</td>
+                        <td><a href="/testcase_edit?testcaseId=${tc.id?c}">${tc.name}</a></td>
                         <td>
+                            Product: ${tc.product}
+                            <br/>
+                            Assigned To: 
                             <#list tptcLst as tptc>
                             <#if tptc.testcaseId.id?c == tc.id?c>
                             <#if tptc.assignedTo??>
                             ${tptc.assignedTo}
                             </#if>
                             </#if>
                             </#list>
-                        </td>
-                        <td>
+                            <br/>
+                            Priority: 
                             <#if tc.priority??>
                             ${tc.priority}
                             </#if>
+                            <br/>
+                            Environment: <#if trMap[tc.id?c]??>${trMap[tc.id?c].environment}</#if>
+                            <br/>
+                            Run On:
+                            <#if trMap[tc.id?c]??>${trMap[tc.id?c].timestamp}</#if>
+                            <br/>
                         </td>
-                        <td><input type="text" name="tcomments_${tc.id?c}" size="55" value="<#if trMap[tc.id?c]??>${trMap[tc.id?c].note}</#if>"/></td>
-                        <td><input type="text" name="tbug_${tc.id?c}" size="10" value="<#if trMap[tc.id?c]??>${trMap[tc.id?c].bugTicket}</#if>"/></td>
-                        <td><#if trMap[tc.id?c]??>${trMap[tc.id?c].environment}</#if></td>
                         <td>
-                            <#if trMap[tc.id?c]??>${trMap[tc.id?c].timestamp}</#if>
+                            Comments
+                            <br/>
+                            <input type="text" class="form-control" name="tcomments_${tc.id?c}" maxlength="90" size="45" value="<#if trMap[tc.id?c]??>${trMap[tc.id?c].note}</#if>"/>
+                            <br/>
+                            <br/>
+                            Bug
+                            <br/>
+                            <input type="text" class="form-control" name="tbug_${tc.id?c}" maxlength="45" size="45" value="<#if trMap[tc.id?c]??>${trMap[tc.id?c].bugTicket}</#if>"/>
                         </td>
+
                         <td><#if trMap[tc.id?c]??>${trMap[tc.id?c].tester}</#if></td>
                         <td>
                             <#if trMap[tc.id?c]??>
@@ -118,7 +126,7 @@ <h3>Run Test Plan</h3>
                         </td>
                     </tr>
                     <tr>
-                        <td colspan="13">
+                        <td colspan="8">
                             <div id="tcstep_${tc.id?c}"></div>
                         </td>
                         <td style="display: none;"></td>
@@ -128,11 +136,6 @@ <h3>Run Test Plan</h3>
                         <td style="display: none;"></td>
                         <td style="display: none;"></td>
                         <td style="display: none;"></td>
-                        <td style="display: none;"></td>
-                        <td style="display: none;"></td>
-                        <td style="display: none;"></td>
-                        <td style="display: none;"></td>
-                        <td style="display: none;"></td>
                     </tr>
                     </#list>
                     </#if>