move button to user menu

Author: odeimaiz

services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js

@@ -133,9 +133,6 @@ qx.Class.define("osparc.navigation.NavigationBar", {
       this.getChildControl("read-only-info");
 
       // right-items
-      if (osparc.product.Utils.isProduct("tiplite")) {
-        this.getChildControl("tip-lite-button");
-      }
       this.getChildControl("tasks-button");
       this.getChildControl("notifications-button");
       this.getChildControl("expiration-icon");
@@ -231,15 +228,6 @@ qx.Class.define("osparc.navigation.NavigationBar", {
           this.getChildControl("center-items").add(control);
           break;
         }
-        case "tip-lite-button":
-          control = new qx.ui.form.Button(this.tr("Access TIP")).set({
-            marginRight: 30,
-            ...this.self().BUTTON_OPTIONS,
-          });
-          osparc.utils.Utils.setIdToWidget(control, "accessTIPBtn");
-          control.addListener("execute", () => osparc.product.TIPTeaser.getInstance().open());
-          this.getChildControl("right-items").add(control);
-          break;
         case "credits-button":
           control = new osparc.desktop.credits.CreditsIndicatorButton();
           this.getChildControl("right-items").add(control);

services/static-webserver/client/source/class/osparc/navigation/UserMenu.js

@@ -95,12 +95,6 @@ qx.Class.define("osparc.navigation.UserMenu", {
           control.addListener("execute", () => osparc.cluster.Utils.popUpClustersDetails(), this);
           this.add(control);
           break;
-        case "license":
-          control = new qx.ui.menu.Button(this.tr("License"));
-          osparc.store.Support.getLicenseURL()
-            .then(licenseURL => control.addListener("execute", () => window.open(licenseURL)));
-          this.add(control);
-          break;
         case "about":
           control = new qx.ui.menu.Button(this.tr("About oSPARC"));
           control.addListener("execute", () => osparc.About.getInstance().open());
@@ -116,6 +110,18 @@ qx.Class.define("osparc.navigation.UserMenu", {
           this.add(control);
           break;
         }
+        case "license":
+          control = new qx.ui.menu.Button(this.tr("License"));
+          osparc.store.Support.getLicenseURL()
+            .then(licenseURL => control.addListener("execute", () => window.open(licenseURL)));
+          this.add(control);
+          break;
+        case "tip-lite-button":
+          control = new qx.ui.menu.Button(this.tr("Access full TIP"));
+          osparc.utils.Utils.setIdToWidget(control, "userMenuAccessTIPBtn");
+          control.addListener("execute", () => osparc.product.TIPTeaser.getInstance().open());
+          this.getChildControl("right-items").add(control);
+          break;
         case "log-out": {
           const authData = osparc.auth.Data.getInstance();
           control = new qx.ui.menu.Button(authData.isGuest() ? this.tr("Exit") : this.tr("Log out"));
@@ -167,6 +173,9 @@ qx.Class.define("osparc.navigation.UserMenu", {
         this.getChildControl("about-product");
       }
       this.getChildControl("license");
+      if (osparc.product.Utils.isProduct("tiplite")) {
+        this.getChildControl("tip-lite-button");
+      }
       this.addSeparator();
 
       this.getChildControl("log-out");
@@ -220,6 +229,9 @@ qx.Class.define("osparc.navigation.UserMenu", {
         this.getChildControl("about-product");
       }
       this.getChildControl("license");
+      if (osparc.product.Utils.isProduct("tiplite")) {
+        this.getChildControl("tip-lite-button");
+      }
       this.addSeparator();
       this.getChildControl("log-out");