From 686953aafddd555246d7d934e7671a756ef28c23 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 13 Apr 2015 22:43:51 +0300
Subject: [PATCH] Working on L5

---
 app/Models/AccountGatewayToken.php         | 1 +
 app/Models/Affiliate.php                   | 2 ++
 app/Models/License.php                     | 1 +
 app/Models/Project.php                     | 1 +
 app/Models/ProjectCode.php                 | 2 +-
 app/Models/Timesheet.php                   | 1 +
 app/Models/TimesheetEvent.php              | 2 +-
 app/Models/TimesheetEventSource.php        | 2 +-
 resources/views/accounts/details.blade.php | 6 ++----
 9 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/Models/AccountGatewayToken.php b/app/Models/AccountGatewayToken.php
index 7726df1301f0..b706882af77d 100644
--- a/app/Models/AccountGatewayToken.php
+++ b/app/Models/AccountGatewayToken.php
@@ -1,5 +1,6 @@
 <?php namespace App\Models;
 
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class AccountGatewayToken extends Eloquent
diff --git a/app/Models/Affiliate.php b/app/Models/Affiliate.php
index f88b96c3fc1e..63fcb71ce357 100644
--- a/app/Models/Affiliate.php
+++ b/app/Models/Affiliate.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class Affiliate extends Eloquent
 {
     public $timestamps = true;
diff --git a/app/Models/License.php b/app/Models/License.php
index dff6f25b409a..93898f8d7d18 100644
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -1,5 +1,6 @@
 <?php namespace App\Models;
 
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class License extends Eloquent
diff --git a/app/Models/Project.php b/app/Models/Project.php
index 2dad20d29436..921090293581 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -2,6 +2,7 @@
 
 use Auth;
 use Utils;
+use Eloquent;
 
 class Project extends Eloquent
 {
diff --git a/app/Models/ProjectCode.php b/app/Models/ProjectCode.php
index 5849c5f23d89..1eece95d4c65 100644
--- a/app/Models/ProjectCode.php
+++ b/app/Models/ProjectCode.php
@@ -2,7 +2,7 @@
 
 use Auth;
 use Utils;
-
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class ProjectCode extends Eloquent
diff --git a/app/Models/Timesheet.php b/app/Models/Timesheet.php
index 107110ebb718..085cb3ef3390 100644
--- a/app/Models/Timesheet.php
+++ b/app/Models/Timesheet.php
@@ -1,5 +1,6 @@
 <?php namespace App\Models;
 
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Timesheet extends Eloquent
diff --git a/app/Models/TimesheetEvent.php b/app/Models/TimesheetEvent.php
index 7fc981198000..44a04f842119 100644
--- a/app/Models/TimesheetEvent.php
+++ b/app/Models/TimesheetEvent.php
@@ -2,7 +2,7 @@
 
 use Auth;
 use Utils;
-
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class TimesheetEvent extends Eloquent
diff --git a/app/Models/TimesheetEventSource.php b/app/Models/TimesheetEventSource.php
index 9ae36be0c156..99ee62f69f86 100644
--- a/app/Models/TimesheetEventSource.php
+++ b/app/Models/TimesheetEventSource.php
@@ -2,7 +2,7 @@
 
 use Auth;
 use Utils;
-
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class TimesheetEventSource extends Eloquent
diff --git a/resources/views/accounts/details.blade.php b/resources/views/accounts/details.blade.php
index 592a147042df..0ad1dfeeaff0 100644
--- a/resources/views/accounts/details.blade.php
+++ b/resources/views/accounts/details.blade.php
@@ -91,6 +91,8 @@
         {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
 	</center>
 
+    {!! Former::close() !!}
+
 
     <div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="passwordModalLabel" aria-hidden="true">
         <div class="modal-dialog">
@@ -144,14 +146,10 @@
     </div>
 
 
-	{!! Former::close() !!}
-
 	{!! Form::open(['url' => 'remove_logo', 'class' => 'removeLogoForm']) !!}	
 	{!! Form::close() !!}
 
 
-
-
 	<script type="text/javascript">
 
 		$(function() {