From 58a8b72ce98b2bb979fc6c3bdb7a8244edb636c4 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 11 Nov 2014 19:47:31 +0200 Subject: [PATCH] Revert "dashboard page" --- app/lang/en/texts.php | 11 +- app/views/dashboard.blade.php | 255 +++++------------- app/views/header.blade.php | 2 +- app/views/public/splash.blade.php | 1 + public/css/customCss.css | 91 +------ public/images/account_dashboard_icon.png | Bin 1426 -> 0 bytes public/images/alert_bg_img.png | Bin 3822 -> 0 bytes public/images/alert_icon.png | Bin 1185 -> 0 bytes public/images/avgl_invoice_icon.png | Bin 1209 -> 0 bytes public/images/past_due_invoice_icon.png | Bin 1213 -> 0 bytes public/images/row_grey_bg_img.png | Bin 1193 -> 0 bytes public/images/total_client_icon.png | Bin 1616 -> 0 bytes public/images/upcoming_invoice.png | Bin 3417 -> 0 bytes public/images/upcoming_invoice_icon.png | Bin 1145 -> 0 bytes public/js/jquery.min.js | 16 -- public/js/jquery.nicescroll.min.js | 313 ----------------------- 16 files changed, 73 insertions(+), 616 deletions(-) delete mode 100644 public/images/account_dashboard_icon.png delete mode 100644 public/images/alert_bg_img.png delete mode 100644 public/images/alert_icon.png delete mode 100644 public/images/avgl_invoice_icon.png delete mode 100644 public/images/past_due_invoice_icon.png delete mode 100644 public/images/row_grey_bg_img.png delete mode 100644 public/images/total_client_icon.png delete mode 100644 public/images/upcoming_invoice.png delete mode 100644 public/images/upcoming_invoice_icon.png delete mode 100644 public/js/jquery.min.js delete mode 100644 public/js/jquery.nicescroll.min.js diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php index 5835615f32..775414d063 100644 --- a/app/lang/en/texts.php +++ b/app/lang/en/texts.php @@ -47,7 +47,6 @@ return array( 'subtotal' => 'Subtotal', 'paid_to_date' => 'Paid to Date', 'balance_due' => 'Balance Due', - 'balance' => 'Balance', 'invoice_design_id' => 'Design', 'terms' => 'Terms', 'your_invoice' => 'Your Invoice', @@ -89,8 +88,6 @@ return array( 'company_details' => 'Company Details', 'online_payments' => 'Online Payments', 'notifications' => 'Notifications', - 'alert'=>'ALERT', - 'view_all' =>'VIEW ALL', 'import_export' => 'Import/Export', 'done' => 'Done', 'save' => 'Save', @@ -121,11 +118,9 @@ return array( 'billed_clients' => 'billed clients', 'active_client' => 'active client', 'active_clients' => 'active clients', - 'invoices_past_due' => 'PAST DUE INVOICES', - 'upcoming_invoices' => 'UPCOMING INVOICES', - 'average_invoice' => 'Invoice Average', - 'total_active_client'=> 'Total Active Clients', - + 'invoices_past_due' => 'Invoices Past Due', + 'upcoming_invoices' => 'Upcoming invoices', + 'average_invoice' => 'Average invoice', // list pages 'archive' => 'Archive', diff --git a/app/views/dashboard.blade.php b/app/views/dashboard.blade.php index de05cffef1..cb8802f27f 100644 --- a/app/views/dashboard.blade.php +++ b/app/views/dashboard.blade.php @@ -1,20 +1,5 @@ @extends('header') - - - - - - - - @section('content')
@@ -64,202 +49,96 @@
-
-
-
-

- - - - {{ trans('texts.alert') }} - {{ trans('texts.view_all') }} +
+
+

+ {{ trans('texts.notifications') }}

- -
- -
    - - {{$oddLoop = false;}} - @foreach ($activities as $activity) - @if($oddLoop=!$oddLoop) -
  • - {{ Utils::timestampToDateString(strtotime($activity->created_at)) }}: - {{ Utils::decodeActivity($activity->message) }} -
    • - @else -
  • - {{ Utils::timestampToDateString(strtotime($activity->created_at)) }}: - {{ Utils::decodeActivity($activity->message) }} -
    • - @endif - @endforeach -
- -
-
+
    + @foreach ($activities as $activity) +
  • + {{ Utils::timestampToDateString(strtotime($activity->created_at)) }}: + {{ Utils::decodeActivity($activity->message) }} +
    • + @endforeach +

-
-
-

- - - - {{ trans('texts.upcoming_invoices') }} - {{ trans('texts.view_all') }} +
+
+

+ {{ trans('texts.invoices_past_due') }}

- - - - - - - - -
{{ trans('texts.client') }}{{ trans('texts.invoice_number_short') }}{{ trans('texts.balance') }}{{ trans('texts.due_date') }}
- -
- - - @foreach ($upcoming as $invoice) - - - - - - - @endforeach - + + + + + + + + @foreach ($pastDue as $invoice) + + + + + + + @endforeach +
{{ $invoice->client->getDisplayName() }}{{ $invoice->getLink() }}{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }}{{ Utils::fromSqlDate($invoice->due_date) }}
{{ trans('texts.invoice_number_short') }}{{ trans('texts.client') }}{{ trans('texts.due_date') }}{{ trans('texts.balance_due') }}
{{ $invoice->getLink() }}{{ $invoice->client->getDisplayName() }}{{ Utils::fromSqlDate($invoice->due_date) }}{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }}
-

-

 

- -
-

 

- -
-
-
-

- - - - {{ trans('texts.invoices_past_due') }} - {{ trans('texts.view_all') }} +
+
+
+
+

+ {{ trans('texts.upcoming_invoices') }}

- - - - - - - - -
{{ trans('texts.client') }}{{ trans('texts.invoice_number_short') }}{{ trans('texts.balance') }}{{ trans('texts.due_date') }}
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @foreach ($pastDue as $invoice) - - - - - - - @endforeach - + + + + + + + + @foreach ($upcoming as $invoice) + + + + + + + @endforeach +
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
{{ $invoice->client->getDisplayName() }}{{ $invoice->getLink() }}{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }}{{ Utils::fromSqlDate($invoice->due_date) }}
{{ trans('texts.invoice_number_short') }}{{ trans('texts.client') }}{{ trans('texts.due_date') }}{{ trans('texts.balance_due') }}
{{ $invoice->getLink() }}{{ $invoice->client->getDisplayName() }}{{ Utils::fromSqlDate($invoice->due_date) }}{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }}
-
-
+
- -
-
- -

{{ trans('texts.total_active_client') }}

-
{{ $activeClients }}
- -
- -
+
+
+
{{ $activeClients }}
+
{{ Utils::pluralize('active_client', $activeClients) }}
+
+
-
- -

{{ trans('texts.average_invoice') }}

-
{{ $invoiceAvg }}
-
-
+
+
{{ trans('texts.average_invoice') }}
+
{{ $invoiceAvg }}
+
+ +

@stop \ No newline at end of file diff --git a/app/views/header.blade.php b/app/views/header.blade.php index 4cf9a3ba22..795d1f50ae 100755 --- a/app/views/header.blade.php +++ b/app/views/header.blade.php @@ -4,7 +4,7 @@ @section('head') - +