From 1c83a304a1619de153649e14730aa05a07a87f10 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 15 Mar 2011 11:15:47 +0100
Subject: links korrigiert, dev ist nun lauffähig

---
 application/modules/dev/views/scripts/auth/login.phtml     | 2 +-
 application/modules/dev/views/scripts/bootiso/index.phtml  | 4 +++-
 application/modules/dev/views/scripts/bootmenu/index.phtml | 9 +++++++--
 application/modules/dev/views/scripts/bootos/index.phtml   | 4 +++-
 application/modules/dev/views/scripts/client/index.phtml   | 4 +++-
 application/modules/dev/views/scripts/config/index.phtml   | 4 +++-
 application/modules/dev/views/scripts/filter/index.phtml   | 9 +++++++--
 application/modules/dev/views/scripts/group/index.phtml    | 2 +-
 application/modules/dev/views/scripts/person/show.phtml    | 6 +++---
 application/modules/dev/views/scripts/pool/index.phtml     | 9 +++++++--
 application/modules/dev/views/scripts/session/index.phtml  | 4 +++-
 11 files changed, 41 insertions(+), 16 deletions(-)

(limited to 'application/modules/dev/views/scripts')

diff --git a/application/modules/dev/views/scripts/auth/login.phtml b/application/modules/dev/views/scripts/auth/login.phtml
index 4e642a3..815cda4 100644
--- a/application/modules/dev/views/scripts/auth/login.phtml
+++ b/application/modules/dev/views/scripts/auth/login.phtml
@@ -2,4 +2,4 @@
 $this->loginForm->setAction($this->url());
 echo $this->loginForm;
 ?>
-<div><button onclick="location.href='/auth/recoverpassword'">Recover Password</button></div>
\ No newline at end of file
+<div><button onclick="location.href='/dev/auth/recoverpassword'">Recover Password</button></div>
diff --git a/application/modules/dev/views/scripts/bootiso/index.phtml b/application/modules/dev/views/scripts/bootiso/index.phtml
index 5e7da1e..b119aff 100644
--- a/application/modules/dev/views/scripts/bootiso/index.phtml
+++ b/application/modules/dev/views/scripts/bootiso/index.phtml
@@ -1,6 +1,6 @@
 <h1>BootISO</h1>
 <?php echo $this->formButton('createbootiso', 'Create BootISO', array(
-							'onclick' => 'self.location="/bootiso/createbootiso"',
+							'onclick' => 'self.location="/dev/bootiso/createbootiso"',
 							'class' => 'addbutton'))?>
 <table>
   <tr>
@@ -30,6 +30,7 @@
     <td><?php echo $this->escape($bootiso->getPublic()); ?></td>
     <td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'bootiso',
 						'action'     => 'editbootiso',
 						'bootisoID'   =>  $bootiso->getID()
@@ -38,6 +39,7 @@
 					true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootISO' /></a></td>
 	<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'bootiso',
 						'action'     => 'deletebootiso',
 						'bootisoID'   =>  $bootiso->getID()
diff --git a/application/modules/dev/views/scripts/bootmenu/index.phtml b/application/modules/dev/views/scripts/bootmenu/index.phtml
index fa722e4..b29a5cc 100644
--- a/application/modules/dev/views/scripts/bootmenu/index.phtml
+++ b/application/modules/dev/views/scripts/bootmenu/index.phtml
@@ -1,6 +1,6 @@
 <h1>BootMenu</h1>
 <?php echo $this->formButton('createbootmenu', 'Create BootMenu', array(
-							'onclick' => 'self.location="/bootmenu/createbootmenu"',
+							'onclick' => 'self.location="/dev/bootmenu/createbootmenu"',
 							'class' => 'addbutton'))?>
 
 
@@ -24,6 +24,7 @@
     <td><?php echo $this->escape(date('Y-m-d H:i:s', $bootmenu->getCreated())); ?></td>
     <td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'bootmenu',
 						'action'     => 'editbootmenu',
 						'bootmenuID'   =>  $bootmenu->getID()
@@ -32,6 +33,7 @@
 					true, false) ?>"><img src='/media/img/edit.png' alt='Edit Bootmenu'/></a></td>
 	<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'bootmenu',
 						'action'     => 'deletebootmenu',
 						'bootmenuID'   =>  $bootmenu->getID()
