From f1c4f4c02051a722c6685d2cf7da277c793486d3 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 7 Feb 2017 16:59:12 -0600
Subject: [PATCH] Rename database password toggle
* otherwise submitting the form with the password show will be overwritten
* see https://github.com/nextcloud/server/blob/2c9d7eeb763d2f907eea8234f6c60a829a5d39f7/core/Controller/SetupController.php#L59
* seems to be a legacy fallback
* fixes #3381
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
core/css/guest.css | 12 ++++++------
core/templates/installation.php | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/core/css/guest.css b/core/css/guest.css
index f0383ea75cd..292ae40e8d6 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -257,26 +257,26 @@ label.infield {
}
/* Show password toggle */
-#show, #dbpassword {
+#show, #dbpassword-toggle {
position: absolute;
right: 1em;
top: .8em;
float: right;
}
-#show, #dbpassword, #personal-show {
+#show, #dbpassword-toggle, #personal-show {
display: none;
}
-#show + label, #dbpassword + label {
+#show + label, #dbpassword-toggle + label {
right: 21px;
top: 15px !important;
margin: -14px !important;
padding: 14px !important;
}
-#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label {
+#show:checked + label, #dbpassword-toggle:checked + label, #personal-show:checked + label {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
opacity: .8;
}
-#show + label, #dbpassword + label, #personal-show + label {
+#show + label, #dbpassword-toggle + label, #personal-show + label {
position: absolute !important;
height: 20px;
width: 24px;
@@ -286,7 +286,7 @@ label.infield {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
opacity: .3;
}
-#show + label:before, #dbpassword + label:before, #personal-show + label:before {
+#show + label:before, #dbpassword-toggle + label:before, #personal-show + label:before {
display: none;
}
#pass2, input[name="personal-password-clone"] {
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 2f645454128..058049d8946 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -108,13 +108,13 @@ script('core', [
autocomplete="off" autocapitalize="off" autocorrect="off">
</p>
<p class="groupmiddle">
- <input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword"
+ <input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword-toggle"
placeholder="<?php p($l->t( 'Database password' )); ?>"
value="<?php p($_['dbpass']); ?>"
autocomplete="off" autocapitalize="off" autocorrect="off">
<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
- <input type="checkbox" id="dbpassword" name="dbpassword">
- <label for="dbpassword"></label>
+ <input type="checkbox" id="dbpassword-toggle" name="dbpassword-toggle">
+ <label for="dbpassword-toggle"></label>
</p>
<p class="groupmiddle">
<label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label>
--
GitLab