From 0954a80dac370c9fe8c66b8855d13acd3483e42a Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 8 Mar 2011 14:43:06 +0100 Subject: pools nun besser bearbeitbar --- application/controllers/PoolController.php | 28 +++++++++++++++++++++++----- application/views/scripts/filter/index.phtml | 3 ++- application/views/scripts/pool/index.phtml | 28 +++++++++++++++++++++++++++- 3 files changed, 52 insertions(+), 7 deletions(-) (limited to 'application') diff --git a/application/controllers/PoolController.php b/application/controllers/PoolController.php index 28bde8e..cb38a80 100644 --- a/application/controllers/PoolController.php +++ b/application/controllers/PoolController.php @@ -13,8 +13,21 @@ class PoolController extends Zend_Controller_Action $poolMapper = new Application_Model_PoolMapper(); $this->view->pools = $poolMapper->fetchAll(); - $poolentriesMapper = new Application_Model_PoolEntriesMapper(); - #print_a($poolentriesMapper->findBy('poolID',1)); + $clientmapper = new Application_Model_ClientMapper(); + $clients = $clientmapper->fetchAll(); + foreach($clients as $c){ + #$client = new Application_Model_Client($c); + $clientsArray[] = $c->toArray(); + } + $assignedclientmapper = new Application_Model_PoolEntriesMapper(); + $assignedclients = $assignedclientmapper->fetchAll(); + foreach($assignedclients as $c){ + $assignedclientsArray[] = $c->toArray(); + } + $freeclients = $this->arrayDiff($clientsArray,$assignedclientsArray); + #print_a($freeclients); + + $this->view->freeclients = $freeclients; } @@ -84,12 +97,15 @@ class PoolController extends Zend_Controller_Action public function linkclientAction() { - if(!isset($_POST['clientID'])){ + $clientID = $this->_request->getParam('clientID'); + $poolID = $this->_request->getParam('poolID'); + print_a($clientID,$poolID); + + if(!isset($_POST['clientID']) && ($clientID == '' && $poolID == '')){ print_a($_POST); $clientmapper = new Application_Model_ClientMapper(); $clients = $clientmapper->fetchAll(); foreach($clients as $c){ - #$client = new Application_Model_Client($c); $clientsArray[] = $c->toArray(); } $assignedclientmapper = new Application_Model_PoolEntriesMapper(); @@ -108,7 +124,9 @@ class PoolController extends Zend_Controller_Action try{ $pool = new Application_Model_PoolEntries($_POST); $pool->setPoolID($this->_request->getParam('poolID')); - + if($pool->getClientID() == ''){ + $pool->setClientID($this->_request->getParam('clientID')); + } $poolmapper = new Application_Model_PoolEntriesMapper(); $poolmapper->save($pool); $this->_redirect('/pool'); diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml index a3e6f25..eb459a7 100644 --- a/application/views/scripts/filter/index.phtml +++ b/application/views/scripts/filter/index.phtml @@ -103,7 +103,8 @@ tr.filter{background-color:#DDD;} - + +

There are no filters to display.

diff --git a/application/views/scripts/pool/index.phtml b/application/views/scripts/pool/index.phtml index 25f1528..c3a6be9 100644 --- a/application/views/scripts/pool/index.phtml +++ b/application/views/scripts/pool/index.phtml @@ -79,7 +79,33 @@ - +

Free clients

