From 33f78278c0b019aa80c59951a8b4a45e6746c9b4 Mon Sep 17 00:00:00 2001
From: filesite <release@filesite.io>
Date: Thu, 24 Nov 2022 13:50:45 +0800
Subject: [PATCH] view improved

---
 themes/beauty/views/layout/main.php | 10 ++--
 themes/beauty/views/site/index.php  | 87 ++++++-----------------------
 www/js/beauty.js                    | 38 +++++++------
 3 files changed, 42 insertions(+), 93 deletions(-)
diff --git a/themes/beauty/views/layout/main.php b/themes/beauty/views/layout/main.php
index 0ea0c9f..9ae238c 100644
--- a/themes/beauty/views/layout/main.php
+++ b/themes/beauty/views/layout/main.php
@@ -2,10 +2,8 @@
 //常用方法
 require_once __DIR__ . '/../../../../plugins/Html.php';
 
-?>
-<!DocType html>
+?><!DocType html>
 <html>
-
 <head>
     <meta charset="utf-8">
     <title><?php echo $pageTitle; ?></title>
@@ -78,10 +76,13 @@ eof;
                 </li>
             </ul>
         </div>
+
+        <?php if (!empty($viewData['mp3File'])) { ?>
         <!-- 音乐 -->
-        <audio class="music_main musicMJS" id="music_main" src="https://demo.jialuoma.cn//girls/Unchained_Melody.mp3" preload autoplay loop>
+        <audio class="music_main musicMJS" id="music_main" src="<?=$viewData['mp3File']['path']?>" preload autoplay loop>
             你的浏览器不支持<code>audio</code>标签
         </audio>
+        <?php } ?>
     </div>
 
     <!--for theme googleimage-->
@@ -91,5 +92,4 @@ eof;
     <script src="/js/fubox.min.js"></script>
     <script src="/js/beauty.js?v<?= Html::getStaticFileVersion('beauty.js', 'js') ?>"></script>
 </body>
-
 </html>
\ No newline at end of file
diff --git a/themes/beauty/views/site/index.php b/themes/beauty/views/site/index.php
index fc29e28..7755d8e 100644
--- a/themes/beauty/views/site/index.php
+++ b/themes/beauty/views/site/index.php
@@ -82,19 +82,19 @@ eof;
         $imgExts = !empty(FSC::$app['config']['supportedImageExts']) ? FSC::$app['config']['supportedImageExts'] : array('jpg', 'jpeg', 'png', 'webp', 'gif');
         $category = !empty($viewData['scanResults'][$selectedId]) ? $viewData['scanResults'][$selectedId] : [];
 
