From 50c896e2a3e33144ebf79cf3fb220a49d188274c Mon Sep 17 00:00:00 2001 From: Dave Date: Sun, 20 Mar 2016 21:34:44 +0000 Subject: [PATCH] - layout fix for tickets page --- public/assets/stylesheet/application.css | 2 +- public/assets/stylesheet/custom.less | 6 +- resources/views/ManageEvent/Tickets.blade.php | 247 ++++++++++-------- 3 files changed, 137 insertions(+), 118 deletions(-) diff --git a/public/assets/stylesheet/application.css b/public/assets/stylesheet/application.css index 84fc6c97..f5553103 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 .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}.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} \ No newline at end of file diff --git a/public/assets/stylesheet/custom.less b/public/assets/stylesheet/custom.less index 3d17785d..f12bf6fb 100644 --- a/public/assets/stylesheet/custom.less +++ b/public/assets/stylesheet/custom.less @@ -301,7 +301,7 @@ label.required::after { .order_options .event_count { font-weight: bold; color: #777; - line-height: 30px; + //line-height: 30px; } .well { @@ -348,4 +348,8 @@ input[readonly] { html.working { cursor: progress; +} + +.order_options { + padding: 10px 0; } \ No newline at end of file diff --git a/resources/views/ManageEvent/Tickets.blade.php b/resources/views/ManageEvent/Tickets.blade.php index f6518f4e..c572e75b 100644 --- a/resources/views/ManageEvent/Tickets.blade.php +++ b/resources/views/ManageEvent/Tickets.blade.php @@ -1,162 +1,177 @@ @extends('Shared.Layouts.Master') @section('title') -@parent -Event Tickets + @parent + Event Tickets @stop @section('top_nav') -@include('ManageEvent.Partials.TopNav') + @include('ManageEvent.Partials.TopNav') @stop @section('page_title') - -Event Tickets + + Event Tickets @stop @section('menu') -@include('ManageEvent.Partials.Sidebar') + @include('ManageEvent.Partials.Sidebar') @stop @section('page_header') -
- - -
- {!! Form::open(array('url' => route('showEventTickets', ['event_id'=>$event->id,'sort_by'=>$sort_by]), 'method' => 'get')) !!} -
- +
+ {!! Form::open(array('url' => route('showEventTickets', ['event_id'=>$event->id,'sort_by'=>$sort_by]), 'method' => 'get')) !!} +
+ - {!!Form::hidden('sort_by', $sort_by)!!} + {!!Form::hidden('sort_by', $sort_by)!!} +
+ {!! Form::close() !!}
- {!! Form::close() !!} -
@stop @section('content') @if($tickets->count()) -
-
-
+ +
+
+
{{$tickets->count()}} events
-
+
+
+
{!! Form::select('sort_by_select', $allowed_sorts, $sort_by, ['class' => 'form-control pull right']) !!}
@endif - +
- @if($tickets->count()) - - @foreach($tickets as $ticket) -
-
+ @if($tickets->count()) -
-

- - {{$ticket->title}} - + @foreach($tickets as $ticket) +
+
+ +
+

+ + {{$ticket->title}} + {{ ($ticket->is_free) ? "FREE" : money($ticket->price, $event->currency->code) }} -

-
+

+
-
-
    -
  • -
    -

    {{ $ticket->quantity_sold }}

    -

    Sold

    -
    -
    • -
  • -
    -

    - {{ ($ticket->quantity_available === null) ? '∞' : $ticket->quantity_remaining }} -

    -

    Remaining

    -
    -
    • -
  • -
    -

    - {{money($ticket->sales_volume + $ticket->organiser_fees_volume, $event->currency->code)}} * -

    -

    Revenue

    -
    -
    • -
-
-
- +
+
+
+ @endforeach + + @else + + @if($q) + @include('Shared.Partials.NoSearchResults') + @else + @include('ManageEvent.Partials.TicketsBlankSlate') + @endif + + + @endif +
+ +
+
+ {!! $tickets->appends(['q' => $q, 'sort_by' => $sort_by])->render() !!}
-
- @endforeach - - @else - - @if($q) - @include('Shared.Partials.NoSearchResults') - @else - @include('ManageEvent.Partials.TicketsBlankSlate') - @endif - - - @endif -
- -
-
- {!! $tickets->appends(['q' => $q, 'sort_by' => $sort_by])->render() !!} -
-
@stop