New view for #3415

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

View File

@ -108,26 +108,6 @@ body.waiting * {
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 */
.rule-triggers {
cursor: move;
@ -152,7 +132,7 @@ body.waiting * {
}
.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;
}
@ -262,4 +242,4 @@ span.twitter-typeahead {
text-decoration: none;
outline: 0;
background-color: #428bca;
}
}

View File

@ -10,38 +10,37 @@
<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 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 #}
{% include('partials.favicons') %}
</head>
<body class="ff-error-page">
<div class="ff-error-box">
<div class="login-logo">
<a href="{{ route('index') }}"><b>Firefly</b>III</a>
<body class="container">
<div class="row">
<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-12 col-md-12 col-sm-12">
<h3 class="text-info">{{ 'two_factor_lost_header'|_ }}</h3>
</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">{{ 'two_factor_lost_header'|_ }}</h3>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<p>
{{ 'two_factor_lost_intro'|_ }}
</p>
<ul>
<li>
{{ 'two_factor_lost_fix_self'|_ }}
</li>
<li>
{{ trans('firefly.two_factor_lost_fix_owner', {site_owner: siteOwner})|raw }}
</li>
</ul>
</div>
<div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
<p>
{{ 'two_factor_lost_intro'|_ }}
</p>
<ul>
<li>
{{ 'two_factor_lost_fix_self'|_ }}
</li>
<li>
{{ trans('firefly.two_factor_lost_fix_owner', {site_owner: siteOwner})|raw }}
</li>
</ul>
</div>
</div>
</body>

View File

@ -3,54 +3,54 @@
<head>
<meta charset="UTF-8">
<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 content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<base href="{{ route('index') }}/">
{# CSS things #}
{# libraries #}
<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/css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# 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/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# 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') %}
</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>
<body class="container">
<div class="row">
<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 class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h3 class="text-info">404 &mdash; {{ trans('errors.404_header') }}</h3>
</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>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<p class="text-danger">
{{ trans('errors.404_page_does_not_exist') }}
</p>
<p>
{{ trans('errors.404_send_error') }}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<p>
{{ trans('errors.404_github_link')|raw }}
</p>
</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.404_page_does_not_exist') }}
</p>
<p>
{{ trans('errors.404_send_error') }}
</p>
<p>
{{ trans('errors.404_github_link')|raw }}
</p>
</div>
</div>
</body>
</html>

View File

@ -1,59 +1,97 @@
<!DOCTYPE html>
<html>
<head>
<base href="{{ route('index') }}/"/>
<style>
<meta charset="UTF-8">
<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 */
@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;
}
{# CSS things #}
body {
margin: 0;
padding: 0;
width: 100%;
height: 100%;
color: #B0BEC5;
display: table;
font-weight: 100;
font-family: 'Lato', sans-serif;
}
{# libraries #}
<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/css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
.container {
text-align: center;
display: table-cell;
vertical-align: middle;
}
{# 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/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
.content {
text-align: center;
display: inline-block;
}
{# Firefly III customisations #}
<link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
.title {
font-size: 72px;
margin-bottom: 40px;
}
{# favicons #}
{% include('partials.favicons') %}
.text {
font-size: 30px;
margin-bottom: 40px;
}
</style>
</head>
<body>
<div class="container">
<div class="content">
<div class="title">{{ trans('errors.whoops') }}</div>
<code class="text">{{ trans('errors.fatal_error') }}</code>
</div>
<body class="container">
<div class="row">
<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>
</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>
{% endif %}
</body>
</html>

View File

@ -1,55 +1,44 @@
<!DOCTYPE html>
<html>
<head>
<base href="{{ route('index') }}/"/>
<title>{{ trans('errors.maintenance_mode') }}</title>
<style>
<meta charset="UTF-8">
<meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
<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 */
@font-face {
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;
}
{# libraries #}
<link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
body {
margin: 0;
padding: 0;
width: 100%;
height: 100%;
color: #B0BEC5;
display: table;
font-family: 'Roboto', sans-serif;
}
{# 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/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
p {
color: #575e62;
font-size: 1.5em;
}
{# Firefly III customisations #}
<link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
.container {
text-align: center;
display: table-cell;
vertical-align: middle;
}
{# favicons #}
{% include('partials.favicons') %}
.content {
text-align: center;
display: inline-block;
}
.title {
font-size: 4em;
margin-bottom: 40px;
}
</style>
</head>
<body>
<div class="container">
<div class="content">
<div class="title">{{ trans('errors.be_right_back') }}</div>
<body class="container">
<div class="row">
<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.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>
{{ trans('errors.be_right_back') }}
</p>
<p class="text-danger">
{{ trans('errors.check_back') }}
</p>
</div>

View File

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<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 content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<base href="{{ route('index') }}/">
@ -20,65 +20,73 @@
<link href="v1/lib/adminlte/css/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# 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') %}
</head>
<body class="ff-error-page">
<div class="ff-error-box">
<div class="login-logo">
<a href="{{ route('index') }}"><b>Firefly</b>III</a>
<body class="container">
<div class="row">
<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 class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h3 class="text-info">{{ trans('errors.error_occurred') }}</h3>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-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-12 col-md-12 col-sm-12">
<p>
<strong>{{ trans('errors.more_info') }}</strong><br />
{{ trans('errors.collect_info')|raw }}
{{ trans('errors.collect_info_more')|raw }}
</p>
<p>
<strong>{{ trans('errors.github_help') }}</strong><br />
{{ 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 %}
</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="error-stack">
<h4>{{ trans('errors.error') }}</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 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>
<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>
{% endif %}

View File

@ -33,6 +33,7 @@
{{ ExpandedForm.date('targetdate') }}
{{ 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.objectGroup('object_group') }}#}
</div>
</div>
</div>