+ {% block row-head %}
[[ row+1 ]]
+ {% block row-field %}
- {% include "./form_field.html" with field=field name=name value="item.data."|add:name %}
+ {% include "./form_field.html" with value="item.data."|add:name vbind=1 %}
+ {% endblock %}
[[ error ]] !
@@ -69,6 +83,8 @@ Context:
{% endif %}
{% endfor %}
-
+ {% endblock %}
+
+ {% for field in sound_form %}
+ {% with field.name as name %}
+ {% with field.initial as value %}
+ {% with field.field as field %}
+ {% if name in "episode,program" %}
+ {% include "./form_field.html" with value=value hidden=True %}
+ {% elif name != "file" %}
+
+ {{ field.label }}
+ {% include "./form_field.html" with value=value %}
+
+ {% endif %}
+ {% endwith %}
+ {% endwith %}
+ {% endwith %}
+ {% endfor %}
+
+
+{% endblock %}
diff --git a/aircox/templates/aircox/dashboard/tracklist_editor.html b/aircox/templates/aircox/dashboard/tracklist_editor.html
new file mode 100644
index 0000000..e1fcf32
--- /dev/null
+++ b/aircox/templates/aircox/dashboard/tracklist_editor.html
@@ -0,0 +1,19 @@
+{% extends "./list_editor.html" %}
+
+{% block outer %}
+ {% with tag_id="inline-tracks" %}
+ {% with tag="a-track-list-editor" %}
+ {{ block.super }}
+ {% endwith %}
+ {% endwith %}
+{% endblock %}
+
+{% block row-field %}
+
-
- {% for field in sound_form %}
- {% if field.name in "episode,program" %}
-
- {% if field|is_checkbox %}
-
-
- {% else %}
-
{{ field.label }}
-
-
- {% endif %}
-
-
{{ field.help_text }}
-
-
-
{{ block.super }}
{% translate "Sound files" %}
- {% include "./widgets/playlist_editor.html" with formset=playlist_formset %}
+ {% include "./dashboard/soundlist_editor.html" with formset=soundlist_formset %}
diff --git a/aircox/templates/aircox/widgets/form_field.html b/aircox/templates/aircox/widgets/form_field.html
deleted file mode 100644
index 7ee7454..0000000
--- a/aircox/templates/aircox/widgets/form_field.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% comment %}
-Render a form field instance as field (to be used when no model instance is provided). Value is binded as vue, class to Bulma
-
-Context:
-- name: field name
-- field: form field
-- value: input ":value" attribute
-{% endcomment %}
-{% load aircox %}
-
-{% if field|is_checkbox %}
-
- {% for value, label in field.widget.choices %}
- {{ label }}
- {% endfor %}
-
-{% else %}
-
- {{ formset.non_form_errors }}
-
-
-
-
- {% trans "Playlist" %}
-
-
-
-
-
-
-
-
-
-
-
- [[ row+1 ]]
-
-
- {% for name, field in fields.items %}
- {% if not field.widget.is_hidden and not field.is_readonly %}
- ---
-
-
-
- {% endif %}
- {% endfor %}
-
-
+
+
+
diff --git a/assets/src/components/APlaylistEditor.vue b/assets/src/components/ASoundListEditor.vue
similarity index 66%
rename from assets/src/components/APlaylistEditor.vue
rename to assets/src/components/ASoundListEditor.vue
index 1d8485b..04019eb 100644
--- a/assets/src/components/APlaylistEditor.vue
+++ b/assets/src/components/ASoundListEditor.vue
@@ -1,5 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ labels.submit }}
+
+
+
+
@@ -21,7 +45,7 @@
@@ -38,16 +62,19 @@ import Model, {Set} from '../model'
// import AActionButton from './AActionButton'
import ARows from './ARows'
-// import AModal from "./AModal"
+import AModal from "./AModal"
+import AFileUpload from "./AFileUpload"
export default {
- components: {ARows},
+ components: {ARows, AModal, AFileUpload},
props: {
initData: Object,
dataPrefix: String,
labels: Object,
settingsUrl: String,
+ soundListUrl: String,
+ soundUploadUrl: String,
columns: {
type: Array,
default: () => ['name', "type", 'is_public', 'is_downloadable']
@@ -89,6 +116,14 @@ export default {
// if(settings)
// this.settingsSaved(settings)
},
+
+ uploadDone(event) {
+ const req = event.target
+ if(req.status == 201) {
+ const item = JSON.parse(req.response)
+ this.set.push(item)
+ }
+ },
},
diff --git a/assets/src/components/ATracklistEditor.vue b/assets/src/components/ATrackListEditor.vue
similarity index 100%
rename from assets/src/components/ATracklistEditor.vue
rename to assets/src/components/ATrackListEditor.vue
diff --git a/assets/src/components/index.js b/assets/src/components/index.js
index 857a38b..2ecad53 100644
--- a/assets/src/components/index.js
+++ b/assets/src/components/index.js
@@ -12,11 +12,12 @@ import ASoundItem from './ASoundItem'
import ASwitch from './ASwitch'
import AModal from "./AModal"
+import AFileUpload from "./AFileUpload"
import ASelectFile from "./ASelectFile"
import AStatistics from './AStatistics'
import AStreamer from './AStreamer'
-import ATracklistEditor from './ATracklistEditor'
-import APlaylistEditor from './APlaylistEditor'
+import ATrackListEditor from './ATrackListEditor'
+import ASoundListEditor from './ASoundListEditor'
/**
* Core components
@@ -31,10 +32,10 @@ export default base
export const admin = {
...base,
- AStatistics, AStreamer, ATracklistEditor
+ AStatistics, AStreamer, ATrackListEditor
}
export const dashboard = {
...base,
- AActionButton, ASelectFile, AModal, ATracklistEditor, APlaylistEditor
+ AActionButton, AFileUpload, ASelectFile, AModal, ATrackListEditor, ASoundListEditor
}