Merge lp:~cjwatson/launchpad/builders-styling into lp:launchpad

[Colin Watson]

Various small improvements to the layout of /builders.

Various small improvements to the layout of /builders:

 * Drop unnecessary headings.
 * Darken the border below builder clump header rows.
 * Drop excessively-highlighted green colour on "Idle" text.
 * Sort builder processors by name.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/icing/css/base.css'
--- lib/canonical/launchpad/icing/css/base.css	2012-06-07 18:37:10 +0000
+++ lib/canonical/launchpad/icing/css/base.css	2015-03-24 11:30:56 +0000
@@ -384,7 +384,7 @@
     }
 
 table.listing tr.category {
-    border-bottom: 1px solid #d2d2d2;
+    border-bottom: 1px solid #999;
     }
 
 table.listing tr.category th,
@@ -427,6 +427,11 @@
     border-style: dotted none none none;
     }
 
+table.listing tr.category:first-child td {
+    border-top-style: none;
+    padding-top: 0;
+    }
+
 table.listing .section-break td {
     border-width: 1px 0 0 0;
     border-style: solid;

=== modified file 'lib/lp/buildmaster/browser/builder.py'
--- lib/lp/buildmaster/browser/builder.py	2015-03-23 11:05:51 +0000
+++ lib/lp/buildmaster/browser/builder.py	2015-03-24 11:30:56 +0000
@@ -147,7 +147,7 @@
     def getBuilderSortKey(builder):
         return (
             builder.virtualized,
-            tuple(p.id for p in builder.processors),
+            tuple(p.name for p in builder.processors),
             builder.name)
 
     @cachedproperty

=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2015-02-17 04:52:53 +0000
+++ lib/lp/buildmaster/model/builder.py	2015-03-24 11:30:56 +0000
@@ -141,7 +141,7 @@
         return list(Store.of(self).find(
             Processor,
             BuilderProcessor.processor_id == Processor.id,
-            BuilderProcessor.builder == self).order_by(Processor.id))
+            BuilderProcessor.builder == self).order_by(Processor.name))
 
     def _processors(self):
         return self._processors_cache
@@ -344,11 +344,12 @@
     def _preloadProcessors(self, rows):
         # Grab (Builder.id, Processor.id) pairs and stuff them into the
         # Builders' processor caches.
-        store = IStore(Builder)
-        pairs = list(store.find(
+        store = IStore(BuilderProcessor)
+        pairs = list(store.using(BuilderProcessor, Processor).find(
             (BuilderProcessor.builder_id, BuilderProcessor.processor_id),
+            BuilderProcessor.processor_id == Processor.id,
             BuilderProcessor.builder_id.is_in([b.id for b in rows])).order_by(
-                BuilderProcessor.builder_id, BuilderProcessor.processor_id))
+                BuilderProcessor.builder_id, Processor.name))
         load(Processor, [pid for bid, pid in pairs])
         for row in rows:
             get_property_cache(row)._processors_cache = []

=== modified file 'lib/lp/buildmaster/templates/builder-index.pt'
--- lib/lp/buildmaster/templates/builder-index.pt	2014-06-20 08:42:25 +0000
+++ lib/lp/buildmaster/templates/builder-index.pt	2015-03-24 11:30:56 +0000
@@ -102,7 +102,7 @@
           </tal:cleaning>
           <tal:clean condition="builder/clean_status/enumvalue:CLEAN">
           <span class="sortkey" tal:content="string:1" />
-          <span class="sprite yes green">Idle</span>
+          <span class="sprite yes">Idle</span>
           </tal:clean>
         </tal:idle>
         <tal:manual tal:condition="builder/manual">

=== modified file 'lib/lp/buildmaster/templates/builders-index.pt'
--- lib/lp/buildmaster/templates/builders-index.pt	2015-03-23 11:05:51 +0000
+++ lib/lp/buildmaster/templates/builders-index.pt	2015-03-24 11:30:56 +0000
@@ -43,44 +43,34 @@
 
        <div class="first yui-u">
          <div id="builders-list" class="portlet">
-           <h2>Builders</h2>
            <table class="listing" id="builders-table">
