From b43f744707e4687b424cf217b183cf3f19693ef2 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Dec 09 2014 14:11:56 +0000
Subject: More details in package_detail


---

diff --git a/templates/package-detail.html b/templates/package-detail.html
index e2467db..840eeba 100644
--- a/templates/package-detail.html
+++ b/templates/package-detail.html
@@ -5,96 +5,124 @@
 {% endmacro %}
 {% block content %}
 <div class="pageHeader">{{ package.name }}</div>
-{% if package.state_string == 'unresolved' %}
-<table class="nested-data-list">
-    <tr class="list-header">
-        <th>Dependency problems</th>
-    </tr>
-    {% for problem in package.resolution_problems %}
-    <tr>
-        <td>{{ problem.problem }}</td>
-    </tr>
-    {% endfor %}
-</table>
-{% endif %}
-{% if package.unapplied_changes %}
-<table class="nested">
+<table class="details">
     <tr>
-        <th colspan="4">Dependency changes since last build</th>
-    </tr>
-    {{ macros.depchange_table(package.unapplied_changes) }}
-</table>
-{% endif %}
-{{ macros.pagination_row(page, "Builds") }}
-<table class="data-list">
-  <thead>
-    <tr class="list-header">
-        <th>State</th>
-        <th>Koji task</th>
-        <th>Started</th>
-        <th colspan="4">Dependency changes</th>
-        <th>Build details</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for build in builds %}
-    {% set row_class = ["odd", "even"][loop.index % 2] + ["", " real"][build.real] %}
-    {% set changes = iter(build.dependency_changes) %}
-    {% if build.real %}
-    <tr class="{{ row_class }}">
-        <td/>
-        <td colspan="7" class="real_build_description">
-            Real build: <span class="mono">{{ package.name }}-{% if build.epoch %}{{ build.epoch }}:{% endif %}{{ build.version }}-{{ build.release }}</span>
-        </td>
-    </tr>
-    {% endif %}
-    <tr class="{{ row_class }}">
-        <td><div class="hidden">{{ build.state_string }}</div>
-            <img src="{{ url_for('static', filename='images/' ~ build.state_string ~ '.png') }}"
-                 title="{{ build.state_string }}" alt="{{ build.state_string }}"/></td>
-        <td>
-            <a href="{{ koji_weburl }}/taskinfo?taskID={{ build.task_id }}">
-                {{ build.task_id }}
-            </a>
-        </td>
-        <td>
-            {{ build.started | date }}
-        </td>
-        {{ next_change(changes) }}
+        <th>Package state</th>
         <td>
-            <a href="{{ url_for('build_detail', name=package.name, build_id=build.id) }}">details</a>
+            <img src="{{ package.state_icon }}"/>
+            {{ package.state_string }}
         </td>
     </tr>
-    {% for subtask in build.build_arch_tasks %}
-    <tr class="{{ row_class }}">
+    <tr>
+        <th>Current priority</th>
         <td>
-            <div class="task{{ subtask.state_string }}">{{ subtask.arch }}</div>
+            {{ package.current_priority }}
         </td>
+    </tr>
+    <tr>
+        <th>Static priority</th>
         <td>
-            <a href="{{ koji_weburl }}/taskinfo?taskID={{ subtask.task_id }}">
-                {{ "├└"[loop.last] }}{{ subtask.task_id }}
-            </a>
+            {{ package.static_priority }}
         </td>
-        <td>(
-            <a href="{{ koji_pathinfo.task(subtask.task_id) }}/build.log">
-                build.log
-            </a>|
-            <a href="{{ koji_pathinfo.task(subtask.task_id) }}/root.log">
-                root.log
-            </a>
-        )</td>
-        {{ next_change(changes) }}
-        <td/>
+    </tr>
+    {% if package.state_string == 'unresolved'  and package.resolution_problems %}
+    <tr>
+        <th>Dependency problems</th>
+        <td>{{ package.resolution_problems[0].problem }}</td>
+    </tr>
+    {% for problem in package.resolution_problems[1:] %}
+    <tr>
+        <td></td>
+        <td>{{ problem.problem }}</td>
     </tr>
     {% endfor %}
