From a4f21e9482c682936b840faf19f0fcb9dfa6dace Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 8 Aug 2015 21:38:11 +0100
Subject: [PATCH] Standardized form button layout/colors

---
 resources/views/books/form.blade.php      |  7 ++++++-
 resources/views/chapters/delete.blade.php |  2 +-
 resources/views/chapters/form.blade.php   | 10 ++++++++--
 resources/views/pages/delete.blade.php    |  2 +-
 resources/views/pages/form.blade.php      |  1 +
 resources/views/pages/sort.blade.php      |  1 +
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/resources/views/books/form.blade.php b/resources/views/books/form.blade.php
index 163c37e96..40a6d92cb 100644
--- a/resources/views/books/form.blade.php
+++ b/resources/views/books/form.blade.php
@@ -4,8 +4,13 @@
     <label for="name">Book Name</label>
     @include('form/text', ['name' => 'name'])
 </div>
+
 <div class="form-group description-input">
     <label for="description">Description</label>
     @include('form/textarea', ['name' => 'description'])
 </div>
-<button type="submit" class="button pos">Save</button>
\ No newline at end of file
+
+<div class="form-group">
+    <a href="/books" class="button muted">Cancel</a>
+    <button type="submit" class="button pos">Save Book</button>
+</div>
\ No newline at end of file
diff --git a/resources/views/chapters/delete.blade.php b/resources/views/chapters/delete.blade.php
index 094cb7058..1607e7b6a 100644
--- a/resources/views/chapters/delete.blade.php
+++ b/resources/views/chapters/delete.blade.php
@@ -11,8 +11,8 @@
         <form action="{{$chapter->getUrl()}}" method="POST">
             {!! csrf_field() !!}
             <input type="hidden" name="_method" value="DELETE">
+            <a href="{{$chapter->getUrl()}}" class="button muted">Cancel</a>
             <button type="submit" class="button neg">Confirm</button>
-            <a href="{{$chapter->getUrl()}}" class="button">Cancel</a>
         </form>
     </div>
 
diff --git a/resources/views/chapters/form.blade.php b/resources/views/chapters/form.blade.php
index 4eb96fae1..cc66c15e0 100644
--- a/resources/views/chapters/form.blade.php
+++ b/resources/views/chapters/form.blade.php
@@ -1,11 +1,17 @@
 
-{{ csrf_field() }}
+{!! csrf_field() !!}
+
 <div class="form-group title-input">
     <label for="name">Chapter Name</label>
     @include('form/text', ['name' => 'name'])
 </div>
+
 <div class="form-group description-input">
     <label for="description">Description</label>
     @include('form/textarea', ['name' => 'description'])
 </div>
-<button type="submit" class="button pos">Save</button>
\ No newline at end of file
+
+<div class="form-group">
+    <a onclick="window.history.back();" class="button muted">Cancel</a>
+    <button type="submit" class="button pos">Save</button>
+</div>
diff --git a/resources/views/pages/delete.blade.php b/resources/views/pages/delete.blade.php
index 4e6a14813..3d199cd1d 100644
--- a/resources/views/pages/delete.blade.php
+++ b/resources/views/pages/delete.blade.php
@@ -9,8 +9,8 @@
         <form action="{{$page->getUrl()}}" method="POST">
             {!! csrf_field() !!}
             <input type="hidden" name="_method" value="DELETE">
+            <a href="{{$page->getUrl()}}" class="button muted">Cancel</a>
             <button type="submit" class="button neg">Confirm</button>
-            <a href="{{$page->getUrl()}}" class="button">Cancel</a>
         </form>
     </div>
 
diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index 8d5cdb158..c0a7b4379 100644
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -13,6 +13,7 @@
         @include('form/textarea', ['name' => 'html'])
     </div>
     <div class="margin-top large">
+        <a onclick="window.history.back();" class="button muted">Cancel</a>
         <button type="submit" class="button pos">Save Page</button>
     </div>
 </div>
diff --git a/resources/views/pages/sort.blade.php b/resources/views/pages/sort.blade.php
index 02904f638..4511a8508 100644
--- a/resources/views/pages/sort.blade.php
+++ b/resources/views/pages/sort.blade.php
@@ -27,6 +27,7 @@
             <input type="hidden" name="_method" value="PUT">
             <input type="hidden" id="sort-tree-input" name="sort-tree">
             <div class="list">
+                <a href="{{$book->getUrl()}}" class="button muted">Cancel</a>
                 <button class="button pos" type="submit">Save Ordering</button>
             </div>
         </form>