소스 검색

Moved background task to bottom right hand corner

Toby Chui 1 년 전
부모
커밋
39224eb0d3

+ 46 - 22
web/desktop.system

@@ -268,6 +268,25 @@
         .navimenu .item.floatWindowButton.hideText .floatWindowAppIcon {
             margin-right: 0px;
         }
+        .navimenu .clock{
+            float: right;
+            text-align: center;
+            color: white;
+            font-size: 0.9em;
+            line-height: 1.3em;
+            pointer-events: none;
+            padding-top: 2px;
+            padding-right: 0.5em;
+            padding-left: 0.5em;
+        }
+        .navimenu .backgroundtasks{
+            float: right;
+            border-right: 1px solid rgb(206, 206, 206, 0.4);
+            color: white;
+            padding-top: 0.5em;
+            padding-right: 0.5em;
+            padding-left: 0.7em;
+        }
         
         #fwdragpanel {
             position: fixed;
@@ -562,12 +581,6 @@
             justify-content: space-between;
         }
 
-        .clock{
-            text-align: center;
-            cursor:pointer; 
-            user-select: none;
-        }
-
         .statusbarpadding{
             padding-top: 0.2em;
         }
@@ -965,23 +978,16 @@
             #backgroundTaskPanel{
                 background-color:white;
                 position:absolute;
-                top:28px;
-                right:50px;
+                bottom:36px;
+                right:0;
                 z-index:115;
                 width:400px;
-                border-radius: 10px;
-                border-top-right-radius: 0px;
-                border-top-left-radius: 0px;
                 border: 1px solid #ebebeb;
                 padding-top:8px;
                 padding-bottom:8px;
-                max-height: 50vh;
+                max-height: 70vh;
                 overflow-y: auto;
                 overflow-x: hidden;
-
-                box-shadow: 6px 8px 13px 2px rgba(191,191,191,0.13);
-                -webkit-box-shadow: 6px 8px 13px 2px rgba(191,191,191,0.13);
-                -moz-box-shadow: 6px 8px 13px 2px rgba(191,191,191,0.13);
             }
 
             .backgroundtaskObject{
@@ -1060,12 +1066,12 @@
         <div class="hostname statusbarpadding">
             Welcome
         </div>
-        <div class="clock statusbarpadding" onclick="toggleNotification();" ontouchstart="toggleNotification();">
+        <div class=" statusbarpadding" onclick="toggleNotification();" ontouchstart="toggleNotification();">
             ArozOS Desktop
         </div>
         <div class="quicktools statusbarpadding">
-            <div id="backgroundtaskBtn" class="qtwrapper backgroundtask" onclick="showBackgroundTaskPanel()" ontouchstart="showBackgroundTaskPanel();">
-                <i class="clone icon"></i>
+            <div class="qtwrapper backgroundtask" >
+                
             </div>
             <div class="qtwrapper content" onclick="showToolPanel();" ontouchend="showToolPanel();" style="margin-right: 0.4em;">
                 <i class="content icon"></i>
@@ -1108,7 +1114,18 @@
         <div class="item clickable system" onclick="toggleListMenu();" ontouchstart="toggleListMenu();" >
             <img style="height:36px;" src="img/desktop/system_icon/list.png"></img>
         </div>
-        <!-- <div class="item padding system"></div> -->
+        <div class="item clickable system">
+            <img style="height:36px;" src="img/desktop/system_icon/navi.png"></img>
+        </div>
+
+        <!-- Right fixed buttons-->
+        <div id="backgroundtaskBtn" class="item backgroundtasks clickable system" onclick="showBackgroundTaskPanel()" ontouchstart="showBackgroundTaskPanel();">
+            <i class="clone icon"></i>
+        </div>
+        <div class="item clock system">
+
+        </div>
+        
     </div>
 
     <!-- floatWindow dragging panel-->
@@ -1178,7 +1195,7 @@
     </div>
 
     <!-- Background Task Panel -->
-    <div id="backgroundTaskPanel" class="" style="display:none;">
+    <div id="backgroundTaskPanel" class="" style="display:;">
         <!--
         <div class="backgroundtaskObject">
             <small>src > dest (test.mp4)</small>
@@ -1615,7 +1632,14 @@
         updateClockTime();
         function updateClockTime(){
             var d = new Date();
-            var display = monthNames[d.getMonth()] + " " + d.getDate() + " " + zeropad(d.getHours(),2) + ":" + zeropad(d.getMinutes(),2);
+            var ampm = "AM";
+            var currentHour = d.getHours()
+            if (currentHour > 12){
+                ampm = "PM";
+                currentHour -= 12;
+            }
+            var display = `${zeropad(currentHour,2)}:${zeropad(d.getMinutes(),2)} ${ampm}<br>
+            ${d.getDate()} ${monthNames[d.getMonth()].substr(0, 3)} ${d.getFullYear()}`;
             
             if ($(".notification.object").length > 0){
                 display += `<span style="color: #f54242; margin-left: 8px; float: center;"><i class="notice circle icon"></i></span>`;

BIN
web/img/desktop/system_icon/bottom_navigation_FILL0_wght400_GRAD0_opsz24.png


BIN
web/img/desktop/system_icon/menu_FILL0_wght400_GRAD0_opsz24.png


BIN
web/img/desktop/system_icon/navi.png


BIN
web/img/desktop/system_icon/navi.psd