diff --git a/maloja/web/jinja/partials/scrobbles.jinja b/maloja/web/jinja/partials/scrobbles.jinja
index baeac8a..38777a8 100644
--- a/maloja/web/jinja/partials/scrobbles.jinja
+++ b/maloja/web/jinja/partials/scrobbles.jinja
@@ -17,34 +17,32 @@
{{ entityrow.row(s.track) }}
{% if adminmode %}
-
-
-
-
+ |
+
+
+
+
+
+
+
+
+ {% include 'icons/reparse.jinja' %}
+
+
-
-
-
+
- |
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+ {% include 'icons/delete.jinja' %}
+
+
|
diff --git a/maloja/web/static/css/maloja.css b/maloja/web/static/css/maloja.css
index fd93273..af19960 100644
--- a/maloja/web/static/css/maloja.css
+++ b/maloja/web/static/css/maloja.css
@@ -615,35 +615,50 @@ table.list td.searchProvider:hover {
color: gold;
}
-table.list td.delete_area {
+table.list td.scrobble_action_area {
text-align: right;
- width:0em;
+ width:2em;
+ overflow:visible;
}
-table.list td.delete_area.active {
- width:7em;
+table.list tr td.scrobble_action_area span.scrobble_action_type {
+ display:inline-block;
+ float:right;
+}
+
+table.list td.scrobble_action_area span.scrobble_action_type.active {
}
/* rows that can be deleted in some form
'active' class on the delete area cell to toggle confirm prompt
'removed' class on the whole row to delete
*/
-table.list tr td.delete_area span.confirmactions {
+table.list tr td.scrobble_action_area span.scrobble_action_type span.confirmactions {
display: none;
}
-table.list tr td.delete_area span.initializeactions {
+table.list tr td.scrobble_action_area span.scrobble_action_type span.initializeactions {
display: initial;
}
-table.list tr td.delete_area.active span.confirmactions {
+
+/* when other action is active, hide all */
+table.list tr td.scrobble_action_area.active span.scrobble_action_type span.initializeactions {
+ display: none;
+}
+table.list tr td.scrobble_action_area.active span.scrobble_action_type span.initializeactions {
+ display: none;
+}
+/* except this one itself is active */
+table.list tr td.scrobble_action_area.active span.scrobble_action_type.active span.confirmactions {
display: initial;
}
-table.list tr td.delete_area.active span.initializeactions {
+table.list tr td.scrobble_action_area.active span.scrobble_action_type.active span.initializeactions {
display: none;
}
-table.list tr.removed td.delete_area span.confirmactions {
+
+table.list tr.removed td.scrobble_action_area span.scrobble_action_type span.confirmactions {
display: none;
}
-table.list tr.removed td.delete_area span.initializeactions {
+table.list tr.removed td.scrobble_action_area span.scrobble_action_type span.initializeactions {
display: none;
}
table.list tr.removed {
diff --git a/maloja/web/static/js/edit.js b/maloja/web/static/js/edit.js
index 6111922..78e4b47 100644
--- a/maloja/web/static/js/edit.js
+++ b/maloja/web/static/js/edit.js
@@ -13,6 +13,7 @@ function selectAll(e) {
// DELETION
function toggleDeleteConfirm(element) {
element.parentElement.parentElement.classList.toggle('active');
+ element.parentElement.parentElement.parentElement.classList.toggle('active');
}
function deleteScrobble(id,element) {
@@ -29,6 +30,20 @@ function deleteScrobble(id,element) {
neo.xhttpreq("/apis/mlj_1/delete_scrobble",data={'timestamp':id},method="POST",callback=callback_func,json=true);
}
+// REPARSING
+
+function toggleReparseConfirm(element) {
+ element.parentElement.parentElement.classList.toggle('active');
+ element.parentElement.parentElement.parentElement.classList.toggle('active');
+}
+
+function reparseScrobble(id, element) {
+ toggleReparseConfirm(element);
+
+ neo.xhttpreq("/apis/mlj_1/reparse_scrobble",data={'timestamp':id},method="POST",callback=notifyCallback,json=true);
+
+}
+
// EDIT NAME
function editEntity() {
@@ -187,14 +202,3 @@ function cancelMerge() {
lcst.setItem(key,[]);
showValidMergeIcons();
}
-
-function toggleReparseConfirm(element) {
- element.parentElement.parentElement.classList.toggle('active');
-}
-
-function reparseScrobble(id, element) {
- toggleReparseConfirm(element);
-
- neo.xhttpreq("/apis/mlj_1/reparse_scrobble",data={'timestamp':id},method="POST",callback=(()=>null),json=true);
-
-}