Pārlūkot izejas kodu

eng video switch

huai-sian 3 gadi atpakaļ
vecāks
revīzija
5b39463e64

+ 1 - 1
html/index.html

@@ -131,7 +131,7 @@
                                     href="user_profile2.html" set-lan="html:user_profile">會員資料</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link btn-logout" aria-current="page" set-lan="html:logout">登出</a>
+                                <a class="nav-link btn-logout text-white" aria-current="page" set-lan="html:logout">登出</a>
                             </li>
                         </ul>
                         <span class="menu-bar ms-auto" style="font-size: 32px;"><i

+ 2 - 2
html/index_eng.html

@@ -107,10 +107,10 @@
                   href="./make_video_long.html" set-lan="html:make_video_long">長影片製作</a>
             </div>
             <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
-              <a class="nav-link btn-gocreate text-white col-6" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">Make
-                English<br>Videos</a>
               <a class="nav-link btn-gocreate text-white col-6" aria-current="page"
                 href="./make_video_slide_eng.html" set-lan="html:make_slides">Make Videos <br>By Slides</a>
+              <a class="nav-link btn-gocreate text-white col-6" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">Make
+                English<br>Videos</a>
             </div>
             <hr>
             <ul class="nav-list ps-0">

+ 1 - 22
html/make_video_slide.html

@@ -249,6 +249,7 @@
                                     data-bs-placement="right" title="將作為影片的講者 The spokesgirl of your video">
                             </h3>
                             <select id="avatar" class='avatar'>
+                                <option set-lan="html:p_choose_character" value="請選擇人物" selected="selected" disabled>>請選擇人物</option>
                                 <option value="7">Peggy</option>
                                 <option value="8">Stacy</option>
                                 <option value="11">Summer韓小夏</option>
@@ -416,28 +417,6 @@
     <script type="text/javascript" src="static/lan.js"></script>
     <script src="static/common.js"></script>
     <script>
-        $('.owl-carousel').owlCarousel({
-            loop: true,
-            margin: 10,
-            nav: false,
-            mouseDrag: true,
-            touchDrag: true,
-            smartSpeed: 1000,
-            autoplay: true,
-            autoplayTimeout: 8000,
-            autoplayHoverPause: false,
-            responsive: {
-                0: {
-                    items: 1
-                },
-                600: {
-                    items: 2
-                },
-                1000: {
-                    items: 4
-                }
-            }
-        });
         $(".menu-bar").click(function () {
             $(".sidenav").show();
         });

+ 3 - 25
html/make_video_slide_eng.html

@@ -206,7 +206,7 @@
                               <option value="17">Kristina</option>
                               <option value="18">Paula</option>
                             </select>
-                            <div class="d-flex row row-cols-2 row-cols-lg-6">
+                            <div class="d-flex row row-cols-2 row-cols-lg-6 avatar-cards" id="avatar-cards">
                               <div class="card col" data-avatar="Peggy" data-img="peggy">
                                 <div class="imgfr"><img src="static/img/peggy.webp" class="card-img-top" alt="..."></div>
                                 <div class="card-body">
@@ -345,33 +345,11 @@
     <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.2/dist/umd/popper.min.js" integrity="sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.min.js" integrity="sha384-Atwg2Pkwv9vp0ygtn1JAojH0nYbwNJLPhwyoVbhoPwBhjQPR5VtM2+xf0Uwh9KtT" crossorigin="anonymous"></script> 
     <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.18/dist/sweetalert2.all.min.js"></script>
-    <script src="static/owl.carousel.min.js"></script>
-    <script src="static/script_slides_eng.js"></script>
     <script type="text/javascript" src="static/lan.js"></script>
+    <script src="static/loading-overlay.js"></script>
+    <script src="static/script_slides_eng.js"></script>
     <script src="static/common.js"></script>
 <script>
-    $('.owl-carousel').owlCarousel({
-        loop: true,
-        margin: 10,
-        nav: false,
-        mouseDrag: true,
-        touchDrag: true,
-        smartSpeed: 1000,
-        autoplay: true,
-        autoplayTimeout: 8000,
-        autoplayHoverPause: false,
-        responsive: {
-            0: {
-                items: 1
-            },
-            600: {
-                items: 2
-            },
-            1000: {
-                items: 4
-            }
-        }
-    });
     $(".menu-bar").click(function () {
         $(".sidenav").show();
     });

+ 25 - 1
html/static/script_slides.js

