launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #12880
[Merge] lp:~rvb/maas/move-setting-conf into lp:maas
Raphaël Badin has proposed merging lp:~rvb/maas/move-setting-conf into lp:maas.
Commit message:
This branch is a tiny fix to the settings page: it moves the ubuntu_form.default_distro_series up one bit so that the "Update from" field is now next to the link to add a custom archive.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~rvb/maas/move-setting-conf/+merge/127796
This branch is a tiny fix to the settings page: it moves the ubuntu_form.default_distro_series up one bit so that the "Update from" field is now next to the link to add a custom archive.
--
https://code.launchpad.net/~rvb/maas/move-setting-conf/+merge/127796
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/move-setting-conf into lp:maas.
=== modified file 'src/maasserver/templates/maasserver/settings.html'
--- src/maasserver/templates/maasserver/settings.html 2012-10-02 17:53:24 +0000
+++ src/maasserver/templates/maasserver/settings.html 2012-10-03 15:39:35 +0000
@@ -90,12 +90,12 @@
<form action="{% url "settings" %}" method="post">
{% csrf_token %}
<ul>
+ {% with field=ubuntu_form.default_distro_series %}
+ {% include "maasserver/form_field.html" %}
+ {% endwith %}
{% with field=ubuntu_form.update_from %}
{% include "maasserver/form_field.html" %}
{% endwith %}
- {% with field=ubuntu_form.default_distro_series %}
- {% include "maasserver/form_field.html" %}
- {% endwith %}
<li>
<label>Custom archives</label>
<a href="{% url "settings-add-archive" %}">