hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-10 15:26: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

8
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 { #offline {
display: none; display: none;

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

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

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

@ -19,4 +19,5 @@
{% endif %} {% endif %}
<span class="small font-weight-bold mt-3 d-block text-muted">{{ setting_value('streams::domain', 'openclassify.com') }}</span> <span class="small font-weight-bold mt-3 d-block text-muted">{{ setting_value('streams::domain', 'openclassify.com') }}</span>
</div> </div>
</div>
{% endblock %} {% endblock %}

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

@ -19,4 +19,5 @@
{% endif %} {% endif %}
<span class="small font-weight-bold mt-3 d-block text-muted">{{ setting_value('streams::domain', 'openclassify.com') }}</span> <span class="small font-weight-bold mt-3 d-block text-muted">{{ setting_value('streams::domain', 'openclassify.com') }}</span>
</div> </div>
</div>
{% endblock %} {% endblock %}

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

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

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

7
app/Exceptions/ExceptionHandler.php
View File

@ -80,7 +80,12 @@ class ExceptionHandler extends Handler
} }
if ($e instanceof Swift_TransportException) { 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); parent::report($e);