oberfläche verändert

8 files changed, 43 insertions, 23 deletions

diff --git a/application/views/scripts/bootiso/index.phtml b/application/views/scripts/bootiso/index.phtml
index f529ff3..5b766a6 100644
--- a/application/views/scripts/bootiso/index.phtml
+++ b/application/views/scripts/bootiso/index.phtml
@@ -13,6 +13,7 @@
     <th>Created</th>    
     <th>Expires</th>
     <th>Public</th>
+ 	<th colspan=2>Actions</th>
   </tr>
   <?php foreach ($this->bootisolist as $bootiso): ?>
   <tr class=entry>
diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml
index 70bb134..7e3a92e 100644
--- a/application/views/scripts/bootmenu/index.phtml
+++ b/application/views/scripts/bootmenu/index.phtml
@@ -11,9 +11,10 @@
     <th>GroupID</th>
     <th>MembershipID</th>
     <th>Changed</th>
+ 	<th colspan=3>Actions</th>
   </tr>
   <?php foreach ($this->bootmenulist as $bootmenu): ?>
-  <tr class=bootmenu>
+  <tr class=entry>
     <td><?php echo $this->escape($bootmenu->getID()); ?></td>
     <td><?php echo $this->escape($bootmenu->getTitle()); ?></td>
     <td><?php echo $this->escape($bootmenu->getGroupID()); ?></td>
@@ -45,18 +46,23 @@
 					'default',
 					true) ?>">Add Entry</a></td>
   </tr>
-  <tr>
-  	<th></th>
+<?php if(count($this->bootmenuentrylist[$bootmenu->getID()]) > 0):?>
+  <tr class=detail>
+	<td></td>
+	<td colspan=7>
+	<table>
+	<tr>
 	<th>ID</th>
     <th>Title</th>
 <!--	<th>BootmenuID</th>-->
     <th>BootOSID</th>
     <th>kcl</th>
     <th>ConfigID</th>
-    <th>order</th>
+    <th>order</th>	
+ 	<th colspan=2>Actions</th>
   </tr>
   	<?php foreach ($this->bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?>	
-  	<tr class=bootentry><td class=nostyle></td>	
+  	<tr>
 		<td><?php echo $this->escape($bootmenuentry->getID()); ?></td>
 		<td><?php echo $this->escape($bootmenuentry->getTitle()); ?></td>
 		<!--<td><?php echo $this->escape($bootmenuentry->getBootmenuID()); ?></td>
@@ -85,6 +91,10 @@
 					true) ?>">Remove Entry</a></td>
 	</tr>
 	<?php endforeach; ?>
+	</table>
+	</td>
+	</tr>
+	<?php endif; ?>
   <?php endforeach; ?>
 </table>
 
diff --git a/application/views/scripts/bootos/index.phtml b/application/views/scripts/bootos/index.phtml
index fefd219..fd3e8cb 100644
--- a/application/views/scripts/bootos/index.phtml
+++ b/application/views/scripts/bootos/index.phtml
@@ -17,6 +17,7 @@
     <th>Changed</th>
     <th>Expires</th>
     <th>Public</th>
+ 	<th colspan=2>Actions</th>
   </tr>
   <?php foreach ($this->bootoslist as $bootos): ?>
   <tr class=entry>
diff --git a/application/views/scripts/client/index.phtml b/application/views/scripts/client/index.phtml
index e9de06b..9ef344b 100644
--- a/application/views/scripts/client/index.phtml
+++ b/application/views/scripts/client/index.phtml
@@ -6,12 +6,13 @@
 <?php if ($this->clients): ?>
     <table>
         <tr>
-            <th>clientID</th>
+            <th>ID</th>
 			<th>MAC</th>
 			<th>Hardwarehash</th>
+ 			<th colspan=2>Actions</th>
         </tr>
 	<?php foreach ($this->clients as $client): ?>
-	 	<tr class='client'>
+	 	<tr class=entry>
 			<td><?php echo $this->escape($client->getID()) ?></td>
 			<td class='monospace'><?php echo $this->escape($client->getMacadress()) ?></td>
 			<td class='monospace'><?php echo $this->escape($client->getHardwarehash()) ?></td>
diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml
index 62ab1d4..3e220a0 100644
--- a/application/views/scripts/config/index.phtml
+++ b/application/views/scripts/config/index.phtml
@@ -11,6 +11,7 @@
     <th>MembershipID</th>
     <th>Shellscript</th>
     <th>Changed</th>
