Attachment #7327 for bug #36444

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




					type:			'Text',
					name:			'reboot_progress_text',
					label:			'',
					size:			'One',
					content:		_("The computer is now rebooting. ") +
									_("This may take some time. Please be patient. ") +
									_("During reboot, the connection to the system will be lost. ") +

				{
					type:			'Text',
					name:			'reboot_text',
					label:			' ',
					content:		_("In order to complete the recently executed action, it is required to reboot the system."),
					size:			'One',
					labelPosition:          'bottom'
				},
				// ------------------- Easy upgrade mode -------------------------
				{

					type:			'Text',
					name:			'easy_release_text',
					label:			'',
					content:		'easy_release_text',			// set in onLoaded event
					size:			'One'
				},
				{
					type:			'Text',
					// FIXME: Manual placement: should be done by the layout framework some day.
					style:			'width:500px;',
					name:			'easy_available_text',
					label:			' ',
					content:		'easy_available_text',		// changed in onLoaded event
					size:			'One',
					labelPosition:		'bottom'
				},
				// -------------------- Release updates --------------------------
				{

					// These dependencies establish the auto-refresh of the combobox
					// whenever the form itself has been reloaded.
					depends:		['ucs_version', 'erratalevel', 'serial', 'timestamp'],
					dynamicValues:		'updater/updates/query',
					size:			'One',
					style:			'width:300px;',
					onValuesLoaded:	lang.hitch(this, function(values) {
						// TODO check updater/installer/running, don't do anything if something IS running
						try


							// hide or show combobox, spacers and corresponding button
							this._form.showWidget('releases', to_show);
							this._form.showWidget('hspacer_180px', to_show);
							this._form.showWidget('vspacer_1em', to_show);

							var but = this._form._buttons.run_release_update;
							but.set('visible', to_show);

				{
					type:			'Text',
					label:			'',
					name:			'vspacer_1em',
					style:			'height:1em;'
				},
				{
					type:			'Text',
					label:			'',
					name:			'hspacer_180px',
					// FIXME Manual placement: should be done by the layout framework some day.
					style:			'width:180px;'
				},
				{
					type:			'Text',
					label:			'',
					name:			'ucs_version_text',
					content:		_("... loading data ..."),
					style:			'margin-bottom:1em',
					size:			'One'
				},
				{
					type:			'Text',
					label:			'',
					name:			'ucs_updates_text',
					content:		_("There are no release updates available."),
					size:			'One'
				},
				// ---------------------- Errata updates -----------------------
				{

				// -------------------- Package updates ------------------------
				{
					type:			'Text',
					label:			' ',
					name:			'package_update_text1',
					// FIXME Manual placement: should be done by the layout framework some day.
					content:		_("Package update status not yet checked"),
					size:			'One',
					labelPosition:		'bottom'
				},
				{
					type:			'Text',
					label:			'',
					name:			'erratalink',
					style:			'width:500px;margin-top:.5em;',
					content:		''
				},
				{
					type:			'Text',
					label:			'',
					name:			'app_center_updates_text',
					content:		_('... loading data ...'),
					size:			'Two'
				},
				{
					type:			'Text',
					label:			'',
					name:			'app_center_updates_apps',
					size:			'Two',
					content:		''
				}
			];

						this.onRunReleaseUpdate(release);
						topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'release-update');
					}),
					visible:	false,
					style:		'margin:0',
					size:		'One'
				},
				{
					name:		'run_packages_update',

							this.standbyDuring(distUpdgradeDeferred);
						}
						topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'package-update');
					}),
					style:		'margin:0',
					size:		'One'
				},
				// If refresh isn't automatic anymore... should we show a "Refresh" button?
	//			{

					callback:	lang.hitch(this, function() {
						this._reboot();
						topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'reboot');
					}),
					style:		'margin:0',
					size:		'One'
				},
				{
					name:		'easy_upgrade',

						// TODO check updater/installer/running, don't do action if a job is running
						this.onRunEasyUpgrade();
						topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'easy-upgrade');
					}),
					style:		'margin:0',
					size:		'One'
				}
			];


					layout:
					[
						['ucs_version_text'],
						['releases', 'run_release_update'],
						['releases', 'hspacer_180px', 'run_release_update'],
						['ucs_updates_text']
					]
				},

					label:		_("Package updates"),
					layout:
					[
						['package_update_text1', 'run_packages_update'],
						['erratalink', 'run_packages_update']
					]
				},
				{

			if (versionWithoutPatchlevel) {
				var erratalink = lang.replace('<a href="https://errata.software-univention.de/ucs/{version}/" target="_blank">{label}</a>', {
					version: versionWithoutPatchlevel,
					label: _('Detailed informations about the updates.')
				});
				return erratalink
			}
		},


					lang.hitch(this, function(data) {
						this._set_updates_button(data.result,
							data.result ?
								_("Package updates are available. %(link)s", {link: this._update_errata_link(this._form.gatherFormValues().ucs_version)}) :
								_("There are no package updates available."));
					}),
					lang.hitch(this, function() {

Return to bug 36444

Lines 79-84 Link Here

(-)UpdatesPage.js (-50 / +41 lines)
79	type: 'Text',	79	type: 'Text',
80	name: 'reboot_progress_text',	80	name: 'reboot_progress_text',
81	label: '',	81	label: '',
		82	size: 'One',
82	content: _("The computer is now rebooting. ") +	83	content: _("The computer is now rebooting. ") +
83	_("This may take some time. Please be patient. ") +	84	_("This may take some time. Please be patient. ") +
84	_("During reboot, the connection to the system will be lost. ") +	85	_("During reboot, the connection to the system will be lost. ") +
Lines 87-96 Link Here
87	{	88	{
88	type: 'Text',	89	type: 'Text',
89	name: 'reboot_text',	90	name: 'reboot_text',
90	label: '',	91	label: ' ',
91	content: _("In order to complete the recently executed action, it is required to reboot the system."),	92	content: _("In order to complete the recently executed action, it is required to reboot the system."),
92	// FIXME: Manual placement: should be done by the layout framework some day.	93	size: 'One',
93	style: 'width:500px;'	94	labelPosition: 'bottom'
94	},	95	},
95	// ------------------- Easy upgrade mode -------------------------	96	// ------------------- Easy upgrade mode -------------------------
96	{	97	{
Lines 105-119 Link Here
105	type: 'Text',	106	type: 'Text',
106	name: 'easy_release_text',	107	name: 'easy_release_text',
107	label: '',	108	label: '',
108	content: 'easy_release_text' // set in onLoaded event	109	content: 'easy_release_text', // set in onLoaded event
		110	size: 'One'
109	},	111	},
110	{	112	{
111	type: 'Text',	113	type: 'Text',
112	// FIXME: Manual placement: should be done by the layout framework some day.
113	style: 'width:500px;',
114	name: 'easy_available_text',	114	name: 'easy_available_text',
115	label: '',	115	label: ' ',
116	content: 'easy_available_text' // changed in onLoaded event	116	content: 'easy_available_text', // changed in onLoaded event
		117	size: 'One',
		118	labelPosition: 'bottom'
117	},	119	},
118	// -------------------- Release updates --------------------------	120	// -------------------- Release updates --------------------------
119	{	121	{
Lines 136-144 Link Here
136	// These dependencies establish the auto-refresh of the combobox	138	// These dependencies establish the auto-refresh of the combobox
137	// whenever the form itself has been reloaded.	139	// whenever the form itself has been reloaded.
138	depends: ['ucs_version', 'erratalevel', 'serial', 'timestamp'],	140	depends: ['ucs_version', 'erratalevel', 'serial', 'timestamp'],
139	dynamicValues: 'updater/updates/query',	141	dynamicValues: 'updater/updates/query',
140	// FIXME Manual placement: should be done by the layout framework some day.	142	size: 'One',
141	style: 'width:300px;',
142	onValuesLoaded: lang.hitch(this, function(values) {	143	onValuesLoaded: lang.hitch(this, function(values) {
143	// TODO check updater/installer/running, don't do anything if something IS running	144	// TODO check updater/installer/running, don't do anything if something IS running
144	try	145	try
Lines 236-243 Link Here
236		237
237	// hide or show combobox, spacers and corresponding button	238	// hide or show combobox, spacers and corresponding button
238	this._form.showWidget('releases', to_show);	239	this._form.showWidget('releases', to_show);
239	this._form.showWidget('hspacer_180px', to_show);
240	this._form.showWidget('vspacer_1em', to_show);
241		240
242	var but = this._form._buttons.run_release_update;	241	var but = this._form._buttons.run_release_update;
243	but.set('visible', to_show);	242	but.set('visible', to_show);
Lines 284-310 Link Here
284	{	283	{
285	type: 'Text',	284	type: 'Text',
286	label: '',	285	label: '',
287	name: 'vspacer_1em',
288	style: 'height:1em;'
289	},
290	{
291	type: 'Text',
292	label: '',
293	name: 'hspacer_180px',
294	// FIXME Manual placement: should be done by the layout framework some day.
295	style: 'width:180px;'
296	},
297	{
298	type: 'Text',
299	label: '',
300	name: 'ucs_version_text',	286	name: 'ucs_version_text',
301	content: _("... loading data ...")	287	content: _("... loading data ..."),
		288	style: 'margin-bottom:1em',
		289	size: 'One'
302	},	290	},
303	{	291	{
304	type: 'Text',	292	type: 'Text',
305	label: '',	293	label: '',
306	name: 'ucs_updates_text',	294	name: 'ucs_updates_text',
307	content: _("There are no release updates available.")	295	content: _("There are no release updates available."),
		296	size: 'One'
308	},	297	},
309	// ---------------------- Errata updates -----------------------	298	// ---------------------- Errata updates -----------------------
310	{	299	{
Lines 314-342 Link Here
314	// -------------------- Package updates ------------------------	303	// -------------------- Package updates ------------------------
315	{	304	{
316	type: 'Text',	305	type: 'Text',
317	label: '',	306	label: ' ',
318	name: 'package_update_text1',	307	name: 'package_update_text1',
319	// FIXME Manual placement: should be done by the layout framework some day.	308	// FIXME Manual placement: should be done by the layout framework some day.
320	content: _("Package update status not yet checked")	309	content: _("Package update status not yet checked"),
		310	size: 'One',
		311	labelPosition: 'bottom'
321	},	312	},
322	{	313	{
323	type: 'Text',	314	type: 'Text',
324	label: '',	315	label: '',
325	name: 'erratalink',
326	style: 'width:500px;margin-top:.5em;',
327	content: ''
328	},
329	{
330	type: 'Text',
331	label: '',
332	name: 'app_center_updates_text',	316	name: 'app_center_updates_text',
333	content: _('... loading data ...')	317	content: _('... loading data ...'),
		318	size: 'Two'
334	},	319	},
335	{	320	{
336	type: 'Text',	321	type: 'Text',
337	label: '',	322	label: '',
338	name: 'app_center_updates_apps',	323	name: 'app_center_updates_apps',
339	style: 'width:500px;margin-top:.5em;',	324	size: 'Two',
340	content: ''	325	content: ''
341	}	326	}
342	];	327	];
Lines 357-363 Link Here
357	this.onRunReleaseUpdate(release);	342	this.onRunReleaseUpdate(release);
358	topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'release-update');	343	topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'release-update');
359	}),	344	}),
360	visible: false	345	visible: false,
		346	style: 'margin:0',
		347	size: 'One'
361	},	348	},
362	{	349	{
363	name: 'run_packages_update',	350	name: 'run_packages_update',
Lines 368-374 Link Here
368	this.standbyDuring(distUpdgradeDeferred);	355	this.standbyDuring(distUpdgradeDeferred);
369	}	356	}
370	topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'package-update');	357	topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'package-update');
371	})	358	}),
		359	style: 'margin:0',
		360	size: 'One'
