From f3e6f931cebd6fbd89ec3b4477e5bc633ea0bcd4 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Wed, 1 Jun 2016 11:00:52 -0400
Subject: [PATCH] Eliminated redundant templates.

---
 .../{ILS => AbstractBase}/newpassword.phtml   |  0
 .../templates/Auth/Database/newpassword.phtml | 30 ------------------
 .../templates/Auth/MultiILS/newpassword.phtml | 31 -------------------
 .../{ILS => AbstractBase}/newpassword.phtml   |  0
 .../templates/Auth/Database/newpassword.phtml | 15 ---------
 .../templates/Auth/MultiILS/newpassword.phtml | 15 ---------
 6 files changed, 91 deletions(-)
 rename themes/bootstrap3/templates/Auth/{ILS => AbstractBase}/newpassword.phtml (100%)
 delete mode 100644 themes/bootstrap3/templates/Auth/Database/newpassword.phtml
 delete mode 100644 themes/bootstrap3/templates/Auth/MultiILS/newpassword.phtml
 rename themes/jquerymobile/templates/Auth/{ILS => AbstractBase}/newpassword.phtml (100%)
 delete mode 100644 themes/jquerymobile/templates/Auth/Database/newpassword.phtml
 delete mode 100644 themes/jquerymobile/templates/Auth/MultiILS/newpassword.phtml