@@ -40,6 +42,7 @@
 					true) ?>"><img src='/media/img/delete.png' alt='Delete Bootmenu'/></a></td>
 	<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'bootmenu',
 						'action'     => 'addbootmenuentry',
 						'bootmenuID'   =>  $bootmenu->getID(),
@@ -72,7 +75,7 @@
   	<?php $config = $this->configmapper->find($bootmenuentry->getConfigID());?>
   	<tr>
 		<td class='action'>
-			<a href='/resource/getbootmenuentry/bootmenuentryID/<?php echo $bootmenuentry->getID();?>'>
+			<a href='/dev/resource/getbootmenuentry/bootmenuentryID/<?php echo $bootmenuentry->getID();?>'>
 				<img src='/media/img/play.gif'>
 			</a>
 		</td>
@@ -85,6 +88,7 @@
 		<td><?php echo $this->escape($bootmenuentry->getOrder() + 1); ?></td>
 		<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'bootmenu',
 						'action'     => 'editbootmenuentry',
 						'bootmenuentryID'   =>  $bootmenuentry->getID(),
@@ -96,6 +100,7 @@
 					true, false) ?>"><img src='/media/img/edit.png' alt='Edit Entry'/></a></td>
 		<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'bootmenu',
 						'action'     => 'removebootmenuentry',
 						'bootmenuentryID'   =>  $bootmenuentry->getID()
diff --git a/application/modules/dev/views/scripts/bootos/index.phtml b/application/modules/dev/views/scripts/bootos/index.phtml
index 6da7a16..6462b1f 100644
--- a/application/modules/dev/views/scripts/bootos/index.phtml
+++ b/application/modules/dev/views/scripts/bootos/index.phtml
@@ -1,6 +1,6 @@
 <h1>BootOS</h1>
 <?php echo $this->formButton('createbootos', 'Create BootOS', array(
-							'onclick' => 'self.location="/bootos/createbootos"',
+							'onclick' => 'self.location="/dev/bootos/createbootos"',
 							'class' => 'addbutton'))?>
 
 <table>
@@ -37,6 +37,7 @@
     <td><?php echo $this->escape($bootos->getPublic()); ?></td>
     <td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'bootos',
 						'action'     => 'editbootos',
 						'bootosID'   =>  $bootos->getID()
@@ -45,6 +46,7 @@
 					true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootOS'/></a></td>
 	<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'bootos',
 						'action'     => 'deletebootos',
 						'bootosID'   =>  $bootos->getID()
diff --git a/application/modules/dev/views/scripts/client/index.phtml b/application/modules/dev/views/scripts/client/index.phtml
index fd7725c..fa12ed7 100644
--- a/application/modules/dev/views/scripts/client/index.phtml
+++ b/application/modules/dev/views/scripts/client/index.phtml
@@ -1,6 +1,6 @@
 <h1>Clients</h1>
 <?php echo $this->formButton('createbootos', 'Create Client', array(
-							'onclick' => 'self.location="/client/addclient"',
+							'onclick' => 'self.location="/dev/client/addclient"',
 							'class' => 'addbutton'))?>
 
 <?php if ($this->clients): ?>
@@ -18,6 +18,7 @@
 			<td class='monospace'><?php echo $this->escape($client->getHardwarehash()) ?></td>
 			<td class='action'><a href="<?php echo $this->url(
 						array(
+							'module'	=> 'dev',
 							'controller' => 'client',
 							'action'     => 'editclient',
 							'clientID'	=> $client->getID()
@@ -26,6 +27,7 @@
 						true) ?>"><img src='/media/img/edit.png' alt='Edit Client'/></a></td>
 			<td class='action'><a href="<?php echo $this->url(
 						array(
+							'module'	=> 'dev',
 							'controller' => 'client',
 							'action'     => 'removeclient',
 							'clientID'	=> $client->getID()
diff --git a/application/modules/dev/views/scripts/config/index.phtml b/application/modules/dev/views/scripts/config/index.phtml
index 5562b86..2191f6a 100644
--- a/application/modules/dev/views/scripts/config/index.phtml
+++ b/application/modules/dev/views/scripts/config/index.phtml
@@ -1,6 +1,6 @@
 <h1>Config</h1>
 <?php echo $this->formButton('createconfig', 'Create Config', array(
-							'onclick' => 'self.location="/config/createconfig"',
+							'onclick' => 'self.location="/dev/config/createconfig"',
 							'class' => 'addbutton'))?>
 
 <table>
@@ -25,6 +25,7 @@
     <td><?php echo $this->escape(date('Y-m-d H:i:s', $config->getCreated())); ?></td>
     <td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'config',
 						'action'     => 'editconfig',
 						'configID'   =>  $config->getID()
@@ -33,6 +34,7 @@
 					true, false) ?>"><img src='/media/img/edit.png' alt='Edit Config'/></a></td>
 	<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'config',
 						'action'     => 'deleteconfig',
 						'configID'   =>  $config->getID()
