@openui5/sap.ui.documentation 1.104.0 → 1.105.1

package/.reuse/dep5

@@ -159,7 +159,7 @@ Copyright:
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery.rtl-scroll-type: _FeatureDetection.js is overall written by SAP, but contains code which is inspired by jQuery.rtl-scroll-type
 
-Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite*
+Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.*
 Copyright: jQuery Foundation and other contributors
 License: MIT
 Comment: these files belong to: QUnit Composite

package/THIRDPARTY.txt

@@ -104,7 +104,7 @@ Component: QUnit Composite, version: 1.0.2-pre
 Copyright: jQuery Foundation and other contributors
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite*
+Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.*
 
 Component: JUnit Reporter for QUnit, version: 1.1.1
 Copyright: jQuery Foundation and other contributors

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.documentation",
-  "version": "1.104.0",
+  "version": "1.105.1",
   "description": "OpenUI5 UI Library sap.ui.documentation",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,10 +14,10 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.104.0",
-    "@openui5/sap.ui.core": "1.104.0",
-    "@openui5/sap.ui.layout": "1.104.0",
-    "@openui5/themelib_sap_belize": "1.104.0",
-    "@openui5/themelib_sap_fiori_3": "1.104.0"
+    "@openui5/sap.m": "1.105.1",
+    "@openui5/sap.ui.core": "1.105.1",
+    "@openui5/sap.ui.layout": "1.105.1",
+    "@openui5/themelib_sap_belize": "1.105.1",
+    "@openui5/themelib_sap_fiori_3": "1.105.1"
   }
 }

package/src/sap/ui/documentation/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.104.0</version>
+  <version>1.105.1</version>
 
   <documentation>SAPUI5 library for the Demokit 2.0.</documentation>
 
@@ -47,27 +47,27 @@
     </packaging>
     <!-- Thirdparty references -->
     <thirdparty xmlns="http://www.sap.com/ui5/buildext/thirdparty" >
-      <lib name="esprima" displayName="Esprima" version="1.2.2" homepage="http://esprima.org">
+      <lib name="esprima" displayName="Esprima" version="1.2.2" homepage="http://esprima.org" id="73554900106100003281">
         <license url="http://esprima.org/doc/index.html#license" type="BSD-2-Clause" />
         <copyright>2013 Ariya Hidayat and other contributors</copyright>
         <pattern>sap/ui/documentation/sdk/thirdparty/esprima.js</pattern>
       </lib>
