Merge branch '623-fix-pool-form-order'

SpriteLink · Sep 24, 2014 · a15285a · a15285a
2 parents 4407d02 + 03c2fe2
commit a15285a
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/nipap-www/nipapwww/templates/pool_form.html b/nipap-www/nipapwww/templates/pool_form.html
@@ -38,16 +38,14 @@ <h3 class="options-group-heading">Properties of {% if c.pool is defined %}pool:
 			<div class="option">
 				<dl>
 					<dt>
-					Default type
+					Tags
 					</dt>
 					<dd>
-					<input id="radio-default-type-reservation" class="tiptip" title="Reservation are for reserving a network for later assigning as specific assignments" type="radio" name="default_type" value="reservation" {% if c.pool is defined %}{% if c.pool.default_type == 'reservation' %} checked{% endif %}{% endif %}>
-					<label for="radio-default-type-reservation" class="tiptip" title="Reservation are for reserving a network for later assigning as specific assignments">Reservation</label>
-					<input id="radio-default-type-assignment" class="tiptip" title="A single subnet, for a specific use in the network" type="radio" name="default_type" value="assignment" {% if c.pool is defined %}{% if c.pool.default_type == 'assignment' %} checked{% endif %}{% endif %}>
-					<label for="radio-default-type-assignment" class="tiptip" title="A single subnet, for a specific use in the network">Assignment</label>
-					<input id="radio-default-type-host" class="tiptip" title="A single host within an assignment" type="radio" name="default_type" value="host" {% if c.pool is defined %}{% if c.pool.default_type == 'host' %} checked{% endif %}{% endif %}>
-					<label id="label-default-type-host" class="tiptip" title="A single host within an assignment" for="radio-default-type-host">Host</label>
-					<a href="javascript:void(0);" onclick="displayPrefixTypeHelp();" style="font-size: 10px; padding-left: 30px;">help on prefix types?</a>
+					<ul id="tags" style="font-size: 1.0em;">
+						{%- if c.pool is defined -%}
+						{% for tag in c.pool.tags|sort() %}<li>{{ tag }}</li>{% endfor %}
+						{% endif %}
+					</ul>
 					</dd>
 				</dl>
 			</div>
@@ -57,10 +55,16 @@ <h3 class="options-group-heading">Properties of {% if c.pool is defined %}pool:
 			<div class="option">
 				<dl>
 					<dt>
-					Default IPv4 prefix length
+					Default type
 					</dt>
 					<dd>
-					<input type="text" name="ipv4_default_prefix_length" value="{% if c.pool is defined %}{{ c.pool.ipv4_default_prefix_length or '' }}{% endif %}" class="tiptip" title="The default IPv4 prefix length of prefixes assigned from this pool. Should be an integer value, for example 24 or 31.">
+					<input id="radio-default-type-reservation" class="tiptip" title="Reservation are for reserving a network for later assigning as specific assignments" type="radio" name="default_type" value="reservation" {% if c.pool is defined %}{% if c.pool.default_type == 'reservation' %} checked{% endif %}{% endif %}>
+					<label for="radio-default-type-reservation" class="tiptip" title="Reservation are for reserving a network for later assigning as specific assignments">Reservation</label>
+					<input id="radio-default-type-assignment" class="tiptip" title="A single subnet, for a specific use in the network" type="radio" name="default_type" value="assignment" {% if c.pool is defined %}{% if c.pool.default_type == 'assignment' %} checked{% endif %}{% endif %}>
+					<label for="radio-default-type-assignment" class="tiptip" title="A single subnet, for a specific use in the network">Assignment</label>
+					<input id="radio-default-type-host" class="tiptip" title="A single host within an assignment" type="radio" name="default_type" value="host" {% if c.pool is defined %}{% if c.pool.default_type == 'host' %} checked{% endif %}{% endif %}>
+					<label id="label-default-type-host" class="tiptip" title="A single host within an assignment" for="radio-default-type-host">Host</label>
+					<a href="javascript:void(0);" onclick="displayPrefixTypeHelp();" style="font-size: 10px; padding-left: 30px;">help on prefix types?</a>
 					</dd>
 				</dl>
 			</div>
@@ -70,21 +74,16 @@ <h3 class="options-group-heading">Properties of {% if c.pool is defined %}pool:
 			<div class="option">
 				<dl>
 					<dt>
-					Tags
+					Default IPv4 prefix length
 					</dt>
 					<dd>
-					<ul id="tags" style="font-size: 1.0em;">
-						{%- if c.pool is defined -%}
-						{% for tag in c.pool.tags|sort() %}<li>{{ tag }}</li>{% endfor %}
-						{% endif %}
-					</ul>
+					<input type="text" name="ipv4_default_prefix_length" value="{% if c.pool is defined %}{{ c.pool.ipv4_default_prefix_length or '' }}{% endif %}" class="tiptip" title="The default IPv4 prefix length of prefixes assigned from this pool. Should be an integer value, for example 24 or 31.">
 					</dd>
 				</dl>
 			</div>
 
 			<div class="rule"></div>
 
-
 			<div class="option">
 				<dl>
 					<dt>