Add generated js / css to all views.

This commit is contained in:
James Cole 2018-02-06 07:51:49 +01:00
parent 6b38faf84e
commit 31884bbba6
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 8 additions and 12 deletions

View File

@ -156,14 +156,14 @@
</div>
</div>
</div>
<script src="js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="js/lib/moment.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}" type="text/javascript"></script>
<script src="js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="js/lib/daterangepicker.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="lib/adminlte/js/app.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script type="text/javascript" src="js/lib/accounting.min.js?v={{ FF_VERSION }}"></script>
<script src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}"
type="text/javascript"></script>
<script type="text/javascript" src="js/ff/firefly.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript">
var helpPageTitle = "{{ trans('firefly.help_for_this_page')|escape('js') }}";

View File

@ -7,8 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<base href="{{ route('index') }}/">
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
<link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
<link href="css/app.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<!--[if lt IE 9]>
@ -27,9 +26,8 @@
</div>
{% block content %}{% endblock %}
</div>
<script type="text/javascript" src="js/lib/jquery-3.2.1.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script>
<script src="js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
{% if env('ANALYTICS_ID','') != '' %}
<script>
// send pageview

View File

@ -16,8 +16,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<base href="{{ route('index') }}/">
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
<link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
<link href="css/app.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
@ -37,8 +36,7 @@
</div>
{% block content %}{% endblock %}
</div>
<script type="text/javascript" src="js/lib/jquery-3.2.1.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script>
<script src="js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script type="text/javascript" src="js/ff/guest.js?v={{ FF_VERSION }}"></script>
{% if env('ANALYTICS_ID','') != '' %}