forked from enviPath/enviPy
[Feature] Modern UI roll out (#236)
This PR moves all the collection pages into the new UI in a rough push. I did not put the same amount of care into these as into search, index, and predict. ## Major changes - All modals are now migrated to a state based alpine.js implementation. - jQuery is no longer present in the base layout; ajax is replace by native fetch api - most of the pps.js is now obsolte (as I understand it; the code is not referenced any more @jebus please double check) - in-memory pagination for large result lists (set to 50; we can make that configurable later; performance degrades at around 1k) stukk a bit rough tracked in #235 ## Minor things - Sarch and index also use alpine now - The loading spinner is now CSS animated (not sure if it currently gets correctly called) ## Not done - Ihave not even cheked the admin pages. Not sure If these need migrations - The temporary migration pages still use the old template. Not sure what is supposed to happen with those? @jebus ## What I did to test - opend all pages in browse, and user ; plus all pages reachable from there. - Interacted and tested the functionality of each modal superfically with exception of the API key modal (no functional test). --- This PR is massive sorry for that; just did not want to push half-brokenn state. @jebus @liambrydon I would be glad if you could click around and try to break it :) Finally closes #133 Co-authored-by: Tim Lorsbach <tim@lorsba.ch> Reviewed-on: enviPath/enviPy#236 Co-authored-by: Tobias O <tobias.olenyi@envipath.com> Co-committed-by: Tobias O <tobias.olenyi@envipath.com>
This commit is contained in:
@ -1,198 +1,193 @@
|
||||
<div
|
||||
class="modal fade"
|
||||
tabindex="-1"
|
||||
<dialog
|
||||
id="set_license_modal"
|
||||
role="dialog"
|
||||
aria-labelledby="set_license_modal"
|
||||
aria-hidden="true"
|
||||
class="modal"
|
||||
x-data="{
|
||||
isSubmitting: false,
|
||||
licenseType: '',
|
||||
ccRemix: false,
|
||||
ccNoCom: false,
|
||||
ccAlike: false,
|
||||
|
||||
reset() {
|
||||
this.isSubmitting = false;
|
||||
this.licenseType = '';
|
||||
this.ccRemix = false;
|
||||
this.ccNoCom = false;
|
||||
this.ccAlike = false;
|
||||
},
|
||||
|
||||
get licenseString() {
|
||||
if (this.licenseType !== 'cc') return 'no-license';
|
||||
|
||||
let str = 'by';
|
||||
if (this.ccNoCom) str += '-nc';
|
||||
if (!this.ccRemix) {
|
||||
str += '-nd';
|
||||
} else if (this.ccAlike) {
|
||||
str += '-sa';
|
||||
}
|
||||
return str;
|
||||
},
|
||||
|
||||
get licenseUrl() {
|
||||
if (this.licenseType !== 'cc') return '';
|
||||
return 'https://creativecommons.org/licenses/' + this.licenseString + '/4.0/';
|
||||
},
|
||||
|
||||
get licenseImageUrl() {
|
||||
if (this.licenseType !== 'cc') return '';
|
||||
return 'https://licensebuttons.net/l/' + this.licenseString + '/4.0/88x31.png';
|
||||
},
|
||||
|
||||
submit(formId) {
|
||||
const form = document.getElementById(formId);
|
||||
document.getElementById('license').value = this.licenseString;
|
||||
if (form && form.checkValidity()) {
|
||||
this.isSubmitting = true;
|
||||
form.submit();
|
||||
} else if (form) {
|
||||
form.reportValidity();
|
||||
}
|
||||
}
|
||||
}"
|
||||
@close="reset()"
|
||||
>
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal">
|
||||
<span aria-hidden="true">×</span>
|
||||
<span class="sr-only">Close</span>
|
||||
</button>
|
||||
<h3 class="modal-title">Set License</h3>
|
||||
<div class="modal-box">
|
||||
<!-- Header -->
|
||||
<h3 class="text-lg font-bold">Set License</h3>
|
||||
|
||||
<!-- Close button (X) -->
|
||||
<form method="dialog">
|
||||
<button
|
||||
class="btn btn-sm btn-circle btn-ghost absolute top-2 right-2"
|
||||
:disabled="isSubmitting"
|
||||
>
|
||||
✕
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<!-- Body -->
|
||||
<div class="py-4">
|
||||
<div class="flex gap-4 mb-4">
|
||||
<div class="flex-1">
|
||||
<p>
|
||||
Set the license for all data in this package:
|
||||
<br /><br />
|
||||
(For more information please visit our
|
||||
<a
|
||||
target="_blank"
|
||||
href="https://wiki.envipath.org/index.php/License"
|
||||
class="link link-primary"
|
||||
>wiki</a
|
||||
>.)
|
||||
</p>
|
||||
</div>
|
||||
<div class="flex-none" x-show="licenseType === 'cc'" x-cloak>
|
||||
<a :href="licenseUrl" target="_blank">
|
||||
<img :src="licenseImageUrl" alt="CC License" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<p>
|
||||
Set the license for all data in this package:
|
||||
<br />
|
||||
<br />
|
||||
(For more information please visit our
|
||||
<a target="#" href="https://wiki.envipath.org/index.php/License"
|
||||
>wiki</a
|
||||
>.)
|
||||
</p>
|
||||
<form
|
||||
id="set_license_form"
|
||||
accept-charset="UTF-8"
|
||||
action=""
|
||||
method="post"
|
||||
>
|
||||
{% csrf_token %}
|
||||
|
||||
<div class="form-control">
|
||||
<label class="label cursor-pointer justify-start gap-3">
|
||||
<input
|
||||
type="radio"
|
||||
name="optlicense"
|
||||
class="radio"
|
||||
value="cc"
|
||||
x-model="licenseType"
|
||||
/>
|
||||
<span class="label-text">Creative commons license</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="ml-8 space-y-2" x-show="licenseType === 'cc'" x-cloak>
|
||||
<div class="form-control">
|
||||
<label class="label cursor-pointer justify-start gap-3">
|
||||
<input type="checkbox" class="checkbox" x-model="ccRemix" />
|
||||
<span class="label-text"
|
||||
>Allow adaptations of your work to be shared</span
|
||||
>
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div id="ccfig"></div>
|
||||
|
||||
<div class="form-control">
|
||||
<label class="label cursor-pointer justify-start gap-3">
|
||||
<input type="checkbox" class="checkbox" x-model="ccNoCom" />
|
||||
<span class="label-text">Prohibit commercial use</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="form-control">
|
||||
<label class="label cursor-pointer justify-start gap-3">
|
||||
<input
|
||||
type="checkbox"
|
||||
class="checkbox"
|
||||
x-model="ccAlike"
|
||||
:disabled="!ccRemix"
|
||||
/>
|
||||
<span class="label-text">Share only if others share alike</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<form
|
||||
id="set_license_form"
|
||||
accept-charset="UTF-8"
|
||||
action=""
|
||||
data-remote="true"
|
||||
method="post"
|
||||
>
|
||||
{% csrf_token %}
|
||||
<div class="input-group">
|
||||
<div class="radio">
|
||||
<label
|
||||
><input
|
||||
type="radio"
|
||||
name="optlicense"
|
||||
onclick="cc()"
|
||||
id="ccradio"
|
||||
/>Creative commons license</label
|
||||
>
|
||||
</div>
|
||||
<div>
|
||||
<div class="checkbox">
|
||||
<label
|
||||
><input
|
||||
type="checkbox"
|
||||
value=""
|
||||
onclick="cc()"
|
||||
id="ccremix"
|
||||
disabled
|
||||
/>Allow adaptations of your work to be shared</label
|
||||
>
|
||||
</div>
|
||||
<div class="checkbox">
|
||||
<label
|
||||
><input
|
||||
type="checkbox"
|
||||
value=""
|
||||
onclick="cc()"
|
||||
id="ccnocom"
|
||||
disabled
|
||||
/>Prohibit commercial use</label
|
||||
>
|
||||
</div>
|
||||
<div class="checkbox">
|
||||
<label
|
||||
><input
|
||||
type="checkbox"
|
||||
value=""
|
||||
onclick="cc()"
|
||||
id="ccalike"
|
||||
disabled
|
||||
/>Share only if others share alike</label
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<div class="radio">
|
||||
<label
|
||||
><input
|
||||
type="radio"
|
||||
name="optlicense"
|
||||
onclick="cc()"
|
||||
id="noccradio"
|
||||
/>No creative commons license, contact package owner for license
|
||||
information</label
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<input type="hidden" id="license" name="license" />
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button id="set_license_form_submit" class="btn btn-primary">
|
||||
Submit
|
||||
</button>
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="form-control mt-2">
|
||||
<label class="label cursor-pointer justify-start gap-3">
|
||||
<input
|
||||
type="radio"
|
||||
name="optlicense"
|
||||
class="radio"
|
||||
value="nocc"
|
||||
x-model="licenseType"
|
||||
/>
|
||||
<span class="label-text"
|
||||
>No creative commons license, contact package owner for license
|
||||
information</span
|
||||
>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<input type="hidden" id="license" name="license" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- Footer -->
|
||||
<div class="modal-action">
|
||||
<button
|
||||
type="button"
|
||||
class="btn"
|
||||
onclick="this.closest('dialog').close()"
|
||||
:disabled="isSubmitting"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-primary"
|
||||
@click="submit('set_license_form')"
|
||||
:disabled="isSubmitting || !licenseType"
|
||||
>
|
||||
<span x-show="!isSubmitting">Submit</span>
|
||||
<span
|
||||
x-show="isSubmitting"
|
||||
class="loading loading-spinner loading-sm"
|
||||
></span>
|
||||
<span x-show="isSubmitting">Submitting...</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
function ccstring(ccremix, ccnocom, ccalike) {
|
||||
var ccstring = "by";
|
||||
|
||||
if (ccnocom) {
|
||||
ccstring += "-nc";
|
||||
}
|
||||
|
||||
if (!ccremix) {
|
||||
ccstring += "-nd";
|
||||
} else {
|
||||
if (ccalike) {
|
||||
ccstring += "-sa";
|
||||
}
|
||||
}
|
||||
return ccstring;
|
||||
}
|
||||
|
||||
function cc() {
|
||||
var nocc = $("#noccradio").prop("checked");
|
||||
var iscc = $("#ccradio").prop("checked");
|
||||
|
||||
if (nocc) {
|
||||
$("#ccradio").prop("checked", false);
|
||||
$("#ccremix").prop("checked", false);
|
||||
$("#ccnocom").prop("checked", false);
|
||||
$("#ccalike").prop("checked", false);
|
||||
|
||||
$("#ccremix").prop("disabled", true);
|
||||
$("#ccnocom").prop("disabled", true);
|
||||
$("#ccalike").prop("disabled", true);
|
||||
} else if (iscc) {
|
||||
$("#ccremix").prop("disabled", false);
|
||||
$("#ccnocom").prop("disabled", false);
|
||||
|
||||
if ($("#ccremix").prop("checked")) {
|
||||
$("#ccalike").prop("disabled", false);
|
||||
} else {
|
||||
$("#ccalike").prop("disabled", true);
|
||||
}
|
||||
}
|
||||
|
||||
var remix = $("#ccremix").prop("checked");
|
||||
var nocom = $("#ccnocom").prop("checked");
|
||||
var alike = $("#ccalike").prop("checked");
|
||||
|
||||
if (nocc) {
|
||||
$("#set_license_form_submit").prop("disabled", false);
|
||||
$("#ccfig").empty();
|
||||
$("#license").val("no-license");
|
||||
} else if (iscc) {
|
||||
$("#set_license_form_submit").prop("disabled", false);
|
||||
$("#ccfig").empty();
|
||||
var ccstr = ccstring(remix, nocom, alike);
|
||||
|
||||
var link = `https://creativecommons.org/licenses/${ccstr}/4.0/`;
|
||||
var imageLink = `https://licensebuttons.net/l/${ccstr}/4.0/88x31.png`;
|
||||
|
||||
var img_tpl = `<a href='${link}' target="_blank">
|
||||
<img src='${imageLink}'>
|
||||
</a>`;
|
||||
|
||||
$("#ccfig").append(img_tpl);
|
||||
$("#license").val(ccstr);
|
||||
} else {
|
||||
$("#ccfig").empty();
|
||||
$("#set_license_form_submit").prop("disabled", true);
|
||||
$("#license").val("no-license");
|
||||
}
|
||||
}
|
||||
|
||||
$(function () {
|
||||
// Disable by default as nothing is selected
|
||||
|
||||
cc();
|
||||
$("#set_license_form_submit").prop("disabled", true);
|
||||
|
||||
$("#set_license_form_submit").on("click", function (e) {
|
||||
e.preventDefault();
|
||||
$("#set_license_form").submit();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<!-- Backdrop -->
|
||||
<form method="dialog" class="modal-backdrop">
|
||||
<button :disabled="isSubmitting">close</button>
|
||||
</form>
|
||||
</dialog>
|
||||
|
||||
Reference in New Issue
Block a user