").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var i=this.document.data("ui-dialog-overlays")-1;i?this.document.data("ui-dialog-overlays",i):(this.document.off("focusin.ui-dialog"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),!1!==t.uiBackCompat&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(i,t){"dialogClass"===i&&this.uiDialog.removeClass(this.options.dialogClass).addClass(t),this._superApply(arguments)}}),t.ui.dialog}();
\ No newline at end of file
diff --git a/public/themes/custom/hdbt_subtheme/src/js/dialog.js b/public/themes/custom/hdbt_subtheme/src/js/dialog.js
index 53de27b5..ef46c75d 100644
--- a/public/themes/custom/hdbt_subtheme/src/js/dialog.js
+++ b/public/themes/custom/hdbt_subtheme/src/js/dialog.js
@@ -175,7 +175,7 @@
this._addClass( "ui-dialog-content", "ui-widget-content" );
this._createTitlebar();
- this._createKoro();
+
this._createButtonPane();
if ( this.options.draggable && $.fn.draggable ) {
@@ -435,20 +435,6 @@
}
},
- _createKoro: function() {
- var koro;
- var uniqueKoroId;
- uniqueKoroId = Math.floor(Math.random() * 1000000)
- koro = $('
" );
- this._addClass( this.uiKoro,
- "hds-koros" );
-
- koro.appendTo(this.uiKoro);
- this.uiKoro.prependTo( this.uiDialog );
-
- },
_createTitlebar: function() {
var uiDialogTitle;
@@ -542,7 +528,6 @@
// Default to a non-submitting button
props = $.extend( { type: "button" }, props );
-
// Change the context for the click callback to be the main element
click = props.click;
buttonOptions = {
@@ -566,13 +551,14 @@
delete props.text;
}
- $( "
", props )
- .button( buttonOptions )
- .addClass( ' hds-button hds-button--primary' )
- .appendTo( that.uiButtonSet )
- .on( "click", function() {
- click.apply( that.element[ 0 ], arguments );
- } );
+ $( "
", props )
+ .button( buttonOptions )
+ .addClass( ' hds-button hds-button--' + (props.buttonType ? props.buttonType : 'primary') )
+ .appendTo( that.uiButtonSet )
+ .on( "click", function() {
+ click.apply( that.element[ 0 ], arguments );
+ } );
+
} );
this._addClass( this.uiDialog, "ui-dialog-buttons" );
this.uiDialogButtonPane.appendTo( this.uiDialog );
diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/dialog/_modal.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/dialog/_modal.scss
index adcf64d8..06b8f758 100644
--- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/dialog/_modal.scss
+++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/dialog/_modal.scss
@@ -5,12 +5,22 @@
.ui-button:hover {
border-width: 2px;
}
- .hds-koros {
- position: absolute;
- top: -40px;
- left: 0;
- color: white;
- z-index: 1000;
+ .ui-dialog-titlebar-close {
+ top: var(--spacing-s);
+ z-index: 1001;
+ }
+ .ui-dialog-buttonpane .ui-dialog-buttonset {
+ float: left;
+ }
+ .ui-dialog-buttonpane {
+ padding: var(--spacing-2-xs) var(--spacing-m);
+ }
+ .ui-dialog-content {
+ position: initial;
+ padding: 0 1em 1em;
+ }
+ div.ui-dialog-titlebar {
+ padding: 0;
}
&-titlebar {
border: 0;
@@ -37,29 +47,21 @@
}
}
}
-.ui-dialog div.ui-dialog-titlebar {
- padding: 0;
-}
-.ui-dialog .ui-dialog-titlebar-close {
- top: -40px;
- z-index: 1001;
-}
.ui-widget-content {
+ border: 0px transparent solid;
h3 {
margin-top: 0;
}
}
+
div.ui-widget.ui-widget-content {
- border-top: 60px solid var(--color-engel);
+ border-top: var(--spacing-2-xs) solid var(--color-black);
padding-top: 0;
min-width: 300px;
max-width: 100vw;
}
-.ui-dialog .ui-dialog-content {
- position: initial;
- padding: 0 1em 1em;
-}
+
.ui-widget-content span.ui-icon {
mask-image: url("data:image/svg+xml;charset=utf-8,%3Csvg role='img' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E %3Cg fill='none' fill-rule='evenodd'%3E %3Crect width='24' height='24'/%3E %3Cpolygon fill='currentColor' points='18 7.5 13.5 12 18 16.5 16.5 18 12 13.5 7.5 18 6 16.5 10.5 12 6 7.5 7.5 6 12 10.5 16.5 6'/%3E %3C/g%3E %3C/svg%3E");
-webkit-mask-image: url("data:image/svg+xml;charset=utf-8,%3Csvg role='img' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E %3Cg fill='none' fill-rule='evenodd'%3E %3Crect width='24' height='24'/%3E %3Cpolygon fill='currentColor' points='18 7.5 13.5 12 18 16.5 16.5 18 12 13.5 7.5 18 6 16.5 10.5 12 6 7.5 7.5 6 12 10.5 16.5 6'/%3E %3C/g%3E %3C/svg%3E");
diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/layout/_login_page.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/layout/_login_page.scss
index bf687b44..58a3782f 100644
--- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/layout/_login_page.scss
+++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/layout/_login_page.scss
@@ -8,7 +8,7 @@
font-size: 2.5rem;
@include breakpoint($breakpoint-m) {
- font-size: 4rem;
+ font-size: 3rem;
margin-top: 0;
margin-bottom: 64px;
}
diff --git a/public/themes/custom/hdbt_subtheme/templates/field/field--node--webform--webform.html.twig b/public/themes/custom/hdbt_subtheme/templates/field/field--node--webform--webform.html.twig
index 97ba9aa9..98b1b538 100644
--- a/public/themes/custom/hdbt_subtheme/templates/field/field--node--webform--webform.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/field/field--node--webform--webform.html.twig
@@ -1,3 +1,11 @@
+
+
+
+
+ {{ 'Fields marked with an asterisk * are required, that need to be filled before saving.'|t }}
+
+
{% for item in items %}
{% block paragraph %}
{% embed "@hdbt/misc/component.twig" with { component_classes: [ 'component--webform' ], } %}
diff --git a/public/themes/custom/hdbt_subtheme/templates/layout/page--403.html.twig b/public/themes/custom/hdbt_subtheme/templates/layout/page--403.html.twig
index d7ac9e9e..86e886a4 100644
--- a/public/themes/custom/hdbt_subtheme/templates/layout/page--403.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/layout/page--403.html.twig
@@ -21,7 +21,9 @@
{{ link(feedback_link_title, error_page_feedback_link, link_attributes) }}
{% endif %}
{% if user_not_logged_in %}
-
{{ 'Login to the form'|t({}, {'context': 'Log in block title on error pages'}) }}
+
{{ 'Login to the form'|t({}, {'context': 'Log in block title on error pages'}) }}
+ {{-": " ~ page.webform_label }}
+
{% endif %}
{% if user_not_logged_in %}
diff --git a/public/themes/custom/hdbt_subtheme/translations/fi.po b/public/themes/custom/hdbt_subtheme/translations/fi.po
index 13a9559e..68b4bb3d 100644
--- a/public/themes/custom/hdbt_subtheme/translations/fi.po
+++ b/public/themes/custom/hdbt_subtheme/translations/fi.po
@@ -13,5 +13,15 @@ msgctxt "Log in block title on error pages"
msgid "Login to the form"
msgstr "Kirjaudu lomakkeelle"
+msgctxt "Log in block title on error pages"
+msgid "Login to the form: @webform_label"
+msgstr "Kirjaudu lomakkeelle: @webform_label"
+
msgid "Below is the data of a submitted form."
msgstr "Alla on lähetetyn lomakkeen tiedot."
+
+msgid "Yes"
+msgstr "Kyllä"
+
+msgid "Fields marked with an asterisk * are required, that need to be filled before saving."
+msgstr "Tähdellä * merkityt kentät ovat pakollisia tietoja, jotka sinun on täytettävä ennen tietojen tallentamista."
diff --git a/public/themes/custom/hdbt_subtheme/translations/sv.po b/public/themes/custom/hdbt_subtheme/translations/sv.po
index 3d9f4524..0e3138f5 100644
--- a/public/themes/custom/hdbt_subtheme/translations/sv.po
+++ b/public/themes/custom/hdbt_subtheme/translations/sv.po
@@ -16,5 +16,15 @@ msgctxt "Log in block title on error pages"
msgid "Login to the form"
msgstr "Logga in i formuläret"
+msgctxt "Log in block title on error pages"
+msgid "Login to the form: @webform_label"
+msgstr "Logga in i formuläret: @webform_label"
+
msgid "Below is the data of a submitted form."
msgstr "Nedan finns uppgifterna för ett inlämnat formulär."
+
+msgid "Yes"
+msgstr "Ja"
+
+msgid "Fields marked with an asterisk * are required, that need to be filled before saving."
+msgstr "Fält markerade med en asterisk * är obligatoriska, som måste fyllas i innan du sparar."
diff --git a/tools/make/qa.mk b/tools/make/qa.mk
index 57df5e12..0dae5b6c 100644
--- a/tools/make/qa.mk
+++ b/tools/make/qa.mk
@@ -2,6 +2,7 @@ TEST_TARGETS += test-phpunit
FIX_TARGETS :=
LINT_PHP_TARGETS :=
CS_INSTALLED := $(shell test -f $(COMPOSER_JSON_PATH)/vendor/bin/phpcs && echo yes || echo no)
+TESTSUITES ?= unit,kernel,functional
PHONY += fix
fix: ## Fix code style
@@ -37,21 +38,19 @@ test: ## Run tests
$(call step,Tests completed.)
PHONY += test-phpunit
-test-phpunit: TESTSUITES := unit,kernel,functional
test-phpunit: ## Run PHPUnit tests
$(call step,Run PHPUnit tests...)
ifeq ($(CI),true)
vendor/bin/phpunit -c phpunit.xml.dist --testsuite $(TESTSUITES)
else
- $(call docker,${DOCKER_PROJECT_ROOT}/vendor/bin/phpunit -c $(DOCKER_PROJECT_ROOT)/phpunit.xml.dist \
+ $(call docker_compose_exec,${DOCKER_PROJECT_ROOT}/vendor/bin/phpunit -c $(DOCKER_PROJECT_ROOT)/phpunit.xml.dist \
--testsuite $(TESTSUITES))
endif
$(call test_result,test-phpunit,"[OK]")
PHONY += test-phpunit-locally
-test-phpunit-locally: TESTSUITES := unit,kernel,functional
test-phpunit-locally:
- @SIMPLETEST_BASE_URL=http://$(DRUPAL_HOSTNAME) SIMPLETEST_DB=mysql://$(DB_URL) \
+ @SIMPLETEST_BASE_URL=https://$(DRUPAL_HOSTNAME) SIMPLETEST_DB=mysql://$(DB_URL) \
vendor/bin/phpunit -c $(CURDIR)/phpunit.xml.dist --testsuite $(TESTSUITES)
define test_result
diff --git a/tools/make/utils.mk b/tools/make/utils.mk
index c7e5ef60..9ac8b12d 100644
--- a/tools/make/utils.mk
+++ b/tools/make/utils.mk
@@ -21,7 +21,7 @@ endif
PHONY += --open-db-gui
--open-db-gui:
- @open mysql://$(DB_USER):$(DB_PASS)@$(shell docker port $(DB_CONTAINER) 3306)/$(DB_NAME)
+ @open mysql://$(DB_USER):$(DB_PASS)@$(shell docker port $(DB_CONTAINER) 3306 | grep -v ::)/$(DB_NAME)
define dbg
@printf "${GREEN}${1}:${NO_COLOR} ${2}\n"