-      <lib name="highlight.js" displayName="highlight.js" version="10.4.1" homepage="https://highlightjs.org/">
+      <lib name="highlight.js" displayName="highlight.js" version="10.4.1" homepage="https://highlightjs.org/" id="73555000106100051976">
         <license url="https://github.com/highlightjs/highlight.js/blob/10.4.1/LICENSE" type="BSD-3-Clause" />
         <copyright>2006-2020, Ivan Sagalaev</copyright>
         <pattern>sap/ui/documentation/sdk/thirdparty/highlight.js/*</pattern>
       </lib>
-      <lib name="elasticlunr" displayName="Elasticlunr" version="0.9.5" homepage="http://elasticlunr.com/">
+      <lib name="elasticlunr" displayName="Elasticlunr" version="0.9.5" homepage="http://elasticlunr.com/" id="73554900106100021592">
         <license url="https://github.com/weixsong/elasticlunr.js/blob/v0.9.5/LICENSE" type="MIT" />
         <copyright>2017 Wei Song and Oliver Nightingale</copyright>
         <pattern>sap/ui/documentation/sdk/thirdparty/elasticlunr.js</pattern>
       </lib>
-      <lib name="datatables" displayName="DataTables" version="1.10.15" homepage="https://datatables.net/">
+      <lib name="datatables" displayName="DataTables" version="1.10.15" homepage="https://datatables.net/" id="73555000106100009470">
         <license url="https://datatables.net/license/" type="MIT" />
         <copyright>2008-2017 SpryMedia Ltd</copyright>
         <pattern>sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-1.10.15/*</pattern>
       </lib>
-      <lib name="datatables-buttons" displayName="Buttons extension for DataTables" version="1.4.0" homepage="https://datatables.net/extensions/buttons/">
+      <lib name="datatables-buttons" displayName="Buttons extension for DataTables" version="1.4.0" homepage="https://datatables.net/extensions/buttons/" id="73555000106100007649">
         <license url="https://datatables.net/license/" type="MIT" />
         <copyright>2016 SpryMedia Ltd</copyright>
         <pattern>sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-1.4.0/*</pattern>

package/src/sap/ui/documentation/library.js

@@ -25,13 +25,13 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.documentation
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 * @since 1.48
 	 * @public
 	 */
 	var thisLibrary = sap.ui.getCore().initLibrary({
 		name : 'sap.ui.documentation',
-		version: '1.104.0',
+		version: '1.105.1',
 		dependencies : ['sap.ui.core','sap.m'],
 		types: [],
 		interfaces: [],

package/src/sap/ui/documentation/messagebundle.properties

@@ -411,8 +411,6 @@ APP_SETTINGS_DIALOG_CANCEL_BTN = Cancel
 
 #XHED: The title of the dialog for configuring the cookie settings
 COOKIE_SETTINGS_DIALOG_TITLE = Your Cookie Settings
-#XTXT: Summary note that explains why we use cookies
-COOKIE_SETTINGS_DIALOG_SUMMARY = We use cookies and SAP Web Analytics to improve your experience on our site. By continuing to use this site, you consent to use our cookies.
 #XTXT: Title of the section about the required cookies used in the application
 COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TITLE = Required Cookies
 #XTXT: Summary note that explains what are the required cookies in the application

package/src/sap/ui/documentation/sdk/Component.js

@@ -76,18 +76,14 @@ sap.ui.define([
 			getCookiesManagement: function() {
 				var sId = "sap.ui.documentation.sdk.cookieSettingsDialog";
 
-				if (!this._oCookiesComponent) {
-					this._oCookiesComponent = this.runAsOwner(function() {
-						this._oCookiesComponent = sap.ui.getCore().createComponent({
-							id: 'cookiesComp-' + sId,
-							name: sId
-						});
-
-						return this._oCookiesComponent;
-					}.bind(this));
+				if (!this._pCookiesComponent) {
+					this._pCookiesComponent = this.createComponent({
+						usage: "cookieSettingsDialog",
+						id: 'cookiesComp-' + sId
+					});
 				}
 
-				return this._oCookiesComponent;
+				return this._pCookiesComponent;
 			},
 
 			/**
@@ -100,7 +96,9 @@ sap.ui.define([
 				this._oErrorHandler.destroy();
 				this._oConfigUtil.destroy();
 				this._oConfigUtil = null;
-				this._oCookiesComponent && this._oCookiesComponent.destroy();
+				this._pCookiesComponent && this._pCookiesComponent.then(function(oCookiesMgmtComponent) {
+					oCookiesMgmtComponent.destroy();
+				});
 				// call the base component's destroy function
 				UIComponent.prototype.destroy.apply(this, arguments);
 			},
@@ -176,7 +174,6 @@ sap.ui.define([
 					bOpenUI5,
 					sVersionSuffix,
 					bIsInternal,
-					bSupportsSWA,
 					sVersionPrefixPath = ResourcesUtil.getResourcesVersion();
 
 				this.aAllowedMembers = ["public", "protected"];
@@ -189,9 +186,6 @@ sap.ui.define([
 				sVersionSuffix = oVersion.getSuffix();
 				bSnapshot = /-SNAPSHOT$/i.test(sVersionSuffix);
 				bOpenUI5 = oVersionInfo.gav && /openui5/i.test(oVersionInfo.gav);
-				bSupportsSWA = oVersionInfo.libraries.some(function (lib) {
-					return lib.name === "sap.webanalytics.core";
-				});
 
 				// We show restricted members for internal versions
 				if (ResourcesUtil.isInternal(oVersionInfo)) {
@@ -200,6 +194,7 @@ sap.ui.define([
 				}
 
 				this.getModel("versionData").setData({
+					enableAdvancedCookieSettings: false, // this flag is left for eventual future advanced cookie settings
 					versionGav: oVersionInfo.gav,
 					versionName: oVersionInfo.name,
 					version: [oVersion.getMajor(), oVersion.getMinor(), oVersion.getPatch()].join("."),
@@ -210,7 +205,6 @@ sap.ui.define([
 					isDevVersion: bSnapshot,
 					isBetaVersion: !bOpenUI5 && !bSnapshot && /-beta$/i.test(sVersionSuffix),
 					isInternal: !!bIsInternal,
-					supportsSWA: bSupportsSWA,
 					libraries: oVersionInfo.libraries,
 					allowedMembers: this.aAllowedMembers
 				});

package/src/sap/ui/documentation/sdk/controller/App.controller.js

@@ -266,7 +266,9 @@ sap.ui.define([
 					}
 				}.bind(this));
 
-			oComponent.getCookiesManagement().enable(oComponent.getRootControl());
+				oComponent.getCookiesManagement().then(function(oCookieMgmtComponent) {
+					oCookieMgmtComponent.enable(oComponent.getRootControl());
+				});
 
 			},
 
@@ -464,7 +466,9 @@ sap.ui.define([
 				} else if (sTargetText === CHANGE_SETTINGS_TEXT) {
 					this.settingsDialogOpen();
 				} else if (sTargetText === CHANGE_COOKIE_PREFERENCES_TEXT) {
-					this.getOwnerComponent().getCookiesManagement().cookieSettingsDialogOpen({ showCookieDetails: true }, this.getView());
+					this.getOwnerComponent().getCookiesManagement().then(function(oCookieMgmtComponent) {
+						oCookieMgmtComponent.cookieSettingsDialogOpen({ showCookieDetails: true }, this.getView());
+					}.bind(this));
 				} else if (sTargetText === CHANGE_VERSION_TEXT) {
 					this.onChangeVersionButtonPress();
 				} else if (DEMOKIT_APPEARANCE[sTargetText]) {

package/src/sap/ui/documentation/sdk/controller/SubApiDetail.controller.js

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 		"sap/ui/thirdparty/jquery",
+		"sap/ui/core/Fragment",
 		"sap/ui/documentation/sdk/controller/BaseController",
 		"sap/ui/documentation/sdk/util/ToggleFullScreenHandler",
 		"sap/ui/documentation/sdk/model/formatter",
@@ -23,7 +24,7 @@ sap.ui.define([
 		"sap/m/List",
 		"sap/ui/dom/includeStylesheet",
 		"sap/ui/dom/includeScript"
-	], function (jQuery, BaseController, ToggleFullScreenHandler,
+	], function (jQuery, Fragment, BaseController, ToggleFullScreenHandler,
 			formatter, Image, Label, Link, Text, HBox, ObjectAttribute, ObjectStatus, Popover,
 			library, coreLibrary, CustomListItem, List, includeStylesheet, includeScript) {
 		"use strict";
@@ -253,6 +254,24 @@ sap.ui.define([
 				}
 			},
 
+			onVisibilityInformationClick: function (oEvent) {
+				var oIcon = oEvent.getSource(),
+					oView = this.getView();
+
+				if (!this._oPopover) {
+					this._oPopover = Fragment.load({
+						name: "sap.ui.documentation.sdk.view.VisibilityInformation",
+						controller: this
+					}).then(function(oPopover) {
+						oView.addDependent(oPopover);
+						return oPopover;
+					});
+				}
+				this._oPopover.then(function(oPopover) {
+					oPopover.openBy(oIcon);
+				});
+			},
+
 			/* =========================================================== */
 			/* begin: internal methods									   aa*/
 			/* =========================================================== */

package/src/sap/ui/documentation/sdk/controller/util/ConfigUtil.js

@@ -7,9 +7,8 @@
 /* Utility class that facilitates route configuration handling */
 sap.ui.define([
 	"sap/ui/base/Object",
-	"sap/base/strings/capitalize",
-	"sap/base/util/merge"
-], function (BaseObject, capitalize, merge) {
+	"sap/base/strings/capitalize"
+], function (BaseObject, capitalize) {
 	"use strict";
 
 	return BaseObject.extend("sap.ui.documentation.sdk.controller.util.ConfigUtil", {
@@ -17,7 +16,6 @@ sap.ui.define([
 		"COOKIE_NAMES": {
 			"APPROVAL_REQUESTED": "dk_approval_requested",
 			"ALLOW_REQUIRED_COOKIES": "dk_allow_required_cookies",
-			"ALLOW_USAGE_TRACKING": "dk_allow_usage_tracking",
 			"DEMOKIT_IMPORTANT_MESSAGES_READ": "IMR"
 		},
 

package/src/sap/ui/documentation/sdk/controller/util/DataTable.js

@@ -373,14 +373,19 @@ sap.ui.define([
 					oOption = null;
 				}
 
-				if (oOption && oOption.length > 0) {
+				if (oOption && oOption.is("p")) {
+					var sText = oOption.text();
+					if (aOptions.indexOf(sText) < 0) {
+						aOptions.push(sText);
+					}
+				} else if (oOption && oOption.length > 0) {
 					oOption.find('li').each(function (i, sOption) {
 						if (aOptions.indexOf(sOption.textContent) < 0) {
 							aOptions.push(sOption.textContent);
 						}
 					});
 				} else {
-					aOptions.push(sOption);
+					sOption && aOptions.push(sOption);
 				}
 
 			});
@@ -398,7 +403,7 @@ sap.ui.define([
 				that.API = this.api();
 
 				// Create new table row to append filters
-				var oTableHeader = $('#' + sId + ' thead'),
+				var oTableHeader = $('#' + sId + ' > thead'),
 					oNewTableRow = $('<tr/>'),
 					oFilterHeader,
 					oHighlighter,
@@ -449,7 +454,7 @@ sap.ui.define([
 								control: oFilter.control
 							});
 						});
-						oFilter.control.placeAt(oFilterHeader);
+						oFilter.control.placeAt(oFilterHeader[0]);
 					}
 
 					oNewTableRow.append(oFilterHeader);

package/src/sap/ui/documentation/sdk/controller/util/URLUtil.js

@@ -45,6 +45,10 @@ sap.ui.define(["sap/ui/thirdparty/URI"], function(URI) {
 				aSegments = oURI.segment(),
 				sVersion;
 
+			if (pathMatchesDemokitRoute(oURI.path())) {
+				return; // no version in path
+			}
+
 			for (var i = 0, l = aSegments.length; i < l; i++) {
 				if (reVersion.test(aSegments[i])) {
 					sVersion = aSegments[i];

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/Component.js

@@ -17,18 +17,9 @@ sap.ui.define([
 
 		"COOKIE_NAMES": {
 			"APPROVAL_REQUESTED": "dk_approval_requested",
-			"ALLOW_REQUIRED_COOKIES": "dk_allow_required_cookies",
-			"ALLOW_USAGE_TRACKING": "dk_allow_usage_tracking"
+			"ALLOW_REQUIRED_COOKIES": "dk_allow_required_cookies"
 		},
 
-		SWA_CONFIG: {
-			pubToken: 'd5a5359b-0b55-415c-acc8-314511b613ca',
-			baseUrl: 'https://webanalytics2.cfapps.eu10.hana.ondemand.com/tracker/',
-			owner: null
-		},
-
-		SWA_TRACKER_URL: "sap/webanalytics/core/tracker/js/track.js",
-
 		metadata : {
 			manifest: "json"
 		},
@@ -44,24 +35,14 @@ sap.ui.define([
 
 			if (this.sCookieSettingsParameterValue === "true" || this.sCookieSettingsParameterValue === "" || !bCookieSettingsParameter) {
 
-				VersionInfo.load().then(function (oVersionInfo) {
-					var bSupportsSWA = oVersionInfo.libraries.some(function (lib) {
-						return lib.name === "sap.webanalytics.core";
-					}),
-					bApprovalRequested = this.getCookieValue(this.COOKIE_NAMES.APPROVAL_REQUESTED) === "1",
-					bHasConsentUseSWA = this.getCookieValue(this.COOKIE_NAMES.ALLOW_USAGE_TRACKING) === "1";
-
-					if (!bApprovalRequested) {
-						this.cookieSettingsDialogOpen({
-							showCookieDetails: false,
-							supportsUsageTracking: bSupportsSWA
-						}, oRootView);
-					}
-
-					if (bSupportsSWA && bHasConsentUseSWA) {
-						this.enableUsageTracking();
-					}
-				}.bind(this));
+				var bApprovalRequested = this.getCookieValue(this.COOKIE_NAMES.APPROVAL_REQUESTED) === "1";
+
+				if (!bApprovalRequested) {
+					this.cookieSettingsDialogOpen({
+						showCookieDetails: false,
+						enableAdvancedSettings: false // this flag is left for eventual future advanced cookie settings
+					}, oRootView);
+				}
 			}
 		},
 
@@ -92,44 +73,6 @@ sap.ui.define([
 			return "";
 		},
 
-		enableUsageTracking: function() {
-			this._loadSWA().then(function(swa) {
-				if (swa && typeof swa.enable === "function") {
-					swa.enable();
-				}
-			});
-		},
-
-		disableUsageTracking: function() {
-			var swa = window['swa'];
-			if (swa && typeof swa.disable === "function") {
-				swa.disable();
-			}
-		},
-
-		_loadSWA: function() {
-			if (!this._oPromiseLoadSWA) {
-				this._oPromiseLoadSWA = new Promise(function(resolve, reject) {
-					var oSWAConfig = merge({}, this.SWA_CONFIG),
-						oDoc = document,
-						oNewScriptEl = oDoc.createElement('script'),
-						oFirstScriptEl = oDoc.getElementsByTagName('script')[0];
-
-					oNewScriptEl.type = 'text/javascript';
-					oNewScriptEl.defer = true;
-					oNewScriptEl.async = true;
-					oNewScriptEl.src = sap.ui.require.toUrl(this.SWA_TRACKER_URL);
-					window.addEventListener("swaLoadSuccess", function(){
-						resolve(window["swa"]);
-					});
-
-					oFirstScriptEl.parentNode.insertBefore(oNewScriptEl, oFirstScriptEl);
-					window["swa"] = oSWAConfig;
-				}.bind(this));
-			}
-			return this._oPromiseLoadSWA;
-		},
-
 		/**
 		 * Opens the cookie settings dialog
 		 * @public

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/controller/CookieSettingsDialog.controller.js

@@ -79,24 +79,20 @@ sap.ui.define([
 
 			onAcceptAllCookies: function () {
 				this._saveCookiePreference(this._oCookieNames.ALLOW_REQUIRED_COOKIES, true);
-				this._saveCookiePreference(this._oCookieNames.ALLOW_USAGE_TRACKING, this._oModel.getProperty("/supportsUsageTracking"));
 
 				this._oCookieSettingsDialog.close();
 			},
 
 			onRejectAllCookies: function () {
 				this._saveCookiePreference(this._oCookieNames.ALLOW_REQUIRED_COOKIES, false);
-				this._saveCookiePreference(this._oCookieNames.ALLOW_USAGE_TRACKING, false);
 
 				this._oCookieSettingsDialog.close();
 			},
 
 			onSaveCookies: function() {
-				var bHasConsentRequiredCookies = Core.byId("requiredCookiesSwitch").getState(),
-					bHasConsentFunctionalCookies = Core.byId("functionalCookiesSwitch").getState();
+				var bHasConsentRequiredCookies = Core.byId("requiredCookiesSwitch").getState();
 
 				this._saveCookiePreference(this._oCookieNames.ALLOW_REQUIRED_COOKIES, bHasConsentRequiredCookies);
-				this._saveCookiePreference(this._oCookieNames.ALLOW_USAGE_TRACKING, bHasConsentFunctionalCookies);
 
 				this._oCookieSettingsDialog.close();
 			},
@@ -130,21 +126,10 @@ sap.ui.define([
 			onCancelEditCookies: function() {
 				this._oCookieSettingsDialog.close();
 				Core.byId("requiredCookiesSwitch").setState(this._oCookiesUtil.getCookieValue(this._oCookieNames.ALLOW_REQUIRED_COOKIES) === "1");
-				Core.byId("functionalCookiesSwitch").setState(this._oCookiesUtil.getCookieValue(this._oCookieNames.ALLOW_USAGE_TRACKING) === "1");
 			},
 
 			_saveCookiePreference: function(sCookieName, bEnable) {
-				var sValue = bEnable ? "1" : "0",
-					sOldValue;
-
-				if (sCookieName === this._oCookieNames.ALLOW_USAGE_TRACKING) {
-					sOldValue = this._oCookiesUtil.getCookieValue(sCookieName);
-
-					if (sOldValue !== sValue) {
-						bEnable && this._oCookiesUtil.enableUsageTracking();
-						!bEnable && this._oCookiesUtil.disableUsageTracking();
-					}
-				}
+				var sValue = bEnable ? "1" : "0";
 
 				this._oCookiesUtil.setCookie(sCookieName, sValue);
 				this._oModel.setProperty("/" + sCookieName, sValue);
@@ -166,10 +151,8 @@ sap.ui.define([
 					// when the user opens the edit dialog for a first time, show the cookies enabled
 					// the user will then edit and save his choice
 					oData[this._oCookieNames.ALLOW_REQUIRED_COOKIES] = "1";
-					oData[this._oCookieNames.ALLOW_USAGE_TRACKING] = "1";
 				} else {
 					oData[this._oCookieNames.ALLOW_REQUIRED_COOKIES] = this._oCookiesUtil.getCookieValue(this._oCookieNames.ALLOW_REQUIRED_COOKIES);
-					oData[this._oCookieNames.ALLOW_USAGE_TRACKING] = this._oCookiesUtil.getCookieValue(this._oCookieNames.ALLOW_USAGE_TRACKING);
 				}
 
 				this._oModel.setData(oData, true /* merge */);

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/i18n/i18n.properties

@@ -3,20 +3,12 @@
 
 #XHED: The title of the dialog for configuring the cookie settings
 COOKIE_SETTINGS_DIALOG_TITLE = Your Cookie Settings
-#XTXT: Summary note that explains why we use cookies
-COOKIE_SETTINGS_DIALOG_SUMMARY = We use cookies and SAP Web Analytics to improve your experience on our site. By continuing to use this site, you consent to use our cookies.
 #XTXT: Title of the section about the required cookies used in the application
 COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TITLE = Required Cookies
 #XTXT: Summary note that explains what are the required cookies in the application
 COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_SUMMARY = These cookies are required to enable core site functionality.
 #XTXT: Detailed note that explains why we use the required cookies in the application
 COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TEXT = We use cookies to improve your experience on our site. By continuing to use this site, you consent to use our cookies.
-#XTXT: Title of the section about the extra functional cookies used in the application
-COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TITLE = Functional Cookies
-#XTXT: Summary note that explains what are the functional cookies in the application
-COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SUMMARY = These cookies are used to analyse site usage for the purpose of measuring and improving site performance.
-#XTXT: Detailed note that explains why we use the functional cookies in the application
-COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TEXT = This site uses SAP Web Analytics to analyze how users use this site. The information generated (including a part of your IP address and a browser ID) will be transmitted to and stored by SAP on its servers. Cookies are used to identify your repeat visit and your visit origin page. We will use this information only for the purpose of evaluating website usage and compiling reports on website activity for website operators - and finally, to improve the site. If you would like to opt-in for SAP Web Analytics tracking, please specify your preference using the "On"/"Off" switch above. By opt-in, you consent to the processing of analytics data about you in the manner and for the purposes set out above.
 #XTXT: Title of the panel that contains more detailed information
 COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_MORE_INFO = More Info
 #XTXT: Title of the button to accept all cookies

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/view/CookieSettingsDialog.fragment.xml

@@ -7,10 +7,8 @@
 	<Dialog title="{i18n>COOKIE_SETTINGS_DIALOG_TITLE}" contentWidth="45rem">
 		<content>
 			<html:div class="sapUiSmallMargin">
-				<Text text="{i18n>COOKIE_SETTINGS_DIALOG_SUMMARY}"
-					  visible="{= !${cookieData>/showCookieDetails} &amp;&amp; ${cookieData>/supportsUsageTracking} }"/>
 				<Text text="{i18n>COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TEXT}"
-					  visible="{= !${cookieData>/showCookieDetails} &amp;&amp; !${cookieData>/supportsUsageTracking} }"/>
+					  visible="{= !${cookieData>/showCookieDetails} }"/>
 				<f:GridList visible="{cookieData>/showCookieDetails}">
 					<f:customLayout>
 						<grid:GridBasicLayout gridTemplateColumns="1fr" gridGap="1rem"/>
@@ -28,20 +26,6 @@
 							<Text text="{i18n>COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TEXT}"/>
 						</Panel>
 					</f:GridListItem>
-
-					<f:GridListItem>
-						<HBox justifyContent="SpaceBetween" class="sapUiSmallMarginBeginEnd sapUiSmallMarginTop">
-							<VBox>
-								<Title text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TITLE}"/>
-								<Text text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SUMMARY}"/>
-							</VBox>
-							<Switch id="functionalCookiesSwitch" class="sapUiSmallMarginBegin"
-								state="{path: 'cookieData>/dk_allow_usage_tracking', type: 'sap.ui.model.type.Boolean', formatter: '.formatCookieValue'}"/>
-						</HBox>
-						<Panel headerText="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_MORE_INFO}" expandable="true" class="sapUiTinyMarginTop">
-							<Text text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TEXT}"/>
-						</Panel>
-					</f:GridListItem>
 				</f:GridList>
 			</html:div>
 		</content>
@@ -51,7 +35,7 @@
 				<OverflowToolbarLayoutData priority="NeverOverflow"/>
 			</layoutData>
 		</Button>
-		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SET_PREFERENCES}" id="btnSetPreferences" type="Ghost" press="showCookieDetails" visible="{= !${cookieData>/showCookieDetails} &amp;&amp; ${cookieData>/supportsUsageTracking} }"></Button>
+		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SET_PREFERENCES}" id="btnSetPreferences" type="Ghost" press="showCookieDetails" visible="{= !${cookieData>/showCookieDetails} &amp;&amp; ${cookieData>/enableAdvancedSettings} }"></Button>
 		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_REJECT_ALL}" press="onRejectAllCookies" visible="{=! ${cookieData>/showCookieDetails} }">
 			<layoutData>
 				<OverflowToolbarLayoutData priority="NeverOverflow"/>

package/src/sap/ui/documentation/sdk/css/style.css

@@ -214,11 +214,6 @@ html:not(.sapUiMedia-StdExt-Phone) .sapUiDocumentationFooter {
 }
 
 /********************************************* Header navigation on phone *********************************************/
-.sapUiMedia-Std-Phone .sapTntToolHeader .sapMSlt.sapUiDocumentationSelect,
-.sap-phone .sapTntToolHeader .sapMSlt.sapUiDocumentationSelect {
-	height: 3rem;
-}
-
 .sapUiTheme-sap_fiori_3 .sapTntToolHeader .sapMSlt.menuSelect.sapUiDocumentationSelect,
 .sapUiTheme-sap_fiori_3_dark .sapTntToolHeader .sapMSlt.menuSelect.sapUiDocumentationSelect,
 .sapUiTheme-sap_fiori_3 .sapTntToolHeader .sapMSlt.menuSelect.sapUiDocumentationSelect .sapMSltArrow,
@@ -273,11 +268,6 @@ html.sap-desktop .sapContrast.sapMSlt.sapUiDocumentationSelect:not(.sapMSltExpan
 	outline: none;
 }
 
-.sapTntToolHeader .sapMSlt.menuSelect.sapUiDocumentationSelect .sapMSltLabel,
-.sapTntToolHeader .sapMSlt.menuSelect.sapUiDocumentationSelect .sapMSltArrow {
-	line-height: 2.7rem;
-}
-
 /* Menu Select`s label */
 .sapUiTheme-sap_fiori_3 .sapTntToolHeader .sapMSlt.menuSelect.sapUiDocumentationSelect .sapMSltLabel,
 .sapUiTheme-sap_fiori_3_dark .sapTntToolHeader .sapMSlt.menuSelect.sapUiDocumentationSelect .sapMSltLabel {
@@ -295,11 +285,6 @@ html.sap-desktop .sapContrast.sapMSlt.sapUiDocumentationSelect:not(.sapMSltExpan
 }
 
 /* Menu Select`s arrow color on press */
-:not(.sapUiTheme-sap_fiori_3) .sapTntToolHeader .sapMSlt.sapMSltPressed > .sapMSltArrow::before,
-:not(.sapUiTheme-sap_fiori_3_dark) .sapTntToolHeader .sapMSlt.sapMSltPressed > .sapMSltArrow::before {
-	color: #cae4fb;
-}
-
 .sapUiTheme-sap_fiori_3_hcb .sapTntToolHeader .sapMSlt.sapMSltPressed > .sapMSltArrow::before,
 .sapUiTheme-sap_belize_hcb .sapTntToolHeader .sapMSlt.sapMSltPressed > .sapMSltArrow::before {
 	color: #fff;
@@ -327,18 +312,26 @@ html.sap-desktop .sapContrast.sapMSlt.sapUiDocumentationSelect:not(.sapMSltExpan
 
 /* Topics - dynamic page */
 .sapUiDocumentationTopicTitle {
-	font-size: 1.375rem !important;
+	font-size: 2rem;
+	font-family: "72Black", "72", "72full", Arial, Helvetica, sans-serif;
 }
 
-html.sap-phone .sapUiDocumentationTopicTitle {
-	font-size: 1.25rem !important;
+.sapUiMedia-Std-Phone .sapUiDocumentationTopicTitle {
+	font-size: 1.5rem;
+}
+
+.sapFDynamicPage:not(.sapFDynamicPage-Std-Phone):not(.sapFDynamicPage-Std-Desktop-XL)
+.sapFDynamicPageHeader.sapFDynamicPageHeaderWithContent {
+	padding-left: 2rem;
+	padding-right: 2rem;
 }
 
-.sapUiDocumentationDynamicPageTitle .sapFDynamicPageTitleLeft {
-	width: 80% !important;
+.sapUiTheme-sap_horizon .sapFDynamicPageHeader.sapFDynamicPageHeaderWithContent .sapMText {
+	color: #556b82;
 }
-.sapUiDocumentationDynamicPageTitle .sapFDynamicPageTitleRight {
-	width: 20% !important;
+
+.sapUiTheme-sap_horizon_dark .sapFDynamicPageHeader.sapFDynamicPageHeaderWithContent .sapMText {
+	color: #8396a8;
 }
 
 .sapUiDocumentation2ColumnsEqualTable {
@@ -349,6 +342,14 @@ html.sap-phone .sapUiDocumentationTopicTitle {
 	font-size: 1.25rem !important;
 }
 
+.sapUiDocumentationVisibilityInformationText {
+	margin: 0.375rem;
+}
+
+.sapUiDocumentationVisibilityInformationIcon {
+	margin-left: 0.375rem;
+}
+
 .sapUiBody#content {
 	padding-left: 0; /* overrides the padding of documentation */
 }
@@ -1848,4 +1849,17 @@ html[dir="rtl"] .sapUiDemoKitTreeItemIcon {
 .sapUiDemokit .sapUiHomePage .sapMTitleStyleH1,
 .sapUiDemokit .sapUiDemoApps .sapMTitleStyleH1 {
 	font-size: 1.625rem;
+}
+
+html.sap-desktop .sapMFocus > .sapMSFF::before {
+	border: 0.125rem solid #0070f2 !important;
+	position: absolute;
+	content: " ";
+	top: 0;
+	right: 0;
+	left: 0;
+	bottom: 0;
+	border-radius: inherit;
+	z-index: 2;
+	pointer-events: none;
 }

package/src/sap/ui/documentation/sdk/manifest.json

@@ -526,6 +526,11 @@
 					"controlAggregation": "detailPages"
 				}
 			}
+		},
+		"componentUsages": {
+			"cookieSettingsDialog": {
+				"name": "sap.ui.documentation.sdk.cookieSettingsDialog"
+			}
 		}
 	}
 }

package/src/sap/ui/documentation/sdk/model/formatter.js

@@ -42,7 +42,7 @@ sap.ui.define([
 		 */
 		libraryLink: function (sNamespace) {
 			if (sNamespace && sNamespace.search("sap\\.") === 0) {
-				return this.formatter.crossLink("#docs/api/symbols/" + sNamespace + ".html");
+				return this.formatter.crossLink("api/" + sNamespace);
 			} else {
 				return "";
 			}

package/src/sap/ui/documentation/sdk/model/libraryData.js

@@ -18,8 +18,19 @@ sap.ui.define([
 
 	// function to compute the app objects for a demo object
 	function createDemoAppData(oDemoAppMetadata, sLibUrl, sLibNamespace) {
+
+		//Define the default Demo Kit theme
+		var DEFAULT_THEME = sap.ui.getCore().getConfiguration().getTheme();
+
 		// transform simple demo app link to a configuration object
-		var aLinks = [];
+		var aLinks = [],
+			sRef = oDemoAppMetadata.ref;
+		//Attach theme parameter to Demo app link
+		if (sRef.indexOf("#") > 0) {
+			sRef = sRef.slice(0, sRef.indexOf("#")) + "?sap-ui-theme=" + DEFAULT_THEME + sRef.slice(sRef.indexOf("#"));
+		} else {
+			sRef = sRef + "?sap-ui-theme=" + DEFAULT_THEME;
+		}
 		// transform link object to a bindable array of objects
 		if (isPlainObject(oDemoAppMetadata.links)) {
 			aLinks = Object.keys(oDemoAppMetadata.links).map(function (sKey) {
@@ -38,7 +49,7 @@ sap.ui.define([
 			config : oDemoAppMetadata.config,
 			teaser : oDemoAppMetadata.teaser,
 			category : oDemoAppMetadata.category,
-			ref : (oDemoAppMetadata.resolve === "lib" ? sLibUrl : "") + oDemoAppMetadata.ref + "?sap-ui-theme=sap_fiori_3",
+			ref : (oDemoAppMetadata.resolve === "lib" ? sLibUrl : "") + sRef,
 			links : aLinks
 		};
 

package/src/sap/ui/documentation/sdk/view/App.view.xml

@@ -148,7 +148,7 @@
 										<MenuItem icon="sap-icon://tree" text="{i18n>APP_INFORMATION_BTN_SITEMAP}" key="sitemap" visible="{versionData>/isOpenUI5}"/>
 										<MenuItem icon="sap-icon://hello-world" text="{i18n>APP_SETTINGS_DIALOG_LANGUAGE}" key="settings"/>
 										<MenuItem icon="sap-icon://customize" text="{i18n>APP_SETTINGS_DIALOG_COOKIE_PREFERENCES}" key="cookie_preferences"
-												visible="{= ${versionData>/supportsSWA}}"/>
+												visible="{= ${versionData>/enableAdvancedCookieSettings}}"/>
 									</items>
 								</Menu>
 							</menu>

package/src/sap/ui/documentation/sdk/view/SubApiDetail.view.xml

@@ -280,8 +280,16 @@
 												<m:Text text="{defaultValue}"/>
 												<layout:VerticalLayout width="100%">
 													<custom:JSDocText sanitizeContent="false" text="{description}"/>
-													<m:ObjectStatus text="Visibility: {parts : [{path : 'visibility'}, {path : 'allowedFor'}], formatter : 'sap.ui.documentation.sdk.model.formatter.formatVisibility'}"
-														state="{= ${visibility} === 'public' ? 'Success' : 'Warning'}"/>
+													<layout:HorizontalLayout width="100%">
+														<m:ObjectStatus text="Visibility: {parts : [{path : 'visibility'}, {path : 'allowedFor'}], formatter : 'sap.ui.documentation.sdk.model.formatter.formatVisibility'}"
+															state="{= ${visibility} === 'public' ? 'Success' : 'Warning'}"/>
+														<core:Icon
+															src="sap-icon://sys-help-2"
+															color="#286eb4"
+															class="sapUiDocumentationVisibilityInformationIcon"
+															press="onVisibilityInformationClick">
+														</core:Icon>
+													</layout:HorizontalLayout>
 													<m:MessageStrip
 														visible="{=${deprecatedText} !== undefined}"
 														text="{deprecatedText}"
@@ -474,9 +482,16 @@
 
 												<custom:JSDocText sanitizeContent="false" text="{path: 'event>description', formatter: 'sap.ui.base.ManagedObject.escapeSettingsValue'}"/>
 
-												<m:ObjectStatus text="Visibility: {parts : [{path : 'event>visibility'}, {path : 'event>allowedFor'}], formatter : 'sap.ui.documentation.sdk.model.formatter.formatVisibility'}"
+												<layout:HorizontalLayout width="100%">
+													<m:ObjectStatus text="Visibility: {parts : [{path : 'event>visibility'}, {path : 'event>allowedFor'}], formatter : 'sap.ui.documentation.sdk.model.formatter.formatVisibility'}"
 													state="{= ${event>visibility} === 'public' ? 'Success' : 'Warning'}" class="sapUiSmallMarginBottom"/>
-
+													<core:Icon
+														src="sap-icon://sys-help-2"
+														color="#286eb4"
+														class="sapUiDocumentationVisibilityInformationIcon"
+														press="onVisibilityInformationClick">
+													</core:Icon>
+												</layout:HorizontalLayout>
 												<template:if test="{=${event>deprecated} !== undefined}">
 													<m:MessageStrip
 														text="{event>deprecatedText}"
@@ -584,9 +599,17 @@
 													</layout:VerticalLayout>
 
 													<m:FlexBox class="sapUiTinyMarginBottom">
+														<layout:HorizontalLayout width="100%">
 														<m:ObjectStatus text="Visibility: {parts : [{path : 'method>visibility'}, {path : 'method>allowedFor'}], formatter : 'sap.ui.documentation.sdk.model.formatter.formatVisibility'}"
-														state="{= ${method>visibility} === 'public' ? 'Success' : 'Warning'}" class="sapUiTinyMarginEnd"/>
+														state="{= ${method>visibility} === 'public' ? 'Success' : 'Warning'}"/>
+														<core:Icon
+															src="sap-icon://sys-help-2"
+															color="#286eb4"
+															class="sapUiDocumentationVisibilityInformationIcon sapUiTinyMarginEnd"
+															press="onVisibilityInformationClick">
+														</core:Icon>
 														<m:ObjectStatus visible="{=${method>since} !== undefined}" text="Since: {method>since}"/>
+													</layout:HorizontalLayout>
 													</m:FlexBox>
 													<template:if test="{=${method>deprecated} !== undefined}">
 														<m:MessageStrip
@@ -609,7 +632,7 @@
 														</m:MessageStrip>
 													</template:if>
 
-													<custom:JSDocText text="{method>code}" />
+													<custom:JSDocText text="{path: 'method>code', formatter: 'sap.ui.base.ManagedObject.escapeSettingsValue'}" />
 
 													<template:if test="{= !!${method>parameters} &amp;&amp; ${method>parameters}.length > 0}">
 														<custom:LightTable
@@ -647,7 +670,7 @@
 															<custom:Row>
 																<layout:VerticalLayout class="sapUiDocumentationOrList" width="100%">
 																	<template:repeat list="{method>returnValue/types}" var="rtype">
-																		<m:Link text="{rtype>value}"
+																		<m:Link text="{path: 'rtype>value', formatter: 'sap.ui.base.ManagedObject.escapeSettingsValue'}"
 																				href="{rtype>href}"
 																				enabled="{= !!${rtype>linkEnabled} }"/>
 																	</template:repeat>

package/src/sap/ui/documentation/sdk/view/VisibilityInformation.fragment.xml

@@ -0,0 +1,12 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:layout="sap.ui.layout">
+	<Popover
+		id="visibilityInformationPopover"
+		placement="Right"
+		showHeader="false">
+		<FormattedText class="sapUiDocumentationVisibilityInformationText"
+			htmlText="For more information about different API types click &lt;a href='topic/b0d5fe2f1b0b497cbd67cd5a1d35fa4c'&gt;here&lt;/a&gt;" />
+	</Popover>
+</core:FragmentDefinition>

package/src/sap/ui/documentation/themes/base/ObjectPageSubSection.less

@@ -6,4 +6,11 @@
 	.sapUxAPObjectPageSectionContainer .sapUxAPObjectPageSubSection .sapUxAPBlockContainer {
 		padding: 1rem;
 	}
+
+	.sapUiDemokit .sapUxAPObjectPageLayout-Std-Phone .sapUxAPObjectPageSection
+	.sapUxAPObjectPageSectionContainer .sapUxAPObjectPageSubSection .sapUxAPBlockContainer {
+		margin-left: 1rem;
+		margin-right: 1rem;
+	}
+
 }

package/src/sap/ui/documentation/themes/sap_horizon/Panel.less

@@ -0,0 +1,3 @@
+.sapUiDemokit .sapMPanel {
+	border-radius: 0;
+}

package/src/sap/ui/documentation/themes/sap_horizon/library.source.less

@@ -10,5 +10,6 @@
 @import "global.less";
 
 @import "./Link.less";
+@import "./Panel.less";
 @import "./Search.less";
 @import "./SplitButton.less";

package/src/sap/ui/documentation/themes/sap_horizon_dark/Panel.less

@@ -0,0 +1,3 @@
+.sapUiDemokit .sapMPanel {
+	border-radius: 0;
+}

package/src/sap/ui/documentation/themes/sap_horizon_dark/library.source.less

@@ -10,5 +10,6 @@
 
 @import "./Documentation.less";
 @import "./Link.less";
+@import "./Panel.less";
 @import "./Search.less";
 @import "./SplitButton.less";