Cleaned book-show page/chapter list design

diff --git a/gulpfile.js b/gulpfile.js
index 36693223d1c3fc4c61e6358c592979a4e7db2622..7092e6ff838a12e2db220d06d77b18df5c7fcf1f 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -14,6 +14,6 @@ var elixir = require('laravel-elixir');
 elixir(function(mix) {
     mix.sass('styles.scss');
     mix.scripts('image-manager.js', 'public/js/image-manager.js');
-    mix.scripts('book-sidebar.js', 'public/js/book-sidebar.js');
+    mix.scripts('book-dashboard.js', 'public/js/book-dashboard.js');
     mix.scripts('jquery-extensions.js', 'public/js/jquery-extensions.js');
 });

diff --git a/resources/assets/js/book-sidebar.js b/resources/assets/js/book-dashboard.js
similarity index 100%
rename from resources/assets/js/book-sidebar.js
rename to resources/assets/js/book-dashboard.js

diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss
index 665315287745e679db57e79a337f10851df15a72..2c3a70bcf096f362af76efaed3732a8bbe900ee7 100644 (file)
--- a/resources/assets/sass/styles.scss
+++ b/resources/assets/sass/styles.scss
@@ -169,7 +169,7 @@ body.flexbox {
 
 .page-list {
   h3 {
-    margin: $-l 0;
+    margin: $-l 0 $-m 0;
   }
   a.chapter {
     color: $color-chapter;
@@ -177,16 +177,43 @@ body.flexbox {
   .inset-list {
     display: block;
     overflow: hidden;
-    padding-left: $-l*2;
-    border-top: 3px dotted #EEE;
+   // padding-left: $-m;
+    margin-bottom: $-l;
   }
   h4 {
     display: block;
-    margin: $-m 0;
+    margin: $-s 0 0 0;
+    border-left: 5px solid $color-page;
+    padding: $-xs 0 $-xs $-m;
   }
   hr {
     margin-top: 0;
   }
+  .book-child {
+    padding-left: $-l;
+    &.page {
+      border-left: 5px solid $color-page;
+    }
+    &.chapter {
+      border-left: 5px solid $color-chapter;
+    }
+  }
+}
+.chapter-toggle {
+  cursor: pointer;
+  margin: 0 0 $-l 0;
+  transition: all ease-in-out 180ms;
+  i {
+    transition: all ease-in-out 180ms;
+    transform: rotate(0deg);
+    transform-origin: 25% 50%;
+  }
+  &.open {
+    margin-bottom: 0;
+  }
+  &.open i {
+    transform: rotate(90deg);
+  }
 }
 
 .side-nav {

diff --git a/resources/views/books/form.blade.php b/resources/views/books/form.blade.php
index 40a6d92cb0972ed770da5cdd54134453cb481b06..dc0fd0a3fbc0490a02881d3ff507890d6c5972d6 100644 (file)
--- a/resources/views/books/form.blade.php
+++ b/resources/views/books/form.blade.php
@@ -11,6 +11,6 @@
 </div>
 
 <div class="form-group">
-    <a href="/books" class="button muted">Cancel</a>
+    <a href="{{ back()->getTargetUrl() }}" 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/books/show.blade.php b/resources/views/books/show.blade.php
index 6e1aaf7b484c7ff481cff3a9c4a73d7b9000423b..9d2841a22dfafcd34b0e840ff9955c1006d95005 100644 (file)
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -39,10 +39,10 @@
                         <hr>
                         @if(count($book->children()) > 0)
                             @foreach($book->children() as $childElement)
-                                <div class="book-child">
+                                <div class="book-child {{ $childElement->getName() }}">
                                     <h3>
                                         <a href="{{ $childElement->getUrl() }}" class="{{ $childElement->getName() }}">
-                                            <i class="zmdi {{ $childElement->isA('chapter') ? 'zmdi-collection-bookmark chapter-toggle':'zmdi-file-text'}}"></i>{{ $childElement->name }}
+                                            <i class="zmdi {{ $childElement->isA('chapter') ? 'zmdi-collection-bookmark':'zmdi-file-text'}}"></i>{{ $childElement->name }}
                                         </a>
                                     </h3>
                                     <p class="text-muted">
@@ -50,6 +50,7 @@
                                     </p>
 
                                     @if($childElement->isA('chapter') && count($childElement->pages) > 0)
+                                        <p class="text-muted chapter-toggle open"><i class="zmdi zmdi-caret-right"></i> {{ count($childElement->pages) }} Pages</p>
                                         <div class="inset-list">
                                             @foreach($childElement->pages as $page)
                                                 <h4><a href="{{$page->getUrl()}}"><i class="zmdi zmdi-file-text"></i>{{$page->name}}</a></h4>
@@ -109,6 +110,7 @@
 
             $('.chapter-toggle').click(function(e) {
                 e.preventDefault();
+                $(this).toggleClass('open');
                 $(this).closest('.book-child').find('.inset-list').slideToggle(180);
             });
 

diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 9eb27f2257a0cc02d3334e92c37e3dcde0b8688d..bd61500aa98df034e2316ae84e1ea88bfa3cdb71 100644 (file)
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -7,7 +7,7 @@
             <div class="row">
                 <div class="col-md-4 faded">
                     <div class="breadcrumbs">
-                        <a href="{{$book->getUrl()}}"><i class="zmdi zmdi-book"></i>{{ $book->name }}</a>
+                        <a href="{{$book->getUrl()}}" class="text-book"><i class="zmdi zmdi-book"></i>{{ $book->name }}</a>
                     </div>
                 </div>
                 <div class="col-md-8 faded">