From 3184b5cd9760ddf71600f227efb909ab0a8252a7 Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <kmccarth@redhat.com>
Date: Fri, 17 Aug 2007 10:59:42 -0700
Subject: [PATCH] Remove ':' from the label widgets so they can be used outside
 forms. Add ':' into the edit/new/show pages.

---
 ipa-server/ipa-gui/ipagui/forms/user.py          | 16 ++++++++--------
 .../ipa-gui/ipagui/templates/usereditform.kid    | 16 ++++++++--------
 .../ipa-gui/ipagui/templates/usernewform.kid     | 16 ++++++++--------
 ipa-server/ipa-gui/ipagui/templates/usershow.kid | 14 +++++++-------
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/ipa-server/ipa-gui/ipagui/forms/user.py b/ipa-server/ipa-gui/ipagui/forms/user.py
index bdf5f0625..9ce512567 100644
--- a/ipa-server/ipa-gui/ipagui/forms/user.py
+++ b/ipa-server/ipa-gui/ipagui/forms/user.py
@@ -2,14 +2,14 @@ import turbogears
 from turbogears import validators, widgets
 
 class UserFields():
-    uid = widgets.TextField(name="uid", label="Login:")
-    userpassword = widgets.TextField(name="userpassword", label="Password:")
-    uidnumber = widgets.TextField(name="uidnumber", label="UID:")
-    gidnumber = widgets.TextField(name="gidnumber", label="GID:")
-    givenname = widgets.TextField(name="givenname", label="First name:")
-    sn = widgets.TextField(name="sn", label="Last name:")
-    mail = widgets.TextField(name="mail", label="E-mail address:")
-    telephonenumber = widgets.TextField(name="telephonenumber", label="Phone:")
+    uid = widgets.TextField(name="uid", label="Login")
+    userpassword = widgets.TextField(name="userpassword", label="Password")
+    uidnumber = widgets.TextField(name="uidnumber", label="UID")
+    gidnumber = widgets.TextField(name="gidnumber", label="GID")
+    givenname = widgets.TextField(name="givenname", label="First name")
+    sn = widgets.TextField(name="sn", label="Last name")
+    mail = widgets.TextField(name="mail", label="E-mail address")
+    telephonenumber = widgets.TextField(name="telephonenumber", label="Phone")
 
     uid.validator = validators.PlainText(not_empty=True)
     userpassword.validator = validators.String(not_empty=True)
diff --git a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid
index 585568682..771d94d49 100644
--- a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid
@@ -12,7 +12,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.uid.field_id}"
-            py:content="user.uid.label" />
+            py:content="user.uid.label" />:
         </th>
         <td>
           ${value_for(user.uid)}
@@ -22,7 +22,7 @@
       <tr>
         <th valign="top">
           <label class="fieldlabel" for="${user.userpassword.field_id}"
-            py:content="user.userpassword.label" />
+            py:content="user.userpassword.label" />:
         </th>
         <td valign="top">
           <span py:replace="user.userpassword.display(value_for(user.userpassword))" />
@@ -67,7 +67,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.uidnumber.field_id}"
-            py:content="user.uidnumber.label" />
+            py:content="user.uidnumber.label" />:
         </th>
         <td>
           ${value_for(user.uidnumber)}
@@ -77,7 +77,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.gidnumber.field_id}"
-            py:content="user.gidnumber.label" />
+            py:content="user.gidnumber.label" />:
         </th>
         <td>
           ${value_for(user.gidnumber)}
@@ -90,7 +90,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.givenname.field_id}"
-            py:content="user.givenname.label" />
+            py:content="user.givenname.label" />:
         </th>
         <td>
           <span py:replace="user.givenname.display(value_for(user.givenname))" />
@@ -103,7 +103,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.sn.field_id}"
-            py:content="user.sn.label" />
+            py:content="user.sn.label" />:
         </th>
         <td>
           <span py:replace="user.sn.display(value_for(user.sn))" />
@@ -118,7 +118,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.mail.field_id}"
-            py:content="user.mail.label" />
+            py:content="user.mail.label" />:
         </th>
         <td>
           <span py:replace="user.mail.display(value_for(user.mail))" />
@@ -129,7 +129,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.telephonenumber.field_id}"
-            py:content="user.telephonenumber.label" />
+            py:content="user.telephonenumber.label" />:
         </th>
         <td>
           <span py:replace="user.telephonenumber.display(value_for(user.telephonenumber))" />
