2 files changed, 25 insertions, 16 deletions

diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index 95aebbe4a..536baadd4 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -23,6 +23,7 @@ import { SchemaHeaderField } from "../../fields/SchemaHeaderField";
 import { DimUnit } from "../views/collections/collectionMulticolumn/CollectionMulticolumnView";
 import { LabelBox } from "../views/nodes/LabelBox";
 import { LinkManager } from "./LinkManager";
+import { Id } from "../../fields/FieldSymbols";
 
 export class CurrentUserUtils {
     private static curr_id: string;
@@ -502,19 +503,20 @@ export class CurrentUserUtils {
         return doc.myItemCreators as Doc;
     }
 
-    static menuBtnDescriptions(): {
-        title: string, icon: string, click: string,
+    static menuBtnDescriptions(doc: Doc): {
+        title: string, icon: string, click: string, watchedDocuments?: Doc
     }[] {
+        this.setupSharingSidebar(doc);  // sets up the right sidebar collection for mobile upload documents and sharing
         return [
-            { title: "Sharing", icon: "users", click: 'scriptContext.selectMenu(self, "Sharing")' },
-            { title: "Workspace", icon: "desktop", click: 'scriptContext.selectMenu(self, "Workspace")' },
-            { title: "Catalog", icon: "file", click: 'scriptContext.selectMenu(self, "Catalog")' },
-            { title: "Archive", icon: "archive", click: 'scriptContext.selectMenu(self, "Archive")' },
-            { title: "Import", icon: "upload", click: 'scriptContext.selectMenu(self, "Import")' },
-            { title: "Tools", icon: "wrench", click: 'scriptContext.selectMenu(self, "Tools")' },
-            { title: "Help", icon: "question-circle", click: 'scriptContext.selectMenu(self, "Help")' },
-            { title: "Settings", icon: "cog", click: 'scriptContext.selectMenu(self, "Settings")' },
-            { title: "User Doc", icon: "address-card", click: 'scriptContext.selectMenu(self, "UserDoc")' },
+            { title: "Sharing", icon: "users", click: 'selectMainMenu(self)', watchedDocuments: doc["sidebar-sharing"] as Doc },
+            { title: "Workspace", icon: "desktop", click: 'selectMainMenu(self)' },
+            { title: "Catalog", icon: "file", click: 'selectMainMenu(self)' },
+            { title: "Archive", icon: "archive", click: 'selectMainMenu(self)' },
+            { title: "Import", icon: "upload", click: 'selectMainMenu(self)' },
+            { title: "Tools", icon: "wrench", click: 'selectMainMenu(self)' },
+            { title: "Help", icon: "question-circle", click: 'selectMainMenu(self)' },
+            { title: "Settings", icon: "cog", click: 'selectMainMenu(self)' },
+            { title: "User Doc", icon: "address-card", click: 'selectMainMenu(self)' },
         ];
     }
 
@@ -528,16 +530,17 @@ export class CurrentUserUtils {
     }
     static setupMenuPanel(doc: Doc) {
         if (doc.menuStack === undefined) {
-            const menuBtns = CurrentUserUtils.menuBtnDescriptions().map(({ title, icon, click }) =>
+            const menuBtns = CurrentUserUtils.menuBtnDescriptions(doc).map(({ title, icon, click, watchedDocuments }) =>
                 Docs.Create.FontIconDocument({
                     icon,
                     iconShape: "square",
                     title,
                     _backgroundColor: "black",
-                    stayInCollection: true,
+                    _stayInCollection: true,
                     childDropAction: "same",
                     _width: 60,
                     _height: 60,
+                    watchedDocuments,
                     onClick: ScriptField.MakeScript(click, { scriptContext: "any" }), system: true
                 }));
             const userDoc = menuBtns[menuBtns.length - 1];
@@ -724,7 +727,7 @@ export class CurrentUserUtils {
         if (doc.myCatalog === undefined) {
             doc.myCatalog = new PrefetchProxy(Docs.Create.SchemaDocument([], [], {
                 title: "CATALOG", _height: 1000, _fitWidth: true, forceActive: true, boxShadow: "0 0", treeViewPreventOpen: false,
-                childDropAction: "alias", targetDropAction: "same", stayInCollection: true, treeViewOpen: true, system: true
+                childDropAction: "alias", targetDropAction: "same", _stayInCollection: true, treeViewOpen: true, system: true
             }));
         }
 
@@ -744,7 +747,7 @@ export class CurrentUserUtils {
         doc.myRecentlyClosed === undefined;
         if (doc.myRecentlyClosed === undefined) {
             doc.myRecentlyClosed = new PrefetchProxy(Docs.Create.TreeDocument([], {
-                title: "RECENTLY CLOSED", _height: 75, forceActive: true, boxShadow: "0 0", treeViewPreventOpen: false, treeViewOpen: true, stayInCollection: true, system: true
+                title: "RECENTLY CLOSED", _height: 75, forceActive: true, boxShadow: "0 0", treeViewPreventOpen: false, treeViewOpen: true, _stayInCollection: true, system: true
             }));
         }
         // this is equivalent to using PrefetchProxies to make sure the recentlyClosed doc is ready
@@ -923,6 +926,7 @@ export class CurrentUserUtils {
         doc.fontFamily = StrCast(doc.fontFamily, "Arial");
         doc.fontColor = StrCast(doc.fontColor, "black");
         doc.fontHighlight = StrCast(doc.fontHighlight, "");
+        doc.defaultAclPrivate = BoolCast(doc.defaultAclPrivate, true);
         doc.activeCollectionBackground = StrCast(doc.activeCollectionBackground, "white");
         doc.activeCollectionNestedBackground = Cast(doc.activeCollectionNestedBackground, "string", null);
         doc.noviceMode = BoolCast(doc.noviceMode, true);
@@ -931,7 +935,6 @@ export class CurrentUserUtils {
         Utils.DRAG_THRESHOLD = NumCast(doc["constants-dragThreshold"]);
         this.setupDefaultIconTemplates(doc);  // creates a set of icon templates triggered by the document deoration icon
         this.setupDocTemplates(doc); // sets up the template menu of templates
-        this.setupSharingSidebar(doc);  // sets up the right sidebar collection for mobile upload documents and sharing
         this.setupImportSidebar(doc);
         this.setupActiveMobileMenu(doc); // sets up the current mobile menu for Dash Mobile
         this.setupMenuPanel(doc);
diff --git a/src/client/util/SettingsManager.scss b/src/client/util/SettingsManager.scss
index 560786400..ec513e5d5 100644
--- a/src/client/util/SettingsManager.scss
+++ b/src/client/util/SettingsManager.scss
@@ -97,6 +97,8 @@
 
 .modes-content {
     display: flex;
+    margin-left: 10px;
+    font-size: 12;
 
     .modes-select {
         // width: 170px;
@@ -112,6 +114,8 @@
     .modes-playground,
     .default-acl {
         display: flex;
+        margin-left: 10px;
+        font-size: 12;
 
         .playground-check,
         .acl-check {
@@ -125,10 +129,12 @@
         .playground-text {
             color: black;
             margin-right: 10px;
+            margin-top: 2;
         }
 
         .acl-text {
             color: black;
+            margin-top: 2;
         }
 
     }