hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1201 from openclassify/dia

Browse Source 
Dia
This commit is contained in:
Muammer Top 2021-10-19 14:26:42 +03:00 committed by GitHub
commit ac56dcd8f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/default/visiosoft/base-theme/resources/css/offline.scss
View File

@ -1,3 +1,11 @@
.offline-hide {
display: none !important;
}
.offline-show {
display: block !important;
}
#offline {
display: none;
@ -17,7 +25,7 @@
p {
color: #7B7B90;
}
button {
background-color: #ebeeff;
color: #007eff;
@ -34,4 +42,4 @@
}
}
}
}
}

4
addons/default/visiosoft/base-theme/resources/js/offline.js
View File

@ -1,7 +1,7 @@
/* Offline */
window.addEventListener('offline', () => {
$('body > *').hide();
$('#offline').show();
$('body > *').addClass('offline-hide');
$('#offline').addClass('offline-show');
});
$('#offline button').click(function () {

23
addons/default/visiosoft/base-theme/resources/views/errors/403.twig
View File

@ -6,17 +6,18 @@
{% block content %}
<div class="container h-100 align-items-center d-flex">
<div class="col-12 bg-white shadow p-5 rounded text-center">
<img src="{{ img('visiosoft.theme.base::images/errors/403.png').url }}" class="w-100 error-image" alt="403">
<div class="col-12 bg-white shadow p-5 rounded text-center">
<img src="{{ img('visiosoft.theme.base::images/errors/403.png').url }}" class="w-100 error-image" alt="403">
<h3 class="h3 mb-3 font-weight-bold">{{ trans('visiosoft.theme.base::errors.403_title') }}</h3>
<h5 class="h5 mb-3 font-weight-bold color-error-message">{{ trans('visiosoft.theme.base::errors.403_message') }}</h5>
<div class="py-4">
<a class="error-btn-home rounded px-3 py-2" href="{{ url('/') }}"> {{ trans('visiosoft.theme.base::errors.home_page') }}</a>
<h3 class="h3 mb-3 font-weight-bold">{{ trans('visiosoft.theme.base::errors.403_title') }}</h3>
<h5 class="h5 mb-3 font-weight-bold color-error-message">{{ trans('visiosoft.theme.base::errors.403_message') }}</h5>
<div class="py-4">
<a class="error-btn-home rounded px-3 py-2" href="{{ url('/') }}"> {{ trans('visiosoft.theme.base::errors.home_page') }}</a>
</div>
{% if auth_check() %}
<a class="text-white bg-dark border rounded px-3 py-2" href="{{ url('/') }}">{{ trans('visiosoft.theme.base::field.logout.name') }}</a>
{% endif %}
<span class="small font-weight-bold mt-3 d-block text-muted">{{ setting_value('streams::domain', 'openclassify.com') }}</span>
</div>
{% if auth_check() %}
<a class="text-white bg-dark border rounded px-3 py-2" href="{{ url('/') }}">{{ trans('visiosoft.theme.base::field.logout.name') }}</a>
{% endif %}
<span class="small font-weight-bold mt-3 d-block text-muted">{{ setting_value('streams::domain', 'openclassify.com') }}</span>
</div>
{% endblock %}
{% endblock %}

23
addons/default/visiosoft/base-theme/resources/views/errors/404.twig
View File

@ -6,17 +6,18 @@
{% block content %}
<div class="container h-100 align-items-center d-flex">
<div class="col-12 bg-white shadow p-5 rounded text-center">
<img src="{{ img('visiosoft.theme.base::images/errors/404.png').url }}" class="w-100 error-image" alt="404">
<div class="col-12 bg-white shadow p-5 rounded text-center">
<img src="{{ img('visiosoft.theme.base::images/errors/404.png').url }}" class="w-100 error-image" alt="404">
<h3 class="h3 mb-3 font-weight-bold">{{ trans('visiosoft.theme.base::errors.404_title') }}</h3>
<h5 class="h5 mb-3 font-weight-bold color-error-message">{{ trans('visiosoft.theme.base::errors.404_message') }}</h5>
<div class="py-4">
<a class="error-btn-home rounded px-3 py-2" href="{{ url('/') }}"> {{ trans('visiosoft.theme.base::errors.home_page') }}</a>
<h3 class="h3 mb-3 font-weight-bold">{{ trans('visiosoft.theme.base::errors.404_title') }}</h3>
<h5 class="h5 mb-3 font-weight-bold color-error-message">{{ trans('visiosoft.theme.base::errors.404_message') }}</h5>
<div class="py-4">
<a class="error-btn-home rounded px-3 py-2" href="{{ url('/') }}"> {{ trans('visiosoft.theme.base::errors.home_page') }}</a>
</div>
{% if auth_check() %}
<a class="text-white bg-dark border rounded px-3 py-2" href="{{ url('/') }}">{{ trans('visiosoft.theme.base::field.logout.name') }}</a>
{% endif %}
<span class="small font-weight-bold mt-3 d-block text-muted">{{ setting_value('streams::domain', 'openclassify.com') }}</span>
</div>
{% if auth_check() %}
<a class="text-white bg-dark border rounded px-3 py-2" href="{{ url('/') }}">{{ trans('visiosoft.theme.base::field.logout.name') }}</a>
{% endif %}
<span class="small font-weight-bold mt-3 d-block text-muted">{{ setting_value('streams::domain', 'openclassify.com') }}</span>
</div>
{% endblock %}
{% endblock %}

3
addons/default/visiosoft/base-theme/resources/views/layouts/error.twig
View File

@ -20,7 +20,8 @@
{% block content %}{% endblock %}
{% include "visiosoft.theme.base::partials/offline" %}
{% include "visiosoft.theme.base::partials/assets" %}
</body>
</html>
</html>

4
addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
View File

@ -19,8 +19,6 @@
{{ asset_add("theme.css", "visiosoft.theme.base::css/select2.css") }}
{{ asset_add("theme.css", "visiosoft.theme.base::css/font-awesome.min.css") }}
{{ asset_add("theme.css", "visiosoft.theme.base::css/intlTelInput.css") }}
{{ asset_add("theme.css", "visiosoft.theme.base::css/offline.scss") }}
<script src="{{ asset_path('visiosoft.theme.base::js/vendor/jquery.min.js') }}"></script>
{{ asset_script('visiosoft.theme.base::js/visiosoft.js') }}
@ -33,6 +31,8 @@
{% for style in asset_inlines("custom-theme.css", ["min"]) %}
{{ style|raw }}
{% endfor %}
{{ asset_inline("visiosoft.theme.base::css/offline.scss") }}
</style>
{# Important!! #}

7
app/Exceptions/ExceptionHandler.php
View File

@ -80,7 +80,12 @@ class ExceptionHandler extends Handler
}
if ($e instanceof Swift_TransportException) {
die(trans('visiosoft.theme.base::message.error_mail'));
echo json_encode([
'success' => false,
'msg' => trans('visiosoft.theme.base::message.error_mail'),
]);
die();
}
parent::report($e);