Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

15 files changed, 242 insertions, 59 deletions

diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml
index f43949d..23f7780 100644
--- a/application/modules/user/views/scripts/bootiso/index.phtml
+++ b/application/modules/user/views/scripts/bootiso/index.phtml
@@ -1,19 +1,20 @@
 <h1>BootMedien</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+<?php echo $this->searchform; ?>
 <?php echo $this->formButton('createbootiso', 'Create BootISO', array(
 							'onclick' => 'self.location="/user/bootiso/createbootiso/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
 <table>
   <tr>
-    <th>ID</th>
-    <th>Title</th>
-    <th>GroupID</th>
-    <th>MembershipID</th>
-    <th>PrebootID</th>
-    <th>Serialnumber</th>
-    <th>Created</th>    
-    <th>Expires</th>
-    <th>Public</th>
+    <th>ID <span class='code'>bootosID</span></th>
+    <th>Title <span class='code'>title</span></th>
+    <th>GroupID <span class='code'>groupID</span></th>
+    <th>MembershipID <span class='code'>membershipID</span></th>
+    <th>PrebootID <span class='code'>prebootID</span></th>
+    <th>Serialnumber <span class='code'>serialnumber</span></th>
+    <th>Created <span class='code'>created</span></th>    
+    <th>Expires <span class='code'>expires</span></th>
+    <th>Public <span class='code'>public</span></th>
  	<th colspan=3>Actions</th>
   </tr>
   <?php if(count($this->bootisolist)==0)
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
index a43a058..b580237 100644
--- a/application/modules/user/views/scripts/bootmenu/index.phtml
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -1,14 +1,15 @@
 <h1>BootMenu</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+<?php echo $this->searchform; ?>
 <?php echo $this->formButton('createbootmenu', 'Create BootMenu', array(
 							'onclick' => 'self.location="/user/bootmenu/createbootmenu/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
 
 <table>
   <tr>
-	<th>ID</th>
-    <th>Title</th>
-    <th>Changed</th>
+	<th>ID <span class='code'>bootmenuID</span></th>
+    <th>Title <span class='code'>title</span></th>
+    <th>Changed <span class='code'>created</span></th>
  	<th colspan=3>Actions</th>
   </tr>
   <?php if(count($this->bootmenulist)==0)
diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml
index 8982fb2..a678cef 100644
--- a/application/modules/user/views/scripts/bootos/index.phtml
+++ b/application/modules/user/views/scripts/bootos/index.phtml
@@ -1,5 +1,6 @@
 <h1>BootOS</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+<?php echo $this->searchform; ?>
 <?php echo $this->formButton('checkupdate', 'Check for Updates', array(
 							'onclick' => 'self.location="/user/bootos/index/page/'.$this->page.'/checkupdate/true"',
 							'class' => 'updatebutton',
@@ -10,18 +11,18 @@
 
 <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>ID <span class='code'>bootosID</span></th>
+		<th>Title <span class='code'>title</span></th>
+		<th>GroupID <span class='code'>groupID</span></th>
+		<th>MembershipID <span class='code'>membershipID</span></th>
+		<th>ConfigID <span class='code'>configID</span></th>
+		<th>Init <span class='code'>init</span></th>
+		<th>Kernel <span class='code'>kernel</span></th>
+		<th>Kcl <span class='code'>kcl</span></th>
+		<th>Description <span class='code'>description</span></th>
+		<th>Changed <span class='code'>Changed</span></th>
+		<th>Expires <span class='code'>expires</span></th>
+		<th>Public <span class='code'>public</span></th>
 		<th colspan=3>Actions</th>
 	</tr>
 	<?php if(count($this->bootoslist)==0)
diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml
index 051ea90..95bf7a2 100644
--- a/application/modules/user/views/scripts/client/index.phtml
+++ b/application/modules/user/views/scripts/client/index.phtml
@@ -8,8 +8,8 @@
 <?php if ($this->clients): ?>
     <table>
         <tr>            
-			<th>MAC<span class='code'> [macadress]</span></th>
-			<th>Hardwarehash<span class='code'> [hardwarehash]</span></th>
+			<th>MAC <span class='code'>macadress</span></th>
+			<th>Hardwarehash <span class='code'>hardwarehash</span></th>
  			<th colspan=2>Actions</th>
         </tr>
 	<?php foreach ($this->clients as $client): ?>
diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml
index 478a12d..91177f4 100644
--- a/application/modules/user/views/scripts/config/index.phtml
+++ b/application/modules/user/views/scripts/config/index.phtml
@@ -1,16 +1,17 @@
 <h1>Config</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+<?php echo $this->searchform; ?>
 <?php echo $this->formButton('createconfig', 'Create Config', array(
 							'onclick' => 'self.location="/user/config/createconfig/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
 
 <table>
   <tr>
-    <th>ID</th>
-    <th>Title</th>
-    <th>GroupID</th>
-    <th>Shellscript</th>
-    <th>Changed</th>
+    <th>ID <span class='code'>configID</span></th>
+    <th>Title <span class='code'>title</span></th>
+    <th>GroupID <span class='code'>groupID</span></th>
+    <th>Shellscript <span class='code'>shellscript</span></th>
+    <th>Changed <span class='code'>created</span></th>
  	<th colspan=2>Actions</th>
   </tr>
   <?php if(count($this->configlist)==0)
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
index 9800d42..7f8bad8 100644
--- a/application/modules/user/views/scripts/filter/index.phtml
+++ b/application/modules/user/views/scripts/filter/index.phtml
@@ -1,5 +1,6 @@
 <h1>Filters</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+<?php echo $this->searchform; ?>
 <?php echo $this->formButton('createconfig', 'Create Filter', array(
 							'onclick' => 'self.location="/user/filter/addfilter/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
@@ -7,11 +8,11 @@
 <?php if ($this->filters): ?>
     <table>
         <tr>
-            <th>ID</th>
-			<th>Title</th>
-			<th>Description</th>
-			<th>Priority</th>
-			<th>TargetBootMenu</th>
+            <th>ID <span class='code'>filterID</span></th>
+			<th>Title <span class='code'>title</span></th>
+			<th>Description <span class='code'>description</span></th>
+			<th>Priority <span class='code'>priority</span></th>
+			<th>TargetBootMenu <span class='code'>bootmenuID</span></th>
  			<th colspan=3>Actions</th>
         </tr>
 	<?php foreach ($this->filters as $filter): ?>
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index d343204..9777b21 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -139,6 +139,3 @@ function printRoleSelect($roleList) {
 ?>
 <br />
 <br />
-<br />
-<br />
-<br />
diff --git a/application/modules/user/views/scripts/group/showall.phtml b/application/modules/user/views/scripts/group/showall.phtml
index e26e91e..e58e762 100644
--- a/application/modules/user/views/scripts/group/showall.phtml
+++ b/application/modules/user/views/scripts/group/showall.phtml
@@ -1,4 +1,4 @@
-<h1>Groups</h1>
+<h1>Groups Overview</h1>
 <?php echo $this->formButton('addgroup', 'Add Group', array(
 							'onclick' => 'self.location="/user/group/add"',
 							'class' => 'addbutton'))
@@ -77,3 +77,5 @@
 							'onclick' => 'self.location="/user/group/link"',
 							'class' => 'addbutton'))
 	?>
+<br />
+<br />
diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml
index cdf5c6b..715bd95 100644
--- a/application/modules/user/views/scripts/person/index.phtml
+++ b/application/modules/user/views/scripts/person/index.phtml
@@ -1,5 +1,5 @@
 <h1>Person</h1>
-<?php echo $this->formButton('editperson', 'Edit', array(
+<?php if($this->editRight === true) echo $this->formButton('editperson', 'Edit', array(
 							'onclick' => 'self.location="/user/person/edit/"',
 							'class' => 'rightbutton'))?>
 <br />
@@ -15,18 +15,23 @@
 <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($this->overviewRight === true) echo $this->formButton('showallperson', 'Show Personlist', array(
+							'onclick' => 'self.location="/user/person/showall/"',
+							'class' => 'rightbutton'));
 if(isset($this->groups)) {
 	?>
 <br />
 <h2>Member in the following Groups:</h2>
-	<?php echo $this->formButton('changeGroup', 'Select other Membership', array(
-							'onclick' => 'self.location="/user/person/changemembership"',
-							'class' => 'rightbutton'))?>
 <table>
 	<tr>
 		<th>Title</th>
 		<th>Description</th>
+		<?php if($this->leaveRight === true) {
+			?>
 		<th>Leave</th>
+		<?php
+		}
+		?>
 	</tr>
 	<?php
 	foreach($this->groups as $group) {
@@ -35,6 +40,8 @@ if(isset($this->groups)) {
 	<?php if($group['membershipID'] == $this->userIDsNamespace['membershipID']) echo 'class="selectedEntry"'; else echo 'class="entry"'; ?>>
 		<td><?php echo $group['title']; ?></td>
 		<td><?php echo $group['description']; ?></td>
+		<?php if($this->leaveRight === true) {
+			?>
 		<td class='action'><a
 			href="<?php echo $this->url(
 					array(
@@ -46,12 +53,15 @@ if(isset($this->groups)) {
 					'default',
 					true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
 		</td>
+		<?php
+		}
+		?>
 	</tr>
 	<?php
 	}
 	?>
 </table>
-	<?php echo $this->formButton('addtogroup', 'Add to additional
+	<?php if($this->groupRequestRight === true) echo $this->formButton('addtogroup', 'Add to additional
 Groups', array(
 							'onclick' => 'self.location="/user/person/request/"',
 							'class' => 'addbutton'));
@@ -59,6 +69,3 @@ Groups', array(
 ?>
 <br />
 <br />
-<br />
-<br />
-<br />
diff --git a/application/modules/user/views/scripts/person/show.phtml b/application/modules/user/views/scripts/person/show.phtml
new file mode 100644
index 0000000..a380b3c
--- /dev/null
+++ b/application/modules/user/views/scripts/person/show.phtml
@@ -0,0 +1,48 @@
+<h1>Person</h1>
+<?php if($this->editRight === true) echo $this->formButton('editperson', 'Edit', array(
+							'onclick' => 'self.location="/user/person/edit/personID/' . $this->personID . '"',
+							'class' => 'rightbutton')) ?>
+<?php if($this->deleteRight === true) echo $this->formButton('deleteperson', 'Delete', array(
+							'onclick' => 'self.location="/user/auth/delete/personID/' . $this->personID . '"',
+							'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($this->overviewRight === true) echo $this->formButton('showallperson', 'Show Personlist', array(
+							'onclick' => 'self.location="/user/person/showall/"',
+							'class' => 'rightbutton'));
+if(isset($this->groups)) {
+	?>
+<br />
+<h2>Member in the following Groups:</h2>
+<table>
+	<tr>
+		<th>Title</th>
+		<th>Description</th>
+	</tr>
+	<?php
+	foreach($this->groups as $group) {
+		?>
+	<tr class="entry">
+		<td><?php echo $group['title']; ?></td>
+		<td><?php echo $group['description']; ?></td>
+	</tr>
+	<?php
+	}
+	?>
+</table>
+	<?php
+}
+?>
+<br />
+<br />
diff --git a/application/modules/user/views/scripts/person/showall.phtml b/application/modules/user/views/scripts/person/showall.phtml
new file mode 100644
index 0000000..68e9e7c
--- /dev/null
+++ b/application/modules/user/views/scripts/person/showall.phtml
@@ -0,0 +1,117 @@
+<h1>Persons Overview</h1>
+<br />
+<br />
+<table>
+	<tr>
+		<th>Title</th>
+		<th>Name</th>
+		<th>Firstname</th>
+		<th>Email</th>
+		<?php
+		if($this->showRight === true || $this->editRight === true || $this->deleteRight === true) {
+			?>
+		<th colspan=3>Actions</th>
+		<?php
+		}
+		?>
+	</tr>
+	<?php
+	if(count($this->personList) > 0) {
+		foreach($this->personList as $person) {
+			?>
+	<tr
+	<?php if($person->getID() == $this->userIDsNamespace['personID']) echo 'class="selectedEntry"'; else echo 'class="entry"'; ?>>
+		<td><?php echo $person->getTitle(); ?></td>
+		<td><?php echo $person->getName(); ?></td>
+		<td><?php echo $person->getFirstname(); ?></td>
+		<td><?php echo $person->getEmail(); ?></td>
+		<?php
+		if($person->getID() == $this->userIDsNamespace['personID']) {
+			if($this->showRight === true) {
+				?>
+		<td class='action'><a
+			href="<?php echo $this->url(
+					array(
+						'module'	=> 'user',
+						'controller' => 'person',
+						'action'     => 'index'
+					),
+					'default',
+					true);?>"> <img src='/media/img/show.png' alt='Show Person' /></a></td>
+					<?php
+			}
+			if($this->editRight === true) { ?>
+		<td class='action'><a
+			href="<?php echo $this->url(
+					array(
+						'module'	=> 'user',
+						'controller' => 'person',
+						'action'     => 'edit'
+					),
+					'default',
+					true);?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a></td>
+					<?php
+			}
+			if($this->deleteRight === true) { ?>
+		<td class='action'><a
+			href="<?php echo $this->url(
+					array(
+						'module'	=> 'user',
+						'controller' => 'auth',
+						'action'     => 'delete'
+					),
+					'default',
+					true);?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a></td>
+					<?php
+			}
+		} else {
+			if($this->showOtherRight === true) {
+				?>
+		<td class='action'><a
+			href=" <?php echo $this->url(
+					array(
+						'module'	=> 'user',
+						'controller' => 'person',
+						'action'     => 'show',
+						'personID'   =>  $person->getID()
+					),
+					'default',
+					true); ?>"> <img src='/media/img/show.png' alt='Show Person' /></a></td>
+					<?php
+			}
+			if($this->editOtherRight === true) {
+				?>
+		<td class='action'><a
+			href=" <?php echo $this->url(
+					array(
+						'module'	=> 'user',
+						'controller' => 'person',
+						'action'     => 'edit',
+						'personID'   =>  $person->getID()
+					),
+					'default',
+					true); ?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a></td>
+					<?php
+			}
+			if($this->deleteOtherRight === true) {
+				?>
+		<td class='action'><a
+			href=" <?php echo $this->url(
+					array(
+						'module'	=> 'user',
+						'controller' => 'auth',
+						'action'     => 'delete',
+						'personID'   =>  $person->getID()
+					),
+					'default',
+					true); ?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a></td>
+					<?php
+			}
+		}
+		?>
+	</tr>
+	<?php
+		}
+	}
+	?>
+</table>
diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml
index 80053f2..f7d04e2 100644
--- a/application/modules/user/views/scripts/pool/index.phtml
+++ b/application/modules/user/views/scripts/pool/index.phtml
@@ -1,5 +1,6 @@
 <h1>Pools</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+<?php echo $this->searchform; ?>
 <?php echo $this->formButton('createconfig', 'Create Pool', array(
 							'onclick' => 'self.location="/user/pool/createpool/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
@@ -7,10 +8,10 @@
 <?php if ($this->pools): ?>
     <table >
         <tr>
-            <!--<th>ID</th>-->
-			<th>Title</th>
-			<th>Description</th>
-			<th>Location</th>
+            <!--<th>ID <span class='code'>poolID</span></th>-->
+			<th>Title <span class='code'>title</span></th>
+			<th>Description <span class='code'>description</span></th>
+			<th>Location <span class='code'>location</span></th>
  			<th colspan=3>Actions</th>
         </tr>
 	<?php foreach ($this->pools as $pool): ?>
diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml
index 9e73de1..295f1ca 100644
--- a/application/modules/user/views/scripts/preboot/index.phtml
+++ b/application/modules/user/views/scripts/preboot/index.phtml
@@ -1,5 +1,6 @@
 <h1>Preboot</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+<?php echo $this->searchform; ?>
 <?php echo $this->formButton('checkupdate', 'Check for Updates', array(
 							'onclick' => 'self.location="/user/preboot/index/checkupdate/true"',
 							'class' => 'updatebutton',
@@ -9,11 +10,11 @@
 							'class' => 'addbutton'))?>
 <table>
   <tr>
-    <th>ID</th>
-    <th>Title</th>
-    <th>GroupID</th>
-    <th>MembershipID</th>
-    <th>Preboot Path</th>
+    <th>ID <span class='code'>prebootID</span></th>
+    <th>Title <span class='code'>title</span></th>
+    <th>GroupID <span class='code'>groupID</span></th>
+    <th>MembershipID <span class='code'>membershipID</span></th>
+    <th>Preboot Path <span class='code'>path_preboot</span></th>
  	<th colspan=3>Actions</th>
   </tr>
   <?php if(count($this->prebootlist)==0)
diff --git a/application/modules/user/views/scripts/role/index.phtml b/application/modules/user/views/scripts/role/index.phtml
index db20aa2..a0b4284 100644
--- a/application/modules/user/views/scripts/role/index.phtml
+++ b/application/modules/user/views/scripts/role/index.phtml
@@ -56,4 +56,6 @@ if($this->userIDsNamespace['groupID']) {
 </table>
 	<?php
 }
-?>
\ No newline at end of file
+?>
+<br />
+<br />
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 6c6f8f5..6769336 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -88,4 +88,7 @@ if($this->roleID) {
 </center>
 		<?php
 	}
-}
\ No newline at end of file
+}
+?>
+<br />
+<br />