launchpad-reviewers team mailing list archive

[Huw Wilkins <huw.wilkins@xxxxxxxxxxxxx>]

Huw Wilkins has proposed merging lp:~huwshimi/maas/cluster-ui-improvements into lp:maas.

Commit message:
Change text colour of messages. Added lines and spacing to settings. Added cluster controller zebra stripes.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~huwshimi/maas/cluster-ui-improvements/+merge/127929

This branch adds zebra striping to included templates for cluster controllers. As each row is in an included template I had to save the row class to a variable to be referenced in the included template.

I also took the opportunity to add dividing lines between sections on the settings page and changed the text colour of the header notifications to make them a bit more readable.
-- 
https://code.launchpad.net/~huwshimi/maas/cluster-ui-improvements/+merge/127929
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~huwshimi/maas/cluster-ui-improvements into lp:maas.

=== modified file 'src/maasserver/static/css/components/flash_messages.css'
--- src/maasserver/static/css/components/flash_messages.css	2012-02-20 06:06:01 +0000
+++ src/maasserver/static/css/components/flash_messages.css	2012-10-04 05:17:23 +0000
@@ -8,8 +8,9 @@
     margin: 0 10px;
     box-shadow: 1px 1px 4px rgba(0,0,0,0.2);
     font-weight: bold;
-    text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
-    color: #FFF;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
+    color: #000;
+    color: rgba(0, 0, 0, 0.5);
     }
 #flash-messages li:first-child {
     margin-top: 10px;

=== modified file 'src/maasserver/static/css/modifiers.css'
--- src/maasserver/static/css/modifiers.css	2012-10-03 03:59:53 +0000
+++ src/maasserver/static/css/modifiers.css	2012-10-04 05:17:23 +0000
@@ -25,6 +25,11 @@
 a.icon:hover {
     text-decoration: none;
     }
+.divider {
+    clear: both;
+    margin: 30px 0;
+    border-top: 1px solid #e5e2e0;
+    }
 /* Spacing */
 .block.space-top-small,
 .space-top-small {

=== modified file 'src/maasserver/templates/maasserver/settings.html'
--- src/maasserver/templates/maasserver/settings.html	2012-10-03 15:18:22 +0000
+++ src/maasserver/templates/maasserver/settings.html	2012-10-04 05:17:23 +0000
@@ -69,9 +69,12 @@
       </a>
       <div class="clear"></div>
     </div>
-    <div id="clusters" class="block size7 first">
+    <div class="divider"></div>
+    <div id="clusters" class="block size9 first">
       {% include "maasserver/settings_cluster_listing.html" %}
+      <div class="clear"></div>
     </div>
+    <div class="divider"></div>
     <div id="commissioning" class="block size7 first">
       <h2>Commissioning</h2>
       <form action="{% url "settings" %}" method="post">
@@ -84,7 +87,9 @@
         <input type="hidden" name="commissioning_submit" value="1" />
         <input type="submit" class="button right" value="Save" />
       </form>
+      <div class="clear"></div>
     </div>
+    <div class="divider"></div>
     <div id="ubuntu" class="block size7 first">
       <h2>Ubuntu</h2>
       <form action="{% url "settings" %}" method="post">
@@ -117,7 +122,9 @@
         <input type="hidden" name="ubuntu_submit" value="1" />
         <input type="submit" class="button right" value="Save" />
       </form>
+      <div class="clear"></div>
     </div>
+    <div class="divider"></div>
     <div id="maas_and_network" class="block size7 first">
       <h2>Network Configuration</h2>
       <form action="{% url "settings" %}" method="post">
@@ -130,6 +137,7 @@
         <input type="hidden" name="maas_and_network_submit" value="1" />
         <input type="submit" class="button right" value="Save" />
       </form>
+      <div class="clear"></div>
     </div>
   </div>
 {% endblock %}

=== modified file 'src/maasserver/templates/maasserver/settings_cluster_listing.html'
--- src/maasserver/templates/maasserver/settings_cluster_listing.html	2012-10-02 17:53:24 +0000
+++ src/maasserver/templates/maasserver/settings_cluster_listing.html	2012-10-04 05:17:23 +0000
@@ -2,7 +2,8 @@
 <table class="list" id="accepted-clusters-list">
   <tbody>
     {% for cluster in accepted_clusters %}
-    {% include "maasserver/settings_cluster_listing_row.html" %}
+      {% cycle 'even' 'odd' as cycle silent %}
+      {% include "maasserver/settings_cluster_listing_row.html" with cycle=cycle %}
     {% endfor %}
   </tbody>
 </table>
@@ -11,7 +12,8 @@
 <table class="list" id="pending-clusters-list">
   <tbody>
     {% for cluster in pending_clusters %}
-    {% include "maasserver/settings_cluster_listing_row.html" %}
+      {% cycle 'even' 'odd' as cycle silent %}
+      {% include "maasserver/settings_cluster_listing_row.html" with cycle=cycle %}
     {% endfor %}
   </tbody>
 </table>
@@ -21,7 +23,8 @@
 <table class="list" id="rejected-clusters-list">
   <tbody>
     {% for cluster in rejected_clusters %}
-    {% include "maasserver/settings_cluster_listing_row.html" %}
+      {% cycle 'even' 'odd' as cycle silent %}
+      {% include "maasserver/settings_cluster_listing_row.html" with cycle=cycle %}
     {% endfor %}
   </tbody>
 </table>

=== modified file 'src/maasserver/templates/maasserver/settings_cluster_listing_row.html'
--- src/maasserver/templates/maasserver/settings_cluster_listing_row.html	2012-10-02 17:53:24 +0000
+++ src/maasserver/templates/maasserver/settings_cluster_listing_row.html	2012-10-04 05:17:23 +0000
@@ -1,4 +1,4 @@
-<tr class="cluster {% cycle 'even' 'odd' %}"
+<tr class="cluster {{ cycle }}"
     id="{{ cluster.cluster_name }}">
   <td>{{ cluster.cluster_name }}</td>
   <td>