From 952d88a28cf62387e861c8d796caecf5cbfc6afe Mon Sep 17 00:00:00 2001 From: Dawid Opis Date: Thu, 11 Aug 2011 16:37:20 +0200 Subject: [PATCH 1/3] fixed mysql/sqlite selection labels in installation screen --- core/css/styles.css | 4 ++++ core/templates/installation.php | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 05bb63e0f0..1ccdc0b398 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; } + /* 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/templates/installation.php b/core/templates/installation.php index 80c3c27308..180405860f 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -31,7 +31,10 @@

t( 'SQLite will be used.' ); ?>

-

/>

+

+ /> + +

@@ -41,7 +44,10 @@

t( 'MySQL will be used.' ); ?>

- /> +

+ /> + +

From 6b9cf8d2d546174cd212d9c9947d4eb253ff7384 Mon Sep 17 00:00:00 2001 From: Dawid Opis Date: Thu, 11 Aug 2011 16:38:54 +0200 Subject: [PATCH 2/3] fixed mysql/sqlite selection labels in installation screen --- core/css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index 1ccdc0b398..39e7bd2a5b 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -77,7 +77,7 @@ legend { padding:.2em; font-size:1.2em; } #login form p { clear:both; } #login form p label { float:left; position:static; margin:0; padding:0.1em;} -#login form p input { float:left; } +#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; } From 26ac7f0f1d532d27b6e0ebd74b1a0e44f9d5a239 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 11 Aug 2011 16:53:00 +0200 Subject: [PATCH 3/3] get rid of some js errors on the login screen --- apps/media/js/loader.js | 1 + core/js/js.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js index b7ef2fb7be..ef8647eeca 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/js/js.js b/core/js/js.js index dc8345545a..dd3f3b2ac3 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