-//         //当前目录的描述介绍
-//         if (!empty($category['description'])) {
-//             echo <<<eof
-//     <p class="modal-body text_dark">{$category['description']}</p>
-// eof;
-//         }
-
-//         //当前目录的readme详细介绍
-//         if (!empty($viewData['htmlCateReadme'])) {
-//             echo <<<eof
-//     <div class="modal-body text_dark markdown-body">{$viewData['htmlCateReadme']}</div>
-// eof;
-//         }
+        //当前目录的描述介绍
+        if (!empty($category['description'])) {
+            echo <<<eof
+    <p class="modal-body text_dark">{$category['description']}</p>
+eof;
+        }
+
+        //当前目录的readme详细介绍
+        if (!empty($viewData['htmlCateReadme'])) {
+            echo <<<eof
+    <div class="modal-body text_dark markdown-body">{$viewData['htmlCateReadme']}</div>
+eof;
+        }
 
         if (!empty($category['directories'])) {        //两级目录支持
             $index = 0;
@@ -132,7 +132,7 @@ eof;
 eof;
                         } else {
                             echo <<<eof
-    <img src="/img/beauty/lazy.svg" data-original="{$first_img['path']}" class="bor_radius im_img lazy" alt="{$first_img['filename']}">
+    <img src="{$first_img['path']}" class="bor_radius im_img" alt="{$first_img['filename']}">
 eof;
                         }
                     } else {
@@ -175,7 +175,7 @@ eof;
                     echo <<<eof
 <div class="im_item bor_radius col-xs-6 col-sm-4 col-md-3 col-lg-2">
     <a href="javascript:;" class="bor_radius" data-fancybox="gallery" data-src="{$file['path']}" data-caption="图片{$title}">
-        <img src="/img/beauty/lazy.svg" data-original="{$file['path']}" class="bor_radius im_img lazy" alt="{$file['filename']}">
+        <img src="{$file['path']}" class="bor_radius im_img" alt="{$file['filename']}">
     </a>
 </div>
 eof;
@@ -187,59 +187,4 @@ eof;
         ?>
 
     </div>
-</div>
-
-<?php /*if (!empty($viewData['mp3File'])) { ?>
-<audio autoplay controls loop preload="auto" id="music" class="hide">
-    <source src="<?=$viewData['mp3File']['path']?>" type="audio/mpeg">
-    Your browser does not support the audio element.
-</audio>
-<div class="mbtns" onclick="playMusic()">
-    <div class="mbtn playing hide" id="btn_playing">
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-cassette-fill" viewBox="0 0 16 16">
-            <path d="M1.5 2A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h.191l1.862-3.724A.5.5 0 0 1 4 10h8a.5.5 0 0 1 .447.276L14.31 14h.191a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 14.5 2h-13ZM4 7a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm8 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2ZM6 6a1 1 0 0 1 1-1h2a1 1 0 0 1 0 2H7a1 1 0 0 1-1-1Z"/>
-            <path d="m13.191 14-1.5-3H4.309l-1.5 3h10.382Z"/>
-        </svg>
-    </div>
-    <div class="mbtn paused" id="btn_paused">
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-cassette" viewBox="0 0 16 16">
-            <path d="M4 8a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm9-1a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM7 6a1 1 0 0 0 0 2h2a1 1 0 1 0 0-2H7Z"/>
-            <path d="M1.5 2A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h13a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 14.5 2h-13ZM1 3.5a.5.5 0 0 1 .5-.5h13a.5.5 0 0 1 .5.5v9a.5.5 0 0 1-.5.5h-.691l-1.362-2.724A.5.5 0 0 0 12 10H4a.5.5 0 0 0-.447.276L2.19 13H1.5a.5.5 0 0 1-.5-.5v-9ZM11.691 11l1 2H3.309l1-2h7.382Z"/>
-        </svg>
-    </div>
-</div>
-<script>
-function playMusic() {
-    var mp3 = document.getElementById('music');
-    var playingBtn = document.getElementById('btn_playing'),
-        pausedBtn = document.getElementById('btn_paused');
-    try {
-        if (mp3.paused) {
-            mp3.play();
-            mp3.volume = 0.5;
-            playingBtn.className = playingBtn.className.replace(' hide', '');
-            pausedBtn.className = pausedBtn.className.replace(' hide', '') + ' hide';
-        }else {
-            mp3.pause();
-            pausedBtn.className = pausedBtn.className.replace(' hide', '');
-            playingBtn.className = playingBtn.className.replace(' hide', '') + ' hide';
-        }
-    }catch(e){}
-}
-
-function detectMusicAutoPlaying() {
-    var mp3 = document.getElementById('music');
-    var playingBtn = document.getElementById('btn_playing'),
-        pausedBtn = document.getElementById('btn_paused');
-    try {
-        if (!mp3.paused) {
-            mp3.volume = 0.5;
-            playingBtn.className = pausedBtn.className.replace(' hide', '');
-            pausedBtn.className = playingBtn.className.replace(' hide', '') + ' hide';
-            if (typeof(timer) != 'undefined') {clearInterval(timer);}
-        }
-    }catch(e){}
-}
-var timer = setInterval(detectMusicAutoPlaying, 50);
-</script>
-<?php }*/ ?>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/www/js/beauty.js b/www/js/beauty.js
index 57d5bf6..f4c8174 100644
--- a/www/js/beauty.js
+++ b/www/js/beauty.js
@@ -63,10 +63,12 @@ if ($('#image_site').get(0)) {
     var lanpnum = 0;
     $('#image_site .lampJS').click(function () {
         if (lanpnum == 0) {
+            $('#markdowncss').attr('href', '/css/github-markdown-dark.css');
             $(document.body).addClass('lampshow');
             $('#image_site .navbarJS').removeClass('navbar-default').addClass('navbar-inverse'); // 导航栏用bootstrap主题切换
             lanpnum = 1;
         } else if (lanpnum == 1) {
+            $('#markdowncss').attr('href', '/css/github-markdown-light.css');
             $(document.body).removeClass('lampshow');
             $('#image_site .navbarJS').addClass('navbar-default').removeClass('navbar-inverse');
             lanpnum = 0;
@@ -76,25 +78,27 @@ if ($('#image_site').get(0)) {
     });
 
     // 音乐播放
-    var musicState = 0;
-    $('#music_main').get(0).volume = 0.5; // 控制音量
-    $('.musicJS').click(function () {
-        if (musicState == 0) {
+    if ($('#music_main').length > 0) {
+        var musicState = 0;
+        $('#music_main').get(0).volume = 0.5; // 控制音量
+        $('.musicJS').click(function () {
+            if (musicState == 0) {
+                $('#music_main').get(0).play();
+                $('.musicJS').addClass('music_put');
+                musicState = 1;
+            } else {
+                $('#music_main').get(0).pause();
+                $('.musicJS').removeClass('music_put');
+                musicState = 0;
+            }
+            return;
+        })
+
+        $(document).one('touchstart mousedown', function () {
             $('#music_main').get(0).play();
             $('.musicJS').addClass('music_put');
             musicState = 1;
-        } else {
-            $('#music_main').get(0).pause();
-            $('.musicJS').removeClass('music_put');
-            musicState = 0;
-        }
-        return;
-    })
-
-    $(document).one('touchstart mousedown', function () {
-        $('#music_main').get(0).play();
-        $('.musicJS').addClass('music_put');
-        musicState = 1;
-    });
+        });
+    }
 
 }
