Przeglądaj źródła

update readMoreList

SyuanYu 2 lat temu
rodzic
commit
cadc7b154e

+ 11 - 4
backstage/static/js/sidebar.js

@@ -79,8 +79,15 @@ for (let i = 0; i < btn__opentab.length; i++) {
 }
 }
 
 
 $("#updatePassword").on("input", (e) => {
 $("#updatePassword").on("input", (e) => {
-  let encode = window.btoa(`${e.target.value}`);
-  if (encode === "YWRtaW4=") {
+  // 判斷數字或英文
+  let reg = /^[\d|a-zA-Z]+$/;
+  let encode = "";
+
+  if (reg.test(e.target.value)) {
+    encode = window.btoa(`${e.target.value}`);
+  }
+  
+  if (encode === "NTQ1OTQ4Mzk=") {
     $("#updateBtn").removeClass("disabled");
     $("#updateBtn").removeClass("disabled");
     $("#updateBtn a").removeClass("disabled-link");
     $("#updateBtn a").removeClass("disabled-link");
   } else {
   } else {
@@ -90,8 +97,8 @@ $("#updatePassword").on("input", (e) => {
 });
 });
 
 
 $("#updateBtn").on("click", () => {
 $("#updateBtn").on("click", () => {
-  let classValue = $('#updateBtn').attr('class');
-  if (!classValue.includes('disabled')) {
+  let classValue = $("#updateBtn").attr("class");
+  if (!classValue.includes("disabled")) {
     alert("更新成功!請點擊確認並稍候…");
     alert("更新成功!請點擊確認並稍候…");
   }
   }
 });
 });

+ 8 - 0
backstage/static/styles/main.css

@@ -560,3 +560,11 @@ a.bg-dark:focus {
   pointer-events: none;
   pointer-events: none;
   color: rgba(255, 255, 255, 0.7) !important;
   color: rgba(255, 255, 255, 0.7) !important;
 }
 }
+
+#contactData .table__data {
+  padding: 3px;
+}
+
+#contactData .table__data input {
+  padding: 8px 10px;
+}

+ 52 - 52
backstage/templates/editorblog.html

@@ -1,60 +1,60 @@
 {% extends "editor.html" %}
 {% extends "editor.html" %}
 {% block extras %}
 {% block extras %}
-      <p class="card">
-        <div class="card-body">
-          前言:文章前言說明
-          <div><textarea class="form-control" id="cintroduction" rows=5 type="paragraph"></textarea></div>
-        </div>
-      </p>
-      <p class="card">
-        <div class="card-body">
-          目錄說明:目錄使用,將說明本文章可以解決的問題
-          <div><input class="form-control" id="cquestionboxintro" type="text" /></div>
-        </div>
-      </p>
+<p class="card">
+<div class="card-body">
+  前言:文章前言說明
+  <div><textarea class="form-control" id="cintroduction" rows=5 type="paragraph"></textarea></div>
+</div>
+</p>
+<p class="card">
+<div class="card-body">
+  目錄說明:目錄使用,將說明本文章可以解決的問題
+  <div><input class="form-control" id="cquestionboxintro" type="text" /></div>
+</div>
+</p>
 {% endblock extras %}
 {% endblock extras %}
 {% block extratwo %}
 {% block extratwo %}
 <p class="card">
 <p class="card">
-  <table>
-    <tbody id='contactData'>
-      <p>延伸閱讀清單</p>
-      <tr>
-        <td>文章名稱</td>
-        <td>文章連結 <span class="text-danger">(請務必填寫文章連結,否則此項文章不予載入)</span></td>
-      </tr>
-      <tr>
-        <td class="table__data"><input class="form-control" id="data00" type="text" style="width: 420px;"
-          placeholder="文章內容" disabled/></td>
-        <td class="table__data"><input class="form-control" id="data01" type="text" style="width: 420px;"
-            placeholder="文章連結" /></td>
-      </tr>
-      <tr>
-        <td class="table__data"><input class="form-control" id="data10" type="text" style="width: 420px;"
-            placeholder="文章內容" disabled/></td>
-        <td class="table__data"><input class="form-control" id="data11" type="text" style="width: 420px;"
-            placeholder="文章連結" /></td>
-      </tr>
-      <tr>
-        <td class="table__data"><input class="form-control" id="data20" type="text" style="width: 420px;"
-            placeholder="文章內容" disabled/></td>
-        <td class="table__data"><input class="form-control" id="data21" type="text" style="width: 420px;"
-            placeholder="文章連結" /></td>
-      </tr>
-      <tr>
-        <td class="table__data"><input class="form-control" id="data30" type="text" style="width: 420px;"
-            placeholder="文章內容" disabled/></td>
-        <td class="table__data"><input class="form-control" id="data31" type="text" style="width: 420px;"
-            placeholder="文章連結" /></td>
-      </tr>
-      <tr>
-        <td class="table__data"><input class="form-control" id="data40" type="text" style="width: 420px;"
-            placeholder="文章內容" disabled/></td>
-        <td class="table__data"><input class="form-control" id="data41" type="text" style="width: 420px;"
-            placeholder="文章連結" /></td>
-      </tr>
-  
-    </tbody>
-  </table>
+<table>
+  <tbody id='contactData'>
+    <p class="mt-3">延伸閱讀清單</p>
+    <tr>
+      <td class="pb-2">文章名稱 <span class="text-danger">(點擊編輯完成將自動帶入文章名稱)</span></td>
+      <td class="pb-2">文章連結 <span class="text-danger">(請務必填寫文章連結,否則此項文章不予載入)</span></td>
+    </tr>
+    <tr>
+      <td class="table__data"><input class="form-control" id="data00" type="text" style="width: 420px;"
+          placeholder="文章名稱" disabled /></td>
+      <td class="table__data"><input class="form-control" id="data01" type="text" style="width: 420px;"
+          placeholder="文章連結" /></td>
+    </tr>
+    <tr>
+      <td class="table__data"><input class="form-control" id="data10" type="text" style="width: 420px;"
+          placeholder="文章名稱" disabled /></td>
+      <td class="table__data"><input class="form-control" id="data11" type="text" style="width: 420px;"
+          placeholder="文章連結" /></td>
+    </tr>
+    <tr>
+      <td class="table__data"><input class="form-control" id="data20" type="text" style="width: 420px;"
+          placeholder="文章名稱" disabled /></td>
+      <td class="table__data"><input class="form-control" id="data21" type="text" style="width: 420px;"
+          placeholder="文章連結" /></td>
+    </tr>
+    <tr>
+      <td class="table__data"><input class="form-control" id="data30" type="text" style="width: 420px;"
+          placeholder="文章名稱" disabled /></td>
+      <td class="table__data"><input class="form-control" id="data31" type="text" style="width: 420px;"
+          placeholder="文章連結" /></td>
+    </tr>
+    <tr>
+      <td class="table__data"><input class="form-control" id="data40" type="text" style="width: 420px;"
+          placeholder="文章名稱" disabled /></td>
+      <td class="table__data"><input class="form-control" id="data41" type="text" style="width: 420px;"
+          placeholder="文章連結" /></td>
+    </tr>
+
+  </tbody>
+</table>
 </p>
 </p>
 <!--<script>
 <!--<script>
   $(function () {
   $(function () {

+ 15 - 4
backstage/templates/layout.html

@@ -75,12 +75,12 @@
               <span class="menu-collapsed">設計專欄</span>
               <span class="menu-collapsed">設計專欄</span>
             </div>
             </div>
           </a>
           </a>
-          <a href="{{ url_for('blogs.edit_further') }}" class="bg-dark list-group-item list-group-item-action">
+          <!-- <a href="{{ url_for('blogs.edit_further') }}" class="bg-dark list-group-item list-group-item-action">
             <div class="d-flex w-100 justify-content-start align-items-center">
             <div class="d-flex w-100 justify-content-start align-items-center">
               <i class="far fa-newspaper mr-3"></i>
               <i class="far fa-newspaper mr-3"></i>
               <span class="menu-collapsed">設計專欄-延伸閱讀清單</span>
               <span class="menu-collapsed">設計專欄-延伸閱讀清單</span>
             </div>
             </div>
-          </a>
+          </a> -->
           <a href="{{ url_for('blogs.edit_solid_wood_furniture') }}"
           <a href="{{ url_for('blogs.edit_solid_wood_furniture') }}"
             class="bg-dark list-group-item list-group-item-action">
             class="bg-dark list-group-item list-group-item-action">
             <div class="d-flex w-100 justify-content-start align-items-center">
             <div class="d-flex w-100 justify-content-start align-items-center">
@@ -164,9 +164,20 @@
                 <div class="input-group-prepend">
                 <div class="input-group-prepend">
                   <span class="input-group-text" style="padding-right: 5px;">請輸入密碼:</span>
                   <span class="input-group-text" style="padding-right: 5px;">請輸入密碼:</span>
                 </div>
                 </div>
-                <input type="text" class="form-control" placeholder="Password" aria-label="password" id="updatePassword">
+                <input type="text" class="form-control" placeholder="Password" aria-label="password" id="updatePassword" onkeyup="value=value.replace(/[\W]/g,'')">
               </div>
               </div>
-
+              <p class="mt-3 text-danger">
+                點擊更新後,程式會先進行一次備份
+              <br>
+                備份完成後才會進行更新的動作!
+              </p>
+              <p class="text-danger">
+                當您按下更新後,若發現前台有錯誤或是有頁面無法顯示,
+                <br>
+                !請勿!再次按下更新(會將上一次的備份覆蓋掉)
+                <br>
+                麻煩直接聯繫工程師回復備份!謝謝~
+              </p>
             </div>
             </div>
             <div class="modal-footer">
             <div class="modal-footer">
               <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
               <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>

+ 6 - 0
models/contents/routes.py

@@ -57,6 +57,12 @@ def _get_data(file_dir):
         elif 'blog_tag: ' in line:
         elif 'blog_tag: ' in line:
             s = line.replace('blog_tag: ', '').strip()
             s = line.replace('blog_tag: ', '').strip()
             result['blog_tag'] = s
             result['blog_tag'] = s
+        elif 'readmore_ttl: ' in line:
+            s = line.replace('readmore_ttl: ', '').strip()
+            result['readmore_ttl'] = s
+        elif 'readmore_lnk: ' in line:
+            s = line.replace('readmore_lnk: ', '').strip()
+            result['readmore_lnk'] = s
         elif 'image: ' in line:
         elif 'image: ' in line:
             s = line.replace('image: ', '').strip()
             s = line.replace('image: ', '').strip()
             s = s.replace('"', '').strip()
             s = s.replace('"', '').strip()