From b5cbdd6b400aa1ec77c9846e9cc8d4257f437e3c Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 14 Mar 2011 16:09:03 +0100 Subject: Application in 3 Modules gesplittet, Dev = unsere entwicklungsumgebung, user = die weboberfläche fr anwender mit acl etc, fbgui = für die fbgui truppe - links in dev müssen noch angepasst werden --- .../views/scripts/bootmenu/addbootmenuentry.phtml | 4 + .../views/scripts/bootmenu/createbootmenu.phtml | 4 + .../dev/views/scripts/bootmenu/editbootmenu.phtml | 4 + .../views/scripts/bootmenu/editbootmenuentry.phtml | 4 + .../modules/dev/views/scripts/bootmenu/index.phtml | 119 +++++++++++++++++++++ 5 files changed, 135 insertions(+) create mode 100644 application/modules/dev/views/scripts/bootmenu/addbootmenuentry.phtml create mode 100644 application/modules/dev/views/scripts/bootmenu/createbootmenu.phtml create mode 100644 application/modules/dev/views/scripts/bootmenu/editbootmenu.phtml create mode 100644 application/modules/dev/views/scripts/bootmenu/editbootmenuentry.phtml create mode 100644 application/modules/dev/views/scripts/bootmenu/index.phtml (limited to 'application/modules/dev/views/scripts/bootmenu') diff --git a/application/modules/dev/views/scripts/bootmenu/addbootmenuentry.phtml b/application/modules/dev/views/scripts/bootmenu/addbootmenuentry.phtml new file mode 100644 index 0000000..914cc9c --- /dev/null +++ b/application/modules/dev/views/scripts/bootmenu/addbootmenuentry.phtml @@ -0,0 +1,4 @@ +addbootmenuentryForm->setAction($this->url()); +echo $this->addbootmenuentryForm; +?> \ No newline at end of file diff --git a/application/modules/dev/views/scripts/bootmenu/createbootmenu.phtml b/application/modules/dev/views/scripts/bootmenu/createbootmenu.phtml new file mode 100644 index 0000000..2d2c2df --- /dev/null +++ b/application/modules/dev/views/scripts/bootmenu/createbootmenu.phtml @@ -0,0 +1,4 @@ +createbootmenuForm->setAction($this->url()); +echo $this->createbootmenuForm; +?> diff --git a/application/modules/dev/views/scripts/bootmenu/editbootmenu.phtml b/application/modules/dev/views/scripts/bootmenu/editbootmenu.phtml new file mode 100644 index 0000000..b7adc4a --- /dev/null +++ b/application/modules/dev/views/scripts/bootmenu/editbootmenu.phtml @@ -0,0 +1,4 @@ +editbootmenuForm->setAction($this->url()); +echo $this->editbootmenuForm; +?> diff --git a/application/modules/dev/views/scripts/bootmenu/editbootmenuentry.phtml b/application/modules/dev/views/scripts/bootmenu/editbootmenuentry.phtml new file mode 100644 index 0000000..5680d65 --- /dev/null +++ b/application/modules/dev/views/scripts/bootmenu/editbootmenuentry.phtml @@ -0,0 +1,4 @@ +editbootmenuentryForm->setAction($this->url()); +echo $this->editbootmenuentryForm; +?> \ No newline at end of file diff --git a/application/modules/dev/views/scripts/bootmenu/index.phtml b/application/modules/dev/views/scripts/bootmenu/index.phtml new file mode 100644 index 0000000..fa722e4 --- /dev/null +++ b/application/modules/dev/views/scripts/bootmenu/index.phtml @@ -0,0 +1,119 @@ +

BootMenu

