Added gray screen for group find page.

7 files changed, 190 insertions, 79 deletions

diff --git a/web/group.css b/web/group.css
new file mode 100644
index 000000000..e85f77a2c
--- /dev/null
+++ b/web/group.css
@@ -0,0 +1,45 @@
+<style type="text/css" media="all" >
+#frame{
+    background-color: #e8e8e8;
+    padding: 0;
+    padding-top:  4px;
+	padding-right:  4px;
+	padding-left:  4px;
+	padding-bottom:  4px;
+	
+    
+}
+#allGroups{
+    background-color: #e8e8e8;
+
+    float: left;
+    border :  1px;
+}
+#groupData{
+    background-color: #e8e8e8;
+
+    float: right;
+}
+#groupMembers{
+
+    float: left;
+}
+#groupNesting{
+    float: right;
+}
+
+
+tr.selected{
+    background-color: cyan
+}
+
+
+tr.odd{
+    background-color: white
+}
+
+tr.even{
+    background-color: lightgray
+}
+
+</style>      
diff --git a/web/group.inc b/web/group.inc
new file mode 100644
index 000000000..c58dd8d65
--- /dev/null
+++ b/web/group.inc
@@ -0,0 +1,62 @@
+
+<div id="frame">
+  <div>
+    <form>
+      <input type="text" />
+      <input type="submit" value="find groups" />
+    </form>
+  </div>
+  
+
+  <table border="1">
+    <tr><th>	<span>Group Name [+]  [-]</span></th>
+      <th>	<span>Users [+]  [-]</span>
+      </th>
+      <th>	  <span>Groups within group Admin: [+]  [-]</span>
+</th></tr>
+    <tr>
+      <td valign="top" align="left">
+	<table  border="1" width="100%">
+	  <tr class="selected"><td>Admin</td></tr>
+	  <tr class="odd" ><td>HR</td></tr>
+	  <tr class="even"><td>Managers</td></tr>
+	  <tr class="odd" ><td>Tech</td></tr>
+	  <tr class="even"><td>Sales</td></tr>
+	  <tr><td>Guest Users</td></tr>
+	</table>
+      </td>
+      <td valign="top">
+	<table border="1" width="100%">
+	  <tr class="selected" ><td>Peg Alliston</td></tr>
+	  <tr class="even"><td>Anne Grosnik</td></tr>
+	  <tr class="odd" ><td>Pat DeBunny</td></tr>
+	  <tr class="even"><td>Olaf Martin</td></tr>
+	  <tr class="odd" ><td>Lee Patrick</td></tr>
+	  <tr class="even"><td>Hong Li</td></tr>
+	  <tr class="odd" ><td>Michael Vanka</td></tr>
+	  <tr class="even"><td>Kari Watson</td></tr>
+	</table>
+      </td><td valign="top">
+	<div id="subordinateGroups">
+	  <table border="1" width="100%">
+	    <tr><th width="60%">Group:          </th><th># Members</th></tr>
+	    <tr class="odd" ><td>Senior Sysadmins</td><td>5         </td></tr>
+	    <tr class="even"><td>Junior Sysadmins</td><td>15        </td></tr>
+	    <tr class="odd" ><td>Interns         </td><td>3         </td></tr>
+	    <tr class="even"><td>Desktop Support </td><td>318       </td></tr>
+	  </table>
+	</div>
+<div><hr /></div>	
+	  <span><b>Group Admin is a member of: [+]  [-]</b></span>
+
+	<div id="superiorGroups">
+	  <table border="1" width="100%">
+	    <tr><th width="60%">Group:         </th><th># Members</th></tr>
+	    <tr class="odd" ><td>Tech</td><td>14</td></tr>      
+	    <tr class="even"><td>Organizers</td><td>3</td></tr>
+	  </table>
+ 	</div>
+      </td>
+    </tr>
+  </table>
+</div>
diff --git a/web/groups.inc b/web/groups.inc
deleted file mode 100644
index 83cef9192..000000000
--- a/web/groups.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-<form>
-<div><input type="text"/><input type="submit" value="Find Groups"/></div>
-<table border="1" ><tr>
-<td valign="top">
-<div>Group Name   [+] Add </div>
-<table>
-<tr><td>Admin </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
-<tr><td>Organizers  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
-<tr><td>HR Department  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
-<tr><td>Managers  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
-<tr><td>Tech  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
-<tr><td>Sales  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
-<tr><td>Guest Users  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
-</table>
-
-
-</td>
-<td valign="top"><div>Members of Group Admin  [+] Add [-] Remove</div></td>
-</tr>
-</table>
-
-
-</form>
\ No newline at end of file
diff --git a/web/ipa.xhtml b/web/ipa.xhtml
index 0f727b17c..5df99bbc4 100644
--- a/web/ipa.xhtml
+++ b/web/ipa.xhtml
@@ -5,6 +5,10 @@
 <title>Page Title</title>
 <link href="ipa.css" 
 rel="stylesheet" type="text/css" />
+<link href="group.css" rel="stylesheet" type="text/css" />
+
+
+
  <script type="text/javascript" src="jquery.js"></script>
  <script type="text/javascript" src="jquery.cookie.js"></script>
 <style type="text/css">
@@ -45,7 +49,7 @@ rel="stylesheet" type="text/css" />
 	</tr>
 	<tr>
 	  <td><a href="#" onclick='doMenu("user-find.inc");'     >Users</a></td>
