From 117a78f909e52c4e6adaef4e19433f75cbcd67d4 Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <kmccarth@redhat.com>
Date: Mon, 15 Oct 2007 13:17:26 -0700
Subject: Rename delegatenewform to delegateform.

---
 ipa-server/ipa-gui/ipagui/forms/delegate.py        |   3 +-
 .../ipa-gui/ipagui/templates/delegateform.kid      | 173 +++++++++++++++++++++
 .../ipa-gui/ipagui/templates/delegatenewform.kid   | 173 ---------------------
 3 files changed, 174 insertions(+), 175 deletions(-)
 create mode 100644 ipa-server/ipa-gui/ipagui/templates/delegateform.kid
 delete mode 100644 ipa-server/ipa-gui/ipagui/templates/delegatenewform.kid

(limited to 'ipa-server')

diff --git a/ipa-server/ipa-gui/ipagui/forms/delegate.py b/ipa-server/ipa-gui/ipagui/forms/delegate.py
index 668249128..4856b477f 100644
--- a/ipa-server/ipa-gui/ipagui/forms/delegate.py
+++ b/ipa-server/ipa-gui/ipagui/forms/delegate.py
@@ -81,9 +81,8 @@ class DelegateForm(widgets.Form):
 
     def __init__(self, *args, **kw):
         super(DelegateForm,self).__init__(*args, **kw)
-        # TODO - rename to delegateform
         (self.template_c, self.template) = widgets.meta.load_kid_template(
-                "ipagui.templates.delegatenewform")
+                "ipagui.templates.delegateform")
         self.delegate = DelegateFields
 
     def update_params(self, params):
