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

Collapse All | Expand All

(-)a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/css/Grid.styl (-8 / +32 lines)
 Lines 4-26    Link Here 
4
	overflow-y: scroll
4
	overflow-y: scroll
5
	overflow-x: hidden
5
	overflow-x: hidden
6
6
7
.umc .umcMultiSelect .dojoxGridView
7
.umc .umcMultiSelect
8
	min-width: 100%
8
	.dojoxGridMasterHeader
9
	max-width: 100%
9
		background-color: white
10
10
11
	.dojoxGridContent
11
		.dojoxGridHeader
12
			background-color: @background-color
13
			display: none
14
15
			^[-2].umcMultiSelectWithContent ^[-2..-1]
16
				display: block
17
18
			.dojoxGridCell
19
				background-color: @background-color
20
				color: $text-color
21
22
			.dijitCheckBox
23
				icon-image(0, -48, "", "-small", 12px, 12px)
24
				
25
				&.dijitCheckBoxChecked
26
					background-position: -48px -48px
27
28
	.dojoxGridView
12
		min-width: 100%
29
		min-width: 100%
13
		max-width: 100%
30
		max-width: 100%
14
31
15
		div[role="presentation"]
32
		^[-1].umcMultiSelectWithContent ^[-1..-1]
33
			border-top: 1px solid black
34
35
		.dojoxGridContent
36
			min-width: 100%
16
			max-width: 100%
37
			max-width: 100%
17
38
18
			.dojoxGridRow
39
			div[role="presentation"]
19
				max-width: 100%
40
				max-width: 100%
20
41
21
				.dojoxGridRowTable
42
				.dojoxGridRow
22
					width: 100% !important
43
					max-width: 100%
23
44
45
					.dojoxGridRowTable
46
						width: 100% !important
47
24
.umc .umcGrid
48
.umc .umcGrid
25
	background-color: #fff
49
	background-color: #fff
26
	material-shadow(1)
50
	material-shadow(1)
(-)a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/de.po (-1 / +5 lines)
 Lines 7-13    Link Here 
7
msgstr ""
7
msgstr ""
8
"Project-Id-Version: univention-management-console-frontend\n"
8
"Project-Id-Version: univention-management-console-frontend\n"
9
"Report-Msgid-Bugs-To: packages@univention.de\n"
9
"Report-Msgid-Bugs-To: packages@univention.de\n"
10
"POT-Creation-Date: 2017-06-20 18:42+0200\n"
10
"POT-Creation-Date: 2017-06-27 18:43+0200\n"
11
"PO-Revision-Date: 2013-09-12 11:31+0200\n"
11
"PO-Revision-Date: 2013-09-12 11:31+0200\n"
12
"Last-Translator: Univention GmbH <packages@univention.de>\n"
12
"Last-Translator: Univention GmbH <packages@univention.de>\n"
13
"Language-Team: Univention GmbH <packages@univention.de>\n"
13
"Language-Team: Univention GmbH <packages@univention.de>\n"
 Lines 357-362    Link Here 
357
msgid "Search term"
357
msgid "Search term"
358
msgstr "Suchbegriff"
358
msgstr "Suchbegriff"
359
359
360
#: widgets/MultiSelect.js:77
361
msgid "Select all"
362
msgstr "Alles auswählen"
363
360
#: tools.js:872
364
#: tools.js:872
361
msgid "Send as email"
365
msgid "Send as email"
362
msgstr "Als E-Mail senden"
366
msgstr "Als E-Mail senden"
(-)a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/MultiSelect.js (-7 / +9 lines)
 Lines 33-39    Link Here 
33
	"dojo/_base/lang",
33
	"dojo/_base/lang",
34
	"dojo/_base/array",
34
	"dojo/_base/array",
35
	"dojo/Deferred",
35
	"dojo/Deferred",
36
	"dojo/query",
37
	"dojo/dom-class",
36
	"dojo/dom-class",
38
	"dojox/grid/EnhancedGrid",
37
	"dojox/grid/EnhancedGrid",
39
	"../tools",
38
	"../tools",
 Lines 41-49    Link Here 
41
	"./_FormWidgetMixin",
40
	"./_FormWidgetMixin",
42
	"./StandbyMixin",
41
	"./StandbyMixin",
43
	"./_RegisterOnShowMixin",
42
	"./_RegisterOnShowMixin",
43
	"umc/i18n!",
44
	"dojox/grid/enhanced/plugins/IndirectSelection",
44
	"dojox/grid/enhanced/plugins/IndirectSelection",
45
	"dojox/grid/cells"
45
	"dojox/grid/cells"
46
], function(declare, lang, array, Deferred, query, domClass, EnhancedGrid, tools, _SelectMixin, _FormWidgetMixin, StandbyMixin, _RegisterOnShowMixin) {
46
], function(declare, lang, array, Deferred, domClass, EnhancedGrid, tools, _SelectMixin, _FormWidgetMixin, StandbyMixin, _RegisterOnShowMixin, _) {
47
	return declare("umc.widgets.MultiSelect", [ EnhancedGrid, _FormWidgetMixin, _SelectMixin, StandbyMixin, _RegisterOnShowMixin ], {
47
	return declare("umc.widgets.MultiSelect", [ EnhancedGrid, _FormWidgetMixin, _SelectMixin, StandbyMixin, _RegisterOnShowMixin ], {
48
		// summary:
48
		// summary:
49
		//		This class represents a MultiSelect widget. Essentially, it adapts a DataGrid
49
		//		This class represents a MultiSelect widget. Essentially, it adapts a DataGrid
 Lines 74-80    Link Here 
74
		// simple grid structure, only one column
74
		// simple grid structure, only one column
75
		structure: [{
75
		structure: [{
76
			field: 'label',
76
			field: 'label',
77
			name: 'Name',
77
			name: lang.replace('<b>{0}</b>', [_('Select all')]),
78
			width: '100%'
78
			width: '100%'
79
		}],
79
		}],
80
80
 Lines 99-107    Link Here 
99
		postCreate: function() {
99
		postCreate: function() {
100
			this.inherited(arguments);
100
			this.inherited(arguments);
101
101
102
			// hide the header
103
			query('.dojoxGridHeader', this.domNode).style('height', '0px');
104
105
			// send an onChange event when the selection has changed
102
			// send an onChange event when the selection has changed
106
			this.on('selectionChanged', lang.hitch(this, function() {
103
			this.on('selectionChanged', lang.hitch(this, function() {
107
				if (array.some(this.selection.getSelected(), function(v) { return v === null; })) {
104
				if (array.some(this.selection.getSelected(), function(v) { return v === null; })) {
 Lines 237-243    Link Here 
237
			// stop standby animation and re-render
234
			// stop standby animation and re-render
238
			this.standby(false);
235
			this.standby(false);
239
			this.render();
236
			this.render();
240
		}
237
		},
241
238
242
		/*adaptHeight: function() {
239
		/*adaptHeight: function() {
243
			this.inherited(arguments);
240
			this.inherited(arguments);
 Lines 247-252    Link Here 
247
				this.scroller.windowHeight = parseInt(this.height, 10);
244
				this.scroller.windowHeight = parseInt(this.height, 10);
248
			}
245
			}
249
		}*/
246
		}*/
247
248
		render: function() {
249
			domClass.toggle(this.domNode, 'umcMultiSelectWithContent', this.get('rowCount'));
250
			this.inherited(arguments);
251
		}
250
	});
252
	});
251
});
253
});
252
254

Return to bug 19928