diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/Project.php | 3 | ||||
| -rw-r--r-- | app/Template/project_search.php | 2 | ||||
| -rw-r--r-- | app/Template/task_new.php | 2 | ||||
| -rw-r--r-- | app/Template/user_login.php | 16 |
4 files changed, 8 insertions, 15 deletions
diff --git a/app/Controller/Project.php b/app/Controller/Project.php index becdd135..bdc382f7 100644 --- a/app/Controller/Project.php +++ b/app/Controller/Project.php @@ -404,6 +404,7 @@ class Project extends Base $project = $this->getProject(); $this->response->html($this->template->layout('project_activity', array( + 'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()), 'events' => $this->projectActivity->getProject($project['id']), 'project' => $project, 'title' => t('%s\'s activity', $project['name']) @@ -432,6 +433,7 @@ class Project extends Base } $this->response->html($this->template->layout('project_search', array( + 'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()), 'tasks' => $tasks, 'nb_tasks' => $nb_tasks, 'pagination' => array( @@ -474,6 +476,7 @@ class Project extends Base $nb_tasks = $this->taskFinder->countByProjectId($project['id'], array(TaskModel::STATUS_CLOSED)); $this->response->html($this->template->layout('project_tasks', array( + 'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()), 'pagination' => array( 'controller' => 'project', 'action' => 'tasks', diff --git a/app/Template/project_search.php b/app/Template/project_search.php index d028a104..11e207d2 100644 --- a/app/Template/project_search.php +++ b/app/Template/project_search.php @@ -11,7 +11,7 @@ <?= Helper\form_hidden('controller', $values) ?> <?= Helper\form_hidden('action', $values) ?> <?= Helper\form_hidden('project_id', $values) ?> - <?= Helper\form_text('search', $values, array(), array('autofocus', 'required', 'placeholder="'.t('Search').'"')) ?> + <?= Helper\form_text('search', $values, array(), array('autofocus', 'required', 'placeholder="'.t('Search').'"'), 'form-input-large') ?> <input type="submit" value="<?= t('Search') ?>" class="btn btn-blue"/> </form> diff --git a/app/Template/task_new.php b/app/Template/task_new.php index de24f6e1..43916551 100644 --- a/app/Template/task_new.php +++ b/app/Template/task_new.php @@ -11,7 +11,7 @@ <div class="form-column"> <?= Helper\form_label(t('Title'), 'title') ?> - <?= Helper\form_text('title', $values, $errors, array('autofocus', 'required')) ?><br/> + <?= Helper\form_text('title', $values, $errors, array('autofocus', 'required'), 'form-input-large') ?><br/> <?= Helper\form_label(t('Description'), 'description') ?> <?= Helper\form_textarea('description', $values, $errors) ?><br/> diff --git a/app/Template/user_login.php b/app/Template/user_login.php index cf92cd4d..a8e8fc15 100644 --- a/app/Template/user_login.php +++ b/app/Template/user_login.php @@ -1,8 +1,4 @@ -<div class="form-login"> - - <div class="page-header"> - <h1><?= t('Sign in') ?></h1> - </div> +<div class="form-login"> <?php if (isset($errors['login'])): ?> <p class="alert alert-error"><?= Helper\escape($errors['login']) ?></p> @@ -20,19 +16,13 @@ <?= Helper\form_checkbox('remember_me', t('Remember Me'), 1) ?><br/> - <ul> <?php if (GOOGLE_AUTH): ?> - <li> - <a href="?controller=user&action=google"><?= t('Login with my Google Account') ?></a> - </li> + <a href="?controller=user&action=google"><?= t('Login with my Google Account') ?></a> <?php endif ?> <?php if (GITHUB_AUTH): ?> - <li> - <a href="?controller=user&action=gitHub"><?= t('Login with my GitHub Account') ?></a> - </li> + <a href="?controller=user&action=gitHub"><?= t('Login with my GitHub Account') ?></a> <?php endif ?> - </ul> <div class="form-actions"> <input type="submit" value="<?= t('Sign in') ?>" class="btn btn-blue"/> |