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') 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') 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') 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 22812c5f0dc57b1598912cf51fd1e5b721519f2d Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Fri, 18 Jan 2013 22:38:44 +0100 Subject: replace live() with on() in core js --- apps/files/js/filelist.js | 8 ++++---- apps/files/js/files.js | 6 +++--- apps/files_external/js/dropbox.js | 4 ++-- apps/files_external/js/google.js | 6 +++--- apps/files_external/js/settings.js | 6 +++--- core/js/oc-vcategories.js | 4 ++-- core/js/share.js | 26 +++++++++++++------------- settings/js/users.js | 16 ++++++++-------- 8 files changed, 38 insertions(+), 38 deletions(-) (limited to 'core/js') diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 04b7d92e2c3..57c281f2fdc 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -335,7 +335,7 @@ var FileList={ $(document).ready(function(){ $('#notification').hide(); - $('#notification .undo').live('click', function(){ + $('#notification').on('click', '.undo', function(){ if (FileList.deleteFiles) { $.each(FileList.deleteFiles,function(index,file){ $('tr').filterAttr('data-file',file).show(); @@ -361,16 +361,16 @@ $(document).ready(function(){ FileList.lastAction = null; OC.Notification.hide(); }); - $('#notification .replace').live('click', function() { + $('#notification').on('click', '.replace', function() { OC.Notification.hide(function() { FileList.replace($('#notification').data('oldName'), $('#notification').data('newName'), $('#notification').data('isNewFile')); }); }); - $('#notification .suggest').live('click', function() { + $('#notification').on('click', '.suggest', function() { $('tr').filterAttr('data-file', $('#notification').data('oldName')).show(); OC.Notification.hide(); }); - $('#notification .cancel').live('click', function() { + $('#notification').on('click', '.cancel', function() { if ($('#notification').data('isNewFile')) { FileList.deleteCanceled = false; FileList.deleteFiles = [$('#notification').data('oldName')]; diff --git a/apps/files/js/files.js b/apps/files/js/files.js index c817d8431e2..9fd9b73a947 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -110,7 +110,7 @@ $(document).ready(function() { } // Triggers invisible file input - $('#upload a').live('click', function() { + $('#upload a').on('click', function() { $(this).parent().children('#file_upload_start').trigger('click'); return false; }); @@ -118,7 +118,7 @@ $(document).ready(function() { var lastChecked; // Sets the file link behaviour : - $('td.filename a').live('click',function(event) { + $('td.filename').on('click','a',function(event) { if (event.ctrlKey || event.shiftKey) { event.preventDefault(); if (event.shiftKey) { @@ -184,7 +184,7 @@ $(document).ready(function() { procesSelection(); }); - $('td.filename input:checkbox').live('change',function(event) { + $('#fileList').on('change', 'td.filename input:checkbox',function(event) { if (event.shiftKey) { var last = $(lastChecked).parent().parent().prevAll().length; var first = $(this).parent().parent().prevAll().length; diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js index c1e38640708..930d786c543 100644 --- a/apps/files_external/js/dropbox.js +++ b/apps/files_external/js/dropbox.js @@ -36,7 +36,7 @@ $(document).ready(function() { } }); - $('#externalStorage tbody tr input').live('keyup', function() { + $('#externalStorage tbody').on('keyup', 'tr input', function() { var tr = $(this).parent().parent(); if ($(tr).hasClass('OC_Filestorage_Dropbox') && $(tr).find('[data-parameter="configured"]').val() != 'true') { var config = $(tr).find('.configuration'); @@ -52,7 +52,7 @@ $(document).ready(function() { } }); - $('.dropbox').live('click', function(event) { + $('.dropbox').on('click', function(event) { event.preventDefault(); var app_key = $(this).parent().find('[data-parameter="app_key"]').val(); var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val(); diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js index 0b3c314eb5d..d26dc7f0014 100644 --- a/apps/files_external/js/google.js +++ b/apps/files_external/js/google.js @@ -33,7 +33,7 @@ $(document).ready(function() { } }); - $('#externalStorage tbody tr').live('change', function() { + $('#externalStorage tbody').on('change', 'tr', function() { if ($(this).hasClass('OC_Filestorage_Google') && $(this).find('[data-parameter="configured"]').val() != 'true') { if ($(this).find('.mountPoint input').val() != '') { if ($(this).find('.google').length == 0) { @@ -43,7 +43,7 @@ $(document).ready(function() { } }); - $('#externalStorage tbody tr .mountPoint input').live('keyup', function() { + $('#externalStorage tbody').on('keyup', 'tr .mountPoint input', function() { var tr = $(this).parent().parent(); if ($(tr).hasClass('OC_Filestorage_Google') && $(tr).find('[data-parameter="configured"]').val() != 'true' && $(tr).find('.google').length > 0) { if ($(this).val() != '') { @@ -54,7 +54,7 @@ $(document).ready(function() { } }); - $('.google').live('click', function(event) { + $('.google').on('click', function(event) { event.preventDefault(); var tr = $(this).parent().parent(); var configured = $(this).parent().find('[data-parameter="configured"]'); diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 0dc983ca8ad..75604ca4530 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -71,7 +71,7 @@ OC.MountConfig={ $(document).ready(function() { $('.chzn-select').chosen(); - $('#selectBackend').live('change', function() { + $('#selectBackend').on('change', function() { var tr = $(this).parent().parent(); $('#externalStorage tbody').append($(tr).clone()); $('#externalStorage tbody tr').last().find('.mountPoint input').val(''); @@ -135,11 +135,11 @@ $(document).ready(function() { return defaultMountPoint+append; } - $('#externalStorage td').live('change', function() { + $('#externalStorage').on('change', 'td', function() { OC.MountConfig.saveStorage($(this).parent()); }); - $('td.remove>img').live('click', function() { + $('td.remove>img').on('click', function() { var tr = $(this).parent().parent(); var mountPoint = $(tr).find('.mountPoint input').val(); if ( ! mountPoint) { diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js index 609703f2cc9..3e75767c49c 100644 --- a/core/js/oc-vcategories.js +++ b/core/js/oc-vcategories.js @@ -50,7 +50,7 @@ var OCCategories= { $('#category_dialog').remove(); }, open : function(event, ui) { - $('#category_addinput').live('input',function() { + $('#category_addinput').on('input',function() { if($(this).val().length > 0) { $('#category_addbutton').removeAttr('disabled'); } @@ -61,7 +61,7 @@ var OCCategories= { $('#category_addbutton').attr('disabled', 'disabled'); return false; }); - $('#category_addbutton').live('click',function(e) { + $('#category_addbutton').on('click',function(e) { e.preventDefault(); if($('#category_addinput').val().length > 0) { OCCategories.add($('#category_addinput').val()); diff --git a/core/js/share.js b/core/js/share.js index 0c45765bd8b..f42124d0e00 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -410,7 +410,7 @@ $(document).ready(function() { firstDay: firstDay }); } - $('a.share').live('click', function(event) { + $('a.share').on('click', function(event) { event.stopPropagation(); if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) { var itemType = $(this).data('item-type'); @@ -444,12 +444,12 @@ $(document).ready(function() { } }); - $('#shareWithList li').live('mouseenter', function(event) { + $('#shareWithList').on('mouseenter', 'li', function(event) { // Show permissions and unshare button $(':hidden', this).filter(':not(.cruds)').show(); }); - $('#shareWithList li').live('mouseleave', function(event) { + $('#shareWithList').on('mouseleave', 'li', function(event) { // Hide permissions and unshare button if (!$('.cruds', this).is(':visible')) { $('a', this).hide(); @@ -462,11 +462,11 @@ $(document).ready(function() { } }); - $('.showCruds').live('click', function() { + $('.showCruds').on('click', function() { $(this).parent().find('.cruds').toggle(); }); - $('.unshare').live('click', function() { + $('.unshare').on('click', function() { var li = $(this).parent(); var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); @@ -483,7 +483,7 @@ $(document).ready(function() { }); }); - $('.permissions').live('change', function() { + $('.permissions').on('change', function() { if ($(this).attr('name') == 'edit') { var li = $(this).parent().parent() var checkboxes = $('.permissions', li); @@ -510,7 +510,7 @@ $(document).ready(function() { OC.Share.setPermissions($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), $(li).data('share-type'), $(li).data('share-with'), permissions); }); - $('#linkCheckbox').live('change', function() { + $('#linkCheckbox').on('change', function() { var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); if (this.checked) { @@ -532,12 +532,12 @@ $(document).ready(function() { } }); - $('#linkText').live('click', function() { + $('#linkText').on('click', function() { $(this).focus(); $(this).select(); }); - $('#showPassword').live('click', function() { + $('#showPassword').on('click', function() { $('#linkPass').toggle('blind'); if (!$('#showPassword').is(':checked') ) { var itemType = $('#dropdown').data('item-type'); @@ -548,7 +548,7 @@ $(document).ready(function() { } }); - $('#linkPassText').live('focusout keyup', function(event) { + $('#linkPassText').on('focusout keyup', function(event) { if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) { var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); @@ -560,7 +560,7 @@ $(document).ready(function() { } }); - $('#expirationCheckbox').live('click', function() { + $('#expirationCheckbox').on('click', function() { if (this.checked) { OC.Share.showExpirationDate(''); } else { @@ -575,7 +575,7 @@ $(document).ready(function() { } }); - $('#expirationDate').live('change', function() { + $('#expirationDate').on('change', function() { var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) { @@ -586,7 +586,7 @@ $(document).ready(function() { }); - $('#emailPrivateLink').live('submit', function(event) { + $('#emailPrivateLink').on('submit', function(event) { event.preventDefault(); var link = $('#linkText').val(); var itemType = $('#dropdown').data('item-type'); diff --git a/settings/js/users.js b/settings/js/users.js index 424d00b51a7..0ee813f4cb3 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -262,7 +262,7 @@ $(document).ready(function () { UserList.applyMultiplySelect($(element)); }); - $('td.remove>a').live('click', function (event) { + $('table').on('click', 'td.remove>a', function (event) { var row = $(this).parent().parent(); var uid = $(row).attr('data-uid'); $(row).hide(); @@ -270,7 +270,7 @@ $(document).ready(function () { UserList.do_delete(uid); }); - $('td.password>img').live('click', function (event) { + $('table').on('click', 'td.password>img', function (event) { event.stopPropagation(); var img = $(this); var uid = img.parent().parent().attr('data-uid'); @@ -298,11 +298,11 @@ $(document).ready(function () { img.css('display', ''); }); }); - $('td.password').live('click', function (event) { + $('table').on('click', 'td.password', function (event) { $(this).children('img').click(); }); - $('td.displayName>img').live('click', function (event) { + $('table').on('click', 'td.displayName>img', function (event) { event.stopPropagation(); var img = $(this); var uid = img.parent().parent().attr('data-uid'); @@ -336,7 +336,7 @@ $(document).ready(function () { }); - $('select.quota, select.quota-user').live('change', function () { + $('select.quota, select.quota-user').on('change', function () { var select = $(this); var uid = $(this).parent().parent().parent().attr('data-uid'); var quota = $(this).val(); @@ -355,7 +355,7 @@ $(document).ready(function () { $(select).data('previous', $(select).val()); }) - $('input.quota-other').live('change', function () { + $('input.quota-other').on('change', function () { var uid = $(this).parent().parent().parent().attr('data-uid'); var quota = $(this).val(); var select = $(this).prev(); @@ -391,7 +391,7 @@ $(document).ready(function () { } }); - $('input.quota-other').live('blur', function () { + $('input.quota-other').on('blur', function () { $(this).change(); }) @@ -438,7 +438,7 @@ $(document).ready(function () { }); // Handle undo notifications OC.Notification.hide(); - $('#notification .undo').live('click', function () { + $('#notification').on('click', '.undo', function () { if ($('#notification').data('deleteuser')) { $('tbody tr').filterAttr('data-uid', UserList.deleteUid).show(); UserList.deleteCanceled = true; -- cgit v1.2.3 From d7823adb07072cfcfea746f2bb13ba4bdcc281f3 Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Wed, 30 Jan 2013 17:46:33 +0100 Subject: attach to filelist which is present on .ready() --- core/js/share.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'core/js') diff --git a/core/js/share.js b/core/js/share.js index f42124d0e00..6ad4130690d 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -410,7 +410,7 @@ $(document).ready(function() { firstDay: firstDay }); } - $('a.share').on('click', function(event) { + $('#fileList').on('click', 'a.share', function(event) { event.stopPropagation(); if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) { var itemType = $(this).data('item-type'); @@ -444,12 +444,12 @@ $(document).ready(function() { } }); - $('#shareWithList').on('mouseenter', 'li', function(event) { + $('#fileList').on('mouseenter', '#dropdown #shareWithList li', function(event) { // Show permissions and unshare button $(':hidden', this).filter(':not(.cruds)').show(); }); - $('#shareWithList').on('mouseleave', 'li', function(event) { + $('#fileList').on('mouseleave', '#dropdown #shareWithList li', function(event) { // Hide permissions and unshare button if (!$('.cruds', this).is(':visible')) { $('a', this).hide(); @@ -462,11 +462,11 @@ $(document).ready(function() { } }); - $('.showCruds').on('click', function() { + $('#fileList').on('click', '#dropdown .showCruds', function() { $(this).parent().find('.cruds').toggle(); }); - $('.unshare').on('click', function() { + $('#fileList').on('click', '#dropdown .unshare', function() { var li = $(this).parent(); var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); @@ -483,7 +483,7 @@ $(document).ready(function() { }); }); - $('.permissions').on('change', function() { + $('#fileList').on('change', '#dropdown .permissions', function() { if ($(this).attr('name') == 'edit') { var li = $(this).parent().parent() var checkboxes = $('.permissions', li); @@ -510,7 +510,7 @@ $(document).ready(function() { OC.Share.setPermissions($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), $(li).data('share-type'), $(li).data('share-with'), permissions); }); - $('#linkCheckbox').on('change', function() { + $('#fileList').on('change', '#dropdown #linkCheckbox', function() { var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); if (this.checked) { @@ -532,12 +532,12 @@ $(document).ready(function() { } }); - $('#linkText').on('click', function() { + $('#fileList').on('click', '#dropdown #linkText', function() { $(this).focus(); $(this).select(); }); - $('#showPassword').on('click', function() { + $('#fileList').on('click', '#dropdown #showPassword', function() { $('#linkPass').toggle('blind'); if (!$('#showPassword').is(':checked') ) { var itemType = $('#dropdown').data('item-type'); @@ -548,7 +548,7 @@ $(document).ready(function() { } }); - $('#linkPassText').on('focusout keyup', function(event) { + $('#fileList').on('focusout keyup', '#dropdown #linkPassText', function(event) { if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) { var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); @@ -560,7 +560,7 @@ $(document).ready(function() { } }); - $('#expirationCheckbox').on('click', function() { + $('#fileList').on('click', '#dropdown #expirationCheckbox', function() { if (this.checked) { OC.Share.showExpirationDate(''); } else { @@ -575,7 +575,7 @@ $(document).ready(function() { } }); - $('#expirationDate').on('change', function() { + $('#fileList').on('change', '#dropdown #expirationDate', function() { var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) { @@ -586,7 +586,7 @@ $(document).ready(function() { }); - $('#emailPrivateLink').on('submit', function(event) { + $('#fileList').on('submit', '#dropdown #emailPrivateLink', function(event) { event.preventDefault(); var link = $('#linkText').val(); var itemType = $('#dropdown').data('item-type'); -- cgit v1.2.3 From 9cd692a6d00623940a4dbf04045793e44d602569 Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Thu, 31 Jan 2013 17:00:05 +0100 Subject: use the same tooltip as for the password field --- core/js/js.js | 1 + 1 file changed, 1 insertion(+) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index 01e47edf268..9c8cf4aa625 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -672,6 +672,7 @@ $(document).ready(function(){ // all the tipsy stuff needs to be here (in reverse order) to work $('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true}); $('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true}); + $('.displayName .action').tipsy({gravity:'se', fade:true, live:true}); $('.password .action').tipsy({gravity:'se', fade:true, live:true}); $('#upload').tipsy({gravity:'w', fade:true}); $('.selectedActions a').tipsy({gravity:'s', fade:true, live:true}); -- 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') 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') 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