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

10 files changed, 71 insertions, 1 deletions

diff --git a/application/modules/user/views/scripts/client/addclient.phtml b/application/modules/user/views/scripts/client/addclient.phtml
new file mode 100644
index 0000000..13511fb
--- /dev/null
+++ b/application/modules/user/views/scripts/client/addclient.phtml
@@ -0,0 +1,3 @@
+<?php
+echo $this->addclient;
+?>
diff --git a/application/modules/user/views/scripts/client/editclient.phtml b/application/modules/user/views/scripts/client/editclient.phtml
new file mode 100644
index 0000000..2753a0f
--- /dev/null
+++ b/application/modules/user/views/scripts/client/editclient.phtml
@@ -0,0 +1,3 @@
+<?php
+echo $this->editclient;
+?>
diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml
index 4f0e6ec..dd791ad 100644
--- a/application/modules/user/views/scripts/client/index.phtml
+++ b/application/modules/user/views/scripts/client/index.phtml
@@ -1 +1,42 @@
-<br /><br /><center>View script for controller <b>Client</b> and script/action name <b>index</b></center>
\ No newline at end of file
+<h1>Clients</h1>
+<?php if($this->notification != ''){echo $this->notification;} ?>
+<?php echo $this->formButton('createbootos', 'Create Client', array(
+							'onclick' => 'self.location="/user/client/addclient"',
+							'class' => 'addbutton'))?>
+
+<?php if ($this->clients): ?>
+    <table>
+        <tr>            
+			<th>MAC</th>
+			<th>Hardwarehash</th>
+ 			<th colspan=2>Actions</th>
+        </tr>
+	<?php foreach ($this->clients as $client): ?>
+	 	<tr class=entry>
+			<td class='monospace'><?php echo $this->escape($client['macadress']) ?></td>
+			<td class='monospace'><?php echo $this->escape($client['hardwarehash']) ?></td>
+			<td class='action'><a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'client',
+							'action'     => 'editclient',
+							'clientID'	=> $client['clientID']
+						),
+						'default',
+						true) ?>"><img src='/media/img/edit.png' alt='Edit Client'/></a></td>
+			<td class='action'><a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'client',
+							'action'     => 'removeclient',
+							'clientID'	=> $client['clientID']
+						),
+						'default',
+						true) ?>"><img src='/media/img/delete.png' alt='Delete Client'/></a></td>
+		</tr>
+    <?php endforeach ?> 
+    </table>
+ 
+<?php else: ?>
+    <p>There are no clients to display.</p> 
+<?php endif;?>
diff --git a/application/modules/user/views/scripts/client/removeclient.phtml b/application/modules/user/views/scripts/client/removeclient.phtml
new file mode 100644
index 0000000..97254f6
--- /dev/null
+++ b/application/modules/user/views/scripts/client/removeclient.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Client</b> and script/action name <b>removeclient</b></center>
\ No newline at end of file
diff --git a/application/modules/user/views/scripts/index/index.phtml b/application/modules/user/views/scripts/index/index.phtml
index 57e6edb..a6e84a7 100644
--- a/application/modules/user/views/scripts/index/index.phtml
+++ b/application/modules/user/views/scripts/index/index.phtml
@@ -1 +1,18 @@
 <h1>Welcome</h1>
+
+<div class='infobox'>infobox: <?php echo $this->text;?></div>
+<div class='okbox'>okbox: <?php echo $this->text;?></div>
+<div class='warningbox'>warningbox: <?php echo $this->text;?></div>
+<div class='errorbox'>errorbox: <?php echo $this->text;?></div>
+<?php print_a($this->links);?>
+
+<?php if(count($this->links)>0 && is_array($this->links)): ?>
+<ul>
+<?php foreach($this->links as $link => $text):?>
+<li><a href='<?php echo $link;?>'><?php echo $text;?></a></li>
+
+<?php endforeach ?>
+</ul>
+
+<?php endif ?>
+
diff --git a/application/modules/user/views/scripts/pool/createpool.phtml b/application/modules/user/views/scripts/pool/createpool.phtml
new file mode 100644
index 0000000..3d7f8ca
--- /dev/null
+++ b/application/modules/user/views/scripts/pool/createpool.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Pool</b> and script/action name <b>createpool</b></center>
\ No newline at end of file
diff --git a/application/modules/user/views/scripts/pool/deletepool.phtml b/application/modules/user/views/scripts/pool/deletepool.phtml
new file mode 100644
index 0000000..622e663
--- /dev/null
+++ b/application/modules/user/views/scripts/pool/deletepool.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Pool</b> and script/action name <b>deletepool</b></center>
\ No newline at end of file
diff --git a/application/modules/user/views/scripts/pool/editpool.phtml b/application/modules/user/views/scripts/pool/editpool.phtml
new file mode 100644
index 0000000..c70464e
--- /dev/null
+++ b/application/modules/user/views/scripts/pool/editpool.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Pool</b> and script/action name <b>editpool</b></center>
\ No newline at end of file
diff --git a/application/modules/user/views/scripts/pool/linkclient.phtml b/application/modules/user/views/scripts/pool/linkclient.phtml
new file mode 100644
index 0000000..a2f9a6c
--- /dev/null
+++ b/application/modules/user/views/scripts/pool/linkclient.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Pool</b> and script/action name <b>linkpool</b></center>
\ No newline at end of file
diff --git a/application/modules/user/views/scripts/pool/unlinkclient.phtml b/application/modules/user/views/scripts/pool/unlinkclient.phtml
new file mode 100644
index 0000000..e1d5397
--- /dev/null
+++ b/application/modules/user/views/scripts/pool/unlinkclient.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Pool</b> and script/action name <b>unlinkpool</b></center>
\ No newline at end of file