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

4 files changed, 35 insertions, 14 deletions

diff --git a/application/views/scripts/bootiso/index.phtml b/application/views/scripts/bootiso/index.phtml
index d1b939a..171d85f 100644
--- a/application/views/scripts/bootiso/index.phtml
+++ b/application/views/scripts/bootiso/index.phtml
@@ -1,4 +1,11 @@
 <h1>BootISO</h1>
+
+<style>
+table{font-family:verdana;font-size:12px;}
+td{border:1px solid #CCC;}
+tr.entry{background-color:#E0ECF8;}
+</style>
+
 <table border=1>
   <tr>
     <th>ID</th>
@@ -12,7 +19,7 @@
     <th>Public</th>
   </tr>
   <?php foreach ($this->bootisolist as $bootiso): ?>
-  <tr>
+  <tr class=entry>
     <td><?php echo $this->escape($bootiso->getID()); ?></td>
     <td><?php echo $this->escape($bootiso->getTitle()); ?></td>
     <td><?php echo $this->escape($bootiso->getGroupID()); ?></td>
diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml
index e40ac90..a5c4fec 100644
--- a/application/views/scripts/bootmenu/index.phtml
+++ b/application/views/scripts/bootmenu/index.phtml
@@ -10,7 +10,7 @@ tr.bootentry{background-color:#E0ECF8;}
 
 <table border=1>
   <tr>
-    <th>ID</th>
+<!--<th>ID</th>-->
     <th>Title</th>
     <th>GroupID</th>
     <th>MembershipID</th>
@@ -18,12 +18,12 @@ tr.bootentry{background-color:#E0ECF8;}
   </tr>
   <?php foreach ($this->bootmenulist as $bootmenu): ?>
   <tr class=bootmenu>
-    <td><?php echo $this->escape($bootmenu->getID()); ?></td>
+    <!--<td><?php echo $this->escape($bootmenu->getID()); ?></td>-->
     <td><?php echo $this->escape($bootmenu->getTitle()); ?></td>
     <td><?php echo $this->escape($bootmenu->getGroupID()); ?></td>
     <td><?php echo $this->escape($bootmenu->getMembershipID()); ?></td>
     <td><?php echo $this->escape(date('Y-m-d H:i:s', $bootmenu->getCreated())); ?></td>
-    <td class=nostyle><a href="<?php echo $this->url(
+    <td><a href="<?php echo $this->url(
 					array(
 						'controller' => 'bootmenu',
 						'action'     => 'editbootmenu',
@@ -31,7 +31,7 @@ tr.bootentry{background-color:#E0ECF8;}
 					),
 					'default',
 					true, false) ?>">Edit Bootmenu</a></td>
-	<td class=nostyle><a href="<?php echo $this->url(
+	<td><a href="<?php echo $this->url(
 					array(
 						'controller' => 'bootmenu',
 						'action'     => 'deletebootmenu',
@@ -39,7 +39,7 @@ tr.bootentry{background-color:#E0ECF8;}
 					),
 					'default',
 					true) ?>">Delete Bootmenu</a></td>
-	<td class=nostyle><a href="<?php echo $this->url(
+	<td><a href="<?php echo $this->url(
 					array(
 						'controller' => 'bootmenu',
 						'action'     => 'addbootmenuentry',
@@ -50,9 +50,9 @@ tr.bootentry{background-color:#E0ECF8;}
   </tr>
   <tr>
   	<th></th>
-    <th>ID</th>
+<!--<th>ID</th>-->
     <th>Title</th>
-    <th>BootmenuID</th>
+<!--<th>BootmenuID</th>-->
     <th>BootOSID</th>
     <th>kcl</th>
     <th>ConfigID</th>
@@ -60,14 +60,14 @@ tr.bootentry{background-color:#E0ECF8;}
   </tr>
   	<?php foreach ($this->bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?>	
   	<tr class=bootentry><td class=nostyle></td>	
-		<td><?php echo $this->escape($bootmenuentry->getID()); ?></td>
+		<!--<td><?php echo $this->escape($bootmenuentry->getID()); ?></td>-->
 		<td><?php echo $this->escape($bootmenuentry->getTitle()); ?></td>
-		<td><?php echo $this->escape($bootmenuentry->getBootmenuID()); ?></td>
+		<!--<td><?php echo $this->escape($bootmenuentry->getBootmenuID()); ?></td>-->
 		<td><?php echo $this->escape($bootmenuentry->getBootosID()); ?></td>
 		<td><?php echo $this->escape($bootmenuentry->getkcl()); ?></td>
 		<td><?php echo $this->escape($bootmenuentry->getConfigID()); ?></td>
 		<td><?php echo $this->escape($bootmenuentry->getOrder()); ?></td>
-		<td class=nostyle><a href="<?php echo $this->url(
+		<td><a href="<?php echo $this->url(
 					array(
 						'controller' => 'bootmenu',
 						'action'     => 'editbootmenuentry',
@@ -76,7 +76,7 @@ tr.bootentry{background-color:#E0ECF8;}
 					),
 					'default',
 					true, false) ?>">Edit Entry</a></td>
-		<td class=nostyle><a href="<?php echo $this->url(
+		<td><a href="<?php echo $this->url(
 					array(
 						'controller' => 'bootmenu',
 						'action'     => 'removebootmenuentry',
diff --git a/application/views/scripts/bootos/index.phtml b/application/views/scripts/bootos/index.phtml
index f7f6e0f..86bcdff 100644
--- a/application/views/scripts/bootos/index.phtml
+++ b/application/views/scripts/bootos/index.phtml
@@ -1,4 +1,11 @@
 <h1>BootOS</h1>
+
+<style>
+table{font-family:verdana;font-size:12px;}
+td{border:1px solid #CCC;}
+tr.entry{background-color:#E0ECF8;}
+</style>
+
 <table border=1>
   <tr>
     <th>ID</th>
@@ -15,7 +22,7 @@
     <th>Public</th>
   </tr>
   <?php foreach ($this->bootoslist as $bootos): ?>
-  <tr>
+  <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>
diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml
index 5348387..e273b27 100644
--- a/application/views/scripts/config/index.phtml
+++ b/application/views/scripts/config/index.phtml
@@ -1,4 +1,11 @@
 <h1>Config</h1>
+
+<style>
+table{font-family:verdana;font-size:12px;}
+td{border:1px solid #CCC;}
+tr.entry{background-color:#E0ECF8;}
+</style>
+
 <table border=1>
   <tr>
     <th>ID</th>
@@ -9,7 +16,7 @@
     <th>Changed</th>
   </tr>
   <?php foreach ($this->configlist as $config): ?>
-  <tr>
+  <tr class=entry>
     <td><?php echo $this->escape($config->getID()); ?></td>
     <td><?php echo $this->escape($config->getTitle()); ?></td>
     <td><?php echo $this->escape($config->getGroupID()); ?></td>