From 0af019b94d296eeeb3e5a686f2246133dbd1def9 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 14 Jun 2021 13:12:44 +0200
Subject: [PATCH] styling of property rows in edit_mode
---
misc/unit_test_http_server.py | 2 +-
src/core/css/webcaosdb.css | 10 ++++++++++
src/core/js/form_elements.js | 13 ++++++++-----
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/misc/unit_test_http_server.py b/misc/unit_test_http_server.py
index 68e6a743..56205df8 100755
--- a/misc/unit_test_http_server.py
+++ b/misc/unit_test_http_server.py
@@ -153,5 +153,5 @@ class UnitTestHTTPServer(HTTPServer):
os._exit(self._exit_code)#pylint: disable=protected-access
-UnitTestHTTPServer(server_address=('127.0.0.1', int(sys.argv[1])),
+UnitTestHTTPServer(server_address=('0.0.0.0', int(sys.argv[1])),
timeout=float(sys.argv[2]), ignore_done=(sys.argv[3] == "True")).start()
diff --git a/src/core/css/webcaosdb.css b/src/core/css/webcaosdb.css
index fb86c816..4de7034b 100644
--- a/src/core/css/webcaosdb.css
+++ b/src/core/css/webcaosdb.css
@@ -742,3 +742,13 @@ details p {
.caosdb-f-map-panel .leaflet-container {
height: 500px;
}
+
+.caosdb-v-field .bootstrap-select button {
+ border: 1px solid #ced4da;
+ background-color: #FFF;
+}
+
+.caosdb-v-field > div {
+ margin-top: auto;
+ margin-bottom: auto;
+}
diff --git a/src/core/js/form_elements.js b/src/core/js/form_elements.js
index da1d7fdf..d01b45ee 100644
--- a/src/core/js/form_elements.js
+++ b/src/core/js/form_elements.js
@@ -519,7 +519,7 @@ var form_elements = new function () {
let label = this._make_input_label_str(config);
let loading = $(createWaitingNotification("loading..."))
.addClass("caosdb-f-field-not-ready");
- let input_col = $('<div class="col-sm-9"/>');
+ let input_col = $('<div class="caosdb-f-property-value col-sm-9"/>');
input_col.append(loading);
this._query(config.query).then(async function (entities) {
@@ -559,7 +559,6 @@ var form_elements = new function () {
select_picker_options["liveSearchNormalize"] = true;
select_picker_options["liveSearchPlaceholder"] = "search...";
}
- console.log(select)
$(select).selectpicker(select_picker_options);
$(select).selectpicker("val", value);
this.init_actions_box(field);
@@ -577,7 +576,7 @@ var form_elements = new function () {
if (actions_box.length === 0) {
actions_box = $(`<div class="bs-actionsbox">
<div class="btn-group btn-group-sm d-grid">
- <button type="button" class="actions-btn btn-secondary bs-deselect-all btn btn-light">None</button>
+ <button type="button" class="actions-btn bs-deselect-all btn btn-light">None</button>
</div>
</div>`)
.hide();
@@ -599,7 +598,11 @@ var form_elements = new function () {
actions_box
.find(".bs-deselect-all")
.click((e) => {
- select.selectpicker('deselectAll');
+ select
+ .selectpicker("val", null);
+ select
+ .selectpicker("render");
+ select.dropdown("hide");
select[0].dispatchEvent(form_elements.field_changed_event);
});
}
@@ -1295,7 +1298,7 @@ var form_elements = new function () {
*/
this._make_field_wrapper = function (name) {
caosdb_utils.assert_string(name, "param `name`");
- return $('<div class="row caosdb-f-field" data-field-name="' + name + '" />')[0];
+ return $('<div class="row caosdb-f-field caosdb-v-field" data-field-name="' + name + '" />')[0];
}
/**
--
GitLab