diff --git a/ipa-server/ipa-gui/ipagui/templates/delegateform.kid b/ipa-server/ipa-gui/ipagui/templates/delegateform.kid
new file mode 100644
index 000000000..2f31a06b3
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/templates/delegateform.kid
@@ -0,0 +1,173 @@
+<div xmlns:py="http://purl.org/kid/ns#"
+  class="simpleroster">
+
+  <?python searchurl = tg.url('/delegate/group_search') ?>
+
+  <script type="text/javascript">
+
+    function enterDoSearch(e, which_group) {
+      var keyPressed;
+      if (window.event) {
+        keyPressed = window.event.keyCode;
+      } else {
+        keyPressed = e.which; 
+      }
+
+      if (keyPressed == 13) {
+        return doSearch(which_group);
+      } else {
+        return true;
+      }
+    }
+
+    function doSearch(which_group) {
+      $(which_group + '_searchresults').update("Searching...");
+      new Ajax.Updater(which_group + '_searchresults',
+          '${searchurl}',
+          {  asynchronous:true,
+             parameters: { criteria: $(which_group + '_criteria').value,
+                           which_group: which_group},
+             evalScripts: true });
+      return false;
+    }
+
+    function selectGroup(which_group, group_dn, group_cn) {
+      group_dn_field = $('form_' + which_group + '_group_dn');
+      group_cn_field = $('form_' + which_group + '_group_cn');
+      group_cn_span = $(which_group + '_group_cn');
+
+      group_dn_field.value = group_dn;
+      group_cn_field.value = group_cn;
+      group_cn_span.update(group_cn);
+
+      new Effect.Fade($(which_group + '_searcharea'), {duration: 0.25});
+      new Effect.Appear($(which_group + '_change_link'), {duration: 0.25});
+    }
+  </script>
+
+  <form action="${action}" name="${name}" method="${method}" class="tableform">
+
+    <table class="formtable" cellpadding="2" cellspacing="0" border="0">
+      <tr>
+        <th>
+          <input type="submit" class="submitbutton" name="submit"
+                 value="${actionname} Delegation"/>
+          <br />
+        </th>
+        <td>
+          <input type="submit" class="submitbutton" name="submit"
+                 value="Cancel ${actionname}"/>
+          <br />
+        </td>
+      </tr>
+    </table>
+
+    <div py:for="field in hidden_fields"
+      py:replace="field.display(value_for(field), **params_for(field))" 
+      />
+
+    <table class="formtable" cellpadding="2" cellspacing="0" border="0">
+      <tr>
+        <th valign="top">
+          <label class="fieldlabel" for="${delegate.name.field_id}"
+            py:content="delegate.name.label" />:
+        </th>
+        <td>
+          <span py:replace="delegate.name.display(value_for(delegate.name))" />
+          <span py:if="tg.errors.get('name')" class="fielderror"
+              py:content="tg.errors.get('name')" />
+        </td>
+      </tr>
+      <tr>
+        <th valign="top">
+          <label class="fieldlabel" for="${delegate.source_group_cn.field_id}"
+            py:content="delegate.source_group_cn.label" />:
+        </th>
+        <td>
+          <div>
+            <span id='source_group_cn'>${value_for(delegate.source_group_cn)}</span>
+            <a href="#" id='source_change_link'
+              onclick="new Effect.Appear($('source_searcharea'), {duration: 0.25});
+                       new Effect.Fade(this, {duration: 0.25});
+                       return false;">change</a>
+            <span py:if="tg.errors.get('source_group_dn')" class="fielderror"
+                py:content="tg.errors.get('source_group_dn')" />
+          </div>
+          <div id="source_searcharea" style="display:none">
+            <div>
+              <input id="source_criteria" type="text"
+                onkeypress="return enterDoSearch(event, 'source');" />
+              <input type="button" value="Find"
+                onclick="return doSearch('source');"
+              />
+            </div>
+            <div id="source_searchresults">
+            </div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <th valign="top">
+          <label class="fieldlabel" for="${delegate.attrs.field_id}"
+            py:content="delegate.attrs.label" />:
+        </th>
+        <td valign="top">
+          <span py:if="tg.errors.get('attrs')" class="fielderror"
+              py:content="tg.errors.get('attrs')" />
+          <span py:replace="delegate.attrs.display(value_for(delegate.attrs))" />
+        </td>
+      </tr>
+      <tr>
+        <th valign="top">
+          <label class="fieldlabel" for="${delegate.dest_group_cn.field_id}"
+            py:content="delegate.dest_group_cn.label" />:
+        </th>
+        <td>
+          <div>
+            <span id='dest_group_cn'>${value_for(delegate.dest_group_cn)}</span>
+            <a href="#" id='dest_change_link'
+              onclick="new Effect.Appear($('dest_searcharea'), {duration: 0.25});
+                       new Effect.Fade(this, {duration: 0.25});
+                       return false;">change</a>
+            <span py:if="tg.errors.get('dest_group_dn')" class="fielderror"
+                py:content="tg.errors.get('dest_group_dn')" />
+          </div>
+          <div id="dest_searcharea" style="display:none">
+            <div>
+              <input id="dest_criteria" type="text"
+                onkeypress="return enterDoSearch(event, 'dest');" />
+              <input type="button" value="Find"
+                onclick="return doSearch('dest');"
+              />
+            </div>
+            <div id="dest_searchresults">
+            </div>
+          </div>
+        </td>
+      </tr>
+    </table>
+
+    <table class="formtable" cellpadding="2" cellspacing="0" border="0">
+      <tr>
+        <th>
+          <input type="submit" class="submitbutton" name="submit"
+                 value="${actionname} Delegation"/>
+        </th>
+        <td>
+          <input type="submit" class="submitbutton" name="submit"
+                 value="Cancel ${actionname}"/>
+        </td>
+      </tr>
+    </table>
+
+  <script py:if="not value.get('source_group_dn')">
+      new Effect.Appear($('source_searcharea'), {duration: 0.25});
+      new Effect.Fade($('source_change_link'), {duration: 0.25});
+  </script>
+  <script py:if="not value.get('dest_group_dn')">
+      new Effect.Appear($('dest_searcharea'), {duration: 0.25});
+      new Effect.Fade($('dest_change_link'), {duration: 0.25});
+  </script>
+
+  </form>
+</div>
diff --git a/ipa-server/ipa-gui/ipagui/templates/delegatenewform.kid b/ipa-server/ipa-gui/ipagui/templates/delegatenewform.kid
deleted file mode 100644
index 2f31a06b3..000000000
--- a/ipa-server/ipa-gui/ipagui/templates/delegatenewform.kid
+++ /dev/null
@@ -1,173 +0,0 @@
-<div xmlns:py="http://purl.org/kid/ns#"
-  class="simpleroster">
-
-  <?python searchurl = tg.url('/delegate/group_search') ?>
-
-  <script type="text/javascript">
-
-    function enterDoSearch(e, which_group) {
-      var keyPressed;
-      if (window.event) {
-        keyPressed = window.event.keyCode;
-      } else {
-        keyPressed = e.which; 
-      }
-
-      if (keyPressed == 13) {
-        return doSearch(which_group);
-      } else {
-        return true;
-      }
-    }
-
-    function doSearch(which_group) {
-      $(which_group + '_searchresults').update("Searching...");
-      new Ajax.Updater(which_group + '_searchresults',
-          '${searchurl}',
-          {  asynchronous:true,
-             parameters: { criteria: $(which_group + '_criteria').value,
-                           which_group: which_group},
-             evalScripts: true });
-      return false;
-    }
-
-    function selectGroup(which_group, group_dn, group_cn) {
-      group_dn_field = $('form_' + which_group + '_group_dn');
-      group_cn_field = $('form_' + which_group + '_group_cn');
-      group_cn_span = $(which_group + '_group_cn');
-
-      group_dn_field.value = group_dn;
-      group_cn_field.value = group_cn;
-      group_cn_span.update(group_cn);
-
-      new Effect.Fade($(which_group + '_searcharea'), {duration: 0.25});
-      new Effect.Appear($(which_group + '_change_link'), {duration: 0.25});
-    }
-  </script>
-
-  <form action="${action}" name="${name}" method="${method}" class="tableform">
-
-    <table class="formtable" cellpadding="2" cellspacing="0" border="0">
-      <tr>
-        <th>
-          <input type="submit" class="submitbutton" name="submit"
-                 value="${actionname} Delegation"/>
-          <br />
-        </th>
-        <td>
-          <input type="submit" class="submitbutton" name="submit"
-                 value="Cancel ${actionname}"/>
-          <br />
-        </td>
-      </tr>
-    </table>
-
-    <div py:for="field in hidden_fields"
-      py:replace="field.display(value_for(field), **params_for(field))" 
-      />
-
-    <table class="formtable" cellpadding="2" cellspacing="0" border="0">
-      <tr>
-        <th valign="top">
-          <label class="fieldlabel" for="${delegate.name.field_id}"
-            py:content="delegate.name.label" />:
-        </th>
-        <td>
-          <span py:replace="delegate.name.display(value_for(delegate.name))" />
-          <span py:if="tg.errors.get('name')" class="fielderror"
-              py:content="tg.errors.get('name')" />
-        </td>
-      </tr>
-      <tr>
-        <th valign="top">
-          <label class="fieldlabel" for="${delegate.source_group_cn.field_id}"
-            py:content="delegate.source_group_cn.label" />:
-        </th>
-        <td>
-          <div>
-            <span id='source_group_cn'>${value_for(delegate.source_group_cn)}</span>
-            <a href="#" id='source_change_link'
-              onclick="new Effect.Appear($('source_searcharea'), {duration: 0.25});
-                       new Effect.Fade(this, {duration: 0.25});
-                       return false;">change</a>
-            <span py:if="tg.errors.get('source_group_dn')" class="fielderror"
-                py:content="tg.errors.get('source_group_dn')" />
-          </div>
-          <div id="source_searcharea" style="display:none">
-            <div>
-              <input id="source_criteria" type="text"
-                onkeypress="return enterDoSearch(event, 'source');" />
-              <input type="button" value="Find"
-                onclick="return doSearch('source');"
-              />
-            </div>
-            <div id="source_searchresults">
-            </div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th valign="top">
-          <label class="fieldlabel" for="${delegate.attrs.field_id}"
-            py:content="delegate.attrs.label" />:
-        </th>
-        <td valign="top">
-          <span py:if="tg.errors.get('attrs')" class="fielderror"
-              py:content="tg.errors.get('attrs')" />
-          <span py:replace="delegate.attrs.display(value_for(delegate.attrs))" />
-        </td>
-      </tr>
-      <tr>
-        <th valign="top">
-          <label class="fieldlabel" for="${delegate.dest_group_cn.field_id}"
-            py:content="delegate.dest_group_cn.label" />:
-        </th>
-        <td>
-          <div>
-            <span id='dest_group_cn'>${value_for(delegate.dest_group_cn)}</span>
-            <a href="#" id='dest_change_link'
-              onclick="new Effect.Appear($('dest_searcharea'), {duration: 0.25});
-                       new Effect.Fade(this, {duration: 0.25});
-                       return false;">change</a>
-            <span py:if="tg.errors.get('dest_group_dn')" class="fielderror"
-                py:content="tg.errors.get('dest_group_dn')" />
-          </div>
-          <div id="dest_searcharea" style="display:none">
-            <div>
-              <input id="dest_criteria" type="text"
-                onkeypress="return enterDoSearch(event, 'dest');" />
-              <input type="button" value="Find"
-                onclick="return doSearch('dest');"
-              />
-            </div>
-            <div id="dest_searchresults">
-            </div>
-          </div>
-        </td>
-      </tr>
-    </table>
-
-    <table class="formtable" cellpadding="2" cellspacing="0" border="0">
-      <tr>
-        <th>
-          <input type="submit" class="submitbutton" name="submit"
-                 value="${actionname} Delegation"/>
-        </th>
-        <td>
-          <input type="submit" class="submitbutton" name="submit"
-                 value="Cancel ${actionname}"/>
-        </td>
-      </tr>
-    </table>
-
-  <script py:if="not value.get('source_group_dn')">
-      new Effect.Appear($('source_searcharea'), {duration: 0.25});
-      new Effect.Fade($('source_change_link'), {duration: 0.25});
-  </script>
-  <script py:if="not value.get('dest_group_dn')">
-      new Effect.Appear($('dest_searcharea'), {duration: 0.25});
-      new Effect.Fade($('dest_change_link'), {duration: 0.25});
-  </script>
-
-  </form>
-</div>
-- 
cgit