template changes for goup forms

4 files changed, 36 insertions, 15 deletions

diff --git a/funcweb/funcweb/templates/group_minion.html b/funcweb/funcweb/templates/group_minion.html
index bc45fe8..5d9ea7a 100644
--- a/funcweb/funcweb/templates/group_minion.html
+++ b/funcweb/funcweb/templates/group_minion.html
@@ -1,10 +1,13 @@
 <div class="graytexts" id="miniongroupsbigbox"
     xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:py="http://genshi.edgewall.org/">
+    xmlns:py="http://genshi.edgewall.org/"
+    xmlns:xi="http://www.w3.org/2001/XInclude">
 
-    <xi:include href="group_small.html"/>
-    <!-- small groups ends here	 -->
+    <div id="group_small">
+        <xi:include href="group_small.html"/>
+    </div>
+    <div id="minion_small">
+        <xi:include href="minion_small.html"/>
+    </div>
     
-    <xi:include href="minion_small.html" />
-    <!-- small minions ends here	 -->
 </div>
diff --git a/funcweb/funcweb/templates/group_small.html b/funcweb/funcweb/templates/group_small.html
index 2638c2f..eff3965 100644
--- a/funcweb/funcweb/templates/group_small.html
+++ b/funcweb/funcweb/templates/group_small.html
@@ -1,19 +1,27 @@
-<div class="group" id="group">
+<div class="group" id="group"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:py="http://genshi.edgewall.org/">
     <div align="center">Group</div>
+     <form action="/funcweb/add_minions_togroup" method="post" onsubmit="return !glob_submit(this,'group_small');" name="group_remove">
     <div class="groupbox" id="groupbox">
-        <div class="minionstextblue" id="grouptextbox"><span class="minionsandgroupsbluetext">Group1</span>          
+        <span py:for="host in hosts">
+            <div class="minionstextblue" id="grouptextbox"><span class="minionsandgroupsbluetext">${host}</span>          
             <label>
-                <input type="checkbox" name="groupcheckbox" id="groupcheckbox" />
+                <input type="checkbox" name="rmgroup" id="groupcheckbox" value="${host}"/>
             </label>
         </div>
+        </span>
     </div>  
     <div class="selectallgroupboxes" id="selectallgroupboxes">
+        <input type="hidden" name="action_name" value="remove"/>
+        <input type="hidden" name="group_name" value="${group_name}"/>
         <span class="graytexts2">Select all:</span> 
         <label>
-            <input type="checkbox" name="groupcheckbox2" id="groupcheckbox2" />
+            <input type="checkbox" name="groupcheckbox2" id="groupcheckbox2"/>
         </label>
         <label>
             <input name="removegroups" type="submit" class="addnewgroupbtn" id="removegroups" value="Remove" />
         </label>
     </div>
+    </form>
 </div>
diff --git a/funcweb/funcweb/templates/list_group.html b/funcweb/funcweb/templates/list_group.html
index 49cd8b7..6c6ce8c 100644
--- a/funcweb/funcweb/templates/list_group.html
+++ b/funcweb/funcweb/templates/list_group.html
@@ -4,7 +4,7 @@
     
     <div align="center" class="graytexts">Groups</div>
     <span py:for="group_name in groups">
-        <div class="minionstextblue" id="groupstexts"><a href="#">${group_name}</a></div>
+        <div class="minionstextblue" id="groupstexts"><a href="#" onclick="myj('#miniongroupcontents').hide().load('/funcweb/list_host_by_group/${group_name}').show('slow');" >${group_name}</a></div>
         <form action="/funcweb/remove_group" method="post" onsubmit="return !glob_submit(this,'groupscontent');" name="remove_form">
  
             <input type="hidden" name="group_name" value="${group_name}"/>
diff --git a/funcweb/funcweb/templates/minion_small.html b/funcweb/funcweb/templates/minion_small.html
index e3206b2..b180576 100644
--- a/funcweb/funcweb/templates/minion_small.html
+++ b/funcweb/funcweb/templates/minion_small.html
@@ -1,18 +1,28 @@
-<div class="minions2" id="minions2">
+<div class="minions2" id="minions2"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:py="http://genshi.edgewall.org/">
+
     <div align="center">Minions</div>
+    <form action="/funcweb/add_minions_togroup" method="post" onsubmit="return !glob_submit(this,'group_small');" name="minion_merge">
     <div class="minions2box" id="minions2box">
-        <div class="minionstextbox" id="minionstextbox"><span class="minionsandgroupsbluetext">Minion1</span>
+    <span py:for="minion in all_minions">
+        <div class="minionstextbox" id="minionstextbox"><span class="minionsandgroupsbluetext">${minion}</span>
             <label>
-                <input type="checkbox" name="checkminion" id="checkminion" />
+                <input type="checkbox" class = "checkminion" name="checkminion" id="checkminion" value="${minion}"/>
             </label>
         </div> 
+    </span>
     </div>
     <div class="graytexts2" id="selectallbox"> Select all:
-        <label>
-            <input type="checkbox" name="selectallchechbox" id="selectallchechbox" />
+         <label>
+            <input type="checkbox" name="groupcheckbox2" id="groupcheckbox2" />
         </label>
+
+        <input type="hidden" name="group_name" value="${group_name}"/>
+        <input type="hidden" name="action_name" value="add"/>
         <label>
             <input name="addbtn" type="submit" class="addnewgroupbtn" id="addbtn" value="Add" />
         </label>
     </div>
+    </form>
 </div>