diff --git a/app/Http/Controllers/OrganiserCustomizeController.php b/app/Http/Controllers/OrganiserCustomizeController.php index e3bd90a0..8fdc5e03 100644 --- a/app/Http/Controllers/OrganiserCustomizeController.php +++ b/app/Http/Controllers/OrganiserCustomizeController.php @@ -5,53 +5,64 @@ namespace App\Http\Controllers; use App\Models\Organiser; use File; use Image; -use Input; -use Response; -use Session; -use View; +use Illuminate\Http\Request; +use Validator; class OrganiserCustomizeController extends MyBaseController { + /** + * Show organiser setting page + * + * @param $organiser_id + * @return mixed + */ public function showCustomize($organiser_id) { $data = [ 'organiser' => Organiser::scope()->findOrFail($organiser_id), ]; - return View::make('ManageOrganiser.Customize', $data); + return view('ManageOrganiser.Customize', $data); } - public function postEditOrganiser($organiser_id) + /** + * Edits organiser settings / design etc. + * + * @param Request $request + * @param $organiser_id + * @return mixed + */ + public function postEditOrganiser(Request $request, $organiser_id) { $organiser = Organiser::scope()->find($organiser_id); - if (!$organiser->validate(Input::all())) { - return Response::json([ + if (!$organiser->validate($request->all())) { + return response()->json([ 'status' => 'error', 'messages' => $organiser->errors(), ]); } - $organiser->name = Input::get('name'); - $organiser->about = Input::get('about'); - $organiser->email = Input::get('email'); - $organiser->facebook = Input::get('facebook'); - $organiser->twitter = Input::get('twitter'); + $organiser->name = $request->get('name'); + $organiser->about = $request->get('about'); + $organiser->email = $request->get('email'); + $organiser->facebook = $request->get('facebook'); + $organiser->twitter = $request->get('twitter'); /* * If the email has been changed the user must confirm the email. */ - if ($organiser->email !== Input::get('email')) { + if ($organiser->email !== $request->get('email')) { $organiser->is_email_confirmed = 0; } - if (Input::get('remove_current_image') == '1') { + if ($request->get('remove_current_image') == '1') { $organiser->logo_path = ''; } - if (Input::hasFile('organiser_logo')) { - $the_file = \File::get(Input::file('organiser_logo')->getRealPath()); - $file_name = str_slug($organiser->name).'-logo-'.$organiser->id.'.'.strtolower(Input::file('organiser_logo')->getClientOriginalExtension()); + if ($request->hasFile('organiser_logo')) { + $the_file = \File::get($request->file('organiser_logo')->getRealPath()); + $file_name = str_slug($organiser->name).'-logo-'.$organiser->id.'.'.strtolower($request->file('organiser_logo')->getClientOriginalExtension()); $relative_path_to_file = config('attendize.organiser_images_path').'/'.$file_name; $full_path_to_file = public_path($relative_path_to_file); @@ -72,13 +83,55 @@ class OrganiserCustomizeController extends MyBaseController $organiser->save(); - Session::flash('message', 'Successfully Updated Organiser'); + session()->flash('message', 'Successfully Updated Organiser'); - return Response::json([ + return response()->json([ 'status' => 'success', 'redirectUrl' => route('showOrganiserCustomize', [ 'organiser_id' => $organiser->id, ]), ]); } + + /** + * Edits organiser profile page colors / design + * + * @param Request $request + * @param $organiser_id + * @return mixed + */ + public function postEditOrganiserPageDesign(Request $request, $organiser_id) + { + $event = Organiser::scope()->findOrFail($organiser_id); + + $rules = [ + 'page_bg_color' => ['required'], + 'page_header_bg_color' => ['required'], + 'page_text_color' => ['required'], + ]; + $messages = [ + 'page_header_bg_color.required' => 'Please enter a header background color.', + 'page_bg_color.required' => 'Please enter a background color.', + ]; + + $validator = Validator::make($request->all(), $rules, $messages); + + if ($validator->fails()) { + return response()->json([ + 'status' => 'error', + 'messages' => $validator->messages()->toArray(), + ]); + } + + $event->page_bg_color = $request->get('page_bg_color'); + $event->page_header_bg_color = $request->get('page_header_bg_color'); + $event->page_text_color = $request->get('page_text_color'); + + $event->save(); + + return response()->json([ + 'status' => 'success', + 'message' => 'Organiser Design Successfully Updated', + ]); + } } diff --git a/app/Http/routes.php b/app/Http/routes.php index eaf99cd8..f9233ea2 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -226,37 +226,43 @@ Route::group(['middleware' => ['auth', 'first.run']], function () { ]); /* - * New organiser dashboard + * Organiser routes */ Route::group(['prefix' => 'organiser'], function () { - /* - * ----------- - * Organiser Dashboard - * ----------- - */ + Route::get('{organiser_id}/dashboard', [ 'as' => 'showOrganiserDashboard', 'uses' => 'OrganiserDashboardController@showDashboard', ]); - - /* - * ----------- - * Organiser events - * ----------- - */ Route::get('{organiser_id}/events', [ 'as' => 'showOrganiserEvents', 'uses' => 'OrganiserEventsController@showEvents', ]); - /* - * ----------- - * Organiser events - * ----------- - */ Route::get('{organiser_id}/customize', [ 'as' => 'showOrganiserCustomize', 'uses' => 'OrganiserCustomizeController@showCustomize', ]); + Route::get('create', [ + 'as' => 'showCreateOrganiser', + 'uses' => 'OrganiserController@showCreateOrganiser', + ]); + Route::post('create', [ + 'as' => 'postCreateOrganiser', + 'uses' => 'OrganiserController@postCreateOrganiser', + ]); + Route::get('{organiser_id}/edit', [ + 'as' => 'showEditOrganiser', + 'uses' => 'OrganiserController@showEditOrganiser', + ]); + Route::post('{organiser_id}/edit', [ + 'as' => 'postEditOrganiser', + 'uses' => 'OrganiserCustomizeController@postEditOrganiser', + ]); + + Route::post('{organiser_id}/page_design', [ + 'as' => 'postEditOrganiserPageDesign', + 'uses' => 'OrganiserCustomizeController@postEditOrganiserPageDesign' + ]); }); /* @@ -264,36 +270,6 @@ Route::group(['middleware' => ['auth', 'first.run']], function () { */ Route::group(['prefix' => 'events'], function () { - /* - * ----------- - * Events Dashboard - Organisers - * ----------- - */ - Route::get('/organiser/create', [ - 'as' => 'showCreateOrganiser', - 'uses' => 'OrganiserController@showCreateOrganiser', - ]); - Route::post('/organiser/create', [ - 'as' => 'postCreateOrganiser', - 'uses' => 'OrganiserController@postCreateOrganiser', - ]); - Route::get('/organiser/{organiser_id}', [ - 'as' => 'showOrganiserEventsDashboard', - 'uses' => 'OrganiserController@showOrganiserDashboard', - ]); - Route::get('/organiser/{organiser_id?}', [ - 'as' => 'showSearchEventsDashboard', - 'uses' => 'OrganiserController@showOrganiserDashboard', - ]); - Route::get('/organiser/{organiser_id}/edit', [ - 'as' => 'showEditOrganiser', - 'uses' => 'OrganiserController@showEditOrganiser', - ]); - Route::post('/organiser/{organiser_id}/edit', [ - 'as' => 'postEditOrganiser', - 'uses' => 'OrganiserCustomizeController@postEditOrganiser', - ]); - /* * ---------- * Create Event diff --git a/database/migrations/2016_03_09_221103_add_ticket_design_options.php b/database/migrations/2016_03_09_221103_add_ticket_design_options.php index ed959332..f284f87b 100644 --- a/database/migrations/2016_03_09_221103_add_ticket_design_options.php +++ b/database/migrations/2016_03_09_221103_add_ticket_design_options.php @@ -16,11 +16,11 @@ class AddTicketDesignOptions extends Migration /* * @see https://github.com/milon/barcode */ - $table->string('barcode_type', 10)->default('QRCODE'); - $table->string('ticket_border_color', 10)->default('#000000'); - $table->string('ticket_bg_color', 10)->default('#FFFFFF'); - $table->string('ticket_text_color', 10)->default('#000000'); - $table->string('ticket_sub_text_color', 10)->default('#999999'); + $table->string('barcode_type', 20)->default('QRCODE'); + $table->string('ticket_border_color', 20)->default('#000000'); + $table->string('ticket_bg_color', 20)->default('#FFFFFF'); + $table->string('ticket_text_color', 20)->default('#000000'); + $table->string('ticket_sub_text_color', 20)->default('#999999'); }); } diff --git a/database/migrations/2016_03_25_114646_organiser_page_design_update.php b/database/migrations/2016_03_25_114646_organiser_page_design_update.php new file mode 100644 index 00000000..18efc930 --- /dev/null +++ b/database/migrations/2016_03_25_114646_organiser_page_design_update.php @@ -0,0 +1,40 @@ +boolean('show_twitter_widget'); + $table->boolean('show_facebook_widget'); + + $table->string('page_header_bg_color', 20)->default('#009688'); + $table->string('page_bg_color', 20)->default('#EEEEEE'); + $table->string('page_text_color', 20)->default('#FFFFFF'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('organisers', function (Blueprint $table) { + $table->dropColumn('show_twitter_widget'); + $table->dropColumn('show_facebook_widget'); + $table->dropColumn('page_header_bg_color'); + $table->dropColumn('page_bg_color'); + $table->dropColumn('page_text_color'); + }); + } +} diff --git a/public/assets/stylesheet/application.css b/public/assets/stylesheet/application.css index a2c37bda..259afcec 100644 --- a/public/assets/stylesheet/application.css +++ b/public/assets/stylesheet/application.css @@ -483,9 +483,4 @@ body { .minicolors-theme-semanticui input { text-indent: 30px; } - -#bgOptions .panel { - overflow: visible; -} - .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}.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}.order_options{padding:10px 0}.minicolors-theme-default.minicolors{width:auto;display:block}.minicolors-theme-default .minicolors-input{padding-left:35px;height:auto;width:100%;display:block}.minicolors-theme-default .minicolors-swatch{top:8px;left:6px;width:18px;height:18px} \ No newline at end of file diff --git a/public/assets/stylesheet/frontend.css b/public/assets/stylesheet/frontend.css index 576884b1..4307427b 100644 --- a/public/assets/stylesheet/frontend.css +++ b/public/assets/stylesheet/frontend.css @@ -100,4 +100,4 @@ body { opacity: 0.7; filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70); } -body{font-family:'Open Sans',sans-serif}table{margin:0}@media (min-width:1200px){.container{width:960px}}section.container{padding:40px;background-color:#fff;margin-bottom:25px}.section_head{border:none !important;font-size:35px;text-align:center;margin:0;margin-bottom:30px;letter-spacing:.2em;font-weight:200}.section_head h1{margin:0;font-weight:100;text-align:center}section{color:#666}#organiser_page_wrap #intro{position:relative;text-align:center;font-weight:100;padding:20px 0 20px 0;border:none;margin-bottom:0;margin-top:20px;color:#fff !important;background-color:#af5050 !important}#organiser_page_wrap .organiser_logo{max-width:150px;margin:0 auto}#organiser_page_wrap .organiser_logo .thumbnail{background-color:transparent;border:none}#event_page_wrap{background:rgba(0,0,0,0.4)}#event_page_wrap #organiserHead{text-align:center;color:#fff;border:none;font-size:15px;opacity:.6;transition:all .15s ease-in-out;background:rgba(0,0,0,0.4);line-height:30px;cursor:pointer}#event_page_wrap #organiserHead:hover{opacity:1}#event_page_wrap #intro{position:relative;text-align:center;font-weight:100;padding:20px 0 20px 0;color:#fff;border:none;background-color:transparent;margin-bottom:0}#event_page_wrap #intro h1{position:relative;padding:10px 10px;margin:0;font-weight:400;font-size:60px;margin-bottom:10px}#event_page_wrap #intro .event_date{font-size:15px;padding:10px;font-weight:500}#event_page_wrap #intro .event_venue{font-size:19px}#event_page_wrap #intro .event_buttons{margin-top:30px;margin-bottom:30px}#event_page_wrap #intro .event_buttons .btn-event-link{line-height:35px;font-size:17px;text-transform:uppercase;letter-spacing:5px;border:1px solid;border-color:rgba(255,255,255,0.2);text-decoration:none;color:#fff;padding:0 15px;transition:all .15s ease-in-out;width:100%;background:rgba(0,0,0,0.3)}#event_page_wrap #intro .event_buttons .btn-event-link:hover{border-color:rgba(255,255,255,0.6)}#event_page_wrap #tickets .input-group-addon{background:none;border:none}#event_page_wrap #tickets table tr:first-child td{border-top:none}#event_page_wrap #tickets table tr td{padding:20px 0}#event_page_wrap #details .event_poster img{border:4px solid #f6f6f6;max-width:100%;min-width:100%}#event_page_wrap #details .event_details iframe,#event_page_wrap #details .event_details img{max-width:100%}#event_page_wrap #details .event_details h1,#event_page_wrap #details .event_details h2,#event_page_wrap #details .event_details h3,#event_page_wrap #details .event_details h4,#event_page_wrap #details .event_details h5,#event_page_wrap #details .event_details h6{margin-top:0;margin-bottom:15px;font-weight:100}#event_page_wrap #details .event_details h1{font-size:28px}#event_page_wrap #details .event_details h2{font-size:24px}#event_page_wrap #details .event_details h3{font-size:20px}#event_page_wrap #details .event_details h4{font-size:17px}#event_page_wrap #share .btn{margin-bottom:20px}#event_page_wrap #location{padding:0}#event_page_wrap #location .google-maps{position:relative;overflow:hidden}#event_page_wrap #location .google-maps iframe{width:100% !important;height:100% !important;min-height:500px}#footer{background-color:#888;background-color:rgba(0,0,0,0.4);min-height:60px;line-height:60px;color:#fff;text-align:center}#organiser{text-align:center}#organiser .contact_form{display:none;padding:20px;margin-top:25px;text-align:left}.totop{border-radius:0;background-color:#888;background-color:rgba(0,0,0,0.4)}.totop:hover{background-color:#fff;background-color:rgba(255,255,255,0.4);color:#000}@media (min-width:100px) and (max-width:767px){.row{margin:0}section.container{margin-bottom:0;padding:10px}.section_head{padding:10px;font-size:30px}.main_content{padding:0;background:#fff}#organiser_page_wrap #intro{padding:30px}#organiser_page_wrap #intro h1{font-size:2.236em;padding:15px}#event_page_wrap #intro{padding:30px}#event_page_wrap #intro .event_date h2{font-size:20px}#event_page_wrap #intro .event_date h4{font-size:11px}#event_page_wrap #intro h1{font-size:2.236em;padding:15px}#event_page_wrap #intro .event_venue{color:#fff;font-size:20px;margin-top:10px}#event_page_wrap #intro .event_buttons{margin-top:50px}#event_page_wrap #intro .event_buttons .btn-event-link{padding:5px 0;font-size:18px;margin-bottom:5px;line-height:30px}#event_page_wrap #tickets .btn-checkout{width:100%}#event_page_wrap #location .google-maps iframe{min-height:290px}.content{padding:15px}}.rrssb-buttons.large-format li a{border-radius:0}.event-listing .event .panel{min-height:140px}.event-listing .event_flyer{text-align:center}.event-listing .event_flyer img{max-height:140px;max-width:100%} \ No newline at end of file +body{font-family:'Open Sans',sans-serif}table{margin:0}@media (min-width:1200px){.container{width:960px}}section.container{padding:40px;background-color:#fff;margin-bottom:25px}.section_head{border:none !important;font-size:35px;text-align:center;margin:0;margin-bottom:30px;letter-spacing:.2em;font-weight:200}.section_head h1{margin:0;font-weight:100;text-align:center}section{color:#666}#organiser_page_wrap #intro{position:relative;text-align:center;font-weight:100;padding:20px 0 20px 0;border:none;margin-bottom:0;margin-top:20px;color:#fff;background-color:#af5050}#organiser_page_wrap .organiser_logo{max-width:150px;margin:0 auto}#organiser_page_wrap .organiser_logo .thumbnail{background-color:transparent;border:none}#event_page_wrap{background:rgba(0,0,0,0.4)}#event_page_wrap #organiserHead{text-align:center;color:#fff;border:none;font-size:15px;opacity:.6;transition:all .15s ease-in-out;background:rgba(0,0,0,0.4);line-height:30px;cursor:pointer}#event_page_wrap #organiserHead:hover{opacity:1}#event_page_wrap #intro{position:relative;text-align:center;font-weight:100;padding:20px 0 20px 0;color:#fff;border:none;background-color:transparent;margin-bottom:0}#event_page_wrap #intro h1{position:relative;padding:10px 10px;margin:0;font-weight:400;font-size:60px;margin-bottom:10px}#event_page_wrap #intro .event_date{font-size:15px;padding:10px;font-weight:500}#event_page_wrap #intro .event_venue{font-size:19px}#event_page_wrap #intro .event_buttons{margin-top:30px;margin-bottom:30px}#event_page_wrap #intro .event_buttons .btn-event-link{line-height:35px;font-size:17px;text-transform:uppercase;letter-spacing:5px;border:1px solid;border-color:rgba(255,255,255,0.2);text-decoration:none;color:#fff;padding:0 15px;transition:all .15s ease-in-out;width:100%;background:rgba(0,0,0,0.3)}#event_page_wrap #intro .event_buttons .btn-event-link:hover{border-color:rgba(255,255,255,0.6)}#event_page_wrap #tickets .input-group-addon{background:none;border:none}#event_page_wrap #tickets table tr:first-child td{border-top:none}#event_page_wrap #tickets table tr td{padding:20px 0}#event_page_wrap #details .event_poster img{border:4px solid #f6f6f6;max-width:100%;min-width:100%}#event_page_wrap #details .event_details iframe,#event_page_wrap #details .event_details img{max-width:100%}#event_page_wrap #details .event_details h1,#event_page_wrap #details .event_details h2,#event_page_wrap #details .event_details h3,#event_page_wrap #details .event_details h4,#event_page_wrap #details .event_details h5,#event_page_wrap #details .event_details h6{margin-top:0;margin-bottom:15px;font-weight:100}#event_page_wrap #details .event_details h1{font-size:28px}#event_page_wrap #details .event_details h2{font-size:24px}#event_page_wrap #details .event_details h3{font-size:20px}#event_page_wrap #details .event_details h4{font-size:17px}#event_page_wrap #share .btn{margin-bottom:20px}#event_page_wrap #location{padding:0}#event_page_wrap #location .google-maps{position:relative;overflow:hidden}#event_page_wrap #location .google-maps iframe{width:100% !important;height:100% !important;min-height:500px}#footer{background-color:#888;background-color:rgba(0,0,0,0.4);min-height:60px;line-height:60px;color:#fff;text-align:center}#organiser{text-align:center}#organiser .contact_form{display:none;padding:20px;margin-top:25px;text-align:left}.totop{border-radius:0;background-color:#888;background-color:rgba(0,0,0,0.4)}.totop:hover{background-color:#fff;background-color:rgba(255,255,255,0.4);color:#000}@media (min-width:100px) and (max-width:767px){.row{margin:0}section.container{margin-bottom:0;padding:10px}.section_head{padding:10px;font-size:30px}.main_content{padding:0;background:#fff}#organiser_page_wrap #intro{padding:30px}#organiser_page_wrap #intro h1{font-size:2.236em;padding:15px}#event_page_wrap #intro{padding:30px}#event_page_wrap #intro .event_date h2{font-size:20px}#event_page_wrap #intro .event_date h4{font-size:11px}#event_page_wrap #intro h1{font-size:2.236em;padding:15px}#event_page_wrap #intro .event_venue{color:#fff;font-size:20px;margin-top:10px}#event_page_wrap #intro .event_buttons{margin-top:50px}#event_page_wrap #intro .event_buttons .btn-event-link{padding:5px 0;font-size:18px;margin-bottom:5px;line-height:30px}#event_page_wrap #tickets .btn-checkout{width:100%}#event_page_wrap #location .google-maps iframe{min-height:290px}.content{padding:15px}}.rrssb-buttons.large-format li a{border-radius:0}.event-listing .event .panel{min-height:140px}.event-listing .event_flyer{text-align:center}.event-listing .event_flyer img{max-height:140px;max-width:100%} \ No newline at end of file diff --git a/public/assets/stylesheet/public.less b/public/assets/stylesheet/public.less index 8014dbbb..ce3fbae1 100644 --- a/public/assets/stylesheet/public.less +++ b/public/assets/stylesheet/public.less @@ -50,6 +50,7 @@ section h1 { } #organiser_page_wrap { + #intro { position: relative; text-align: center; @@ -58,8 +59,8 @@ section h1 { border: none; margin-bottom: 0; margin-top: 20px; - color:#fff !important; - background-color: #AF5050 !important; + color:#fff; + background-color: #AF5050; } .organiser_logo { diff --git a/resources/views/ManageOrganiser/Customize.blade.php b/resources/views/ManageOrganiser/Customize.blade.php index ddf12ef0..c888804b 100644 --- a/resources/views/ManageOrganiser/Customize.blade.php +++ b/resources/views/ManageOrganiser/Customize.blade.php @@ -30,6 +30,11 @@ display: none; } + @stop @section('menu') @@ -132,9 +137,47 @@ {!! Form::close() !!} -
- Coming soon. -
+
+ {!! Form::model($organiser, array('url' => route('postEditOrganiserPageDesign', ['event_id' => $organiser->id]), 'class' => 'ajax ')) !!} +

Organiser Design

+
+
+
+ {!! Form::label('page_header_bg_color', 'Header Background Color', ['class'=>'control-label required ']) !!} + {!! Form::input('text', 'page_header_bg_color', Input::old('page_header_bg_color'), + [ + 'class'=>'form-control colorpicker', + 'placeholder'=>'#000000' + ]) !!} +
+
+
+
+ {!! Form::label('page_text_color', 'Text Color', ['class'=>'control-label required ']) !!} + {!! Form::input('text', 'page_text_color', Input::old('page_text_color'), + [ + 'class'=>'form-control colorpicker', + 'placeholder'=>'#FFFFFF' + ]) !!} +
+
+
+
+ {!! Form::label('page_bg_color', 'Background Color', ['class'=>'control-label required ']) !!} + {!! Form::input('text', 'page_bg_color', Input::old('page_bg_color'), + [ + 'class'=>'form-control colorpicker', + 'placeholder'=>'#EEEEEE' + ]) !!} +
+
+
+ + + {!! Form::close() !!} +
diff --git a/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php b/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php index 31c781ec..c7df559d 100644 --- a/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php +++ b/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php @@ -29,11 +29,9 @@ - @yield('head') {!!HTML::style('assets/stylesheet/frontend.css')!!} - - + @yield('head') @include('Shared.Partials.FacebookSdk') @@ -46,11 +44,5 @@ {!!HTML::script('assets/javascript/frontend.js')!!} - - @include('Shared.Partials.GlobalFooterJS') diff --git a/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php b/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php index d5545329..ac047ff5 100644 --- a/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php +++ b/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php @@ -1,5 +1,16 @@ @extends('Public.ViewOrganiser.Layouts.OrganiserPage') + +@section('head') + +@stop + @section('content') @include('Public.ViewOrganiser.Partials.OrganiserHeaderSection') @include('Public.ViewOrganiser.Partials.OrganiserEventsSection') diff --git a/resources/views/Public/ViewEvent/Partials/EventListingPanel.blade.php b/resources/views/Public/ViewOrganiser/Partials/EventListingPanel.blade.php similarity index 95% rename from resources/views/Public/ViewEvent/Partials/EventListingPanel.blade.php rename to resources/views/Public/ViewOrganiser/Partials/EventListingPanel.blade.php index da00911c..427b023a 100644 --- a/resources/views/Public/ViewEvent/Partials/EventListingPanel.blade.php +++ b/resources/views/Public/ViewOrganiser/Partials/EventListingPanel.blade.php @@ -7,7 +7,7 @@
@foreach($events as $event) -
+
diff --git a/resources/views/Public/ViewOrganiser/Partials/OrganiserEventsSection.blade.php b/resources/views/Public/ViewOrganiser/Partials/OrganiserEventsSection.blade.php index 486cccf8..5adedbd1 100644 --- a/resources/views/Public/ViewOrganiser/Partials/OrganiserEventsSection.blade.php +++ b/resources/views/Public/ViewOrganiser/Partials/OrganiserEventsSection.blade.php @@ -1,32 +1,32 @@
- @include('Public.ViewEvent.Partials.EventListingPanel', - array( + @include('Public.ViewOrganiser.Partials.EventListingPanel', + [ 'panel_title' => 'Upcoming Events', 'events' => $upcoming_events - ) + ] ) - @include('Public.ViewEvent.Partials.EventListingPanel', - array( + @include('Public.ViewOrganiser.Partials.EventListingPanel', + [ 'panel_title' => 'Past Events', 'events' => $past_events - ) + ] )
-
+
@if ($organiser->facebook) @include('Shared.Partials.FacebookTimelinePanel', - array( + [ 'facebook_account' => $organiser->facebook - ) + ] ) @endif @if ($organiser->twitter) @include('Shared.Partials.TwitterTimelinePanel', - array( + [ 'twitter_account' => $organiser->twitter - ) + ] ) @endif
diff --git a/resources/views/Shared/Partials/FacebookTimelinePanel.blade.php b/resources/views/Shared/Partials/FacebookTimelinePanel.blade.php index d0bb9668..4abdf1c8 100644 --- a/resources/views/Shared/Partials/FacebookTimelinePanel.blade.php +++ b/resources/views/Shared/Partials/FacebookTimelinePanel.blade.php @@ -9,6 +9,7 @@