From 964a5fc5146adf4b4b9c70cfafee692626b5630f Mon Sep 17 00:00:00 2001
From: James Brooks <james@bluebaytravel.co.uk>
Date: Tue, 27 Oct 2015 08:19:53 +0000
Subject: [PATCH] Move the banner form into Theme. Closes #1051

---
 .../dashboard/settings/app-setup.blade.php    | 18 +-----------------
 .../views/dashboard/settings/theme.blade.php  | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php
index 7a77bcb6..2734a561 100644
--- a/resources/views/dashboard/settings/app-setup.blade.php
+++ b/resources/views/dashboard/settings/app-setup.blade.php
@@ -13,7 +13,7 @@
             </div>
             <div class="row">
                 <div class="col-sm-12">
-                    <form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST" enctype="multipart/form-data">
+                    <form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST">
                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
                         @include('dashboard.partials.errors')
                         <fieldset>
@@ -84,22 +84,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col-xs-12">
-                                    <div class="form-group">
-                                        <label>{{ trans('forms.settings.app-setup.banner') }}</label>
-                                        @if($banner = Setting::get('app_banner'))
-                                        <div id="banner-view" class="well">
-                                            <img src="data:{{ Setting::get('app_banner_type') }};base64,{{ $banner }}" style="max-width: 100%">
-                                            <br><br>
-                                            <button id="remove-banner" class="btn btn-danger">{{ trans('forms.remove') }}</button>
-                                        </div>
-                                        @endif
-                                        <input type="file" name="app_banner" class="form-control">
-                                        <span class="help-block">{{ trans('forms.settings.app-setup.banner-help') }}</span>
-                                    </div>
-                                </div>
-                            </div>
                         </fieldset>
 
                         <div class="row">
diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php
index be606186..d2a3ab34 100644
--- a/resources/views/dashboard/settings/theme.blade.php
+++ b/resources/views/dashboard/settings/theme.blade.php
@@ -13,9 +13,26 @@
             </div>
             <div class="row">
                 <div class="col-sm-12">
-                    <form name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST">
+                    <form name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST"  enctype="multipart/form-data">
                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
                         @include('dashboard.partials.errors')
+                        <div class="row">
+                            <div class="col-xs-12">
+                                <div class="form-group">
+                                    <label>{{ trans('forms.settings.app-setup.banner') }}</label>
+                                    @if($banner = Setting::get('app_banner'))
+                                    <div id="banner-view" class="well">
+                                        <img src="data:{{ Setting::get('app_banner_type') }};base64,{{ $banner }}" style="max-width: 100%">
+                                        <br><br>
+                                        <button id="remove-banner" class="btn btn-danger">{{ trans('forms.remove') }}</button>
+                                    </div>
+                                    @endif
+                                    <input type="file" name="app_banner" class="form-control">
+                                    <span class="help-block">{{ trans('forms.settings.app-setup.banner-help') }}</span>
+                                </div>
+                            </div>
+                        </div>
+                        <hr>
                         <fieldset>
                             <div class="row">
                                 <div class="col-xs-6">