launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #06839
[Merge] lp:~huwshimi/maas/design-updates into lp:maas
Huw Wilkins has proposed merging lp:~huwshimi/maas/design-updates into lp:maas.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~huwshimi/maas/design-updates/+merge/98787
This branch adds a bunch of design polish (mostly from feedback from latest design call with Mark).
- resized home icon
- added new edit icon
- Added "Metal as a Service" title to login screen
- Made footer logo larger
- Changed content on node listing (lists all mac addresses and makes hostname secondary).
- Fixed a bunch of button spacing etc.
I think that's it.
--
https://code.launchpad.net/~huwshimi/maas/design-updates/+merge/98787
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~huwshimi/maas/design-updates into lp:maas.
=== modified file 'src/maasserver/static/css/layout.css'
--- src/maasserver/static/css/layout.css 2012-03-21 08:46:49 +0000
+++ src/maasserver/static/css/layout.css 2012-03-22 06:44:19 +0000
@@ -53,6 +53,10 @@
padding-top: 18px;
height: 46px;
}
+#main-nav li.icon.large a {
+ padding-top: 13px;
+ height: 51px;
+ }
#right-nav li.active a,
#main-nav li.active a {
background: rgba(0,0,0,0.2) url(../img/header_tail.png) no-repeat bottom center;
@@ -97,6 +101,8 @@
padding-top: 1px;
}
#page-title {
+ /* Need to set relative so the tail appears above shadows. */
+ position: relative;
font-size: 36px;
color: #fff;
margin: 0 20px;
@@ -118,9 +124,6 @@
.modal-content #body {
background-color: transparent;
}
-.modal-content #content {
- margin-top: 20px;
- }
/******************************************************************************
@@ -132,9 +135,14 @@
.login.no-users .center-page-wrapper {
width: 670px;
}
+.login #body {
+ margin-top: 100px;
+ }
+.login #page-title {
+ margin-left: 15px;
+ }
.login #content {
padding: 30px 40px;
- margin-top: 100px;
-webkit-box-shadow: 0 0 15px 0 rgba(0,0,0,1);
box-shadow: 0 0 15px 0 rgba(0,0,0,1);
}
@@ -188,7 +196,7 @@
*/
#footer {
margin-bottom: 20px;
- padding: 12px 20px;
+ padding: 12px 0;
color: #aea79f;
font-size: 12px;
}
=== modified file 'src/maasserver/static/css/modifiers.css'
--- src/maasserver/static/css/modifiers.css 2012-03-22 04:29:00 +0000
+++ src/maasserver/static/css/modifiers.css 2012-03-22 06:44:19 +0000
@@ -35,6 +35,9 @@
.space-right-large {
margin-right: 40px;
}
+.space-right-small {
+ margin-right: 10px;
+ }
.space-bottom-none {
margin-bottom: 0;
}
=== modified file 'src/maasserver/static/img/edit.png'
Binary files src/maasserver/static/img/edit.png 2012-02-15 12:08:42 +0000 and src/maasserver/static/img/edit.png 2012-03-22 06:44:19 +0000 differ
=== modified file 'src/maasserver/static/img/home.png'
Binary files src/maasserver/static/img/home.png 2012-03-01 06:22:38 +0000 and src/maasserver/static/img/home.png 2012-03-22 06:44:19 +0000 differ
=== modified file 'src/maasserver/static/img/ubuntu_logo_footer.png'
Binary files src/maasserver/static/img/ubuntu_logo_footer.png 2012-02-20 06:06:01 +0000 and src/maasserver/static/img/ubuntu_logo_footer.png 2012-03-22 06:44:19 +0000 differ
=== removed file 'src/maasserver/static/img/yes.png'
Binary files src/maasserver/static/img/yes.png 2012-02-15 12:08:42 +0000 and src/maasserver/static/img/yes.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'src/maasserver/templates/maasserver/base.html'
--- src/maasserver/templates/maasserver/base.html 2012-03-15 13:58:32 +0000
+++ src/maasserver/templates/maasserver/base.html 2012-03-22 06:44:19 +0000
@@ -69,7 +69,7 @@
{% endif %}
</ul>
<ul id="main-nav" class="nav">
- <li class="icon {% block nav-active-index %}{% endblock %}">
+ <li class="icon large {% block nav-active-index %}{% endblock %}">
<a href="{% url 'index' %}">
<img src="{{ STATIC_URL }}img/home.png" alt="MAAS home" />
</a>
@@ -91,11 +91,9 @@
{% endfor %}
{% endif %}
</ul>
- {% if user.is_authenticated %}
- {% block page-title-block %}
- <h1 id="page-title">{% block page-title %}{% endblock %}</h1>
- {% endblock %}
- {% endif %}
+ {% block page-title-block %}
+ <h1 id="page-title">{% block page-title %}{% endblock %}</h1>
+ {% endblock %}
<div id="content">
<div id="sidebar">{% block sidebar %}{% endblock %}</div>
{% block content %}{% endblock %}
@@ -105,8 +103,8 @@
<div id="footer">
<img src="{{ STATIC_URL }}img/ubuntu_logo_footer.png" alt="Ubuntu" />
{% block footer-copyright %}
- © 2012 Canonical Ltd. Ubuntu and Canonical are registered
- trademarks of Canonical Ltd.
+ <p>© 2012 Canonical Ltd. Ubuntu and Canonical are registered
+ trademarks of Canonical Ltd.</p>
{% endblock %}
<div class="clear"></div>
</div>
=== modified file 'src/maasserver/templates/maasserver/node_list.html'
--- src/maasserver/templates/maasserver/node_list.html 2012-03-20 14:00:39 +0000
+++ src/maasserver/templates/maasserver/node_list.html 2012-03-22 06:44:19 +0000
@@ -32,7 +32,6 @@
<table class="list">
<thead>
<tr>
- <th>Hostname</th>
<th>MAC</th>
<th>Status</th>
</tr>
@@ -41,19 +40,16 @@
<tr class="node {% cycle 'even' 'odd' %}">
<td>
<a href="{% url 'node-view' node.id %}">
- {{ node.hostname }}
+ {% for macaddress in node.macaddress_set.reverse %}
+ {{ macaddress }}{% if not forloop.last %},{% endif %}
+ {% endfor %}
</a>
- </td>
- <td>
- {{ node.macaddress_set.reverse|first }}
- {% if node.macaddress_set.count > 1 %}
- ({{ node.macaddress_set.count|add:"-1" }} more MAC Address{{ node.macaddress_set.count|add:"-1"|pluralize }})
- {% endif %}
+ ({{ node.hostname }})
</td>
<td>{{ node.display_status }}</td>
</tr>
{% endfor %}
</table>
{% endif%}
- <a id="addnode" href="#" class="button right">Add node</a>
+ <a id="addnode" href="#" class="button right space-top">Add node</a>
{% endblock %}
=== modified file 'src/maasserver/templates/maasserver/settings.html'
--- src/maasserver/templates/maasserver/settings.html 2012-03-15 13:58:32 +0000
+++ src/maasserver/templates/maasserver/settings.html 2012-03-22 06:44:19 +0000
@@ -35,13 +35,15 @@
<td>{{ user_item.last_login }}</td>
<td>
{% if user_item.is_superuser %}
- <img src="{{ STATIC_URL }}img/yes.png" alt="yes" />
+ Yes
{% endif %}
</td>
<td>
<a href="{% url 'accounts-edit' user_item.username %}"
title="Edit user {{ user_item.username }}">
- <img src="{{ STATIC_URL }}img/edit.png" alt="edit" />
+ <img src="{{ STATIC_URL }}img/edit.png"
+ alt="edit"
+ class="space-right-small" />
</a>
{% if user != user_item %}
<a title="Delete user {{ user_item.username }}"
@@ -60,7 +62,7 @@
{% endfor %}
</tbody>
</table>
- <a class="button right" href="{% url 'accounts-add' %}">
+ <a class="button right space-top-small" href="{% url 'accounts-add' %}">
Add user
</a>
<div class="clear"></div>
=== modified file 'src/maasserver/templates/registration/login.html'
--- src/maasserver/templates/registration/login.html 2012-03-21 08:46:49 +0000
+++ src/maasserver/templates/registration/login.html 2012-03-22 06:44:19 +0000
@@ -1,6 +1,7 @@
{% extends "maasserver/base.html" %}
{% block title %}Login{% endblock %}
+{% block page-title %}Metal as a Service{% endblock %}
{% block layout-modifiers %}modal-content login {% if no_users %}no-users{% endif %}{% endblock %}
{% block head %}
