Person und Gruppen, Fehler korrigiert + Layout

12 files changed, 163 insertions, 192 deletions

diff --git a/application/modules/dev/views/scripts/auth/delete.phtml b/application/modules/dev/views/scripts/auth/delete.phtml
deleted file mode 100644
index e69de29..0000000
--- a/application/modules/dev/views/scripts/auth/delete.phtml
+++ /dev/null
diff --git a/application/modules/dev/views/scripts/auth/index.phtml b/application/modules/dev/views/scripts/auth/index.phtml
deleted file mode 100644
index e69de29..0000000
--- a/application/modules/dev/views/scripts/auth/index.phtml
+++ /dev/null
diff --git a/application/modules/dev/views/scripts/auth/logout.phtml b/application/modules/dev/views/scripts/auth/logout.phtml
deleted file mode 100644
index a709bd9..0000000
--- a/application/modules/dev/views/scripts/auth/logout.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<br /><br /><center>View script for controller <b>Auth</b> and script/action name <b>logout</b></center>
\ No newline at end of file
diff --git a/application/modules/dev/views/scripts/bootos/index.phtml b/application/modules/dev/views/scripts/bootos/index.phtml
index 6462b1f..c5970b6 100644
--- a/application/modules/dev/views/scripts/bootos/index.phtml
+++ b/application/modules/dev/views/scripts/bootos/index.phtml
@@ -4,38 +4,39 @@
 							'class' => 'addbutton'))?>
 
 <table>
-  <tr>
-    <th>ID</th>
-    <th>Title</th>
-    <th>GroupID</th>
-    <th>MembershipID</th>
-    <th>ConfigID</th>
-    <th>Init</th>
-    <th>Kernel</th>
-    <th>Kcl</th>
-    <th>Description</th>
-    <th>Changed</th>
-    <th>Expires</th>
-    <th>Public</th>
- 	<th colspan=2>Actions</th>
-  </tr>
-  <?php if(count($this->bootoslist)==0)
-  	echo "</table> There are no BootOs's to display." ?>
-  <?php foreach ($this->bootoslist as $bootos): ?>
-  <tr class=entry>
-    <td><?php echo $this->escape($bootos->getID()); ?></td>
-    <td><?php echo $this->escape($bootos->getTitle()); ?></td>
-    <td><?php echo $this->escape($bootos->getGroupID()); ?></td>
-    <td><?php echo $this->escape($bootos->getMembershipID()); ?></td>    
-    <td><?php echo $this->escape($bootos->getConfigID()); ?></td>
-    <td><?php echo $this->escape($bootos->getPath_init()); ?></td>
-    <td><?php echo $this->escape($bootos->getPath_kernel()); ?></td>
-    <td><?php echo $this->escape($bootos->getDefaultkcl()); ?></td>
-    <td><?php echo $this->escape($bootos->getDescription()); ?></td>
-    <td><?php echo $this->escape(date('Y-m-d H:i:s', $bootos->getCreated())); ?></td>
-    <td><?php echo $this->escape($bootos->getExpires()); ?></td>
-    <td><?php echo $this->escape($bootos->getPublic()); ?></td>
-    <td class='action'><a href="<?php echo $this->url(
+	<tr>
+		<th>ID</th>
+		<th>Title</th>
+		<th>GroupID</th>
+		<th>MembershipID</th>
+		<th>ConfigID</th>
+		<th>Init</th>
+		<th>Kernel</th>
+		<th>Kcl</th>
+		<th>Description</th>
+		<th>Changed</th>
+		<th>Expires</th>
+		<th>Public</th>
+		<th colspan=2>Actions</th>
+	</tr>
+	<?php if(count($this->bootoslist)==0)
+	echo "</table> There are no BootOs's to display." ?>
+	<?php foreach ($this->bootoslist as $bootos): ?>
+	<tr class=entry>
+		<td><?php echo $this->escape($bootos->getID()); ?></td>
+		<td><?php echo $this->escape($bootos->getTitle()); ?></td>
+		<td><?php echo $this->escape($bootos->getGroupID()); ?></td>
+		<td><?php echo $this->escape($bootos->getMembershipID()); ?></td>
+		<td><?php echo $this->escape($bootos->getConfigID()); ?></td>
+		<td><?php echo $this->escape($bootos->getPath_init()); ?></td>
+		<td><?php echo $this->escape($bootos->getPath_kernel()); ?></td>
+		<td><?php echo $this->escape($bootos->getDefaultkcl()); ?></td>
+		<td><?php echo $this->escape($bootos->getDescription()); ?></td>
+		<td><?php echo $this->escape(date('Y-m-d H:i:s', $bootos->getCreated())); ?></td>
+		<td><?php echo $this->escape($bootos->getExpires()); ?></td>
+		<td><?php echo $this->escape($bootos->getPublic()); ?></td>
+		<td class='action'><a
+			href="<?php echo $this->url(
 					array(
 						'module'	=> 'dev',
 						'controller' => 'bootos',
@@ -43,8 +44,9 @@
 						'bootosID'   =>  $bootos->getID()
 					),
 					'default',
