From 88d4be40a395e22a280cb9f94699d187f48097fb Mon Sep 17 00:00:00 2001 From: Jonas Blatt <jonasblatt@uni-koblenz.de> Date: Sat, 19 Oct 2019 19:36:52 +0200 Subject: [PATCH] #8 Format verifier text in frontend --- .../META-INF/resources/css/stylesheets.css | 3 +++ .../META-INF/resources/js/dmnVerifier.js | 16 ++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/css/stylesheets.css b/dmnverifierfrontend/src/main/resources/META-INF/resources/css/stylesheets.css index 5e55f139..c62e741d 100644 --- a/dmnverifierfrontend/src/main/resources/META-INF/resources/css/stylesheets.css +++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/css/stylesheets.css @@ -56,6 +56,7 @@ select { height: 35px; outline: none; padding-left: 5px; + min-width: 200px; } select option { @@ -78,6 +79,7 @@ span.select2 { display: table; table-layout: fixed; width: 25% !important; + min-width: 200px; } .clickable { @@ -159,6 +161,7 @@ span.select2 { display: flex; justify-content: flex-start; align-items: flex-start; + flex-wrap: wrap; } #dmn-button-verify { diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js index d7dfe6c9..3fdf6103 100644 --- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js +++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js @@ -227,17 +227,22 @@ function renderDmnVerifierOptions() { `)); currentOpt = verifier.type.classification.niceName; } + let $option; if (verifierResults.verifier.length === 1 || lastTypeSelect !== undefined && lastTypeSelect === verifier.type.name) { selOpt = true; - $curGroup.append($(` + $option = $(` <option value="${verifier.type.name}" selected>${verifier.type.niceName} (${verifier.size})</option> - `)); + `); } else { - $curGroup.append($(` + $option = $(` <option value="${verifier.type.name}">${verifier.type.niceName} (${verifier.size})</option> - `)); + `); + } + if (verifier.size === 0) { + $option.css('color', '#999') } + $curGroup.append($option); } $select.append($curGroup); @@ -291,8 +296,7 @@ function renderVerifier(verifier) { } $verifierContent.append($verifierType); $verifierContent.append($verifierEntries); - $verifierContent.fadeIn(300); - //$verifierType.animate({left: '100px'}, "slow") + $verifierContent.fadeIn(250); } /** -- GitLab