Fixed layout for captcha to match form. Upped Geeklog Theme Versions

Updated Captcha layout. Updated theme versions for Geeklog 2.2.2
Geeklog-Core · Mar 5, 2020 · 17907b5 · 17907b5
1 parent e250bb4
commit 17907b5
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 15 deletions.
diff --git a/public_html/layout/denim/comment/commentform.thtml b/public_html/layout/denim/comment/commentform.thtml
@@ -53,12 +53,17 @@
       {record_edit}
     </dl>
 
-    {captcha}
+    {!if captcha}
+    <dl class="form_block">
+      <dt></dt>
+        <dd>{captcha}</dd>
+    </dl>
+    {!endif}
 
     <div class="submit">
 {!if allow_save}
       <button type="submit" name="{nprefix}mode" value="{lang_save}" class="uk-button uk-button-primary g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_save}</button>
-      <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}>
+      <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}> {# Needed for Invisible reCaptcha Error message and must be before preview #}
 {!endif}
       <button type="submit" name="{nprefix}mode" value="{lang_preview}" class="uk-button uk-button-success">{lang_preview}</button>
 {!if allow_delete}

diff --git a/public_html/layout/denim/comment/commentform_advanced.thtml b/public_html/layout/denim/comment/commentform_advanced.thtml
@@ -59,12 +59,17 @@
           {record_edit}
         </dl>
 
-        {captcha}
+        {!if captcha}
+		<dl class="form_block">
+		  <dt></dt>
+		    <dd>{captcha}</dd>
+		</dl>
+		{!endif}
 
         <div class="submit">
 {!if allow_save}
           <button type="submit" name="{nprefix}mode" value="{lang_save}" class="uk-button uk-button-primary g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_save}</button>
-          <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}>
+          <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}> {# Needed for Invisible reCaptcha Error message and must be before preview #}
 {!endif}
           <button type="submit" name="{nprefix}mode" value="{lang_preview}" class="uk-button uk-button-success">{lang_preview}</button>
 {!if allow_delete}

diff --git a/public_html/layout/denim/functions.php b/public_html/layout/denim/functions.php
@@ -85,7 +85,7 @@ function theme_config_denim()
 
     return array(
         'theme_name'            => 'Denim',
-        'theme_version'         => '1.1.1',
+        'theme_version'         => '1.1.2',
         'theme_gl_version'      => '2.2.1',
         'theme_description'     => '',
         'theme_author'          => 'dengen',

diff --git a/public_html/layout/denim_three/comment/commentform.thtml b/public_html/layout/denim_three/comment/commentform.thtml
@@ -53,12 +53,17 @@
       {record_edit}
     </dl>
 
-    {captcha}
+    {!if captcha}
+    <dl class="form_block">
+      <dt></dt>
+        <dd>{captcha}</dd>
+    </dl>
+    {!endif}
 
     <div class="submit">
 {!if allow_save}
       <button type="submit" name="{nprefix}mode" value="{lang_save}" class="uk-button uk-button-primary g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_save}</button>
-      <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}>
+      <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}> {# Needed for Invisible reCaptcha Error message and must be before preview #}
 {!endif}
       <button type="submit" name="{nprefix}mode" value="{lang_preview}" class="uk-button uk-button-default">{lang_preview}</button>
 {!if allow_delete}

diff --git a/public_html/layout/denim_three/comment/commentform_advanced.thtml b/public_html/layout/denim_three/comment/commentform_advanced.thtml
@@ -59,12 +59,17 @@
           {record_edit}
         </dl>
 
-        {captcha}
+        {!if captcha}
+		<dl class="form_block">
+		  <dt></dt>
+		    <dd>{captcha}</dd>
+		</dl>
+		{!endif}
 
         <div class="submit">
 {!if allow_save}
           <button type="submit" name="{nprefix}mode" value="{lang_save}" class="uk-button uk-button-primary g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_save}</button>
-          <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}>
+          <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}> {# Needed for Invisible reCaptcha Error message and must be before preview #}
 {!endif}
           <button type="submit" name="{nprefix}mode" value="{lang_preview}" class="uk-button uk-button-default">{lang_preview}</button>
 {!if allow_delete}

diff --git a/public_html/layout/denim_three/functions.php b/public_html/layout/denim_three/functions.php
@@ -59,7 +59,7 @@ function theme_config_denim_three()
 
     return array(
         'theme_name'            => 'Denim Three',
-        'theme_version'         => '1.0.1',
+        'theme_version'         => '1.0.2',
         'theme_gl_version'      => '2.2.1',
         'theme_description'     => '',
         'theme_author'          => 'dengen',

diff --git a/public_html/layout/modern_curve/comment/commentform.thtml b/public_html/layout/modern_curve/comment/commentform.thtml
@@ -52,15 +52,20 @@
       </dd>
     </dl>
 
-    {captcha}
+    {!if captcha}
+    <dl class="form_block">
+      <dt></dt>
+        <dd>{captcha}</dd>
+    </dl>
+    {!endif}
 
     <ul class="submit">
       <li><input type="submit" name="{nprefix}mode" value="{lang_preview}" class="submit"{xhtml}></li>
       <li>
         <input type="hidden" name="formtype" value="{formtype}"{xhtml}>
 {!if allow_save}
         <button type="submit" name="{nprefix}mode" value="{lang_save}" class="g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_save}</button>
-        <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}>
+        <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}> {# Needed for Invisible reCaptcha Error message and must be before preview #}
 {!endif}
         <input type="submit" value="{lang_cancel}" name="{nprefix}mode"{xhtml}>
 {!if allow_delete}

diff --git a/public_html/layout/modern_curve/comment/commentform_advanced.thtml b/public_html/layout/modern_curve/comment/commentform_advanced.thtml
@@ -59,15 +59,20 @@
           </dd>
         </dl>
 
-        {captcha}
+        {!if captcha}
+		<dl class="form_block">
+		  <dt></dt>
+		    <dd>{captcha}</dd>
+		</dl>
+		{!endif}
 
         <ul class="submit">
           <li><input type="submit" name="{nprefix}mode" value="{lang_preview}" class="submit"{xhtml}></li>
           <li>
             <input type="hidden" name="formtype" value="{formtype}"{xhtml}>
 {!if allow_save}
             <button type="submit" name="{nprefix}mode" value="{lang_save}" class="g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_save}</button>
-            <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}>
+            <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}> {# Needed for Invisible reCaptcha Error message and must be before preview #}
 {!endif}
             <input type="submit" value="{lang_cancel}" name="{nprefix}mode"{xhtml}>
 {!if allow_delete}

diff --git a/public_html/layout/modern_curve/functions.php b/public_html/layout/modern_curve/functions.php
@@ -46,7 +46,7 @@ function theme_config_modern_curve()
 {
     return array(
         'theme_name'            => 'Modern Curve',
-        'theme_version'         => '1.0.0',
+        'theme_version'         => '1.0.1',
         'theme_gl_version'      => '2.2.1',
         'theme_description'     => '',
         'theme_author'          => '',