diff --git a/themes/bootstrap3/templates/Auth/ILS/newpassword.phtml b/themes/bootstrap3/templates/Auth/AbstractBase/newpassword.phtml
similarity index 100%
rename from themes/bootstrap3/templates/Auth/ILS/newpassword.phtml
rename to themes/bootstrap3/templates/Auth/AbstractBase/newpassword.phtml
diff --git a/themes/bootstrap3/templates/Auth/Database/newpassword.phtml b/themes/bootstrap3/templates/Auth/Database/newpassword.phtml
deleted file mode 100644
index 1c6e7e2bfba..00000000000
--- a/themes/bootstrap3/templates/Auth/Database/newpassword.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<? if (isset($this->username)): ?>
-  <div class="form-group">
-    <label class="col-sm-3 control-label"><?=$this->transEsc('Username') ?>:</label>
-    <div class="col-sm-9">
-      <p class="form-control-static"><?=$this->username ?></p>
-    </div>
-  </div>
-<? endif; ?>
-<? if (isset($this->verifyold) && $this->verifyold || isset($this->oldpwd)): ?>
-  <div class="form-group">
-    <label class="col-sm-3 control-label"><?=$this->transEsc('old_password') ?>:</label>
-    <div class="col-sm-9">
-      <input type="password" name="oldpwd" class="form-control"/>
-    </div>
-  </div>
-<? endif; ?>
-<div class="form-group">
-  <label class="col-sm-3 control-label"><?=$this->transEsc('new_password') ?>:</label>
-  <div class="col-sm-9">
-    <input type="password" id="password" name="password" class="form-control" required aria-required="true"<?=isset($this->passwordPolicy['minLength']) ? ' data-minlength="' . $this->passwordPolicy['minLength'] . '" data-minlength-error="' . $this->escapeHtmlAttr($this->translate('password_minimum_length', array('%%minlength%%' => $this->passwordPolicy['minLength']))) . '"' : ''?><?=isset($this->passwordPolicy['maxLength']) ? ' maxlength="' . $this->passwordPolicy['maxLength'] . '"' : ''?>/>
-    <div class="help-block with-errors"></div>
-  </div>
-</div>
-<div class="form-group">
-  <label class="col-sm-3 control-label"><?=$this->transEsc('confirm_new_password') ?>:</label>
-  <div class="col-sm-9">
-    <input type="password" name="password2" class="form-control" required aria-required="true" data-match="#password" data-match-error="<?=$this->escapeHtmlAttr($this->translate('Passwords do not match'))?>"/>
-    <div class="help-block with-errors"></div>
-  </div>
-</div>
diff --git a/themes/bootstrap3/templates/Auth/MultiILS/newpassword.phtml b/themes/bootstrap3/templates/Auth/MultiILS/newpassword.phtml
deleted file mode 100644
index 04c0fbce37e..00000000000
--- a/themes/bootstrap3/templates/Auth/MultiILS/newpassword.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<? if (isset($this->username)): ?>
-  <div class="form-group">
-    <label class="col-sm-3 control-label"><?=$this->transEsc('Username') ?>:</label>
-    <div class="col-sm-9">
-      <p class="form-control-static"><?=$this->username ?></p>
-    </div>
-  </div>
-<? endif; ?>
-<? if (isset($this->verifyold) && $this->verifyold || isset($this->oldpwd)): ?>
-  <div class="form-group">
-    <label class="col-sm-3 control-label"><?=$this->transEsc('old_password') ?>:</label>
-    <div class="col-sm-9">
-      <input type="password" name="oldpwd" class="form-control"/>
-      <div class="help-block with-errors"></div>
-    </div>
-  </div>
-<? endif; ?>
-<div class="form-group">
-  <label class="col-sm-3 control-label"><?=$this->transEsc('new_password') ?>:</label>
-  <div class="col-sm-9">
-    <input type="password" id="password" name="password" class="form-control" required aria-required="true"<?=isset($this->passwordPolicy['minLength']) ? ' data-minlength="' . $this->passwordPolicy['minLength'] . '" data-minlength-error="' . $this->escapeHtmlAttr($this->translate('password_minimum_length', array('%%minlength%%' => $this->passwordPolicy['minLength']))) . '"' : ''?><?=isset($this->passwordPolicy['maxLength']) ? ' maxlength="' . $this->passwordPolicy['maxLength'] . '"' : ''?>/>
-    <div class="help-block with-errors"></div>
-  </div>
-</div>
-<div class="form-group">
-  <label class="col-sm-3 control-label"><?=$this->transEsc('confirm_new_password') ?>:</label>
-  <div class="col-sm-9">
-    <input type="password" name="password2" class="form-control" required aria-required="true" data-match="#password" data-match-error="<?=$this->escapeHtmlAttr($this->translate('Passwords do not match'))?>"/>
-    <div class="help-block with-errors"></div>
-  </div>
-</div>
diff --git a/themes/jquerymobile/templates/Auth/ILS/newpassword.phtml b/themes/jquerymobile/templates/Auth/AbstractBase/newpassword.phtml
similarity index 100%
rename from themes/jquerymobile/templates/Auth/ILS/newpassword.phtml
rename to themes/jquerymobile/templates/Auth/AbstractBase/newpassword.phtml
diff --git a/themes/jquerymobile/templates/Auth/Database/newpassword.phtml b/themes/jquerymobile/templates/Auth/Database/newpassword.phtml
deleted file mode 100644
index 4c0b2d107fd..00000000000
--- a/themes/jquerymobile/templates/Auth/Database/newpassword.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<div data-role="fieldcontain" class="ui-field-contain ui-body ui-br">
-  <? if (isset($this->username)): ?>
-    <input type="hidden" name="username" value="<?=$this->username ?>"/>
-    <label class="ui-input-text"><?=$this->transEsc('Username') ?>:</label>
-    <input type="text" name="username" id="username" value="<?=$this->username ?>" disabled class="ui-input-text ui-body-c ui-corner-all ui-shadow-inset" style="border:1px solid #CCC;box-shadow:rgba(0, 0, 0, 0.1) 0px 1px 4px 0px inset;color:#777"/><br/>
-  <? endif; ?>
-  <? if (isset($this->verifyold) && $this->verifyold || isset($this->oldpwd)): ?>
-    <label for="oldpwd" class="ui-input-text"><?=$this->transEsc('old_password') ?>:</label>
-    <input type="password" name="oldpwd" id="oldpwd" class="ui-input-text ui-body-c ui-corner-all ui-shadow-inset"/><br/>
-  <? endif; ?>
-  <label for="password" class="ui-input-text"><?=$this->transEsc('new_password') ?>:</label>
-  <input type="password" name="password" id="password" class="ui-input-text ui-body-c ui-corner-all ui-shadow-inset"/><br/>
-  <label for="password2" class="ui-input-text"><?=$this->transEsc('confirm_new_password') ?>:</label>
-  <input type="password" name="password2" id="password2" class="ui-input-text ui-body-c ui-corner-all ui-shadow-inset"/><br/>
-</div>
\ No newline at end of file
diff --git a/themes/jquerymobile/templates/Auth/MultiILS/newpassword.phtml b/themes/jquerymobile/templates/Auth/MultiILS/newpassword.phtml
deleted file mode 100644
index 7ac88888f69..00000000000
--- a/themes/jquerymobile/templates/Auth/MultiILS/newpassword.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<div data-role="fieldcontain" class="ui-field-contain ui-body ui-br">
-  <? if (isset($this->username)): ?>
-    <input type="hidden" name="username" value="<?=$this->username ?>"/>
-    <label class="ui-input-text"><?=$this->transEsc('Username') ?>:</label>
-    <input type="text" name="username" id="username" value="<?=$this->username ?>" disabled class="ui-input-text ui-body-c ui-corner-all ui-shadow-inset" style="border:1px solid #CCC;box-shadow:rgba(0, 0, 0, 0.1) 0px 1px 4px 0px inset;color:#777"/><br/>
-  <? endif; ?>
-  <? if (isset($this->verifyold) && $this->verifyold || isset($this->oldpwd)): ?>
-    <label for="oldpwd" class="ui-input-text"><?=$this->transEsc('old_password') ?>:</label>
-    <input type="password" name="oldpwd" id="oldpwd" class="ui-input-text ui-body-c ui-corner-all ui-shadow-inset"/><br/>
-  <? endif; ?>
-  <label for="password" class="ui-input-text"><?=$this->transEsc('new_password') ?>:</label>
-  <input type="password" name="password" id="password" class="ui-input-text ui-body-c ui-corner-all ui-shadow-inset"/><br/>
-  <label for="password2" class="ui-input-text"><?=$this->transEsc('confirm_new_password') ?>:</label>
-  <input type="password" name="password2" id="password2" class="ui-input-text ui-body-c ui-corner-all ui-shadow-inset"/><br/>
-</div>
-- 
GitLab