kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 01:06:46 +00:00
Code Issues Projects Releases Wiki Activity

New view for #3415

Browse Source
This commit is contained in:
James Cole
2020-06-05 18:40:02 +02:00
parent a77187135f
commit b75178a184
7 changed files with 227 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/v1/css/firefly.css vendored
View File

@@ -108,26 +108,6 @@ body.waiting * {
padding: 0; padding: 0;
} }
.ff-error-page {
width: 1000px;
margin: 20px auto 0 auto;
}
.ff-error-page > .error-content {
margin-left: 190px;
display: block;
}
.ff-error-page > .error-content > h3 {
font-weight: 300;
font-size: 25px;
}
.ff-error-box {
width: 460px;
margin: 7% auto;
}
/* cursors */ /* cursors */
.rule-triggers { .rule-triggers {
cursor: move; cursor: move;
@@ -152,7 +132,7 @@ body.waiting * {
} }
.loading { .loading {
background: url('/images/loading-small.gif') no-repeat center center; background: url('/v1/images/loading-small.gif') no-repeat center center;
min-height: 30px; min-height: 30px;
} }

15
resources/views/v1/auth/lost-two-factor.twig
View File

@@ -10,26 +10,26 @@
<link rel="stylesheet" href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/> <link rel="stylesheet" href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
<link rel="stylesheet" href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/> <link rel="stylesheet" href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
<link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="v1/css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# favicons #} {# favicons #}
{% include('partials.favicons') %} {% include('partials.favicons') %}
</head> </head>
<body class="ff-error-page"> <body class="container">
<div class="ff-error-box"> <div class="row">
<div class="login-logo"> <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<a href="{{ route('index') }}"><b>Firefly</b>III</a> <h1><a href="{{ route('index') }}"><b>Firefly</b>III</a></h1>
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<h3 class="text-info">{{ 'two_factor_lost_header'|_ }}</h3> <h3 class="text-info">{{ 'two_factor_lost_header'|_ }}</h3>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<p> <p>
{{ 'two_factor_lost_intro'|_ }} {{ 'two_factor_lost_intro'|_ }}
</p> </p>
@@ -43,6 +43,5 @@
</ul> </ul>
</div> </div>
</div> </div>
</div>
</body> </body>
</html> </html>

34
resources/views/v1/errors/404.twig
View File

@@ -3,54 +3,54 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir"> <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
<title>404</title> <title>Firefly III 404 :(</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <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'> <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<base href="{{ route('index') }}/"> <base href="{{ route('index') }}/">
{# CSS things #}
{# libraries #} {# libraries #}
<link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="v1/css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# the theme #} {# the theme #}
<link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="v1/lib/adminlte/css/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="v1/lib/adminlte/css/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# Firefly III customisations #} {# Firefly III customisations #}
<link href="v1/css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# favicons #}
{% include('partials.favicons') %} {% include('partials.favicons') %}
</head>
<body class="ff-error-page">
<div class="ff-error-box">
<div class="login-logo">
<a href="{{ route('index') }}"><s><b>Firefly</b>III</s> <span class="text-danger">404</span></a>
</div>
</head>
<body class="container">
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<h1><s><b>Firefly</b>III</s> 404 Not Found :(</h1>
</div>
</div>
<div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<h3 class="text-info">404 &mdash; {{ trans('errors.404_header') }}</h3> <h3 class="text-info">404 &mdash; {{ trans('errors.404_header') }}</h3>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<p class="text-danger"> <p>
{{ trans('errors.404_page_does_not_exist') }} {{ trans('errors.404_page_does_not_exist') }}
</p> </p>
<p> <p>
{{ trans('errors.404_send_error') }} {{ trans('errors.404_send_error') }}
</p> </p>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<p> <p>
{{ trans('errors.404_github_link')|raw }} {{ trans('errors.404_github_link')|raw }}
</p> </p>
</div> </div>
</div> </div>
</div>
</body> </body>
</html> </html>

124
resources/views/v1/errors/500.twig
View File

@@ -1,59 +1,97 @@
<!DOCTYPE html>
<html> <html>
<head> <head>
<base href="{{ route('index') }}/"/> <meta charset="UTF-8">
<style> <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
<title>Firefly III 500 :(</title>
<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') }}/">
/* latin */ {# CSS things #}
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 100;
src: local('Lato Hairline'), local('Lato-Hairline'), url('v1/fonts/lato-100.woff2') format('woff2'), url('v1/fonts/lato-100.woff') format('woff');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
}
body { {# libraries #}
margin: 0; <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
padding: 0; <link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
width: 100%; <link href="v1/css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
height: 100%;
color: #B0BEC5;
display: table;
font-weight: 100;
font-family: 'Lato', sans-serif;
}
.container { {# the theme #}
text-align: center; <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
display: table-cell; <link href="v1/lib/adminlte/css/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
vertical-align: middle;
}
.content { {# Firefly III customisations #}
text-align: center; <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
display: inline-block;
}
.title { {# favicons #}
font-size: 72px; {% include('partials.favicons') %}
margin-bottom: 40px;
}
.text {
font-size: 30px;
margin-bottom: 40px;
}
</style>
</head> </head>
<body> <body class="container">
<div class="container"> <div class="row">
<div class="content"> <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<div class="title">{{ trans('errors.whoops') }}</div> <h1><a href="{{ route('index') }}"><b>Firefly</b>III</a></h1>
<code class="text">{{ trans('errors.fatal_error') }}</code> </div>
</div>
<div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<h3 class="text-info">{{ trans('errors.error_occurred') }}</h3>
</div>
</div>
<div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<p>
{{ trans('errors.error_not_recoverable') }}
</p>
<p class="text-danger">
{{ exception.getMessage |default('General unknown errror') }}
</p>
</div>
</div>
{% if not debug %}
<div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<h4>
{{ trans('errors.more_info') }}
</h4>
<p>
{{ trans('errors.collect_info')|raw }}
{{ trans('errors.collect_info_more')|raw }}
</p>
<h4>
{{ trans('errors.github_help') }}
</h4>
<p>
{{ trans('errors.github_instructions')|raw }}
</p>
<ol>
<li>{{ trans('errors.use_search') }}</li>
<li>{{ trans('errors.include_info', { link: route('debug') })|raw }}</li>
<li>{{ trans('errors.tell_more') }}</li>
<li>{{ trans('errors.include_logs') }}</li>
<li>{{ trans('errors.what_did_you_do') }}</li>
</ol>
</div>
</div>
{% endif %}
{% if debug %}
<div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<h4></h4>
<p>
{{ trans('errors.error_location', {file: exception.getFile, line: exception.getLine, code: exception.getCode })|raw }}
</p>
<h4>
{{ trans('errors.stacktrace') }}
</h4>
<div style="font-family: monospace;font-size:11px;">
{{ exception.getTraceAsString|nl2br }}
</div> </div>
</div> </div>
</div> </div>
{% endif %}
</body> </body>
</html> </html>

75
resources/views/v1/errors/503.twig
View File

@@ -1,55 +1,44 @@
<!DOCTYPE html>
<html> <html>
<head> <head>
<base href="{{ route('index') }}/"/> <meta charset="UTF-8">
<title>{{ trans('errors.maintenance_mode') }}</title> <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
<style> <title>Firefly III Maintenance Mode</title>
<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') }}/">
/* latin */ {# libraries #}
@font-face { <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: local('Roboto Light'), local('Roboto-Light'), url('fonts/roboto-light-300.woff2') format('woff2'), url('fonts/roboto-light-300.woff') format('woff');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
}
body { {# the theme #}
margin: 0; <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
padding: 0; <link href="v1/lib/adminlte/css/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
width: 100%;
height: 100%;
color: #B0BEC5;
display: table;
font-family: 'Roboto', sans-serif;
}
p { {# Firefly III customisations #}
color: #575e62; <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
font-size: 1.5em;
}
.container { {# favicons #}
text-align: center; {% include('partials.favicons') %}
display: table-cell;
vertical-align: middle;
}
.content {
text-align: center;
display: inline-block;
}
.title {
font-size: 4em;
margin-bottom: 40px;
}
</style>
</head> </head>
<body> <body class="container">
<div class="container"> <div class="row">
<div class="content"> <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<div class="title">{{ trans('errors.be_right_back') }}</div> <h1><a href="{{ route('index') }}"><b>Firefly</b>III</a></h1>
</div>
</div>
<div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<h3 class="text-info">{{ trans('errors.maintenance_mode') }}</h3>
</div>
</div>
<div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<p> <p>
{{ trans('errors.be_right_back') }}
</p>
<p class="text-danger">
{{ trans('errors.check_back') }} {{ trans('errors.check_back') }}
</p> </p>
</div> </div>

44
resources/views/v1/errors/FireflyException.twig
View File

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir"> <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
<title>Firefly III</title> <title>Firefly III Exception :(</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <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'> <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<base href="{{ route('index') }}/"> <base href="{{ route('index') }}/">
@@ -20,26 +20,25 @@
<link href="v1/lib/adminlte/css/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="v1/lib/adminlte/css/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# Firefly III customisations #} {# Firefly III customisations #}
<link href="v1/css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# favicons #} {# favicons #}
{% include('partials.favicons') %} {% include('partials.favicons') %}
</head> </head>
<body class="ff-error-page"> <body class="container">
<div class="ff-error-box">
<div class="login-logo">
<a href="{{ route('index') }}"><b>Firefly</b>III</a>
</div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<h1><a href="{{ route('index') }}"><b>Firefly</b>III</a></h1>
</div>
</div>
<div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<h3 class="text-info">{{ trans('errors.error_occurred') }}</h3> <h3 class="text-info">{{ trans('errors.error_occurred') }}</h3>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<p> <p>
{{ trans('errors.error_not_recoverable') }} {{ trans('errors.error_not_recoverable') }}
</p> </p>
@@ -50,14 +49,18 @@
</div> </div>
{% if not debug %} {% if not debug %}
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<h4>
{{ trans('errors.more_info') }}
</h4>
<p> <p>
<strong>{{ trans('errors.more_info') }}</strong><br />
{{ trans('errors.collect_info')|raw }} {{ trans('errors.collect_info')|raw }}
{{ trans('errors.collect_info_more')|raw }} {{ trans('errors.collect_info_more')|raw }}
</p> </p>
<h4>
{{ trans('errors.github_help') }}
</h4>
<p> <p>
<strong>{{ trans('errors.github_help') }}</strong><br />
{{ trans('errors.github_instructions')|raw }} {{ trans('errors.github_instructions')|raw }}
</p> </p>
<ol> <ol>
@@ -70,17 +73,22 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
</div>
{% if debug %} {% if debug %}
<div class="error-stack"> <div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<h4>{{ trans('errors.error') }}</h4> <h4>{{ trans('errors.error') }}</h4>
<p>{{ trans('errors.error_location', {file: exception.getFile, line: exception.getLine, code: exception.getCode })|raw }}</p> <p>
<h4>{{ trans('errors.stacktrace') }}</h4> {{ trans('errors.error_location', {file: exception.getFile, line: exception.getLine, code: exception.getCode })|raw }}
</p>
<h4>
{{ trans('errors.stacktrace') }}
</h4>
<div style="font-family: monospace;font-size:11px;"> <div style="font-family: monospace;font-size:11px;">
{{ exception.getTraceAsString|nl2br }} {{ exception.getTraceAsString|nl2br }}
</div> </div>
</div> </div>
</div>
{% endif %} {% endif %}
</body> </body>

1
resources/views/v1/piggy-banks/create.twig
View File

@@ -33,6 +33,7 @@
{{ ExpandedForm.date('targetdate') }} {{ ExpandedForm.date('targetdate') }}
{{ ExpandedForm.textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')} ) }} {{ ExpandedForm.textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')} ) }}
{{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
{#{{ ExpandedForm.objectGroup('object_group') }}#}
</div> </div>
</div> </div>
</div> </div>