Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-15 17:56:07 +01:00
Code Issues Packages Projects Releases Activity

A better update success message. Update the version in the footer.

Browse Source
This commit is contained in:
Flavio Copes
2015-08-06 17:23:08 +02:00
parent 66764b2255
commit 7b705d3595
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
classes/controller.php
View File

@@ -703,19 +703,11 @@ class AdminController
$result = \Grav\Plugin\Admin\Gpm::selfupgrade(); $result = \Grav\Plugin\Admin\Gpm::selfupgrade();
if ($result) { if ($result) {
$this->admin->json_response = ['status' => 'success', 'message' => 'Everything updated']; $this->admin->json_response = ['status' => 'success', 'message' => 'Grav was successfully updated to '];
} else { } else {
$this->admin->json_response = ['status' => 'error', 'message' => 'Updates failed']; $this->admin->json_response = ['status' => 'error', 'message' => 'Grav update failed'];
} }
if ($result) {
$this->admin->setMessage("Installation successful.", 'info');
} else {
$this->admin->setMessage("Installation failed.", 'error');
}
//$this->post = array('_redirect' => $this->view . '/' . $this->route);
return true; return true;
} }

11
themes/grav/js/admin-all.js
View File

@@ -122,10 +122,16 @@ $(function () {
url: url, url: url,
toastErrors: true, toastErrors: true,
success: function(result, status) { success: function(result, status) {
toastr.success(result.message);
if (url.indexOf('task:updategrav') !== -1) { if (url.indexOf('task:updategrav') !== -1) {
if (result.status == 'success') {
$('[data-gpm-grav]').remove(); $('[data-gpm-grav]').remove();
toastr.success(result.message + window.grav_available_version);
$('#footer .grav-version').html(window.grav_available_version);
} else {
toastr.success(result.message);
}
} else {
toastr.success(result.message);
} }
} }
}).always(function() { }).always(function() {
@@ -231,6 +237,7 @@ $(function () {
content = jQuery.substitute(content, {available: grav.available, version: grav.version}); content = jQuery.substitute(content, {available: grav.available, version: grav.version});
$('[data-gpm-grav]').addClass('grav').html('<p>' + icon + content + button + '</p>'); $('[data-gpm-grav]').addClass('grav').html('<p>' + icon + content + button + '</p>');
window.grav_available_version = grav.available;
} }
$('#grav-update-button').on('click', function() { $('#grav-update-button').on('click', function() {

2
themes/grav/templates/partials/base.html.twig
View File

@@ -90,7 +90,7 @@
{% block content_bottom %}{% endblock %} {% block content_bottom %}{% endblock %}
</div> </div>
<footer id="footer"> <footer id="footer">
<a href="http://getgrav.org">Grav</a> version {{ constant('GRAV_VERSION') }} was made with <i class="fa fa-heart"></i> by <a href="http:/www.rockettheme.com">RocketTheme</a>. <a href="http://getgrav.org">Grav</a> version <span class="grav-version">{{ constant('GRAV_VERSION') }}</span> was made with <i class="fa fa-heart"></i> by <a href="http:/www.rockettheme.com">RocketTheme</a>.
</footer> </footer>
</div> </div>