launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/builders-styling into lp:launchpad.

Commit message:
Various small improvements to the layout of /builders.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/builders-styling/+merge/253945

Various small improvements to the layout of /builders:

 * Drop unnecessary heading.
 * Darken the border below builder clump header rows.
 * Drop excessively-highlighted green colour on "Idle" text.
 * Sort builder processors by name.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/builders-styling into lp:launchpad.

=== 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 10:33:46 +0000
@@ -384,7 +384,7 @@
     }
 
 table.listing tr.category {
-    border-bottom: 1px solid #d2d2d2;
+    border-bottom: 1px solid #999;
     }
 
 table.listing tr.category th,

=== 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 10:33:46 +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 10:33:46 +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 10:33:46 +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 10:33:46 +0000
@@ -43,7 +43,6 @@
 
        <div class="first yui-u">
          <div id="builders-list" class="portlet">
-           <h2>Builders</h2>
            <table class="listing" id="builders-table">
              <thead>
                <tr>