+formButton('createbootmenu', 'Create BootMenu', array( + 'onclick' => 'self.location="/bootmenu/createbootmenu"', + 'class' => 'addbutton'))?> + + + + + + + + + + + + bootmenulist)==0) + echo "
IDTitleGroupIDMembershipIDChangedActions
There are no BootMenus to display." ?> + bootmenulist as $bootmenu): ?> + + escape($bootmenu->getID()); ?> + escape($bootmenu->getTitle()); ?> + escape($bootmenu->getGroupID()); ?> + escape($bootmenu->getMembershipID()); ?> + escape(date('Y-m-d H:i:s', $bootmenu->getCreated())); ?> + Edit Bootmenu + Delete Bootmenu + Add Entry + + +bootmenuentrylist[$bootmenu->getID()]) > 0):?> + + ↳ + + + + + + + + + + + + + + + + bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?> + bootosmapper->find($bootmenuentry->getBootosID());?> + configmapper->find($bootmenuentry->getConfigID());?> + + + + + + + + + + + + +
IDTitleBootOSkclConfigPositionActions
+ + + + escape($bootmenuentry->getID()); ?>escape($bootmenuentry->getTitle()); ?>escape($bootmenuentry->getBootosID()."] ". $bootos->getTitle()); ?>escape($bootmenuentry->getkcl()); ?>escape($bootmenuentry->getConfigID()."] ". $config->getTitle()); ?>escape($bootmenuentry->getOrder() + 1); ?>Edit EntryRemove Entry
+ + + + + + + + + + + + -- cgit v1.2.3-55-g7522 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/controllers/AuthController.php | 4 ++-- .../modules/dev/controllers/BootisoController.php | 10 +++++----- .../modules/dev/controllers/BootmenuController.php | 16 ++++++++-------- .../modules/dev/controllers/BootosController.php | 10 +++++----- .../modules/dev/controllers/ClientController.php | 6 +++--- .../modules/dev/controllers/ConfigController.php | 10 +++++----- .../modules/dev/controllers/FilterController.php | 17 +++++++---------- application/modules/dev/controllers/GroupController.php | 2 +- .../modules/dev/controllers/PersonController.php | 4 ++-- application/modules/dev/controllers/PoolController.php | 10 +++++----- application/modules/dev/controllers/RoleController.php | 2 +- .../modules/dev/controllers/SessionController.php | 6 +++--- application/modules/dev/views/scripts/auth/login.phtml | 2 +- .../modules/dev/views/scripts/bootiso/index.phtml | 4 +++- .../modules/dev/views/scripts/bootmenu/index.phtml | 9 +++++++-- .../modules/dev/views/scripts/bootos/index.phtml | 4 +++- .../modules/dev/views/scripts/client/index.phtml | 4 +++- .../modules/dev/views/scripts/config/index.phtml | 4 +++- .../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 +++++++-- .../modules/dev/views/scripts/session/index.phtml | 4 +++- 23 files changed, 88 insertions(+), 66 deletions(-) (limited to 'application/modules/dev/views/scripts/bootmenu') diff --git a/application/modules/dev/controllers/AuthController.php b/application/modules/dev/controllers/AuthController.php index 32783c9..49640c0 100644 --- a/application/modules/dev/controllers/AuthController.php +++ b/application/modules/dev/controllers/AuthController.php @@ -54,7 +54,7 @@ class dev_AuthController extends Zend_Controller_Action $date = new DateTime(); $person->setLogindate($date->getTimestamp()); $this->personmapper->save($person); - $this->_redirect('/'); + $this->_redirect('/dev/'); return; } else { echo "Wrong Email or Password."; @@ -96,7 +96,7 @@ class dev_AuthController extends Zend_Controller_Action return; } echo "Successfully registered.
"; - echo "Continue to Login: Login"; + echo "Continue to Login: Login"; $this->_helper->redirector('login', 'auth'); return; } diff --git a/application/modules/dev/controllers/BootisoController.php b/application/modules/dev/controllers/BootisoController.php index 770271d..2b0e624 100644 --- a/application/modules/dev/controllers/BootisoController.php +++ b/application/modules/dev/controllers/BootisoController.php @@ -49,7 +49,7 @@ class dev_BootisoController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootiso'); + $this->_redirect('/dev/bootiso'); } } @@ -64,7 +64,7 @@ class dev_BootisoController extends Zend_Controller_Action if (!isset($_POST["editbootiso"])){ $bootisoID = $this->_request->getParam('bootisoID'); if (!isset($bootisoID) || !is_numeric($bootisoID)){ - $this->_redirect('/bootiso'); + $this->_redirect('/dev/bootiso'); } else { $bootiso = new Application_Model_BootIso(); $bootisomapper = new Application_Model_BootIsoMapper(); @@ -92,7 +92,7 @@ class dev_BootisoController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootiso'); + $this->_redirect('/dev/bootiso'); } } @@ -104,14 +104,14 @@ class dev_BootisoController extends Zend_Controller_Action { $bootisoID = $this->_request->getParam('bootisoID'); if (!isset($bootisoID)){ - $this->_redirect('/bootiso'); + $this->_redirect('/dev/bootiso'); } else { $bootiso = new Application_Model_BootIso(); $bootiso->setID($bootisoID); $bootisomapper = new Application_Model_BootIsoMapper(); $bootisomapper->delete($bootiso); } - $this->_redirect('/bootiso'); + $this->_redirect('/dev/bootiso'); } diff --git a/application/modules/dev/controllers/BootmenuController.php b/application/modules/dev/controllers/BootmenuController.php index f47b78c..07924d4 100644 --- a/application/modules/dev/controllers/BootmenuController.php +++ b/application/modules/dev/controllers/BootmenuController.php @@ -123,7 +123,7 @@ class dev_BootmenuController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } } @@ -156,7 +156,7 @@ class dev_BootmenuController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } } @@ -201,7 +201,7 @@ class dev_BootmenuController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } } @@ -221,7 +221,7 @@ class dev_BootmenuController extends Zend_Controller_Action if (!isset($_POST["editbootmenuentry"])){ $bootmenuentryID = $this->_request->getParam('bootmenuentryID'); if (!isset($bootmenuentryID) || !is_numeric($bootmenuentryID)){ - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } else { $bootmenuentrymapper->find($bootmenuentryID, $bootmenuentry); @@ -262,7 +262,7 @@ class dev_BootmenuController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } } @@ -283,21 +283,21 @@ class dev_BootmenuController extends Zend_Controller_Action $bootmenuentrymapper->delete($bootmenuentry); $bootmenuentrymapper->orderremove($bootmenuentry); } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } public function deletebootmenuAction() { $bootmenuID = $this->_request->getParam('bootmenuID'); if (!isset($bootmenuID) || !is_numeric($bootmenuID)){ - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } else { $bootmenu = new Application_Model_BootMenu(); $bootmenu->setID($bootmenuID); $bootmenumapper = new Application_Model_BootMenuMapper(); $bootmenumapper->delete($bootmenu); } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } private function arrayDiff($a, $b){ diff --git a/application/modules/dev/controllers/BootosController.php b/application/modules/dev/controllers/BootosController.php index 00c2297..36c1cf5 100644 --- a/application/modules/dev/controllers/BootosController.php +++ b/application/modules/dev/controllers/BootosController.php @@ -70,7 +70,7 @@ class dev_BootosController extends Zend_Controller_Action } - $this->_redirect('/bootos'); + $this->_redirect('/dev/bootos'); } } @@ -86,7 +86,7 @@ class dev_BootosController extends Zend_Controller_Action if (!isset($_POST["editbootos"])){ $bootosID = $this->_request->getParam('bootosID'); if (!isset($bootosID) || !is_numeric($bootosID)){ - $this->_redirect('/bootos'); + $this->_redirect('/dev/bootos'); } else { $bootos = new Application_Model_BootOs(); $bootosmapper = new Application_Model_BootOsMapper(); @@ -116,7 +116,7 @@ class dev_BootosController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootos'); + $this->_redirect('/dev/bootos'); } } @@ -129,14 +129,14 @@ class dev_BootosController extends Zend_Controller_Action { $bootosID = $this->_request->getParam('bootosID'); if (!isset($bootosID)){ - $this->_redirect('/bootos'); + $this->_redirect('/dev/bootos'); } else { $bootos = new Application_Model_BootOs(); $bootos->setID($bootosID); $bootosmapper = new Application_Model_BootOsMapper(); $bootosmapper->delete($bootos); } - $this->_redirect('/bootos'); + $this->_redirect('/dev/bootos'); } diff --git a/application/modules/dev/controllers/ClientController.php b/application/modules/dev/controllers/ClientController.php index b6bcb7e..d73379c 100644 --- a/application/modules/dev/controllers/ClientController.php +++ b/application/modules/dev/controllers/ClientController.php @@ -34,7 +34,7 @@ class dev_ClientController extends Zend_Controller_Action $clientmapper = new Application_Model_ClientMapper(); $clientmapper->save($client); print_a('inserted'); - $this->_redirect('/client'); + $this->_redirect('/dev/client'); } $this->view->addclient = $addclient; } @@ -50,7 +50,7 @@ class dev_ClientController extends Zend_Controller_Action $clientMapper = new Application_Model_ClientMapper(); $clientMapper->delete($removeClient); } - $this->_redirect('/client'); + $this->_redirect('/dev/client'); } public function editclientAction() @@ -73,7 +73,7 @@ class dev_ClientController extends Zend_Controller_Action $clientmapper = new Application_Model_ClientMapper(); $clientmapper->save($client); print_a('updated'); - $this->_redirect('/client'); + $this->_redirect('/dev/client'); } $this->view->editclient = $editclient; } diff --git a/application/modules/dev/controllers/ConfigController.php b/application/modules/dev/controllers/ConfigController.php index 5528b28..47b9eeb 100644 --- a/application/modules/dev/controllers/ConfigController.php +++ b/application/modules/dev/controllers/ConfigController.php @@ -50,7 +50,7 @@ class dev_ConfigController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/config'); + $this->_redirect('/dev/config'); } } @@ -65,7 +65,7 @@ class dev_ConfigController extends Zend_Controller_Action if (!isset($_POST["editconfig"])){ $configID = $this->_request->getParam('configID'); if (!isset($configID) || !is_numeric($configID)){ - $this->_redirect('/config'); + $this->_redirect('/dev/config'); } else { $config = new Application_Model_Config(); $configmapper = new Application_Model_ConfigMapper(); @@ -93,7 +93,7 @@ class dev_ConfigController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/config'); + $this->_redirect('/dev/config'); } } @@ -105,14 +105,14 @@ class dev_ConfigController extends Zend_Controller_Action { $configID = $this->_request->getParam('configID'); if (!isset($configID)){ - $this->_redirect('/config'); + $this->_redirect('/dev/config'); } else { $config = new Application_Model_Config(); $config->setID($configID); $configmapper = new Application_Model_ConfigMapper(); $configmapper->delete($config); } - $this->_redirect('/config'); + $this->_redirect('/dev/config'); } diff --git a/application/modules/dev/controllers/FilterController.php b/application/modules/dev/controllers/FilterController.php index e6978ab..b346810 100644 --- a/application/modules/dev/controllers/FilterController.php +++ b/application/modules/dev/controllers/FilterController.php @@ -50,7 +50,7 @@ class dev_FilterController extends Zend_Controller_Action $newfilter2 = new Application_Model_FilterMapper(); $newfilter2->save($newfilter); - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); return; }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; @@ -70,7 +70,7 @@ class dev_FilterController extends Zend_Controller_Action $filtermapper = new Application_Model_FilterMapper(); $filtermapper->delete($deletefilter); } - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); } public function editfilterAction() @@ -108,7 +108,7 @@ class dev_FilterController extends Zend_Controller_Action $newfilter2 = new Application_Model_FilterMapper(); $newfilter2->save($newfilterenty); echo 'valid'; - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); } $this->view->editfilterform = $editfilterform; }catch (Zend_Exception $e) { @@ -151,7 +151,7 @@ class dev_FilterController extends Zend_Controller_Action $newfilter2 = new Application_Model_FilterEntriesMapper(); $newfilter2->save($newfilterenty); #print_a($newfilterenty); - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); } $this->view->editfilterform = $editfilterform; } @@ -206,7 +206,7 @@ class dev_FilterController extends Zend_Controller_Action $newfilter2 = new Application_Model_FilterEntriesMapper(); $newfilter2->save($newfilterenty); #print_a($newfilterenty); - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); } $this->view->editfilterform = $editfilterform; @@ -224,16 +224,13 @@ class dev_FilterController extends Zend_Controller_Action // TODO: ACL implementieren ob er den filter löschen darf if(is_numeric($filterentriesID)){ $deletefilterentry = new Application_Model_FilterEntries(); - $deletefilterentry->setID($filterentriesID); - echo "
";
-    				print_r($deletefilterentry);
-    				echo "
"; + $deletefilterentry->setID($filterentriesID); $filterentriesmapper = new Application_Model_FilterEntriesMapper(); $filterentriesmapper->delete($deletefilterentry); echo "ok"; } - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; } diff --git a/application/modules/dev/controllers/GroupController.php b/application/modules/dev/controllers/GroupController.php index 45c28d4..0456665 100644 --- a/application/modules/dev/controllers/GroupController.php +++ b/application/modules/dev/controllers/GroupController.php @@ -21,7 +21,7 @@ class dev_GroupController extends Zend_Controller_Action $this->rolemapper = new Application_Model_RoleMapper(); $this->groupList = $this->groupMapper->fetchAll(); } else { - $this->_helper->redirector('login', 'auth'); + $this->_helper->redirector('dev', 'login', 'auth'); } } diff --git a/application/modules/dev/controllers/PersonController.php b/application/modules/dev/controllers/PersonController.php index 3cb1756..74c58c7 100644 --- a/application/modules/dev/controllers/PersonController.php +++ b/application/modules/dev/controllers/PersonController.php @@ -30,13 +30,13 @@ class dev_PersonController extends Zend_Controller_Action } } } else { - $this->_helper->redirector('login', 'auth'); + $this->_helper->redirector('dev','login', 'auth'); } } public function indexAction() { - $this->_helper->redirector('show', 'person'); + $this->_helper->redirector('dev','show', 'person'); } public function showAction() diff --git a/application/modules/dev/controllers/PoolController.php b/application/modules/dev/controllers/PoolController.php index cf6395d..375f709 100644 --- a/application/modules/dev/controllers/PoolController.php +++ b/application/modules/dev/controllers/PoolController.php @@ -42,7 +42,7 @@ class dev_PoolController extends Zend_Controller_Action $pool = new Application_Model_Pool($_POST); $poolmapper = new Application_Model_PoolMapper(); $poolmapper->save($pool); - $this->_redirect('/pool'); + $this->_redirect('/dev/pool'); return; }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; @@ -62,7 +62,7 @@ class dev_PoolController extends Zend_Controller_Action $poolmapper = new Application_Model_PoolMapper(); $poolmapper->delete($deletepool); } - $this->_redirect('/pool'); + $this->_redirect('/dev/pool'); } public function editpoolAction() @@ -87,7 +87,7 @@ class dev_PoolController extends Zend_Controller_Action $pool->setID($this->_request->getParam('poolID')); $poolmapper = new Application_Model_PoolMapper(); $poolmapper->save($pool); - $this->_redirect('/pool'); + $this->_redirect('/dev/pool'); }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; } @@ -125,7 +125,7 @@ class dev_PoolController extends Zend_Controller_Action } $poolmapper = new Application_Model_PoolEntriesMapper(); $poolmapper->save($pool); - $this->_redirect('/pool'); + $this->_redirect('/dev/pool'); }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; } @@ -158,7 +158,7 @@ class dev_PoolController extends Zend_Controller_Action $deletepoolentriesmapper->delete($deletepoolentries); echo "ok"; } - $this->_redirect('/pool'); + $this->_redirect('/dev/pool'); } diff --git a/application/modules/dev/controllers/RoleController.php b/application/modules/dev/controllers/RoleController.php index 195accc..2f2de2d 100644 --- a/application/modules/dev/controllers/RoleController.php +++ b/application/modules/dev/controllers/RoleController.php @@ -8,7 +8,7 @@ class dev_RoleController extends Zend_Controller_Action if (Zend_Auth::getInstance()->hasIdentity()) { } else { - $this->_helper->redirector('login', 'auth'); + $this->_helper->redirector('dev', 'login', 'auth'); } } diff --git a/application/modules/dev/controllers/SessionController.php b/application/modules/dev/controllers/SessionController.php index e7092bc..bb92da9 100644 --- a/application/modules/dev/controllers/SessionController.php +++ b/application/modules/dev/controllers/SessionController.php @@ -76,7 +76,7 @@ class dev_SessionController extends Zend_Controller_Action $sessionmapper = new Application_Model_SessionMapper(); $sessionmapper->save($session); - $this->_redirect('/session'); + $this->_redirect('/dev/session'); }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; @@ -155,7 +155,7 @@ class dev_SessionController extends Zend_Controller_Action }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; } - $this->_redirect('/session'); + $this->_redirect('/dev/session'); } } @@ -168,7 +168,7 @@ class dev_SessionController extends Zend_Controller_Action $sessionmapper = new Application_Model_SessionMapper(); $sessionmapper->delete($deletesession); } - $this->_redirect('/session'); + $this->_redirect('/dev/session'); } 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; ?> -
\ No newline at end of file +
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 @@

