From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 27 Jun 2007 06:40:46 -0000
Subject: [Cluster-devel] conga/luci/storage form-macros index_html
Message-ID: <20070627064046.6992.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-06-27 06:40:45

Modified files:
	luci/storage   : form-macros index_html 

Log message:
	Fix formatting nits

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17.2.6&r2=1.17.2.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/index_html.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.7.2.3&r2=1.7.2.4

--- conga/luci/storage/form-macros	2007/06/26 17:00:53	1.17.2.6
+++ conga/luci/storage/form-macros	2007/06/27 06:40:45	1.17.2.7
@@ -266,11 +266,11 @@
        <td>
         <select name="preferred_size_units" onchange="this.form.submit()">
          <option value="MB" 
-                 tal:attributes="selected python:preferred_size_units == 'MB'">MB - MegaBytes</option>
+                 tal:attributes="selected python:preferred_size_units == 'MB'">MB - Megabytes</option>
          <option value="GB" 
-                 tal:attributes="selected python:preferred_size_units == 'GB'">GB - GigaBytes</option>
+                 tal:attributes="selected python:preferred_size_units == 'GB'">GB - Gigabytes</option>
          <option value="TB" 
-                 tal:attributes="selected python:preferred_size_units == 'TB'">TB - TeraBytes</option>
+                 tal:attributes="selected python:preferred_size_units == 'TB'">TB - Terabytes</option>
         </select>
        </td>
       </tr>
--- conga/luci/storage/index_html	2007/06/27 06:19:22	1.7.2.3
+++ conga/luci/storage/index_html	2007/06/27 06:40:45	1.7.2.4
@@ -216,11 +216,7 @@
                       <h1 tal:content="storagename"></h1>
                     </span>
                   </div>
-                </div>
-              </metal:block>
-              <metal:main-form-content use-macro="here/form-chooser/macros/main-form">
-                <h1>Future Site of Forms</h1>
-              </metal:main-form-content>
+				<metal:main-form-content use-macro="here/form-chooser/macros/main-form" />
 				<div style="padding-top: 10px;"
 					tal:condition="python: report_cached and not (request.has_key('pagetype') and request['pagetype']=='commit_changes')">
 					<form>
@@ -232,6 +228,8 @@
 							onclick="javascript:location=this.form.reprobe_url.value;" />
 					</form>
 				</div>
+                </div>
+              </metal:block>
             </td>
             <tal:comment replace="nothing"> End of main content block </tal:comment>
           </tr>