From ef244df1f0c0548aeccaa396c31dc7836aadf09b Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Fri, 11 Mar 2016 12:16:20 -0500
Subject: [PATCH] Create a Bootstrap3 recaptcha Helper to prevent empty divs
and simplify logic.
---
.../src/VuFind/View/Helper/Bootstrap3/Factory.php | 15 +++++++++++++++
.../templates/Auth/Database/recovery.phtml | 6 +-----
.../templates/Helpers/email-form-fields.phtml | 6 +-----
.../bootstrap3/templates/myresearch/account.phtml | 8 +-------
.../templates/myresearch/newpassword.phtml | 6 +-----
themes/bootstrap3/templates/record/sms.phtml | 6 +-----
themes/bootstrap3/theme.config.php | 1 +
7 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/module/VuFind/src/VuFind/View/Helper/Bootstrap3/Factory.php b/module/VuFind/src/VuFind/View/Helper/Bootstrap3/Factory.php
index d3e2f782404..563cb6baf69 100644
--- a/module/VuFind/src/VuFind/View/Helper/Bootstrap3/Factory.php
+++ b/module/VuFind/src/VuFind/View/Helper/Bootstrap3/Factory.php
@@ -80,4 +80,19 @@ class Factory
}
return new LayoutClass($left, $offcanvas);
}
+
+ /**
+ * Construct the Recaptcha helper.
+ *
+ * @param ServiceManager $sm Service manager.
+ *
+ * @return Recaptcha
+ */
+ public static function getRecaptcha(ServiceManager $sm)
+ {
+ return new Recaptcha(
+ $sm->getServiceLocator()->get('VuFind\Recaptcha'),
+ $sm->getServiceLocator()->get('VuFind\Config')->get('config')
+ );
+ }
}
diff --git a/themes/bootstrap3/templates/Auth/Database/recovery.phtml b/themes/bootstrap3/templates/Auth/Database/recovery.phtml
index c164f063883..8d7ffb78fcf 100644
--- a/themes/bootstrap3/templates/Auth/Database/recovery.phtml
+++ b/themes/bootstrap3/templates/Auth/Database/recovery.phtml
@@ -10,11 +10,7 @@
<input type="email" name="email" class="form-control"/>
</div>
</div>
-<div class="form-group">
- <div class="col-sm-9 col-sm-offset-3">
- <?=$this->recaptcha()->html($this->useRecaptcha) ?>
- </div>
-</div>
+<?=$this->recaptcha()->html($this->useRecaptcha) ?>
<div class="form-group">
<div class="col-sm-9 col-sm-offset-3">
<input class="btn btn-default" name="submit" type="submit" value="<?=$this->transEsc('Recover Account') ?>"/>
diff --git a/themes/bootstrap3/templates/Helpers/email-form-fields.phtml b/themes/bootstrap3/templates/Helpers/email-form-fields.phtml
index 27e6c5bde2e..8a982c42399 100644
--- a/themes/bootstrap3/templates/Helpers/email-form-fields.phtml
+++ b/themes/bootstrap3/templates/Helpers/email-form-fields.phtml
@@ -44,11 +44,7 @@
</div>
</div>
<? endif ?>
-<div class="form-group">
- <div class="col-sm-9 col-sm-offset-3">
- <?=$this->recaptcha()->html($this->useRecaptcha) ?>
- </div>
-</div>
+<?=$this->recaptcha()->html($this->useRecaptcha) ?>
<div class="form-group">
<div class="col-sm-9 col-sm-offset-3">
<input type="submit" class="btn btn-primary" name="submit" value="<?=$this->transEsc('Send')?>"/>
diff --git a/themes/bootstrap3/templates/myresearch/account.phtml b/themes/bootstrap3/templates/myresearch/account.phtml
index dbd29f4ba83..22e742f9f2d 100644
--- a/themes/bootstrap3/templates/myresearch/account.phtml
+++ b/themes/bootstrap3/templates/myresearch/account.phtml
@@ -10,13 +10,7 @@
<form method="post" name="accountForm" id="accountForm" class="form-horizontal" data-toggle="validator" role="form">
<?=$this->auth()->getCreateFields()?>
- <? if ($this->useRecaptcha): ?>
- <div class="form-group">
- <div class="col-sm-9 col-sm-offset-3">
- <?=$this->recaptcha()->html($this->useRecaptcha) ?>
- </div>
- </div>
- <? endif; ?>
+ <?=$this->recaptcha()->html($this->useRecaptcha) ?>
<div class="form-group">
<div class="col-sm-3">
<a class="back-to-login btn btn-link" href="<?=$this->url('myresearch-userlogin') ?>"><i class="fa fa-chevron-left"></i> <?=$this->transEsc('Back')?></a>
diff --git a/themes/bootstrap3/templates/myresearch/newpassword.phtml b/themes/bootstrap3/templates/myresearch/newpassword.phtml
index 20a9e0f05e9..d504382bf7d 100644
--- a/themes/bootstrap3/templates/myresearch/newpassword.phtml
+++ b/themes/bootstrap3/templates/myresearch/newpassword.phtml
@@ -24,11 +24,7 @@
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->username) ?>" name="username"/>
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->auth_method) ?>" name="auth_method"/>
<?=$this->auth()->getNewPasswordForm() ?>
- <div class="form-group">
- <div class="col-sm-9 col-sm-offset-3">
- <?=$this->recaptcha()->html($this->useRecaptcha) ?>
- </div>
- </div>
+ <?=$this->recaptcha()->html($this->useRecaptcha) ?>
<div class="form-group">
<div class="col-sm-9 col-sm-offset-3">
<input class="btn btn-primary" name="submit" type="submit" value="<?=$this->transEsc('Submit')?>" />
diff --git a/themes/bootstrap3/templates/record/sms.phtml b/themes/bootstrap3/templates/record/sms.phtml
index dc3685c7ed0..bada672d77e 100644
--- a/themes/bootstrap3/templates/record/sms.phtml
+++ b/themes/bootstrap3/templates/record/sms.phtml
@@ -36,11 +36,7 @@
<? $keys = is_array($this->carriers) ? array_keys($this->carriers) : array(); ?>
<input type="hidden" name="provider" value="<?=isset($keys[0]) ? $keys[0] : ''?>" />
<? endif; ?>
- <div class="form-group">
- <div class="col-sm-9 col-sm-offset-3">
- <?=$this->recaptcha()->html($this->useRecaptcha) ?>
- </div>
- </div>
+ <?=$this->recaptcha()->html($this->useRecaptcha) ?>
<div class="form-group">
<div class="col-sm-9 col-sm-offset-3">
<input class="btn btn-primary" type="submit" name="submit" value="<?=$this->transEsc('Send Text')?>"/>
diff --git a/themes/bootstrap3/theme.config.php b/themes/bootstrap3/theme.config.php
index a8734d23891..b22ce20bee0 100644
--- a/themes/bootstrap3/theme.config.php
+++ b/themes/bootstrap3/theme.config.php
@@ -31,6 +31,7 @@ return array(
'factories' => array(
'flashmessages' => 'VuFind\View\Helper\Bootstrap3\Factory::getFlashmessages',
'layoutclass' => 'VuFind\View\Helper\Bootstrap3\Factory::getLayoutClass',
+ 'recaptcha' => 'VuFind\View\Helper\Bootstrap3\Factory::getRecaptcha',
),
'invokables' => array(
'highlight' => 'VuFind\View\Helper\Bootstrap3\Highlight',
--
GitLab