BootISO

formButton('createbootiso', 'Create BootISO', array( - 'onclick' => 'self.location="/bootiso/createbootiso"', + 'onclick' => 'self.location="/dev/bootiso/createbootiso"', 'class' => 'addbutton'))?> @@ -30,6 +30,7 @@
escape($bootiso->getPublic()); ?> Edit BootISO 'self.location="/dev/bootmenu/createbootmenu"', 'class' => 'addbutton'))?> @@ -24,6 +24,7 @@ escape(date('Y-m-d H:i:s', $bootmenu->getCreated())); ?> Edit Bootmenu Delete Bootmenu url( array( + 'module' => 'dev', 'controller' => 'bootmenu', 'action' => 'editbootmenuentry', 'bootmenuentryID' => $bootmenuentry->getID(), @@ -96,6 +100,7 @@ true, false) ?>">Edit Entry 'self.location="/dev/bootos/createbootos"', 'class' => 'addbutton'))?> @@ -37,6 +37,7 @@
escape($bootos->getPublic()); ?> Edit BootOS 'self.location="/dev/client/addclient"', 'class' => 'addbutton'))?> clients): ?> @@ -18,6 +18,7 @@ escape($client->getHardwarehash()) ?> Edit Client 'self.location="/dev/config/createconfig"', 'class' => 'addbutton'))?> @@ -25,6 +25,7 @@
escape(date('Y-m-d H:i:s', $config->getCreated())); ?> Edit Config 'self.location="/dev/filter/addfilter"', 'class' => 'addbutton'))?> filters): ?> @@ -22,6 +22,7 @@ escape($filter->bootmenuID) ?> Edit Filter Delete Filter url( array( + 'module' => 'dev', 'controller' => 'filter', 'action' => 'editfilterentry', 'filterentriesID' => $filterentry['filterentriesID'] @@ -90,6 +94,7 @@ true) ?>">Edit Filterentry '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 @@

- +
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 @@
- +
@@ -61,7 +61,7 @@ foreach($this->groups as $group) {
Remove Membership
@@ -74,6 +74,6 @@ foreach($this->groups as $group) {

-
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 @@

Pools

formButton('createconfig', 'Create Pool', array( - 'onclick' => 'self.location="/pool/createpool"', + 'onclick' => 'self.location="/dev/pool/createpool"', 'class' => 'addbutton'))?> pools): ?> @@ -20,6 +20,7 @@ 		escape($pool->getLocation()) ?> Edit Pool Delete Pool url( array( + 'module' => 'dev', 'controller' => 'pool', 'action' => 'unlinkclient', 'poolentriesID' => $client['poolentriesID'] @@ -104,6 +108,7 @@ foreach ($this->freeclients as $client): ?> pools as $pool): ?>