-					true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootOS'/></a></td>
-	<td class='action'><a href="<?php echo $this->url(
+					true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootOS' /></a></td>
+		<td class='action'><a
+			href="<?php echo $this->url(
 					array(
 						'module'	=> 'dev',
 						'controller' => 'bootos',
@@ -52,13 +54,13 @@
 						'bootosID'   =>  $bootos->getID()
 					),
 					'default',
-					true) ?>"><img src='/media/img/delete.png' alt='Delete BootOS'/></a></td>
-  </tr>
-  <?php endforeach; ?>
+					true) ?>"><img src='/media/img/delete.png' alt='Delete BootOS' /></a></td>
+	</tr>
+	<?php endforeach; ?>
 </table>
 
 
 
-	
-	
-	
+
+
+
diff --git a/application/modules/dev/views/scripts/group/delete.phtml b/application/modules/dev/views/scripts/group/delete.phtml
deleted file mode 100644
index fc96431..0000000
--- a/application/modules/dev/views/scripts/group/delete.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-if(!isset($_POST['groupID'])) {
-	?>
-<div>No group has been chosen.</div>
-	<?php
-}
\ No newline at end of file
diff --git a/application/modules/dev/views/scripts/group/grantperson.phtml b/application/modules/dev/views/scripts/group/grantperson.phtml
deleted file mode 100644
index f15d08a..0000000
--- a/application/modules/dev/views/scripts/group/grantperson.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-if(!isset($_POST['grouprequestID'])) {
-	?>
-<div>No Request has been chosen.</div>
-	<?php
-}
-if(!isset($_POST['roleID'])) {
-	?>
-<div>No Role has been chosen.</div>
-	<?php
-}
\ No newline at end of file
diff --git a/application/modules/dev/views/scripts/group/index.phtml b/application/modules/dev/views/scripts/group/index.phtml
index 714498e..a3d1269 100644
--- a/application/modules/dev/views/scripts/group/index.phtml
+++ b/application/modules/dev/views/scripts/group/index.phtml
@@ -1,27 +1,48 @@
+<h1>Groups</h1>
+<?php echo $this->formButton('addgroup', 'Add Group', array(
+							'onclick' => 'self.location="/dev/group/add"',
+							'class' => 'addbutton'))?>
 <table>
 	<tr>
-		<th>Title:</th>
-		<th>Functions:</th>
+		<th>Title</th>
+		<th colspan=3>Actions</th>
 	</tr>
 	<?php
 	$count = 0;
 	foreach($this->groupList as $group) {
 		?>
-	<tr>
+	<tr class="entry">
 		<td><?php echo $group->getTitle(); ?></td>
-		<td>
-		<form name="show<?php echo $count; ?>" action="/dev/group/show"
-			method="post"><input type="hidden" name="groupID"
-			value="<?php echo $group->getID(); ?>" /><a
-			href="javascript:document.show<?php echo $count; ?>.submit();">Details</a></form>
-		<form name="edit<?php echo $count; ?>" action="/group/edit"
-			method="post"><input type="hidden" name="groupID"
-			value="<?php echo $group->getID(); ?>" /><a
-			href="javascript:document.edit<?php echo $count; ?>.submit();">Edit</a></form>
-		<form name="delete<?php echo $count; ?>" action="/group/delete"
-			method="post"><input type="hidden" name="groupID"
-			value="<?php echo $group->getID(); ?>" /><a
-			href="javascript:document.delete<?php echo $count; ?>.submit();">Delete</a></form>
+		<td class='action'><a
+			href="<?php echo $this->url(
+					array(
+						'module'	=> 'dev',
+						'controller' => 'group',
+						'action'     => 'show',
+						'groupID'   =>  $group->getID()
+					),
+					'default',
+					true) ?>"> <img src='/media/img/show.png' alt='Show Group' /></a></td>
+		<td class='action'><a
+			href="<?php echo $this->url(
+					array(
+						'module'	=> 'dev',
+						'controller' => 'group',
+						'action'     => 'edit',
+						'groupID'   =>  $group->getID()
+					),
+					'default',
+					true) ?>"> <img src='/media/img/edit.png' alt='Edit Group' /></a></td>
+		<td class='action'><a
+			href="<?php echo $this->url(
+					array(
+						'module'	=> 'dev',
+						'controller' => 'group',
+						'action'     => 'delete',
+						'groupID'   =>  $group->getID()
+					),
+					'default',
+					true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
 		</td>
 	</tr>
 	<?php
