mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 00:11:35 +02:00
Combined advanced settings pages
This commit is contained in:
parent
d13a377ff7
commit
e42c6b3ca2
@ -567,5 +567,7 @@ return array(
|
||||
'password_error_invalid' => 'The new password is invalid.',
|
||||
'updated_password' => 'Successfully updated password',
|
||||
|
||||
'api_tokens' => 'API Tokens',
|
||||
'users_and_tokens' => 'Users & Tokens',
|
||||
|
||||
);
|
||||
|
@ -558,5 +558,8 @@ return array(
|
||||
'password_error_invalid' => 'Das neue Kennwort ist ungültig.',
|
||||
'updated_password' => 'Passwort erfolgreich aktualisiert',
|
||||
|
||||
'api_tokens' => 'API Tokens',
|
||||
'users_and_tokens' => 'Users & Tokens',
|
||||
|
||||
|
||||
);
|
||||
|
@ -565,4 +565,8 @@ return array(
|
||||
'password_error_invalid' => 'The new password is invalid.',
|
||||
'updated_password' => 'Successfully updated password',
|
||||
|
||||
'api_tokens' => 'API Tokens',
|
||||
'users_and_tokens' => 'Users & Tokens',
|
||||
|
||||
|
||||
);
|
||||
|
@ -537,5 +537,8 @@ return array(
|
||||
'password_error_invalid' => 'The new password is invalid.',
|
||||
'updated_password' => 'Successfully updated password',
|
||||
|
||||
'api_tokens' => 'API Tokens',
|
||||
'users_and_tokens' => 'Users & Tokens',
|
||||
|
||||
|
||||
);
|
@ -558,5 +558,8 @@ return array(
|
||||
'password_error_invalid' => 'The new password is invalid.',
|
||||
'updated_password' => 'Successfully updated password',
|
||||
|
||||
'api_tokens' => 'API Tokens',
|
||||
'users_and_tokens' => 'Users & Tokens',
|
||||
|
||||
|
||||
);
|
@ -560,5 +560,8 @@ return array(
|
||||
'password_error_invalid' => 'The new password is invalid.',
|
||||
'updated_password' => 'Successfully updated password',
|
||||
|
||||
'api_tokens' => 'API Tokens',
|
||||
'users_and_tokens' => 'Users & Tokens',
|
||||
|
||||
|
||||
);
|
||||
|
@ -568,6 +568,9 @@ return array(
|
||||
'password_error_invalid' => 'The new password is invalid.',
|
||||
'updated_password' => 'Successfully updated password',
|
||||
|
||||
'api_tokens' => 'API Tokens',
|
||||
'users_and_tokens' => 'Users & Tokens',
|
||||
|
||||
|
||||
);
|
||||
|
||||
|
@ -566,5 +566,8 @@ return array(
|
||||
'password_error_invalid' => 'The new password is invalid.',
|
||||
'updated_password' => 'Successfully updated password',
|
||||
|
||||
'api_tokens' => 'API Tokens',
|
||||
'users_and_tokens' => 'Users & Tokens',
|
||||
|
||||
|
||||
);
|
@ -561,6 +561,9 @@ return array(
|
||||
'password_error_invalid' => 'The new password is invalid.',
|
||||
'updated_password' => 'Successfully updated password',
|
||||
|
||||
'api_tokens' => 'API Tokens',
|
||||
'users_and_tokens' => 'Users & Tokens',
|
||||
|
||||
|
||||
|
||||
);
|
@ -549,5 +549,8 @@ return array(
|
||||
'password_error_invalid' => 'The new password is invalid.',
|
||||
'updated_password' => 'Successfully updated password',
|
||||
|
||||
'api_tokens' => 'API Tokens',
|
||||
'users_and_tokens' => 'Users & Tokens',
|
||||
|
||||
|
||||
);
|
||||
|
@ -2,20 +2,16 @@
|
||||
{{ 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/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/user_management', 'users', 'users') }}
|
||||
{{ HTML::nav_link('company/advanced_settings/token_management', 'tokens', 'tokens') }}
|
||||
{{ HTML::nav_link('company/advanced_settings/user_management', 'users_and_tokens') }}
|
||||
</ul>
|
||||
<p> </p>
|
||||
|
||||
@if (!Auth::user()->account->isPro())
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<center>
|
||||
<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>
|
||||
<p/>
|
||||
</div>
|
||||
</div>
|
||||
</center>
|
||||
@endif
|
||||
|
||||
<br/>
|
@ -13,9 +13,12 @@
|
||||
{{ Former::close() }}
|
||||
|
||||
|
||||
@if (Utils::isPro())
|
||||
{{ Button::success_link(URL::to('users/create'), trans("texts.add_user"), array('class' => 'pull-right'))->append_with_icon('plus-sign') }}
|
||||
@endif
|
||||
<div class="pull-right">
|
||||
@if (Utils::isPro())
|
||||
{{ Button::success_link(URL::to('users/create'), trans("texts.add_user"))->append_with_icon('plus-sign') }}
|
||||
@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;">
|
||||
|
@ -10,9 +10,13 @@
|
||||
@parent
|
||||
@include('accounts.nav_advanced')
|
||||
|
||||
{{ Former::open() }}
|
||||
{{ Former::legend('chart_builder') }}
|
||||
{{ Former::close() }}
|
||||
|
||||
<legend style="padding-bottom:32px">
|
||||
{{ 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="col-lg-4">
|
||||
|
Loading…
Reference in New Issue
Block a user