Update.

xOS · Feb 27, 2024 · a8cc17e · a8cc17e
1 parent b43a1e7
commit a8cc17e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 245 deletions.
diff --git a/resource/template/common/footer.html b/resource/template/common/footer.html
@@ -7,10 +7,11 @@
 </div>
 <script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/3.6.0/jquery.min.js"></script>
 <script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/semantic-ui/2.4.1/semantic.min.js"></script>
-<script src="static/semantic-ui-alerts.min.js?v20220423"></script>
 <script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/vue/2.6.14/vue.min.js"></script>
 <script src="static/main.js?v20240227"></script>
 <script src="static/wallpaper.js?v20220423"></script>
+<script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/echarts/5.3.0/echarts.min.js"></script>
+<script src="/static/theme-default/js/mixin.js?v20240227"></script>
 <script>
     var def_bg = document.getElementById('def_background');
     if (def_bg) {

diff --git a/resource/template/common/header.html b/resource/template/common/header.html
@@ -19,9 +19,9 @@
     <link rel="stylesheet" type="text/css" href="static/fontawesome.min.css">
     <link href="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/font-logos/0.17/font-logos.min.css" rel="stylesheet">
     <link href="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/flag-icon-css/4.1.5/css/flag-icons.min.css" rel="stylesheet">
-    <link rel="stylesheet" type="text/css" href="static/semantic-ui-alerts.min.css?v20220423">
     <link rel="stylesheet" type="text/css" href="static/main.css?v2024020910">
-    <link rel="shortcut icon" type="image/png" href="static/logo.svg?v20220602" />
+    <!-- <link rel="stylesheet" type="text/css" href="static/theme-default/css/main.css?v20240227"> -->
+    <link rel="shortcut icon" type="image/png" href="static/logo.svg?v20220602"/>
 </head>
 <body id="bg">
     <div class="def_background_wrap">

diff --git a/resource/template/common/menu.html b/resource/template/common/menu.html
@@ -1,4 +1,5 @@
 {{define "common/menu"}}
+<div id="app">
 <div class="ui large top fixed menu nb-menu">
     <div class="ui container">
         <div class="item">
@@ -47,5 +48,6 @@
         </div>
     </div>
 </div>
+</div>
 {{template "component/confirm" .}}
 {{end}}
diff --git a/resource/template/common/network.html b/resource/template/common/network.html
diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html
@@ -1,7 +1,7 @@
 {{define "theme-default/home"}}
-{{template "theme-default/header" .}}
+{{template "common/header" .}}
 {{if ts .CustomCode}} {{.CustomCode|safe}} {{end}}
-{{template "theme-default/menu" .}}
+{{template "common/menu" .}}
 <div class="nb-container">
   <div class="ui container">  
     <template v-if="groups">
@@ -184,7 +184,7 @@
     </template>
   </div>
 </div>
-{{template "theme-default/footer" .}}
+{{template "common/footer" .}}
 <script>
   function specialOS(i) {
     if ((i.toString().toLowerCase().indexOf("windows")) != -1) {

diff --git a/resource/template/theme-default/network.html b/resource/template/theme-default/network.html
@@ -1,9 +1,9 @@
 {{define "theme-default/network"}}
-{{template "theme-default/header" .}}
+{{template "common/header" .}}
 {{if ts .CustomCode}}
 {{.CustomCode|safe}}
 {{end}}
-{{template "theme-default/menu" .}}
+{{template "common/menu" .}}
 <div class="nb-container">
     <div class="ui container">
         <div class="service-status">
@@ -26,9 +26,7 @@
     </div>
 </div>
 
-{{template "theme-default/footer" .}}
-<script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/echarts/5.3.0-rc.1/echarts.min.js"></script>
-
+{{template "common/footer" .}}
 <script>
     const monitorInfo =  JSON.parse('{{.MonitorInfos}}');
     const initData = JSON.parse('{{.Servers}}').servers;
@@ -218,7 +216,7 @@
                 this.myChart.setOption(this.option);
             },
             isWindowsPlatform(str) {
-                return str.includes('Windows')
+                return str.includes('indows')
             },
             renderChart() {
               this.myChart = echarts.init(this.$refs.chartDom);

diff --git a/resource/template/theme-default/viewpassword.html b/resource/template/theme-default/viewpassword.html
@@ -3,6 +3,7 @@
 {{if ts .CustomCode}}
 {{.CustomCode|safe}}
 {{end}}
+{{template "common/menu" .}}
 <div class="login nb-container">
     <div class="ui center aligned grid">
         <div class="column">