TC pushbot 5 преди 4 години
родител
ревизия
c5c4f313f4

+ 1 - 1
startup.flags.go

@@ -20,7 +20,7 @@ func StartupFlagsInit() {
 	//Create a admin permission router for handling requests
 	//Register a boot flag modifier
 	registerSetting(settingModule{
-		Name:         "Startup",
+		Name:         "Runtime",
 		Desc:         "Change startup paramter in runtime",
 		IconPath:     "SystemAO/info/img/small_icon.png",
 		Group:        "Info",

+ 0 - 2
web/SystemAO/disk/disk_restore.html

@@ -162,8 +162,6 @@
            <button class="ui right floated button" onclick="ao_module_close();">Close</button>
         <br>
     </div>
-        
-    <br><br>
     <script>
         var vrootID = "";
         var viewingFileInfo = {};

+ 35 - 15
web/SystemAO/security/authreq.html

@@ -9,29 +9,45 @@
     <script type="text/javascript" src="../../script/semantic/semantic.min.js"></script>
     <script type="text/javascript" src="../../script/ao_module.js"></script>
     <style>
-   
+        .topSlate{
+            background-image: url("img/auth_slate.png");
+            background-repeat: no-repeat;
+            background-repeat: no-repeat !important;
+            background-size: 100% auto;
+            background-attachment: fixed !important;
+            background-color: #1a1a1a;
+            height: 70px; 
+            margin-bottom: 4px;
+        }
+
+        .whitefont{
+            color: white !important;
+        }
     </style>
 </head>
 <body>
+    <div class="topSlate">
+        <div class="ui container">
+            <h3 class="ui header" style="padding-top: 12px;">
+                <div class="content whitefont">
+                    <span id="title">Authentication Required</span>
+                    <div id="desc" class="sub header whitefont">in order to proceed this operation</div>
+                </div>
+            </h3>
+        </div>
+    </div>
     <div class="ui container">
-        <h3 class="ui header" style="padding-top: 12px;">
-            <img src="img/lock.svg">
-            <div class="content">
-                <span id="title">Authentication Required</span>
-                <div id="desc" class="sub header">in order to proceed this operation</div>
-            </div>
-        </h3>
-        <p>Username</p>
-        <div class="ui small fluid input" style="margin-top: -10px;">
-            <input id="username" type="text" placeholder="">
+        <div class="ui left icon small fluid input" style="margin-top: 12px;">
+            <input id="username" type="text" placeholder="Username">
+            <i class="user icon"></i>
         </div>
-        <p>Password</p>
-        <div class="ui fluid input" style="margin-top: -10px;">
-            <input id="password" type="password" placeholder="">
+        <div class="ui left icon fluid input" style="margin-top: 12px;">
+            <input id="password" type="password" placeholder="Password">
+            <i class="key icon"></i>
         </div>
         <br>
         <div align="right">
-            <button class="ui green button" onclick="confirm()">OK</button>
+            <button class="ui blue button" onclick="confirm()">Confirm</button>
             <button class="ui button" onclick="cancel()">Cancel</button>
         </div>
         
@@ -39,6 +55,7 @@
     
     <script>
        ao_module_setFixedWindowSize();
+       ao_module_setWindowSize(420, 260);
        var actionObject = {};
        var method = "GET";
        if (window.location.hash.length > 1){
@@ -86,6 +103,9 @@
                 success: function(data){
                     if (data.error != undefined){
                         $("#password").parent().addClass("error");
+                        if ($("#username").parent().hasClass("disabled") == false){
+                            $("#username").parent().addClass("error");
+                        }
                     }else{
                         if (ao_module_hasParentCallback()){
                             ao_module_parentCallback(data);

BIN
web/SystemAO/security/img/auth_slate.png


BIN
web/SystemAO/security/img/auth_slate.psd


+ 1 - 1
web/SystemAO/users/group.html

@@ -152,7 +152,7 @@
                     url: "SystemAO/users/newgroup.html",
                     width: 560,
                     height: 768,
-                    appicon: "SystemAO/users/img/group_white.png",
+                    appicon: "SystemAO/users/img/users-white.svg",
                     title: "Create User Group",
                     parent: ao_module_windowID,
                     callback: "confirmCreateHandler"

+ 2 - 2
web/SystemAO/users/userList.html

@@ -324,7 +324,7 @@
                     url: "user.system",
                     width: 530,
                     height: 740,
-                    appicon: "SystemAO/users/img/user_white.png",
+                    appicon: "SystemAO/users/img/user-white.svg",
                     title: "Create New User",
                     callback: "finishCreateHandler",
                     parent: ao_module_windowID
@@ -337,7 +337,7 @@
                     url:"SystemAO/users/editUser.html#" + encodeURIComponent(username),
                     width: 530,
                     height: 740,
-                    appicon: "SystemAO/users/img/user_white.png",
+                    appicon: "SystemAO/users/img/user-white.svg",
                     title: "Edit User",
                     callback: "finishCreateHandler",
                     parent: ao_module_windowID

+ 5 - 2
web/desktop.system

@@ -1034,8 +1034,12 @@
         var hardwareman = false;
         var downloadMode = false;
         var lowMemoryMode = true;
+
+        //Browser detection
         var isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
         var isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+        var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
+        var isMacOS = (navigator.appVersion.indexOf("Mac")!=-1);
 
         //Initiation functions
         initDesktopTheme();
@@ -3038,7 +3042,6 @@
 
         function appendDesktopIcon(target, properties){
             var htmlType = "div";
-            var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
             if (properties.type == "file" && isChrome){
                 htmlType = "a";
             }
@@ -4231,7 +4234,7 @@
                     }
                     showMenu = true;
 
-                } else if (clickTarget.hasClass("backgroundFrame") || (isSafari && $(clickTarget).attr("id") == "selectionPanel")) {
+                } else if (clickTarget.hasClass("backgroundFrame") || ((isSafari || (isMacOS && isChrome)) && $(clickTarget).attr("id") == "selectionPanel")) {
                     //Click on the background. Load background context menu.
                     addContextMenuItem($("#contextmenu"), 'New', "<i class='caret right icon'></i>", "newitemmenu", true);
                     addContextMenuItem($("#contextmenu"), 'Refresh', "<i class='refresh icon'></i>", "handleMenuRefresh", false);