From a6f3a570c68440eeb51d8b25cf7a1cef0f723a15 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 27 Oct 2012 19:42:25 +0200 Subject: dont resize content div with javascript but use css box-sizing to do it --- core/js/js.js | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'core/js/js.js') diff --git a/core/js/js.js b/core/js/js.js index c5e32f3c278..3bc988a2b6e 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -464,44 +464,8 @@ function object(o) { } -/** - * Fills height of window. (more precise than height: 100%;) - */ -function fillHeight(selector) { - if (selector.length === 0) { - return; - } - var height = parseFloat($(window).height())-selector.offset().top; - selector.css('height', height + 'px'); - if(selector.outerHeight() > selector.height()){ - selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px'); - } -} - -/** - * Fills height and width of window. (more precise than height: 100%; or width: 100%;) - */ -function fillWindow(selector) { - if (selector.length === 0) { - return; - } - fillHeight(selector); - var width = parseFloat($(window).width())-selector.offset().left; - selector.css('width', width + 'px'); - if(selector.outerWidth() > selector.width()){ - selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px'); - } -} - $(document).ready(function(){ - $(window).resize(function () { - fillHeight($('#leftcontent')); - fillWindow($('#content')); - fillWindow($('#rightcontent')); - }); - $(window).trigger('resize'); - if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg replaceSVG(); }else{ -- cgit v1.2.3 From 71435ac1ccdceb75342202c86a763b4f3f7c8b0e Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 28 Oct 2012 16:47:25 +0100 Subject: improve user menu --- core/css/styles.css | 7 ++++--- core/js/js.js | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'core/js/js.js') diff --git a/core/css/styles.css b/core/css/styles.css index 677d44658e8..bacb6367e86 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -106,9 +106,10 @@ label.infield { cursor: text !important; } #expand:hover, #expand:focus, #expand:active { color:#fff; } #expand img { opacity:.5; margin-bottom:-2px; } #expand:hover img, #expand:focus img, #expand:active img { opacity:1; } -#expanddiv { position:absolute; right:0; background-color:rgb(29, 45, 68); } -#expanddiv a { color:#ccc; padding:5px 8px; } -#expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { color:#fff; } +#expanddiv { position:absolute; right:0; top:45px; background-color:#eee; border-bottom-left-radius:7px; box-shadow: 0 0 20px #888888; z-index:76; } +#expanddiv a { display:block; color:#222; text-shadow:0 1px 0 #fff; padding:0 8px; } +#expanddiv a img { margin-bottom:-3px; } +#expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { color:#555; background-color:#ddd; } /* VARIOUS REUSABLE SELECTORS */ .hidden { display:none; } diff --git a/core/js/js.js b/core/js/js.js index 6ed50b42bd5..d0399063cfc 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -590,9 +590,7 @@ $(document).ready(function(){ event.stopPropagation(); }); $(window).click(function(){//hide the settings menu when clicking outside it - if($('body').attr("id")==="body-user"){ - $('#settings #expanddiv').slideUp(); - } + $('#settings #expanddiv').slideUp(); }); // all the tipsy stuff needs to be here (in reverse order) to work -- cgit v1.2.3 From c4b8bb10411a4d601b7f4c8758980005f14850ab Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Mon, 29 Oct 2012 01:14:07 +0100 Subject: added old functions again to not break apps, but show a deprecation warning --- core/js/js.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'core/js/js.js') diff --git a/core/js/js.js b/core/js/js.js index ee8bdea7255..a30d66c00b8 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -468,6 +468,36 @@ function object(o) { return new F(); } +/** + * Fills height of window. (more precise than height: 100%;) + */ +function fillHeight(selector) { + if (selector.length === 0) { + return; + } + var height = parseFloat($(window).height())-selector.offset().top; + selector.css('height', height + 'px'); + if(selector.outerHeight() > selector.height()){ + selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px'); + } + console.warn("This function is deprecated! Use CSS instead"); +} + +/** + * Fills height and width of window. (more precise than height: 100%; or width: 100%;) + */ +function fillWindow(selector) { + if (selector.length === 0) { + return; + } + fillHeight(selector); + var width = parseFloat($(window).width())-selector.offset().left; + selector.css('width', width + 'px'); + if(selector.outerWidth() > selector.width()){ + selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px'); + } + console.warn("This function is deprecated! Use CSS instead"); +} $(document).ready(function(){ -- cgit v1.2.3 From 5dd2c9152e86a5b4e0ca050aa1aca29ce3b813b1 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 1 Feb 2013 00:14:39 +0100 Subject: fix breadcrumbs for gallery and texteditor --- core/js/js.js | 1 - 1 file changed, 1 deletion(-) (limited to 'core/js/js.js') diff --git a/core/js/js.js b/core/js/js.js index 42d31a8c482..bfc972c786f 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -354,7 +354,6 @@ OC.Breadcrumb={ } var crumb=$('
'); crumb.addClass('crumb').addClass('last'); - crumb.attr('style','background-image:url("'+OC.imagePath('core','breadcrumb')+'")'); var crumbLink=$(''); crumbLink.attr('href',link); -- cgit v1.2.3 From 3bcf3c91e18e5863cb6b6a34eb80ae218f028022 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Fri, 25 Jan 2013 15:22:10 +0530 Subject: Password Toggle Support for Login --- core/css/styles.css | 12 +++++++-- core/img/actions/toggle.png | Bin 0 -> 515 bytes core/img/actions/toggle.svg | 61 ++++++++++++++++++++++++++++++++++++++++++++ core/js/js.js | 1 + core/templates/login.php | 6 +++-- 5 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 core/img/actions/toggle.png create mode 100644 core/img/actions/toggle.svg (limited to 'core/js/js.js') diff --git a/core/css/styles.css b/core/css/styles.css index e10a4c7fbe1..8bca96349ad 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -52,12 +52,19 @@ input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; } input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; } #quota { cursor:default; } + /* SCROLLING */ ::-webkit-scrollbar { width:8px; } ::-webkit-scrollbar-track-piece { background-color:transparent; } ::-webkit-scrollbar-thumb { background:#ddd; } +#show { float: right; position: absolute; right: 1em; top: 0.8em; display:none; } +#login form input[name="show"] + label { background: url("../img/actions/toggle.png") no-repeat; opacity:0.3; +float: right; width: 24px; position: absolute !important; height: 14px; right: 1em; top: 1.25em;} +#login form input[name="show"]:checked + label { background:url("../img/actions/toggle.png") no-repeat; opacity:0.8; } + + /* BUTTONS */ input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { width:auto; padding:.4em; @@ -141,12 +148,13 @@ 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, #adminpass+label, #user+label, #password+label { left:2.2em; } #adminlogin+label+img, #adminpass+label+img, #user+label+img, #password+label+img { position:absolute; left:1.25em; top:1.65em; opacity:.3; } #adminpass+label+img, #password+label+img { top:1.1em; } +input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; } +#pass_image { position: absolute; top: 1.2em; left: 1.4em; opacity: 0.3; } /* Nicely grouping input field sets */ @@ -170,7 +178,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b /* NEEDED FOR INFIELD LABELS */ p.infield { position:relative; } label.infield { cursor:text !important; top:1.05em; left:.85em; } -#login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; } +#login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; padding-left:1.2em; } #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; } #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; } diff --git a/core/img/actions/toggle.png b/core/img/actions/toggle.png new file mode 100644 index 00000000000..6ef3f2227b7 Binary files /dev/null and b/core/img/actions/toggle.png differ diff --git a/core/img/actions/toggle.svg b/core/img/actions/toggle.svg new file mode 100644 index 00000000000..82a5171477e --- /dev/null +++ b/core/img/actions/toggle.svg @@ -0,0 +1,61 @@ + + + +image/svg+xml + + + + + \ No newline at end of file diff --git a/core/js/js.js b/core/js/js.js index bfc972c786f..6b0c289850c 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -622,6 +622,7 @@ $(document).ready(function(){ }); // 'show password' checkbox + $('#password').showPassword(); $('#pass2').showPassword(); //use infield labels diff --git a/core/templates/login.php b/core/templates/login.php index c82d2cafa2e..59b685eabff 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -30,10 +30,12 @@

- /> - + + +

-- cgit v1.2.3 From c0b370f6cf8bf2ec3f4af921fc9f6935238ca41d Mon Sep 17 00:00:00 2001 From: Bart Visscher 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 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