Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements

Browse Source
This commit is contained in:
Hillel Coren 2015-08-04 17:33:30 +03:00
parent 8f80ccf4d7
commit 2cfcdd1e77
16 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/HomeController.php
View File

@ -72,9 +72,9 @@ class HomeController extends BaseController
$user->news_feed_id = $newsFeedId; $user->news_feed_id = $newsFeedId;
$user->save(); $user->save();
} }
Session::forget('news_feed_message');
} }
Session::forget('news_feed_message');
return 'success'; return 'success';
} }

2
resources/lang/da/texts.php
View File

@ -743,7 +743,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',

2
resources/lang/de/texts.php
View File

@ -733,7 +733,7 @@ return array(
'invoice_no' => 'Rechnung Nr.', 'invoice_no' => 'Rechnung Nr.',
'recent_payments' => 'Kürzliche Zahlungen', 'recent_payments' => 'Kürzliche Zahlungen',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',
); );

3
resources/lang/en/texts.php
View File

@ -120,7 +120,7 @@ return array(
'active_clients' => 'active clients', 'active_clients' => 'active clients',
'invoices_past_due' => 'Invoices Past Due', 'invoices_past_due' => 'Invoices Past Due',
'upcoming_invoices' => 'Upcoming Invoices', 'upcoming_invoices' => 'Upcoming Invoices',
'average_invoice' => 'Average invoice', 'average_invoice' => 'Average Invoice',
// list pages // list pages
'archive' => 'Archive', 'archive' => 'Archive',
@ -741,6 +741,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',
); );

2
resources/lang/es/texts.php
View File

@ -713,7 +713,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',
); );

2
resources/lang/es_ES/texts.php
View File

@ -742,7 +742,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',

2
resources/lang/fr/texts.php
View File

@ -734,7 +734,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',

2
resources/lang/fr_CA/texts.php
View File

@ -735,7 +735,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',
); );

2
resources/lang/it/texts.php
View File

@ -737,7 +737,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',

2
resources/lang/lt/texts.php
View File

@ -744,7 +744,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',

2
resources/lang/nb_NO/texts.php
View File

@ -742,7 +742,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',

2
resources/lang/nl/texts.php
View File

@ -737,7 +737,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',

2
resources/lang/pt_BR/texts.php
View File

@ -737,7 +737,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',
); );

2
resources/lang/sv/texts.php
View File

@ -740,7 +740,7 @@ return array(
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',
'total_revenue' => 'Total Revenue',

6
resources/views/dashboard.blade.php
View File

@ -7,6 +7,9 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<img src="{{ asset('images/totalinvoices.png') }}" class="in-image"/> <img src="{{ asset('images/totalinvoices.png') }}" class="in-image"/>
<div class="in-thin">
{{ trans('texts.total_revenue') }}
</div>
<div class="in-bold"> <div class="in-bold">
@if (count($paidToDate)) @if (count($paidToDate))
@foreach ($paidToDate as $item) @foreach ($paidToDate as $item)
@ -16,9 +19,6 @@
{{ Utils::formatMoney(0) }} {{ Utils::formatMoney(0) }}
@endif @endif
</div> </div>
<div class="in-thin">
{{ trans('texts.in_total_revenue') }}
</div>
</div> </div>
</div> </div>
</div> </div>

7
resources/views/list.blade.php
View File

@ -24,13 +24,16 @@
</label> </label>
<div id="top_right_buttons" class="pull-right"> <div id="top_right_buttons" class="pull-right">
<input id="tableFilter" type="text" style="width:140px;margin-right:17px;background-color: white !important" class="form-control pull-left" placeholder="{{ trans('texts.filter') }}"/> <input id="tableFilter" type="text" style="width:140px;margin-right:17px;background-color: white !important" class="form-control pull-left" placeholder="{{ trans('texts.filter') }}"/>
@if (Auth::user()->isPro() && $entityType == ENTITY_INVOICE) @if (Auth::user()->isPro() && $entityType == ENTITY_INVOICE)
{!! Button::normal(trans('texts.quotes'))->asLinkTo(URL::to('/quotes'))->appendIcon(Icon::create('list')) !!} {!! Button::normal(trans('texts.quotes'))->asLinkTo(URL::to('/quotes'))->appendIcon(Icon::create('list')) !!}
@elseif ($entityType == ENTITY_CLIENT) @elseif ($entityType == ENTITY_CLIENT)
{!! Button::normal(trans('texts.credits'))->asLinkTo(URL::to('/credits'))->appendIcon(Icon::create('list')) !!} {!! Button::normal(trans('texts.credits'))->asLinkTo(URL::to('/credits'))->appendIcon(Icon::create('list')) !!}
@endif @endif
{!! Button::primary(trans("texts.new_$entityType"))->asLinkTo(URL::to("/{$entityType}s/create"))->appendIcon(Icon::create('plus-sign')) !!}
@if ($entityType != ENTITY_TASK || Auth::user()->account->timezone_id)
{!! Button::primary(trans("texts.new_$entityType"))->asLinkTo(URL::to("/{$entityType}s/create"))->appendIcon(Icon::create('plus-sign')) !!}
@endif
</div> </div>
@if (isset($secEntityType)) @if (isset($secEntityType))