From 179113a99637b1380326c285c0f0eb40f9d70be9 Mon Sep 17 00:00:00 2001 From: mindnervestech Date: Sat, 8 Nov 2014 11:52:43 +0530 Subject: [PATCH] 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 0 -> 1426 bytes public/images/alert_bg_img.png | Bin 0 -> 3822 bytes public/images/alert_icon.png | Bin 0 -> 1185 bytes public/images/avgl_invoice_icon.png | Bin 0 -> 1209 bytes public/images/past_due_invoice_icon.png | Bin 0 -> 1213 bytes public/images/row_grey_bg_img.png | Bin 0 -> 1193 bytes public/images/total_client_icon.png | Bin 0 -> 1616 bytes public/images/upcoming_invoice.png | Bin 0 -> 3417 bytes public/images/upcoming_invoice_icon.png | Bin 0 -> 1145 bytes public/js/jquery.min.js | 16 ++ public/js/jquery.nicescroll.min.js | 313 +++++++++++++++++++++++ 16 files changed, 616 insertions(+), 73 deletions(-) create mode 100644 public/images/account_dashboard_icon.png create mode 100644 public/images/alert_bg_img.png create mode 100644 public/images/alert_icon.png create mode 100644 public/images/avgl_invoice_icon.png create mode 100644 public/images/past_due_invoice_icon.png create mode 100644 public/images/row_grey_bg_img.png create mode 100644 public/images/total_client_icon.png create mode 100644 public/images/upcoming_invoice.png create mode 100644 public/images/upcoming_invoice_icon.png create mode 100644 public/js/jquery.min.js create mode 100644 public/js/jquery.nicescroll.min.js diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php index d682d1ce246a..afe57e561f54 100644 --- a/app/lang/en/texts.php +++ b/app/lang/en/texts.php @@ -47,6 +47,7 @@ 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', @@ -88,6 +89,8 @@ 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', @@ -118,9 +121,11 @@ return array( 'billed_clients' => 'billed clients', 'active_client' => 'active client', 'active_clients' => 'active clients', - 'invoices_past_due' => 'Invoices Past Due', - 'upcoming_invoices' => 'Upcoming invoices', - 'average_invoice' => 'Average invoice', + 'invoices_past_due' => 'PAST DUE INVOICES', + 'upcoming_invoices' => 'UPCOMING INVOICES', + 'average_invoice' => 'Invoice Average', + 'total_active_client'=> 'Total Active Clients', + // list pages 'archive' => 'Archive', diff --git a/app/views/dashboard.blade.php b/app/views/dashboard.blade.php index cb8802f27f66..de05cffef170 100644 --- a/app/views/dashboard.blade.php +++ b/app/views/dashboard.blade.php @@ -1,5 +1,20 @@ @extends('header') + + + + + + + + @section('content')
@@ -49,96 +64,202 @@
-
-
-

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

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

-
    - @foreach ($activities as $activity) -
  • - {{ Utils::timestampToDateString(strtotime($activity->created_at)) }}: - {{ Utils::decodeActivity($activity->message) }} -
    • - @endforeach -
+ +
+ +
    + + {{$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 +
+ +
+

-
-
-

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

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

+ + + + + + + + +
{{ 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 +
{{ 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) }}
{{ $invoice->client->getDisplayName() }}{{ $invoice->getLink() }}{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }}{{ Utils::fromSqlDate($invoice->due_date) }}
+

-
-
-
-
-

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

 

+ +
+

 

+ +
+
+
+

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

+ + + + + + + + +
{{ 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 +
{{ 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) }}
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) }}
-
-
-
-
-
{{ $activeClients }}
-
{{ Utils::pluralize('active_client', $activeClients) }}
-
+
+
+ +
+
+ +

{{ trans('texts.total_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 04ddb6b0c84f..03f22e47d4e1 100755 --- a/app/views/header.blade.php +++ b/app/views/header.blade.php @@ -4,7 +4,7 @@ @section('head') - +