Change form styles

This commit is contained in:
Frédéric Guillot
2014-11-08 13:33:07 -05:00
parent 30c7e96169
commit 20c8342503
6 changed files with 28 additions and 37 deletions

View File

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

View File

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

View File

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

View File

@@ -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&amp;action=google"><?= t('Login with my Google Account') ?></a>
</li>
<a href="?controller=user&amp;action=google"><?= t('Login with my Google Account') ?></a>
<?php endif ?>
<?php if (GITHUB_AUTH): ?>
<li>
<a href="?controller=user&amp;action=gitHub"><?= t('Login with my GitHub Account') ?></a>
</li>
<a href="?controller=user&amp;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"/>