IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Better demo warning and budget indication.

Browse Source
This commit is contained in:
James Cole 2016-04-29 11:34:48 +02:00
parent baff9780de
commit 8bcc319b7d
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Auth/AuthController.php
View File

@ -15,7 +15,6 @@ use Illuminate\Mail\Message;
use Illuminate\Support\Facades\Lang; use Illuminate\Support\Facades\Lang;
use Log; use Log;
use Mail; use Mail;
use Request as Rq;
use Session; use Session;
use Swift_TransportException; use Swift_TransportException;
use Validator; use Validator;
@ -143,9 +142,9 @@ class AuthController extends Controller
*/ */
public function showRegistrationForm() public function showRegistrationForm()
{ {
$host = Rq::getHttpHost(); $showDemoWarning = env('SHOW_DEMO_WARNING', false);
return view('auth.register', compact('host')); return view('auth.register', compact('showDemoWarning'));
} }
/** /**

4
resources/views/auth/register.twig
View File

@ -17,7 +17,7 @@
<div class="register-box-body"> <div class="register-box-body">
<p class="login-box-msg">Register a new account</p> <p class="login-box-msg">Register a new account</p>
{% if host == 'geld.nder.be' or host == 'firefly.app' %} {% if showDemoWarning %}
<p class="text-info login-box-msg">Please note that an account on this site will only <p class="text-info login-box-msg">Please note that an account on this site will only
work for one (1) month.</p> work for one (1) month.</p>
{% endif %} {% endif %}
@ -27,7 +27,7 @@
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<input type="email" name="email" class="form-control" placeholder="Email"/> <input type="email" name="email" class="form-control" placeholder="Email"/>
{% if host == 'geld.nder.be' or host == 'firefly.app' %} {% if showDemoWarning %}
<p class="help-block">You will receive an email from Firefly III. If your email address <p class="help-block">You will receive an email from Firefly III. If your email address
is incorrect, your account may not work.</p> is incorrect, your account may not work.</p>
{% endif %} {% endif %}

2
resources/views/transactions/create.twig
View File

@ -63,7 +63,7 @@
</div> </div>
<div class="box-body"> <div class="box-body">
<!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL --> <!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
{% if budgets|length > 0 %} {% if budgets|length > 1 %}
{{ ExpandedForm.select('budget_id',budgets,0) }} {{ ExpandedForm.select('budget_id',budgets,0) }}
{% else %} {% else %}
{{ ExpandedForm.select('budget_id',budgets,0, {helpText: trans('firefly.no_budget_pointer')}) }} {{ ExpandedForm.select('budget_id',budgets,0, {helpText: trans('firefly.no_budget_pointer')}) }}