From 692f2f229205f26aa4a336925b9fc09eb1167d34 Mon Sep 17 00:00:00 2001
From: Shan Jin <shanx.jin@intel.com>
Date: Thu, 16 Jan 2014 15:40:19 +0800
Subject: [PATCH] split version and commitId columns to old part and new part

update two templates of snap diff.

Change-Id: I110bfe09c6d89fcd4b2c8c3b0e9afc5ce1698362
---
 snapdiff/templates/diff.html       | 73 +++++++++++++++---------------
 snapdiff/templates/image_diff.html | 39 ++++++++--------
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/snapdiff/templates/diff.html b/snapdiff/templates/diff.html
index 4a62a6c..de33539 100644
--- a/snapdiff/templates/diff.html
+++ b/snapdiff/templates/diff.html
@@ -36,48 +36,50 @@
         <li><a href="#modified">Modified packages: {{ diff['modified']|count }}</a></li>
         <li><a href="#rebuilded">Packages with Rebuilds: {{ diff['rebuilded']|count }}</a></li>
     </ul>
-    <h3><a>Added Packages</a></h3>
-    {% if diff['added'] %}
-        <table>
+    <table>
+        <tr><td colspan="6" class="tableTitle"><h3><a>Added Packages</a></h3></td></tr>
+        {% if diff['added'] %}
+            <tbody>
             <tr>
-                <th>Package</th><th>Version</th><th>GitPath</th><th>CommitId</th>
+                <th>Package</th><th colspan="2">Version</th><th>GitPath</th><th colspan="2">CommitId</th>
             </tr>
             {% for item in diff['added'] %}
                 <tr>
                     <td>{{ item['newpkg']['name'] }}</td>