+ 	<th colspan=2>Actions</th>
   </tr>
   <?php foreach ($this->configlist as $config): ?>
   <tr class=entry>
diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml
index 0de30a0..253d14d 100644
--- a/application/views/scripts/filter/index.phtml
+++ b/application/views/scripts/filter/index.phtml
@@ -6,13 +6,14 @@
 <?php if ($this->filters): ?>
     <table>
         <tr>
-            <th>filterID</th>
+            <th>ID</th>
 			<th>Title</th>
 			<th>Priority</th>
 			<th>TargetBootMenu</th>
+ 			<th colspan=3>Actions</th>
         </tr>
 	<?php foreach ($this->filters as $filter): ?>
-    <tr class='filter'>
+    <tr class='entry'>
 			<td><?php echo $this->escape($filter->getID()) ?></td>
             <td><?php echo $this->escape($filter->title) ?></td>
 			<td><?php echo $this->escape($filter->priority) ?></td>
@@ -42,20 +43,22 @@
 					'default',
 					true) ?>">add filterentry</a></td>
 			</tr>
-			<tr><td></td>
+			<tr class=detail>
+			<td></td>
 			<td colspan=6>
 				<?php
 					$fe = new Application_Model_FilterEntriesMapper();
 						#	print_a($erg = $fe->findBy('filterID',$filter->getID()));
 					$erg = $fe->findBy('filterID',$filter->getID());
 				?>	
-				<table style='width:100%;'>
+				<table>
 					<tr>
 						<th>Filtertype</th>
 						<th>Value</th>
 						<th>Value2</th>
+					 	<th colspan=2>Actions</th>
 					</tr>
-				<?php 					foreach ($erg as $filterentry): ?>
+				<?php foreach ($erg as $filterentry): ?>
 						
 						<tr>
 						<td><?php 
diff --git a/application/views/scripts/pool/index.phtml b/application/views/scripts/pool/index.phtml
index 2df3e52..68fcbc4 100644
--- a/application/views/scripts/pool/index.phtml
+++ b/application/views/scripts/pool/index.phtml
@@ -6,13 +6,14 @@
 <?php if ($this->pools): ?>
     <table >
         <tr>
-            <th>poolID</th>
+            <th>ID</th>
 			<th>Title</th>
 			<th>Description</th>
 			<th>Location</th>
+ 			<th colspan=3>Actions</th>
         </tr>
 	<?php foreach ($this->pools as $pool): ?>
-	 	<tr class='pool'>
+	 	<tr class=entry>
 			<td><?php echo $this->escape($pool->getID()) ?></td>
 			<td><?php echo $this->escape($pool->getTitle()) ?></td>
 			<td><?php echo $this->escape($pool->getDescription()) ?></td>
@@ -42,14 +43,15 @@
 						'default',
 						true) ?>">link client</a></td>
 		</tr>
-		<tr>
-		<td>
-		</td>
-		<td colspan=6><table>
+		<tr class=detail>
+		<td></td>
+		<td colspan=6>
+		<table>
 			<tr>
-				<th>clientID</th>
-				<th>mac</th>
-				<th>hardwarehash</th>
+				<th>ClientID</th>
+				<th>Mac</th>
+				<th>Hardwarehash</th>
+ 				<th>Actions</th>
 			</tr>
 		<?php
 		$poolentriesMapper = new Application_Model_PoolEntriesMapper();
diff --git a/application/views/scripts/session/index.phtml b/application/views/scripts/session/index.phtml
index 1d2506b..f98fa48 100644
--- a/application/views/scripts/session/index.phtml
+++ b/application/views/scripts/session/index.phtml
@@ -4,16 +4,17 @@
 							'class' => 'addbutton'))?>
 <table>
 <tr>
-	<th>SessionID</th>
+	<th>ID</th>
 	<th>ClientID</th>
 	<th>BootosID</th>
 	<th>BootIsoID</th>
 	<th>Time</th>
 	<th>IP</th>
 	<th>IPv6</th>
+ 	<th colspan=2>Actions</th>
 </tr>
 <?php foreach ($this->sessions as $session): ?>
-	<tr>
+	<tr class=entry>
 		<td><?php echo $this->escape($session->getID()) ?></td>
 		<td><?php echo $this->escape($session->getClientID()) ?></td>
 		<td><?php echo $this->escape($session->getBootosID()) ?></td>