@@ -29,7 +50,8 @@
 	}
 	?>
 </table>
-<br />
 <div>
-<button onclick="location.href='/dev/group/link'">Link Groups</button>
+<?php echo $this->formButton('linkgroups', 'Link Groups', array(
+							'onclick' => 'self.location="/dev/group/link"',
+							'class' => 'addbutton'))?>
 </div>
diff --git a/application/modules/dev/views/scripts/group/revokeperson.phtml b/application/modules/dev/views/scripts/group/revokeperson.phtml
deleted file mode 100644
index 6af5564..0000000
--- a/application/modules/dev/views/scripts/group/revokeperson.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-if(!isset($_POST['membershipID'])) {
-	?>
-<div>No Membership has been chosen.</div>
-	<?php
-}
\ No newline at end of file
diff --git a/application/modules/dev/views/scripts/group/show.phtml b/application/modules/dev/views/scripts/group/show.phtml
index 7b3660d..f8fbe1e 100644
--- a/application/modules/dev/views/scripts/group/show.phtml
+++ b/application/modules/dev/views/scripts/group/show.phtml
@@ -1,23 +1,21 @@
+<h1>Group Details</h1>
 <?php
-if($_POST['groupID']) {
+if($this->groupID) {
 	?>
-<div align="right">
-<form name="editForm" action="/dev/group/edit/" method="post"><input
-	type="hidden" name="groupID"
-	value="<?php echo $this->group->getID(); ?>" /> <input type="submit"
-	name="edit" value="Edit" /></form>
-<form name="deleteForm" action="/dev/group/delete/" method="post"><input
-	type="hidden" name="groupID"
-	value="<?php echo $this->group->getID(); ?>" /> <input type="submit"
-	name="delete" value="Delete" /></form>
-</div>
+	<?php echo $this->formButton('deletegroup', 'Delete', array(
+							'onclick' => 'self.location="/dev/group/delete/groupID/' . $this->group->getID() .'"',
+							'class' => 'rightbutton'))?>
+	<?php echo $this->formButton('editgroup', 'Edit', array(
+							'onclick' => 'self.location="/dev/group/edit/groupID/' . $this->group->getID() .'"',
+							'class' => 'rightbutton'))?>
+<span class="clear"></span>
 <table>
 	<tr>
-		<td><b>Title:</b></td>
-		<td><?php echo $this->group->getTitle(); ?></td>
+		<th>Title</th>
+		<th>Description</th>
 	</tr>
-	<tr>
-		<td><b>Description:</b></td>
+	<tr class="entry">
+		<td><?php echo $this->group->getTitle(); ?></td>
 		<td><?php echo $this->group->getDescription(); ?></td>
 	</tr>
 	<?php
@@ -35,30 +33,31 @@ if($_POST['groupID']) {
 	if(isset($this->groupRequestList)) {
 		?>
 <br />
-<div>Grouprequests:</div>
-<br />
+<h2>Requests:</h2>
 <table>
 	<tr>
-		<th>Firstname:</th>
-		<th>Name:</th>
-		<th>email:</th>
-		<th>city:</th>
-		<th>grant:</th>
+		<th>Firstname</th>
+		<th>Name</th>
+		<th>email</th>
+		<th>city</th>
+		<th>grant</th>
 	</tr>
 	<?php
 	foreach($this->groupRequestList as $grouprequest) {
 		$grouprequestID = $grouprequest['grouprequestID'];
 		$person = $grouprequest['person'];
 		?>
-	<tr>
+	<tr class="entry">
 		<td><?php echo $person->getFirstname(); ?></td>
 		<td><?php echo $person->getName(); ?></td>
 		<td><?php echo $person->getEmail(); ?></td>
 		<td><?php echo $person->getCity(); ?></td>
 		<td>
-		<form action="/dev/group/grantperson" method="post"><input type="hidden"
-			name="grouprequestID" value="<?php echo $grouprequestID; ?>" /> <?php printRoleSelect($this->roleList); ?>
-		<input type="submit" name="confirm" value="confirm" /></form>
+		<form action="/dev/group/grantperson" method="post"><input
+			type="hidden" name="grouprequestID"
+			value="<?php echo $grouprequestID; ?>" /> <?php printRoleSelect($this->roleList); ?>
+		<input type="image" src='/media/img/save.png' alt='Grant Person'
+			name="confirm" value="confirm" /></form>
 		</td>
 	</tr>
 	<?php
@@ -67,35 +66,39 @@ if($_POST['groupID']) {
 </table>
 	<?php
 	}
-	if(isset($this->memberslist)) {
+	if(isset($this->membersList)) {
 		?>
 <br />
-<div>Members:</div>
-<br />
+<h2>Members:</h2>
 <table>
 	<tr>
-		<th>Firstname:</th>
-		<th>Name:</th>
-		<th>email:</th>
-		<th>city:</th>
-		<th></th>
+		<th>Firstname</th>
+		<th>Name</th>
+		<th>email</th>
+		<th>city</th>
+		<th>revoke</th>
 	</tr>
 
 	<?php
-	foreach($this->memberslist as $member) {
+	foreach($this->membersList as $member) {
 		$membershipID = $member['membershipID'];
 		$person = $member['person'];
 		?>
-	<tr>
+	<tr class="entry">
 		<td><?php echo $person->getFirstname(); ?></td>
 		<td><?php echo $person->getName(); ?></td>
 		<td><?php echo $person->getEmail(); ?></td>
 		<td><?php echo $person->getCity(); ?></td>
-		<td>
-		<form action="/dev/group/revokeperson" method="post"><input type="hidden"
-			name="membershipID" value="<?php echo $membershipID; ?>" /><input
-			type="hidden" name="personID" value="<?php echo $person->getID(); ?>" />
-		<input type="submit" name="revoke" value="revoke" /></form>
+		<td class='action'><a
+			href="<?php echo $this->url(
+					array(
+						'module'	=> 'dev',
+						'controller' => 'group',
+						'action'     => 'revokeperson',
+						'membershipID'   =>  $membershipID,
+					),
+					'default',
+					true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
 		</td>
 	</tr>
 	<?php
@@ -104,10 +107,6 @@ if($_POST['groupID']) {
 </table>
 	<?php
 	}
-} else {
-	?>
-<div>No Group has been chosen.</div>
-	<?php
 }
 
 function printRoleSelect($roleList) {
@@ -120,3 +119,5 @@ function printRoleSelect($roleList) {
 	}
 	echo "</select>";
 }
+?>
+<br /><br /><br /><br /><br />
\ No newline at end of file
diff --git a/application/modules/dev/views/scripts/person/index.phtml b/application/modules/dev/views/scripts/person/index.phtml
deleted file mode 100644
index e69de29..0000000
--- a/application/modules/dev/views/scripts/person/index.phtml
+++ /dev/null
diff --git a/application/modules/dev/views/scripts/person/leave.phtml b/application/modules/dev/views/scripts/person/leave.phtml
deleted file mode 100644
index fc96431..0000000
--- a/application/modules/dev/views/scripts/person/leave.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-if(!isset($_POST['groupID'])) {
-	?>
-<div>No group has been chosen.</div>
-	<?php
-}
\ No newline at end of file
diff --git a/application/modules/dev/views/scripts/person/show.phtml b/application/modules/dev/views/scripts/person/show.phtml
index 945bb61..b0c6fc1 100644
--- a/application/modules/dev/views/scripts/person/show.phtml
+++ b/application/modules/dev/views/scripts/person/show.phtml
@@ -1,70 +1,45 @@
-<div align="right">
-<button onclick="location.href='/dev/person/edit'">Edit</button>
-</div>
-<table>
-	<tr>
-		<td><b>Title:</b></td>
-		<td><?php echo $this->person->getTitle(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Name:</b></td>
-		<td><?php echo $this->person->getName(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Firstname:</b></td>
-		<td><?php echo $this->person->getFirstname(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Street:</b></td>
-		<td><?php echo $this->person->getStreet(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Housenumber:</b></td>
-		<td><?php echo $this->person->getHousenumber(); ?></td>
-	</tr>
-	<tr>
-		<td><b>City:</b></td>
-		<td><?php echo $this->person->getCity(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Postalcode:</b></td>
-		<td><?php echo $this->person->getPostalcode(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Email:</b></td>
-		<td><?php echo $this->person->getEmail(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Last Login Date:</b></td>
-		<td><?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()); ?> Uhr</td>
-	</tr>
-	<tr>
-		<td><b>Register Date:</b></td>
-		<td><?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()); ?> Uhr</td>
-	</tr>
-</table>
+<h1>Person</h1>
+<?php echo $this->formButton('editperson', 'Edit', array(
+							'onclick' => 'self.location="/dev/person/edit/"',
+							'class' => 'rightbutton'))?>
+<br /><br  />
+<div class="personColorDiv"><span class="bold">Title:</span>&nbsp;<?php echo $this->person->getTitle(); ?></div>
+<div class="personDiv"><span class="bold">Name:</span>&nbsp;<?php echo $this->person->getName(); ?></div>
+<div class="personColorDiv"><span class="bold">Firstname:</span>&nbsp;<?php echo $this->person->getFirstname(); ?></div>
+<div class="personDiv"><span class="bold">Street:</span>&nbsp;<?php echo $this->person->getStreet(); ?></div>
+<div class="personColorDiv"><span class="bold">Housenumber:</span>&nbsp;<?php echo $this->person->getHousenumber(); ?></div>
+<div class="personDiv"><span class="bold">City:</span>&nbsp;<?php echo $this->person->getCity(); ?></div>
+<div class="personColorDiv"><span class="bold">Postalcode:</span>&nbsp;<?php echo $this->person->getPostalcode(); ?></div>
+<div class="personDiv"><span class="bold">Email:</span>&nbsp;<?php echo $this->person->getEmail(); ?></div>
+<div class="personColorDiv"><span class="bold">Last Login Date:</span>&nbsp;<?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?></div>
+<div class="personDiv"><span class="bold">Register Date:</span>&nbsp;<?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?></div>
 <?php
 if(isset($this->groups)) {
 	?>
 <br />
-<div>Member in the following Groups:</div>
-<br />
+<h2>Member in the following Groups:</h2>
 <table>
 <?php
 foreach($this->groups as $group) {
 	?>
 	<tr>
 		<th>Title</th>
-		<th>Functions</th>
+		<th>Description</th>
+		<th>Leave</th>
 	</tr>
 	<tr>
 		<td><?php echo $group['title']; ?></td>
-		<td>
-		<form name="leaveGroup<?php echo $group['id']; ?>"
-			action="/dev/person/leave/" method="post"><input type="hidden"
-			name="groupID" value="<?php echo $group['id']; ?>" /> <a
-			href="javascript:document.leaveGroup<?php echo $group['id']; ?>.submit();">Remove
-		Membership</a></form>
+		<td><?php echo $group['description']; ?></td>
+		<td class='action'><a
+			href="<?php echo $this->url(
+					array(
+						'module'	=> 'dev',
+						'controller' => 'person',
+						'action'     => 'leave',
+						'membershipID'   =>  $group['membershipID']
+					),
+					'default',
+					true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
 		</td>
 	</tr>
 	<?php
@@ -72,8 +47,9 @@ foreach($this->groups as $group) {
 }
 ?>
 </table>
-<br />
-<div>
-<button onclick="location.href='/dev/person/request'">Add to additional
-Groups</button>
-</div>
+<?php echo $this->formButton('addtogroup', 'Add to additional
+Groups', array(
+							'onclick' => 'self.location="/dev/person/request/"',
+							'class' => 'addbutton'));
+?>
+<br /><br /><br /><br /><br />
\ No newline at end of file