Make sure the /javascript/ url’s are ignored.

This commit is contained in:
James Cole
2017-02-12 16:50:35 +01:00
parent 3399b133ae
commit ec146d4cbe
10 changed files with 172 additions and 22 deletions

View File

@@ -959,4 +959,7 @@ return [
'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.',
'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the <a href="tags/show/:tag">tag that was created for this import</a>.',
// sandstorm.io errors and messages:
'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
];

View File

@@ -10,7 +10,12 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
{{ message |default('General unknown errror') }}
<p>{{ message |default('General unknown errror') }}</p>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<p><a href="{{ route('index') }}">Follow this link back to the index.</a></p>
</div>
</div>
{% endblock %}

View File

@@ -148,10 +148,11 @@
</a>
<ul class="treeview-menu">
{% if not SANDSTORM %}
<li class="{{ activeRoutePartial('profile') }}">
<a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}"><i class="fa fa-user fa-fw"></i> {{ 'profile'|_ }}</a>
</li>
{% if not SANDSTORM %}
{% endif %}
<li class="{{ activeRoutePartial('preferences') }}">
<a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}"><i class="fa fa-gear fa-fw"></i> {{ 'preferences'|_ }}</a>
@@ -173,7 +174,6 @@
<!-- other options -->
{% if not SANDSTORM %}
<li>
<a href="{{ route('logout') }}">