Attachment 9893 Details for Bug 48868 – patch

[patch] patch

computerroom_grid.patch (text/plain), 2.31 KB, created by Johannes Keiser on 2019-03-05 18:51:57 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Keiser

Created: 2019-03-05 18:51:57 CET

Size: 2.31 KB

patch

obsolete

>diff --git a/ucs-school-umc-computerroom/umc/js/computerroom.css b/ucs-school-umc-computerroom/umc/js/computerroom.css
>new file mode 100644
>index 000000000..934ff4646
>--- /dev/null
>+++ b/ucs-school-umc-computerroom/umc/js/computerroom.css
>@@ -0,0 +1,15 @@
>+.computerroomGrid .umcGridHeader {
>+	display: block !important;
>+}
>+
>+.computerroomGrid .umcGrid__toolbar {
>+	float: left !important;
>+}
>+.computerroomGrid .umcGrid__contextWrapper {
>+	float: left !important;
>+}
>+
>+.computerroomGrid .umcGridStatus {
>+	width: 100% !important;
>+}
>+
>diff --git a/ucs-school-umc-computerroom/umc/js/computerroom.js b/ucs-school-umc-computerroom/umc/js/computerroom.js
>index 504721c88..fd709f204 100644
>--- a/ucs-school-umc-computerroom/umc/js/computerroom.js
>+++ b/ucs-school-umc-computerroom/umc/js/computerroom.js
>@@ -61,7 +61,8 @@ define([
> 	"umc/widgets/ProgressBar",
> 	"umc/modules/computerroom/ScreenshotView",
> 	"umc/modules/computerroom/SettingsDialog",
>-	"umc/i18n!umc/modules/computerroom"
>+	"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, _) {
>@@ -169,7 +170,7 @@ define([
> 				type: Text,
> 				name: 'examEndTime',
> 				'class': 'dijitButtonText umcExamEndTimeButton',
>-				style: 'display: inline-block; vertical-align: middle;',
>+				style: 'display: inline-block; vertical-align: middle; padding: 0 16px;',
> 				visible: false
> 			}, {
> 				name: 'collect',
>@@ -724,8 +725,10 @@ define([
> 			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) {
>@@ -772,6 +775,7 @@ define([
> 			array.forEach(this._headActionsTop, addButtonTo(_containerTop));
> 
> 			this._grid._header.addChild(_containerRight);
>+			this._grid._header.addChild(this._grid._statusMessage);
> 			this._grid._header.addChild(_containerTop, 0);
> 		},
>

Actions: View | Diff

Attachments on bug 48868: 9893