From c0b370f6cf8bf2ec3f4af921fc9f6935238ca41d Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 7 Feb 2013 08:11:18 +0100
Subject: Define the variables that are expected to exist but won't be set in
 setup

---
 core/js/js.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 6b0c289850c..80914e954e5 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -5,6 +5,9 @@
  * To the end of config/config.php to enable debug mode.
  * The undefined checks fix the broken ie8 console
  */
+var oc_debug;
+var oc_webroot;
+var oc_requesttoken;
 if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") {
 	if (!window.console) {
 		window.console = {};
-- 
cgit v1.2.3


From a82d18d2f8e13edab296daaf2bda917381e78810 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 7 Feb 2013 21:13:57 +0100
Subject: Fill oc_webroot with the expected value

---
 core/js/js.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 80914e954e5..c137f734d91 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -8,6 +8,7 @@
 var oc_debug;
 var oc_webroot;
 var oc_requesttoken;
+oc_webroot = oc_webroot || location.pathname.substr(0, location.pathname.lastIndexOf('/'));
 if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") {
 	if (!window.console) {
 		window.console = {};
-- 
cgit v1.2.3


From b356b7065f406cd2e18ed7bb9842e292f888c8e4 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Fri, 8 Feb 2013 16:38:28 +0530
Subject: Password Toggle Works on Installation as well.

---
 core/css/styles.css             | 1 +
 core/js/js.js                   | 3 ++-
 core/templates/installation.php | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/css/styles.css b/core/css/styles.css
index cefab2d49ff..961c7fb7f3a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -155,6 +155,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 }
 #adminpass-icon, #password-icon { top:1.1em; }
 input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
+input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
 
 /* Nicely grouping input field sets */
 .grouptop input {
diff --git a/core/js/js.js b/core/js/js.js
index c137f734d91..4a1f8571cc7 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -626,7 +626,8 @@ $(document).ready(function(){
 	});
 
 	// 'show password' checkbox
-	$('#password').showPassword();	
+	$('#password').showPassword();
+	$('#adminpass').showPassword();	
 	$('#pass2').showPassword();
 
 	//use infield labels
diff --git a/core/templates/installation.php b/core/templates/installation.php
index f3d232b637e..19395b80efe 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -34,13 +34,13 @@
 	<?php endif; ?>
 	<fieldset id="adminaccount">
 		<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
-		<p class="infield grouptop">
-			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
+		<p class="infield grouptop">		
+			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />			
 			<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
-			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
+			<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 data-typetoggle="#show" />
+			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" />
 			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
 			<img class="svg" id="adminpass-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
 			<input type="checkbox" id="show" name="show" />
-- 
cgit v1.2.3


From d5f98a82aa5d1bee7971cb4c811b86083ce60ed6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 8 Feb 2013 18:44:52 +0100
Subject: fix-oc_webroot

---
 core/js/js.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index c137f734d91..5f1870eb6ce 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -8,7 +8,9 @@
 var oc_debug;
 var oc_webroot;
 var oc_requesttoken;
-oc_webroot = oc_webroot || location.pathname.substr(0, location.pathname.lastIndexOf('/'));
+if (typeof oc_webroot === "undefined") {
+	oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/'));
+}
 if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") {
 	if (!window.console) {
 		window.console = {};
-- 
cgit v1.2.3