Added adavnec sharing setting popup on desktop

web/SystemAO/file_system/file_share.html

@@ -16,7 +16,7 @@
             }
 
             .sub.header.darkTheme{
-                color: rgba(255, 255, 255, 0.623) !important;
+                color: rgba(39, 19, 19, 0.623) !important;
             }
 
             .darkTheme:not(a){
@@ -209,7 +209,6 @@
             var relpath = "../../";
             
             function applyDarkThemeMode(){
-                $("body").addClass("darkTheme");
                 $(".ui.message").addClass("inverted");
                 darkTheme = true;
             }
@@ -301,7 +300,10 @@
                 //Load theme style
                 $.get(relpath + "../system/file_system/preference?key=file_explorer/theme",function(data){
                     if (data == "darkTheme"){
+                        $("body").addClass("darkTheme");
                         applyDarkThemeMode();
+                    }else{
+                        $("body").addClass("whiteTheme");
                     }
                 });
 

web/SystemAO/locale/desktop.json

@@ -91,6 +91,7 @@
                 "contextmenu/share/link": "任何擁有鏈接的使用者",
                 "contextmenu/share/signedin": "任何已登入的使用者",
                 "contextmenu/share/samegroup": "擁有相同權限的使用者",
+                "contextmenu/share/openshare": "進階分享設定",
                 "contextmenu/Remove Share": "移除檔案分享",
                 "contextmenu/Small": "小",
                 "contextmenu/Medium": "中",
@@ -209,6 +210,7 @@
                 "contextmenu/share/link": "任何擁有鏈接的使用者",
                 "contextmenu/share/signedin": "任何已登入的使用者",
                 "contextmenu/share/samegroup": "擁有相同權限的使用者",
+                "contextmenu/share/openshare": "進階分享設定",
                 "contextmenu/Remove Share": "移除檔案分享",
                 "contextmenu/Small": "小",
                 "contextmenu/Medium": "中",
@@ -327,6 +329,7 @@
                 "contextmenu/share/link": "任何拥有连接的使用者",
                 "contextmenu/share/signedin": "任何已登录的使用者",
                 "contextmenu/share/samegroup": "拥有相同权限的使用者",
+                "contextmenu/share/openshare": "进阶分享设定",
                 "contextmenu/Remove Share": "移除文件分享",
                 "contextmenu/Small": "小",
                 "contextmenu/Medium": "中",
@@ -445,7 +448,8 @@
                 "contextmenu/Share this File": "Share this File",
                 "contextmenu/share/link": "Anyone with the link",
                 "contextmenu/share/signedin": "Anyone signed in",
-                "contextmenu/share/samegroup": "People in the same group",
+                "contextmenu/share/samegroup": "Same user group",
+                "contextmenu/share/openshare": "Advance Share Settings",
                 "contextmenu/Remove Share": "Remove File Share",
                 "contextmenu/Small": "Small",
                 "contextmenu/Medium": "Medium",
@@ -560,10 +564,11 @@
                 "contextmenu/Copy Link": "リンクをコピー",
                 "contextmenu/Copied": "コピーしました",
                 "contextmenu/Change Share Settings": "共有設定を変更",
-                "contextmenu/Share this File": "このファイルを共有",
+                "contextmenu/Share this File": "ファイルを共有",
                 "contextmenu/share/link": "リンクを持つすべての人",
                 "contextmenu/share/signedin": "サインインしているすべての人",
                 "contextmenu/share/samegroup": "同じグループの人",
+                "contextmenu/share/openshare": "高度な共有設定",
                 "contextmenu/Remove Share": "ファイルの共有を解除",
                 "contextmenu/Small": "小",
                 "contextmenu/Medium": "中",

web/desktop.system

@@ -5561,7 +5561,13 @@
 
                         var sameGroupClass = "";
                         if (data.ShareUUID.Permission == "samegroup"){
-                            samegroup = `<i ${checkmarkStyle} class="checkmark icon"></i>`;
+                            sameGroupClass = `<i ${checkmarkStyle} class="checkmark icon"></i>`;
+                        }
+
+                        var advanceShareClass = "";
+                        if (data.IsShared && anyoneClass == "" && signedinClass == "" && sameGroupClass == ""){
+                            //None of the simple class this share is using. Assume advance share
+                            advanceShareClass = `<i ${checkmarkStyle} class="checkmark icon"></i>`;
                         }
 
                         addContextMenuItem($("#subcontextmenu"), `<i class="globe icon"></i> ${applocale.getString("contextmenu/share/link","Anyone with Link")}`, anyoneClass, "shareWithThisPermission", false, {
@@ -5574,12 +5580,17 @@
                                 type: "signedin"
                             }
                         });
-                        addContextMenuItem($("#subcontextmenu"), `<i class="users icon"></i> ${applocale.getString("contextmenu/share/samegroup","Same Group Users")}`, sameGroupClass, "shareWithThisPermission", false,{
+                        addContextMenuItem($("#subcontextmenu"), `<i class="users icon"></i> ${applocale.getString("contextmenu/share/samegroup","Same user group")}`, sameGroupClass, "shareWithThisPermission", false,{
                             payload: {
                                 type: "samegroup"
                             }
                         });
-                        if (data.IsShared == true){
+                        addContextMenuItem($("#subcontextmenu"), `<i class="setting icon"></i> ${applocale.getString("contextmenu/share/openshare","Advance Share Settings")}`, advanceShareClass, "shareWithThisPermission", false,{
+                            payload: {
+                                action: "openshare"
+                            }
+                        });
+                        if (data.IsShared){
                             //This file is shared.
                             addContextMenuSeperator($("#subcontextmenu"));
                             addContextMenuItem($("#subcontextmenu"), lcontex("Remove Share"), `<i style="color: #d97762;" class="trash icon"></i>`, "shareWithThisPermission", false,{
@@ -5653,6 +5664,7 @@
                 return;
             }
 
+
             //Get the selected file
             var selectedFileObjects = $(".launchIconWrapper.selected");
             if (selectedFileObjects.length == 0){
@@ -5674,6 +5686,27 @@
                 "shareMode": payload.type
             };
 
+            if (payload.action != undefined && payload.action == "openshare"){
+                //Advance setting. Open share interface
+                delete afd.shareMode;
+                afd.ActionButtons = false;
+
+                //Open share manager in another floatWindow
+                let targetURL = "SystemAO/file_system/file_share.html#" + encodeURIComponent(JSON.stringify([afd]));
+                newFloatWindow({
+                    url: targetURL,
+                    width: 330,
+                    height: 480,
+                    left: left,
+                    top: top,
+                    appicon: "SystemAO/file_system/img/share.svg",
+                    title: "Share File"
+                });
+
+                hideAllContextMenus();
+                return;
+            }
+
             //Create a new share for this
             var targetURL = "SystemAO/file_system/file_share.html#" + encodeURIComponent(JSON.stringify([afd]));
 

web/script/ao_module.js

@@ -891,6 +891,7 @@ class ao_module_utils{
 			filelist = JSON.parse(filelist);
 			return filelist;
 		}
+        return null;
     }
 
     static readFileFromFileObject(fileObject, successCallback, failedCallback=undefined){