diff --git a/.github/workflows/k8s-destroy.yml b/.github/workflows/k8s-destroy.yml index 1af2ef6a..1958f2c5 100644 --- a/.github/workflows/k8s-destroy.yml +++ b/.github/workflows/k8s-destroy.yml @@ -27,7 +27,7 @@ jobs: - name: Delete PR Deployment run: | kubectl config set-context --current --namespace="${KUBE_NAMESPACE}" - kubectl delete deployment,replicaset,ingress,all -l "app.kubernetes.io/instance=${RELEASE_NAME}" + helm uninstall "${RELEASE_NAME}" kubectl delete secret "${RELEASE_NAME}-tls" - name: Deactivate Github Deployment diff --git a/.holo/sources/skeleton-v2.toml b/.holo/sources/skeleton-v2.toml index b4e73a3e..1b2b8449 100644 --- a/.holo/sources/skeleton-v2.toml +++ b/.holo/sources/skeleton-v2.toml @@ -1,3 +1,3 @@ [holosource] url = "https://github.com/JarvusInnovations/emergence-skeleton-v2" -ref = "refs/tags/v2.8.7" +ref = "refs/tags/v2.10.0" diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..4de4bf12 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,22 @@ + +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Listen for XDebug", + "type": "php", + "request": "launch", + "port": 9000, + "pathMappings": { + "/hab/svc/php-runtime/var/site": "${workspaceRoot}" + }, + "ignore": [ + "**/vendor/**/*.php", + "**/src-compat/File.php" + ] + } + ] +} \ No newline at end of file diff --git a/html-templates/contact/contact.tpl b/html-templates/contact/contact.tpl index c0d928a5..ecf1f60f 100644 --- a/html-templates/contact/contact.tpl +++ b/html-templates/contact/contact.tpl @@ -7,6 +7,11 @@ {if RemoteSystems\ReCaptcha::$siteKey} + {/if} {/block} @@ -20,7 +25,7 @@ {contentBlock "contact-introduction"} -
+ {if $validationErrors}
{_ "Please double-check the fields highlighted below."} @@ -31,19 +36,21 @@ {field inputName=Name label=Name error=$validationErrors.Name required=true attribs='autofocus autocapitalize="words"'} {field inputName=Email label=Email error=$validationErrors.Email type=email required=true} - {field inputName=Phone label=Phone error=$validationErrors.Phone type=tel hint='{_ "Optional. Include your area code."}'} + {field inputName=Phone label=Phone error=$validationErrors.Phone type=tel hint=_("Optional. Include your area code.")} {textarea inputName=Message label=Message error=$validationErrors.Message required=true} - {if RemoteSystems\ReCaptcha::$siteKey} -
- {/if} - {if $validationErrors.ReCaptcha}

{$validationErrors.ReCaptcha}

{/if} - + {if RemoteSystems\ReCaptcha::$siteKey} +
diff --git a/html-templates/register/register.tpl b/html-templates/register/register.tpl index 46a38b18..8604fb80 100644 --- a/html-templates/register/register.tpl +++ b/html-templates/register/register.tpl @@ -7,6 +7,11 @@ {if RemoteSystems\ReCaptcha::$siteKey} + {/if} {/block} @@ -65,12 +70,16 @@ - {if RemoteSystems\ReCaptcha::$siteKey} -
- {/if} -
-

+

+ {if RemoteSystems\ReCaptcha::$siteKey} + +

{_ "Already have an account?"} {_ "Log in"}

{/strip}