@@ -46,6 +46,7 @@ function checkLan() {
   if(lan == 'en') {
     $('.btn-makev').css('display', 'none');
     $('.btn-makelong').css('display', 'none');
+    $('#slide_raw_url').attr('placeholder', 'Slides Link (slides must be public)')
   } else {
     $('.btn-makev').css('display', 'block');
     $('.btn-makelong').css('display', 'block');
@@ -64,6 +65,26 @@ function loginControl() {
 loginControl();
 
 
+JsLoadingOverlay.show({
+  "overlayBackgroundColor": "#FFFFFF",
+  "overlayOpacity": "1",
+  "spinnerIcon": "ball-circus",
+  "spinnerColor": "#B9DDF3",
+  "spinnerSize": "1x",
+  "overlayIDName": "overlay",
+  "spinnerIDName": "spinner",
+  "offsetX": 0,
+  "offsetY": 0,
+  "containerID": "avatar-cards",
+  "lockScroll": false,
+  "overlayZIndex": 9998,
+  "spinnerZIndex": 9999
+});
+
+window.setTimeout(() => {
+  JsLoadingOverlay.hide()
+}, 5000)
+
 function getAvatar() {
   let jwt_token = get_jwt_token();
   if(jwt_token == undefined) {
@@ -95,7 +116,10 @@ function getAvatar() {
     }
     $('#avatar').html(`<option set-lan="html:p_choose_character" value="請選擇人物" selected="selected" disabled>請選擇人物</option>${str}`);
     $('.avatar-cards').html(carStr);
-    
+    if(lan = 'en') {
+      $('#avatar option:disabled').val('Choose Character')
+      $('#avatar option:disabled').text('Choose Character')
+    }
     card = document.getElementsByClassName('card');
     console.log(card);
     addCardListener(card);

+ 34 - 8
html/static/script_slides_eng.js

@@ -1,4 +1,5 @@
 checkRoute();
+let card;
 
 let userBasics = JSON.parse(localStorage.getItem('user_profile')) || [];
 
@@ -50,6 +51,7 @@ function checkLan() {
   } else {
     $('.btn-makev').css('display', 'block');
     $('.btn-makelong').css('display', 'block');
+    $('#slide_raw_url').attr('placeholder', 'SLIDE連結(連結須為公開)')
   }
 }
 
@@ -64,6 +66,26 @@ function loginControl() {
 
 loginControl();
 
+JsLoadingOverlay.show({
+  "overlayBackgroundColor": "#FFFFFF",
+  "overlayOpacity": "1",
+  "spinnerIcon": "ball-circus",
+  "spinnerColor": "#B9DDF3",
+  "spinnerSize": "1x",
+  "overlayIDName": "overlay",
+  "spinnerIDName": "spinner",
+  "offsetX": 0,
+  "offsetY": 0,
+  "containerID": "avatar-cards",
+  "lockScroll": false,
+  "overlayZIndex": 9998,
+  "spinnerZIndex": 9999
+});
+
+window.setTimeout(() => {
+  JsLoadingOverlay.hide()
+}, 5000)
+
 
 function getAvatar() {
   let jwt_token = get_jwt_token();
@@ -94,16 +116,21 @@ function getAvatar() {
                 </div>`;
     }
     $('#avatar').html(`<option value="Choose Character" selected="selected" disabled>Choose Character</option>${str}`);
-    $('.owl-carousel').html(carStr);
+    $('.avatar-cards').html(carStr);
+    if(lan = 'en') {
+      $('#avatar option:disabled').val('請選擇人物')
+      $('#avatar option:disabled').text('請選擇人物')
+    }
     card = document.getElementsByClassName('card');
     console.log(card);
     addCardListener(card);
+    avatarChange()
   }).catch(err => {
     console.log(err);
   });
 }
 
-//getAvatar();
+getAvatar();
 
 
 var client_id = Date.now();
@@ -120,22 +147,21 @@ var avatarModal = new bootstrap.Modal(document.getElementById('avatarmega'), {
 var modalImg = document.querySelector("#avatarmega .modal-img");
 var modalTitle = document.querySelector("#avatarmega .modal-title");
 var avatarSelector = document.getElementById("avatar");
-var card = document.getElementsByClassName('card');
-card = [...card];
+// var card = document.getElementsByClassName('card');
+// card = [...card];
 avatarSelector.addEventListener('change', avatarChange);
-avatarChange();
+// avatarChange();
 
-function addCardListener() {
+function addCardListener(card) {
   for (let i = 0; i < card.length; i++) {
     card[i].addEventListener('click', openavatarModel);
   }
 }
 
-addCardListener();
+// addCardListener();
 
 function avatarChange() {
   var value = avatarSelector.options[avatarSelector.selectedIndex].text;
-  $('.owl-carousel').trigger('to.owl.carousel', avatarSelector.selectedIndex);
   for (let i = 0; i < card.length; i++) {
     card[i].classList.remove('active');
     if (card[i].dataset.avatar == value) {