-	  <td><a href="#" onclick='doMenu("membership.inc");' >Groups</a></td>
+	  <td><a href="#" onclick='doMenu("group.inc");' >Groups</a></td>
 	  <td><a href="#" onclick='doMenu("hosts.inc");' >Hosts</a></td>
 	  <td><a href="#" onclick='doMenu("hostgroups.inc");' >Host Groups</a></td>
 	  <td><a href="#" onclick='doMenu("netgroups.inc");' >Netgroups</a></td>
diff --git a/web/membership.inc b/web/membership.inc
index 5ace723ea..83cef9192 100644
--- a/web/membership.inc
+++ b/web/membership.inc
@@ -1,58 +1,23 @@
+<form>
+<div><input type="text"/><input type="submit" value="Find Groups"/></div>
+<table border="1" ><tr>
+<td valign="top">
+<div>Group Name   [+] Add </div>
+<table>
+<tr><td>Admin </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
+<tr><td>Organizers  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
+<tr><td>HR Department  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
+<tr><td>Managers  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
+<tr><td>Tech  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
+<tr><td>Sales  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
+<tr><td>Guest Users  </td><td><a href="#">Modify</a>|<a href="#">Delete</a></td></tr>
+</table>
 
-<div>
-  <form>
-    <input type="radio" id="membership-types" value="1">
-	  </input><a href="#">Personal Details</a>
-	  <input type="radio" id="membership-types"></input>Memberships
-  </form>
-</div>
-<div>
-  <table border="1">
-    <tr>
-      <td>
-	<div>Memberships</div>
-      </td>
-      <td>
-	<div>My Groups</div>
-      </td>
-      <td>
-	<div>Dev-1 Group</div>
-      </td>
-    </tr>
-    <tr>
-      <td valign="top">
-	<form>
-	  <div><input type="radio" id="memberships" />
-	    <a href="#">My Groups</a>
-	  </div>
 
-	  <div><input type="radio" id="memberships" />
-	    <a href="#">My Netgroups</a>
-	  </div>
+</td>
+<td valign="top"><div>Members of Group Admin  [+] Add [-] Remove</div></td>
+</tr>
+</table>
 
-	  <div><input type="radio" id="memberships" />
-	    <a href="#">My Roles</a>
-	  </div>
 
-	  <div><input type="radio" id="memberships" />
-	    <a href="#">My Delegations</a>
-	  </div>
-	</form>
-      </td>
-      <td valign="top">
-	<div>Dev 1.......................... See Members</div>
-	<div>Engineering................ See Members</div>
-	<div>IPA USers</div>
-      </td>
-      <td  id="groupmembers" valign="top">
-	<div>Sam</div>
-	<div>Val</div>
-	<div>Barry</div>
-	<div>Martha</div>
-	<div>Garth</div>
-	<div>Braden</div>
-	<div>Amaro</div>
-      </td>
-    </tr>
-  </table>
-</div>
+</form>
\ No newline at end of file
diff --git a/web/user-edit.inc b/web/user-edit.inc
index 7da90d3fb..89a4cac66 100644
--- a/web/user-edit.inc
+++ b/web/user-edit.inc
@@ -2,7 +2,7 @@
 <div><a href="#" onclick='doMenu("user-find.inc");'>Cancel</a></div>
 
 <div><input type="radio" />Personal Details<input type="radio" /> 
-    <a href="#"  onclick='doMenu("groups.inc");' >Memberships</a></div>
+    <a href="#"  onclick='doMenu("membership.inc");' >Memberships</a></div>
 <table border="1">
 <tr><th colspan="2">-Identity Details</th></tr>
 <tr><th>Title</th>        <td>Director of Software Development</td> </tr>
diff --git a/web/user-groups.inc b/web/user-groups.inc
new file mode 100644
index 000000000..3f59b37b8
--- /dev/null
+++ b/web/user-groups.inc
@@ -0,0 +1,58 @@
+
+<div>
+  <form>
+    <input type="radio" id="membership-types" value="1">
+	  </input>Personal Details
+	  <input type="radio" id="membership-types"></input><a href="#"  onclick='doMenu("membership.inc");' >Memberships</a>
+  </form>
+</div>
+<div>
+  <table border="1">
+    <tr>
+      <td>
+	<div>Memberships</div>
+      </td>
+      <td>
+	<div>My Groups</div>
+      </td>
+      <td>
+	<div>Dev-1 Group</div>
+      </td>
+    </tr>
+    <tr>
+      <td valign="top">
+	<form>
+	  <div><input type="radio" id="memberships" />
+	    <a href="#">My Groups</a>
+	  </div>
+
+	  <div><input type="radio" id="memberships" />
+	    <a href="#">My Netgroups</a>
+	  </div>
+
+	  <div><input type="radio" id="memberships" />
+	    <a href="#">My Roles</a>
+	  </div>
+
+	  <div><input type="radio" id="memberships" />
+	    <a href="#">My Delegations</a>
+	  </div>
+	</form>
+      </td>
+      <td valign="top">
+	<div>Dev 1.......................... See Members</div>
+	<div>Engineering................ See Members</div>
+	<div>IPA USers</div>
+      </td>
+      <td  id="groupmembers" valign="top">
+	<div>Sam</div>
+	<div>Val</div>
+	<div>Barry</div>
+	<div>Martha</div>
+	<div>Garth</div>
+	<div>Braden</div>
+	<div>Amaro</div>
+      </td>
+    </tr>
+  </table>
+</div>