Updates for Titan v1.*

bpocallaghan · May 21, 2019 · 9f6d7ba · 9f6d7ba
1 parent 1e7f5f4
commit 9f6d7ba
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/app/Controllers/Admin/OrderController.php b/app/Controllers/Admin/OrderController.php
@@ -5,7 +5,7 @@
 use App\Http\Requests;
 use Illuminate\Http\Request;
 use Bpocallaghan\Testimonials\Models\Testimonial;
-use App\Http\Controllers\Admin\AdminController;
+use Bpocallaghan\Titan\Http\Controllers\Admin\AdminController;
 
 class OrderController extends AdminController
 {

diff --git a/app/Controllers/Admin/TestimonialsController.php b/app/Controllers/Admin/TestimonialsController.php
@@ -6,7 +6,7 @@
 use App\Http\Requests;
 use Illuminate\Http\Request;
 use Bpocallaghan\Testimonials\Models\Testimonial;
-use App\Http\Controllers\Admin\AdminController;
+use Bpocallaghan\Titan\Http\Controllers\Admin\AdminController;
 
 class TestimonialsController extends AdminController
 {

diff --git a/app/Models/Testimonial.php b/app/Models/Testimonial.php
@@ -2,7 +2,7 @@
 
 namespace Bpocallaghan\Testimonials\Models;
 
-use Titan\Models\TitanCMSModel;
+use Bpocallaghan\Titan\Models\TitanCMSModel;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**

diff --git a/app/TestimonialsServiceProvider.php b/app/TestimonialsServiceProvider.php
@@ -14,8 +14,7 @@ class TestimonialsServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->loadViewsFrom(__DIR__ . '/../resources/views/admin', 'admin.testimonials');
-        $this->loadViewsFrom(__DIR__ . '/../resources/views/website', 'website.testimonials');
+        $this->loadViewsFrom(__DIR__ . '/../resources/views', 'testimonials');
 
         $this->registerCommand(PublishCommand::class, 'publish');
     }

diff --git a/database/migrations/2017_06_20_114920_create_testimonials_table.php b/database/migrations/2017_06_20_114920_create_testimonials_table.php
@@ -18,6 +18,7 @@ public function up()
             $table->increments('id')->unique()->index();
             $table->string('customer');
             $table->string('link')->nullable();
+            $table->string('image')->nullable();
             $table->text('description');
             $table->unsignedInteger('list_order')->default(999);
             $table->timestamps();

diff --git a/resources/views/admin/add_edit.blade.php b/resources/views/admin/add_edit.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.admin')
+@extends('titan::layouts.admin')
 
 @section('content')
     <div class="row">
@@ -13,7 +13,7 @@
 
                 <div class="box-body no-padding">
 
-                    @include('admin.partials.info')
+                    @include('titan::admin.partials.info')
 
 					<form method="POST" action="{{$selectedNavigation->url . (isset($item)? "/{$item->id}" : '')}}" accept-charset="UTF-8">
                         <input name="_token" type="hidden" value="{{ csrf_token() }}">
@@ -51,7 +51,7 @@
                             </section>
                         </fieldset>
 
-						@include('admin.partials.form_footer')
+						@include('titan::admin.partials.form_footer')
                     </form>
                 </div>
             </div>

diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.admin')
+@extends('titan::layouts.admin')
 
 @section('content')
 	<div class="row">
@@ -13,9 +13,9 @@
 
 				<div class="box-body">
 
-					@include('admin.partials.info')
+					@include('titan::admin.partials.info')
 
-					@include('admin.partials.toolbar', ['order' => true])
+					@include('titan::admin.partials.toolbar', ['order' => true])
 
 					<table id="tbl-list" data-server="false" class="dt-table table table-striped table-bordered" cellspacing="0" width="100%">
                         <thead>

diff --git a/resources/views/admin/order.blade.php b/resources/views/admin/order.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.admin')
+@extends('titan::layouts.admin')
 
 @section('content')
     <div class="row">
@@ -31,7 +31,7 @@
         </div>
     </div>
 
-    @include('admin.partials.nestable')
+    @include('titan::admin.partials.nestable')
 @endsection
 
 @section('scripts')

diff --git a/resources/views/admin/show.blade.php b/resources/views/admin/show.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.admin')
+@extends('titan::layouts.admin')
 
 @section('content')
     <div class="row">
@@ -13,7 +13,7 @@
 
                 <div class="box-body no-padding">
 
-                    @include('admin.partials.info')
+                    @include('titan::admin.partials.info')
 
                     <form>
                         <fieldset>
@@ -41,7 +41,7 @@
                             </section>
                         </fieldset>
 
-                        @include('admin.partials.form_footer', ['submit' => false])
+                        @include('titan::admin.partials.form_footer', ['submit' => false])
                     </form>
                 </div>
             </div>