372	},	361	},
373	// If refresh isn't automatic anymore... should we show a "Refresh" button?	362	// If refresh isn't automatic anymore... should we show a "Refresh" button?
374	// {	363	// {
Lines 384-390 Link Here
384	callback: lang.hitch(this, function() {	373	callback: lang.hitch(this, function() {
385	this._reboot();	374	this._reboot();
386	topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'reboot');	375	topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'reboot');
387	})	376	}),
		377	style: 'margin:0',
		378	size: 'One'
388	},	379	},
389	{	380	{
390	name: 'easy_upgrade',	381	name: 'easy_upgrade',
Lines 393-399 Link Here
393	// TODO check updater/installer/running, don't do action if a job is running	384	// TODO check updater/installer/running, don't do action if a job is running
394	this.onRunEasyUpgrade();	385	this.onRunEasyUpgrade();
395	topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'easy-upgrade');	386	topic.publish('/umc/actions', this.moduleID, this.moduleFlavor, 'easy-upgrade');
396	})	387	}),
		388	style: 'margin:0',
		389	size: 'One'
397	}	390	}
398	];	391	];
399		392
Lines 420-427 Link Here
420	layout:	413	layout:
421	[	414	[
422	['ucs_version_text'],	415	['ucs_version_text'],
423	['vspacer_1em'],	416	['releases', 'run_release_update'],
424	['releases', 'hspacer_180px', 'run_release_update'],
425	['ucs_updates_text']	417	['ucs_updates_text']
426	]	418	]
427	},	419	},
Lines 429-436 Link Here
429	label: _("Package updates"),	421	label: _("Package updates"),
430	layout:	422	layout:
431	[	423	[
432	['package_update_text1'],	424	['package_update_text1', 'run_packages_update'],
433	['erratalink', 'run_packages_update']
434	]	425	]
435	},	426	},
436	{	427	{
Lines 602-610 Link Here
602	if (versionWithoutPatchlevel) {	593	if (versionWithoutPatchlevel) {
603	var erratalink = lang.replace('<a href="https://errata.software-univention.de/ucs/{version}/" target="_blank">{label}</a>', {	594	var erratalink = lang.replace('<a href="https://errata.software-univention.de/ucs/{version}/" target="_blank">{label}</a>', {
604	version: versionWithoutPatchlevel,	595	version: versionWithoutPatchlevel,
605	label: _('Information about the updates')	596	label: _('Detailed informations about the updates.')
606	});	597	});
607	this._form.getWidget('erratalink').set('content', erratalink);	598	return erratalink
608	}	599	}
609	},	600	},
610		601
Lines 664-670 Link Here
664	lang.hitch(this, function(data) {	655	lang.hitch(this, function(data) {
665	this._set_updates_button(data.result,	656	this._set_updates_button(data.result,
666	data.result ?	657	data.result ?
667	_("Package updates are available.") :	658	_("Package updates are available. %(link)s", {link: this._update_errata_link(this._form.gatherFormValues().ucs_version)}) :
668	_("There are no package updates available."));	659	_("There are no package updates available."));
669	}),	660	}),
670	lang.hitch(this, function() {	661	lang.hitch(this, function() {