diff --git a/application/modules/dev/views/scripts/filter/index.phtml b/application/modules/dev/views/scripts/filter/index.phtml
index 188bed3..df97000 100644
--- a/application/modules/dev/views/scripts/filter/index.phtml
+++ b/application/modules/dev/views/scripts/filter/index.phtml
@@ -1,6 +1,6 @@
 <h1>Filters</h1>
 <?php echo $this->formButton('createconfig', 'Create Filter', array(
-							'onclick' => 'self.location="/filter/addfilter"',
+							'onclick' => 'self.location="/dev/filter/addfilter"',
 							'class' => 'addbutton'))?>
 
 <?php if ($this->filters): ?>
@@ -22,6 +22,7 @@
 			<td><?php echo $this->escape($filter->bootmenuID) ?></td>
 			<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'filter',
 						'action'     => 'editfilter',
 						'filterID'	=> $filter->getID()
@@ -30,6 +31,7 @@
 					true) ?>"><img src='/media/img/edit.png' alt='Edit Filter'/></a></td>
 			<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'filter',
 						'action'     => 'removefilter',
 						'filterID'	=> $filter->getID()
@@ -38,6 +40,7 @@
 					true) ?>"><img src='/media/img/delete.png' alt='Delete Filter'/></a></td>
 			<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'filter',
 						'action'     => 'addfilterentry',
 						'filterID'	=> $filter->getID()
