Merge branch 'master' of git.kde.org:owncloud

4 files changed, 14 insertions, 3 deletions

diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
index b7ef2fb7be4..ef8647eeca5 100644
--- a/apps/media/js/loader.js
+++ b/apps/media/js/loader.js
@@ -49,6 +49,7 @@ $(document).ready(function() {
 		FileActions.setDefault('audio','Play');
 		FileActions.setDefault('application/ogg','Play');
 	}
+	var oc_current_user=OC.currentUser;
 	if(typeof PlayList==='undefined'){
 		if(typeof localStorage !== 'undefined' && localStorage){
 			if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]' && localStorage.getItem(oc_current_user+'oc_playlist_active')!='true'){
diff --git a/core/css/styles.css b/core/css/styles.css
index 05bb63e0f07..39e7bd2a5b0 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -75,6 +75,10 @@ legend { padding:.2em; font-size:1.2em; }
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
 #login form ul.errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 4em 0; padding:1em 1em 1em 5em; }
 
+#login form p { clear:both; }
+#login form p label { float:left; position:static; margin:0; padding:0.1em;}
+#login form p input { float:left; width: auto;}
+
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; }
 #navigation a { display:block; padding:.6em .5em .4em 2.5em; background:#eee 1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; }
diff --git a/core/js/js.js b/core/js/js.js
index dc8345545a6..dd3f3b2ac33 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -27,7 +27,7 @@ t.cache={};
 
 OC={
 	webroot:oc_webroot,
-	currentUser:oc_current_user,
+	currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
 	coreApps:['files','admin','log','search','settings','core','3rdparty'],
 	/**
 	 * get an absolute url to a file in an appen
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 80c3c273084..180405860f8 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -31,7 +31,10 @@
 		<p><?php echo $l->t( 'SQLite will be used.' ); ?></p>
 		<input type="hidden" id="dbtype" name="dbtype" value="sqlite" />
 		<?php else: ?>
-		<p><label class="sqlite" for="sqlite"><?php echo $l->t( 'SQLite' ); ?></label><input type="radio" name="dbtype" value='sqlite' id="sqlite" <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/></p>
+		<p>
+			<input type="radio" name="dbtype" value='sqlite' id="sqlite" <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/>
+			<label class="sqlite" for="sqlite"><?php echo $l->t( 'SQLite' ); ?></label>
+		</p>
 		<?php endif; ?>
 		<?php endif; ?>
 
@@ -41,7 +44,10 @@
 		<p><?php echo $l->t( 'MySQL will be used.' ); ?></p>
 		<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
 		<?php else: ?>
-		<label class="mysql" for="mysql">MySQL</label><input type="radio" name="dbtype" value='mysql' id="mysql" <?php OC_Helper::init_radio('dbtype','pgsql', 'mysql', 'sqlite'); ?>/>
+		<p>
+			<input type="radio" name="dbtype" value='mysql' id="mysql" <?php OC_Helper::init_radio('dbtype','pgsql', 'mysql', 'sqlite'); ?>/>
+			<label class="mysql" for="mysql">MySQL</label>
+		</p>
 		<?php endif; ?>
 		<?php endif; ?>