-                    <td>{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
+                    <td colspan="2">{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
                     <td>{{ item['newpkg']['git_path'] }}</td>
-                    <td>{{ item['newpkg']['commit_id'] }}</td>
+                    <td colspan="2">{{ item['newpkg']['commit_id'] }}</td>
                 </tr>
             {% endfor %}
-        </table>
-    {% endif %}
-    <h3><a>Removed Packages</a></h3>
-    {% if diff['removed'] %}
-         <table>
+            </tbody>
+        {% endif %}
+        <tr><td colspan="6" class="tableTitle"><h3><a>Removed Packages</a></h3></td></tr>
+        {% if diff['removed'] %}
+         <tbody>
             <tr>
-                <th>Package</th><th>Version</th><th>GitPath</th><th>CommitId</th>
+                <th>Package</th><th colspan="2">Version</th><th>GitPath</th><th colspan="2">CommitId</th>
             </tr>
             {% for item in diff['removed'] %}
                 <tr>
                     <td>{{ item['oldpkg']['name'] }}</td>
-                    <td>{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}</td>
+                    <td colspan="2">{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}</td>
                     <td>{{ item['oldpkg']['git_path'] }}</td>
-                    <td>{{ item['oldpkg']['commit_id'] }}</td>
+                    <td colspan="2">{{ item['oldpkg']['commit_id'] }}</td>
                 </tr>
             {% endfor %}
-        </table>
-    {% endif %}
-    <h3><a>Modified Packages</a></h3>
-    {% if diff['modified'] %}
-         <table>
+        </tbody>
+        {% endif %}
+        <tr><td colspan="6" class="tableTitle"><h3><a>Modified Packages</a></h3></td></tr>
+        {% if diff['modified'] %}
+         <tbody>
             <tr>
-                <th>Package</th><th>Version</th><th>GitPath</th><th>CommitId</th>
+                <th>Package</th><th>Old Version</th><th>New Version</th><th>GitPath</th><th>Old CommitId</th><th>New CommitId</th>
             </tr>
             {% for item in diff['modified'] %}
                 <tr>
                     <td>{{ item['oldpkg']['name'] }}</td>
-                    <td>{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}~{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
+                    <td>{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}</td>
+                    <td>{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
                     <td>
                         <ul>
                             {% if item['oldpkg']['git_path'] != item['newpkg']['git_path'] %}
@@ -88,32 +90,31 @@
                             {% endif %}
                         </ul>
                     </td>
-                    <td>
-                        <ul class="modifLi">
-                            <li>{{ item['oldpkg']['commit_id'] }}</li>
-                            <li>{{ item['newpkg']['commit_id'] }}</li>
-                        </ul>
+                    <td>{{ item['oldpkg']['commit_id'] }}</td>
+                    <td>{{ item['newpkg']['commit_id'] }}</td>
                     </td>
                 </tr>
             {% endfor %}
-        </table>
-    {% endif %}
-    <h3><a>Packages with Rebuilds</a></h3>
-    {% if diff['rebuilded'] %}
-         <table>
+        </tbody>
+        {% endif %}
+        <tr><td colspan="6" class="tableTitle"><h3><a>Packages with Rebuilds</a></h3></td></tr>
+        {% if diff['rebuilded'] %}
+         <tbody>
             <tr>
-                <th>Package</th><th>Version</th><th>GitPath</th><th>CommitId</th>
+                <th>Package</th><th>Old Version</th><th>New Version</td><th>GitPath</th><th colspan="2">CommitId</th>
             </tr>
             {% for item in diff['rebuilded'] %}
                 <tr>
                     <td>{{ item['oldpkg']['name'] }}</td>
-                    <td>{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}~{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
+                    <td>{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}</td>
+                    <td>{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
                     <td>{{ item['oldpkg']['git_path'] }}</td>
-                    <td>{{ item['oldpkg']['commit_id'] }}</td>
+                    <td colspan="2">{{ item['oldpkg']['commit_id'] }}</td>
                 </tr>
             {% endfor %}
-        </table>
-    {% endif %}
+        </tbody>
+        {% endif %}
+    </table>
 </body>
 </html>
 
diff --git a/snapdiff/templates/image_diff.html b/snapdiff/templates/image_diff.html
index dc49dae..93a5d12 100644
--- a/snapdiff/templates/image_diff.html
+++ b/snapdiff/templates/image_diff.html
@@ -81,48 +81,49 @@
         <li><a href="#rebuilded">Packages with Rebuilds: {{ diff['rebuilded']|count }}</a></li>
     </ul>
     <table>
-        <tr><td colspan="4" class="tableTitle"><h3><a>Added Packages</a></h3></td></tr>
+        <tr><td colspan="6" class="tableTitle"><h3><a>Added Packages</a></h3></td></tr>
         {% if diff['added'] %}
             <tbody>
             <tr>
-                <th>Package</th><th>Version</th><th>GitPath</th><th>CommitId</th>
+                <th>Package</th><th colspan="2">Version</th><th>GitPath</th><th colspan="2">CommitId</th>
             </tr>
             {% for item in diff['added'] %}
                 <tr>
                     <td>{{ item['newpkg']['name'] }}</td>
-                    <td>{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
+                    <td colspan="2">{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
                     <td>{{ item['newpkg']['git_path'] }}</td>
-                    <td>{{ item['newpkg']['commit_id'] }}</td>
+                    <td colspan="2">{{ item['newpkg']['commit_id'] }}</td>
                 </tr>
             {% endfor %}
             </tbody>
         {% endif %}
-        <tr><td colspan="4" class="tableTitle"><h3><a>Removed Packages</a></h3></td></tr>
+        <tr><td colspan="6" class="tableTitle"><h3><a>Removed Packages</a></h3></td></tr>
         {% if diff['removed'] %}
             <tbody>
             <tr>
-                <th>Package</th><th>Version</th><th>GitPath</th><th>CommitId</th>
+                <th>Package</th><th colspan="2">Version</th><th>GitPath</th><th colspan="2">CommitId</th>
             </tr>
             {% for item in diff['removed'] %}
                 <tr>
                     <td>{{ item['oldpkg']['name'] }}</td>
-                    <td>{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}</td>
+                    <td colspan="2">{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}</td>
                     <td>{{ item['oldpkg']['git_path'] }}</td>
-                    <td>{{ item['oldpkg']['commit_id'] }}</td>
+                    <td colspan="2">{{ item['oldpkg']['commit_id'] }}</td>
                 </tr>
             {% endfor %}
             </tbody>
         {% endif %}
-        <tr><td colspan="4" class="tableTitle"><h3><a>Modified Packages</a></h3></td></tr>
+        <tr><td colspan="6" class="tableTitle"><h3><a>Modified Packages</a></h3></td></tr>
         {% if diff['modified'] %}
             <tbody>
             <tr>
-                <th>Package</th><th>Version</th><th>GitPath</th><th>CommitId</th>
+                <th>Package</th><th>Old Version</th><th>New Version</th><th>GitPath</th><th>Old CommitId</th><th>New CommitId</th>
             </tr>
             {% for item in diff['modified'] %}
                 <tr>
                     <td>{{ item['oldpkg']['name'] }}</td>
-                    <td>{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}~{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
+                    <td>{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}</td>
+                    <td>{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
                     <td>
                         <ul>
                             {% if item['oldpkg']['git_path'] != item['newpkg']['git_path'] %}
@@ -133,28 +134,26 @@
                             {% endif %}
                         </ul>
                     </td>
-                    <td>
-                        <ul class="modifLi">
-                            <li>{{ item['oldpkg']['commit_id'] }}</li>
-                            <li>{{ item['newpkg']['commit_id'] }}</li>
-                        </ul>
+                    <td>{{ item['oldpkg']['commit_id'] }}</td>
+                    <td>{{ item['newpkg']['commit_id'] }}</td>
                     </td>
                 </tr>
             {% endfor %}
             </tbody>
         {% endif %}
-        <tr><td colspan="4" class="tableTitle"><h3><a>Packages with Rebuilds</a></h3></td></tr>
+        <tr><td colspan="6" class="tableTitle"><h3><a>Packages with Rebuilds</a></h3></td></tr>
         {% if diff['rebuilded'] %}
         <tbody>
             <tr>
-                <th>Package</th><th>Version</th><th>GitPath</th><th>CommitId</th>
+                <th>Package</th><th>Old Version</th><th>New Version</th><th>GitPath</th><th colspan="2">CommitId</th>
             </tr>
             {% for item in diff['rebuilded'] %}
                 <tr>
                     <td>{{ item['oldpkg']['name'] }}</td>
-                    <td>{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}~{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
+                    <td>{{ item['oldpkg']['version']['ver'] }}-{{item['oldpkg']['version']['rel']}}</td>
+                    <td>{{ item['newpkg']['version']['ver'] }}-{{item['newpkg']['version']['rel']}}</td>
                     <td>{{ item['oldpkg']['git_path'] }}</td>
-                    <td>{{ item['oldpkg']['commit_id'] }}</td>
+                    <td colspan="2">{{ item['oldpkg']['commit_id'] }}</td>
                 </tr>
             {% endfor %}
             </tbody>
-- 
2.34.1