+ + +pools as $pool): ?> + + + +freeclients as $client): ?> + + + + + pools as $pool): ?> + + + + +
ClientIDMacAdressHardwarehashescape($pool->getTitle()) ?>
'pool', + 'action' => 'linkclient', + 'clientID' => $client['clientID'], + 'poolID' => $pool->getID(), + ), + 'default', + true) ?>'>link
-- cgit v1.2.3-55-g7522 From 03acf25abb83f79569fff49445848b6dc4c2a4c1 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 8 Mar 2011 14:53:21 +0100 Subject: session hinzugefügt --- .zfproject.xml | 19 +++++++++++ application/controllers/IndexController.php | 5 +-- application/controllers/SessionController.php | 39 ++++++++++++++++++++++ .../views/scripts/session/createsession.phtml | 1 + .../views/scripts/session/deletesession.phtml | 1 + .../views/scripts/session/editsession.phtml | 1 + application/views/scripts/session/index.phtml | 1 + .../controllers/SessionControllerTest.php | 20 +++++++++++ 8 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 application/controllers/SessionController.php create mode 100644 application/views/scripts/session/createsession.phtml create mode 100644 application/views/scripts/session/deletesession.phtml create mode 100644 application/views/scripts/session/editsession.phtml create mode 100644 application/views/scripts/session/index.phtml create mode 100644 tests/application/controllers/SessionControllerTest.php (limited to 'application') diff --git a/.zfproject.xml b/.zfproject.xml index 8cdb2e0..373017a 100644 --- a/.zfproject.xml +++ b/.zfproject.xml @@ -74,6 +74,12 @@ + + + + + + @@ -286,6 +292,18 @@ + + + + + + + + + + + + @@ -329,6 +347,7 @@ + diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php index 1ff6319..df2f91c 100644 --- a/application/controllers/IndexController.php +++ b/application/controllers/IndexController.php @@ -11,11 +11,12 @@ class IndexController extends Zend_Controller_Action public function indexAction() { // action body - } - + } } + + diff --git a/application/controllers/SessionController.php b/application/controllers/SessionController.php new file mode 100644 index 0000000..382e68e --- /dev/null +++ b/application/controllers/SessionController.php @@ -0,0 +1,39 @@ +
View script for controller Session and script/action name createsession
\ No newline at end of file diff --git a/application/views/scripts/session/deletesession.phtml b/application/views/scripts/session/deletesession.phtml new file mode 100644 index 0000000..57f8698 --- /dev/null +++ b/application/views/scripts/session/deletesession.phtml @@ -0,0 +1 @@ +

View script for controller Session and script/action name deletesession
\ No newline at end of file diff --git a/application/views/scripts/session/editsession.phtml b/application/views/scripts/session/editsession.phtml new file mode 100644 index 0000000..987a332 --- /dev/null +++ b/application/views/scripts/session/editsession.phtml @@ -0,0 +1 @@ +

View script for controller Session and script/action name editsession
\ No newline at end of file diff --git a/application/views/scripts/session/index.phtml b/application/views/scripts/session/index.phtml new file mode 100644 index 0000000..fe3c2d4 --- /dev/null +++ b/application/views/scripts/session/index.phtml @@ -0,0 +1 @@ +

View script for controller Session and script/action name index
\ No newline at end of file diff --git a/tests/application/controllers/SessionControllerTest.php b/tests/application/controllers/SessionControllerTest.php new file mode 100644 index 0000000..909c117 --- /dev/null +++ b/tests/application/controllers/SessionControllerTest.php @@ -0,0 +1,20 @@ + +
diff --git a/application/controllers/SessionController.php b/application/controllers/SessionController.php index 382e68e..fc3b962 100644 --- a/application/controllers/SessionController.php +++ b/application/controllers/SessionController.php @@ -10,22 +10,88 @@ class SessionController extends Zend_Controller_Action public function indexAction() { - // action body + $mapper = new Application_Model_SessionMapper(); + $this->view->sessions = $mapper->fetchAll(); } public function createsessionAction() { - // action body + if (!isset($_POST["add"])){ + $createsession = new Application_Form_Session(); + $this->view->createsession = $createsession; + }else { + $createsession = new Application_Form_Session($_POST); + print_a($_POST); + if ($createsession->isValid($_POST)) { + try{ + $session = new Application_Model_Session($_POST); + $sessionmapper = new Application_Model_SessionMapper(); + $sessionmapper->save($session); + + $this->_redirect('/session'); + + }catch (Zend_Exception $e) { + echo "Error message 2: " . $e->getMessage() . "\n"; + } + print_a('saved'); + $this->_redirect('/session'); + } + else{ + print_a('not saved'); + } + } } public function editsessionAction() { - // action body + if (!isset($_POST["add"])){ + // TODO: ACL implementieren ob er editieren darf + $sessionID = $this->_request->getParam('sessionID'); + $session = new Application_Model_Session(); + + + $sessionmapper = new Application_Model_SessionMapper(); + $sessionmapper->find($sessionID,$session); + $session2 = $session->toArray(); + + $editsession = new Application_Form_Session(); + $editsession->populate($session2); + $this->view->editsession = $editsession; + + } else{ + try{ + $sessionID = $this->_request->getParam('sessionID'); + + $editsession = new Application_Form_Session($_POST); + + if ($editsession->isValid($_POST)) { + $session = new Application_Model_Session($_POST); + $session->setID($this->_request->getParam('sessionID')); + $sessionmapper = new Application_Model_SessionMapper(); + $sessionmapper->save($session); + echo 'valid'; + } + else + { + echo 'not valid'; + } + }catch (Zend_Exception $e) { + echo "Error message 2: " . $e->getMessage() . "\n"; + } + $this->_redirect('/session'); + } } public function deletesessionAction() { - // action body + $sessionID = $this->_request->getParam('sessionID'); + if(is_numeric($sessionID)){ + $deletesession = new Application_Model_Session(); + $deletesession->setID($sessionID); + $sessionmapper = new Application_Model_SessionMapper(); + $sessionmapper->delete($deletesession); + } + $this->_redirect('/session'); } diff --git a/application/forms/Session.php b/application/forms/Session.php new file mode 100644 index 0000000..f094676 --- /dev/null +++ b/application/forms/Session.php @@ -0,0 +1,70 @@ +setName("session"); + $this->setMethod('post'); + + $this->addElement('text', 'clientID', array( + 'filters' => array('StringTrim'), + 'validators' => array( + array('StringLength', false, array(0, 50)), + ), + 'required' => true, + 'label' => 'clientID:', + )); + + $this->addElement('text', 'bootosID', array( + 'filters' => array('StringTrim'), + 'validators' => array( + array('StringLength', false, array(0, 50)), + ), + 'required' => true, + 'label' => 'bootosID:', + )); +$this->addElement('text', 'bootisoID', array( + 'filters' => array('StringTrim'), + 'validators' => array( + array('StringLength', false, array(0, 50)), + ), + 'required' => true, + 'label' => 'bootisoID:', + )); +$this->addElement('text', 'time', array( + 'filters' => array('StringTrim'), + 'validators' => array( + array('StringLength', false, array(0, 50)), + ), + 'required' => true, + 'label' => 'time:', + )); +$this->addElement('text', 'ip', array( + 'filters' => array('StringTrim'), + 'validators' => array( + array('StringLength', false, array(0, 50)), + ), + 'required' => false, + 'label' => 'ip:', + )); +$this->addElement('text', 'ip6', array( + 'filters' => array('StringTrim'), + 'validators' => array( + array('StringLength', false, array(0, 50)), + ), + 'required' => false, + 'label' => 'ip6:', + )); + + $this->addElement('submit', 'add', array( + 'required' => false, + 'ignore' => true, + 'label' => 'Save', + )); + } + + +} + diff --git a/application/models/Session.php b/application/models/Session.php index b042c17..ca07ccb 100644 --- a/application/models/Session.php +++ b/application/models/Session.php @@ -5,6 +5,7 @@ class Application_Model_Session protected $_sessionID; protected $_clientID; protected $_bootosID; + protected $_bootisoID; protected $_time; protected $_ip; protected $_ip6; @@ -74,6 +75,15 @@ class Application_Model_Session $this->_bootosID = $_bootosID; return $this; } + public function getBootisoID() + { + return $this->_bootisoID; + } + public function setBootisoID($_bootisoID) + { + $this->_bootisoID = $_bootisoID; + return $this; + } public function getTime() { return $this->_time; diff --git a/application/models/SessionMapper.php b/application/models/SessionMapper.php index 57b2fdf..f836643 100644 --- a/application/models/SessionMapper.php +++ b/application/models/SessionMapper.php @@ -44,16 +44,22 @@ class Application_Model_SessionMapper return $this->_dbTable; } - public function save(Application_Model_Session $sesion) + public function save(Application_Model_Session $session) { - $data = array('sessionID'=> $sesion->getSessionID() ,'clientID'=> $sesion->getClientID() ,'bootosID'=> $sesion->getBootosID() ,'time'=> $sesion->getTime() ,'ip'=> $sesion->getIp() ,'ip6'=> $sesion->getIp6() ); - - if (null === ($id = $sesion->getID()) ) { - unset($data['sesionID']); + $data = array( 'sessionID'=> $session->getID() , + 'clientID'=> $session->getClientID() , + 'bootosID'=> $session->getBootosID() , + 'bootisoID'=> $session->getBootisoID() , + 'time'=> $session->getTime() , + 'ip'=> $session->getIp() , + 'ip6'=> $session->getIp6() ); + print_a($data); + if (null === ($id = $session->getID()) ) { + unset($data['sessionID']); $this->getDbTable()->insert($data); } else { - $this->getDbTable()->update($data, array('sesionID = ?' => $id)); + $this->getDbTable()->update($data, array('sessionID = ?' => $id)); } } @@ -62,7 +68,7 @@ class Application_Model_SessionMapper if (null === ($id = $sesion->getID()) ) { return; } else { - $this->getDbTable()->delete(array('sesionID = ?' => $id)); + $this->getDbTable()->delete(array('sessionID = ?' => $id)); } } @@ -75,7 +81,7 @@ class Application_Model_SessionMapper $row = $result->current(); - $sesion->setSessionID($row->sessionID)->setClientID($row->clientID)->setBootosID($row->bootosID)->setTime($row->time)->setIp($row->ip)->setIp6($row->ip6); + $sesion->setID($row->sessionID)->setClientID($row->clientID)->setBootosID($row->bootosID)->setBootisoID($row->bootisoID)->setTime($row->time)->setIp($row->ip)->setIp6($row->ip6); } public function fetchAll() @@ -85,7 +91,7 @@ class Application_Model_SessionMapper foreach ($resultSet as $row) { $entry = new Application_Model_Session(); - $entry->setSessionID($row->sessionID)->setClientID($row->clientID)->setBootosID($row->bootosID)->setTime($row->time)->setIp($row->ip)->setIp6($row->ip6); + $entry->setID($row->sessionID)->setClientID($row->clientID)->setBootosID($row->bootosID)->setBootisoID($row->bootisoID)->setTime($row->time)->setIp($row->ip)->setIp6($row->ip6); $entries[] = $entry; } diff --git a/application/views/scripts/session/createsession.phtml b/application/views/scripts/session/createsession.phtml index 81c476e..11fe7ce 100644 --- a/application/views/scripts/session/createsession.phtml +++ b/application/views/scripts/session/createsession.phtml @@ -1 +1,5 @@ -

View script for controller Session and script/action name createsession
\ No newline at end of file +

create session

+ +createsession; +?> diff --git a/application/views/scripts/session/editsession.phtml b/application/views/scripts/session/editsession.phtml index 987a332..88fb273 100644 --- a/application/views/scripts/session/editsession.phtml +++ b/application/views/scripts/session/editsession.phtml @@ -1 +1,5 @@ -

View script for controller Session and script/action name editsession
\ No newline at end of file +

edit session

+ +editsession; +?> diff --git a/application/views/scripts/session/index.phtml b/application/views/scripts/session/index.phtml index fe3c2d4..d26e818 100644 --- a/application/views/scripts/session/index.phtml +++ b/application/views/scripts/session/index.phtml @@ -1 +1,48 @@ -

View script for controller Session and script/action name index
\ No newline at end of file +

Session

+ +

create new session

+ + + + + + + + + + + +sessions as $session): ?> + + + + + + + + + + + + +
SessionIDClientIDBootosIDBootIsoIDTimeIPIPv6
escape($session->getID()) ?>escape($session->getClientID()) ?>escape($session->getBootosID()) ?>escape($session->getBootisoID()) ?>escape($session->getTime()) ?>escape($session->getIp()) ?>escape($session->getIp6()) ?>edit filterdelete filter
diff --git a/pbs-data.sql b/pbs-data.sql index ec7dd03..52a174a 100644 --- a/pbs-data.sql +++ b/pbs-data.sql @@ -63,3 +63,11 @@ INSERT INTO `pbs_poolentries` (`poolentriesID`, `poolID`, `clientID`) VALUES (9, 3, 9), (10, 3, 10); +-- Insert Data for Sessions +INSERT INTO `pbs`.`pbs_bootos` (`bootosID`, `configID`, `groupID`, `membershipID`, `title`, `description`, `path_init`, `path_kernel`, `defaultkcl`, `created`, `expires`, `public`) VALUES +(1, NULL, 1, 1, 'BootOS 1', 'Description', '', '', '', '', NULL, 0); + +INSERT INTO `pbs_bootiso` (`bootisoID`, `title`, `membershipID`, `groupID`, `path`, `serialnumber`, `created`, `expires`, `public`) VALUES +(1, 'BootISO 1', 1, 1, '', 1337, '', NULL, 1), +(2, 'BootISO 2', 1, 1, '', 1337, '', NULL, 1); + diff --git a/pbs.sql b/pbs.sql index 099ea65..bc38d7c 100644 --- a/pbs.sql +++ b/pbs.sql @@ -214,7 +214,7 @@ CREATE TABLE IF NOT EXISTS `pbs_session` ( KEY `clientID` (`clientID`), KEY `bootosID` (`bootosID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; -ALTER TABLE `pbs_session` ADD `bootisoID` INT NOT NULL AFTER `bootosID` +ALTER TABLE `pbs_session` ADD `bootisoID` INT NOT NULL AFTER `bootosID`; ALTER TABLE `pbs_session` ADD CONSTRAINT `pbs_session_ibfk_1` FOREIGN KEY (`clientID`) REFERENCES `pbs_client` (`clientID`), -- cgit v1.2.3-55-g7522 From c113eb1ddd0263664b6ddaa22291469b56867a6c Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 8 Mar 2011 18:37:35 +0100 Subject: filtertypes implementiert --- application/controllers/FilterController.php | 94 ++++++++++++++++++++-------- application/views/scripts/filter/index.phtml | 4 +- 2 files changed, 71 insertions(+), 27 deletions(-) (limited to 'application') diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php index df8db07..a8a1636 100644 --- a/application/controllers/FilterController.php +++ b/application/controllers/FilterController.php @@ -262,11 +262,18 @@ class FilterController extends Zend_Controller_Action $db = $this->db; $showPartResults = false; try{ + + $mysession = '1'; + + $filtertypID = 8; + $session = new Application_Model_Session(); + $sessionmapper = new Application_Model_SessionMapper(); + $sessionmapper->find($mysession,$session); ######################################################### // IP Adress $filtertypID = 1; // get it from session_table with session_id from the session - $ipAdress = "111.10.10.10"; + $ipAdress = $session->getIp(); $ipAdress = str_replace(".","",$this->fillIP($ipAdress)); $select = $db->select() ->from(array('pbs_filterentries') @@ -281,13 +288,16 @@ class FilterController extends Zend_Controller_Action $set[$filtertypID][] = $r['filterID']; } if($showPartResults) - print_a('ipAdress',$result,$set[$filtertypID]); - + print_a('ipAdress',$result,$set[$filtertypID]); ######################################################### // Mac range $filtertypID = 2; // get it from session_table with session_id from the session - $macAdress = "00:1e:0b:27:f4:99"; + $client = new Application_Model_Client(); + $clientmapper = new Application_Model_ClientMapper(); + $clientmapper->find($session->getClientID(),$client); + + $macAdress = $client->getMacadress(); $macAdress = str_replace(":","",$this->fillMac($ipAdress)); $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE filtertypeID = ".$filtertypID." AND @@ -303,47 +313,81 @@ class FilterController extends Zend_Controller_Action // PoolID $filtertypID = 3; // get PoolID from client_ID from session_id from the session - $poolid = 1; + $poolentry = new Application_Model_PoolEntries(); + $poolentrymapper = new Application_Model_PoolEntriesMapper(); + $poolentry = $poolentrymapper->findby('clientID',$client->getID()); + $poolentry = $poolentry[0]; + + $poolID = $poolentry['poolID']; + print_a($poolentry); $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE filtertypeID = ".$filtertypID." AND - filtervalue = '.$poolid.' "); + filtervalue = ".$poolID." "); $result = $stmt->fetchAll(); foreach($result as $r){ $set[$filtertypID][] = $r['filterID']; } if($showPartResults) print_a('poolID',$result,$set[$filtertypID]); - /* - If client comes from a specific pool - */ ######################################################### - // ClientID - $filtertypID = 8; - // get client_ID from session_id from the session - /* - If client is a specific client - */ + // ClientID + $filtertypID = 8; + // get client_ID from session_id from the session + $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE + filtertypeID = ".$filtertypID." AND + filtervalue = ".$session->getClientID()." "); + $result = $stmt->fetchAll(); + foreach($result as $r){ + $set[$filtertypID][] = $r['filterID']; + } + if($showPartResults) + print_a('clientID',$result,$set[$filtertypID]); ######################################################### // BootIsoID $filtertypID = 4; - // get BootIsoID from client_ID from session_id from the session - /* - WHERE bootiso = bootiso - */ + // get BootIsoID from client_ID from session_id from the session + $bootisoID = $session->getBootisoID(); + $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE + filtertypeID = ".$filtertypID." AND + filtervalue = ".$bootisoID." "); + $result = $stmt->fetchAll(); + foreach($result as $r){ + $set[$filtertypID][] = $r['filterID']; + } + if($showPartResults) + print_a('bootisoID',$result,$set[$filtertypID]); ######################################################### // MembershipID $filtertypID = 5; // get membership from the session - /* - user is in a defined membership - */ + //TODO: GET MEMBERSHIP from SESSION + $membershipID = 1; + + $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE + filtertypeID = ".$filtertypID." AND + filtervalue = ".$membershipID." "); + $result = $stmt->fetchAll(); + foreach($result as $r){ + $set[$filtertypID][] = $r['filterID']; + } + if($showPartResults) + print_a('membership',$result,$set[$filtertypID]); ######################################################### // GroupID $filtertypID = 6; // get membership from the session - /* - user is in a defined groupID - */ + //TODO: GET GROUP from SESSION + $groupID = 1; + + $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE + filtertypeID = ".$filtertypID." AND + filtervalue = ".$groupID." "); + $result = $stmt->fetchAll(); + foreach($result as $r){ + $set[$filtertypID][] = $r['filterID']; + } + if($showPartResults) + print_a('membership',$result,$set[$filtertypID]); ######################################################### // Time $filtertypID = 7; diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml index eb459a7..0b738e0 100644 --- a/application/views/scripts/filter/index.phtml +++ b/application/views/scripts/filter/index.phtml @@ -83,7 +83,7 @@ tr.filter{background-color:#DDD;} array( 'controller' => 'filter', 'action' => 'editfilterentry', - 'filterentriesID' => $filterentry['filtertypeID'] + 'filterentriesID' => $filterentry['filterentriesID'] ), 'default', true) ?>">edit filterentry @@ -91,7 +91,7 @@ tr.filter{background-color:#DDD;} array( 'controller' => 'filter', 'action' => 'removefilterentry', - 'filterentriesID' => $filterentry['filtertypeID'] + 'filterentriesID' => $filterentry['filterentriesID'] ), 'default', true) ?>">remove filterentry -- cgit v1.2.3-55-g7522 From 260b7860bcfcd6ad4d80437bad1d9b885c680e75 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 8 Mar 2011 19:12:36 +0100 Subject: arbeiten zur oberflächenvereinheitlichung --- application/Bootstrap.php | 12 ++++++++++++ application/configs/application.ini.dist | 2 ++ application/controllers/FilterController.php | 4 +--- application/forms/FilterAdd.php | 10 +++++++++- application/layouts/main.phtml | 21 +++++++++++++++++++++ application/media/css/style.css | 3 +++ application/views/scripts/filter/index.phtml | 1 - 7 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 application/layouts/main.phtml create mode 100644 application/media/css/style.css (limited to 'application') diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 224ffcb..7f24b84 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -14,6 +14,18 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headTitle('pbs2') ->setSeparator(' :: '); } + function _initViewHelpers() + { + $this->bootstrap('layout'); + $layout = $this->getResource('layout'); + $view = $layout->getView(); + + $view->doctype('XHTML1_STRICT'); + $view->headMeta()->appendHttpEquiv('Content-Type', 'text/html;charset=utf-8'); + $view->headLink()->appendStylesheet('/media/css/styles.css'); + $view->headTitle()->setSeparator(' - '); + $view->headTitle('pbs2'); + } } function print_a(){ $numargs = func_num_args(); diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist index 48e29e5..b19bac8 100644 --- a/application/configs/application.ini.dist +++ b/application/configs/application.ini.dist @@ -14,6 +14,8 @@ resources.db.params.password = resources.db.params.dbname = pbs resources.db.isDefaultTableAdapter = true resources.view[] = "" +resources.layout.layoutPath = APPLICATION_PATH "/layouts" +resources.layout.layout = "main" [staging : production] diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php index a8a1636..1ebb35e 100644 --- a/application/controllers/FilterController.php +++ b/application/controllers/FilterController.php @@ -42,8 +42,7 @@ class FilterController extends Zend_Controller_Action // TODO: Ändere mit ACL $newfilter->setGroupID('1'); - $newfilter->setMembershipID('1'); - $newfilter->setBootmenuID('1'); + $newfilter->setMembershipID('1'); $newfilter2 = new Application_Model_FilterMapper(); $newfilter2->save($newfilter); @@ -95,7 +94,6 @@ class FilterController extends Zend_Controller_Action //TODO: ACL integrieren $_POST['groupID'] = 1; $_POST['membershipID'] = 1; - $_POST['bootmenuID'] = 1; $_POST['created'] = time(); if ($editfilterform->isValid($_POST)) { diff --git a/application/forms/FilterAdd.php b/application/forms/FilterAdd.php index 931bfee..af4f9b2 100644 --- a/application/forms/FilterAdd.php +++ b/application/forms/FilterAdd.php @@ -21,7 +21,15 @@ class Application_Form_FilterAdd extends Zend_Form 'required' => false, 'label' => 'Description:', )); - // TODO: Add target of Filter + + $this->addElement('text', 'bootmenuID', array( + 'filters' => array('StringTrim'), + 'validators' => array( + array('StringLength', false, array(0, 50)), + ), + 'required' => true, + 'label' => 'bootmenuID:', + )); $this->addElement('text', 'priority', array( 'filters' => array('StringTrim'), diff --git a/application/layouts/main.phtml b/application/layouts/main.phtml new file mode 100644 index 0000000..51dd89c --- /dev/null +++ b/application/layouts/main.phtml @@ -0,0 +1,21 @@ +doctype(); ?> + + + + +headTitle(); +echo $this->headMeta(); +echo $this->headStyle(); +echo $this->headLink(); +echo $this->headScript(); +?> + + + + +layout()->content; ?> + + diff --git a/application/media/css/style.css b/application/media/css/style.css new file mode 100644 index 0000000..b215f86 --- /dev/null +++ b/application/media/css/style.css @@ -0,0 +1,3 @@ +html{ + background-color:#FFCC33; +} diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml index 0b738e0..5d70735 100644 --- a/application/views/scripts/filter/index.phtml +++ b/application/views/scripts/filter/index.phtml @@ -1,4 +1,3 @@ -headTitle() ?>

Filters

- -layout()->content; ?> - +
+ +
+ layout()->content; ?> +
+
-- cgit v1.2.3-55-g7522