From 20c8342503b40e2b6a5d2f635d8efc82b7ae6bae Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Sat, 8 Nov 2014 13:33:07 -0500
Subject: Change form styles

---
 app/Controller/Project.php      |  3 +++
 app/Template/project_search.php |  2 +-
 app/Template/task_new.php       |  2 +-
 app/Template/user_login.php     | 16 +++-------------
 assets/css/app.css              | 21 ++++++++++-----------
 assets/css/form.css             | 21 ++++++++++-----------
 6 files changed, 28 insertions(+), 37 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&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"/>
diff --git a/assets/css/app.css b/assets/css/app.css
index e815a532..7f0cc666 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -107,11 +107,7 @@ th a:hover {
     text-decoration: underline;
 }/* forms */
 form {
-    padding: 10px;
     margin-bottom: 20px;
-    background: #fefefe;
-    border: 1px solid #ddd;
-    border-radius: 5px;
 }
 
 label {
@@ -128,13 +124,13 @@ input[type="password"],
 input[type="text"] {
     color: #888;
     border: 1px solid #ccc;
-    width: 400px;
+    width: 300px;
     max-width: 95%;
     font-size: 1.0em;
     height: 25px;
     padding-bottom: 0;
     font-family: sans-serif;
-    margin-top: 5px;
+    margin-top: 10px;
     -webkit-appearance: none;
     appearance: none;
 }
@@ -236,6 +232,10 @@ input.form-date {
     width: 150px;
 }
 
+input.form-input-large {
+    width: 400px;
+}
+
 .form-row {
     margin-top: 10px;
     margin-bottom: 20px;
@@ -244,8 +244,7 @@ input.form-date {
 .form-column {
     float: left;
     margin-bottom: 60px;
-    padding-right: 30px;
-    padding-left: 30px;
+    padding-right: 50px;
 }
 
 .form-column:first-child {
@@ -257,9 +256,9 @@ input.form-date {
 }
 
 .form-login {
-    width: 470px;
-    padding: 10px;
-    margin: 3% auto 20% auto;
+    width: 350px;
+    margin: 0 auto;
+    margin-top: 8%;
 }
 
 .form-column li,
diff --git a/assets/css/form.css b/assets/css/form.css
index bda71e83..d6336e26 100644
--- a/assets/css/form.css
+++ b/assets/css/form.css
@@ -1,10 +1,6 @@
 /* forms */
 form {
-    padding: 10px;
     margin-bottom: 20px;
-    background: #fefefe;
-    border: 1px solid #ddd;
-    border-radius: 5px;
 }
 
 label {
@@ -21,13 +17,13 @@ input[type="password"],
 input[type="text"] {
     color: #888;
     border: 1px solid #ccc;
-    width: 400px;
+    width: 300px;
     max-width: 95%;
     font-size: 1.0em;
     height: 25px;
     padding-bottom: 0;
     font-family: sans-serif;
-    margin-top: 5px;
+    margin-top: 10px;
     -webkit-appearance: none;
     appearance: none;
 }
@@ -129,6 +125,10 @@ input.form-date {
     width: 150px;
 }
 
+input.form-input-large {
+    width: 400px;
+}
+
 .form-row {
     margin-top: 10px;
     margin-bottom: 20px;
@@ -137,8 +137,7 @@ input.form-date {
 .form-column {
     float: left;
     margin-bottom: 60px;
-    padding-right: 30px;
-    padding-left: 30px;
+    padding-right: 50px;
 }
 
 .form-column:first-child {
@@ -150,9 +149,9 @@ input.form-date {
 }
 
 .form-login {
-    width: 470px;
-    padding: 10px;
-    margin: 3% auto 20% auto;
+    width: 350px;
+    margin: 0 auto;
+    margin-top: 8%;
 }
 
 .form-column li,
-- 
cgit v1.2.3