make show password toggle work for installation (once #1525 is fixed)

diff --git a/core/css/styles.css b/core/css/styles.css
index ebb59f08fa1ba64f98bb9df354722f3aae1a5cfd..cefab2d49ff39af12451e9016bbfce9c405565c4 100644 (file)
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -149,11 +149,11 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 
 /* Icons for username and password fields to better recognize them */
 #adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; }
-#adminlogin+label+img, #adminpass+label+img, #user+label+img, #password-icon {
+#adminlogin+label+img, #adminpass-icon, #user+label+img, #password-icon {
        position:absolute; left:1.25em; top:1.65em;
        opacity:.3;
 }
-#adminpass+label+img, #password-icon { top:1.1em; }
+#adminpass-icon, #password-icon { top:1.1em; }
 input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
 
 /* Nicely grouping input field sets */

diff --git a/core/templates/installation.php b/core/templates/installation.php
index 03c580c9b0b0c12c58bd5dd75cbd452c88da486b..f3d232b637e6e6d44f32684919f6791a4379b057 100644 (file)
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -40,9 +40,11 @@
                        <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
                </p>
                <p class="infield groupbottom">
-                       <input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required />
+                       <input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required data-typetoggle="#show" />
                        <label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
-                       <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
+                       <img class="svg" id="adminpass-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
+                       <input type="checkbox" id="show" name="show" />
+                       <label for="show"></label>
                </p>
        </fieldset>