diff --git a/app/views/accounts/details.blade.php b/app/views/accounts/details.blade.php index 03e0bb2cd561..a82dedcdf656 100755 --- a/app/views/accounts/details.blade.php +++ b/app/views/accounts/details.blade.php @@ -75,7 +75,7 @@
- {{ Button::lg_primary_submit('Save') }} + {{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }}
{{ Former::close() }} diff --git a/app/views/accounts/import_export.blade.php b/app/views/accounts/import_export.blade.php index 4f3841092ebd..1f1e21d030ac 100755 --- a/app/views/accounts/import_export.blade.php +++ b/app/views/accounts/import_export.blade.php @@ -6,12 +6,12 @@ {{ Former::open_for_files('company/import_map')->addClass('col-md-9 col-md-offset-1') }} {{ Former::legend('Import Client Data') }} {{ Former::file('file')->label('Select CSV file') }} - {{ Former::actions( Button::lg_primary_submit('Upload') ) }} + {{ Former::actions( Button::lg_info_submit('Upload')->append_with_icon('open') ) }} {{ Former::close() }} {{ Former::open('company/export')->addClass('col-md-9 col-md-offset-1') }} {{ Former::legend('Export Client Data') }} - {{ Former::actions( Button::lg_primary_submit('Download') ) }} + {{ Former::actions( Button::lg_primary_submit('Download')->append_with_icon('download-alt') ) }} {{ Former::close() }} @stop \ No newline at end of file diff --git a/app/views/accounts/notifications.blade.php b/app/views/accounts/notifications.blade.php index 2e8790306654..1759187d446c 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') ) }} + {{ Former::actions( Button::lg_primary_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 058c4354cf15..9075f9034579 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') ) }} + {{ Former::actions( Button::lg_primary_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 a8bab7065a2d..e59b79d8b44a 100755 --- a/app/views/clients/edit.blade.php +++ b/app/views/clients/edit.blade.php @@ -6,10 +6,10 @@ @stop @section('content') - +
- {{ Former::open($url)->addClass('col-md-10 col-md-offset-1 main_form')->method($method)->rules(array( + {{ Former::open($url)->addClass('col-md-12 main_form')->method($method)->rules(array( 'email' => 'email|required' )); }} @@ -17,7 +17,6 @@ {{ Former::populate($client) }} @endif -
@@ -52,12 +51,12 @@ {{ Former::text('phone')->data_bind("value: phone, valueUpdate: 'afterkeydown'") }}
-
- - {{ link_to('#', 'Remove contact', array('data-bind'=>'click: $parent.removeContact')) }} +
+ + {{ link_to('#', 'Remove contact -', array('data-bind'=>'click: $parent.removeContact')) }} - - {{ link_to('#', 'Add contact', array('onclick'=>'return addContact()')) }} + + {{ link_to('#', 'Add contact +', array('onclick'=>'return addContact()')) }}
@@ -151,11 +150,11 @@ -
- {{ Button::lg_primary_submit('Save') }}  |  - {{ link_to('clients/' . ($client ? $client->public_id : ''), 'Cancel') }} +
+ {{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }} + {{ Button::lg_default_link('clients/' . ($client ? $client->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
{{ Former::close() }} - +
@stop \ No newline at end of file diff --git a/app/views/dashboard.blade.php b/app/views/dashboard.blade.php index 89a28a2456aa..b23c040375fc 100644 --- a/app/views/dashboard.blade.php +++ b/app/views/dashboard.blade.php @@ -49,8 +49,8 @@
-
-
+
+

Notifications

@@ -66,14 +66,14 @@
-
+

Invoices Past Due

- +
@@ -98,14 +98,14 @@
-
+

Upcoming invoices

-
Invoice # Client
+
@@ -126,15 +126,18 @@ -
-
+
+
{{ $activeClients }}
{{ Utils::pluralize('active client', $activeClients) }}
-
+
+
+
Average invoice
{{ $invoiceAvg }}
+
diff --git a/app/views/header.blade.php b/app/views/header.blade.php index 27d1e55f21b8..92c447c867a6 100755 --- a/app/views/header.blade.php +++ b/app/views/header.blade.php @@ -151,7 +151,7 @@
-
+
@if (!isset($showBreadcrumbs) || $showBreadcrumbs) {{ HTML::breadcrumbs() }} @@ -167,7 +167,6 @@ @yield('content') -
-
+

{{ Former::open('signup/submit')->addClass('signUpForm') }} @@ -240,7 +239,7 @@
- diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index e4fac53c3094..d0e294a17c2f 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -212,14 +212,14 @@ ->fromQuery($invoiceDesigns, 'name', 'id')->data_bind("value: invoice_design_id") }} - {{ Button::normal('Download PDF', array('onclick' => 'onDownloadClick()')) }} - + {{ Button::primary('Download PDF', array('onclick' => 'onDownloadClick()'))->append_with_icon('download-alt'); }} + @if (!$invoice || (!$invoice->trashed() && !$invoice->client->trashed())) @if ($invoice)
- - +
-
+
{{ Former::legend('Organization') }} @@ -361,7 +361,7 @@
-
+
Invoice # Client
@@ -414,7 +414,7 @@ -
+
 

Recurring invoices are automatically sent.

Use :MONTH, :QUARTER or :YEAR for dynamic dates.

diff --git a/app/views/list.blade.php b/app/views/list.blade.php index e8323edc2861..e0f01b731d68 100755 --- a/app/views/list.blade.php +++ b/app/views/list.blade.php @@ -17,14 +17,15 @@ ) , array('id'=>'archive'))->split(); }} -