From: Nilesh Deepak <redacted>
Date: Wed, 5 Jul 2017 06:56:02 +0000 (+0530)
Subject: Applied required changes
X-Git-Tag: v0.19.0~1^2~15^2~32^2~14
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d99fd1fd6544ef0d21bfe339572df8657ff36546

Applied required changes
---

d99fd1fd6544ef0d21bfe339572df8657ff36546
diff --cc app/Http/Controllers/BookController.php
index 9c1154281,4ed945944..7aa434a80
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@@ -39,9 -39,10 +39,9 @@@ class BookController extends Controlle
          $books = $this->entityRepo->getAllPaginated('book', 16);
          $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
          $popular = $this->entityRepo->getPopular('book', 3, 0);
 -        $display = $this->currentUser->display;
 +        $books_display = $this->currentUser->books_display;
          $this->setPageTitle('Books');
-         return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'books_display' => $books_display]);
 -
 -        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'display' => $display]); //added displaly to access user display
++        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'books_display' => $books_display] );
      }
  
      /**
diff --cc app/User.php
index 24eca12f3,3d77cd8ee..703322cbd
--- a/app/User.php
+++ b/app/User.php
@@@ -22,7 -22,7 +22,7 @@@ class User extends Model implements Aut
       * The attributes that are mass assignable.
       * @var array
       */
-     protected $fillable = ['name', 'email', 'image_id', 'books_display'];
 -    protected $fillable = ['name', 'email', 'image_id', 'display']; //to write in user database 
++    protected $fillable = ['name', 'email', 'image_id', 'books_display' ];
  
      /**
       * The attributes excluded from the model's JSON form.
diff --cc database/migrations/2014_10_12_000000_create_users_table.php
index 62ac94b60,17e71de5f..ce605b7cd
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@@ -17,8 -17,7 +17,8 @@@ class CreateUsersTable extends Migratio
              $table->string('name');
              $table->string('email')->unique();
              $table->string('password', 60);
-             $table->rememberToken();
 +            $table->string('books_display')->default('grid');
+             $table->rememberToken();
              $table->nullableTimestamps();
          });
  
diff --cc database/migrations/2015_07_12_114933_create_books_table.php
index b8a6c9829,4220809d5..b87b99db2
--- a/database/migrations/2015_07_12_114933_create_books_table.php
+++ b/database/migrations/2015_07_12_114933_create_books_table.php
@@@ -23,8 -23,7 +23,8 @@@ class CreateBooksTable extends Migratio
              $table->string('name');
              $table->string('slug')->indexed();
              $table->text('description');
-             $table->nullableTimestamps();
 +            $table->string('image');
+             $table->nullableTimestamps();
          });
      }
  
diff --cc resources/assets/sass/styles.scss
index bfa95fc1e,afb9d531b..4f9c16efb
--- a/resources/assets/sass/styles.scss
+++ b/resources/assets/sass/styles.scss
@@@ -276,28 -276,3 +276,54 @@@ $btt-size: 40px
  
  
  
++.galleryItem {
++  width: 22%;
++  padding: 5px;
++  float: left;
++  height: 330px;
++  margin: 2% 1% 2% 1%;
++  overflow: hidden;
++  border: 1px solid #9e9e9e;
++  h3 {
++    font-size: 1.2em;
++    text-align: center;
++  }
++  p {
++    font-size: 0.8em;
++    text-align: center;
++  }
++  img {
++    height: 192px;
++    width: 120px;
++    margin-top: 5%;
++  }
++  &.collapse {
++    height: 130px;
++  }
++}
++
 +.galleryItem {
 +  width: 22%;
 +  padding: 5px;
 +  float: left;
 +  height: 330px;
 +  margin: 2% 1% 2% 1%;
 +  overflow: hidden;
 +  border: 1px solid #9e9e9e;
 +  h3 {
 +    font-size: 1.2em;
 +    text-align: center;
 +  }
 +  p {
 +    font-size: 0.8em;
 +    text-align: center;
 +  }
 +  img {
 +    height: 192px;
 +    width: 120px;
 +    margin-top: 5%;
 +  }
 +  &.collapse {
 +    height: 130px;
 +  }
 +}