From fe9249beb7f495f7662e929cfeebdf16fdfc5f33 Mon Sep 17 00:00:00 2001 From: Razi KAntorp Date: Thu, 27 Feb 2014 12:42:23 +0100 Subject: [PATCH] Dasboard table headers, golobal button change. --- app/views/accounts/details.blade.php | 2 +- app/views/accounts/notifications.blade.php | 2 +- app/views/accounts/payments.blade.php | 2 +- app/views/clients/edit.blade.php | 4 +--- app/views/credits/edit.blade.php | 7 +++---- app/views/dashboard.blade.php | 4 ++-- app/views/payments/edit.blade.php | 6 +++--- public/css/style.css | 2 ++ 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/views/accounts/details.blade.php b/app/views/accounts/details.blade.php index a82dedcdf656..bf3ac60d4b02 100755 --- a/app/views/accounts/details.blade.php +++ b/app/views/accounts/details.blade.php @@ -75,7 +75,7 @@
- {{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }} + {{ Button::lg_success_submit('Save')->append_with_icon('floppy-disk') }}
{{ Former::close() }} diff --git a/app/views/accounts/notifications.blade.php b/app/views/accounts/notifications.blade.php index 1759187d446c..4a0e8a41be79 100755 --- a/app/views/accounts/notifications.blade.php +++ b/app/views/accounts/notifications.blade.php @@ -18,7 +18,7 @@ {{ Former::textarea('invoice_terms')->label('Set default invoice terms') }} {{ Former::textarea('email_footer')->label('Set default email signature') }} - {{ Former::actions( Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') ) }} + {{ Former::actions( Button::lg_success_submit('Save')->append_with_icon('floppy-disk') ) }} {{ Former::close() }} @stop \ No newline at end of file diff --git a/app/views/accounts/payments.blade.php b/app/views/accounts/payments.blade.php index 9075f9034579..ce8a149d8507 100755 --- a/app/views/accounts/payments.blade.php +++ b/app/views/accounts/payments.blade.php @@ -45,7 +45,7 @@ @endforeach - {{ Former::actions( Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') ) }} + {{ Former::actions( Button::lg_success_submit('Save')->append_with_icon('floppy-disk') ) }} {{ Former::close() }} diff --git a/app/views/clients/edit.blade.php b/app/views/clients/edit.blade.php index e59b79d8b44a..84fab15a0758 100755 --- a/app/views/clients/edit.blade.php +++ b/app/views/clients/edit.blade.php @@ -148,10 +148,8 @@ - -
- {{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }} + {{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }} {{ Button::lg_default_link('clients/' . ($client ? $client->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
diff --git a/app/views/credits/edit.blade.php b/app/views/credits/edit.blade.php index b55a2038b191..047f792dfd68 100755 --- a/app/views/credits/edit.blade.php +++ b/app/views/credits/edit.blade.php @@ -28,10 +28,9 @@ - -
- {{ Button::lg_primary_submit('Save') }}  |  - {{ link_to('credits/' . ($credit ? $credit->public_id : ''), 'Cancel') }} +
+ {{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }} + {{ Button::lg_default_link('credits/' . ($credit ? $credit->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
{{ Former::close() }} diff --git a/app/views/dashboard.blade.php b/app/views/dashboard.blade.php index b23c040375fc..eaa27672e9a1 100644 --- a/app/views/dashboard.blade.php +++ b/app/views/dashboard.blade.php @@ -98,8 +98,8 @@
-
-
+
+

Upcoming invoices

diff --git a/app/views/payments/edit.blade.php b/app/views/payments/edit.blade.php index e8f446fed65e..580e48ff3000 100755 --- a/app/views/payments/edit.blade.php +++ b/app/views/payments/edit.blade.php @@ -32,9 +32,9 @@
-
- {{ Button::lg_primary_submit_success('Save') }}  |  - {{ link_to('payments/' . ($payment ? $payment->public_id : ''), 'Cancel') }} +
+ {{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }} + {{ Button::lg_default_link('payments/' . ($payment ? $payment->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
{{ Former::close() }} diff --git a/public/css/style.css b/public/css/style.css index fc5937eb2a90..7a20ed55d472 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -448,6 +448,8 @@ background-clip: padding-box; } .panel-body {padding: 25px;} +.dashboard .panel-heading { margin: -1px; } + .dashboard .panel-body {padding: 0;} .dashboard .table-striped>tbody>tr>td, .table-striped>tbody>tr>th { background-color: #fbfbfb;}