Skip to content
Snippets Groups Projects
Commit 7f48c521 authored by Demian Katz's avatar Demian Katz
Browse files

Merge branch 'release-2.3'

parents 4544d67d fce7a26c
Branches
Tags
No related merge requests found
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->username) ?>" name="username"/> <input type="hidden" value="<?=$this->escapeHtmlAttr($this->username) ?>" name="username"/>
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->auth_method) ?>" name="auth_method"/> <input type="hidden" value="<?=$this->escapeHtmlAttr($this->auth_method) ?>" name="auth_method"/>
<?=$this->recaptcha()->html($this->useRecaptcha) ?> <?=$this->recaptcha()->html($this->useRecaptcha) ?>
<input name="submit" type="submit"/> <input name="submit" type="submit" value="<?=$this->transEsc('Submit')?>"/>
</form> </form>
<? endif; ?> <? endif; ?>
</div> </div>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<? if ($account->supportsCreation()): ?> <? if ($account->supportsCreation()): ?>
<a class="btn btn-link createAccountLink" href="<?=$this->url('myresearch-account') ?>?auth_method=<?=$account->getAuthMethod()?>"><?=$this->transEsc('Create New Account')?></a> <a class="btn btn-link createAccountLink" href="<?=$this->url('myresearch-account') ?>?auth_method=<?=$account->getAuthMethod()?>"><?=$this->transEsc('Create New Account')?></a>
<? endif; ?> <? endif; ?>
<input class="btn btn-primary" type="submit" name="processLogin" value="Login"> <input class="btn btn-primary" type="submit" name="processLogin" value="<?=$this->transEsc('Login')?>">
<? if ($account->supportsRecovery()): ?> <? if ($account->supportsRecovery()): ?>
<br/> <br/>
<a class="btn btn-link" href="<?=$this->url('myresearch-recover') ?>?auth_method=<?=$account->getAuthMethod()?>"><?=$this->transEsc('Forgot Password')?></a> <a class="btn btn-link" href="<?=$this->url('myresearch-recover') ?>?auth_method=<?=$account->getAuthMethod()?>"><?=$this->transEsc('Forgot Password')?></a>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<?=$this->recaptcha()->html($this->useRecaptcha) ?> <?=$this->recaptcha()->html($this->useRecaptcha) ?>
<div class="control-group"> <div class="control-group">
<div class="controls"> <div class="controls">
<input class="btn" name="submit" type="submit"/> <input class="btn" name="submit" type="submit" value="<?=$this->transEsc('Submit')?>"/>
</div> </div>
</div> </div>
</form> </form>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<? if ($account->supportsCreation()): ?> <? if ($account->supportsCreation()): ?>
<a class="btn btn-link createAccountLink" href="<?=$this->url('myresearch-account') ?>?auth_method=<?=$account->getAuthMethod()?>"><?=$this->transEsc('Create New Account')?></a> <a class="btn btn-link createAccountLink" href="<?=$this->url('myresearch-account') ?>?auth_method=<?=$account->getAuthMethod()?>"><?=$this->transEsc('Create New Account')?></a>
<? endif; ?> <? endif; ?>
<input class="btn btn-primary" type="submit" name="processLogin" value="Login"> <input class="btn btn-primary" type="submit" name="processLogin" value="<?=$this->transEsc('Login')?>">
<? if ($account->supportsRecovery()): ?> <? if ($account->supportsRecovery()): ?>
<br/> <br/>
<a class="btn btn-link" href="<?=$this->url('myresearch-recover') ?>?auth_method=<?=$account->getAuthMethod()?>"><?=$this->transEsc('Forgot Password')?></a> <a class="btn btn-link" href="<?=$this->url('myresearch-recover') ?>?auth_method=<?=$account->getAuthMethod()?>"><?=$this->transEsc('Forgot Password')?></a>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<input class="btn btn-primary" type="submit" name="processLogin" value="Login"> <input class="btn btn-primary" type="submit" name="processLogin" value="<?=$this->transEsc('Login')?>">
</div> </div>
</div> </div>
</form> </form>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<?=$this->recaptcha()->html($this->useRecaptcha) ?> <?=$this->recaptcha()->html($this->useRecaptcha) ?>
<div class="form-group"> <div class="form-group">
<div class="col-sm-9 col-sm-offset-3"> <div class="col-sm-9 col-sm-offset-3">
<input class="btn btn-primary" name="submit" type="submit"/> <input class="btn btn-primary" name="submit" type="submit" value="<?=$this->transEsc('Submit')?>" />
</div> </div>
</div> </div>
</form> </form>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment