diff --git a/.env.example b/.env.example index 9b80b3d3..16b673c6 100644 --- a/.env.example +++ b/.env.example @@ -22,4 +22,6 @@ MAIL_USERNAME= GOOGLE_ANALYTICS_ID= +TWITTER_WIDGET_ID= + LOG=single \ No newline at end of file diff --git a/app/Http/Controllers/OrganiserViewController.php b/app/Http/Controllers/OrganiserViewController.php index d45bc739..f73c8fb9 100644 --- a/app/Http/Controllers/OrganiserViewController.php +++ b/app/Http/Controllers/OrganiserViewController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use App\Models\Organiser; use View; +use Carbon\Carbon; class OrganiserViewController extends Controller { @@ -11,10 +12,15 @@ class OrganiserViewController extends Controller { $organiser = Organiser::findOrFail($organiser_id); + $upcoming_events = $organiser->events()->where('end_date', '>=', Carbon::now())->get(); + $past_events = $organiser->events()->where('end_date', '<', Carbon::now())->get(); + $data = [ - 'organiser' => $organiser, - 'tickets' => $organiser->events()->orderBy('created_at', 'desc')->get(), - 'is_embedded' => 0, + 'organiser' => $organiser, + 'tickets' => $organiser->events()->orderBy('created_at', 'desc')->get(), + 'is_embedded' => 0, + 'upcoming_events' => $upcoming_events, + 'past_events' => $past_events ]; return View::make('Public.ViewOrganiser.OrganiserPage', $data); diff --git a/config/services.php b/config/services.php index e606dbe0..4e797b15 100644 --- a/config/services.php +++ b/config/services.php @@ -34,4 +34,7 @@ return [ 'secret' => '', ], + 'twitter' => [ + 'widget_id' => env('TWITTER_WIDGET_ID'), + ] ]; diff --git a/public/assets/stylesheet/public.less b/public/assets/stylesheet/public.less index c5944e21..8014dbbb 100644 --- a/public/assets/stylesheet/public.less +++ b/public/assets/stylesheet/public.less @@ -55,10 +55,21 @@ section h1 { text-align: center; font-weight: 100; padding: 20px 0 20px 0; - color: #ffffff; border: none; - background-color: transparent; margin-bottom: 0; + margin-top: 20px; + color:#fff !important; + background-color: #AF5050 !important; + } + + .organiser_logo { + max-width: 150px; + margin: 0 auto; + } + + .organiser_logo .thumbnail { + background-color: transparent; + border: none; } } @@ -347,4 +358,25 @@ Small devices (tablets, 768px and up) .rrssb-buttons.large-format li a { border-radius: 0; +} + +/* +----------------------------------------------------- +Event Listing +----------------------------------------------------- +*/ +.event-listing { + .event .panel { + min-height: 140px; + } + + .event_flyer { + text-align: center; + + } + + .event_flyer img { + max-height: 140px; + max-width: 100%; + } } \ No newline at end of file diff --git a/resources/views/Public/ViewEvent/Partials/EventListingPanel.blade.php b/resources/views/Public/ViewEvent/Partials/EventListingPanel.blade.php new file mode 100644 index 00000000..da00911c --- /dev/null +++ b/resources/views/Public/ViewEvent/Partials/EventListingPanel.blade.php @@ -0,0 +1,31 @@ +
+
+

+ {{ $panel_title }} +

+
+
+
+ @foreach($events as $event) +
+
+
+
+ +
+
+
+
+ {{{$event->title}}} +
+

{{{ $event->start_date->toDayDateTimeString() }}}

+

{{{$event->venue_name}}}

+
+
+
+
+
+ @endforeach +
+
+
\ No newline at end of file diff --git a/resources/views/Public/ViewEvent/Partials/EventOrganiserSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventOrganiserSection.blade.php index 4218fbf4..a3138164 100644 --- a/resources/views/Public/ViewEvent/Partials/EventOrganiserSection.blade.php +++ b/resources/views/Public/ViewEvent/Partials/EventOrganiserSection.blade.php @@ -6,11 +6,11 @@ {{$event->organiser->name}}

- {{$event->organiser->name}} + {!!HTML::link('/o/'.$event->organiser->id, $event->organiser->name, array('title' => "Organiser Page"))!!}

- {{nl2br($event->organiser->about)}} + {!! nl2br($event->organiser->about)!!}

@if($event->organiser->facebook) diff --git a/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php b/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php index 5c9a16bc..31c781ec 100644 --- a/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php +++ b/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php @@ -36,6 +36,7 @@ + @include('Shared.Partials.FacebookSdk')

@yield('content')
diff --git a/resources/views/Public/ViewOrganiser/Partials/OrganiserEventsSection.blade.php b/resources/views/Public/ViewOrganiser/Partials/OrganiserEventsSection.blade.php index b3eaed19..14ffcb58 100644 --- a/resources/views/Public/ViewOrganiser/Partials/OrganiserEventsSection.blade.php +++ b/resources/views/Public/ViewOrganiser/Partials/OrganiserEventsSection.blade.php @@ -1,48 +1,34 @@
- - -
-
-

- Upcoming Events -

+
+
+ @include('Public.ViewEvent.Partials.EventListingPanel', + array( + 'panel_title' => 'Upcoming Events', + 'events' => $upcoming_events + ) + ) + @include('Public.ViewEvent.Partials.EventListingPanel', + array( + 'panel_title' => 'Past Events', + 'events' => $past_events + ) + )
-
-
- @foreach($organiser->events as $event) -
-
-
-
- -
-
-
-
- {{{$event->title}}} -
-

{{{ $event->start_date->toDayDateTimeString() }}}

-

{{{$event->venue_name}}}

-
-
-
-
-
- @endforeach -
+
+ @if ($organiser->facebook) + @include('Shared.Partials.FacebookTimelinePanel', + array( + 'facebook_account' => $organiser->facebook + ) + ) + @endif + @if ($organiser->twitter) + @include('Shared.Partials.TwitterTimelinePanel', + array( + 'twitter_account' => $organiser->facebook + ) + ) + @endif
\ No newline at end of file diff --git a/resources/views/Public/ViewOrganiser/Partials/OrganiserHeaderSection.blade.php b/resources/views/Public/ViewOrganiser/Partials/OrganiserHeaderSection.blade.php index 60fd42f5..6f5ad194 100644 --- a/resources/views/Public/ViewOrganiser/Partials/OrganiserHeaderSection.blade.php +++ b/resources/views/Public/ViewOrganiser/Partials/OrganiserHeaderSection.blade.php @@ -1,21 +1,3 @@ -
@@ -25,6 +7,9 @@

{{$organiser->name}}

+
+ {!! $organiser->about !!} +
diff --git a/resources/views/Shared/Partials/FacebookSdk.blade.php b/resources/views/Shared/Partials/FacebookSdk.blade.php index 13e93ff5..5cdf6f92 100644 --- a/resources/views/Shared/Partials/FacebookSdk.blade.php +++ b/resources/views/Shared/Partials/FacebookSdk.blade.php @@ -1,20 +1,8 @@ - \ No newline at end of file diff --git a/resources/views/Shared/Partials/FacebookTimelinePanel.blade.php b/resources/views/Shared/Partials/FacebookTimelinePanel.blade.php new file mode 100644 index 00000000..d0bb9668 --- /dev/null +++ b/resources/views/Shared/Partials/FacebookTimelinePanel.blade.php @@ -0,0 +1,21 @@ +
+
+

+ Facebook feed +

+
+
+
+
+
+
+ Facebook +
+
+
+
+
+
\ No newline at end of file diff --git a/resources/views/Shared/Partials/TwitterTimelinePanel.blade.php b/resources/views/Shared/Partials/TwitterTimelinePanel.blade.php new file mode 100644 index 00000000..a0495db4 --- /dev/null +++ b/resources/views/Shared/Partials/TwitterTimelinePanel.blade.php @@ -0,0 +1,7 @@ +
+ + Tweets by @ {{ $twitter_account }} + +
\ No newline at end of file