-             <thead>
-               <tr>
-                 <th></th>
-                 <th>Name</th>
-                 <th>Status</th>
-               </tr>
-             </thead>
-             <tbody>
-               <tal:clump tal:repeat="clump view/builder_clumps">
-                 <tr class="category">
-                   <td class="icon left">
-                     <img src="/@@/ppa-icon" alt="[virtual]"
-                          title="Virtual builder"
-                          tal:condition="clump/virtualized" />
-                     <img src="/@@/distribution" alt="[non-virtual]"
-                          title="Non-virtual builder"
-                          tal:condition="not: clump/virtualized" />
-                   </td>
-                   <td colspan="2">
-                     <tal:processor repeat="processor clump/processors"
-                       content="processor/name" />
-                   </td>
-                 </tr>
-                 <tr class="builder-row" tal:repeat="builder clump/builders">
-                   <td></td>
-                   <td style="width: 9em;">
-                     <a tal:attributes="href builder/fmt:url"
-                        tal:content="builder/name">Bob</a>
-                   </td>
-                   <td tal:define="job builder/currentjob">
-                     <metal:status-summary
-                       use-macro="builder/@@+index/status-summary" />
-                   </td>
-                 </tr>
-               </tal:clump>
-             </tbody>
+             <tal:clump tal:repeat="clump view/builder_clumps">
+               <tr class="category">
+                 <td class="icon left">
+                   <img src="/@@/ppa-icon" alt="[virtual]"
+                        title="Virtual builder"
+                        tal:condition="clump/virtualized" />
+                   <img src="/@@/distribution" alt="[non-virtual]"
+                        title="Non-virtual builder"
+                        tal:condition="not: clump/virtualized" />
+                 </td>
+                 <td colspan="2">
+                   <tal:processor repeat="processor clump/processors"
+                     content="processor/name" />
+                 </td>
+               </tr>
+               <tr class="builder-row" tal:repeat="builder clump/builders">
+                 <td></td>
+                 <td style="width: 9em;">
+                   <a tal:attributes="href builder/fmt:url"
+                      tal:content="builder/name">Bob</a>
+                 </td>
+                 <td tal:define="job builder/currentjob">
+                   <metal:status-summary
+                     use-macro="builder/@@+index/status-summary" />
+                 </td>
+               </tr>
+             </tal:clump>
            </table>
            <p tal:condition="view/user">
               Updated on

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-builder-page.txt'
--- lib/lp/soyuz/stories/soyuz/xx-builder-page.txt	2015-03-23 11:05:51 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-builder-page.txt	2015-03-24 11:30:56 +0000
@@ -260,8 +260,6 @@
     Register a new build machine
     1 available build machine, 1 disabled and 0 building of a total
     of 2 registered.
-    Builders
-    Name   Status
     386
     frog   Disabled
     victim Idle

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2015-03-23 11:05:51 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2015-03-24 11:30:56 +0000
@@ -17,8 +17,6 @@
     The Launchpad build farm
     1 available build machine, 1 disabled and 1 building of a total of
     2 registered.
-    Builders
-    Name  Status
     386
     bob   Building i386 build of mozilla-firefox 0.9 ...
     frog  Disabled

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-private-builds.txt'
--- lib/lp/soyuz/stories/soyuz/xx-private-builds.txt	2015-03-23 14:03:33 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-private-builds.txt	2015-03-24 11:30:56 +0000
@@ -201,8 +201,6 @@
     >>> print extract_text(find_main_content(admin_browser.contents))
     The Launchpad build farm
     ...
-    Name  Status
-    ...
     bob   Building i386 build of mozilla-firefox ...
     ...
     frog  Building i386 build of privacy-test ... [~cprov/ubuntu/p3a]
@@ -214,8 +212,6 @@
     >>> print extract_text(find_main_content(name12_browser.contents))
     The Launchpad build farm
     ...
-    Name  Status
-    ...
     bob   Building i386 build of mozilla-firefox ...
     ...
     frog  Building private job
@@ -227,8 +223,6 @@
     >>> print extract_text(find_main_content(cprov_browser.contents))
     The Launchpad build farm
     ...
-    Name  Status
-    ...
     bob   Building i386 build of mozilla-firefox ...
     ...
     frog  Building i386 build of privacy-test ... [~cprov/ubuntu/p3a]
@@ -241,8 +235,6 @@
     The Launchpad build farm
     2 available build machines, ...
     ...
-    Name  Status
-    ...
     bob   Building i386 build of mozilla-firefox ...
     ...
     frog  Building private job
@@ -305,8 +297,6 @@
     >>> print extract_text(find_main_content(anon_browser.contents))
     The Launchpad build farm
     ...
-    Name  Status
-    ...
     bob   Building i386 build of mozilla-firefox ...
     ...
     frog  Building i386 build of privacy-test 666 ... [~cprov/ubuntu/p3a]
@@ -319,8 +309,6 @@
     >>> print extract_text(find_main_content(browser.contents))
     The Launchpad build farm
     ...
-    Name  Status
-    ...
     bob   Building i386 build of mozilla-firefox ...
     ...
     frog  Building i386 build of privacy-test 666 ... [~cprov/ubuntu/p3a]