Change form styles
This commit is contained in:
@@ -404,6 +404,7 @@ class Project extends Base
|
|||||||
$project = $this->getProject();
|
$project = $this->getProject();
|
||||||
|
|
||||||
$this->response->html($this->template->layout('project_activity', array(
|
$this->response->html($this->template->layout('project_activity', array(
|
||||||
|
'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
|
||||||
'events' => $this->projectActivity->getProject($project['id']),
|
'events' => $this->projectActivity->getProject($project['id']),
|
||||||
'project' => $project,
|
'project' => $project,
|
||||||
'title' => t('%s\'s activity', $project['name'])
|
'title' => t('%s\'s activity', $project['name'])
|
||||||
@@ -432,6 +433,7 @@ class Project extends Base
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->response->html($this->template->layout('project_search', array(
|
$this->response->html($this->template->layout('project_search', array(
|
||||||
|
'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
|
||||||
'tasks' => $tasks,
|
'tasks' => $tasks,
|
||||||
'nb_tasks' => $nb_tasks,
|
'nb_tasks' => $nb_tasks,
|
||||||
'pagination' => array(
|
'pagination' => array(
|
||||||
@@ -474,6 +476,7 @@ class Project extends Base
|
|||||||
$nb_tasks = $this->taskFinder->countByProjectId($project['id'], array(TaskModel::STATUS_CLOSED));
|
$nb_tasks = $this->taskFinder->countByProjectId($project['id'], array(TaskModel::STATUS_CLOSED));
|
||||||
|
|
||||||
$this->response->html($this->template->layout('project_tasks', array(
|
$this->response->html($this->template->layout('project_tasks', array(
|
||||||
|
'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
|
||||||
'pagination' => array(
|
'pagination' => array(
|
||||||
'controller' => 'project',
|
'controller' => 'project',
|
||||||
'action' => 'tasks',
|
'action' => 'tasks',
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<?= Helper\form_hidden('controller', $values) ?>
|
<?= Helper\form_hidden('controller', $values) ?>
|
||||||
<?= Helper\form_hidden('action', $values) ?>
|
<?= Helper\form_hidden('action', $values) ?>
|
||||||
<?= Helper\form_hidden('project_id', $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"/>
|
<input type="submit" value="<?= t('Search') ?>" class="btn btn-blue"/>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
<div class="form-column">
|
<div class="form-column">
|
||||||
<?= Helper\form_label(t('Title'), 'title') ?>
|
<?= 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_label(t('Description'), 'description') ?>
|
||||||
<?= Helper\form_textarea('description', $values, $errors) ?><br/>
|
<?= Helper\form_textarea('description', $values, $errors) ?><br/>
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
<div class="form-login">
|
<div class="form-login">
|
||||||
|
|
||||||
<div class="page-header">
|
|
||||||
<h1><?= t('Sign in') ?></h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<?php if (isset($errors['login'])): ?>
|
<?php if (isset($errors['login'])): ?>
|
||||||
<p class="alert alert-error"><?= Helper\escape($errors['login']) ?></p>
|
<p class="alert alert-error"><?= Helper\escape($errors['login']) ?></p>
|
||||||
@@ -20,19 +16,13 @@
|
|||||||
|
|
||||||
<?= Helper\form_checkbox('remember_me', t('Remember Me'), 1) ?><br/>
|
<?= Helper\form_checkbox('remember_me', t('Remember Me'), 1) ?><br/>
|
||||||
|
|
||||||
<ul>
|
|
||||||
<?php if (GOOGLE_AUTH): ?>
|
<?php if (GOOGLE_AUTH): ?>
|
||||||
<li>
|
<a href="?controller=user&action=google"><?= t('Login with my Google Account') ?></a>
|
||||||
<a href="?controller=user&action=google"><?= t('Login with my Google Account') ?></a>
|
|
||||||
</li>
|
|
||||||
<?php endif ?>
|
<?php endif ?>
|
||||||
|
|
||||||
<?php if (GITHUB_AUTH): ?>
|
<?php if (GITHUB_AUTH): ?>
|
||||||
<li>
|
<a href="?controller=user&action=gitHub"><?= t('Login with my GitHub Account') ?></a>
|
||||||
<a href="?controller=user&action=gitHub"><?= t('Login with my GitHub Account') ?></a>
|
|
||||||
</li>
|
|
||||||
<?php endif ?>
|
<?php endif ?>
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div class="form-actions">
|
<div class="form-actions">
|
||||||
<input type="submit" value="<?= t('Sign in') ?>" class="btn btn-blue"/>
|
<input type="submit" value="<?= t('Sign in') ?>" class="btn btn-blue"/>
|
||||||
|
|||||||
@@ -107,11 +107,7 @@ th a:hover {
|
|||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
}/* forms */
|
}/* forms */
|
||||||
form {
|
form {
|
||||||
padding: 10px;
|
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
background: #fefefe;
|
|
||||||
border: 1px solid #ddd;
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
label {
|
label {
|
||||||
@@ -128,13 +124,13 @@ input[type="password"],
|
|||||||
input[type="text"] {
|
input[type="text"] {
|
||||||
color: #888;
|
color: #888;
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
width: 400px;
|
width: 300px;
|
||||||
max-width: 95%;
|
max-width: 95%;
|
||||||
font-size: 1.0em;
|
font-size: 1.0em;
|
||||||
height: 25px;
|
height: 25px;
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
margin-top: 5px;
|
margin-top: 10px;
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
appearance: none;
|
appearance: none;
|
||||||
}
|
}
|
||||||
@@ -236,6 +232,10 @@ input.form-date {
|
|||||||
width: 150px;
|
width: 150px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
input.form-input-large {
|
||||||
|
width: 400px;
|
||||||
|
}
|
||||||
|
|
||||||
.form-row {
|
.form-row {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
@@ -244,8 +244,7 @@ input.form-date {
|
|||||||
.form-column {
|
.form-column {
|
||||||
float: left;
|
float: left;
|
||||||
margin-bottom: 60px;
|
margin-bottom: 60px;
|
||||||
padding-right: 30px;
|
padding-right: 50px;
|
||||||
padding-left: 30px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-column:first-child {
|
.form-column:first-child {
|
||||||
@@ -257,9 +256,9 @@ input.form-date {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.form-login {
|
.form-login {
|
||||||
width: 470px;
|
width: 350px;
|
||||||
padding: 10px;
|
margin: 0 auto;
|
||||||
margin: 3% auto 20% auto;
|
margin-top: 8%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-column li,
|
.form-column li,
|
||||||
|
|||||||
@@ -1,10 +1,6 @@
|
|||||||
/* forms */
|
/* forms */
|
||||||
form {
|
form {
|
||||||
padding: 10px;
|
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
background: #fefefe;
|
|
||||||
border: 1px solid #ddd;
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
label {
|
label {
|
||||||
@@ -21,13 +17,13 @@ input[type="password"],
|
|||||||
input[type="text"] {
|
input[type="text"] {
|
||||||
color: #888;
|
color: #888;
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
width: 400px;
|
width: 300px;
|
||||||
max-width: 95%;
|
max-width: 95%;
|
||||||
font-size: 1.0em;
|
font-size: 1.0em;
|
||||||
height: 25px;
|
height: 25px;
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
margin-top: 5px;
|
margin-top: 10px;
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
appearance: none;
|
appearance: none;
|
||||||
}
|
}
|
||||||
@@ -129,6 +125,10 @@ input.form-date {
|
|||||||
width: 150px;
|
width: 150px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
input.form-input-large {
|
||||||
|
width: 400px;
|
||||||
|
}
|
||||||
|
|
||||||
.form-row {
|
.form-row {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
@@ -137,8 +137,7 @@ input.form-date {
|
|||||||
.form-column {
|
.form-column {
|
||||||
float: left;
|
float: left;
|
||||||
margin-bottom: 60px;
|
margin-bottom: 60px;
|
||||||
padding-right: 30px;
|
padding-right: 50px;
|
||||||
padding-left: 30px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-column:first-child {
|
.form-column:first-child {
|
||||||
@@ -150,9 +149,9 @@ input.form-date {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.form-login {
|
.form-login {
|
||||||
width: 470px;
|
width: 350px;
|
||||||
padding: 10px;
|
margin: 0 auto;
|
||||||
margin: 3% auto 20% auto;
|
margin-top: 8%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-column li,
|
.form-column li,
|
||||||
|
|||||||
Reference in New Issue
Block a user