From 75965675618c0d59ff97ed6cc8a1286d69ba1b8d Mon Sep 17 00:00:00 2001
From: Simon
Date: Fri, 18 Mar 2011 11:26:43 +0100
Subject: PoolController fertig

---
 application/modules/user/views/scripts/pool/index.phtml      | 7 ++++---
 application/modules/user/views/scripts/pool/linkclient.phtml | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'application/modules/user/views/scripts/pool')

diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml
index 05b880a..8ebabe8 100644
--- a/application/modules/user/views/scripts/pool/index.phtml
+++ b/application/modules/user/views/scripts/pool/index.phtml
@@ -1,4 +1,5 @@
 <h1>Pools</h1>
+<?php if($this->notification != ''){echo $this->notification;} ?>
 <?php echo $this->formButton('createconfig', 'Create Pool', array(
 							'onclick' => 'self.location="/user/pool/createpool"',
 							'class' => 'addbutton'))?>
@@ -14,7 +15,7 @@
         </tr>
 	<?php foreach ($this->pools as $pool): ?>
 	 	<tr class=entry>
-			<td><?php echo $this->escape($pool->getID()) ?></td>
+			<!--<td><?php echo $this->escape($pool->getID()) ?></td>-->
 			<td><?php echo $this->escape($pool->getTitle()) ?></td>
 			<td><?php echo $this->escape($pool->getDescription()) ?></td>
 			<td><?php echo $this->escape($pool->getLocation()) ?></td>
@@ -56,7 +57,7 @@
 		<td colspan=6>
 		<table>
 			<tr>
-				<th>ClientID</th>
+				<!-- <th>ClientID</th> -->
 				<th>Mac</th>
 				<th>Hardwarehash</th>
  				<th>Actions</th>
@@ -64,7 +65,7 @@
 		<?php
 		foreach ($clients as $client): ?>		
 		<tr>
-			<td><?php echo $client['clientID'];?></td>
+			<!-- <td><?php echo $client['clientID'];?></td> -->
 			<?php
 				$cli = new Application_Model_Client();
 				$clientMapper = new Application_Model_ClientMapper();
diff --git a/application/modules/user/views/scripts/pool/linkclient.phtml b/application/modules/user/views/scripts/pool/linkclient.phtml
index a2f9a6c..eebe111 100644
--- a/application/modules/user/views/scripts/pool/linkclient.phtml
+++ b/application/modules/user/views/scripts/pool/linkclient.phtml
@@ -1 +1,2 @@
-<br /><br /><center>View script for controller <b>Pool</b> and script/action name <b>linkpool</b></center>
\ No newline at end of file
+<?php
+echo $this->poolclient;
-- 
cgit v1.2.3-55-g7522


From 01fb4ed21df32100b28f63bc37b76c4083582ffd Mon Sep 17 00:00:00 2001
From: Simon
Date: Fri, 18 Mar 2011 12:03:50 +0100
Subject: Ansicht von Pools geändert

---
 application/modules/user/views/scripts/pool/index.phtml | 3 +++
 public/media/css/style.css                              | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'application/modules/user/views/scripts/pool')

diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml
index 8ebabe8..e1c0d7c 100644
--- a/application/modules/user/views/scripts/pool/index.phtml
+++ b/application/modules/user/views/scripts/pool/index.phtml
@@ -90,6 +90,8 @@
 	<?php endif;?>
     <?php endforeach ?> 
     </table>
+    
+<?php if (count($this->freeclients)>0): ?>
 <h2>Free clients</h2>
 <table >
 <tr>
@@ -124,6 +126,7 @@ foreach ($this->freeclients as $client): ?>
 	</tr>
 <?php endforeach ?> 
 </table>
+<?php endif;?>
 <?php else: ?>
 
  
diff --git a/public/media/css/style.css b/public/media/css/style.css
index 103ab3d..c9ad7e8 100644
--- a/public/media/css/style.css
+++ b/public/media/css/style.css
@@ -201,7 +201,7 @@ th {
 
 td {
 	font-size: 12px;
-	border: 1px solid #CCC;
+	border: 1px solid #CCC;	
 }
 
 .addbutton {
@@ -249,6 +249,9 @@ dl.zend_form dd * {
 tr.entry {
 	background-color: #FFF5CC;
 }
+tr.entry td{	
+	padding-left: 3px;
+}
 
 tr.detail>td {
 	border: none;
@@ -261,6 +264,7 @@ td.arrowtop {
 
 tr.detail table tr td {
 	background-color: #E2EFE1;
+	padding-left: 3px;
 }
 
 tr td.action {
@@ -326,4 +330,4 @@ td.action img {
 	background: #FFFFFF url('/media/img/box_info.png') no-repeat;
 	background-position: 10px center;
 	color: #777;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-55-g7522