Attachment #8720 for bug #44070

Lines 1-3 Link Here

(-)a/management/univention-portal/debian/changelog (+6 lines)
		1	univention-portal (1.0.11-3) unstable; urgency=medium
		2
		3	* Bug #44070: Fix representation of other image types than SVG
		4
		5	-- Alexander Kläser <klaeser@univention.de> Fri, 31 Mar 2017 01:47:51 +0200
		6
1	univention-portal (1.0.11-2) unstable; urgency=medium	7	univention-portal (1.0.11-2) unstable; urgency=medium
2		8
3	* Bug #44096: fix type error	9	* Bug #44096: fix type error




	"umc/i18n!portal"
], function(declare, lang, array, kernel, registry, on, dom, domConstruct, PortalCategory, tools, i18nTools, portalContent, installedApps, _) {

	var _regHasImageSuffix = /\.(svg|jpg|jpeg|png|gif)$/i;
	var hasImageSuffix = function(path) {
		return path && _regHasImageSuffix.test(path);
	};

	var hasAbsolutePath = function(path) {

							// just to make tools.getIconClass() leaving the URL untouched
							logo = window.location.origin + logo;

							if (!hasImageSuffix(logo)) {
								// an URL starting with http[s]:// needs also to have a .svg suffix
								logo = logo + '.svg';
							}
- 

Return to bug 44070

Lines 47-55 define([ Link Here

(-)a/management/univention-portal/www/main.js (-5 / +4 lines)
47	"umc/i18n!portal"	47	"umc/i18n!portal"
48	], function(declare, lang, array, kernel, registry, on, dom, domConstruct, PortalCategory, tools, i18nTools, portalContent, installedApps, _) {	48	], function(declare, lang, array, kernel, registry, on, dom, domConstruct, PortalCategory, tools, i18nTools, portalContent, installedApps, _) {
49		49
50	var _regEndsWithSVG = /\.svg$/;	50	var _regHasImageSuffix = /\.(svg\|jpg\|jpeg\|png\|gif)$/i;
51	var hasSVGSuffix = function(path) {	51	var hasImageSuffix = function(path) {
52	return path && _regEndsWithSVG.test(path);	52	return path && _regHasImageSuffix.test(path);
53	};	53	};
54		54
55	var hasAbsolutePath = function(path) {	55	var hasAbsolutePath = function(path) {
Lines 115-121 define([ Link Here
115	// just to make tools.getIconClass() leaving the URL untouched	115	// just to make tools.getIconClass() leaving the URL untouched
116	logo = window.location.origin + logo;	116	logo = window.location.origin + logo;
117		117
118	if (!hasSVGSuffix(logo)) {	118	if (!hasImageSuffix(logo)) {
119	// an URL starting with http[s]:// needs also to have a .svg suffix	119	// an URL starting with http[s]:// needs also to have a .svg suffix
120	logo = logo + '.svg';	120	logo = logo + '.svg';
121	}	121	}
122	-