From 308119c16fe1db3eeae1479780c7b92ac1df99c5 Mon Sep 17 00:00:00 2001
From: Ryan McCabe <rmccabe@redhat.com>
Date: Aug 03 2010 22:35:30 +0000
Subject: Add labels (per Lon's suggestion) to the resource forms so it's clear what you're doing when constructing/editing a service


---

diff --git a/luci/templates/resource_list.html b/luci/templates/resource_list.html
index 3937400..552a79a 100644
--- a/luci/templates/resource_list.html
+++ b/luci/templates/resource_list.html
@@ -13,6 +13,7 @@
 		py:attrs="res and {'value':res.getAttribute('address')} or {}" />
 	<input name="type" type="hidden" value="ip" />
 
+	<h3>IP Address</h3>
 	 <table class="formtable">
 		<tr>
 			<td>IP address</td>
@@ -56,6 +57,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="fs" />
 
+	<h3>Filesystem</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -154,6 +156,15 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="clusterfs" />
 
+	<py:choose test="tmpl_context.cluster.get_version()">
+		<py:when test="2">
+			<h3>GFS/GFS2</h3>
+		</py:when>
+		<py:otherwise>
+			<h3>GFS2</h3>
+		</py:otherwise>
+	</py:choose>
+
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -237,6 +248,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="netfs" />
 
+	<h3>NFS/CIFS Mount</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -315,6 +327,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="nfsexport" />
 
+	<h3>NFS v3 Export</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -336,6 +349,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="nfsserver" />
 
+	<h3>NFS Server</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -364,6 +378,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="nfsclient" />
 
+	<h3>NFS Client</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -406,6 +421,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="smb" />
 
+	<h3>Samba Server</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -462,6 +478,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="script" />
 
+	<h3>Script</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -490,6 +507,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="apache" />
 
+	<h3>Apache</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -542,6 +560,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="mysql" />
 
+	<h3>MySQL</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -599,6 +618,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="lvm" />
 
+	<h3>HA LVM</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -641,6 +661,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="openldap" />
 
+	<h3>Open LDAP</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -692,6 +713,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="postgres-8" />
 
+	<h3>PostgreSQL 8</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -743,6 +765,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="tomcat-5" />
 
+	<h3>Tomcat 5</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -802,6 +825,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="tomcat-6" />
 
+	<h3>Tomcat 6</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -848,6 +872,7 @@
 		py:attrs="res and {'value':res.getAttribute('InstanceName')} or {}" />
 	<input name="type" type="hidden" value="SAPInstance" />
 
+	<h3>SAP Instance</h3>
 	<table class="formtable">
 		<tr>
 			<td>SAP instance name</td>
@@ -948,6 +973,7 @@
 		py:attrs="res and {'value':res.getAttribute('SID')} or {}" />
 	<input name="type" type="hidden" value="SAPDatabase" />
 
+	<h3>SAP Database</h3>
 	<table class="formtable">
 		<tr>
 			<td>SAP Database name</td>
@@ -1094,6 +1120,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="ASEHAagent" />
 
+	<h3>Sybase ASE Failover Instance</h3>
 	<table class="formtable">
 		<tr>
 			<td>Instance Name</td>
@@ -1195,6 +1222,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="oracledb" />
 
+	<h3>Oracle 10g/11g Failover Instance</h3>
 	<table class="formtable">
 		<tr>
 			<td>Instance name (SID) of Oracle instance</td>
@@ -1260,6 +1288,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="named" />
 
+	<h3>Named</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>
@@ -1311,6 +1340,7 @@
 		py:attrs="res and {'value':res.getAttribute('name')} or {}" />
 	<input name="type" type="hidden" value="drbd" />
 
+	<h3>DRBD</h3>
 	<table class="formtable">
 		<tr>
 			<td>Name</td>