Revert to ReCAPTCHA 2 for Staticman (#45)

* Revert to ReCAPTCHA 2 for Staticman * Fixed missing braces to load reCAPTCHA site key Further testing is going to be carried out to see if #45 works. * Remove extra article tag * Remove redundancy of recaptcha.recaptcha * Revert socnet deletion * Simplify code for calling Staticman In the same spirit of ac8c52a.
pacollins · Aug 12, 2019 · d80bfe5 · d80bfe5
1 parent 45370d9
commit d80bfe5
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 25 deletions.
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -101,7 +101,7 @@ disableLanguages        = [""]
     branch              = ""
 
     [params.staticman.recaptcha]
-      recaptcha         = false
+      # Both keys must be present to enable recaptcha
       siteKey           = "" # Site Key
       encryptedKey      = ""
 

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -22,7 +22,7 @@
       <link rel="stylesheet" href="{{ . | relURL }}">
     {{ end }}
   {{ end }}
-  {{ if .Site.Params.staticman.recaptcha.recaptcha }}<script src="https://www.google.com/recaptcha/api.js?render={{ .Site.Params.staticman.recaptcha.sitekey }}"></script>{{ end }}
+  {{ if and .Site.Params.staticman.recaptcha.siteKey .Site.Params.staticman.recaptcha.encryptedKey }}<script src='https://www.google.com/recaptcha/api.js'></script>{{ end }}
   {{ .Scratch.Set "Permalink" .Permalink }}
   {{ .Scratch.Set "Title" .Title }}
   {{ .Scratch.Set "Author" .Author }}

diff --git a/layouts/post/comments.html b/layouts/post/comments.html
@@ -2,7 +2,7 @@
     <article class="post">
         {{ template "_internal/disqus.html" . }}
     </article>
-{{ else if .Site.Params.staticman.staticman }}
+{{ else if .Site.Params.staticman }}
     <article class="post">
       {{ .Render "staticman" }}
     </article>

diff --git a/layouts/post/content-single.html b/layouts/post/content-single.html
@@ -11,7 +11,5 @@
     {{ .Render "stats" }}
   </footer>
 </article>
-<article class="post">
-  {{ .Render "comments" }}
-</article>
+{{ .Render "comments" }}
 {{ .Render "pagination" }}
diff --git a/layouts/post/staticman.html b/layouts/post/staticman.html
@@ -8,24 +8,15 @@ <h2>Say something</h2>
     <input name="fields[website]" type="text" placeholder="Your website">
     <input required name="fields[email]" type="email" placeholder="Your email address (Required for Gravatar)">
     <textarea required name="fields[body]" placeholder="Your message. Feel free to use Markdown (Google 'Markdown Cheat Sheet')." rows="10"></textarea>
-    {{ if .Site.Params.staticman.recaptcha.recaptcha }}
-      <input type="hidden" name="options[reCaptcha][siteKey]" value="{{ .Site.Params.staticman.recaptcha.sitekey }}">
-      <input type="hidden" name="options[reCaptcha][secret]" value="{{ .Site.Params.staticman.recaptcha.encryptedkey }}">
-      <input type="hidden" id="g-recaptcha-response" name="g-recaptcha-response">
+    {{ if and .Site.Params.staticman.recaptcha.siteKey .Site.Params.staticman.recaptcha.encryptedKey }}
+    {{ with .Site.Params.staticman.recaptcha }}
+      <input hidden name="options[reCaptcha][siteKey]" value="{{ .sitekey }}">
+      <input hidden name="options[reCaptcha][secret]" value="{{ .encryptedkey }}">
+      <div class="g-recaptcha" data-sitekey="{{ .sitekey }}"></div>
+    {{ end }}
     {{ end }}
     <input type="submit" value="Submit">
   </form>
-  {{ if .Site.Params.staticman.recaptcha.recaptcha }}
-    <script>
-      grecaptcha.ready(function() {
-        grecaptcha.execute('{{ .Site.Params.staticman.recaptcha.sitekey }}', {action: 'homepage'})
-        .then(function(token) {
-           //console.log(token);
-           document.getElementByID('g-recaptcha-response').value=token;
-        });
-      });
-    </script>
-  {{ end }}
 
 <h2>Comments</h2>
 

diff --git a/static/css/main.min.css b/static/css/main.min.css
diff --git a/static/css/main.scss b/static/css/main.scss
@@ -480,10 +480,10 @@ textarea {
 
  /* ----------------------------------Add-Ons--------------------------------- */
 
- /* Remove Recaptcha Badge */
+ /* Format reCaptcha */
 
- div.grecaptcha-badge {
-   display: none !important;
+ .g-recaptcha {
+   margin: -0.25em 0 0.25em 0;
  }
 
  /* Fancybox */