Merge pull request #253 from CodeForPhilly/develop

Release: v3.1.0

Author: themightychris

.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

.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"

.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"
+            ]
+        }
+    ]
+}

html-templates/contact/contact.tpl

@@ -7,6 +7,11 @@
 
     {if RemoteSystems\ReCaptcha::$siteKey}
         <script src='https://www.google.com/recaptcha/api.js'></script>
+        <script>
+            function onSubmit(token) {
+                document.getElementById('contact-form').submit();
+            }
+        </script>
     {/if}
 {/block}
 
@@ -20,7 +25,7 @@
 
             {contentBlock "contact-introduction"}
 
-            <form action="/contact" method="POST" class="contact-form">
+            <form action="/contact" method="POST" class="contact-form" id="contact-form">
                 {if $validationErrors}
                     <div class="alert alert-danger">
                         {_ "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}
-                    <div class="form-group g-recaptcha" data-sitekey="{RemoteSystems\ReCaptcha::$siteKey|escape}"></div>
-                {/if}
-
                 {if $validationErrors.ReCaptcha}
                     <p class="text-danger">{$validationErrors.ReCaptcha}</p>
                 {/if}
 
-                <button type="submit" class="btn btn-primary">{_ Send}</button>
+                {if RemoteSystems\ReCaptcha::$siteKey}
+                    <button type="submit" class="btn btn-primary g-recaptcha" data-sitekey="{RemoteSystems\ReCaptcha::$siteKey|escape}" data-callback='onSubmit' data-action='submit'>
+                {else}
+                    <button type="submit" class="btn btn-primary">
+                {/if}
+                    {_ "Send"}
+                </button>
             </form>
 
         </div>

html-templates/register/register.tpl

@@ -7,6 +7,11 @@
 
     {if RemoteSystems\ReCaptcha::$siteKey}
         <script src='https://www.google.com/recaptcha/api.js'></script>
+        <script>
+            function onSubmit(token) {
+                document.getElementById('register').submit();
+            }
+        </script>
     {/if}
 {/block}
 
@@ -65,12 +70,16 @@
                         <input type="password" class="form-control" id="PasswordConfirm" name="PasswordConfirm" value="{refill field=PasswordConfirm}">
                     </div>
 
-                    {if RemoteSystems\ReCaptcha::$siteKey}
-                        <div class="form-group g-recaptcha" data-sitekey="{RemoteSystems\ReCaptcha::$siteKey|escape}"></div>
-                    {/if}
-
                     <div class="form-group">
-                        <p><button type="submit" class="btn btn-primary">{_ "Create Account"}</button></p>
+                        <p>
+                            {if RemoteSystems\ReCaptcha::$siteKey}
+                                <button type="submit" class="btn btn-primary g-recaptcha" data-sitekey="{RemoteSystems\ReCaptcha::$siteKey|escape}" data-callback='onSubmit' data-action='submit'>
+                            {else}
+                                <button type="submit" class="btn btn-primary">
+                            {/if}
+                                {_ "Create Account"}
+                            </button>
+                        </p>
                         <p class="help-block">{_ "Already have an account?"} <a href="/login{tif $.request.return ? cat('?return=', escape($.request.return, url))}">{_ "Log in"}</a></p>
                     </div>
                 {/strip}