diff options
| -rw-r--r-- | apps/files/css/upload.css | 12 | ||||
| -rw-r--r-- | settings/css/settings.css | 3 | ||||
| -rw-r--r-- | settings/js/federationsettingsview.js | 2 | ||||
| -rw-r--r-- | settings/js/personal.js | 55 | ||||
| -rw-r--r-- | settings/templates/personal.php | 58 |
5 files changed, 25 insertions, 105 deletions
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css index abc09c3e99c..6f337a27578 100644 --- a/apps/files/css/upload.css +++ b/apps/files/css/upload.css @@ -118,7 +118,7 @@ margin-right: 3px; } .oc-dialog .fileexists th:first-child { - width: 230px; + width: 225px; } .oc-dialog .fileexists th label { font-weight: normal; @@ -147,16 +147,14 @@ background-size: 64px 64px; float: left; } + +.oc-dialog .fileexists .original, .oc-dialog .fileexists .replacement { float: left; - width: 230px; -} -.oc-dialog .fileexists .original { - float: left; - width: 230px; + width: 225px; } .oc-dialog .fileexists .conflicts { - overflow-y:scroll; + overflow-y: auto; max-height: 225px; } .oc-dialog .fileexists .conflict input[type='checkbox'] { diff --git a/settings/css/settings.css b/settings/css/settings.css index 991ebb0c05f..3f23fb6680d 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -586,6 +586,9 @@ span.version { margin-bottom: 8px; display: inline; } +form.section { + position: relative; +} .followupsection { display: block; padding: 0 30px 30px 30px; diff --git a/settings/js/federationsettingsview.js b/settings/js/federationsettingsview.js index b71b450546d..360167bfe43 100644 --- a/settings/js/federationsettingsview.js +++ b/settings/js/federationsettingsview.js @@ -83,7 +83,7 @@ if (field === 'avatar') { return; } - self.$('#' + field).keyUpDelayedOrEnter(_.bind(self._onInputChanged, self)); + self.$('#' + field).keyUpDelayedOrEnter(_.bind(self._onInputChanged, self), true); }); }, diff --git a/settings/js/personal.js b/settings/js/personal.js index 9045851ba0c..d1dd8c09ec1 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -46,61 +46,6 @@ jQuery.fn.keyUpDelayedOrEnter = function (callback, allowEmptyValue) { }); }; - -/** - * Post the email address change to the server. - */ -function changeEmailAddress () { - var emailInfo = $('#email'); - if (emailInfo.val() === emailInfo.defaultValue) { - return; - } - emailInfo.defaultValue = emailInfo.val(); - OC.msg.startSaving('#lostpassword .msg'); - var post = $("#lostpassword").serializeArray(); - $.ajax({ - type: 'PUT', - url: OC.generateUrl('/settings/users/{id}/mailAddress', {id: OC.currentUser}), - data: { - mailAddress: post[0].value - } - }).done(function(result){ - // I know the following 4 lines look weird, but that is how it works - // in jQuery - for success the first parameter is the result - // for failure the first parameter is the result object - OC.msg.finishedSaving('#lostpassword .msg', result); - }).fail(function(result){ - OC.msg.finishedError('#lostpassword .msg', result.responseJSON.message); - }); -} - -/** - * Post the display name change to the server. - */ -function changeDisplayName () { - if ($('#displayName').val() !== '') { - OC.msg.startSaving('#displaynameform .msg'); - // Serialize the data - var post = $("#displaynameform").serialize(); - // Ajax foo - $.post(OC.generateUrl('/settings/users/{id}/displayName', {id: OC.currentUser}), post, function (data) { - if (data.status === "success") { - $('#oldDisplayName').val($('#displayName').val()); - // update displayName on the top right expand button - $('#expandDisplayName').text($('#displayName').val()); - // update avatar if avatar is available - if(!$('#removeavatar').hasClass('hidden')) { - updateAvatar(); - } - } - else { - $('#newdisplayname').val(data.data.displayName); - } - OC.msg.finishedSaving('#displaynameform .msg', data); - }); - } -} - function updateAvatar (hidedefault) { var $headerdiv = $('#header .avatardiv'); var $displaydiv = $('#displayavatar .avatardiv'); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index caddfd9467c..a14982b9b74 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -66,9 +66,6 @@ </div> <?php endif; ?> -<?php -if($_['displayNameChangeSupported']) { -?> <div id="personal-settings-container"> <div class="personal-settings-setting-box"> <form id="displaynameform" class="section"> @@ -77,8 +74,12 @@ if($_['displayNameChangeSupported']) { <span class="icon-password"/> </h2> <input type="text" id="displayname" name="displayname" - value="<?php p($_['displayName']) ?>" - autocomplete="on" autocapitalize="off" autocorrect="off" /> + <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?> + value="<?php p($_['displayName']) ?>" + autocomplete="on" autocapitalize="off" autocorrect="off" /> + <?php if(!$_['displayNameChangeSupported']) { ?> + <span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span> + <?php } ?> <span class="icon-checkmark hidden"/> <input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>"> </form> @@ -90,10 +91,16 @@ if($_['displayNameChangeSupported']) { <span class="icon-password"/> </h2> <input type="email" name="email" id="email" value="<?php p($_['email']); ?>" - placeholder="<?php p($l->t('Your email address')); ?>" - autocomplete="on" autocapitalize="off" autocorrect="off" /> - <br /> - <em><?php p($l->t('For password recovery and notifications')); ?></em> + <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?> + placeholder="<?php p($l->t('Your email address')); ?>" + autocomplete="on" autocapitalize="off" autocorrect="off" /> + <?php if(!$_['displayNameChangeSupported']) { ?> + <span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span> + <?php } ?> + <?php if($_['displayNameChangeSupported']) { ?> + <br /> + <em><?php p($l->t('For password recovery and notifications')); ?></em> + <?php } ?> <span class="icon-checkmark hidden"/> <input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>"> </form> @@ -155,39 +162,6 @@ if($_['displayNameChangeSupported']) { <span class="msg"></span> </div> -<?php -} else { -?> -<div id="personal-settings-container" class="no-edit"> - <div id="displaynameform" class="section"> - <h2><?php p($l->t('Full name'));?></h2> - <span><?php if(isset($_['displayName'][0])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span> - </div> - <div id="emailform" class="section"> - <h2><?php p($l->t('Email')); ?></h2> - <span><?php if(isset($_['email'][0])) { p($_['email']); } else { p($l->t('No email address set')); }?></span> - </div> - <div id="phoneform" class="section"> - <h2><?php p($l->t('Phone')); ?></h2> - <span><?php if(isset($_['phone'][0])) { p($_['phone']); } else { p($l->t('No phone number set')); }?></span> - </div> - <div id="addressform" class="section"> - <h2><?php p($l->t('Address')); ?></h2> - <span><?php if(isset($_['address'][0])) { p($_['address']); } else { p($l->t('No address set')); }?></span> - </div> - <div id="websiteform" class="section"> - <h2><?php p($l->t('Website')); ?></h2> - <span><?php if(isset($_['website'][0])) { p($_['website']); } else { p($l->t('No website set')); }?></span> - </div> - <div id="twitterform" class="section"> - <h2><?php p($l->t('Twitter')); ?></h2> - <span><?php if(isset($_['twitter'][0])) { p($_['twitter']); } else { p($l->t('No twitter handle set')); }?></span> - </div> - -</div> -<?php -} -?> </div> <div id="groups" class="section"> |