launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #07015
[Merge] lp:~huwshimi/maas/general-design-improvements into lp:maas
Huw Wilkins has proposed merging lp:~huwshimi/maas/general-design-improvements into lp:maas.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~huwshimi/maas/general-design-improvements/+merge/100930
In this branch:
- Fixed <pre> width for long commands.
- Removed underline on icon hovers.
- Styled add ssh key screen.
- Fixed add ssh button alignment on preferences page (bug #973038).
- Fixed Firefox not wrapping long node names (bug #962872)
- Added "+" icon to "Add additional MAC address" link on add node screen.
- Fixed sidebar heading and button spacing
--
https://code.launchpad.net/~huwshimi/maas/general-design-improvements/+merge/100930
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~huwshimi/maas/general-design-improvements into lp:maas.
=== modified file 'src/maasserver/static/css/base.css'
--- src/maasserver/static/css/base.css 2012-03-21 08:46:49 +0000
+++ src/maasserver/static/css/base.css 2012-04-05 07:58:18 +0000
@@ -13,5 +13,6 @@
pre {
background-color: #f2f2f2;
padding: 5px 5px 5px 3px;
- display: inline-block;
+ display: block;
+ overflow: auto;
}
=== modified file 'src/maasserver/static/css/components/data_list.css'
--- src/maasserver/static/css/components/data_list.css 2012-03-01 06:22:38 +0000
+++ src/maasserver/static/css/components/data_list.css 2012-04-05 07:58:18 +0000
@@ -9,3 +9,6 @@
.data-list span {
font-size: 16px;
}
+.data-list .block {
+ word-wrap: break-word;
+ }
=== modified file 'src/maasserver/static/css/components/table_list.css'
--- src/maasserver/static/css/components/table_list.css 2012-03-02 06:06:51 +0000
+++ src/maasserver/static/css/components/table_list.css 2012-04-05 07:58:18 +0000
@@ -40,5 +40,5 @@
padding: 2px 0;
}
ul.list .icon {
- padding: 6px 0 0 0;
+ padding: 2px 0 0 0;
}
=== modified file 'src/maasserver/static/css/layout.css'
--- src/maasserver/static/css/layout.css 2012-04-02 16:12:18 +0000
+++ src/maasserver/static/css/layout.css 2012-04-05 07:58:18 +0000
@@ -189,6 +189,17 @@
#sidebar .button {
width: 100px;
}
+#sidebar h4 {
+ margin: 30px 0 0 0;
+ }
+#sidebar h4:first-child {
+ margin-top: 10px;
+ }
+#sidebar .button,
+#sidebar button,
+#sidebar input[type="submit"] {
+ margin-top: 10px;
+ }
/******************************************************************************
=== modified file 'src/maasserver/static/css/modifiers.css'
--- src/maasserver/static/css/modifiers.css 2012-03-22 06:38:06 +0000
+++ src/maasserver/static/css/modifiers.css 2012-04-05 07:58:18 +0000
@@ -22,6 +22,9 @@
vertical-align: text-bottom;
margin-right: 3px;
}
+a.icon:hover {
+ text-decoration: none;
+ }
/* Spacing */
.space-top-small {
margin-top: 10px;
@@ -45,8 +48,8 @@
margin-bottom: 5px;
}
.pad-top {
- margin-top: 20px;
+ padding-top: 20px;
}
.pad-top-large {
- margin-top: 40px;
+ padding-top: 40px;
}
=== modified file 'src/maasserver/static/img/inline_add.png'
Binary files src/maasserver/static/img/inline_add.png 2012-03-05 05:52:32 +0000 and src/maasserver/static/img/inline_add.png 2012-04-05 07:58:18 +0000 differ
=== modified file 'src/maasserver/static/js/node_add.js'
--- src/maasserver/static/js/node_add.js 2012-04-04 04:24:35 +0000
+++ src/maasserver/static/js/node_add.js 2012-04-05 07:58:18 +0000
@@ -114,11 +114,16 @@
.set('href', '#')
.set('text', "Cancel")
.addClass('link-button');
+ var macaddress_add_icon = Y.Node.create('<img />')
+ .set('src', MAAS_config.uris.statics + 'img/inline_add.png')
+ .set('alt', "+")
+ .addClass('icon');
var macaddress_add_link = Y.Node.create('<a />')
.addClass('add-link')
.addClass('add-mac-form')
.set('href', '#')
- .set('text', "Add additional MAC address");
+ .set('text', " Add additional MAC address")
+ .prepend(macaddress_add_icon);
var operation = Y.Node.create('<input />')
.set('type', 'hidden')
.set('name', 'op')
=== modified file 'src/maasserver/templates/maasserver/index.html'
--- src/maasserver/templates/maasserver/index.html 2012-03-29 04:21:34 +0000
+++ src/maasserver/templates/maasserver/index.html 2012-04-05 07:58:18 +0000
@@ -72,7 +72,7 @@
</div>
<p id="reserved-nodes" class="medium space-bottom-small"></p>
<p id="retired-nodes" class="secondary medium space-top-none"></p>
- <a href="#" id="addnode" class="button right space-top">Add node</a>
+ <a href="#" id="addnode" class="button right space-top">+ Add node</a>
</div>
<div class="clear"></div>
</div>
=== modified file 'src/maasserver/templates/maasserver/node_list.html'
--- src/maasserver/templates/maasserver/node_list.html 2012-04-04 04:41:04 +0000
+++ src/maasserver/templates/maasserver/node_list.html 2012-04-05 07:58:18 +0000
@@ -55,6 +55,6 @@
{% endfor %}
</table>
{% endif%}
- <a id="addnode" href="#" class="button right space-top">Add node</a>
+ <a id="addnode" href="#" class="button right space-top">+ Add node</a>
</div>
{% endblock %}
=== modified file 'src/maasserver/templates/maasserver/node_view.html'
--- src/maasserver/templates/maasserver/node_view.html 2012-04-04 17:46:16 +0000
+++ src/maasserver/templates/maasserver/node_view.html 2012-04-05 07:58:18 +0000
@@ -7,16 +7,19 @@
{% block sidebar %}
{% if can_edit %}
- <div class="block size3">
<h4>Node details</h4>
<a href="{% url 'node-edit' node.system_id %}" class="button secondary">
Edit node
</a>
- </div>
{% endif %}
+<<<<<<< TREE
{% if form.action_buttons or can_delete %}
<div class="block size3">
+=======
+ {% if form.transition_buttons or can_delete %}
+>>>>>>> MERGE-SOURCE
<h4>Actions</h4>
+<<<<<<< TREE
{% if can_delete %}
{% if node.owner %}
<a href="#"
@@ -42,6 +45,23 @@
{% if forloop.last %}</form>{% endif %}
{% endfor %}
</div>
+=======
+ {% endif %}
+ {% if can_delete %}
+ <a href="{% url 'node-delete' node.system_id %}" class="button secondary">
+ Delete node
+ </a>
+ {% endif %}
+ {% if form.transition_buttons %}
+ <form id="node_actions" method="post" action=".">
+ {% for transition in form.transition_buttons %}
+ <input class="secondary"
+ type="submit"
+ name="{{ form.input_name }}"
+ value="{{ transition.display }}" />
+ {% endfor %}
+ </form>
+>>>>>>> MERGE-SOURCE
{% endif %}
{% endblock %}
=== modified file 'src/maasserver/templates/maasserver/prefs.html'
--- src/maasserver/templates/maasserver/prefs.html 2012-03-28 16:00:26 +0000
+++ src/maasserver/templates/maasserver/prefs.html 2012-04-05 07:58:18 +0000
@@ -56,7 +56,7 @@
</ul>
<a href="{% url 'prefs-add-sshkey' %}"
id="add_ssh_key"
- class="button right">+ Add SSH key</a>
+ class="button right space-top">+ Add SSH key</a>
</div>
<div class="clear"></div>
<div id="profile" class="block size7 first">
=== modified file 'src/maasserver/templates/maasserver/prefs_add_sshkey.html'
--- src/maasserver/templates/maasserver/prefs_add_sshkey.html 2012-03-28 16:00:26 +0000
+++ src/maasserver/templates/maasserver/prefs_add_sshkey.html 2012-04-05 07:58:18 +0000
@@ -4,13 +4,13 @@
{% block page-title %}Add SSH key{% endblock %}
{% block content %}
- <form action="." method="post">
+ <form action="." method="post" class="block auto-width">
<ul>
{% for field in form %}
{% include "maasserver/form_field.html" %}
{% endfor %}
</ul>
- <input type="submit" value="Add key" />
- <a class="link-button" href="{% url 'prefs' %}">Cancel</a>
+ <a class="link-button" href="{% url 'prefs' %}">Cancel</a>
+ <input type="submit" class="right" value="+ Add key" />
</form>
{% endblock %}
=== modified file 'src/maasserver/templates/maasserver/settings.html'
--- src/maasserver/templates/maasserver/settings.html 2012-03-22 06:38:06 +0000
+++ src/maasserver/templates/maasserver/settings.html 2012-04-05 07:58:18 +0000
@@ -40,14 +40,15 @@
</td>
<td>
<a href="{% url 'accounts-edit' user_item.username %}"
- title="Edit user {{ user_item.username }}">
+ title="Edit user {{ user_item.username }}"
+ class="icon">
<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 }}"
- class="delete-user"
+ class="delete-user icon"
href="{% url 'accounts-del' user_item.username %}">
<img src="{{ STATIC_URL }}img/delete.png" alt="delete" />
</a>
=== modified file 'src/maasserver/templates/maasserver/user_view.html'
--- src/maasserver/templates/maasserver/user_view.html 2012-03-15 13:58:32 +0000
+++ src/maasserver/templates/maasserver/user_view.html 2012-04-05 07:58:18 +0000
@@ -6,18 +6,14 @@
{% block layout-modifiers %}sidebar{% endblock %}
{% block sidebar %}
- <div class="block size3">
- <h4>User details</h4>
- <a href="{% url 'accounts-edit' view_user.username %}" class="button secondary">
- Edit user
- </a>
- </div>
- <div class="block size3">
- <h4>Actions</h4>
- <a href="{% url 'accounts-del' view_user.username %}" class="button secondary">
- Delete user
- </a>
- </div>
+ <h4>User details</h4>
+ <a href="{% url 'accounts-edit' view_user.username %}" class="button secondary">
+ Edit user
+ </a>
+ <h4>Actions</h4>
+ <a href="{% url 'accounts-del' view_user.username %}" class="button secondary">
+ Delete user
+ </a>
{% endblock %}
{% block content %}