diff --git a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid
index e25eeca3c..df5fd55fc 100644
--- a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid
@@ -7,7 +7,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.uid.field_id}"
-            py:content="user.uid.label" />
+            py:content="user.uid.label" />:
         </th>
         <td>
           <span py:replace="user.uid.display(value_for(user.uid))" />
@@ -19,7 +19,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.userpassword.field_id}"
-            py:content="user.userpassword.label" />
+            py:content="user.userpassword.label" />:
         </th>
         <td>
           <span py:replace="user.userpassword.display(value_for(user.userpassword))" />
@@ -41,7 +41,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.uidnumber.field_id}"
-            py:content="user.uidnumber.label" />
+            py:content="user.uidnumber.label" />:
         </th>
         <td>
           <span py:replace="user.uidnumber.display(value_for(user.uidnumber))" />
@@ -53,7 +53,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.gidnumber.field_id}"
-            py:content="user.gidnumber.label" />
+            py:content="user.gidnumber.label" />:
         </th>
         <td>
           <span py:replace="user.gidnumber.display(value_for(user.gidnumber))" />
@@ -68,7 +68,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.givenname.field_id}"
-            py:content="user.givenname.label" />
+            py:content="user.givenname.label" />:
         </th>
         <td>
           <span py:replace="user.givenname.display(value_for(user.givenname))" />
@@ -81,7 +81,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.sn.field_id}"
-            py:content="user.sn.label" />
+            py:content="user.sn.label" />:
         </th>
         <td>
           <span py:replace="user.sn.display(value_for(user.sn))" />
@@ -96,7 +96,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.mail.field_id}"
-            py:content="user.mail.label" />
+            py:content="user.mail.label" />:
         </th>
         <td>
           <span py:replace="user.mail.display(value_for(user.mail))" />
@@ -107,7 +107,7 @@
       <tr>
         <th>
           <label class="fieldlabel" for="${user.telephonenumber.field_id}"
-            py:content="user.telephonenumber.label" />
+            py:content="user.telephonenumber.label" />:
         </th>
         <td>
           <span py:replace="user.telephonenumber.display(value_for(user.telephonenumber))" />
diff --git a/ipa-server/ipa-gui/ipagui/templates/usershow.kid b/ipa-server/ipa-gui/ipagui/templates/usershow.kid
index 89256a224..6d3fd5bb6 100644
--- a/ipa-server/ipa-gui/ipagui/templates/usershow.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/usershow.kid
@@ -12,19 +12,19 @@
     <table class="formtable" cellpadding="2" cellspacing="0" border="0">
         <tr>
           <th>
-            <label class="fieldlabel" py:content="fields.uid.label" />
+            <label class="fieldlabel" py:content="fields.uid.label" />:
           </th>
           <td>${user.get("uid")}</td>
         </tr>
         <tr>
           <th>
-            <label class="fieldlabel" py:content="fields.uidnumber.label" />
+            <label class="fieldlabel" py:content="fields.uidnumber.label" />:
           </th>
           <td>${user.get("uidnumber")}</td>
         </tr>
         <tr>
           <th>
-            <label class="fieldlabel" py:content="fields.gidnumber.label" />
+            <label class="fieldlabel" py:content="fields.gidnumber.label" />:
           </th>
           <td>${user.get("gidnumber")}</td>
         </tr>
@@ -34,13 +34,13 @@
     <table class="formtable" cellpadding="2" cellspacing="0" border="0">
         <tr>
           <th>
-            <label class="fieldlabel" py:content="fields.givenname.label" />
+            <label class="fieldlabel" py:content="fields.givenname.label" />:
           </th>
           <td>${user.get("givenname")}</td>
         </tr>
         <tr>
           <th>
-            <label class="fieldlabel" py:content="fields.sn.label" />
+            <label class="fieldlabel" py:content="fields.sn.label" />:
           </th>
           <td>${user.get("sn")}</td>
         </tr>
@@ -50,13 +50,13 @@
     <table class="formtable" cellpadding="2" cellspacing="0" border="0">
         <tr>
           <th>
-            <label class="fieldlabel" py:content="fields.mail.label" />
+            <label class="fieldlabel" py:content="fields.mail.label" />:
           </th>
           <td>${user.get("mail")}</td>
         </tr>
         <tr>
           <th>
-            <label class="fieldlabel" py:content="fields.telephonenumber.label" />
+            <label class="fieldlabel" py:content="fields.telephonenumber.label" />:
           </th>
           <td>${user.get("telephonenumber")}</td>
         </tr>