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

Merge branch 'develop' of https://github.com/getgrav/grav-plugin-admin into develop

Browse Source
This commit is contained in:
Andy Miller
2016-09-30 08:58:46 -06:00
parent 1ea0a54903 82dcf37f0c
commit 5d3b2dd38f
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -13,6 +13,7 @@
* Fix [#773](https://github.com/getgrav/grav-plugin-admin/issues/773) allow filepicker work inside lists, respond to mutation event
* Better error handling for Feed when unable to connect
* Fixed UI for Pagemedia note when files cannot yet be uploaded ([#798](https://github.com/getgrav/grav-plugin-admin/issues/798))
* Fixed Submit buttons getting disabled in case of form invalidity disallowing to submit again ([#802](https://github.com/getgrav/grav-plugin-admin/issues/802))
# v1.2.2
## 09/08/2016

6
admin.yaml
View File

@@ -5,9 +5,9 @@ theme: grav
logo_text: ''
body_classes: ''
sidebar:
activate: tab
hover_delay: 100
size: auto
activate: tab
hover_delay: 100
size: auto
dashboard:
days_of_stats: 7
widgets:

4
themes/grav/app/forms/form.js
View File

@@ -105,7 +105,10 @@ export default class Form {
// workaround for MS Edge, submitting multiple forms at the same time
if (submitted) { return false; }
let formId = form.attr('id');
let unchecked = form.find('input[type="checkbox"]:not(:checked):not(:disabled)');
let submit = form.find('[type="submit"]').add(`[form="${formId}"][type="submit"]`);
if (!unchecked.length) { return true; }
unchecked.each((index, element) => {
@@ -115,6 +118,7 @@ export default class Form {
form.append(fake);
});
submit.addClass('pointer-events-disabled').attr('disabled', 'disabled');
submitted = true;
return true;
});

4
themes/grav/js/admin.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
themes/grav/templates/pages.html.twig
View File

@@ -167,7 +167,7 @@
{% endif %}
<div class="button-group">
<button class="button disable-after-click" name="task" value="save" form="blueprints" type="submit"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN.SAVE"|tu }}</button>
<button class="button" name="task" value="save" form="blueprints" type="submit"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN.SAVE"|tu }}</button>
{% if exists and admin.multilang %}
{% if context.untranslatedLanguages %}
<button type="button" class="button dropdown-toggle" data-toggle="dropdown">
@@ -177,7 +177,7 @@
{% for langCode in context.untranslatedLanguages %}
{% set langName = admin.siteLanguages[langCode] %}
{% if langCode != page_lang %}
<li><button class="button disable-after-click task" name="task" value="saveas" lang="{{langCode}}" form="blueprints" type="submit">{{ "PLUGIN_ADMIN.SAVE_AS"|tu }} {{ langName[:1]|upper ~ langName[1:] }}</button>
<li><button class="button task" name="task" value="saveas" lang="{{langCode}}" form="blueprints" type="submit">{{ "PLUGIN_ADMIN.SAVE_AS"|tu }} {{ langName[:1]|upper ~ langName[1:] }}</button>
{% endif %}
{% endfor %}
</ul>