From 1a059ad2d42c0f92ebd5bae34a95f2dc3bbd47e0 Mon Sep 17 00:00:00 2001
From: Mark Walet <mark.walet@gmail.com>
Date: Wed, 16 Mar 2016 12:48:38 +0100
Subject: [PATCH 1/8] Icon class update

---
 resources/views/ManageEvent/Partials/TopNav.blade.php     | 4 ++--
 resources/views/ManageOrganiser/Partials/TopNav.blade.php | 2 +-
 resources/views/Shared/Layouts/Master.blade.php           | 8 +++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/resources/views/ManageEvent/Partials/TopNav.blade.php b/resources/views/ManageEvent/Partials/TopNav.blade.php
index 835cdc96..cde7cf5b 100644
--- a/resources/views/ManageEvent/Partials/TopNav.blade.php
+++ b/resources/views/ManageEvent/Partials/TopNav.blade.php
@@ -16,7 +16,7 @@
     <li class="navbar-main">
         <a href="javascript:void(0);" class="toggleSidebar" title="Show sidebar">
             <span class="toggleMenuIcon">
-                <span class="icon"><i class="ico-menu"></i></span>
+                <span class="icon ico-menu"></span>
             </span>
         </a>
     </li>
@@ -24,7 +24,7 @@
     <li class="nav-button">
         <a target="_blank" href="{{$event->event_url}}">
             <span>
-                <i class="ico-eye2"></i> &nbsp;<hide class="hidden-xs">View </hide>Event Page
+                <i class="ico-eye2"></i>&nbsp;<hide class="hidden-xs">View </hide>Event Page
             </span>
         </a>
     </li>
diff --git a/resources/views/ManageOrganiser/Partials/TopNav.blade.php b/resources/views/ManageOrganiser/Partials/TopNav.blade.php
index e4bf28b9..af26b4e4 100644
--- a/resources/views/ManageOrganiser/Partials/TopNav.blade.php
+++ b/resources/views/ManageOrganiser/Partials/TopNav.blade.php
@@ -3,7 +3,7 @@
     <li class="navbar-main">
         <a href="javascript:void(0);" class="toggleSidebar" title="Show sidebar">
             <span class="toggleMenuIcon">
-                <span class="icon"><i class="ico-menu"></i></span>
+                <span class="icon ico-menu"></span>
             </span>
         </a>
     </li>
diff --git a/resources/views/Shared/Layouts/Master.blade.php b/resources/views/Shared/Layouts/Master.blade.php
index 707e5f5d..c7870a29 100644
--- a/resources/views/Shared/Layouts/Master.blade.php
+++ b/resources/views/Shared/Layouts/Master.blade.php
@@ -75,17 +75,15 @@
 
                     <li>
                         <a data-href="{{route('showEditUser')}}" data-modal-id="EditUser"
-                           class="loadModal editUserModal" href="javascript:void(0);"><span class="icon"><i
-                                        class="ico-user"></i></span>My Profile</a>
+                           class="loadModal editUserModal" href="javascript:void(0);"><span class="icon ico-user"></span>My Profile</a>
                     </li>
                     <li class="divider"></li>
                     <li><a data-href="{{route('showEditAccount')}}" data-modal-id="EditAccount" class="loadModal"
-                           href="javascript:void(0);"><span class="icon"><i class="ico-cog"></i></span>Account
-                            Setting</a></li>
+                           href="javascript:void(0);"><span class="icon ico-cog"></span>Account Settings</a></li>
 
 
                     <li class="divider"></li>
-                    <li><a href="{{route('logout')}}"><span class="icon"><i class="ico-exit"></i></span> Sign Out</a></li>
+                    <li><a href="{{route('logout')}}"><span class="icon ico-exit"></span>Sign Out</a></li>
                 </ul>
             </li>
         </ul>

From 7566986124618e83741539fe3f71584bbe5c6526 Mon Sep 17 00:00:00 2001
From: Mark Walet <mark.walet@gmail.com>
Date: Wed, 16 Mar 2016 12:50:34 +0100
Subject: [PATCH 2/8] Update event customize view

---
 app/Helpers/helpers.php                       |  2 +-
 .../views/ManageEvent/Customize.blade.php     | 50 ++++++-------------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php
index 819919c0..a8f9d2c9 100644
--- a/app/Helpers/helpers.php
+++ b/app/Helpers/helpers.php
@@ -7,7 +7,7 @@
  * @param string $dec_point
  * @param string $thousands_sep
  *
