diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/apps.css | 4 | ||||
| -rw-r--r-- | core/css/inputs.css | 7 | ||||
| -rw-r--r-- | core/js/apps.js | 4 | ||||
| -rw-r--r-- | core/js/jquery.avatar.js | 6 | ||||
| -rw-r--r-- | core/js/js.js | 1 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 1 | ||||
| -rw-r--r-- | core/js/sharedialogview.js | 12 | ||||
| -rw-r--r-- | core/js/tests/specs/jquery.avatarSpec.js | 4 | ||||
| -rw-r--r-- | core/templates/installation.php | 4 |
9 files changed, 23 insertions, 20 deletions
diff --git a/core/css/apps.css b/core/css/apps.css index bef5c7c4937..ba1e1265655 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -43,6 +43,10 @@ box-sizing: border-box; } +#app-navigation.without-app-settings { + padding-bottom: 0; +} + #app-navigation .active.with-menu > a, #app-navigation .with-counter > a { padding-right: 50px; diff --git a/core/css/inputs.css b/core/css/inputs.css index 3d74ff38271..f2233395658 100644 --- a/core/css/inputs.css +++ b/core/css/inputs.css @@ -243,8 +243,8 @@ select:hover { #select2-drop .select2-search input { width: calc(100% - 14px); min-height: auto; - background: url('../img/actions/search.svg') no-repeat right center; - background-origin: content-box; + background: url('../img/actions/search.svg') no-repeat right center !important; + background-origin: content-box !important; } #select2-drop .select2-results { max-height: 250px; @@ -252,7 +252,6 @@ select:hover { padding: 0; } #select2-drop .select2-results .select2-result-label { - padding: 12px !important; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -340,7 +339,7 @@ select:hover { border: none; } .select2-container .select2-choice .select2-arrow b { - background: url('../img/actions/triangle-s.svg') no-repeat center; + background: url('../img/actions/triangle-s.svg') no-repeat center !important; opacity: .5; } .select2-container .select2-choice:hover .select2-arrow b, diff --git a/core/js/apps.js b/core/js/apps.js index 3b94aa1d87e..4daab5ce4c4 100644 --- a/core/js/apps.js +++ b/core/js/apps.js @@ -59,6 +59,10 @@ var registerAppsSlideToggle = function () { var buttons = $('[data-apps-slide-toggle]'); + if (buttons.length === 0) { + $('#app-navigation').addClass('without-app-settings'); + } + $(document).click(function (event) { if (dynamicSlideToggleEnabled) { diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index 754400acd7b..1abe70b79ea 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -29,7 +29,7 @@ * 3. $('.avatardiv').avatar(); * This will search the DOM for 'user' data, to use as the username. If there * is no username available it will default to a placeholder with the value of - * "x". The size will be determined the same way, as the second example. + * "?". The size will be determined the same way, as the second example. * * 4. $('.avatardiv').avatar('jdoe', 128, true); * This will behave like the first example, except it will also append random @@ -65,7 +65,7 @@ if (typeof(this.data('user')) !== 'undefined') { user = this.data('user'); } else { - this.imageplaceholder('x'); + this.imageplaceholder('?'); return; } } @@ -105,7 +105,7 @@ $div.imageplaceholder(user, result.data.displayname); } else { // User does not exist - $div.imageplaceholder(user, 'X'); + $div.imageplaceholder(user, '?'); $div.css('background-color', '#b9b9b9'); } } else { diff --git a/core/js/js.js b/core/js/js.js index 41041a42885..714529fe5d1 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1579,6 +1579,7 @@ OC.PasswordConfirmation = { } }, error: function() { + OC.PasswordConfirmation.requirePasswordConfirmation(self.callback); OC.Notification.showTemporary(t('core', 'Failed to authenticate, try again')); } }); diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index fc0734e9df4..3b5c1ae7199 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -149,6 +149,7 @@ var OCdialogs = { modal : modal, buttons : buttonlist }); + input.focus(); OCdialogs.dialogsCounter++; }); }, diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index 6377d16dd4c..f83a2675958 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -265,17 +265,11 @@ var text = item.label; if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) { - text = t('core', '{sharee} (group)', { - sharee: text - }); + text = t('core', '{sharee} (group)', { sharee: text }, undefined, { escape: false }); } else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) { - text = t('core', '{sharee} (remote)', { - sharee: text - }); + text = t('core', '{sharee} (remote)', { sharee: text }, undefined, { escape: false }); } else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) { - text = t('core', '{sharee} (email)', { - sharee: text - }); + text = t('core', '{sharee} (email)', { sharee: text }, undefined, { escape: false }); } var insert = $("<div class='share-autocomplete-item'/>"); var avatar = $("<div class='avatardiv'></div>").appendTo(insert); diff --git a/core/js/tests/specs/jquery.avatarSpec.js b/core/js/tests/specs/jquery.avatarSpec.js index f5caae10020..9bb10c41be7 100644 --- a/core/js/tests/specs/jquery.avatarSpec.js +++ b/core/js/tests/specs/jquery.avatarSpec.js @@ -65,7 +65,7 @@ describe('jquery.avatar tests', function() { $div.avatar(); - expect($div.imageplaceholder).toHaveBeenCalledWith('x'); + expect($div.imageplaceholder).toHaveBeenCalledWith('?'); }); describe('no avatar', function() { @@ -96,7 +96,7 @@ describe('jquery.avatar tests', function() { }) ); - expect($div.imageplaceholder).toHaveBeenCalledWith('foo', 'X'); + expect($div.imageplaceholder).toHaveBeenCalledWith('foo', '?'); }); it('show no placeholder', function() { diff --git a/core/templates/installation.php b/core/templates/installation.php index f7556988634..d3f5021821d 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -147,8 +147,6 @@ script('core', [ <?php endif; ?> <?php endif; ?> - <div class="icon-loading-dark float-spinner"> </div> - <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> <fieldset id="sqliteInformation" class="warning"> <legend><?php p($l->t('Performance warning'));?></legend> @@ -158,6 +156,8 @@ script('core', [ </fieldset> <?php endif ?> + <div class="icon-loading-dark float-spinner"> </div> + <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>"></div> <p class="info"> |