diff --git a/Gruntfile.js b/Gruntfile.js index 30585856a853..fdd48d76c49d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -120,13 +120,10 @@ module.exports = function(grunt) { src: [ 'public/vendor/bootstrap/dist/css/bootstrap.min.css', 'public/vendor/font-awesome/css/font-awesome.min.css', - /* - 'public/css/bootstrap.splash.css', - 'public/css/splash.css', - */ 'public/css/bootstrap-combobox.css', 'public/vendor/datatables/media/css/jquery.dataTables.css', 'public/vendor/datatables-bootstrap3/BS3/assets/css/datatables.css', + 'public/css/public.style.css', ], dest: 'public/css/built.public.css', nonull: true, diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index 9704b3adaaad..39419f227df6 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -20,14 +20,7 @@ class ActivityController extends BaseController ->addColumn('activities.id', function ($model) { return Utils::timestampToDateTimeString(strtotime($model->created_at)); }) ->addColumn('message', function ($model) { return Utils::decodeActivity($model->message); }) ->addColumn('balance', function ($model) { return Utils::formatMoney($model->balance, $model->currency_id); }) - ->addColumn('adjustment', function ($model) { return $model->adjustment != 0 ? self::wrapAdjustment($model->adjustment, $model->currency_id) : ''; }) + ->addColumn('adjustment', function ($model) { return $model->adjustment != 0 ? Utils::wrapAdjustment($model->adjustment, $model->currency_id) : ''; }) ->make(); } - - private function wrapAdjustment($adjustment, $currencyId) - { - $class = $adjustment <= 0 ? 'success' : 'default'; - $adjustment = Utils::formatMoney($adjustment, $currencyId); - return "
{!! $client->getWebsite() !!}
+{!! Utils::formatWebsite($client->website) !!}
@endif @if ($client->language) diff --git a/resources/views/invited/dashboard.blade.php b/resources/views/invited/dashboard.blade.php new file mode 100644 index 000000000000..36eb2e5a7052 --- /dev/null +++ b/resources/views/invited/dashboard.blade.php @@ -0,0 +1,170 @@ +@extends('public.header') + +@section('head') + @parent + + + +@stop + +@section('content') + +