diff --git a/PHPCI/Application.php b/PHPCI/Application.php index 1c89c44e..bfae830c 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -65,7 +65,7 @@ class Application extends b8\Application $this->response->setContent(''); } else { $this->response = new RedirectResponse($this->response); - $this->response->setHeader('Location', '/session/login'); + $this->response->setHeader('Location', PHPCI_URL.'session/login'); } return false; diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php index 214f9921..e2bb0aa1 100644 --- a/PHPCI/Controller/SessionController.php +++ b/PHPCI/Controller/SessionController.php @@ -21,7 +21,7 @@ class SessionController extends \PHPCI\Controller { public function init() { - $this->response->disableLayout(); + $this->response->disableLayout(); $this->_userStore = b8\Store\Factory::getStore('User'); } @@ -29,7 +29,7 @@ class SessionController extends \PHPCI\Controller * Handles user login (form and processing) */ public function login() - { + { if ($this->request->getMethod() == 'POST') { $user = $this->_userStore->getByEmail($this->getParam('email')); @@ -42,7 +42,7 @@ class SessionController extends \PHPCI\Controller $form = new b8\Form(); $form->setMethod('POST'); - $form->setAction('/session/login'); + $form->setAction(PHPCI_URL.'session/login'); $email = new b8\Form\Element\Email('email'); $email->setLabel('Email Address'); diff --git a/PHPCI/Controller/UserController.php b/PHPCI/Controller/UserController.php index 0a814b9c..92f1ed46 100644 --- a/PHPCI/Controller/UserController.php +++ b/PHPCI/Controller/UserController.php @@ -129,7 +129,7 @@ class UserController extends \PHPCI\Controller { $form = new Form(); $form->setMethod('POST'); - $form->setAction('/user/' . $type); + $form->setAction(PHPCI_URL.'user/' . $type); $form->addField(new Form\Element\Csrf('csrf')); $field = new Form\Element\Email('email'); diff --git a/assets/css/phpci.css b/assets/css/phpci.css index cfb886d4..71071625 100644 --- a/assets/css/phpci.css +++ b/assets/css/phpci.css @@ -57,22 +57,22 @@ td .label { margin-right: 5px; } .icon-build-ok { - background: url('/assets/img/icon-build-ok.png') no-repeat top left; + background: url('../img/icon-build-ok.png') no-repeat top left; } .icon-build-failed { - background: url('/assets/img/icon-build-failed.png') no-repeat top left; + background: url('../img/icon-build-failed.png') no-repeat top left; } .icon-build-pending { - background: url('/assets/img/icon-build-pending.png') no-repeat top left; + background: url('../img/icon-build-pending.png') no-repeat top left; } .icon-build-running { - background: url('/assets/img/icon-build-running.png') no-repeat top left; + background: url('../img/icon-build-running.png') no-repeat top left; } h3