From 03083a13cca0f2ae50b14d898a8b70d8f6938519 Mon Sep 17 00:00:00 2001 From: Okke Harsta Date: Thu, 4 Oct 2018 06:12:21 +0200 Subject: [PATCH] Release 7.0.1 --- mujina-common/pom.xml | 2 +- mujina-idp/pom.xml | 2 +- mujina-idp/src/main/resources/public/main.css | 3 ++- mujina-idp/src/main/resources/public/main.js | 11 ++++++----- mujina-sp/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/mujina-common/pom.xml b/mujina-common/pom.xml index c53293ff..e753064a 100644 --- a/mujina-common/pom.xml +++ b/mujina-common/pom.xml @@ -20,7 +20,7 @@ org.openconext mujina - 7.0.0 + 7.0.1 ../pom.xml diff --git a/mujina-idp/pom.xml b/mujina-idp/pom.xml index e0151cfb..b27cbd54 100644 --- a/mujina-idp/pom.xml +++ b/mujina-idp/pom.xml @@ -20,7 +20,7 @@ org.openconext mujina - 7.0.0 + 7.0.1 ../pom.xml diff --git a/mujina-idp/src/main/resources/public/main.css b/mujina-idp/src/main/resources/public/main.css index 47c1fb76..d78ec2bb 100644 --- a/mujina-idp/src/main/resources/public/main.css +++ b/mujina-idp/src/main/resources/public/main.css @@ -116,6 +116,7 @@ select.attribute-select { background-color: white; border: 1px solid #e4e4e4; box-shadow: inset 0 1px 3px #e6e6e6; + height: 40px; } div.attribute-value { @@ -165,7 +166,7 @@ span.explain-link { border-radius: 50%; background-color: #4DB3CF; color: white; - padding: 1px 8px; + padding: 5px 13px; } .container { diff --git a/mujina-idp/src/main/resources/public/main.js b/mujina-idp/src/main/resources/public/main.js index abf6e0cd..09e92ee7 100644 --- a/mujina-idp/src/main/resources/public/main.js +++ b/mujina-idp/src/main/resources/public/main.js @@ -4,9 +4,8 @@ function guid() { .toString(16) .substring(1); } - return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4(); -}; +} document.addEventListener("DOMContentLoaded", function () { [].forEach.call(document.querySelectorAll(".help,.close"), function (el) { @@ -18,13 +17,15 @@ document.addEventListener("DOMContentLoaded", function () { if (!explanation.classList.contains("hide")) { setTimeout(function () { document.getElementById("close").focus(); - }, 150); + }, 25); } }); }); + document.getElementById("close").addEventListener("blur", function () { - document.getElementById("explanation").classList.toggle("hide"); + document.getElementById("explanation").classList.add("hide"); }); + document.querySelector(".attribute-select").addEventListener("change", function (e) { var selectedOption = e.target.selectedOptions[0]; var val = selectedOption.value; @@ -57,7 +58,7 @@ document.addEventListener("DOMContentLoaded", function () { } select.value = "Add attribute..."; setTimeout(function () { - document.getElementById(inputId).focus() + document.getElementById(inputId).focus(); }, 25); }); }); diff --git a/mujina-sp/pom.xml b/mujina-sp/pom.xml index bff188e0..a6027267 100644 --- a/mujina-sp/pom.xml +++ b/mujina-sp/pom.xml @@ -20,7 +20,7 @@ org.openconext mujina - 7.0.0 + 7.0.1 ../pom.xml diff --git a/pom.xml b/pom.xml index c0c1f1e5..a3a2aa98 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.openconext mujina - 7.0.0 + 7.0.1 pom