Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Combined advanced settings pages

Browse Source
This commit is contained in:
Hillel Coren 2015-03-09 21:14:00 +02:00
parent d13a377ff7
commit e42c6b3ca2
13 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -567,5 +567,7 @@ return array(
'password_error_invalid' => 'The new password is invalid.', 'password_error_invalid' => 'The new password is invalid.',
'updated_password' => 'Successfully updated password', 'updated_password' => 'Successfully updated password',
'api_tokens' => 'API Tokens',
'users_and_tokens' => 'Users & Tokens',
); );

3
app/lang/de/texts.php
View File

@ -558,5 +558,8 @@ return array(
'password_error_invalid' => 'Das neue Kennwort ist ungültig.', 'password_error_invalid' => 'Das neue Kennwort ist ungültig.',
'updated_password' => 'Passwort erfolgreich aktualisiert', 'updated_password' => 'Passwort erfolgreich aktualisiert',
'api_tokens' => 'API Tokens',
'users_and_tokens' => 'Users & Tokens',
); );

4
app/lang/en/texts.php
View File

@ -565,4 +565,8 @@ return array(
'password_error_invalid' => 'The new password is invalid.', 'password_error_invalid' => 'The new password is invalid.',
'updated_password' => 'Successfully updated password', 'updated_password' => 'Successfully updated password',
'api_tokens' => 'API Tokens',
'users_and_tokens' => 'Users & Tokens',
); );

3
app/lang/es/texts.php
View File

@ -537,5 +537,8 @@ return array(
'password_error_invalid' => 'The new password is invalid.', 'password_error_invalid' => 'The new password is invalid.',
'updated_password' => 'Successfully updated password', 'updated_password' => 'Successfully updated password',
'api_tokens' => 'API Tokens',
'users_and_tokens' => 'Users & Tokens',
); );

3
app/lang/fr/texts.php
View File

@ -558,5 +558,8 @@ return array(
'password_error_invalid' => 'The new password is invalid.', 'password_error_invalid' => 'The new password is invalid.',
'updated_password' => 'Successfully updated password', 'updated_password' => 'Successfully updated password',
'api_tokens' => 'API Tokens',
'users_and_tokens' => 'Users & Tokens',
); );

3
app/lang/it/texts.php
View File

@ -560,5 +560,8 @@ return array(
'password_error_invalid' => 'The new password is invalid.', 'password_error_invalid' => 'The new password is invalid.',
'updated_password' => 'Successfully updated password', 'updated_password' => 'Successfully updated password',
'api_tokens' => 'API Tokens',
'users_and_tokens' => 'Users & Tokens',
); );

3
app/lang/lt/texts.php
View File

@ -568,6 +568,9 @@ return array(
'password_error_invalid' => 'The new password is invalid.', 'password_error_invalid' => 'The new password is invalid.',
'updated_password' => 'Successfully updated password', 'updated_password' => 'Successfully updated password',
'api_tokens' => 'API Tokens',
'users_and_tokens' => 'Users & Tokens',
); );

3
app/lang/nb_NO/texts.php
View File

@ -566,5 +566,8 @@ return array(
'password_error_invalid' => 'The new password is invalid.', 'password_error_invalid' => 'The new password is invalid.',
'updated_password' => 'Successfully updated password', 'updated_password' => 'Successfully updated password',
'api_tokens' => 'API Tokens',
'users_and_tokens' => 'Users & Tokens',
); );

3
app/lang/nl/texts.php
View File

@ -561,6 +561,9 @@ return array(
'password_error_invalid' => 'The new password is invalid.', 'password_error_invalid' => 'The new password is invalid.',
'updated_password' => 'Successfully updated password', 'updated_password' => 'Successfully updated password',
'api_tokens' => 'API Tokens',
'users_and_tokens' => 'Users & Tokens',
); );

3
app/lang/pt_BR/texts.php
View File