- * @return decimal
+ * @return string
  */
 function money($amount, $currency_code = '', $decimals = 2, $dec_point = '.', $thousands_sep = ',')
 {
diff --git a/resources/views/ManageEvent/Customize.blade.php b/resources/views/ManageEvent/Customize.blade.php
index db35a72c..0f47e7c0 100644
--- a/resources/views/ManageEvent/Customize.blade.php
+++ b/resources/views/ManageEvent/Customize.blade.php
@@ -211,42 +211,22 @@
                             <table class="table">
                                 <thead>
                                 <tr>
-                                    <th>
-                                        Affiliate Name
-                                    </th>
-                                    <th>
-                                        Visits Generated
-                                    </th>
-                                    <th>
-                                        Ticket Sales Generated
-                                    </th>
-                                    <th>
-                                        Sales Volume Generated
-                                    </th>
-                                    <th>
-                                        Last Referral
-                                    </th>
+                                    <th>Affiliate Name</th>
+                                    <th>Visits Generated</th>
+                                    <th>Ticket Sales Generated</th>
+                                    <th>Sales Volume Generated</th>
+                                    <th>Last Referral</th>
                                 </tr>
                                 </thead>
 
                                 <tbody>
                                 @foreach($event->affiliates as $affiliate)
                                     <tr>
-                                        <td>
-                                            {{{$affiliate->name}}}
-                                        </td>
-                                        <td>
-                                            {{$affiliate->visits}}
-                                        </td>
-                                        <td>
-                                            {{$affiliate->tickets_sold}}
-                                        </td>
-                                        <td>
-                                            {{money($affiliate->sales_volume, $event->currency->code)}}
-                                        </td>
-                                        <td>
-                                            {{{ $affiliate->updated_at->format('M dS H:i A') }}}
-                                        </td>
+                                        <td>{{ $affiliate->name }}</td>
+                                        <td>{{ $affiliate->visits }}</td>
+                                        <td>{{ $affiliate->tickets_sold }}</td>
+                                        <td>{{ money($affiliate->sales_volume, $event->currency->code) }}</td>
+                                        <td>{{ $affiliate->updated_at->format('M dS H:i A') }}</td>
                                     </tr>
                                 @endforeach
                                 </tbody>
@@ -279,10 +259,10 @@
 
                         {!! Form::label('social_share_text', 'Social Share Text', array('class'=>'control-label ')) !!}
 
-                        {{!!  Form::textarea('social_share_text', $event->social_share_text, [
+                        {!!  Form::textarea('social_share_text', $event->social_share_text, [
                             'class' => 'form-control',
                             'rows' => 4
-                        ])  !!}}
+                        ])  !!}
                         <div class="help-block">
                             This is the text which will be share by default when a user shares your event on social
                             networks
@@ -357,7 +337,7 @@
                                     <div id="bgColor"
                                          class="panel-collapse {{($event->bg_type == 'color') ? 'in' : 'collapse'}}">
                                         <div class="panel-body">
-                                            <input value="{{{$event->bg_color}}}" type="color" name="bg_color"/>
+                                            <input value="{{ $event->bg_color }}" type="color" name="bg_color"/>
                                         </div>
                                     </div>
                                 </div>
@@ -424,7 +404,6 @@
                                 {!! Form::submit('Save Changes', ['class'=>"btn btn-success"]) !!}
                             </div>
 
-
                             <div class="panel-footer ar hide">
                                 {!! Form::button('Cancel', ['class'=>"btn modal-close btn-danger",'data-dismiss'=>'modal']) !!}
                                 {!! Form::submit('Save Changes', ['class'=>"btn btn-success"]) !!}
@@ -509,8 +488,7 @@
                             </label>
                         </div>
                         <div class="help-block">
-                            If checked, the buyer will be asked for details of each attendee; as opposed to just
-                            himself.
+                            If checked, the buyer will be asked for details of each attendee; as opposed to just himself.
                         </div>
                     </div>
 

From a5b40e10df8f5dd6d9012feaca94ec0b045dcaa8 Mon Sep 17 00:00:00 2001
From: Dave <dave@attendize.com>
Date: Wed, 16 Mar 2016 12:51:36 +0000
Subject: [PATCH 3/8]  - L5 update work  - Adding comments  - Removing unused
 method in event dashboard model

---
 app/Http/Controllers/EventController.php      | 197 ++++++++++--------
 .../Controllers/EventCustomizeController.php  | 133 ++++++++----
 .../Controllers/EventDashboardController.php  |  38 +---
 3 files changed, 205 insertions(+), 163 deletions(-)

diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index 0e2f52e5..a72707a4 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -5,78 +5,89 @@ namespace App\Http\Controllers;
 use App\Models\Event;
 use App\Models\EventImage;
 use App\Models\Organiser;
+use Illuminate\Http\Request;
 use Auth;
 use Carbon\Carbon;
 use Image;
-use Input;
-use Response;
 use Validator;
-use View;
+
 
 class EventController extends MyBaseController
 {
-    public function showCreateEvent()
+    /**
+     * Show the 'Create Event' Modal
+     *
+     * @param Request $request
+     * @return \Illuminate\View\View
+     */
+    public function showCreateEvent(Request $request)
     {
         $data = [
-            'modal_id'     => Input::get('modal_id'),
+            'modal_id'     => $request->get('modal_id'),
             'organisers'   => Organiser::scope()->lists('name', 'id'),
-            'organiser_id' => Input::get('organiser_id') ? Input::get('organiser_id') : false,
+            'organiser_id' => $request->get('organiser_id') ? $request->get('organiser_id') : false,
         ];
 
-        return View::make('ManageOrganiser.Modals.CreateEvent', $data);
+        return view('ManageOrganiser.Modals.CreateEvent', $data);
     }
 
-    public function postCreateEvent()
+    /**
+     * Create an event
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function postCreateEvent(Request $request)
     {
         $event = Event::createNew();
 
-        if (!$event->validate(Input::all())) {
-            return Response::json([
+        if (!$event->validate($request->all())) {
+            return response()->json([
                         'status'   => 'error',
                         'messages' => $event->errors(),
             ]);
         }
 
-        $event->title = Input::get('title');
-        $event->description = strip_tags(Input::get('description'));
-        $event->start_date = Input::get('start_date') ? Carbon::createFromFormat('d-m-Y H:i', Input::get('start_date')) : null;
+        $event->title = $request->get('title');
+        $event->description = strip_tags($request->get('description'));
+        $event->start_date = $request->get('start_date') ? Carbon::createFromFormat('d-m-Y H:i', $request->get('start_date')) : null;
 
         /*
-         * Venue location info (Usually autofilled from google maps)
+         * Venue location info (Usually auto-filled from google maps)
          */
 
-        $is_auto_address = (trim(Input::get('place_id')) !== '');
+        $is_auto_address = (trim($request->get('place_id')) !== '');
 
         if ($is_auto_address) { /* Google auto filled */
-            $event->venue_name = Input::get('name');
-            $event->venue_name_full = Input::get('venue_name_full');
-            $event->location_lat = Input::get('lat');
-            $event->location_long = Input::get('lng');
-            $event->location_address = Input::get('formatted_address');
-            $event->location_country = Input::get('country');
-            $event->location_country_code = Input::get('country_short');
-            $event->location_state = Input::get('administrative_area_level_1');
-            $event->location_address_line_1 = Input::get('route');
-            $event->location_address_line_2 = Input::get('locality');
-            $event->location_post_code = Input::get('postal_code');
-            $event->location_street_number = Input::get('street_number');
-            $event->location_google_place_id = Input::get('place_id');
+            $event->venue_name = $request->get('name');
+            $event->venue_name_full = $request->get('venue_name_full');
+            $event->location_lat = $request->get('lat');
+            $event->location_long = $request->get('lng');
+            $event->location_address = $request->get('formatted_address');
+            $event->location_country = $request->get('country');
+            $event->location_country_code = $request->get('country_short');
+            $event->location_state = $request->get('administrative_area_level_1');
+            $event->location_address_line_1 = $request->get('route');
+            $event->location_address_line_2 = $request->get('locality');
+            $event->location_post_code = $request->get('postal_code');
+            $event->location_street_number = $request->get('street_number');
+            $event->location_google_place_id = $request->get('place_id');
             $event->location_is_manual = 0;
         } else { /* Manually entered */
-            $event->venue_name = Input::get('location_venue_name');
-            $event->location_address_line_1 = Input::get('location_address_line_1');
-            $event->location_address_line_2 = Input::get('location_address_line_2');
-            $event->location_state = Input::get('location_state');
-            $event->location_post_code = Input::get('location_post_code');
+            $event->venue_name = $request->get('location_venue_name');
+            $event->location_address_line_1 = $request->get('location_address_line_1');
+            $event->location_address_line_2 = $request->get('location_address_line_2');
+            $event->location_state = $request->get('location_state');
+            $event->location_post_code = $request->get('location_post_code');
             $event->location_is_manual = 1;
         }
 
-        $event->end_date = Input::get('end_date') ? Carbon::createFromFormat('d-m-Y H:i', Input::get('end_date')) : null;
+        $event->end_date = $request->get('end_date') ? Carbon::createFromFormat('d-m-Y H:i', $request->get('end_date')) : null;
 
         $event->currency_id = Auth::user()->account->currency_id;
         //$event->timezone_id = Auth::user()->account->timezone_id;
 
-        if (Input::get('organiser_name')) {
+        if ($request->get('organiser_name')) {
             $organiser = Organiser::createNew(false, false, true);
 
             $rules = [
@@ -87,7 +98,7 @@ class EventController extends MyBaseController
                 'organiser_name.required' => 'You must give a name for the event organiser.',
             ];
 
-            $validator = Validator::make(Input::all(), $rules, $messages);
+            $validator = Validator::make($request->all(), $rules, $messages);
 
             if ($validator->fails()) {
                 return Response::json([
@@ -96,27 +107,28 @@ class EventController extends MyBaseController
                 ]);
             }
 
-            $organiser->name = Input::get('organiser_name');
-            $organiser->about = Input::get('organiser_about');
-            $organiser->email = Input::get('organiser_email');
-            $organiser->facebook = Input::get('organiser_facebook');
-            $organiser->twitter = Input::get('organiser_twitter');
+            $organiser->name = $request->get('organiser_name');
+            $organiser->about = $request->get('organiser_about');
+            $organiser->email = $request->get('organiser_email');
+            $organiser->facebook = $request->get('organiser_facebook');
+            $organiser->twitter = $request->get('organiser_twitter');
             $organiser->save();
             $event->organiser_id = $organiser->id;
-        } elseif (Input::get('organiser_id')) {
-            $event->organiser_id = Input::get('organiser_id');
+
+        } elseif ($request->get('organiser_id')) {
+            $event->organiser_id = $request->get('organiser_id');
         } else { /* Somethings gone horribly wrong */
         }
 
         $event->save();
 
-        if (Input::hasFile('event_image')) {
+        if ($request->hasFile('event_image')) {
             $path = public_path().'/'.config('attendize.event_images_path');
-            $filename = 'event_image-'.md5(time().$event->id).'.'.strtolower(Input::file('event_image')->getClientOriginalExtension());
+            $filename = 'event_image-'.md5(time().$event->id).'.'.strtolower($request->file('event_image')->getClientOriginalExtension());
 
             $file_full_path = $path.'/'.$filename;
 
-            Input::file('event_image')->move($path, $filename);
+            $request->file('event_image')->move($path, $filename);
 
             $img = Image::make($file_full_path);
 
@@ -136,7 +148,7 @@ class EventController extends MyBaseController
             $eventImage->save();
         }
 
-        return Response::json([
+        return response()->json([
                     'status'      => 'success',
                     'id'          => $event->id,
                     'redirectUrl' => route('showEventTickets', [
@@ -146,49 +158,56 @@ class EventController extends MyBaseController
         ]);
     }
 
-    public function postEditEvent($event_id)
+    /**
+     * Edit an event
+     *
+     * @param Request $request
+     * @param $event_id
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function postEditEvent(Request $request, $event_id)
     {
         $event = Event::scope()->findOrFail($event_id);
 
-        if (!$event->validate(Input::all())) {
-            return Response::json([
+        if (!$event->validate($request->all())) {
+            return response()->json([
                         'status'   => 'error',
                         'messages' => $event->errors(),
             ]);
         }
 
-        $event->is_live = Input::get('is_live');
-        $event->title = Input::get('title');
-        $event->description = strip_tags(Input::get('description'));
-        $event->start_date = Input::get('start_date') ? Carbon::createFromFormat('d-m-Y H:i', Input::get('start_date')) : null;
+        $event->is_live = $request->get('is_live');
+        $event->title = $request->get('title');
+        $event->description = strip_tags($request->get('description'));
+        $event->start_date = $request->get('start_date') ? Carbon::createFromFormat('d-m-Y H:i', $request->get('start_date')) : null;
 
         /*
          * If the google place ID is the same as before then don't update the venue
          */
-        if ((Input::get('place_id') !== $event->location_google_place_id) || $event->location_google_place_id == '') {
-            $is_auto_address = (trim(Input::get('place_id')) !== '');
+        if (($request->get('place_id') !== $event->location_google_place_id) || $event->location_google_place_id == '') {
+            $is_auto_address = (trim($request->get('place_id')) !== '');
 
             if ($is_auto_address) { /* Google auto filled */
-                $event->venue_name = Input::get('name');
-                $event->venue_name_full = Input::get('venue_name_full');
-                $event->location_lat = Input::get('lat');
-                $event->location_long = Input::get('lng');
-                $event->location_address = Input::get('formatted_address');
-                $event->location_country = Input::get('country');
-                $event->location_country_code = Input::get('country_short');
-                $event->location_state = Input::get('administrative_area_level_1');
-                $event->location_address_line_1 = Input::get('route');
-                $event->location_address_line_2 = Input::get('locality');
-                $event->location_post_code = Input::get('postal_code');
-                $event->location_street_number = Input::get('street_number');
-                $event->location_google_place_id = Input::get('place_id');
+                $event->venue_name = $request->get('name');
+                $event->venue_name_full = $request->get('venue_name_full');
+                $event->location_lat = $request->get('lat');
+                $event->location_long = $request->get('lng');
+                $event->location_address = $request->get('formatted_address');
+                $event->location_country = $request->get('country');
+                $event->location_country_code = $request->get('country_short');
+                $event->location_state = $request->get('administrative_area_level_1');
+                $event->location_address_line_1 = $request->get('route');
+                $event->location_address_line_2 = $request->get('locality');
+                $event->location_post_code = $request->get('postal_code');
+                $event->location_street_number = $request->get('street_number');
+                $event->location_google_place_id = $request->get('place_id');
                 $event->location_is_manual = 0;
             } else { /* Manually entered */
-                $event->venue_name = Input::get('location_venue_name');
-                $event->location_address_line_1 = Input::get('location_address_line_1');
-                $event->location_address_line_2 = Input::get('location_address_line_2');
-                $event->location_state = Input::get('location_state');
-                $event->location_post_code = Input::get('location_post_code');
+                $event->venue_name = $request->get('location_venue_name');
+                $event->location_address_line_1 = $request->get('location_address_line_1');
+                $event->location_address_line_2 = $request->get('location_address_line_2');
+                $event->location_state = $request->get('location_state');
+                $event->location_post_code = $request->get('location_post_code');
                 $event->location_is_manual = 1;
                 $event->location_google_place_id = '';
                 $event->venue_name_full = '';
@@ -201,21 +220,21 @@ class EventController extends MyBaseController
             }
         }
 
-        $event->end_date = Input::get('end_date') ? Carbon::createFromFormat('d-m-Y H:i', Input::get('end_date')) : null;
+        $event->end_date = $request->get('end_date') ? Carbon::createFromFormat('d-m-Y H:i', $request->get('end_date')) : null;
 
-        if (Input::get('remove_current_image') == '1') {
+        if ($request->get('remove_current_image') == '1') {
             EventImage::where('event_id', '=', $event->id)->delete();
         }
 
         $event->save();
 
-        if (Input::hasFile('event_image')) {
+        if ($request->hasFile('event_image')) {
             $path = public_path().'/'.config('attendize.event_images_path');
-            $filename = 'event_image-'.md5(time().$event->id).'.'.strtolower(Input::file('event_image')->getClientOriginalExtension());
+            $filename = 'event_image-'.md5(time().$event->id).'.'.strtolower($request->file('event_image')->getClientOriginalExtension());
 
             $file_full_path = $path.'/'.$filename;
 
-            Input::file('event_image')->move($path, $filename);
+            $request->file('event_image')->move($path, $filename);
 
             $img = Image::make($file_full_path);
 
@@ -236,7 +255,7 @@ class EventController extends MyBaseController
             $eventImage->save();
         }
 
-        return Response::json([
+        return response()->json([
                     'status'      => 'success',
                     'id'          => $event->id,
                     'message'     => 'Event Successfully Updated',
@@ -244,11 +263,17 @@ class EventController extends MyBaseController
         ]);
     }
 
-    public function postUploadEventImage()
+    /**
+     * Upload event image
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function postUploadEventImage(Request $request)
     {
-        if (Input::hasFile('event_image')) {
-            $the_file = \File::get(Input::file('event_image')->getRealPath());
-            $file_name = 'event_details_image-'.md5(microtime()).'.'.strtolower(Input::file('event_image')->getClientOriginalExtension());
+        if ($request->hasFile('event_image')) {
+            $the_file = \File::get($request->file('event_image')->getRealPath());
+            $file_name = 'event_details_image-'.md5(microtime()).'.'.strtolower($request->file('event_image')->getClientOriginalExtension());
 
             $relative_path_to_file = config('attendize.event_images_path').'/'.$file_name;
             $full_path_to_file = public_path().'/'.$relative_path_to_file;
@@ -262,12 +287,12 @@ class EventController extends MyBaseController
 
             $img->save($full_path_to_file);
             if (\Storage::put($file_name, $the_file)) {
-                return Response::json([
+                return response()->json([
                     'link' => '/'.$relative_path_to_file,
                 ]);
             }
 
-            return Response::json([
+            return response()->json([
                     'error' => 'There was a problem uploading your image.',
                 ]);
         }
diff --git a/app/Http/Controllers/EventCustomizeController.php b/app/Http/Controllers/EventCustomizeController.php
index c1e61dc9..49de921f 100644
--- a/app/Http/Controllers/EventCustomizeController.php
+++ b/app/Http/Controllers/EventCustomizeController.php
@@ -5,14 +5,18 @@ namespace App\Http\Controllers;
 use App\Models\Event;
 use File;
 use Image;
-use Input;
-use Response;
 use Validator;
-use View;
 use Illuminate\Http\Request;
 
 class EventCustomizeController extends MyBaseController
 {
+    /**
+     * Show the event customize page
+     *
+     * @param string $event_id
+     * @param string $tab
+     * @return \Illuminate\View\View
+     */
     public function showCustomize($event_id = '', $tab = '')
     {
         $data = $this->getEventViewData($event_id, [
@@ -21,9 +25,14 @@ class EventCustomizeController extends MyBaseController
             'tab' => $tab,
         ]);
 
-        return View::make('ManageEvent.Customize', $data);
+        return view('ManageEvent.Customize', $data);
     }
 
+    /**
+     * get an array of available event background images
+     *
+     * @return array
+     */
     public function getAvailableBackgroundImages()
     {
         $images = [];
@@ -37,6 +46,11 @@ class EventCustomizeController extends MyBaseController
         return $images;
     }
 
+    /**
+     * Get an array of event bg image thumbnails
+     *
+     * @return array
+     */
     public function getAvailableBackgroundImagesThumbs()
     {
         $images = [];
@@ -50,8 +64,14 @@ class EventCustomizeController extends MyBaseController
         return $images;
     }
 
-
-    public function postEditEventTicketSocial($event_id)
+    /**
+     * Edit social settings of an event
+     *
+     * @param Request $request
+     * @param $event_id
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function postEditEventTicketSocial(Request $request, $event_id)
     {
         $event = Event::scope()->findOrFail($event_id);
 
@@ -65,29 +85,29 @@ class EventCustomizeController extends MyBaseController
         ];
 
         $messages = [
-            'social_share_text.max' => 'Please keep the shate text under 3000 characters.',
+            'social_share_text.max' => 'Please keep the text under 3000 characters.',
         ];
 
-        $validator = Validator::make(Input::all(), $rules, $messages);
+        $validator = Validator::make($request->all(), $rules, $messages);
 
         if ($validator->fails()) {
-            return Response::json([
+            return response()->json([
                 'status' => 'error',
                 'messages' => $validator->messages()->toArray(),
             ]);
         }
 
-        $event->social_share_text = Input::get('social_share_text');
-        $event->social_show_facebook = Input::get('social_show_facebook');
-        $event->social_show_linkedin = Input::get('social_show_linkedin');
-        $event->social_show_twitter = Input::get('social_show_twitter');
-        $event->social_show_email = Input::get('social_show_email');
-        $event->social_show_googleplus = Input::get('social_show_googleplus');
+        $event->social_share_text = $request->get('social_share_text');
+        $event->social_show_facebook = $request->get('social_show_facebook');
+        $event->social_show_linkedin = $request->get('social_show_linkedin');
+        $event->social_show_twitter = $request->get('social_show_twitter');
+        $event->social_show_email = $request->get('social_show_email');
+        $event->social_show_googleplus = $request->get('social_show_googleplus');
         $event->save();
 
-        return Response::json([
+        return response()->json([
             'status' => 'success',
-            'message' => 'Social Settings Succesfully Upated',
+            'message' => 'Social Settings Successfully Updated',
         ]);
 
     }
@@ -117,7 +137,7 @@ class EventCustomizeController extends MyBaseController
         $validator = Validator::make($request->all(), $rules, $messages);
 
         if ($validator->fails()) {
-            return Response::json([
+            return response()->json([
                 'status' => 'error',
                 'messages' => $validator->messages()->toArray(),
             ]);
@@ -137,7 +157,14 @@ class EventCustomizeController extends MyBaseController
         ]);
     }
 
-    public function postEditEventFees($event_id)
+    /**
+     * Edit fees of an event
+     *
+     * @param Request $request
+     * @param $event_id
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function postEditEventFees(Request $request, $event_id)
     {
         $event = Event::scope()->findOrFail($event_id);
 
@@ -147,30 +174,37 @@ class EventCustomizeController extends MyBaseController
         ];
         $messages = [
             'organiser_fee_percentage.numeric' => 'Please enter a value between 0 and 100',
-            'organiser_fee_fixed.numeric' => 'Please check the format. It shoud be in the format 0.00.',
+            'organiser_fee_fixed.numeric' => 'Please check the format. It should be in the format 0.00.',
             'organiser_fee_fixed.between' => 'Please enter a value between 0 and 100.',
         ];
 
-        $validator = Validator::make(Input::all(), $rules, $messages);
+        $validator = Validator::make($request->all(), $rules, $messages);
 
         if ($validator->fails()) {
-            return Response::json([
+            return response()->json([
                 'status' => 'error',
                 'messages' => $validator->messages()->toArray(),
             ]);
         }
 
-        $event->organiser_fee_percentage = Input::get('organiser_fee_percentage');
-        $event->organiser_fee_fixed = Input::get('organiser_fee_fixed');
+        $event->organiser_fee_percentage = $request->get('organiser_fee_percentage');
+        $event->organiser_fee_fixed = $request->get('organiser_fee_fixed');
         $event->save();
 
-        return Response::json([
+        return response()->json([
             'status' => 'success',
-            'message' => 'Order Page Succesfully Upated',
+            'message' => 'Order Page Successfully Updated',
         ]);
     }
 
-    public function postEditEventOrderPage($event_id)
+    /**
+     * Edit the event order page settings
+     *
+     * @param Request $request
+     * @param $event_id
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function postEditEventOrderPage(Request $request, $event_id)
     {
         $event = Event::scope()->findOrFail($event_id);
 
@@ -178,27 +212,34 @@ class EventCustomizeController extends MyBaseController
         $rules = [];
         $messages = [];
 
-        $validator = Validator::make(Input::all(), $rules, $messages);
+        $validator = Validator::make($request->all(), $rules, $messages);
 
         if ($validator->fails()) {
-            return Response::json([
+            return response()->json([
                 'status' => 'error',
                 'messages' => $validator->messages()->toArray(),
             ]);
         }
 
-        $event->pre_order_display_message = trim(Input::get('pre_order_display_message'));
-        $event->post_order_display_message = trim(Input::get('post_order_display_message'));
-        $event->ask_for_all_attendees_info = (Input::get('ask_for_all_attendees_info') == 'on');
+        $event->pre_order_display_message = trim($request->get('pre_order_display_message'));
+        $event->post_order_display_message = trim($request->get('post_order_display_message'));
+        $event->ask_for_all_attendees_info = ($request->get('ask_for_all_attendees_info') == 'on');
         $event->save();
 
-        return Response::json([
+        return response()->json([
             'status' => 'success',
-            'message' => 'Order Page Successfully Upated',
+            'message' => 'Order Page Successfully Updated',
         ]);
     }
 
-    public function postEditEventDesign($event_id)
+    /**
+     * Edit event page design/colors etc.
+     *
+     * @param Request $request
+     * @param $event_id
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function postEditEventDesign(Request $request, $event_id)
     {
         $event = Event::scope()->findOrFail($event_id);
 
@@ -210,35 +251,35 @@ class EventCustomizeController extends MyBaseController
             'bg_image_path.max' => 'Please ensure the image is not larger than 2.5MB',
         ];
 
-        $validator = Validator::make(Input::all(), $rules, $messages);
+        $validator = Validator::make($request->all(), $rules, $messages);
 
         if ($validator->fails()) {
-            return Response::json([
+            return response()->json([
                 'status' => 'error',
                 'messages' => $validator->messages()->toArray(),
             ]);
         }
 
-        if (Input::get('bg_image_path_custom') && Input::get('bg_type') == 'image') {
-            $event->bg_image_path = Input::get('bg_image_path_custom');
+        if ($request->get('bg_image_path_custom') && $request->get('bg_type') == 'image') {
+            $event->bg_image_path = $request->get('bg_image_path_custom');
             $event->bg_type = 'image';
         }
 
-        if (Input::get('bg_color') && Input::get('bg_type') == 'color') {
-            $event->bg_color = Input::get('bg_color');
+        if ($request->get('bg_color') && $request->get('bg_type') == 'color') {
+            $event->bg_color = $request->get('bg_color');
             $event->bg_type = 'color';
         }
 
         /*
          * Not in use for now.
          */
-        if (Input::hasFile('bg_image_path') && Input::get('bg_type') == 'custom_image') {
+        if ($request->hasFile('bg_image_path') && $request->get('bg_type') == 'custom_image') {
             $path = public_path() . '/' . config('attendize.event_images_path');
-            $filename = 'event_bg-' . md5($event->id) . '.' . strtolower(Input::file('bg_image_path')->getClientOriginalExtension());
+            $filename = 'event_bg-' . md5($event->id) . '.' . strtolower($request->file('bg_image_path')->getClientOriginalExtension());
 
             $file_full_path = $path . '/' . $filename;
 
-            Input::file('bg_image_path')->move($path, $filename);
+            $request->file('bg_image_path')->move($path, $filename);
 
             $img = Image::make($file_full_path);
 
@@ -257,9 +298,9 @@ class EventCustomizeController extends MyBaseController
 
         $event->save();
 
-        return Response::json([
+        return response()->json([
             'status' => 'success',
-            'message' => 'Event Page Succesfully Upated',
+            'message' => 'Event Page Successfully Updated',
             'runThis' => 'document.getElementById(\'previewIframe\').contentWindow.location.reload(true);',
         ]);
     }
diff --git a/app/Http/Controllers/EventDashboardController.php b/app/Http/Controllers/EventDashboardController.php
index cc2d3921..0d23ef77 100644
--- a/app/Http/Controllers/EventDashboardController.php
+++ b/app/Http/Controllers/EventDashboardController.php
@@ -8,10 +8,15 @@ use Carbon\Carbon;
 use DateInterval;
 use DatePeriod;
 use DateTime;
-use View;
 
 class EventDashboardController extends MyBaseController
 {
+    /**
+     * Show the event dashboard
+     *
+     * @param bool|false $event_id
+     * @return \Illuminate\View\View
+     */
     public function showDashboard($event_id = false)
     {
         $event = Event::scope()->findOrFail($event_id);
@@ -74,36 +79,7 @@ class EventDashboardController extends MyBaseController
             'chartData' => json_encode($result),
         ];
 
-        return View::make('ManageEvent.Dashboard', $data);
+        return view('ManageEvent.Dashboard', $data);
     }
 
-    /**
-     * @param $chartData
-     * @param bool|false $from_date
-     * @param bool|false $toDate
-     *
-     * @return string
-     */
-    public function generateChartJson($chartData, $from_date = false, $toDate = false)
-    {
-        $data = [];
-
-        $startdate = '2014-10-1';
-        $enddate = '2014-11-7';
-        $timestamp = strtotime($startdate);
-        while ($startdate <= $enddate) {
-            $startdate = date('Y-m-d', $timestamp);
-
-            $data[] = [
-                'date'         => $startdate,
-                'tickets_sold' => rand(0, 7),
-                'views'        => rand(0, 5),
-                'unique_views' => rand(0, 5),
-            ];
-
-            $timestamp = strtotime('+1 days', strtotime($startdate));
-        }
-
-        return json_encode($data);
-    }
 }

From 7fa69e5a0ff92c7b6be231afb7597501c6ad9f3e Mon Sep 17 00:00:00 2001
From: Mark Walet <mark.walet@gmail.com>
Date: Wed, 16 Mar 2016 15:25:14 +0100
Subject: [PATCH 4/8] Refactor of Ticket index view

---
 .../Controllers/EventTicketsController.php    |  43 ++++---
 app/Models/Ticket.php                         |  38 ++----
 public/assets/stylesheet/application.css      |   2 +-
 public/assets/stylesheet/custom.less          |   6 -
 resources/views/ManageEvent/Tickets.blade.php | 117 ++++++------------
 .../Partials/EventTicketsSection.blade.php    |   2 +-
 6 files changed, 75 insertions(+), 133 deletions(-)

diff --git a/app/Http/Controllers/EventTicketsController.php b/app/Http/Controllers/EventTicketsController.php
index d814fe34..392b215e 100644
--- a/app/Http/Controllers/EventTicketsController.php
+++ b/app/Http/Controllers/EventTicketsController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\Event;
 use App\Models\Ticket;
 use Carbon\Carbon;
+use Illuminate\Http\Request;
 use Input;
 use Log;
 use Response;
@@ -16,27 +17,33 @@ use View;
 
 class EventTicketsController extends MyBaseController
 {
-    public function showTickets($event_id)
+    public function showTickets(Request $request, $event_id)
     {
-        $allowed_sorts = ['created_at', 'quantity_sold', 'sales_volume', 'title'];
-
-        $searchQuery = Input::get('q');
-        $sort_by = (in_array(Input::get('sort_by'), $allowed_sorts) ? Input::get('sort_by') : 'created_at');
-
-        $event = Event::scope()->findOrFail($event_id);
-
-        $tickets = $searchQuery
-                ? $event->tickets()->where('title', 'like', '%'.$searchQuery.'%')->orderBy($sort_by, 'desc')->paginate(10)
-                : $event->tickets()->orderBy($sort_by, 'desc')->paginate(10);
-
-        $data = [
-            'event'   => $event,
-            'tickets' => $tickets,
-            'sort_by' => $sort_by,
-            'q'       => $searchQuery ? $searchQuery : '',
+        $allowed_sorts = [
+            'created_at' => 'Creation date',
+            'title' => 'Ticket title',
+            'quantity_sold' => 'Quantity sold',
+            'sales_volume' => 'Sales volume',
         ];
 
-        return View::make('ManageEvent.Tickets', $data);
+        // Getting get parameters.
+        $q = $request->get('q', '');
+        $sort_by = $request->get('sort_by');
+        if (isset($allowed_sorts[$sort_by]) === false)
+            $sort_by = 'title';
+
+        // Find event or return 404 error.
+        $event = Event::scope()->find($event_id);
+        if ($event === null)
+            abort(404);
+
+        // Get tickets for event.
+        $tickets = empty($q) === false
+                ? $event->tickets()->where('title', 'like', '%'.$q.'%')->orderBy($sort_by, 'desc')->paginate()
+                : $event->tickets()->orderBy($sort_by, 'desc')->paginate();
+
+        // Return view.
+        return view('ManageEvent.Tickets', compact('event', 'tickets', 'sort_by', 'q', 'allowed_sorts'));
     }
 
     public function showEditTicket($event_id, $ticket_id)
diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php
index 8d02d992..76e937d6 100644
--- a/app/Models/Ticket.php
+++ b/app/Models/Ticket.php
@@ -8,6 +8,8 @@ class Ticket extends MyBaseModel
 {
     use SoftDeletes;
 
+    protected $perPage = 10;
+
     /**
      * The rules to validate the model.
      *
@@ -179,9 +181,9 @@ class Ticket extends MyBaseModel
      *
      * @return bool
      */
-    public function isFree()
+    public function getIsFreeAttribute()
     {
-        return (int) ceil($this->price) === 0;
+        return ceil($this->price) === 0;
     }
 
     /**
@@ -191,36 +193,18 @@ class Ticket extends MyBaseModel
      */
     public function getSaleStatusAttribute()
     {
-        if ($this->start_sale_date !== null) {
-            if ($this->start_sale_date->isFuture()) {
-                return config('attendize.ticket_status_before_sale_date');
-            }
-        }
+        if ($this->start_sale_date !== null && $this->start_sale_date->isFuture())
+            return config('attendize.ticket_status_before_sale_date');
 
-        if ($this->end_sale_date !== null) {
-            if ($this->end_sale_date->isPast()) {
-                return config('attendize.ticket_status_after_sale_date');
-            }
-        }
+        if ($this->end_sale_date !== null && $this->end_sale_date->isPast())
+            return config('attendize.ticket_status_after_sale_date');
 
-        if ((int) $this->quantity_available > 0) {
-            if ((int) $this->quantity_remaining <= 0) {
-                return config('attendize.ticket_status_sold_out');
-            }
-        }
+        if ((int) $this->quantity_available > 0 && (int) $this->quantity_remaining <= 0)
+            return config('attendize.ticket_status_sold_out');
 
-        if ($this->event->start_date->lte(\Carbon::now())) {
+        if ($this->event->start_date->lte(\Carbon::now()))
             return config('attendize.ticket_status_off_sale');
-        }
 
         return config('attendize.ticket_status_on_sale');
     }
-
-//    public function setQuantityAvailableAttribute($value) {
-//        $this->attributes['quantity_available'] = trim($value) == '' ? -1 : $value;
-//    }
-//
-//    public function setMaxPerPersonAttribute($value) {
-//        $this->attributes['max_per_person'] = trim($value) == '' ? -1 : $value;
-//    }
 }
diff --git a/public/assets/stylesheet/application.css b/public/assets/stylesheet/application.css
index 16e7dbbd..84fc6c97 100644
--- a/public/assets/stylesheet/application.css
+++ b/public/assets/stylesheet/application.css
@@ -149,4 +149,4 @@ body {
   font-size: 9px;
   font-weight: normal;
 }
-.page-title .title .organiser_logo{position:absolute;height:45px;right:20px;top:5px;bottom:5px}.page-title .title .organiser_logo img{max-height:45px}.nav li.nav-button a span{padding:10px;background-color:#037c9c}.event.panel{margin-top:10px}.event .event-date{border:1px solid #fff;padding-bottom:9px;padding-top:7px;text-align:center;text-shadow:0 1px 1px rgba(0,0,0,0.1);width:46px;position:absolute;background-color:#fff;top:-13px;border-color:#0384a6;color:#666}.event .event-date .day{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:22px;font-weight:500;margin:-2px auto -6px auto}.event .event-date .month{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:10px;font-weight:500;margin:-2px auto 0 auto}.event .event-meta{margin:0;padding:0;margin-left:60px;height:55px;margin-top:10px;color:#fff}.event .event-meta li{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;list-style:none;font-size:12px}.event .event-meta li a{color:#fff}.event .event-meta li.event-title a{font-size:16px}.event .event-meta li.event-organiser a{font-weight:bold}.event .panel-title{height:60px;padding:10px}.event .panel-title a{margin:0;height:40px;display:table-cell;vertical-align:middle;text-indent:50px}.stat-box{padding:20px;background-color:#0398bf;color:#fff;text-align:center;margin-bottom:10px;border-bottom:4px solid rgba(0,0,0,0.2)}.stat-box h3{margin-bottom:5px;margin-top:0;font-weight:200}.stat-box span{text-transform:uppercase;font-weight:lighter;color:#d0f0fe}.stat-box:nth-child(odd){background-color:#0384a6}.top_of_page_alert{border:none;margin:0;text-align:center;border-bottom:5px solid}.v-align-text{text-align:center;position:relative;top:50%;-ms-transform:translateY(-50%);-wekbit-transform:translateY(-50%);transform:translateY(-50%)}@media (max-width:992px){.page-header>[class*=" col-"],.page-header>[class^="col-"]{margin-bottom:10px}}@media (max-width:480px){.btn-group-responsive{margin-bottom:-10px;float:none !important;display:block !important}.btn-group-responsive .btn{width:100%;padding-left:0;padding-right:0;margin-bottom:10px}.btn-group-responsive .pull-left,.btn-group-responsive .pull-right{float:none !important}}label.required::after{content:'*';color:red;padding-left:3px;font-size:9px}.hasDatepicker[disabled],.hasDatepicker[readonly],fieldset[disabled] .hasDatepicker{cursor:pointer !important;background-color:#fff !important;opacity:1}.more-options{display:none}.col-sort{color:#fff}.col-sort :hover{color:#fff}.pac-container{z-index:9999}.dtpicker-overlay{z-index:9999}.dtpicker-close{display:none}.dtpicker-header .dtpicker-title{color:#afafaf;text-align:center;font-size:18px;font-weight:normal}.dtpicker-header .dtpicker-value{padding:.8em .2em .2em .2em;color:#0384a6;text-align:center;font-size:1.4em}.dtpicker-buttonCont .dtpicker-button{background:#0384a6;border-radius:0}.dtpicker-content{border-radius:0}.sidebar-open-ltr body{overflow-x:hidden}.order_options{margin:10px 0;padding:5px 15px;margin-top:0}.order_options .event_count{font-weight:bold;color:#777;line-height:30px}.well{background-color:#f9f9f9;box-shadow:none}.input-group-btn select{width:115px !important;border-left:0;font-size:12px}.btn-file{position:relative;overflow:hidden}.btn-file input[type=file]{position:absolute;top:0;right:0;min-width:100%;min-height:100%;font-size:100px;text-align:right;filter:alpha(opacity=0);opacity:0;background:red;cursor:inherit;display:block}input[readonly]{background-color:white !important;cursor:text !important}html.working{cursor:progress}
\ No newline at end of file
+.page-title .title .organiser_logo{position:absolute;height:45px;right:20px;top:5px;bottom:5px}.page-title .title .organiser_logo img{max-height:45px}.nav li.nav-button a span{padding:10px;background-color:#037c9c}.event.panel{margin-top:10px}.event .event-date{border:1px solid #fff;padding-bottom:9px;padding-top:7px;text-align:center;text-shadow:0 1px 1px rgba(0,0,0,0.1);width:46px;position:absolute;background-color:#fff;top:-13px;border-color:#0384a6;color:#666}.event .event-date .day{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:22px;font-weight:500;margin:-2px auto -6px auto}.event .event-date .month{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:10px;font-weight:500;margin:-2px auto 0 auto}.event .event-meta{margin:0;padding:0;margin-left:60px;height:55px;margin-top:10px;color:#fff}.event .event-meta li{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;list-style:none;font-size:12px}.event .event-meta li a{color:#fff}.event .event-meta li.event-title a{font-size:16px}.event .event-meta li.event-organiser a{font-weight:bold}.event .panel-title{height:60px;padding:10px}.event .panel-title a{margin:0;height:40px;display:table-cell;vertical-align:middle;text-indent:50px}.stat-box{padding:20px;background-color:#0398bf;color:#fff;text-align:center;margin-bottom:10px;border-bottom:4px solid rgba(0,0,0,0.2)}.stat-box h3{margin-bottom:5px;margin-top:0;font-weight:200}.stat-box span{text-transform:uppercase;font-weight:lighter;color:#d0f0fe}.stat-box:nth-child(odd){background-color:#0384a6}.top_of_page_alert{border:none;margin:0;text-align:center;border-bottom:5px solid}.v-align-text{text-align:center;position:relative;top:50%;-ms-transform:translateY(-50%);-wekbit-transform:translateY(-50%);transform:translateY(-50%)}@media (max-width:992px){.page-header>[class*=" col-"],.page-header>[class^="col-"]{margin-bottom:10px}}@media (max-width:480px){.btn-group-responsive{margin-bottom:-10px;float:none !important;display:block !important}.btn-group-responsive .btn{width:100%;padding-left:0;padding-right:0;margin-bottom:10px}.btn-group-responsive .pull-left,.btn-group-responsive .pull-right{float:none !important}}label.required::after{content:'*';color:red;padding-left:3px;font-size:9px}.hasDatepicker[disabled],.hasDatepicker[readonly],fieldset[disabled] .hasDatepicker{cursor:pointer !important;background-color:#fff !important;opacity:1}.more-options{display:none}.col-sort{color:#fff}.col-sort :hover{color:#fff}.pac-container{z-index:9999}.dtpicker-overlay{z-index:9999}.dtpicker-close{display:none}.dtpicker-header .dtpicker-title{color:#afafaf;text-align:center;font-size:18px;font-weight:normal}.dtpicker-header .dtpicker-value{padding:.8em .2em .2em .2em;color:#0384a6;text-align:center;font-size:1.4em}.dtpicker-buttonCont .dtpicker-button{background:#0384a6;border-radius:0}.dtpicker-content{border-radius:0}.sidebar-open-ltr body{overflow-x:hidden}.order_options .event_count{font-weight:bold;color:#777;line-height:30px}.well{background-color:#f9f9f9;box-shadow:none}.input-group-btn select{width:115px !important;border-left:0;font-size:12px}.btn-file{position:relative;overflow:hidden}.btn-file input[type=file]{position:absolute;top:0;right:0;min-width:100%;min-height:100%;font-size:100px;text-align:right;filter:alpha(opacity=0);opacity:0;background:red;cursor:inherit;display:block}input[readonly]{background-color:white !important;cursor:text !important}html.working{cursor:progress}
\ No newline at end of file
diff --git a/public/assets/stylesheet/custom.less b/public/assets/stylesheet/custom.less
index 7457d543..3d17785d 100644
--- a/public/assets/stylesheet/custom.less
+++ b/public/assets/stylesheet/custom.less
@@ -298,12 +298,6 @@ label.required::after {
     }
 }
 
-.order_options {
-    margin: 10px 0;
-    padding: 5px 15px;
-    margin-top: 0;
-}
-
 .order_options .event_count {
     font-weight: bold;
     color: #777;
diff --git a/resources/views/ManageEvent/Tickets.blade.php b/resources/views/ManageEvent/Tickets.blade.php
index a25b6387..9b03c20b 100644
--- a/resources/views/ManageEvent/Tickets.blade.php
+++ b/resources/views/ManageEvent/Tickets.blade.php
@@ -5,7 +5,6 @@
 Event Tickets
 @stop
 
-
 @section('top_nav')
 @include('ManageEvent.Partials.TopNav')
 @stop
@@ -15,15 +14,10 @@ Event Tickets
 Event Tickets
 @stop
 
-@section('head')
-
-@stop
-
 @section('menu')
 @include('ManageEvent.Partials.Sidebar')
 @stop
 
-
 @section('page_header')
 <div class="col-md-9">
     <!-- Toolbar -->
@@ -37,8 +31,8 @@ Event Tickets
                 <i class="ico-question"></i> Questions 
             </button>
         </div>
-        <div class="btn-group btn-group-responsive ">
-            <button type="button" class="btn btn-success" >
+            <div class="btn-group btn-group-responsive">
+                <button type="button" class="btn btn-success">
                 <i class="ico-tags"></i> Coupon Codes 
             </button>
         </div>
@@ -59,52 +53,35 @@ Event Tickets
 </div>
 @stop
 
-
 @section('content')
-
+    @if($tickets->count())
+        <div class='order_options'>
+            <div class="row">
+                <div class="col-md-3 col-xs-6">
+                    <span class="event_count">{{$tickets->count()}} events</span>
+                </div>
+                <div class="col-md-2 col-xs-6 col-md-offset-7">
+                    {!! Form::select('sort_by_select', $allowed_sorts, $sort_by, ['class' => 'form-control pull right']) !!}
+                </div>
+            </div>
+        </div>
+        @endif
 <!--Start ticket table-->
-<div class="row">   
-
+        <div class="row">
     @if($tickets->count())
     
-    <div class='order_options hide'>
-        <div class="row">
-            <div class="col-md-3 col-xs-6">
-                <span class="event_count">
-                    {{$tickets->count()}} events
-                </span> 
-            </div>
-            <div class="col-md-2 col-xs-6 col-md-offset-7">
-
-                {!! Form::select('sort_by_select', [
-                'quantity_sold' => 'Quantity sold',
-                'title' => 'Ticket title',
-                'created_at' => 'Createion date',
-                'sales_volume' => 'Sales volume'
-
-            ], $sort_by, ['class' => 'form-control pull right']) !!}            </div>
-
-        </div> 
-    </div>
-    
     @foreach($tickets as $ticket)
-
     <div id="ticket_{{$ticket->id}}" class="col-md-4 col-sm-6 ">
+        <div class="panel panel-success ticket">
 
-
-        <div  class="panel panel-success ticket">
-
-            <div style="cursor: pointer;" data-modal-id='ticket-{{ $ticket->id }}' data-href="{{route('showEditTicket', ['event_id'=>$event->id,'ticket_id'=>$ticket->id])}}" class="panel-heading loadModal">
+            <div style="cursor: pointer;" data-modal-id='ticket-{{ $ticket->id }}'
+                 data-href="{{ route('showEditTicket', ['event_id' => $event->id, 'ticket_id' => $ticket->id]) }}"
+                 class="panel-heading loadModal">
                 <h3 class="panel-title">
                     <i class="ico-ticket ticket_icon mr5 ellipsis"></i>
-                    {{{$ticket->title}}}
+                    {{$ticket->title}}
                     <span class="pull-right">
-                        @if($ticket->isFree())
-                        FREE
-                        @else
-                        {{money($ticket->price, $event->currency->code)}}
-                        @endif
-
+                        {{ ($ticket->is_free) ? "FREE" : money($ticket->price, $event->currency->code) }}
                     </span>
                 </h3>
             </div>
@@ -113,28 +90,20 @@ Event Tickets
                 <ul class="nav nav-section nav-justified mt5 mb5">
                     <li>
                         <div class="section">
-                            <h4 class="nm">{{{$ticket->quantity_sold}}}</h4>
+                            <h4 class="nm">{{ $ticket->quantity_sold }}</h4>
                             <p class="nm text-muted">Sold</p>
                         </div>
                     </li>
                     <li>
                         <div class="section">
                             <h4 class="nm">
-
-                                @if($ticket->quantity_available === NULL)
-                                &infin;
-                                @else
-                                {{$ticket->quantity_remaining}}
-                                @endif
-
+                                {{ ($ticket->quantity_available === null) ? '&infin;' : $ticket->quantity_remaining }}
                             </h4>
                             <p class="nm text-muted">Remaining</p>
                         </div>
                     </li>
                     <li>
                         <div class="section">
-                       
-                            
                             <h4 class="nm hint--top" title="{{money($ticket->sales_volume, $event->currency->code)}} + {{money($ticket->organiser_fees_volume, $event->currency->code)}} Organiser Booking Fees">
                                 {{money($ticket->sales_volume + $ticket->organiser_fees_volume, $event->currency->code)}} <sub title="Doesn't account for refunds.">*</sub>
                             </h4>
@@ -145,42 +114,30 @@ Event Tickets
             </div> 
             <div class="panel-footer" style="height: 56px;">
                 <ul class="nav nav-section nav-justified">
-                    <!--                    <li>
-                                            <a data-modal-id='ticket-{{ $ticket->id }}' href='javascript:void(0);'  data-href="{{route('showEditTicket', ['event_id'=>$event->id,'ticket_id'=>$ticket->id])}}" class='loadModal'>
-                                                <i class="ico-edit"></i> Edit
-                                            </a> 
-                                        </li>-->
                     <li>
-
-                        <a href="#">
-                            
+                        <a href="javascript:void(0);">
                             @if($ticket->sale_status === config('attendize.ticket_status_on_sale'))
-
-                            @if($ticket->is_paused)
-                            Ticket Sales Paused &nbsp;
-                            <span class="pauseTicketSales label label-info" data-id="{{$ticket->id}}" data-route="{{route('postPauseTicket', ['event_id'=>$event->id])}}" >
-                                <i class="ico-play4"></i> Resume
-                            </span>
-                            @else
+                                @if($ticket->is_paused)
+                                    Ticket Sales Paused &nbsp;
+                                    <span class="pauseTicketSales label label-info" data-id="{{$ticket->id}}"
+                                          data-route="{{route('postPauseTicket', ['event_id'=>$event->id])}}">
+                                    <i class="ico-play4"></i> Resume
+                                </span>
+                                @else
                                 On Sale &nbsp;
-                            <span class="pauseTicketSales label label-info" data-id="{{$ticket->id}}" data-route="{{route('postPauseTicket', ['event_id'=>$event->id])}}" >
-                                <i class="ico-pause"></i> Pause
-                            </span>
-                            @endif
-
-
+                                    <span class="pauseTicketSales label label-info" data-id="{{$ticket->id}}"
+                                          data-route="{{route('postPauseTicket', ['event_id'=>$event->id])}}">
+                                    <i class="ico-pause"></i> Pause
+                                </span>
+                                @endif
                             @else 
                                 {{\App\Models\TicketStatus::find($ticket->sale_status)->name}}
                             @endif
                         </a>
-
-
-
                     </li>
                 </ul>
             </div>
         </div>
-
     </div>
     @endforeach
 
@@ -198,7 +155,7 @@ Event Tickets
 
 <div class="row">
     <div class="col-md-12">
-        {!! $tickets->render() !!}
+        {!! $tickets->appends(['q' => $q, 'sort_by' => $sort_by])->render() !!}
     </div>
 </div>
 @stop
diff --git a/resources/views/Public/ViewEvent/Partials/EventTicketsSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventTicketsSection.blade.php
index 9037c8a6..7b936f0e 100644
--- a/resources/views/Public/ViewEvent/Partials/EventTicketsSection.blade.php
+++ b/resources/views/Public/ViewEvent/Partials/EventTicketsSection.blade.php
@@ -31,7 +31,7 @@
                             </td>
                             <td style="width:180px; text-align: right;">
                                 <div class="ticket-pricing" style="margin-right: 20px;">
-                                    @if($ticket->isFree())
+                                    @if($ticket->is_free)
                                     FREE
                                     @else
                                     <span title='{{{money($ticket->price, $event->currency->code)}}} Ticket Price + {{money($ticket->total_booking_fee, $event->currency->code)}} Booking Fees'>{{{money($ticket->total_price, $event->currency->code)}}} </span>

From e1bbc0a176da87a595f150745d108fdc4ce9d227 Mon Sep 17 00:00:00 2001
From: Mark Walet <mark.walet@gmail.com>
Date: Wed, 16 Mar 2016 15:32:17 +0100
Subject: [PATCH 5/8] Refactored ticket edit modal

---
 .../Controllers/EventTicketsController.php    |   2 +-
 .../ManageEvent/Modals/EditTicket.blade.php   | 167 ++++++++----------
 2 files changed, 71 insertions(+), 98 deletions(-)

diff --git a/app/Http/Controllers/EventTicketsController.php b/app/Http/Controllers/EventTicketsController.php
index 392b215e..0c9d7b36 100644
--- a/app/Http/Controllers/EventTicketsController.php
+++ b/app/Http/Controllers/EventTicketsController.php
@@ -54,7 +54,7 @@ class EventTicketsController extends MyBaseController
             'modal_id' => Input::get('modal_id'),
         ];
 
-        return View::make('ManageEvent.Modals.EditTicket', $data);
+        return view('ManageEvent.Modals.EditTicket', $data);
     }
 
     public function showCreateTicket($event_id)
diff --git a/resources/views/ManageEvent/Modals/EditTicket.blade.php b/resources/views/ManageEvent/Modals/EditTicket.blade.php
index 7175a1bd..89e66fcc 100644
--- a/resources/views/ManageEvent/Modals/EditTicket.blade.php
+++ b/resources/views/ManageEvent/Modals/EditTicket.blade.php
@@ -1,5 +1,5 @@
 <div role="dialog" id="{{$modal_id}}" class="modal fade " style="display: none;">
-   {!! Form::model($ticket, array('url' => route('postEditTicket', array('ticket_id' => $ticket->id, 'event_id' => $event->id)), 'class' => 'ajax ')) !!}
+   {!! Form::model($ticket, array('url' => route('postEditTicket', array('ticket_id' => $ticket->id, 'event_id' => $event->id)), 'class' => 'ajax')) !!}
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header text-center">
@@ -9,109 +9,82 @@
                     Edit Ticket: <i>{{{$ticket->title}}}</i></h3>
             </div>
             <div class="modal-body">
+                <div class="form-group">
+                    {!! Form::label('title', 'Ticket Title', ['class'=>'control-label required']) !!}
+                    {!!  Form::text('title', null,['class'=>'form-control', 'placeholder'=>'E.g: General Admission']) !!}
+                </div>
                 <div class="row">
-                    <div class="col-md-12">
+                    <div class="col-sm-6">
                         <div class="form-group">
-                            {!! Form::label('title', 'Ticket Title', array('class'=>'control-label required')) !!}
-                            {!!  Form::text('title', Input::old('title'),
-                                        array(
-                                        'class'=>'form-control',
-                                        'placeholder'=>'E.g: General Admission'
-                                        ))  !!}
-                        </div>
-                        <div class="row">
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                    {!! Form::label('price', 'Ticket Price', array('class'=>'control-label required')) !!}
-                                    {!!  Form::text('price', Input::old('price'),
-                                                array(
-                                                'class'=>'form-control',
-                                                 'placeholder'=>'E.g: 25.99'
-                                                ))  !!}
-                                </div>
-                            </div>
-
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                    {!! Form::label('quantity_available', 'Quantity Available', array('class'=>' control-label')) !!}
-                                    {!!  Form::text('quantity_available', Input::old('quantity_available'),
-                                                array(
-                                                'class'=>'form-control',
-                                                'placeholder'=>'E.g: 100 (Leave blank for unlimited)'
-                                                )
-                                                )  !!}
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="form-group more-options">
-                            {!! Form::label('description', 'Ticket Description', array('class'=>'control-label')) !!}
-
-                            {!!  Form::text('description', Input::old('description'),
-                                        array(
-                                        'class'=>'form-control'
-                                        ))  !!}
-                        </div>
-
-                        <div class="row more-options">
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                   {!! Form::label('start_sale_date', 'Start Sale On', array('class'=>' control-label')) !!}
-
-                                    {!!  Form::text('start_sale_date', $ticket->getFormatedDate('start_sale_date'),
-                                                        [
-                                                    'class'=>'form-control start hasDatepicker ',
-                                                    'data-field'=>'datetime',
-                                                    'data-startend'=>'start',
-                                                    'data-startendelem'=>'.end',
-                                                    'readonly'=>''
-
-                                                ])  !!}
-                                </div>
-                            </div>
-
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                    {!!  Form::label('end_sale_date', 'End Sale On',
-                                                [
-                                            'class'=>' control-label '
-                                        ])  !!}
-                                    {!!  Form::text('end_sale_date', $ticket->getFormatedDate('end_sale_date'),
-                                                [
-                                            'class'=>'form-control end hasDatepicker ',
-                                            'data-field'=>'datetime',
-                                            'data-startend'=>'end',
-                                            'data-startendelem'=>'.start',
-                                            'readonly'=>''
-                                        ])  !!}
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="row more-options">
-                            <div class="col-md-6">
-                                <div class="form-group">
-                                   {!! Form::label('min_per_person', 'Minimum Tickets Per Order', array('class'=>' control-label')) !!}
-                                   {!! Form::selectRange('min_per_person', 1, 100, Input::old('min_per_person'), ['class' => 'form-control']) !!}
-                                </div>
-                            </div>
-                            <div class="col-md-6">
-                                <div class="form-group">
-                                   {!! Form::label('max_per_person', 'Maximum Tickets Per Order', array('class'=>' control-label')) !!}
-                                   {!! Form::selectRange('max_per_person', 1, 100, Input::old('max_per_person'), ['class' => 'form-control']) !!}
-                                </div>
-                            </div>
+                            {!! Form::label('price', 'Ticket Price', ['class'=>'control-label required']) !!}
+                            {!!  Form::text('price', null,['class' => 'form-control', 'placeholder' => 'E.g: 25.99']) !!}
                         </div>
                     </div>
-
-                    <div class="col-md-12">
-                        <a href="javascript:void(0);" class="show-more-options">
-                            More Options
-                        </a>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            {!! Form::label('quantity_available', 'Quantity Available', array('class'=>' control-label')) !!}
+                            {!!  Form::text('quantity_available', null, ['class' => 'form-control', 'placeholder' => 'E.g: 100 (Leave blank for unlimited)']) !!}
+                        </div>
                     </div>
-
                 </div>
 
+                <div class="form-group more-options">
+                    {!! Form::label('description', 'Ticket Description', ['class'=>'control-label']) !!}
+                    {!!  Form::text('description', null,['class'=>'form-control']) !!}
+                </div>
+
+                <div class="row more-options">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                           {!! Form::label('start_sale_date', 'Start Sale On', array('class'=>' control-label')) !!}
+
+                            {!!  Form::text('start_sale_date', $ticket->getFormatedDate('start_sale_date'),
+                                                [
+                                            'class'=>'form-control start hasDatepicker ',
+                                            'data-field'=>'datetime',
+                                            'data-startend'=>'start',
+                                            'data-startendelem'=>'.end',
+                                            'readonly'=>''
+
+                                        ]) !!}
+                        </div>
+                    </div>
+
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            {!!  Form::label('end_sale_date', 'End Sale On',
+                                        [
+                                    'class'=>' control-label '
+                                ])  !!}
+                            {!!  Form::text('end_sale_date', $ticket->getFormatedDate('end_sale_date'),
+                                        [
+                                    'class'=>'form-control end hasDatepicker ',
+                                    'data-field'=>'datetime',
+                                    'data-startend'=>'end',
+                                    'data-startendelem'=>'.start',
+                                    'readonly'=>''
+                                ])  !!}
+                        </div>
+                    </div>
+                </div>
+
+                <div class="row more-options">
+                    <div class="col-md-6">
+                        <div class="form-group">
+                           {!! Form::label('min_per_person', 'Minimum Tickets Per Order', array('class'=>' control-label')) !!}
+                           {!! Form::selectRange('min_per_person', 1, 100, null, ['class' => 'form-control']) !!}
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="form-group">
+                           {!! Form::label('max_per_person', 'Maximum Tickets Per Order', array('class'=>' control-label')) !!}
+                           {!! Form::selectRange('max_per_person', 1, 100, null, ['class' => 'form-control']) !!}
+                        </div>
+                    </div>
+                </div>
+                <a href="javascript:void(0);" class="show-more-options">
+                    More Options
+                </a>
             </div> <!-- /end modal body-->
             <div class="modal-footer">
                {!! Form::button('Close', ['class'=>"btn modal-close btn-danger",'data-dismiss'=>'modal']) !!}

From 0e0ceffbdaf43461c85f576cbcd03ad717d5f7e9 Mon Sep 17 00:00:00 2001
From: Mark Walet <mark.walet@gmail.com>
Date: Wed, 16 Mar 2016 16:00:03 +0100
Subject: [PATCH 6/8] Small syntax fixes

---
 .../ManageEvent/Modals/EditTicket.blade.php   | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/resources/views/ManageEvent/Modals/EditTicket.blade.php b/resources/views/ManageEvent/Modals/EditTicket.blade.php
index 89e66fcc..d72fd387 100644
--- a/resources/views/ManageEvent/Modals/EditTicket.blade.php
+++ b/resources/views/ManageEvent/Modals/EditTicket.blade.php
@@ -1,12 +1,12 @@
 <div role="dialog" id="{{$modal_id}}" class="modal fade " style="display: none;">
-   {!! Form::model($ticket, array('url' => route('postEditTicket', array('ticket_id' => $ticket->id, 'event_id' => $event->id)), 'class' => 'ajax')) !!}
+    {!! Form::model($ticket, ['url' => route('postEditTicket', ['ticket_id' => $ticket->id, 'event_id' => $event->id]), 'class' => 'ajax']) !!}
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header text-center">
                 <button type="button" class="close" data-dismiss="modal">×</button>
                 <h3 class="modal-title">
                     <i class="ico-ticket"></i>
-                    Edit Ticket: <i>{{{$ticket->title}}}</i></h3>
+                    Edit Ticket: <em>{{$ticket->title}}</em></h3>
             </div>
             <div class="modal-body">
                 <div class="form-group">
@@ -22,7 +22,7 @@
                     </div>
                     <div class="col-sm-6">
                         <div class="form-group">
-                            {!! Form::label('quantity_available', 'Quantity Available', array('class'=>' control-label')) !!}
+                            {!! Form::label('quantity_available', 'Quantity Available', ['class'=>' control-label']) !!}
                             {!!  Form::text('quantity_available', null, ['class' => 'form-control', 'placeholder' => 'E.g: 100 (Leave blank for unlimited)']) !!}
                         </div>
                     </div>
@@ -36,17 +36,16 @@
                 <div class="row more-options">
                     <div class="col-sm-6">
                         <div class="form-group">
-                           {!! Form::label('start_sale_date', 'Start Sale On', array('class'=>' control-label')) !!}
+                            {!! Form::label('start_sale_date', 'Start Sale On', ['class'=>' control-label']) !!}
 
                             {!!  Form::text('start_sale_date', $ticket->getFormatedDate('start_sale_date'),
-                                                [
-                                            'class'=>'form-control start hasDatepicker ',
-                                            'data-field'=>'datetime',
-                                            'data-startend'=>'start',
-                                            'data-startendelem'=>'.end',
-                                            'readonly'=>''
-
-                                        ]) !!}
+                                [
+                                    'class' => 'form-control start hasDatepicker',
+                                    'data-field' => 'datetime',
+                                    'data-startend' => 'start',
+                                    'data-startendelem' => '.end',
+                                    'readonly' => ''
+                                ]) !!}
                         </div>
                     </div>
 
@@ -57,12 +56,12 @@
                                     'class'=>' control-label '
                                 ])  !!}
                             {!!  Form::text('end_sale_date', $ticket->getFormatedDate('end_sale_date'),
-                                        [
-                                    'class'=>'form-control end hasDatepicker ',
-                                    'data-field'=>'datetime',
-                                    'data-startend'=>'end',
-                                    'data-startendelem'=>'.start',
-                                    'readonly'=>''
+                                [
+                                    'class' => 'form-control end hasDatepicker',
+                                    'data-field' => 'datetime',
+                                    'data-startend' => 'end',
+                                    'data-startendelem' => '.start',
+                                    'readonly' => ''
                                 ])  !!}
                         </div>
                     </div>
@@ -71,13 +70,13 @@
                 <div class="row more-options">
                     <div class="col-md-6">
                         <div class="form-group">
-                           {!! Form::label('min_per_person', 'Minimum Tickets Per Order', array('class'=>' control-label')) !!}
+                            {!! Form::label('min_per_person', 'Minimum Tickets Per Order', ['class'=>' control-label']) !!}
                            {!! Form::selectRange('min_per_person', 1, 100, null, ['class' => 'form-control']) !!}
                         </div>
                     </div>
                     <div class="col-md-6">
                         <div class="form-group">
-                           {!! Form::label('max_per_person', 'Maximum Tickets Per Order', array('class'=>' control-label')) !!}
+                            {!! Form::label('max_per_person', 'Maximum Tickets Per Order', ['class'=>' control-label']) !!}
                            {!! Form::selectRange('max_per_person', 1, 100, null, ['class' => 'form-control']) !!}
                         </div>
                     </div>
@@ -88,7 +87,7 @@
             </div> <!-- /end modal body-->
             <div class="modal-footer">
                {!! Form::button('Close', ['class'=>"btn modal-close btn-danger",'data-dismiss'=>'modal']) !!}
-               {!! Form::submit('Save Ticket', array('class'=>"btn btn-success")) !!}
+                {!! Form::submit('Save Ticket', ['class'=>"btn btn-success"]) !!}
             </div>
         </div><!-- /end modal content-->
        {!! Form::close() !!}

From 56de2fe28aada9fd3b951a812dcbfc9802fe6f57 Mon Sep 17 00:00:00 2001
From: Mark Walet <mark.walet@gmail.com>
Date: Wed, 16 Mar 2016 16:12:35 +0100
Subject: [PATCH 7/8] Validated and updated html5 markup by validator.w3.org

---
 resources/views/ManageEvent/Partials/Sidebar.blade.php    | 4 ++--
 resources/views/ManageEvent/Partials/TopNav.blade.php     | 2 +-
 resources/views/ManageEvent/Tickets.blade.php             | 4 ++--
 resources/views/ManageOrganiser/Partials/TopNav.blade.php | 2 +-
 resources/views/Shared/Layouts/Master.blade.php           | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/views/ManageEvent/Partials/Sidebar.blade.php b/resources/views/ManageEvent/Partials/Sidebar.blade.php
index 5b3c5315..63c5b741 100644
--- a/resources/views/ManageEvent/Partials/Sidebar.blade.php
+++ b/resources/views/ManageEvent/Partials/Sidebar.blade.php
@@ -1,7 +1,7 @@
 <aside class="sidebar sidebar-left sidebar-menu">
     <section class="content">
         <h5 class="heading">Main Menu</h5>
-        <ul id="nav" class="topmenu">
+        <ul id="nav_main" class="topmenu">
             <li>
                 <a href="{{route('showOrganiserDashboard', ['organiser_id' => $event->organiser->id])}}">
                     <span class="figure"><i class="ico-arrow-left"></i></span>
@@ -10,7 +10,7 @@
             </li>
         </ul>
         <h5 class="heading">Event Menu</h5>
-        <ul id="nav" class="topmenu">
+        <ul id="nav_event" class="topmenu">
             <li class="{{ Request::is('*dashboard*') ? 'active' : '' }}">
                 <a href="{{route('showEventDashboard', array('event_id' => $event->id))}}">
                     <span class="figure"><i class="ico-home2"></i></span>
diff --git a/resources/views/ManageEvent/Partials/TopNav.blade.php b/resources/views/ManageEvent/Partials/TopNav.blade.php
index cde7cf5b..d8cd7047 100644
--- a/resources/views/ManageEvent/Partials/TopNav.blade.php
+++ b/resources/views/ManageEvent/Partials/TopNav.blade.php
@@ -24,7 +24,7 @@
     <li class="nav-button">
         <a target="_blank" href="{{$event->event_url}}">
             <span>
-                <i class="ico-eye2"></i>&nbsp;<hide class="hidden-xs">View </hide>Event Page
+                <i class="ico-eye2"></i>&nbsp;Event Page
             </span>
         </a>
     </li>
diff --git a/resources/views/ManageEvent/Tickets.blade.php b/resources/views/ManageEvent/Tickets.blade.php
index 9b03c20b..d9516b69 100644
--- a/resources/views/ManageEvent/Tickets.blade.php
+++ b/resources/views/ManageEvent/Tickets.blade.php
@@ -23,11 +23,11 @@ Event Tickets
     <!-- Toolbar -->
     <div class="btn-toolbar" role="toolbar">
         <div class="btn-group btn-group-responsive">
-            <button  data-modal-id='CreateTicket' href='javascript:void(0);'  data-href="{{route('showCreateTicket', array('event_id'=>$event->id))}}" class='loadModal btn btn-success' type="button" ><i class="ico-ticket"></i> Create Ticket</button>
+            <button  data-modal-id='CreateTicket' data-href="{{route('showCreateTicket', array('event_id'=>$event->id))}}" class='loadModal btn btn-success' type="button" ><i class="ico-ticket"></i> Create Ticket</button>
         </div>
         @if(false)
         <div class="btn-group btn-group-responsive ">
-            <button data-modal-id='TicketQuestions' href='javascript:void(0);'  data-href="{{route('showTicketQuestions', array('event_id'=>$event->id))}}"  type="button" class="loadModal btn btn-success" >
+            <button data-modal-id='TicketQuestions' data-href="{{route('showTicketQuestions', array('event_id'=>$event->id))}}"  type="button" class="loadModal btn btn-success" >
                 <i class="ico-question"></i> Questions 
             </button>
         </div>
diff --git a/resources/views/ManageOrganiser/Partials/TopNav.blade.php b/resources/views/ManageOrganiser/Partials/TopNav.blade.php
index af26b4e4..2be5cbf5 100644
--- a/resources/views/ManageOrganiser/Partials/TopNav.blade.php
+++ b/resources/views/ManageOrganiser/Partials/TopNav.blade.php
@@ -11,7 +11,7 @@
     <li class="nav-button">
         <a target="__blank" href="{{$organiser->event_url}}">
             <span>
-                <i class="ico-eye2"></i> &nbsp;<hide class="hidden-xs">View </hide>Organiser Page
+                <i class="ico-eye2"></i>&nbsp;Organiser Page
             </span>
 
         </a>
diff --git a/resources/views/Shared/Layouts/Master.blade.php b/resources/views/Shared/Layouts/Master.blade.php
index c7870a29..d9309482 100644
--- a/resources/views/Shared/Layouts/Master.blade.php
+++ b/resources/views/Shared/Layouts/Master.blade.php
@@ -94,7 +94,7 @@
 
 <!--Main Content-->
 <section id="main" role="main">
-    <section class="container-fluid">
+    <div class="container-fluid">
         <div class="page-title">
             <h1 class="title">@yield('page_title')</h1>
         </div>
@@ -109,7 +109,7 @@
         <!--Content-->
         @yield('content')
         <!--/Content-->
-    </section>
+    </div>
 
     <!--To The Top-->
     <a href="#" style="display:none;" class="totop"><i class="ico-angle-up"></i></a>
@@ -138,7 +138,7 @@
 </script>
 <!--/JS-->
 @yield('foot')
-</body>
 
 @include('Shared.Partials.GlobalFooterJS')
+</body>
 </html>
\ No newline at end of file

From 1c05b50419843d65d0d4d527c4a724dd2e1da977 Mon Sep 17 00:00:00 2001
From: Mark Walet <mark.walet@gmail.com>
Date: Wed, 16 Mar 2016 16:50:22 +0100
Subject: [PATCH 8/8] Some more validation fixes

---
 .../Modals/EditAccount.blade.php              |   2 +-
 .../views/ManageEvent/Dashboard.blade.php     | 554 +++++++++---------
 .../views/ManageOrganiser/Dashboard.blade.php | 120 ++--
 .../ManageOrganiser/Partials/TopNav.blade.php |   3 +-
 .../Partials/EventShareSection.blade.php      |  10 +-
 .../Partials/OrganiserSocialSection.blade.php |  12 +-
 .../views/Shared/Layouts/Master.blade.php     |   2 +
 7 files changed, 330 insertions(+), 373 deletions(-)

diff --git a/resources/views/ManageAccount/Modals/EditAccount.blade.php b/resources/views/ManageAccount/Modals/EditAccount.blade.php
index 5d32a51f..9ecd5557 100644
--- a/resources/views/ManageAccount/Modals/EditAccount.blade.php
+++ b/resources/views/ManageAccount/Modals/EditAccount.blade.php
@@ -112,7 +112,7 @@
                                             account you can do so using the button below.
                                         </div>
                                     @endif
-                                    <a target="__blank"
+                                    <a target="_blank"
                                        href="https://connect.stripe.com/oauth/authorize?response_type=code&client_id={{$_ENV['STRIPE_APP_CLIENT_ID']}}&scope=read_write&state={{Auth::user()->id}}">
                                         <img src="{{asset('assets/images/stripe-connect-blue.png')}}"
                                              alt="Connect with Stripe"/>
diff --git a/resources/views/ManageEvent/Dashboard.blade.php b/resources/views/ManageEvent/Dashboard.blade.php
index dff25351..70a1ae06 100644
--- a/resources/views/ManageEvent/Dashboard.blade.php
+++ b/resources/views/ManageEvent/Dashboard.blade.php
@@ -10,26 +10,14 @@
     @include('ManageEvent.Partials.TopNav')
 @stop
 
-@section('page_title')
-    <i class="ico-home2"></i>
-    Event Dashboard
+@section('page_title', '<i class="ico-home2"></i>&nbsp;Event Dashboard')
+
+@section('menu')
+    @include('ManageEvent.Partials.Sidebar')
 @stop
 
-@section('page_header')
-    <style> .page-header {
-            display: none;
-        } </style>
-    @stop
-
-    @section('menu')
-    @include('ManageEvent.Partials.Sidebar')
-    @stop
-
-    @section('head')
-
-
+@section('head')
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.css" />
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.min.js"></script>
     <script>
@@ -41,306 +29,292 @@
     </script>
 
     <style>
-
-
         svg {
             width: 100% !important;
         }
     </style>
+@stop
 
-    @stop
+@section('content')
+    <div class="row">
+        <div class="col-sm-3">
+            <div class="stat-box">
+                <h3>{{ money($event->sales_volume + $event->organiser_fees_volume, $event->currency->code) }}</h3>
+                <span>Sales Volume</span>
+            </div>
+        </div>
+        <div class="col-sm-3">
+            <div class="stat-box">
+                <h3>{{ $event->orders->count() }}</h3>
+                <span>Orders</span>
+            </div>
+        </div>
+        <div class="col-sm-3">
+            <div class="stat-box">
+                <h3>{{ $event->tickets->sum('quantity_sold') }}</h3>
+                <span>Tickets Sold</span>
+            </div>
+        </div>
+        <div class="col-sm-3">
+            <div class="stat-box">
+                <h3>{{ $event->stats->sum('views') }}</h3>
+                <span>Event Views</span>
+            </div>
+        </div>
 
-    @section('content')
-            <!-- Top Stats -->
+        <!-- May be implemented soon.
+        <div class="col-sm-3 hide">
+            <div class="stat-box">
+                <h3 id="facebook-count">0</h3>
+                <span>Facebook Shares</span>
+            </div>
+        </div>
+        -->
+    </div>
 
     <div class="row">
-        <div class="col-md-12">
-
-            <div class="row">
-                <div class="col-sm-3">
-                    <div class="stat-box">
-                        <h3>
-                            <div class="hint--top"
-                                 data-hint="{{money($event->sales_volume, $event->currency->code)}} + {{money($event->organiser_fees_volume, $event->currency->code)}} Organiser Fees">
-                                {{money($event->sales_volume + $event->organiser_fees_volume, $event->currency->code)}}
-                            </div>
-                        </h3>
-                        <span>Sales Volume</span>
-                    </div>
+        <div class="col-md-9 col-sm-6">
+            <div class="panel">
+                <div class="panel-heading panel-default">
+                    <h3 class="panel-title">
+                        Tickets Sold
+                        <span style="color: green; float: right;">
+                            {{$event->tickets->sum('quantity_sold')}} Total
+                        </span>
+                    </h3>
                 </div>
-                <div class="col-sm-3">
-                    <div class="stat-box">
-                        <h3>{{$event->orders->count()}}</h3>
-                        <span>Orders</span>
-                    </div>
-                </div>
-                <div class="col-sm-3">
-                    <div class="stat-box">
-                        <h3>{{$event->tickets->sum('quantity_sold')}}</h3>
-                        <span>Tickets Sold</span>
-                    </div>
-                </div>
-
-
-                <div class="col-sm-3">
-                    <div class="stat-box">
-                        <h3>{{$event->stats->sum('views')}}</h3>
-                        <span>Event Views</span>
-                    </div>
-                </div>
-
-                <div class="col-sm-3 hide">
-                    <div class="stat-box">
-                        <h3 id="facebook-count">0</h3>
-                        <span>Facebook Shares</span>
+                <div class="panel-body">
+                    <div class="chart-wrap">
+                        <div style="height:200px;" class="statChart" id="theChart"></div>
                     </div>
                 </div>
             </div>
 
             <div class="row">
-                <div class="col-md-9 col-sm-6">
+                <div class="col-md-6">
                     <div class="panel">
                         <div class="panel-heading panel-default">
                             <h3 class="panel-title">
-                                Tickets Sold
+                                Event Page Visits
                                 <span style="color: green; float: right;">
-                                    {{$event->tickets->sum('quantity_sold')}} Total
+                                    {{$event->stats->sum('views')}} Total
                                 </span>
                             </h3>
                         </div>
                         <div class="panel-body">
                             <div class="chart-wrap">
-                                <div style="height:200px;" class="statChart" id="theChart"></div>
+                                <div style="height: 200px;" class="statChart" id="theChart2"></div>
                             </div>
                         </div>
                     </div>
-
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="panel">
-                                <div class="panel-heading panel-default">
-                                    <h3 class="panel-title">
-                                        Event Page Visits
-                                        <span style="color: green; float: right;">
-                                            {{$event->stats->sum('views')}} Total
-                                        </span>
-                                    </h3>
-                                </div>
-                                <div class="panel-body">
-                                    <div class="chart-wrap">
-                                        <div style="height: 200px;" class="statChart" id="theChart2"></div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="panel">
-                                <div class="panel-heading panel-default">
-                                    <h3 class="panel-title">
-                                        Ticket Sales Volume
-                                        <span style="color: green; float: right;">
-                                            {{money($event->sales_volume + $event->organiser_fees_volume, $event->currency->code)}}
-                                            Total
-                                        </span>
-                                    </h3>
-                                </div>
-                                <div class="panel-body">
-                                    <div class="chart-wrap">
-                                        <div style="height: 200px;" class="statChart" id="theChart3"></div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="col-md-3 col-sm-6">
-                    <div class="panel panel-success ticket">
-                        <div class="panel-body">
-                            <i class="ico ico-clock"></i>
-                            @if($event->happening_now)
-                                This event is on now
-                            @else
-                                <span id="countdown"></span>
-                            @endif
-                        </div>
-                    </div>
-                    <div class="panel panel-success">
-                        <div class="panel-heading">
-                            <h3 class="panel-title">
-                                <i class="ico-link mr5 ellipsis"></i>
-                                Event URL
-                            </h3>
-                        </div>
-
-                        <div class="panel-body">
-                            {!! Form::input('text', '', $event->event_url, ['class' => 'form-control', 'onclick' => 'this.select();']) !!}
-                        </div>
-
-                    </div>
-                    <div class="panel panel-success">
-                        <div class="panel-heading">
-                            <h3 class="panel-title">
-                                <i class="ico-share mr5 ellipsis"></i>
-                                Share Event
-                            </h3>
-                        </div>
-
-                        <div class="panel-body">
-                            <ul class="rrssb-buttons clearfix">
-                                <li class="rrssb-facebook">
-                                    <a href="https://www.facebook.com/sharer/sharer.php?u={{$event->event_url}}?utm_source=fb"
-                                       class="popup">
-                                    <span class="rrssb-icon">
-                                        <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"
-                                             xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px"
-                                             height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28"
-                                             xml:space="preserve">
-                                        <path d="M27.825,4.783c0-2.427-2.182-4.608-4.608-4.608H4.783c-2.422,0-4.608,2.182-4.608,4.608v18.434
-                                              c0,2.427,2.181,4.608,4.608,4.608H14V17.379h-3.379v-4.608H14v-1.795c0-3.089,2.335-5.885,5.192-5.885h3.718v4.608h-3.726
-                                              c-0.408,0-0.884,0.492-0.884,1.236v1.836h4.609v4.608h-4.609v10.446h4.916c2.422,0,4.608-2.188,4.608-4.608V4.783z"/>
-                                        </svg>
-                                    </span>
-                                        <span class="rrssb-text">facebook</span>
-                                    </a>
-                                </li>
-                                <li class="rrssb-linkedin">
-                                    <a href="http://www.linkedin.com/shareArticle?mini=true&amp;url={{$event->event_url}}?utm_source=linkedin&amp;title={{urlencode($event->title)}}&amp;summary={{{Str::words(strip_tags($event->description), 20)}}}"
-                                       class="popup">
-                                    <span class="rrssb-icon">
-                                        <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"
-                                             xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px"
-                                             height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28"
-                                             xml:space="preserve">
-                                        <path d="M25.424,15.887v8.447h-4.896v-7.882c0-1.979-0.709-3.331-2.48-3.331c-1.354,0-2.158,0.911-2.514,1.803
-                                              c-0.129,0.315-0.162,0.753-0.162,1.194v8.216h-4.899c0,0,0.066-13.349,0-14.731h4.899v2.088c-0.01,0.016-0.023,0.032-0.033,0.048
-                                              h0.033V11.69c0.65-1.002,1.812-2.435,4.414-2.435C23.008,9.254,25.424,11.361,25.424,15.887z M5.348,2.501
-                                              c-1.676,0-2.772,1.092-2.772,2.539c0,1.421,1.066,2.538,2.717,2.546h0.032c1.709,0,2.771-1.132,2.771-2.546
-                                              C8.054,3.593,7.019,2.501,5.343,2.501H5.348z M2.867,24.334h4.897V9.603H2.867V24.334z"/>
-                                        </svg>
-                                    </span>
-                                        <span class="rrssb-text">linkedin</span>
-                                    </a>
-                                </li>
-                                <li class="rrssb-twitter">
-                                    <a href="http://twitter.com/intent/tweet?text=Check out: {{$event->event_url}}?utm_source=twitter {{{Str::words(strip_tags($event->description), 20)}}}"
-                                       class="popup">
-                                    <span class="rrssb-icon">
-                                        <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"
-                                             xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-                                             width="28px" height="28px" viewBox="0 0 28 28"
-                                             enable-background="new 0 0 28 28" xml:space="preserve">
-                                        <path d="M24.253,8.756C24.689,17.08,18.297,24.182,9.97,24.62c-3.122,0.162-6.219-0.646-8.861-2.32
-                                              c2.703,0.179,5.376-0.648,7.508-2.321c-2.072-0.247-3.818-1.661-4.489-3.638c0.801,0.128,1.62,0.076,2.399-0.155
-                                              C4.045,15.72,2.215,13.6,2.115,11.077c0.688,0.275,1.426,0.407,2.168,0.386c-2.135-1.65-2.729-4.621-1.394-6.965
-                                              C5.575,7.816,9.54,9.84,13.803,10.071c-0.842-2.739,0.694-5.64,3.434-6.482c2.018-0.623,4.212,0.044,5.546,1.683
-                                              c1.186-0.213,2.318-0.662,3.329-1.317c-0.385,1.256-1.247,2.312-2.399,2.942c1.048-0.106,2.069-0.394,3.019-0.851
-                                              C26.275,7.229,25.39,8.196,24.253,8.756z"/>
-                                        </svg>
-                                    </span>
-                                        <span class="rrssb-text">twitter</span>
-                                    </a>
-                                </li>
-
-                                <li class="rrssb-googleplus">
-                                    <a href="https://plus.google.com/share?url={{$event->event_url}}?utm_source=googleplus"
-                                       class="popup">
-                                    <span class="rrssb-icon">
-                                        <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"
-                                             xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px"
-                                             height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28"
-                                             xml:space="preserve">
-                                        <g>
-                                            <g>
-                                                <path d="M14.703,15.854l-1.219-0.948c-0.372-0.308-0.88-0.715-0.88-1.459c0-0.748,0.508-1.223,0.95-1.663
-                                              c1.42-1.119,2.839-2.309,2.839-4.817c0-2.58-1.621-3.937-2.399-4.581h2.097l2.202-1.383h-6.67c-1.83,0-4.467,0.433-6.398,2.027
-                                              C3.768,4.287,3.059,6.018,3.059,7.576c0,2.634,2.022,5.328,5.604,5.328c0.339,0,0.71-0.033,1.083-0.068
-                                              c-0.167,0.408-0.336,0.748-0.336,1.324c0,1.04,0.551,1.685,1.011,2.297c-1.524,0.104-4.37,0.273-6.467,1.562
-                                              c-1.998,1.188-2.605,2.916-2.605,4.137c0,2.512,2.358,4.84,7.289,4.84c5.822,0,8.904-3.223,8.904-6.41
-                                              c0.008-2.327-1.359-3.489-2.829-4.731H14.703z M10.269,11.951c-2.912,0-4.231-3.765-4.231-6.037c0-0.884,0.168-1.797,0.744-2.511
-                                              c0.543-0.679,1.489-1.12,2.372-1.12c2.807,0,4.256,3.798,4.256,6.242c0,0.612-0.067,1.694-0.845,2.478
-                                              c-0.537,0.55-1.438,0.948-2.295,0.951V11.951z M10.302,25.609c-3.621,0-5.957-1.732-5.957-4.142c0-2.408,2.165-3.223,2.911-3.492
-                                              c1.421-0.479,3.25-0.545,3.555-0.545c0.338,0,0.52,0,0.766,0.034c2.574,1.838,3.706,2.757,3.706,4.479
-                                              c-0.002,2.073-1.736,3.665-4.982,3.649L10.302,25.609z"/>
-                                                <polygon points="23.254,11.89 23.254,8.521 21.569,8.521 21.569,11.89 18.202,11.89 18.202,13.604 21.569,13.604 21.569,17.004
-                                                 23.254,17.004 23.254,13.604 26.653,13.604 26.653,11.89      "/>
-                                            </g>
-                                        </g>
-                                        </svg>
-                                    </span>
-                                        <span class="rrssb-text">google+</span>
-                                    </a>
-                                </li>
-
-                                @if(false)
-                                    <li class="pinterest">
-                                        <a href="http://pinterest.com/pin/create/button/?url={{$event->event_url}}?utm_source=pinterest&amp;media={{$event->bg_image_url}}&amp;description={{{Str::words(strip_tags($event->description), 20)}}}">
-                                    <span class="icon">
-                                        <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"
-                                             xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px"
-                                             height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28"
-                                             xml:space="preserve">
-                                        <path d="M14.021,1.57C6.96,1.57,1.236,7.293,1.236,14.355c0,7.062,5.724,12.785,12.785,12.785c7.061,0,12.785-5.725,12.785-12.785
-                                              C26.807,7.294,21.082,1.57,14.021,1.57z M15.261,18.655c-1.161-0.09-1.649-0.666-2.559-1.219c-0.501,2.626-1.113,5.145-2.925,6.458
-                                              c-0.559-3.971,0.822-6.951,1.462-10.116c-1.093-1.84,0.132-5.545,2.438-4.632c2.837,1.123-2.458,6.842,1.099,7.557
-                                              c3.711,0.744,5.227-6.439,2.925-8.775c-3.325-3.374-9.678-0.077-8.897,4.754c0.19,1.178,1.408,1.538,0.489,3.168
-                                              C7.165,15.378,6.53,13.7,6.611,11.462c0.131-3.662,3.291-6.227,6.46-6.582c4.007-0.448,7.771,1.474,8.29,5.239
-                                              c0.579,4.255-1.816,8.865-6.102,8.533L15.261,18.655z"/>
-                                        </svg>
-                                    </span>
-                                            <span class="text">pinterest</span>
-                                        </a>
-                                    </li>
-                                @endif
-
-                                <li class="rrssb-email">
-                                    <a href="mailto:?subject=Check This Out&body={{urlencode($event->event_url)}}?utm_source=email">
-                                    <span class="rrssb-icon">
-                                        <svg xmlns="http://www.w3.org/2000/svg"
-                                             xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px"
-                                             width="28px" height="28px" viewBox="0 0 28 28"
-                                             enable-background="new 0 0 28 28" xml:space="preserve"><g>
-                                                <path d="M20.111 26.147c-2.336 1.051-4.361 1.401-7.125 1.401c-6.462 0-12.146-4.633-12.146-12.265 c0-7.94 5.762-14.833 14.561-14.833c6.853 0 11.8 4.7 11.8 11.252c0 5.684-3.194 9.265-7.399 9.3 c-1.829 0-3.153-0.934-3.347-2.997h-0.077c-1.208 1.986-2.96 2.997-5.023 2.997c-2.532 0-4.361-1.868-4.361-5.062 c0-4.749 3.504-9.071 9.111-9.071c1.713 0 3.7 0.4 4.6 0.973l-1.169 7.203c-0.388 2.298-0.116 3.3 1 3.4 c1.673 0 3.773-2.102 3.773-6.58c0-5.061-3.27-8.994-9.303-8.994c-5.957 0-11.175 4.673-11.175 12.1 c0 6.5 4.2 10.2 10 10.201c1.986 0 4.089-0.43 5.646-1.245L20.111 26.147z M16.646 10.1 c-0.311-0.078-0.701-0.155-1.207-0.155c-2.571 0-4.595 2.53-4.595 5.529c0 1.5 0.7 2.4 1.9 2.4 c1.441 0 2.959-1.828 3.311-4.087L16.646 10.068z"/>
-                                            </g></svg>
-                                    </span>
-                                        <span class="rrssb-text">email</span>
-                                    </a>
-                                </li>
-                            </ul>
-                        </div>
-
-                    </div>
-
-                    <div class="panel panel-success hide">
-
-                        <div class="panel-heading">
-                            <h3 class="panel-title">
-                                <i class="ico-link mr5 ellipsis"></i>
-                                Quick Links
-                            </h3>
-                        </div>
-
-                        <div class="panel-body">
-
-                            <a href="" class="btn-link btn">
-                                Edit Event Page Design <i class="ico ico-arrow-right3"></i>
-                            </a>
-                            <a href="" class="btn-link btn">
-                                Create Tickets <i class="ico ico-arrow-right3"></i>
-                            </a>
-                            <a href="" class="btn-link btn">
-                                Website Embed Code <i class="ico ico-arrow-right3"></i>
-                            </a>
-                            <a href="" class="btn-link btn">
-                                Generate Affiliate Link <i class="ico ico-arrow-right3"></i>
-                            </a>
-                            <a href="" class="btn-link btn">
-                                Edit Organiser Fees <i class="ico ico-arrow-right3"></i>
-                            </a>
-                        </div>
-
-                    </div>
                 </div>
+                <div class="col-md-6">
+                    <div class="panel">
+                        <div class="panel-heading panel-default">
+                            <h3 class="panel-title">
+                                Ticket Sales Volume
+                                <span style="color: green; float: right;">
+                                    {{money($event->sales_volume + $event->organiser_fees_volume, $event->currency->code)}}
+                                    Total
+                                </span>
+                            </h3>
+                        </div>
+                        <div class="panel-body">
+                            <div class="chart-wrap">
+                                <div style="height: 200px;" class="statChart" id="theChart3"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+        <div class="col-md-3 col-sm-6">
+            <div class="panel panel-success ticket">
+                <div class="panel-body">
+                    <i class="ico ico-clock"></i>
+                    @if($event->happening_now)
+                        This event is on now
+                    @else
+                        <span id="countdown"></span>
+                    @endif
+                </div>
+            </div>
+            <div class="panel panel-success">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        <i class="ico-link mr5 ellipsis"></i>
+                        Event URL
+                    </h3>
+                </div>
+
+                <div class="panel-body">
+                    {!! $event->event_url !!}
+                    {!! Form::input('text', 'front_end_url', $event->event_url, ['class' => 'form-control', 'onclick' => 'this.select();']) !!}
+                </div>
+
+            </div>
+            <div class="panel panel-success">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        <i class="ico-share mr5 ellipsis"></i>
+                        Share Event
+                    </h3>
+                </div>
+
+                <div class="panel-body">
+                    <ul class="rrssb-buttons clearfix">
+                        <li class="rrssb-facebook">
+                            <a href="https://www.facebook.com/sharer/sharer.php?u={{$event->event_url}}?utm_source=fb"
+                               class="popup">
+                            <span class="rrssb-icon">
+                                <svg version="1.1" xmlns="http://www.w3.org/2000/svg"
+                                     xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px"
+                                     height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28"
+                                     xml:space="preserve">
+                                <path d="M27.825,4.783c0-2.427-2.182-4.608-4.608-4.608H4.783c-2.422,0-4.608,2.182-4.608,4.608v18.434
+                                      c0,2.427,2.181,4.608,4.608,4.608H14V17.379h-3.379v-4.608H14v-1.795c0-3.089,2.335-5.885,5.192-5.885h3.718v4.608h-3.726
+                                      c-0.408,0-0.884,0.492-0.884,1.236v1.836h4.609v4.608h-4.609v10.446h4.916c2.422,0,4.608-2.188,4.608-4.608V4.783z"/>
+                                </svg>
+                            </span>
+                                <span class="rrssb-text">facebook</span>
+                            </a>
+                        </li>
+                        <li class="rrssb-linkedin">
+                            <a href="http://www.linkedin.com/shareArticle?mini=true&amp;url={{$event->event_url}}?utm_source=linkedin&amp;title={{urlencode($event->title)}}&amp;summary={{{Str::words(strip_tags($event->description), 20)}}}"
+                               class="popup">
+                            <span class="rrssb-icon">
+                                <svg version="1.1" xmlns="http://www.w3.org/2000/svg"
+                                     xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px"
+                                     height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28"
+                                     xml:space="preserve">
+                                <path d="M25.424,15.887v8.447h-4.896v-7.882c0-1.979-0.709-3.331-2.48-3.331c-1.354,0-2.158,0.911-2.514,1.803
+                                      c-0.129,0.315-0.162,0.753-0.162,1.194v8.216h-4.899c0,0,0.066-13.349,0-14.731h4.899v2.088c-0.01,0.016-0.023,0.032-0.033,0.048
+                                      h0.033V11.69c0.65-1.002,1.812-2.435,4.414-2.435C23.008,9.254,25.424,11.361,25.424,15.887z M5.348,2.501
+                                      c-1.676,0-2.772,1.092-2.772,2.539c0,1.421,1.066,2.538,2.717,2.546h0.032c1.709,0,2.771-1.132,2.771-2.546
+                                      C8.054,3.593,7.019,2.501,5.343,2.501H5.348z M2.867,24.334h4.897V9.603H2.867V24.334z"/>
+                                </svg>
+                            </span>
+                                <span class="rrssb-text">linkedin</span>
+                            </a>
+                        </li>
+                        <li class="rrssb-twitter">
+                            <a href="http://twitter.com/intent/tweet?text=Check out: {{$event->event_url}}?utm_source=twitter {{ Str::words(strip_tags($event->description)), 20 }}"
+                               class="popup">
+                            <span class="rrssb-icon">
+                                <svg version="1.1" xmlns="http://www.w3.org/2000/svg"
+                                     xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+                                     width="28px" height="28px" viewBox="0 0 28 28"
+                                     enable-background="new 0 0 28 28" xml:space="preserve">
+                                <path d="M24.253,8.756C24.689,17.08,18.297,24.182,9.97,24.62c-3.122,0.162-6.219-0.646-8.861-2.32
+                                      c2.703,0.179,5.376-0.648,7.508-2.321c-2.072-0.247-3.818-1.661-4.489-3.638c0.801,0.128,1.62,0.076,2.399-0.155
+                                      C4.045,15.72,2.215,13.6,2.115,11.077c0.688,0.275,1.426,0.407,2.168,0.386c-2.135-1.65-2.729-4.621-1.394-6.965
+                                      C5.575,7.816,9.54,9.84,13.803,10.071c-0.842-2.739,0.694-5.64,3.434-6.482c2.018-0.623,4.212,0.044,5.546,1.683
+                                      c1.186-0.213,2.318-0.662,3.329-1.317c-0.385,1.256-1.247,2.312-2.399,2.942c1.048-0.106,2.069-0.394,3.019-0.851
+                                      C26.275,7.229,25.39,8.196,24.253,8.756z"/>
+                                </svg>
+                            </span>
+                                <span class="rrssb-text">twitter</span>
+                            </a>
+                        </li>
+
+                        <li class="rrssb-googleplus">
+                            <a href="https://plus.google.com/share?url={{$event->event_url}}?utm_source=googleplus"
+                               class="popup">
+                            <span class="rrssb-icon">
+                                <svg version="1.1" xmlns="http://www.w3.org/2000/svg"
+                                     xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px"
+                                     height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28"
+                                     xml:space="preserve">
+                                <g>
+                                    <g>
+                                        <path d="M14.703,15.854l-1.219-0.948c-0.372-0.308-0.88-0.715-0.88-1.459c0-0.748,0.508-1.223,0.95-1.663
+                                      c1.42-1.119,2.839-2.309,2.839-4.817c0-2.58-1.621-3.937-2.399-4.581h2.097l2.202-1.383h-6.67c-1.83,0-4.467,0.433-6.398,2.027
+                                      C3.768,4.287,3.059,6.018,3.059,7.576c0,2.634,2.022,5.328,5.604,5.328c0.339,0,0.71-0.033,1.083-0.068
+                                      c-0.167,0.408-0.336,0.748-0.336,1.324c0,1.04,0.551,1.685,1.011,2.297c-1.524,0.104-4.37,0.273-6.467,1.562
+                                      c-1.998,1.188-2.605,2.916-2.605,4.137c0,2.512,2.358,4.84,7.289,4.84c5.822,0,8.904-3.223,8.904-6.41
+                                      c0.008-2.327-1.359-3.489-2.829-4.731H14.703z M10.269,11.951c-2.912,0-4.231-3.765-4.231-6.037c0-0.884,0.168-1.797,0.744-2.511
+                                      c0.543-0.679,1.489-1.12,2.372-1.12c2.807,0,4.256,3.798,4.256,6.242c0,0.612-0.067,1.694-0.845,2.478
+                                      c-0.537,0.55-1.438,0.948-2.295,0.951V11.951z M10.302,25.609c-3.621,0-5.957-1.732-5.957-4.142c0-2.408,2.165-3.223,2.911-3.492
+                                      c1.421-0.479,3.25-0.545,3.555-0.545c0.338,0,0.52,0,0.766,0.034c2.574,1.838,3.706,2.757,3.706,4.479
+                                      c-0.002,2.073-1.736,3.665-4.982,3.649L10.302,25.609z"/>
+                                        <polygon points="23.254,11.89 23.254,8.521 21.569,8.521 21.569,11.89 18.202,11.89 18.202,13.604 21.569,13.604 21.569,17.004
+                                         23.254,17.004 23.254,13.604 26.653,13.604 26.653,11.89      "/>
+                                    </g>
+                                </g>
+                                </svg>
+                            </span>
+                                <span class="rrssb-text">google+</span>
+                            </a>
+                        </li>
+
+                        @if(false)
+                            <li class="pinterest">
+                                <a href="http://pinterest.com/pin/create/button/?url={{$event->event_url}}?utm_source=pinterest&amp;media={{$event->bg_image_url}}&amp;description={{{Str::words(strip_tags($event->description), 20)}}}">
+                            <span class="icon">
+                                <svg version="1.1" xmlns="http://www.w3.org/2000/svg"
+                                     xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px"
+                                     height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28"
+                                     xml:space="preserve">
+                                <path d="M14.021,1.57C6.96,1.57,1.236,7.293,1.236,14.355c0,7.062,5.724,12.785,12.785,12.785c7.061,0,12.785-5.725,12.785-12.785
+                                      C26.807,7.294,21.082,1.57,14.021,1.57z M15.261,18.655c-1.161-0.09-1.649-0.666-2.559-1.219c-0.501,2.626-1.113,5.145-2.925,6.458
+                                      c-0.559-3.971,0.822-6.951,1.462-10.116c-1.093-1.84,0.132-5.545,2.438-4.632c2.837,1.123-2.458,6.842,1.099,7.557
+                                      c3.711,0.744,5.227-6.439,2.925-8.775c-3.325-3.374-9.678-0.077-8.897,4.754c0.19,1.178,1.408,1.538,0.489,3.168
+                                      C7.165,15.378,6.53,13.7,6.611,11.462c0.131-3.662,3.291-6.227,6.46-6.582c4.007-0.448,7.771,1.474,8.29,5.239
+                                      c0.579,4.255-1.816,8.865-6.102,8.533L15.261,18.655z"/>
+                                </svg>
+                            </span>
+                                    <span class="text">pinterest</span>
+                                </a>
+                            </li>
+                        @endif
+
+                        <li class="rrssb-email">
+                            <a href="mailto:?subject=Check This Out&body={{urlencode($event->event_url)}}?utm_source=email">
+                            <span class="rrssb-icon">
+                                <svg xmlns="http://www.w3.org/2000/svg"
+                                     xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px"
+                                     width="28px" height="28px" viewBox="0 0 28 28"
+                                     enable-background="new 0 0 28 28" xml:space="preserve"><g>
+                                        <path d="M20.111 26.147c-2.336 1.051-4.361 1.401-7.125 1.401c-6.462 0-12.146-4.633-12.146-12.265 c0-7.94 5.762-14.833 14.561-14.833c6.853 0 11.8 4.7 11.8 11.252c0 5.684-3.194 9.265-7.399 9.3 c-1.829 0-3.153-0.934-3.347-2.997h-0.077c-1.208 1.986-2.96 2.997-5.023 2.997c-2.532 0-4.361-1.868-4.361-5.062 c0-4.749 3.504-9.071 9.111-9.071c1.713 0 3.7 0.4 4.6 0.973l-1.169 7.203c-0.388 2.298-0.116 3.3 1 3.4 c1.673 0 3.773-2.102 3.773-6.58c0-5.061-3.27-8.994-9.303-8.994c-5.957 0-11.175 4.673-11.175 12.1 c0 6.5 4.2 10.2 10 10.201c1.986 0 4.089-0.43 5.646-1.245L20.111 26.147z M16.646 10.1 c-0.311-0.078-0.701-0.155-1.207-0.155c-2.571 0-4.595 2.53-4.595 5.529c0 1.5 0.7 2.4 1.9 2.4 c1.441 0 2.959-1.828 3.311-4.087L16.646 10.068z"/>
+                                    </g></svg>
+                            </span>
+                                <span class="rrssb-text">email</span>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+
+            </div>
+
+            <div class="panel panel-success hide">
+
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        <i class="ico-link mr5 ellipsis"></i>
+                        Quick Links
+                    </h3>
+                </div>
+
+                <div class="panel-body">
+
+                    <a href="" class="btn-link btn">
+                        Edit Event Page Design <i class="ico ico-arrow-right3"></i>
+                    </a>
+                    <a href="" class="btn-link btn">
+                        Create Tickets <i class="ico ico-arrow-right3"></i>
+                    </a>
+                    <a href="" class="btn-link btn">
+                        Website Embed Code <i class="ico ico-arrow-right3"></i>
+                    </a>
+                    <a href="" class="btn-link btn">
+                        Generate Affiliate Link <i class="ico ico-arrow-right3"></i>
+                    </a>
+                    <a href="" class="btn-link btn">
+                        Edit Organiser Fees <i class="ico ico-arrow-right3"></i>
+                    </a>
+                </div>
+
             </div>
         </div>
     </div>
diff --git a/resources/views/ManageOrganiser/Dashboard.blade.php b/resources/views/ManageOrganiser/Dashboard.blade.php
index 4707d354..88bf2e97 100644
--- a/resources/views/ManageOrganiser/Dashboard.blade.php
+++ b/resources/views/ManageOrganiser/Dashboard.blade.php
@@ -10,25 +10,16 @@
 @stop
 @section('page_title')
     <i class="ico-building"></i>
-    <i>{{$organiser->name}}</i> Dashboard
+    <i>{{ $organiser->name }}</i> Dashboard
 @stop
 
-@section('page_header')
-    <style>
-        .page-header {
-            display: none;
-        }
-    </style>
-    @stop
-
-    @section('menu')
+@section('menu')
     @include('ManageOrganiser.Partials.Sidebar')
-    @stop
+@stop
 
-    @section('head')
+@section('head')
 
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.css">
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.min.js"></script>
 
@@ -41,65 +32,56 @@
         }
     </style>
 
-    @stop
+@stop
 
-    @section('content')
-    <!-- Top Stats -->
+@section('content')
     <div class="row">
-        <div class="col-md-12">
-            <div class="row">
-                <div class="col-sm-4">
-                    <div class="stat-box">
-                        <h3>
-                            {{$organiser->events->count()}}
-                        </h3>
-                    <span>
-                        Events
-                    </span>
-                    </div>
-                </div>
-                <div class="col-sm-4">
-                    <div class="stat-box">
-                        <h3>
-                            {{$organiser->attendees->count()}}
-                        </h3>
-                    <span>
-                        Tickets Sold
-                    </span>
-                    </div>
-                </div>
-                <div class="col-sm-4">
-                    <div class="stat-box">
-                        <h3>
-                            {{money($organiser->events->sum('sales_volume') + $organiser->events->sum('organiser_fees_volume'), 'EUR')}}
-                        </h3>
-                    <span>
-                        Sales Volume
-                    </span>
-                    </div>
-                </div>
+        <div class="col-sm-4">
+            <div class="stat-box">
+                <h3>
+                    {{$organiser->events->count()}}
+                </h3>
+            <span>
+                Events
+            </span>
+            </div>
+        </div>
+        <div class="col-sm-4">
+            <div class="stat-box">
+                <h3>
+                    {{$organiser->attendees->count()}}
+                </h3>
+            <span>
+                Tickets Sold
+            </span>
+            </div>
+        </div>
+        <div class="col-sm-4">
+            <div class="stat-box">
+                <h3>
+                    {{ money($organiser->events->sum('sales_volume') + $organiser->events->sum('organiser_fees_volume'), 'EUR') }}
+                </h3>
+            <span>
+                Sales Volume
+            </span>
             </div>
-
-            @if($upcoming_events->count())
-                <div class="row">
-                    <div class="col-md-12">
-                        <h4 style="margin-bottom: 25px;margin-top: 20px;">Upcoming Events</h4>
-                    </div>
-                </div>
-                <div class="row">
-                    @foreach($upcoming_events as $event)
-                        <div class="col-md-6 col-sm-6 col-xs-12">
-                            @include('ManageOrganiser.Partials.EventPanel')
-                        </div>
-                    @endforeach
-                </div>
-            @else
-                @if($search['q'])
-                    @include('Shared.Partials.NoSearchResults')
-                @else
-                    @include('ManageOrganiser.Partials.EventsBlankSlate')
-                @endif
-            @endif
         </div>
     </div>
+
+    @if($upcoming_events->count())
+        <h4 style="margin-bottom: 25px;margin-top: 20px;">Upcoming Events</h4>
+        <div class="row">
+            @foreach($upcoming_events as $event)
+                <div class="col-md-6 col-sm-6 col-xs-12">
+                    @include('ManageOrganiser.Partials.EventPanel')
+                </div>
+            @endforeach
+        </div>
+    @else
+        @if($search['q'])
+            @include('Shared.Partials.NoSearchResults')
+        @else
+            @include('ManageOrganiser.Partials.EventsBlankSlate')
+        @endif
+    @endif
 @stop
diff --git a/resources/views/ManageOrganiser/Partials/TopNav.blade.php b/resources/views/ManageOrganiser/Partials/TopNav.blade.php
index 2be5cbf5..a570f369 100644
--- a/resources/views/ManageOrganiser/Partials/TopNav.blade.php
+++ b/resources/views/ManageOrganiser/Partials/TopNav.blade.php
@@ -9,11 +9,10 @@
     </li>
     <!--/ Show Side Menu -->
     <li class="nav-button">
-        <a target="__blank" href="{{$organiser->event_url}}">
+        <a target="_blank" href="{{ $organiser->event_url }}">
             <span>
                 <i class="ico-eye2"></i>&nbsp;Organiser Page
             </span>
-
         </a>
     </li>
 </ul>
\ No newline at end of file
diff --git a/resources/views/Public/ViewEvent/Partials/EventShareSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventShareSection.blade.php
index ced74f6c..16072e34 100644
--- a/resources/views/Public/ViewEvent/Partials/EventShareSection.blade.php
+++ b/resources/views/Public/ViewEvent/Partials/EventShareSection.blade.php
@@ -12,7 +12,7 @@
                 <li class="rrssb-facebook">
                     <a href="https://www.facebook.com/sharer/sharer.php?u={{$event->event_url}}?utm_source=fb" class="popup">
                         <span class="rrssb-icon">
-                            <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
                                 <path d="M27.825,4.783c0-2.427-2.182-4.608-4.608-4.608H4.783c-2.422,0-4.608,2.182-4.608,4.608v18.434
                                       c0,2.427,2.181,4.608,4.608,4.608H14V17.379h-3.379v-4.608H14v-1.795c0-3.089,2.335-5.885,5.192-5.885h3.718v4.608h-3.726
                                       c-0.408,0-0.884,0.492-0.884,1.236v1.836h4.609v4.608h-4.609v10.446h4.916c2.422,0,4.608-2.188,4.608-4.608V4.783z"/>
@@ -26,7 +26,7 @@
                 <li class="rrssb-linkedin">
                     <a href="http://www.linkedin.com/shareArticle?mini=true&amp;url={{$event->event_url}}?utm_source=linkedin&amp;title={{urlencode($event->title)}}&amp;summary={{{Str::words(strip_tags($event->description), 20)}}}" class="popup">
                         <span class="rrssb-icon">
-                            <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
                                 <path d="M25.424,15.887v8.447h-4.896v-7.882c0-1.979-0.709-3.331-2.48-3.331c-1.354,0-2.158,0.911-2.514,1.803
                                       c-0.129,0.315-0.162,0.753-0.162,1.194v8.216h-4.899c0,0,0.066-13.349,0-14.731h4.899v2.088c-0.01,0.016-0.023,0.032-0.033,0.048
                                       h0.033V11.69c0.65-1.002,1.812-2.435,4.414-2.435C23.008,9.254,25.424,11.361,25.424,15.887z M5.348,2.501
@@ -42,7 +42,7 @@
                 <li class="rrssb-twitter">
                     <a href="http://twitter.com/intent/tweet?text=Check out: {{$event->event_url}} {{{Str::words(strip_tags($event->description), 20)}}}" class="popup">
                         <span class="rrssb-icon">
-                            <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
                                  width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
                                 <path d="M24.253,8.756C24.689,17.08,18.297,24.182,9.97,24.62c-3.122,0.162-6.219-0.646-8.861-2.32
                                       c2.703,0.179,5.376-0.648,7.508-2.321c-2.072-0.247-3.818-1.661-4.489-3.638c0.801,0.128,1.62,0.076,2.399-0.155
@@ -60,7 +60,7 @@
                 <li class="rrssb-googleplus">
                     <a href="https://plus.google.com/share?url={{$event->event_url}}?utm_source=googleplus" class="popup">
                         <span class="rrssb-icon">
-                            <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
                                 <g>
                                     <g>
                                         <path d="M14.703,15.854l-1.219-0.948c-0.372-0.308-0.88-0.715-0.88-1.459c0-0.748,0.508-1.223,0.95-1.663
@@ -88,7 +88,7 @@
                 <li class="rrssb-pinterest">
                     <a href="http://pinterest.com/pin/create/button/?url={{$event->event_url}}?utm_source=pinterest&amp;media={{$event->bg_image_url}}&amp;description={{{Str::words(strip_tags($event->description), 20)}}}">
                         <span class="rrssb-icon">
-                            <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
                                 <path d="M14.021,1.57C6.96,1.57,1.236,7.293,1.236,14.355c0,7.062,5.724,12.785,12.785,12.785c7.061,0,12.785-5.725,12.785-12.785
                                       C26.807,7.294,21.082,1.57,14.021,1.57z M15.261,18.655c-1.161-0.09-1.649-0.666-2.559-1.219c-0.501,2.626-1.113,5.145-2.925,6.458
                                       c-0.559-3.971,0.822-6.951,1.462-10.116c-1.093-1.84,0.132-5.545,2.438-4.632c2.837,1.123-2.458,6.842,1.099,7.557
diff --git a/resources/views/Public/ViewOrganiser/Partials/OrganiserSocialSection.blade.php b/resources/views/Public/ViewOrganiser/Partials/OrganiserSocialSection.blade.php
index aa460fbf..5ff1a895 100644
--- a/resources/views/Public/ViewOrganiser/Partials/OrganiserSocialSection.blade.php
+++ b/resources/views/Public/ViewOrganiser/Partials/OrganiserSocialSection.blade.php
@@ -7,7 +7,7 @@
                 <li class="rrssb-facebook">
                     <a href="https://www.facebook.com/sharer/sharer.php?u={{$event->event_url}}?utm_source=fb" class="popup">
                         <span class="rrssb-icon">
-                            <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
                                 <path d="M27.825,4.783c0-2.427-2.182-4.608-4.608-4.608H4.783c-2.422,0-4.608,2.182-4.608,4.608v18.434
                                       c0,2.427,2.181,4.608,4.608,4.608H14V17.379h-3.379v-4.608H14v-1.795c0-3.089,2.335-5.885,5.192-5.885h3.718v4.608h-3.726
                                       c-0.408,0-0.884,0.492-0.884,1.236v1.836h4.609v4.608h-4.609v10.446h4.916c2.422,0,4.608-2.188,4.608-4.608V4.783z"/>
@@ -21,7 +21,7 @@
                 <li class="rrssb-linkedin">
                     <a href="http://www.linkedin.com/shareArticle?mini=true&amp;url={{$event->event_url}}?utm_source=linkedin&amp;title={{urlencode($event->title)}}&amp;summary={{{Str::words(strip_tags($event->description), 20)}}}" class="popup">
                         <span class="rrssb-icon">
-                            <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
                                 <path d="M25.424,15.887v8.447h-4.896v-7.882c0-1.979-0.709-3.331-2.48-3.331c-1.354,0-2.158,0.911-2.514,1.803
                                       c-0.129,0.315-0.162,0.753-0.162,1.194v8.216h-4.899c0,0,0.066-13.349,0-14.731h4.899v2.088c-0.01,0.016-0.023,0.032-0.033,0.048
                                       h0.033V11.69c0.65-1.002,1.812-2.435,4.414-2.435C23.008,9.254,25.424,11.361,25.424,15.887z M5.348,2.501
@@ -37,7 +37,7 @@
                 <li class="rrssb-twitter">
                     <a href="http://twitter.com/intent/tweet?text=Check out: {{$event->event_url}} {{{Str::words(strip_tags($event->description), 20)}}}" class="popup">
                         <span class="rrssb-icon">
-                            <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
                                  width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
                                 <path d="M24.253,8.756C24.689,17.08,18.297,24.182,9.97,24.62c-3.122,0.162-6.219-0.646-8.861-2.32
                                       c2.703,0.179,5.376-0.648,7.508-2.321c-2.072-0.247-3.818-1.661-4.489-3.638c0.801,0.128,1.62,0.076,2.399-0.155
@@ -55,7 +55,7 @@
                 <li class="rrssb-googleplus">
                     <a href="https://plus.google.com/share?url={{$event->event_url}}?utm_source=googleplus" class="popup">
                         <span class="rrssb-icon">
-                            <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
                                 <g>
                                     <g>
                                         <path d="M14.703,15.854l-1.219-0.948c-0.372-0.308-0.88-0.715-0.88-1.459c0-0.748,0.508-1.223,0.95-1.663
@@ -83,7 +83,7 @@
                 <li class="rrssb-pinterest">
                     <a href="http://pinterest.com/pin/create/button/?url={{$event->event_url}}?utm_source=pinterest&amp;media={{$event->bg_image_url}}&amp;description={{{Str::words(strip_tags($event->description), 20)}}}">
                         <span class="rrssb-icon">
-                            <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
                                 <path d="M14.021,1.57C6.96,1.57,1.236,7.293,1.236,14.355c0,7.062,5.724,12.785,12.785,12.785c7.061,0,12.785-5.725,12.785-12.785
                                       C26.807,7.294,21.082,1.57,14.021,1.57z M15.261,18.655c-1.161-0.09-1.649-0.666-2.559-1.219c-0.501,2.626-1.113,5.145-2.925,6.458
                                       c-0.559-3.971,0.822-6.951,1.462-10.116c-1.093-1.84,0.132-5.545,2.438-4.632c2.837,1.123-2.458,6.842,1.099,7.557
@@ -99,7 +99,7 @@
                 @endif
                 @if($event->social_show_email)
                 <li class="rrssb-email">
-                    <a href="mailto:?subject=Check This Out&body={{urlencode($event->event_url)}}?utm_source=email">
+                    <a href="{{ urlencode("mailto:?subject=Check This Out&body=" . $event->event_url . "?utm_source=email") }}">
                         <span class="rrssb-icon">
                             <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve"><g><path d="M20.111 26.147c-2.336 1.051-4.361 1.401-7.125 1.401c-6.462 0-12.146-4.633-12.146-12.265 c0-7.94 5.762-14.833 14.561-14.833c6.853 0 11.8 4.7 11.8 11.252c0 5.684-3.194 9.265-7.399 9.3 c-1.829 0-3.153-0.934-3.347-2.997h-0.077c-1.208 1.986-2.96 2.997-5.023 2.997c-2.532 0-4.361-1.868-4.361-5.062 c0-4.749 3.504-9.071 9.111-9.071c1.713 0 3.7 0.4 4.6 0.973l-1.169 7.203c-0.388 2.298-0.116 3.3 1 3.4 c1.673 0 3.773-2.102 3.773-6.58c0-5.061-3.27-8.994-9.303-8.994c-5.957 0-11.175 4.673-11.175 12.1 c0 6.5 4.2 10.2 10 10.201c1.986 0 4.089-0.43 5.646-1.245L20.111 26.147z M16.646 10.1 c-0.311-0.078-0.701-0.155-1.207-0.155c-2.571 0-4.595 2.53-4.595 5.529c0 1.5 0.7 2.4 1.9 2.4 c1.441 0 2.959-1.828 3.311-4.087L16.646 10.068z"/></g></svg>
                         </span>
diff --git a/resources/views/Shared/Layouts/Master.blade.php b/resources/views/Shared/Layouts/Master.blade.php
index d9309482..674fac69 100644
--- a/resources/views/Shared/Layouts/Master.blade.php
+++ b/resources/views/Shared/Layouts/Master.blade.php
@@ -98,6 +98,7 @@
         <div class="page-title">
             <h1 class="title">@yield('page_title')</h1>
         </div>
+        @if(array_key_exists('page_header', View::getSections()))
         <!--  header -->
         <div class="page-header page-header-block row">
             <div class="row">
@@ -105,6 +106,7 @@
             </div>
         </div>
         <!--/  header -->
+        @endif
 
         <!--Content-->
         @yield('content')