@@ -82,6 +85,7 @@
 						<td><?php echo $filterentry['filtervalue2'];?></td>
 						<td class='action'><a href="<?php echo $this->url(
 						array(
+							'module'	=> 'dev',
 							'controller' => 'filter',
 							'action'     => 'editfilterentry',
 							'filterentriesID'	=> $filterentry['filterentriesID']
@@ -90,6 +94,7 @@
 						true) ?>"><img src='/media/img/edit.png' alt='Edit Filterentry'/></a>
 						<td class='action'><a href="<?php echo $this->url(
 						array(
+							'module'	=> 'dev',
 							'controller' => 'filter',
 							'action'     => 'removefilterentry',
 							'filterentriesID'	=> $filterentry['filterentriesID']
@@ -113,5 +118,5 @@
  
 <?php endif;?>
 <?php echo $this->formButton('createconfig', 'Test Filters', array(
-							'onclick' => 'self.location="/filter/testevaluate"',
+							'onclick' => 'self.location="/dev/filter/testevaluate"',
 							'class' => 'addbutton'))?>
diff --git a/application/modules/dev/views/scripts/group/index.phtml b/application/modules/dev/views/scripts/group/index.phtml
index b8178dc..d1faf04 100644
--- a/application/modules/dev/views/scripts/group/index.phtml
+++ b/application/modules/dev/views/scripts/group/index.phtml
@@ -31,5 +31,5 @@
 </table>
 <br />
 <div>
-<button onclick="location.href='/group/link'">Link Groups</button>
+<button onclick="location.href='/dev/group/link'">Link Groups</button>
 </div>
diff --git a/application/modules/dev/views/scripts/person/show.phtml b/application/modules/dev/views/scripts/person/show.phtml
index 5386c06..945bb61 100644
--- a/application/modules/dev/views/scripts/person/show.phtml
+++ b/application/modules/dev/views/scripts/person/show.phtml
@@ -1,5 +1,5 @@
 <div align="right">
-<button onclick="location.href='/person/edit'">Edit</button>
+<button onclick="location.href='/dev/person/edit'">Edit</button>
 </div>
 <table>
 	<tr>
@@ -61,7 +61,7 @@ foreach($this->groups as $group) {
 		<td><?php echo $group['title']; ?></td>
 		<td>
 		<form name="leaveGroup<?php echo $group['id']; ?>"
-			action="/person/leave/" method="post"><input type="hidden"
+			action="/dev/person/leave/" method="post"><input type="hidden"
 			name="groupID" value="<?php echo $group['id']; ?>" /> <a
 			href="javascript:document.leaveGroup<?php echo $group['id']; ?>.submit();">Remove
 		Membership</a></form>
@@ -74,6 +74,6 @@ foreach($this->groups as $group) {
 </table>
 <br />
 <div>
-<button onclick="location.href='/person/request'">Add to additional
+<button onclick="location.href='/dev/person/request'">Add to additional
 Groups</button>
 </div>
diff --git a/application/modules/dev/views/scripts/pool/index.phtml b/application/modules/dev/views/scripts/pool/index.phtml
index 2c6ba16..06764d0 100644
--- a/application/modules/dev/views/scripts/pool/index.phtml
+++ b/application/modules/dev/views/scripts/pool/index.phtml
@@ -1,6 +1,6 @@
 <h1>Pools</h1>
 <?php echo $this->formButton('createconfig', 'Create Pool', array(
-							'onclick' => 'self.location="/pool/createpool"',
+							'onclick' => 'self.location="/dev/pool/createpool"',
 							'class' => 'addbutton'))?>
 
 <?php if ($this->pools): ?>
@@ -20,6 +20,7 @@
 			<td><?php echo $this->escape($pool->getLocation()) ?></td>
 			<td class='action'><a href="<?php echo $this->url(
 						array(
+							'module'	=> 'dev',
 							'controller' => 'pool',
 							'action'     => 'editpool',
 							'poolID'	=> $pool->getID()
@@ -27,7 +28,8 @@
 						'default',
 						true) ?>"><img src='/media/img/edit.png' alt='Edit Pool'/></a></td>
 			<td class='action'><a href="<?php echo $this->url(
-						array(
+						array(							
+							'module'	=> 'dev',
 							'controller' => 'pool',
 							'action'     => 'deletepool',
 							'poolID'	=> $pool->getID()
@@ -36,6 +38,7 @@
 						true) ?>"><img src='/media/img/delete.png' alt='Delete Pool'/></a></td>
 			<td class='action'><a href="<?php echo $this->url(
 						array(
+							'module'	=> 'dev',
 							'controller' => 'pool',
 							'action'     => 'linkclient',
 							'poolID'	=> $pool->getID()
@@ -71,6 +74,7 @@
 			<td><?php echo ($cli->hardwarehash); ?></td>
 			<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'pool',
 						'action'     => 'unlinkclient',
 						'poolentriesID'	=> $client['poolentriesID']
@@ -104,6 +108,7 @@ foreach ($this->freeclients as $client): ?>
 		<?php foreach ($this->pools as $pool): ?>
 			<option value="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'pool',
 						'action'     => 'linkclient',
 						'clientID'	=> $client['clientID'],
diff --git a/application/modules/dev/views/scripts/session/index.phtml b/application/modules/dev/views/scripts/session/index.phtml
index c9f726b..32f9ae9 100644
--- a/application/modules/dev/views/scripts/session/index.phtml
+++ b/application/modules/dev/views/scripts/session/index.phtml
@@ -1,6 +1,6 @@
 <h1>Session</h1>
 <?php echo $this->formButton('createconfig', 'Create Session', array(
-							'onclick' => 'self.location="/session/createsession"',
+							'onclick' => 'self.location="/dev/session/createsession"',
 							'class' => 'addbutton'))?>
 <table>
 <tr>
@@ -30,6 +30,7 @@
 		<td><?php echo $this->escape($session->getIp6()) ?></td>
 		<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'session',
 						'action'     => 'editsession',
 						'sessionID'	=> $session->getID()
@@ -38,6 +39,7 @@
 					true) ?>"><img src='/media/img/edit.png' alt='Edit Filter'/></a></td>
 		<td class='action'><a href="<?php echo $this->url(
 					array(
+						'module'	=> 'dev',
 						'controller' => 'session',
 						'action'     => 'deletesession',
 						'sessionID'	=> $session->getID()
-- 
cgit v1.2.3-55-g7522