-    {% for change in changes %}
-    <tr class="{{ row_class }}">
-        <td colspan="3"/>
+    {% endif %}
+
+    {% if package.unapplied_changes %}
+    <tr>
+        <th>Dependency changes since last build</th>
+        {{ package.unapplied_changes[0] | format_depchange | columnize(css_class="mono") }}
+    </tr>
+    {% for change in package.unapplied_changes[1:] %}
+    <tr>
+        <th></th>
         {{ change | format_depchange | columnize(css_class="mono") }}
-        <td/>
     </tr>
     {% endfor %}
-    {% endfor %}
-  </tbody>
+    {% endif %}
+</table>
+
+{{ macros.pagination_row(page, "Builds") }}
+<table class="data-list">
+    <thead>
+        <tr class="list-header">
+            <th>State</th>
+            <th>Koji task</th>
+            <th>Started</th>
+            <th colspan="4">Dependency changes</th>
+            <th>Build details</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for build in builds %}
+        {% set row_class = ["odd", "even"][loop.index % 2] + ["", " real"][build.real] %}
+        {% set changes = iter(build.dependency_changes) %}
+        {% if build.real %}
+        <tr class="{{ row_class }}">
+            <td></td>
+            <td colspan="7" class="real_build_description">
+                Real build: <span class="mono">{{ package.name }}-{% if build.epoch %}{{ build.epoch }}:{% endif %}{{ build.version }}-{{ build.release }}</span>
+            </td>
+        </tr>
+        {% endif %}
+        <tr class="{{ row_class }}">
+            <td><div class="hidden">{{ build.state_string }}</div>
+                <img src="{{ url_for('static', filename='images/' ~ build.state_string ~ '.png') }}"
+                title="{{ build.state_string }}" alt="{{ build.state_string }}"/></td>
+            <td>
+                <a href="{{ koji_weburl }}/taskinfo?taskID={{ build.task_id }}">
+                    {{ build.task_id }}
+                </a>
+            </td>
+            <td>
+                {{ build.started | date }}
+            </td>
+            {{ next_change(changes) }}
+            <td>
+                <a href="{{ url_for('build_detail', name=package.name, build_id=build.id) }}">details</a>
+            </td>
+        </tr>
+        {% for subtask in build.build_arch_tasks %}
+        <tr class="{{ row_class }}">
+            <td>
+                <div class="task{{ subtask.state_string }}">{{ subtask.arch }}</div>
+            </td>
+            <td>
+                <a href="{{ koji_weburl }}/taskinfo?taskID={{ subtask.task_id }}">
+                    {{ "├└"[loop.last] }}{{ subtask.task_id }}
+                </a>
+            </td>
+            <td>(
+                <a href="{{ koji_pathinfo.task(subtask.task_id) }}/build.log">
+                    build.log
+                </a>|
+                <a href="{{ koji_pathinfo.task(subtask.task_id) }}/root.log">
+                    root.log
+                </a>
+                )</td>
+            {{ next_change(changes) }}
+            <td>
+            </td>
+        </tr>
+        {% endfor %}
+        {% for change in changes %}
+        <tr class="{{ row_class }}">
+            <td colspan="3"></td>
+            {{ change | format_depchange | columnize(css_class="mono") }}
+            <td></td>
+        </tr>
+        {% endfor %}
+        {% endfor %}
+    </tbody>
 </table>
 {% endblock %}
diff --git a/theme/fedora/static/koji.css b/theme/fedora/static/koji.css
index ef37d6b..1a58520 100644
--- a/theme/fedora/static/koji.css
+++ b/theme/fedora/static/koji.css
@@ -537,3 +537,6 @@ span#loginInfo {
     font-family: monospace;
     font-size: 12px;
 }
+.details {
+    padding-bottom: 20px;
+}