Attachment #9893 for bug #48868

View | Details | Raw Unified | Return to bug 48868
Collapse All | Expand All




.computerroomGrid .umcGridHeader {
	display: block !important;
}

.computerroomGrid .umcGrid__toolbar {
	float: left !important;
}
.computerroomGrid .umcGrid__contextWrapper {
	float: left !important;
}

.computerroomGrid .umcGridStatus {
	width: 100% !important;
}





	"umc/widgets/ProgressBar",
	"umc/modules/computerroom/ScreenshotView",
	"umc/modules/computerroom/SettingsDialog",
	"umc/i18n!umc/modules/computerroom",
	"xstyle/css!./computerroom.css"
], function(declare, lang, array, ioQuery, aspect, on, topic, dom, domClass, Deferred, Observable, Memory, all, DijitProgressBar,
            Dialog, Tooltip, styles, entities, UMCApp, dialog, tools, Grid, Button, Module, Page, Form,
            ContainerWidget, Text, ComboBox, ProgressBar, ScreenshotView, SettingsDialog, _) {

				type: Text,
				name: 'examEndTime',
				'class': 'dijitButtonText umcExamEndTimeButton',
				style: 'display: inline-block; vertical-align: middle; padding: 0 16px;',
				visible: false
			}, {
				name: 'collect',

			this._objStore = new Observable(new Memory({ data: [], idProperty: 'id' }));

			this._grid = new Grid({
				'class': 'computerroomGrid',
				moduleStore: this._objStore,
				actions: lang.clone(this._actions),
				dontUpdateActionsVisibility: true,
				columns: columns,
				sortIndex: 1,
				footerFormatter: function(nItems, nItemsTotal) {

			array.forEach(this._headActionsTop, addButtonTo(_containerTop));

			this._grid._header.addChild(_containerRight);
			this._grid._header.addChild(this._grid._statusMessage);
			this._grid._header.addChild(_containerTop, 0);
		},


Return to bug 48868

Lines 61-67 define([ Link Here

(-)a/ucs-school-umc-computerroom/umc/js/computerroom.js (-2 / +6 lines)
61	"umc/widgets/ProgressBar",	61	"umc/widgets/ProgressBar",
62	"umc/modules/computerroom/ScreenshotView",	62	"umc/modules/computerroom/ScreenshotView",
63	"umc/modules/computerroom/SettingsDialog",	63	"umc/modules/computerroom/SettingsDialog",
64	"umc/i18n!umc/modules/computerroom"	64	"umc/i18n!umc/modules/computerroom",
		65	"xstyle/css!./computerroom.css"
65	], function(declare, lang, array, ioQuery, aspect, on, topic, dom, domClass, Deferred, Observable, Memory, all, DijitProgressBar,	66	], function(declare, lang, array, ioQuery, aspect, on, topic, dom, domClass, Deferred, Observable, Memory, all, DijitProgressBar,
66	Dialog, Tooltip, styles, entities, UMCApp, dialog, tools, Grid, Button, Module, Page, Form,	67	Dialog, Tooltip, styles, entities, UMCApp, dialog, tools, Grid, Button, Module, Page, Form,
67	ContainerWidget, Text, ComboBox, ProgressBar, ScreenshotView, SettingsDialog, _) {	68	ContainerWidget, Text, ComboBox, ProgressBar, ScreenshotView, SettingsDialog, _) {
Lines 169-175 define([ Link Here
169	type: Text,	170	type: Text,
170	name: 'examEndTime',	171	name: 'examEndTime',
171	'class': 'dijitButtonText umcExamEndTimeButton',	172	'class': 'dijitButtonText umcExamEndTimeButton',
172	style: 'display: inline-block; vertical-align: middle;',	173	style: 'display: inline-block; vertical-align: middle; padding: 0 16px;',
173	visible: false	174	visible: false
174	}, {	175	}, {
175	name: 'collect',	176	name: 'collect',
Lines 724-731 define([ Link Here
724	this._objStore = new Observable(new Memory({ data: [], idProperty: 'id' }));	725	this._objStore = new Observable(new Memory({ data: [], idProperty: 'id' }));
725		726
726	this._grid = new Grid({	727	this._grid = new Grid({
		728	'class': 'computerroomGrid',
727	moduleStore: this._objStore,	729	moduleStore: this._objStore,
728	actions: lang.clone(this._actions),	730	actions: lang.clone(this._actions),
		731	dontUpdateActionsVisibility: true,
729	columns: columns,	732	columns: columns,
730	sortIndex: 1,	733	sortIndex: 1,
731	footerFormatter: function(nItems, nItemsTotal) {	734	footerFormatter: function(nItems, nItemsTotal) {
Lines 772-777 define([ Link Here
772	array.forEach(this._headActionsTop, addButtonTo(_containerTop));	775	array.forEach(this._headActionsTop, addButtonTo(_containerTop));
773		776
774	this._grid._header.addChild(_containerRight);	777	this._grid._header.addChild(_containerRight);
		778	this._grid._header.addChild(this._grid._statusMessage);
775	this._grid._header.addChild(_containerTop, 0);	779	this._grid._header.addChild(_containerTop, 0);
776	},	780	},
777		781

Line 0 Link Here

(-)a/ucs-school-umc-computerroom/umc/js/computerroom.css (+15 lines)
	1	.computerroomGrid .umcGridHeader {
	2	display: block !important;
	3	}
	4
	5	.computerroomGrid .umcGrid__toolbar {
	6	float: left !important;
	7	}
	8	.computerroomGrid .umcGrid__contextWrapper {
	9	float: left !important;
	10	}
	11
	12	.computerroomGrid .umcGridStatus {
	13	width: 100% !important;
	14	}
	15