From 113cb6747c0195dd9e2340e87b19128dde070830 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 12 Nov 2014 23:09:42 +0200 Subject: [PATCH] Created quotes, invoices and payments pages for clients --- Gruntfile.js | 2 + app/controllers/InvoiceController.php | 40 +- app/controllers/PaymentController.php | 34 ++ app/controllers/QuoteController.php | 30 + app/ninja/repositories/InvoiceRepository.php | 30 +- app/routes.php | 7 + app/views/header.blade.php | 53 +- app/views/invoices/deleted.blade.php | 8 +- app/views/invoices/view.blade.php | 4 +- app/views/master.blade.php | 38 +- app/views/public/header.blade.php | 20 +- app/views/public_list.blade.php | 133 +++++ public/built.js | 11 - public/built.public.css | 582 ++++++++++++++++++- public/css/splash.css | 4 +- public/js/script.js | 11 - 16 files changed, 911 insertions(+), 96 deletions(-) create mode 100755 app/views/public_list.blade.php diff --git a/Gruntfile.js b/Gruntfile.js index abb85f97b752..efd085d8104a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -96,6 +96,8 @@ module.exports = function(grunt) { 'public/vendor/bootstrap/dist/css/bootstrap.min.css', 'public/css/bootstrap.splash.css', 'public/css/splash.css', + 'public/vendor/datatables/media/css/jquery.dataTables.css', + 'public/vendor/datatables-bootstrap3/BS3/assets/css/datatables.css', ], dest: 'public/built.public.css', nonull: true diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php index 4827800594d0..0d3742e1a833 100755 --- a/app/controllers/InvoiceController.php +++ b/app/controllers/InvoiceController.php @@ -39,6 +39,18 @@ class InvoiceController extends \BaseController { return View::make('list', $data); } + public function clientIndex() + { + $data = [ + 'showClientHeader' => true, + 'title' => trans('texts.invoices'), + 'entityType'=>ENTITY_INVOICE, + 'columns'=>Utils::trans(['invoice_number', 'invoice_date', 'invoice_total', 'balance_due', 'due_date']) + ]; + + return View::make('public_list', $data); + } + public function getDatatable($clientPublicId = null) { $accountId = Auth::user()->account_id; @@ -47,6 +59,23 @@ class InvoiceController extends \BaseController { return $this->invoiceRepo->getDatatable($accountId, $clientPublicId, ENTITY_INVOICE, $search); } + public function getClientDatatable() + { + //$accountId = Auth::user()->account_id; + $search = Input::get('sSearch'); + $invitationKey = Session::get('invitation_key'); + $invitation = Invitation::where('invitation_key', '=', $invitationKey)->firstOrFail(); + + $invoice = $invitation->invoice; + + if (!$invoice || $invoice->is_deleted) + { + return []; + } + + return $this->invoiceRepo->getClientDatatable($invitation->contact_id, ENTITY_INVOICE, $search); + } + public function getRecurringDatatable($clientPublicId = null) { $query = $this->invoiceRepo->getRecurringInvoices(Auth::user()->account_id, $clientPublicId, Input::get('sSearch')); @@ -85,7 +114,7 @@ class InvoiceController extends \BaseController { public function view($invitationKey) { - $invitation = Invitation::withTrashed()->where('invitation_key', '=', $invitationKey)->firstOrFail(); + $invitation = Invitation::where('invitation_key', '=', $invitationKey)->firstOrFail(); $invoice = $invitation->invoice; @@ -113,12 +142,15 @@ class InvoiceController extends \BaseController { return View::make('invoices.deleted'); } - if (!Auth::check() || Auth::user()->account_id != $invoice->account_id) + if (!Session::has($invitationKey) && (!Auth::check() || Auth::user()->account_id != $invoice->account_id)) { Activity::viewInvoice($invitation); - Event::fire('invoice.viewed', $invoice); + Event::fire('invoice.viewed', $invoice); } + Session::set($invitationKey, true); + Session::set('invitation_key', $invitationKey); + $client->account->loadLocalizationSettings(); $invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date); @@ -126,7 +158,7 @@ class InvoiceController extends \BaseController { $invoice->is_pro = $client->account->isPro(); $data = array( - 'hideHeader' => true, + 'showClientHeader' => true, 'showBreadcrumbs' => false, 'invoice' => $invoice->hidePrivateFields(), 'invitation' => $invitation, diff --git a/app/controllers/PaymentController.php b/app/controllers/PaymentController.php index 1e0e9f734c33..c59aa61d79b6 100755 --- a/app/controllers/PaymentController.php +++ b/app/controllers/PaymentController.php @@ -28,6 +28,16 @@ class PaymentController extends \BaseController )); } + public function clientIndex() + { + return View::make('public_list', array( + 'showClientHeader' => true, + 'entityType'=>ENTITY_PAYMENT, + 'title' => trans('texts.payments'), + 'columns'=>Utils::trans(['invoice', 'transaction_reference', 'method', 'payment_amount', 'payment_date']) + )); + } + public function getDatatable($clientPublicId = null) { $payments = $this->paymentRepo->find($clientPublicId, Input::get('sSearch')); @@ -63,6 +73,30 @@ class PaymentController extends \BaseController ->make(); } + public function getClientDatatable() + { + $search = Input::get('sSearch'); + $invitationKey = Session::get('invitation_key'); + $invitation = Invitation::where('invitation_key', '=', $invitationKey)->with('contact.client')->firstOrFail(); + + $invoice = $invitation->invoice; + + if (!$invoice || $invoice->is_deleted) + { + return []; + } + + $payments = $this->paymentRepo->find($invitation->contact->client->public_id, Input::get('sSearch')); + + return Datatable::query($payments) + ->addColumn('invoice_number', function($model) { return $model->invoice_number; }) + ->addColumn('transaction_reference', function($model) { return $model->transaction_reference ? $model->transaction_reference : 'Manual entry'; }) + ->addColumn('payment_type', function($model) { return $model->payment_type ? $model->payment_type : ($model->account_gateway_id ? 'Online payment' : ''); }) + ->addColumn('amount', function($model) { return Utils::formatMoney($model->amount, $model->currency_id); }) + ->addColumn('payment_date', function($model) { return Utils::dateToString($model->payment_date); }) + ->make(); + } + public function create($clientPublicId = 0, $invoicePublicId = 0) { diff --git a/app/controllers/QuoteController.php b/app/controllers/QuoteController.php index e0d887c25bd4..66e8d1f1830e 100644 --- a/app/controllers/QuoteController.php +++ b/app/controllers/QuoteController.php @@ -46,6 +46,20 @@ class QuoteController extends \BaseController { return View::make('list', $data); } + + public function clientIndex() + { + $data = [ + 'showClientHeader' => true, + 'title' => trans('texts.quotes'), + 'entityType'=>ENTITY_QUOTE, + 'columns'=>Utils::trans(['quote_number', 'quote_date', 'quote_total', 'due_date']) + ]; + + return View::make('public_list', $data); + } + + public function getDatatable($clientPublicId = null) { $accountId = Auth::user()->account_id; @@ -54,6 +68,22 @@ class QuoteController extends \BaseController { return $this->invoiceRepo->getDatatable($accountId, $clientPublicId, ENTITY_QUOTE, $search); } + public function getClientDatatable() + { + $search = Input::get('sSearch'); + $invitationKey = Session::get('invitation_key'); + $invitation = Invitation::where('invitation_key', '=', $invitationKey)->firstOrFail(); + + $invoice = $invitation->invoice; + + if (!$invoice || $invoice->is_deleted) + { + return []; + } + + return $this->invoiceRepo->getClientDatatable($invitation->contact_id, ENTITY_QUOTE, $search); + } + public function create($clientPublicId = 0) { if (!Utils::isPro()) diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php index 52d10c7be494..5439e9534f73 100755 --- a/app/ninja/repositories/InvoiceRepository.php +++ b/app/ninja/repositories/InvoiceRepository.php @@ -83,6 +83,35 @@ class InvoiceRepository return $query; } + public function getClientDatatable($contactId, $entityType, $search) + { + $query = \DB::table('invitations') + ->join('invoices', 'invoices.id', '=','invitations.invoice_id') + ->join('clients', 'clients.id', '=','invoices.client_id') + //->join('contacts', 'contacts.client_id', '=', 'clients.id') + ->where('invitations.contact_id', '=', $contactId) + ->where('invitations.deleted_at', '=', null) + ->where('invoices.is_quote', '=', $entityType == ENTITY_QUOTE) + ->where('invoices.is_deleted', '=', false) + ->where('clients.deleted_at', '=', null) + ->where('invoices.is_recurring', '=', false) + ->select('invitation_key', 'invoice_number', 'invoice_date', 'invoices.balance as balance', 'due_date', 'clients.public_id as client_public_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'start_date', 'end_date', 'clients.currency_id'); + + $table = \Datatable::query($query) + ->addColumn('invoice_number', function($model) use ($entityType) { return link_to('/view/' . $model->invitation_key, $model->invoice_number); }) + ->addColumn('invoice_date', function($model) { return Utils::fromSqlDate($model->invoice_date); }) + ->addColumn('amount', function($model) { return Utils::formatMoney($model->amount, $model->currency_id); }); + + if ($entityType == ENTITY_INVOICE) + { + $table->addColumn('balance', function($model) { return Utils::formatMoney($model->balance, $model->currency_id); }); + } + + return $table->addColumn('due_date', function($model) { return Utils::fromSqlDate($model->due_date); }) + //->addColumn('invoice_status_name', function($model) { return $model->invoice_status_name; }) + ->make(); + } + public function getDatatable($accountId, $clientPublicId = null, $entityType, $search) { $query = $this->getInvoices($accountId, $clientPublicId, $entityType, $search) @@ -157,7 +186,6 @@ class InvoiceRepository ->make(); } - public function getErrors($input) { $contact = (array) $input->client->contacts[0]; diff --git a/app/routes.php b/app/routes.php index 0c8af89f4c9f..ad470fd641d9 100755 --- a/app/routes.php +++ b/app/routes.php @@ -42,10 +42,17 @@ Route::get('log_error', 'HomeController@logError'); Route::get('invoice_now', 'HomeController@invoiceNow'); Route::post('get_started', 'AccountController@getStarted'); +// Client visible pages Route::get('view/{invitation_key}', 'InvoiceController@view'); Route::get('payment/{invitation_key}', 'PaymentController@show_payment'); Route::post('payment/{invitation_key}', 'PaymentController@do_payment'); Route::get('complete', 'PaymentController@offsite_payment'); +Route::get('client/quotes', 'QuoteController@clientIndex'); +Route::get('client/invoices', 'InvoiceController@clientIndex'); +Route::get('client/payments', 'PaymentController@clientIndex'); +Route::get('api/client.quotes', array('as'=>'api.client.quotes', 'uses'=>'QuoteController@getClientDatatable')); +Route::get('api/client.invoices', array('as'=>'api.client.invoices', 'uses'=>'InvoiceController@getClientDatatable')); +Route::get('api/client.payments', array('as'=>'api.client.payments', 'uses'=>'PaymentController@getClientDatatable')); Route::get('license', 'PaymentController@show_license_payment'); Route::post('license', 'PaymentController@do_license_payment'); diff --git a/app/views/header.blade.php b/app/views/header.blade.php index a6473f6f0243..b1609d603592 100755 --- a/app/views/header.blade.php +++ b/app/views/header.blade.php @@ -3,41 +3,26 @@ @section('head') - + - - -@include('script') - - + + + @include('script') + @stop @section('body') @@ -317,18 +302,6 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
- - -
diff --git a/app/views/invoices/deleted.blade.php b/app/views/invoices/deleted.blade.php index 626de7704096..89a7659ea1a1 100755 --- a/app/views/invoices/deleted.blade.php +++ b/app/views/invoices/deleted.blade.php @@ -1,7 +1 @@ -@extends('header') - -@section('content') - -The requested invoice is no longer available. - -@stop \ No newline at end of file +The requested invoice is no longer available. \ No newline at end of file diff --git a/app/views/invoices/view.blade.php b/app/views/invoices/view.blade.php index 9c8d1b69f580..14db0eebe303 100755 --- a/app/views/invoices/view.blade.php +++ b/app/views/invoices/view.blade.php @@ -5,7 +5,7 @@ @include('script') - + @@ -30,7 +30,7 @@
@else
- {{ Button::primary('Download PDF', array('onclick' => 'onDownloadClick()', 'class' => 'btn-lg')) }} + {{ Button::success('Download PDF', array('onclick' => 'onDownloadClick()', 'class' => 'btn-lg')) }}
@endif diff --git a/app/views/master.blade.php b/app/views/master.blade.php index 10afac959e24..ca92bcfde0e2 100755 --- a/app/views/master.blade.php +++ b/app/views/master.blade.php @@ -29,19 +29,31 @@ diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php index 50a8d8905b49..abdf58d0289b 100644 --- a/app/views/public/header.blade.php +++ b/app/views/public/header.blade.php @@ -83,7 +83,7 @@ return false; } -@if (!isset($hideHeader) || !$hideHeader) +@if ((!isset($hideHeader) || !$hideHeader) && (!isset($showClientHeader) || !$showClientHeader))
@@ -113,7 +113,8 @@ -
+ +
  • {{ link_to('http://blog.invoiceninja.com', trans('public.link_blog') ) }}
    • @@ -133,11 +134,20 @@ @else
    -
    - -
    +
    +
    + @if (isset($showClientHeader) && $showClientHeader) +
      + +
    • {{ link_to('/client/quotes', trans('texts.quotes') ) }}
      • +
    • {{ link_to('/client/invoices', trans('texts.invoices') ) }}
      • +
    • {{ link_to('/client/payments', trans('texts.payments') ) }}
      • + +
    + @endif
    +
    @endif
    diff --git a/app/views/public_list.blade.php b/app/views/public_list.blade.php new file mode 100755 index 000000000000..3456eaafc4b6 --- /dev/null +++ b/app/views/public_list.blade.php @@ -0,0 +1,133 @@ +@extends('public.header') + +@section('content') + + + +
    + +

     

    + + + +

    {{ $title }}

    + + {{ Datatable::table() + ->addColumn($columns) + ->setUrl(route('api.client.' . $entityType . 's')) + ->setOptions('sPaginationType', 'bootstrap') + ->render('datatable') }} + +
    + +@stop + +@section('onReady') + + var tableFilter = ''; + var searchTimeout = false; + + var oTable0 = $('#DataTables_Table_0').dataTable(); + function filterTable(val) { + if (val == tableFilter) { + return; + } + tableFilter = val; + oTable0.fnFilter(val); + @if (isset($secEntityType)) + oTable1.fnFilter(val); + @endif + } + + $('#tableFilter').on('keyup', function(){ + if (searchTimeout) { + window.clearTimeout(searchTimeout); + } + + searchTimeout = setTimeout(function() { + filterTable($('#tableFilter').val()); + }, 1000); + }) + +@stop \ No newline at end of file diff --git a/public/built.js b/public/built.js index ff5d546c04ee..136fcc97b515 100644 --- a/public/built.js +++ b/public/built.js @@ -31304,17 +31304,6 @@ if ( $.fn.DataTable.TableTools ) { } ); } -/* -$(document).ready(function() { - $('#example').dataTable( { - "sDom": "<'row'<'span6'l><'span6'f>r>t<'row'<'span6'i><'span6'p>>", - "sPaginationType": "bootstrap", - "oLanguage": { - "sLengthMenu": "_MENU_ records per page" - } - } ); -} ); -*/ function isStorageSupported() { try { diff --git a/public/built.public.css b/public/built.public.css index b5b6b7e0625d..5fe9a7fc3b06 100644 --- a/public/built.public.css +++ b/public/built.public.css @@ -170,7 +170,7 @@ ul.navbar-nav li a:hover { .nav>li>a:hover, .nav>li>a:focus { background-color: transparent; } -.container>.navbar-collapse { +z.container>.navbar-collapse { margin-right: -15px; } .navbar-top { @@ -661,6 +661,7 @@ section.faq .contact-box a { section.faq .contact-box p { } + .btn-primary { color: #fff; background-color: #2299c0; @@ -676,6 +677,7 @@ section.faq .contact-box p { .btn-primary:hover { background-color: #2299c0; } + .btn.green { background-color: #30ab82; } @@ -1385,3 +1387,581 @@ table.compare-table-paid th { display: none !important; } } + +/* + * Table styles + */ +table.dataTable { + width: 100%; + margin: 0 auto; + clear: both; + border-collapse: separate; + border-spacing: 0; + /* + * Header and footer styles + */ + /* + * Body styles + */ +} +table.dataTable thead th, +table.dataTable tfoot th { + font-weight: bold; +} +table.dataTable thead th, +table.dataTable thead td { + padding: 10px 18px; + border-bottom: 1px solid #111111; +} +table.dataTable thead th:active, +table.dataTable thead td:active { + outline: none; +} +table.dataTable tfoot th, +table.dataTable tfoot td { + padding: 10px 18px 6px 18px; + border-top: 1px solid #111111; +} +table.dataTable thead .sorting_asc, +table.dataTable thead .sorting_desc, +table.dataTable thead .sorting { + cursor: pointer; + *cursor: hand; +} +table.dataTable thead .sorting { + background: url("vendor/datatables/media/css/../images/sort_both.png") no-repeat center right; +} +table.dataTable thead .sorting_asc { + background: url("vendor/datatables/media/css/../images/sort_asc.png") no-repeat center right; +} +table.dataTable thead .sorting_desc { + background: url("vendor/datatables/media/css/../images/sort_desc.png") no-repeat center right; +} +table.dataTable thead .sorting_asc_disabled { + background: url("vendor/datatables/media/css/../images/sort_asc_disabled.png") no-repeat center right; +} +table.dataTable thead .sorting_desc_disabled { + background: url("vendor/datatables/media/css/../images/sort_desc_disabled.png") no-repeat center right; +} +table.dataTable tbody tr { + background-color: white; +} +table.dataTable tbody tr.selected { + background-color: #b0bed9; +} +table.dataTable tbody th, +table.dataTable tbody td { + padding: 8px 10px; +} +table.dataTable th.center, +table.dataTable td.center, +table.dataTable td.dataTables_empty { + text-align: center; +} +table.dataTable th.right, +table.dataTable td.right { + text-align: right; +} +table.dataTable.row-border tbody th, table.dataTable.row-border tbody td, table.dataTable.display tbody th, table.dataTable.display tbody td { + border-top: 1px solid #dddddd; +} +table.dataTable.row-border tbody tr:first-child th, +table.dataTable.row-border tbody tr:first-child td, table.dataTable.display tbody tr:first-child th, +table.dataTable.display tbody tr:first-child td { + border-top: none; +} +table.dataTable.cell-border tbody th, table.dataTable.cell-border tbody td { + border-top: 1px solid #dddddd; + border-right: 1px solid #dddddd; +} +table.dataTable.cell-border tbody tr th:first-child, +table.dataTable.cell-border tbody tr td:first-child { + border-left: 1px solid #dddddd; +} +table.dataTable.cell-border tbody tr:first-child th, +table.dataTable.cell-border tbody tr:first-child td { + border-top: none; +} +table.dataTable.stripe tbody tr.odd, table.dataTable.display tbody tr.odd { + background-color: #f9f9f9; +} +table.dataTable.stripe tbody tr.odd.selected, table.dataTable.display tbody tr.odd.selected { + background-color: #abb9d3; +} +table.dataTable.hover tbody tr:hover, +table.dataTable.hover tbody tr.odd:hover, +table.dataTable.hover tbody tr.even:hover, table.dataTable.display tbody tr:hover, +table.dataTable.display tbody tr.odd:hover, +table.dataTable.display tbody tr.even:hover { + background-color: whitesmoke; +} +table.dataTable.hover tbody tr:hover.selected, +table.dataTable.hover tbody tr.odd:hover.selected, +table.dataTable.hover tbody tr.even:hover.selected, table.dataTable.display tbody tr:hover.selected, +table.dataTable.display tbody tr.odd:hover.selected, +table.dataTable.display tbody tr.even:hover.selected { + background-color: #a9b7d1; +} +table.dataTable.order-column tbody tr > .sorting_1, +table.dataTable.order-column tbody tr > .sorting_2, +table.dataTable.order-column tbody tr > .sorting_3, table.dataTable.display tbody tr > .sorting_1, +table.dataTable.display tbody tr > .sorting_2, +table.dataTable.display tbody tr > .sorting_3 { + background-color: #f9f9f9; +} +table.dataTable.order-column tbody tr.selected > .sorting_1, +table.dataTable.order-column tbody tr.selected > .sorting_2, +table.dataTable.order-column tbody tr.selected > .sorting_3, table.dataTable.display tbody tr.selected > .sorting_1, +table.dataTable.display tbody tr.selected > .sorting_2, +table.dataTable.display tbody tr.selected > .sorting_3 { + background-color: #acbad4; +} +table.dataTable.display tbody tr.odd > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd > .sorting_1 { + background-color: #f1f1f1; +} +table.dataTable.display tbody tr.odd > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd > .sorting_2 { + background-color: #f3f3f3; +} +table.dataTable.display tbody tr.odd > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd > .sorting_3 { + background-color: whitesmoke; +} +table.dataTable.display tbody tr.odd.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_1 { + background-color: #a6b3cd; +} +table.dataTable.display tbody tr.odd.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_2 { + background-color: #a7b5ce; +} +table.dataTable.display tbody tr.odd.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_3 { + background-color: #a9b6d0; +} +table.dataTable.display tbody tr.even > .sorting_1, table.dataTable.order-column.stripe tbody tr.even > .sorting_1 { + background-color: #f9f9f9; +} +table.dataTable.display tbody tr.even > .sorting_2, table.dataTable.order-column.stripe tbody tr.even > .sorting_2 { + background-color: #fbfbfb; +} +table.dataTable.display tbody tr.even > .sorting_3, table.dataTable.order-column.stripe tbody tr.even > .sorting_3 { + background-color: #fdfdfd; +} +table.dataTable.display tbody tr.even.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_1 { + background-color: #acbad4; +} +table.dataTable.display tbody tr.even.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_2 { + background-color: #adbbd6; +} +table.dataTable.display tbody tr.even.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_3 { + background-color: #afbdd8; +} +table.dataTable.display tbody tr:hover > .sorting_1, +table.dataTable.display tbody tr.odd:hover > .sorting_1, +table.dataTable.display tbody tr.even:hover > .sorting_1, table.dataTable.order-column.hover tbody tr:hover > .sorting_1, +table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_1, +table.dataTable.order-column.hover tbody tr.even:hover > .sorting_1 { + background-color: #eaeaea; +} +table.dataTable.display tbody tr:hover > .sorting_2, +table.dataTable.display tbody tr.odd:hover > .sorting_2, +table.dataTable.display tbody tr.even:hover > .sorting_2, table.dataTable.order-column.hover tbody tr:hover > .sorting_2, +table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_2, +table.dataTable.order-column.hover tbody tr.even:hover > .sorting_2 { + background-color: #ebebeb; +} +table.dataTable.display tbody tr:hover > .sorting_3, +table.dataTable.display tbody tr.odd:hover > .sorting_3, +table.dataTable.display tbody tr.even:hover > .sorting_3, table.dataTable.order-column.hover tbody tr:hover > .sorting_3, +table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_3, +table.dataTable.order-column.hover tbody tr.even:hover > .sorting_3 { + background-color: #eeeeee; +} +table.dataTable.display tbody tr:hover.selected > .sorting_1, +table.dataTable.display tbody tr.odd:hover.selected > .sorting_1, +table.dataTable.display tbody tr.even:hover.selected > .sorting_1, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_1, +table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_1, +table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_1 { + background-color: #a1aec7; +} +table.dataTable.display tbody tr:hover.selected > .sorting_2, +table.dataTable.display tbody tr.odd:hover.selected > .sorting_2, +table.dataTable.display tbody tr.even:hover.selected > .sorting_2, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_2, +table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_2, +table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_2 { + background-color: #a2afc8; +} +table.dataTable.display tbody tr:hover.selected > .sorting_3, +table.dataTable.display tbody tr.odd:hover.selected > .sorting_3, +table.dataTable.display tbody tr.even:hover.selected > .sorting_3, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_3, +table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_3, +table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_3 { + background-color: #a4b2cb; +} +table.dataTable.no-footer { + border-bottom: 1px solid #111111; +} + +table.dataTable, +table.dataTable th, +table.dataTable td { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +/* + * Control feature layout + */ +.dataTables_wrapper { + position: relative; + clear: both; + *zoom: 1; + zoom: 1; +} +.dataTables_wrapper .dataTables_length { + float: left; +} +.dataTables_wrapper .dataTables_filter { + float: right; + text-align: right; +} +.dataTables_wrapper .dataTables_filter input { + margin-left: 0.5em; +} +.dataTables_wrapper .dataTables_info { + clear: both; + float: left; + padding-top: 0.755em; +} +.dataTables_wrapper .dataTables_paginate { + float: right; + text-align: right; + padding-top: 0.25em; +} +.dataTables_wrapper .dataTables_paginate .paginate_button { + box-sizing: border-box; + display: inline-block; + min-width: 1.5em; + padding: 0.5em 1em; + margin-left: 2px; + text-align: center; + text-decoration: none !important; + cursor: pointer; + *cursor: hand; + color: #333333 !important; + border: 1px solid transparent; +} +.dataTables_wrapper .dataTables_paginate .paginate_button.current, .dataTables_wrapper .dataTables_paginate .paginate_button.current:hover { + color: #333333 !important; + border: 1px solid #cacaca; + background-color: white; + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, gainsboro)); + /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, white 0%, gainsboro 100%); + /* Chrome10+,Safari5.1+ */ + background: -moz-linear-gradient(top, white 0%, gainsboro 100%); + /* FF3.6+ */ + background: -ms-linear-gradient(top, white 0%, gainsboro 100%); + /* IE10+ */ + background: -o-linear-gradient(top, white 0%, gainsboro 100%); + /* Opera 11.10+ */ + background: linear-gradient(to bottom, white 0%, gainsboro 100%); + /* W3C */ +} +.dataTables_wrapper .dataTables_paginate .paginate_button.disabled, .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover, .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active { + cursor: default; + color: #666 !important; + border: 1px solid transparent; + background: transparent; + box-shadow: none; +} +.dataTables_wrapper .dataTables_paginate .paginate_button:hover { + color: white !important; + border: 1px solid #111111; + background-color: #585858; + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #585858), color-stop(100%, #111111)); + /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #585858 0%, #111111 100%); + /* Chrome10+,Safari5.1+ */ + background: -moz-linear-gradient(top, #585858 0%, #111111 100%); + /* FF3.6+ */ + background: -ms-linear-gradient(top, #585858 0%, #111111 100%); + /* IE10+ */ + background: -o-linear-gradient(top, #585858 0%, #111111 100%); + /* Opera 11.10+ */ + background: linear-gradient(to bottom, #585858 0%, #111111 100%); + /* W3C */ +} +.dataTables_wrapper .dataTables_paginate .paginate_button:active { + outline: none; + background-color: #2b2b2b; + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c)); + /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%); + /* Chrome10+,Safari5.1+ */ + background: -moz-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%); + /* FF3.6+ */ + background: -ms-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%); + /* IE10+ */ + background: -o-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%); + /* Opera 11.10+ */ + background: linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%); + /* W3C */ + box-shadow: inset 0 0 3px #111; +} +.dataTables_wrapper .dataTables_processing { + position: absolute; + top: 50%; + left: 50%; + width: 100%; + height: 40px; + margin-left: -50%; + margin-top: -25px; + padding-top: 20px; + text-align: center; + font-size: 1.2em; + background-color: white; + background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(25%, rgba(255, 255, 255, 0.9)), color-stop(75%, rgba(255, 255, 255, 0.9)), color-stop(100%, rgba(255, 255, 255, 0))); + /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); + /* Chrome10+,Safari5.1+ */ + background: -moz-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); + /* FF3.6+ */ + background: -ms-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); + /* IE10+ */ + background: -o-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); + /* Opera 11.10+ */ + background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); + /* W3C */ +} +.dataTables_wrapper .dataTables_length, +.dataTables_wrapper .dataTables_filter, +.dataTables_wrapper .dataTables_info, +.dataTables_wrapper .dataTables_processing, +.dataTables_wrapper .dataTables_paginate { + color: #333333; +} +.dataTables_wrapper .dataTables_scroll { + clear: both; +} +.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody { + *margin-top: -1px; + -webkit-overflow-scrolling: touch; +} +.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th > div.dataTables_sizing, +.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td > div.dataTables_sizing { + height: 0; + overflow: hidden; + margin: 0 !important; + padding: 0 !important; +} +.dataTables_wrapper.no-footer .dataTables_scrollBody { + border-bottom: 1px solid #111111; +} +.dataTables_wrapper.no-footer div.dataTables_scrollHead table, +.dataTables_wrapper.no-footer div.dataTables_scrollBody table { + border-bottom: none; +} +.dataTables_wrapper:after { + visibility: hidden; + display: block; + content: ""; + clear: both; + height: 0; +} + +@media screen and (max-width: 767px) { + .dataTables_wrapper .dataTables_info, + .dataTables_wrapper .dataTables_paginate { + float: none; + text-align: center; + } + .dataTables_wrapper .dataTables_paginate { + margin-top: 0.5em; + } +} +@media screen and (max-width: 640px) { + .dataTables_wrapper .dataTables_length, + .dataTables_wrapper .dataTables_filter { + float: none; + text-align: center; + } + .dataTables_wrapper .dataTables_filter { + margin-top: 0.5em; + } +} + +div.dataTables_length label { + float: left; + text-align: left; +} + +div.dataTables_length select { + width: 75px; +} + +div.dataTables_filter label { + float: right; +} + +div.dataTables_info { + padding-top: 26px; +} + +div.dataTables_paginate { + float: right; + margin: 0; +} + +table.table { + clear: both; + margin-bottom: 6px !important; + max-width: none !important; +} + +table.table thead .sorting, +table.table thead .sorting_asc, +table.table thead .sorting_desc, +table.table thead .sorting_asc_disabled, +table.table thead .sorting_desc_disabled { + cursor: pointer; + *cursor: hand; +} + +table.table thead .sorting { background: url('vendor/datatables-bootstrap3/BS3/assets/css/../images/sort_both.png') no-repeat center right; } +table.table thead .sorting_asc { background: url('vendor/datatables-bootstrap3/BS3/assets/css/../images/sort_asc.png') no-repeat center right; } +table.table thead .sorting_desc { background: url('vendor/datatables-bootstrap3/BS3/assets/css/../images/sort_desc.png') no-repeat center right; } + +table.table thead .sorting_asc_disabled { background: url('vendor/datatables-bootstrap3/BS3/assets/css/../images/sort_asc_disabled.png') no-repeat center right; } +table.table thead .sorting_desc_disabled { background: url('vendor/datatables-bootstrap3/BS3/assets/css/../images/sort_desc_disabled.png') no-repeat center right; } + +table.dataTable th:active { + outline: none; +} + +/* Scrolling */ +div.dataTables_scrollHead table { + margin-bottom: 0 !important; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} + +div.dataTables_scrollHead table thead tr:last-child th:first-child, +div.dataTables_scrollHead table thead tr:last-child td:first-child { + border-bottom-left-radius: 0 !important; + border-bottom-right-radius: 0 !important; +} + +div.dataTables_scrollBody table { + border-top: none; + margin-bottom: 0 !important; +} + +div.dataTables_scrollBody tbody tr:first-child th, +div.dataTables_scrollBody tbody tr:first-child td { + border-top: none; +} + +div.dataTables_scrollFoot table { + border-top: none; +} + + + + +/* + * TableTools styles + */ +.table tbody tr.active td, +.table tbody tr.active th { + background-color: #08C; + color: white; +} + +.table tbody tr.active:hover td, +.table tbody tr.active:hover th { + background-color: #0075b0 !important; +} + +.table-striped tbody tr.active:nth-child(odd) td, +.table-striped tbody tr.active:nth-child(odd) th { + background-color: #017ebc; +} + +table.DTTT_selectable tbody tr { + cursor: pointer; + *cursor: hand; +} + +div.DTTT .btn { + color: #333 !important; + font-size: 12px; +} + +div.DTTT .btn:hover { + text-decoration: none !important; +} + + +ul.DTTT_dropdown.dropdown-menu a { + color: #333 !important; /* needed only when demo_page.css is included */ +} + +ul.DTTT_dropdown.dropdown-menu li:hover a { + background-color: #0088cc; + color: white !important; +} + +/* TableTools information display */ +div.DTTT_print_info.modal { + height: 150px; + margin-top: -75px; + text-align: center; +} + +div.DTTT_print_info h6 { + font-weight: normal; + font-size: 28px; + line-height: 28px; + margin: 1em; +} + +div.DTTT_print_info p { + font-size: 14px; + line-height: 20px; +} + + + +/* + * FixedColumns styles + */ +div.DTFC_LeftHeadWrapper table, +div.DTFC_LeftFootWrapper table, +table.DTFC_Cloned tr.even { + background-color: white; +} + +div.DTFC_LeftHeadWrapper table { + margin-bottom: 0 !important; + border-top-right-radius: 0 !important; + border-bottom-left-radius: 0 !important; + border-bottom-right-radius: 0 !important; +} + +div.DTFC_LeftHeadWrapper table thead tr:last-child th:first-child, +div.DTFC_LeftHeadWrapper table thead tr:last-child td:first-child { + border-bottom-left-radius: 0 !important; + border-bottom-right-radius: 0 !important; +} + +div.DTFC_LeftBodyWrapper table { + border-top: none; + margin-bottom: 0 !important; +} + +div.DTFC_LeftBodyWrapper tbody tr:first-child th, +div.DTFC_LeftBodyWrapper tbody tr:first-child td { + border-top: none; +} + +div.DTFC_LeftFootWrapper table { + border-top: none; +} \ No newline at end of file diff --git a/public/css/splash.css b/public/css/splash.css index d40f7b2c6690..efa32d17b853 100644 --- a/public/css/splash.css +++ b/public/css/splash.css @@ -152,7 +152,7 @@ ul.navbar-nav li a:hover { .nav>li>a:hover, .nav>li>a:focus { background-color: transparent; } -.container>.navbar-collapse { +z.container>.navbar-collapse { margin-right: -15px; } .navbar-top { @@ -643,6 +643,7 @@ section.faq .contact-box a { section.faq .contact-box p { } + .btn-primary { color: #fff; background-color: #2299c0; @@ -658,6 +659,7 @@ section.faq .contact-box p { .btn-primary:hover { background-color: #2299c0; } + .btn.green { background-color: #30ab82; } diff --git a/public/js/script.js b/public/js/script.js index 05fb3c4c41b2..3afeaf62a7cc 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -347,17 +347,6 @@ if ( $.fn.DataTable.TableTools ) { } ); } -/* -$(document).ready(function() { - $('#example').dataTable( { - "sDom": "<'row'<'span6'l><'span6'f>r>t<'row'<'span6'i><'span6'p>>", - "sPaginationType": "bootstrap", - "oLanguage": { - "sLengthMenu": "_MENU_ records per page" - } - } ); -} ); -*/ function isStorageSupported() { try {