View | Details | Raw Unified | Return to bug 40492 | Differences between
and this patch

Collapse All | Expand All

(-)univention-management-console-frontend/debian/changelog (+6 lines)
 Lines 1-3    Link Here 
1
univention-management-console-frontend (5.0.63-53) unstable; urgency=medium
2
3
  * Bug #40492: Hide overflow on session timeout 
4
5
 -- Jürn Brodersen <brodersen@univention.de>  Tue, 29 Nov 2016 12:53:00 +0100
6
1
univention-management-console-frontend (5.0.63-52) unstable; urgency=medium
7
univention-management-console-frontend (5.0.63-52) unstable; urgency=medium
2
8
3
  * Bug #42979: Added english banner for the Univention Summit message
9
  * Bug #42979: Added english banner for the Univention Summit message
(-)univention-management-console-frontend/umc/dialog/LoginDialog.js (-3 / +13 lines)
 Lines 26-32    Link Here 
26
 * /usr/share/common-licenses/AGPL-3; if not, see
26
 * /usr/share/common-licenses/AGPL-3; if not, see
27
 * <http://www.gnu.org/licenses/>.
27
 * <http://www.gnu.org/licenses/>.
28
 */
28
 */
29
/*global define console window setTimeout require*/
29
/*global define, console, window, setTimeout, require*/
30
30
31
define([
31
define([
32
	"dojo/_base/declare",
32
	"dojo/_base/declare",
 Lines 222-228    Link Here 
222
						}));
222
						}));
223
						return;
223
						return;
224
					}
224
					}
225
					if (name == 'umcLoginForm') {
225
					if (name === 'umcLoginForm') {
226
						this._submitFakeForm();
226
						this._submitFakeForm();
227
					}
227
					}
228
					// FIXME: if custom prompts and(!) new password is required we should just switch the view
228
					// FIXME: if custom prompts and(!) new password is required we should just switch the view
 Lines 252-258    Link Here 
252
			});
252
			});
253
253
254
			// validate new password form
254
			// validate new password form
255
			if (name == 'umcNewPasswordForm' && newPasswordInput.value && newPasswordInput.value !== newPasswordRetypeInput.value) {
255
			if (name === 'umcNewPasswordForm' && newPasswordInput.value && newPasswordInput.value !== newPasswordRetypeInput.value) {
256
				this.set('LoginMessage', '<h1>' + _('Changing password failed') + '</h1><p>' +  _('The passwords do not match, please retype again.') + '</p>');
256
				this.set('LoginMessage', '<h1>' + _('Changing password failed') + '</h1><p>' +  _('The passwords do not match, please retype again.') + '</p>');
257
				return;
257
				return;
258
			}
258
			}
 Lines 466-471    Link Here 
466
		_show: function() {
466
		_show: function() {
467
			var deferred;
467
			var deferred;
468
			query('#umcLoginWrapper').style('display', 'block');
468
			query('#umcLoginWrapper').style('display', 'block');
469
			query('body').style('overflow', 'hidden');
470
			if (has('safari')) {
471
				this._safariScrollPosY = window.scrollY;
472
				query('body').style('position', 'fixed');
473
			}
469
			query('#umcLoginDialog').style('opacity', '1');  // baseFx.fadeOut sets opacity to 0
474
			query('#umcLoginDialog').style('opacity', '1');  // baseFx.fadeOut sets opacity to 0
470
			this._setFocus();
475
			this._setFocus();
471
			if (has('ie') < 10) {
476
			if (has('ie') < 10) {
 Lines 518-523    Link Here 
518
			// hide the dialog
523
			// hide the dialog
519
			var hide = lang.hitch(this, function() {
524
			var hide = lang.hitch(this, function() {
520
				query('#umcLoginWrapper').style('display', 'none');
525
				query('#umcLoginWrapper').style('display', 'none');
526
				query('body').style('overflow', '');
527
				if (has('safari')) {
528
					query('body').style('position', '');
529
					window.scrollTo(0, this._safariScrollPosY);
530
				}
521
				Dialog._DialogLevelManager.hide(this);
531
				Dialog._DialogLevelManager.hide(this);
522
				this.standby(false);
532
				this.standby(false);
523
				try {
533
				try {
(-)univention-management-console-frontend-theme/debian/changelog (+6 lines)
 Lines 1-3    Link Here 
1
univention-management-console-frontend-theme (1.0.4-6) unstable; urgency=medium
2
3
  * Bug #40492: Show session timeout dialog centered to the viewport 
4
5
 -- Jürn Brodersen <brodersen@univention.de>  Fri, 18 Nov 2016 10:53:45 +0100
6
1
univention-management-console-frontend-theme (1.0.4-5) unstable; urgency=medium
7
univention-management-console-frontend-theme (1.0.4-5) unstable; urgency=medium
2
8
3
  Bug #38622:
9
  Bug #38622:
(-)univention-management-console-frontend-theme/dijit-claro-stylus/site/login.styl (-1 / +2 lines)
 Lines 1-10    Link Here 
1
@import "../variables";
1
@import "../variables";
2
2
3
#umcLoginWrapper {
3
#umcLoginWrapper {
4
	position: absolute;
4
	position: fixed;
5
	height: 100%;
5
	height: 100%;
6
	width: 100%;
6
	width: 100%;
7
	display: none;
7
	display: none;
8
	overflow: auto;
8
}
9
}
9
10
10
#umcLoginDialog, .umcLoginDialog {
11
#umcLoginDialog, .umcLoginDialog {

Return to bug 40492