@ -549,5 +549,8 @@ return array(
'password_error_invalid' => 'The new password is invalid.', 'password_error_invalid' => 'The new password is invalid.',
'updated_password' => 'Successfully updated password', 'updated_password' => 'Successfully updated password',
'api_tokens' => 'API Tokens',
'users_and_tokens' => 'Users & Tokens',
); );

10
app/views/accounts/nav_advanced.blade.php
View File

@ -2,20 +2,16 @@
{{ HTML::nav_link('company/advanced_settings/invoice_settings', 'invoice_settings') }} {{ HTML::nav_link('company/advanced_settings/invoice_settings', 'invoice_settings') }}
{{ HTML::nav_link('company/advanced_settings/invoice_design', 'invoice_design') }} {{ HTML::nav_link('company/advanced_settings/invoice_design', 'invoice_design') }}
{{ HTML::nav_link('company/advanced_settings/email_templates', 'email_templates') }} {{ HTML::nav_link('company/advanced_settings/email_templates', 'email_templates') }}
{{ HTML::nav_link('company/advanced_settings/data_visualizations', 'data_visualizations') }}
{{ HTML::nav_link('company/advanced_settings/chart_builder', 'chart_builder') }} {{ HTML::nav_link('company/advanced_settings/chart_builder', 'chart_builder') }}
{{ HTML::nav_link('company/advanced_settings/user_management', 'users', 'users') }} {{ HTML::nav_link('company/advanced_settings/user_management', 'users_and_tokens') }}
{{ HTML::nav_link('company/advanced_settings/token_management', 'tokens', 'tokens') }}
</ul> </ul>
<p>&nbsp;</p> <p>&nbsp;</p>
@if (!Auth::user()->account->isPro()) @if (!Auth::user()->account->isPro())
<div class="container"> <center>
<div class="row">
<div style="font-size:larger;" class="col-md-8 col-md-offset-2">{{ trans('texts.pro_plan_advanced_settings', ['link'=>'<a href="#" onclick="showProPlan(\''.$feature.'\')">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}</div> <div style="font-size:larger;" class="col-md-8 col-md-offset-2">{{ trans('texts.pro_plan_advanced_settings', ['link'=>'<a href="#" onclick="showProPlan(\''.$feature.'\')">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}</div>
&nbsp;<p/>&nbsp; &nbsp;<p/>&nbsp;
</div> </center>
</div>
@endif @endif
<br/> <br/>

5
app/views/accounts/user_management.blade.php
View File

@ -13,9 +13,12 @@
{{ Former::close() }} {{ Former::close() }}
<div class="pull-right">
@if (Utils::isPro()) @if (Utils::isPro())
{{ Button::success_link(URL::to('users/create'), trans("texts.add_user"), array('class' => 'pull-right'))->append_with_icon('plus-sign') }} {{ Button::success_link(URL::to('users/create'), trans("texts.add_user"))->append_with_icon('plus-sign') }}
@endif @endif
{{ Button::default_link(URL::to('company/advanced_settings/token_management'), trans("texts.api_tokens"))->append_with_icon('cloud') }}
</div>
<label for="trashed" style="font-weight:normal; margin-left: 10px;"> <label for="trashed" style="font-weight:normal; margin-left: 10px;">

10
app/views/reports/report_builder.blade.php
View File

@ -10,9 +10,13 @@
@parent @parent
@include('accounts.nav_advanced') @include('accounts.nav_advanced')
{{ Former::open() }}
{{ Former::legend('chart_builder') }} <legend style="padding-bottom:32px">
{{ Former::close() }} {{ trans('texts.chart_builder') }}
<div class="pull-right">
{{ Button::default_link(URL::to('company/advanced_settings/data_visualizations'), trans("texts.data_visualizations"))->append_with_icon('globe') }}
</div>
</legend>
<div class="row"> <div class="row">
<div class="col-lg-4"> <div class="col-lg-4">