@openui5/sap.ui.rta 1.108.2 → 1.110.0

package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsUtils.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Helper object containing methods for the AdditionalElements plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @private
 	 * @since 1.94
 	 * @experimental Since 1.94. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/rta/plugin/additionalElements/CommandBuilder.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Helper object to build the RTA commands resulting from the AdditionalElements Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @private
 	 * @since 1.94
 	 * @experimental Since 1.94. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/rta/plugin/iframe/AddIFrame.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -110,7 +110,7 @@ sap.ui.define([
 	 * @class The AddIFrame allows trigger AddIFrame operations on the overlay.
 	 * @extends sap.ui.rta.plugin.BaseCreate
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.75

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.fragment.xml

@@ -84,8 +84,13 @@
 						<items>
 							<Label id="sapUiRtaAddIFrameDialog_ParametersLabel" text="{/text/parametersLabel}" labelFor="sapUiRtaAddIFrameDialog_ParameterTable"
 								   class="sapUiRtaAddIFrameDialogParametersLabel" design="Bold"/>
-							<SearchField id="sapUiRtaAddIFrameDialog_ParametersSearch" ariaLabelledBy="sapUiRtaAddIFrameDialog_ParameterSearchLabel"
-										 class="sapUiRtaAddIFrameDialogParametersSearch" search="onSearch" />
+							<SearchField
+								id="sapUiRtaAddIFrameDialog_ParametersSearch" 
+								ariaLabelledBy="sapUiRtaAddIFrameDialog_ParameterSearchLabel"
+								class="sapUiRtaAddIFrameDialogParametersSearch" 
+								liveChange="onLiveChange"
+								showSearchButton="false"
+							/>
 							<ScrollContainer height="12rem" vertical="true" >
 								<Table id="sapUiRtaAddIFrameDialog_ParameterTable" items="{/parameters/value}" ariaLabelledBy="sapUiRtaAddIFrameDialog_ParametersLabel"
 									   class="sapUiSizeCompact sapUiRtaAddIFrameDialogParameterTable" sticky="ColumnHeaders">

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -113,7 +113,7 @@ sap.ui.define([
 	 * @class Context - Dialog for IFrame settings in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.78

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialogController.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -129,11 +129,11 @@ sap.ui.define([
 		},
 
 		/**
-		 * Event handler for search
+		 * Event handler for live change on the parameter search field
 		 * @param {sap.ui.base.Event} oEvent - Event
 		 */
-		onSearch: function(oEvent) {
-			var oFilter = new Filter("label", FilterOperator.Contains, oEvent.getParameter("query"));
+		onLiveChange: function(oEvent) {
+			var oFilter = new Filter("label", FilterOperator.Contains, oEvent.getParameter("newValue"));
 			var oBinding = sap.ui.getCore().byId("sapUiRtaAddIFrameDialog_ParameterTable").getBinding("items");
 			oBinding.filter([oFilter]);
 		},

package/src/sap/ui/rta/plugin/iframe/urlCleaner.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/rta/service/Action.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @private
 	 * @ui5-restricted
 	 *

package/src/sap/ui/rta/service/ControllerExtension.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @private
 	 * @ui5-restricted
 	*/
@@ -117,7 +117,7 @@ sap.ui.define([
 				 *
 				 * @method sap.ui.rta.service.ControllerExtension.getTemplate
 				 * @param {string} sViewId - ID of the view whose template should be retrieved
-				 * @return {Promise} Promise that resolves with the template as string or rejects when the file was not found
+				 * @return {Promise<string>} Promise that resolves with the template as string or rejects when the file was not found
 				 * @public
 				 */
 				getTemplate: function(sViewId) {

package/src/sap/ui/rta/service/Outline.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.56
 	 * @since 1.56
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/service/Property.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/Receiver.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/rta/service/Selection.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -15,7 +15,7 @@ sap.ui.define(function () {
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/SupportTools.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.106
 	 * @since 1.106
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/service/index.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/rta/themes/base/Toolbar.adaptation.less

@@ -2,6 +2,7 @@
 	Style of the RTA Toolbar (type: adaptation) - base Theme
 *******************************************************************/
 @_sap_ui_rta_Toolbar_Adaptation_BaseColor: darken(desaturate(@sapUiChart1, 48%), 14%); //#435060
+@_sap_ui_rta_Toolbar_Adaptation_BaseColorLight: lighten(@_sap_ui_rta_Toolbar_Adaptation_BaseColor, 5%); //#4d5d6f
 @_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiTextInverted; //#fff
 @_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorder: @sapUiTextInverted; //#fff
 @_sap_ui_rta_Toolbar_Adaptation_BtnHoverBG: @sapUiSegmentedButtonHoverBackground; //#ec8b46
@@ -164,12 +165,10 @@
 
 	.sapUiRtaVersionHistory {
 		background-color: @_sap_ui_rta_Toolbar_Adaptation_BaseColor;
-		border: 0.125rem solid @_sap_ui_rta_Toolbar_Adaptation_TextColor; //2px
-		border-image: repeating-linear-gradient(-45deg, @_sap_ui_rta_Toolbar_Adaptation_BaseColor, @_sap_ui_rta_Toolbar_Adaptation_BaseColor 0.25rem, @_sap_ui_rta_Toolbar_Adaptation_TextColor 0.25rem, @_sap_ui_rta_Toolbar_Adaptation_TextColor 0.375rem) 4;
-		box-shadow: 0 0.625rem 1.25rem fade(@_sap_ui_rta_Toolbar_Adaptation_BoxShadow_DarkColor, 19),
-		0 0.375rem 0.375rem fade(@_sap_ui_rta_Toolbar_Adaptation_BoxShadow_DarkColor, 23),
+		box-shadow: 0.375rem 0.625rem 2rem fade(@_sap_ui_rta_Toolbar_Adaptation_BoxShadow_DarkColor, 30),
+		0.125rem 0.375rem 1rem fade(@_sap_ui_rta_Toolbar_Adaptation_BoxShadow_DarkColor, 60),
 		0 0 0 0.0625rem fade(@_sap_ui_rta_Toolbar_Adaptation_BoxShadow_LightColor, 20),
-		0 0.0625rem 0 0 fade(@_sap_ui_rta_Toolbar_Adaptation_BoxShadow_LightColor, 20);
+		0 0.0625rem 0 0 fade(@_sap_ui_rta_Toolbar_Adaptation_BoxShadow_LightColor, 20); //10px 20px 6px 6px 1px 1px
 
 		.sapMGHLITitle {
 			color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
@@ -192,9 +191,24 @@
 		}
 
 		.sapUiRtaVersionsList {
-			border-bottom: 0.05rem solid @_sap_ui_rta_Toolbar_Adaptation_TextColor;
-			ul > li:first-child.sapMLIBFocusable:focus {
-				outline: none;
+			border-bottom: 0.125rem solid @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+			.sapMLIBTypeInactive {
+				&.sapMLIBFocusable:focus {
+					outline: none;
+				}
+				.sapMLIBContent {
+					margin-top: -1rem;
+				}
+				.sapMGHLITitle {
+					cursor: default;
+					text-align: center;
+					width: 100%;
+				}
+			}
+			.sapMListUl .sapMLIB.sapMGHLI {
+				border-bottom: 0.0625rem solid @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+				background: @_sap_ui_rta_Toolbar_Adaptation_BaseColorLight;
+				box-shadow: none;
 			}
 		}
 
@@ -219,13 +233,16 @@
 			cursor: pointer;
 		}
 
-		.sapMPopoverArr:after,
 		.sapMFeedListShowSeparatorsAll.sapMLIB,
 		.sapMListTblCell,
 		.sapMListTblNavCol {
 			background-color: @_sap_ui_rta_Toolbar_Adaptation_BaseColor;
 			border: 0;
 		}
+		.sapMPopoverArr:after {
+			background-color: lighten(@_sap_ui_rta_Toolbar_Adaptation_BaseColor, 10%);
+			border: 0;
+		}
 
 		.sapMLIBFocusable:focus {
 			outline: 0.0625rem dotted @_sap_ui_rta_Toolbar_Adaptation_TextColor;

package/src/sap/ui/rta/themes/base/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 @import "../../../../../sap/ui/core/themes/base/base.less";

package/src/sap/ui/rta/themes/sap_hcb/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 @import "../base/library.source.less";

package/src/sap/ui/rta/toolbar/ActionsMenu.fragment.xml

@@ -0,0 +1,82 @@
+<core:FragmentDefinition
+		xmlns="sap.m"
+		xmlns:core="sap.ui.core">
+	<Menu
+			id="sapUiRta_actions"
+			class="sapUiRtaToolbarVisualizationSelection">
+		<MenuItem
+				id="sapUiRta_translateMenu"
+				icon="sap-icon://translate"
+				visible="{= ${controls>/translation/visible}}"
+				enabled="{controls>/translation/enabled}"
+				tooltip="{i18n>BTN_TRANSLATE}"
+				text="{i18n>BTN_TRANSLATE}" >
+			<items>
+				<MenuItem
+						text="{i18n>BTN_OPEN_DOWNLOAD_TRANSLATION}"
+						press=".openDownloadTranslationDialog"
+						icon="sap-icon://download"/>
+				<MenuItem
+						text="{i18n>BTN_OPEN_UPLOAD_TRANSLATION}"
+						press=".openUploadTranslationDialog"
+						enabled="{= ${translation>/sourceLanguages}.length > 0}"
+						icon="sap-icon://upload"/>
+			</items>
+		</MenuItem>
+		<MenuItem
+				id="sapUiRta_appVariantMenu"
+				icon="sap-icon://BusinessSuiteInAppSymbols/icon-variant-configuration"
+				enabled="{controls>/appVariantMenu/enabled}"
+				visible="{= (${controls>/appVariantMenu/visible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
+				text="{i18n>BTN_MANAGE_APPS_TXT}" >
+			<items>
+				<MenuItem
+						id="sapUiRta_appVariantOverview"
+						icon="sap-icon://action-settings"
+						enabled="{controls>/appVariantMenu/overview/enabled}"
+						visible="{= (${controls>/appVariantMenu/overview/visible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
+						text="{i18n>BTN_MANAGE_APPS_ITEM}" >
+					<items>
+						<MenuItem
+								id="sapUiRta_keyUser"
+								press=".overviewForKeyUser"
+								icon="sap-icon://key-user-settings"
+								text="{i18n>MENU_ITEM_KEY_USER}" />
+						<MenuItem
+								id="sapUiRta_developer"
+								press=".overviewForDeveloper"
+								icon="sap-icon://developer-settings"
+								text="{i18n>MENU_ITEM_SAP_DEVELOPER}" />
+					</items>
+				</MenuItem>
+				<MenuItem
+						id="sapUiRta_manageApps"
+						icon="sap-icon://action-settings"
+						press=".manageApps"
+						enabled="{controls>/appVariantMenu/manageApps/enabled}"
+						visible="{= (${controls>/appVariantMenu/manageApps/visible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
+						text="{i18n>BTN_MANAGE_APPS_ITEM}" />
+				<MenuItem
+						id="sapUiRta_saveAs"
+						visible="{= (${controls>/appVariantMenu/saveAs/visible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
+						enabled="{parts: ['controls>/appVariantMenu/saveAs/enabled', 'versions>/displayedVersion'], formatter: '.formatSaveAsEnabled'}"
+						press=".saveAs"
+						icon="sap-icon://copy"
+						text="{i18n>BTN_SAVE_AS}" />
+				</items>
+		</MenuItem>
+		<MenuItem
+				id="sapUiRta_restore"
+				icon="sap-icon://reset"
+				enabled="{controls>/restore/enabled}"
+				visible="{= (${controls>/restore/visible} &amp;&amp; ((${controls>/modeSwitcher} === 'visualization') || (${controls>/modeSwitcher} === 'adaptation')))}"
+				press=".restore"
+				text="{i18n>BTN_RESTORE}" />
+		<MenuItem
+				id="sapUiRta_saveAsContextBasedAdaptation"
+				icon="sap-icon://save"
+				visible="{= (${controls>/contextBasedAdaptation/visible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
+				press=".saveAsContextBasedAdaptation"
+				text="{i18n>BTN_SAVE_AS}" />
+	</Menu>
+</core:FragmentDefinition>

package/src/sap/ui/rta/toolbar/Adaptation.fragment.xml

@@ -46,7 +46,7 @@
 				<toolbar:OverflowToolbarButton
 						id="sapUiRta_publishVersion"
 						enabled="{versions>/publishVersionEnabled}"
-						visible="{parts: ['controls>/publishVisible', 'versions>/versioningEnabled', 'versions>/displayedVersion', 'controls>/modeSwitcher'], formatter: '.formatPublishVersionVisibility'}"
+						visible="{parts: ['versions>/publishVersionVisible', 'versions>/versioningEnabled', 'versions>/displayedVersion', 'controls>/modeSwitcher'], formatter: '.formatPublishVersionVisibility'}"
 						press=".publishVersion"
 						type="Transparent"
 						icon="sap-icon://shipping-status"
@@ -78,7 +78,7 @@
 								key="navigation" />
 						<SegmentedButtonItem
 								id="sapUiRta_visualizationSwitcherButton"
-								visible="{controls>/visualizationButtonVisible}"
+								visible="{controls>/visualizationButton/visible}"
 								text="{i18n>BTN_VISUALIZATION}"
 								width="auto"
 								key="visualization" />
@@ -95,27 +95,6 @@
 		<OverflowToolbar id="sapUiRta_actionsToolbar">
 			<content>
 				<ToolbarSpacer />
-				<MenuButton
-						id="sapUiRta_translateMenu"
-						icon="sap-icon://translate"
-						visible="{= ${controls>/modeSwitcher} === 'adaptation' &amp;&amp; ${controls>/translationVisible}}"
-						enabled="{controls>/translationEnabled}"
-						type="Transparent"
-						tooltip="{i18n>BTN_TRANSLATE}">
-					<Menu
-							id="sapUiRta_translate"
-							class="sapUiRtaToolbarVisualizationSelection">
-						<MenuItem
-								text="{i18n>BTN_OPEN_DOWNLOAD_TRANSLATION}"
-								press=".openDownloadTranslationDialog"
-								icon="sap-icon://download"/>
-						<MenuItem
-								text="{i18n>BTN_OPEN_UPLOAD_TRANSLATION}"
-								press=".openUploadTranslationDialog"
-								enabled="{= ${translation>/sourceLanguages}.length > 0}"
-								icon="sap-icon://upload"/>
-					</Menu>
-				</MenuButton>
 				<Button
 						id="sapUiRta_toggleChangeVisualizationMenuButton"
 						visible="{= ${controls>/modeSwitcher} === 'visualization'}"
@@ -125,11 +104,24 @@
 						iconFirst="false"
 						press=".openChangeCategorySelectionPopover"
 						tooltip="{i18n>BUT_CHANGEVISUALIZATION_SELECTCHANGES}"/>
+				<Button
+						id="sapUiRta_actionsMenu"
+						icon="sap-icon://menu2"
+						visible="{= ${controls>/modeSwitcher} === 'adaptation' &amp;&amp; (${controls>/translation/visible} || ${controls>/appVariantMenu/visible} || ${controls>/restore/visible} || ${controls>/contextBasedAdaptation/visible})}"
+						enabled="{controls>/actionsMenuButton/enabled}"
+						type="Transparent"
+						tooltip="{i18n>BTN_MENU}"
+						press=".showActionsMenu"
+						ariaHasPopup="Menu" >
+					<layoutData>
+						<OverflowToolbarLayoutData priority="NeverOverflow" />
+					</layoutData>
+				</Button>
 				<Button
 						id="sapUiRta_undo"
 						icon="sap-icon://undo"
 						press=".undo"
-						enabled="{controls>/undoEnabled}"
+						enabled="{controls>/undo/enabled}"
 						visible="{= ${controls>/modeSwitcher} === 'adaptation'}"
 						type="Transparent"
 						tooltip="{i18n>BTN_UNDO}" >
@@ -141,7 +133,7 @@
 						id="sapUiRta_redo"
 						icon="sap-icon://redo"
 						press=".redo"
-						enabled="{controls>/redoEnabled}"
+						enabled="{controls>/redo/enabled}"
 						visible="{= ${controls>/modeSwitcher} === 'adaptation'}"
 						type="Transparent"
 						tooltip="{i18n>BTN_REDO}" >
@@ -150,75 +142,19 @@
 					</layoutData>
 				</Button>
 				<toolbar:OverflowToolbarButton
-						id="sapUiRta_publish"
-						enabled="{controls>/publishEnabled}"
-						visible="{= (${controls>/publishVisible} &amp;&amp; !${versions>/versioningEnabled} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
-						press=".publish"
-						type="Transparent"
-						text="{i18n>BTN_PUBLISH}" >
-					<toolbar:layoutData>
-						<OverflowToolbarLayoutData priority="High" />
-					</toolbar:layoutData>
-				</toolbar:OverflowToolbarButton>
-				<toolbar:OverflowToolbarButton
-						id="sapUiRta_restore"
-						enabled="{controls>/restoreEnabled}"
-						visible="{= ((${path: 'versions>/versioningEnabled', formatter: '.showRestore'}) &amp;&amp; ((${controls>/modeSwitcher} === 'visualization') || (${controls>/modeSwitcher} === 'adaptation')))}"
-						press=".restore"
+						id="sapUiRta_manageAdaptations"
+						press=".manageAdaptations"
+						visible="{= (${controls>/contextBasedAdaptation/visible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
 						type="Transparent"
-						text="{i18n>BTN_RESTORE}" >
-					<toolbar:layoutData>
-						<OverflowToolbarLayoutData priority="High" />
-					</toolbar:layoutData>
-				</toolbar:OverflowToolbarButton>
-				<toolbar:OverflowToolbarButton
-						id="sapUiRta_manageApps"
-						press=".manageApps"
-						enabled="{controls>/manageAppsEnabled}"
-						visible="{= (${controls>/manageAppsVisible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
-						type="Transparent"
-						text="{i18n>BTN_MANAGE_APPS_TXT}" >
+						text="{i18n>BTN_MANAGE_APP_CTX}" >
 					<toolbar:layoutData>
 						<OverflowToolbarLayoutData priority="Low" />
 					</toolbar:layoutData>
 				</toolbar:OverflowToolbarButton>
-				<MenuButton
-						id="sapUiRta_appVariantOverview"
-						enabled="{controls>/appVariantsOverviewEnabled}"
-						visible="{= (${controls>/appVariantsOverviewVisible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
-						type="Transparent"
-						text="{i18n>BTN_MANAGE_APPS_TXT}" >
-					<menu>
-						<Menu
-								itemSelected=".appVariantOverview"
-								id="sapUiRta_appVariantMenu" >
-							<MenuItem
-									id="sapUiRta_keyUser"
-									text="{i18n>MENU_ITEM_KEY_USER}" />
-							<MenuItem
-									id="sapUiRta_developer"
-									text="{i18n>MENU_ITEM_SAP_DEVELOPER}" />
-						</Menu>
-					</menu>
-					<layoutData>
-						<OverflowToolbarLayoutData priority="Low" />
-					</layoutData>
-				</MenuButton>
 				<toolbar:OverflowToolbarButton
-						id="sapUiRta_saveAsContextBasedAdaptation"
-						visible="{= (${controls>/contextBasedAdaptationVisible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
-						press=".saveAsContextBasedAdaptation"
-						type="Transparent"
-						text="{i18n>BTN_SAVE_AS}" >
-					<toolbar:layoutData>
-						<OverflowToolbarLayoutData priority="Low" />
-					</toolbar:layoutData>
-				</toolbar:OverflowToolbarButton>
-				<toolbar:OverflowToolbarButton
-						id="sapUiRta_saveAs"
-						visible="{= (${controls>/saveAsVisible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
-						enabled="{parts: ['controls>/saveAsEnabled', 'versions>/displayedVersion'], formatter: '.formatSaveAsEnabled'}"
-						press=".saveAs"
+						id="sapUiRta_saveAsAdaptation"
+						visible="{= (${controls>/contextBasedAdaptation/visible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
+						press=".saveAsAdaptation"
 						type="Transparent"
 						text="{i18n>BTN_SAVE_AS}" >
 					<toolbar:layoutData>
@@ -227,14 +163,23 @@
 				</toolbar:OverflowToolbarButton>
 			</content>
 		</OverflowToolbar>
+		<Button
+				id="sapUiRta_save"
+				type="Transparent"
+				press=".save"
+				enabled="{controls>/save/enabled}"
+				tooltip="{i18n>BTN_SAVE}"
+				icon="sap-icon://save" >
+		</Button>
 		<Button
 				id="sapUiRta_exit"
 				type="Transparent"
 				press=".exit"
-				text="{i18n>BTN_EXIT}" >
+				tooltip="{i18n>BTN_EXIT}"
+				icon="sap-icon://decline" >
 		</Button>
 		<layoutData>
 			<FlexItemData growFactor="0" />
 		</layoutData>
 	</HBox>
-</core:FragmentDefinition>
+</core:FragmentDefinition>