210902 fix2

backstage/blogs/forms.py

@@ -7,12 +7,6 @@ from wtforms import StringField, SelectField
 from wtforms.validators import DataRequired
 
 
-path = UPLOAD_PATH_MAP[0][0]+'../blog'
-configfiles = [os.path.join(dirpath, f)
-        for dirpath, dirnames, files in os.walk(path)
-        for f in fnmatch.filter(files, 'cat*.md')]
-
-print(configfiles)
 selected_choices = [('home_aesthetics', '居家美學'),
                     ('room_planner_expertise', '規劃師QA'),
                     ('home_inspection_knowledge', '驗屋知識')]

backstage/blogs/routes.py

@@ -11,7 +11,7 @@ from backstage.config import PORTAL_SERVER, UPLOAD_PATH_MAP
 blogs_app = Blueprint('blogs', __name__)
 
 
-@blogs_app.route('/backstage/blogs')
+@blogs_app.route('/backstage/blogs', methods=['GET'])
 def blog_list():
     response = requests.get('{}contents?url=/blog'.format(PORTAL_SERVER))
     if response.status_code == 200:
@@ -43,9 +43,10 @@ categories: ["{}"]\n\
               form.image.data.filename,
               form.categories.data)
     data = {'frontMatter': front_matter,
-            'name': request.form['title'],
+            'name': get_trans_title_url_name(request.form['title']),
             'type': 'blog',
             'categories': form.categories.data}
+    print(form.title.data)
     return create_content(data, form.image.data)
 
 

backstage/static/js/yo.js

@@ -21,6 +21,7 @@ function parseMd(content) {
             frontMatters.push(line)
             if (line.includes('title: ')) {
                 $('#ctitle').val(line.replace('title: ', '').replaceAll('\"', ''));
+                //alert($('#ctitle').val());
             }
             if (line.includes('date: ')) {
                 //alert(line);
@@ -162,6 +163,7 @@ function GetMdHeader() {
         rContent += 'col2: "' + ($('#ccol2').val() == 'undefined' ? "" : $('#ccol2').val()) + '"\n';
     }
     rContent += '---\n';
+    //alert(rContent);
     return rContent
 }
 

backstage/templates/blogs.html

@@ -1,40 +1,47 @@
 {% extends "tables/editor_table.html" %}
 {% block table_body %}
 {% for idx in range(0, length) %}
-  <tbody>
-    <tr>
-      <td class="table__data">{{ idx+1 }}</td>
-      <td class="table__data">{{ blogs[idx].title }}</td>
-      <td class="table__data">{{ blogs[idx].date }}</td>
-      <td class="table__data"><input type="checkbox" {{ 'checked' if (blogs[idx].draft.lower()=='false') }} onclick="toggleDraft(this,'{{ blogs[idx].url }}');" /></td>
-      <td>
-        <div class="d-flex justify-content-center">
-          <button class="btn btn_light mr-1" onclick="getHeader('{{ blogs[idx].url }}');" ><b>主資訊</b> <i class="fas fa-pencil-alt"></i></button>
-          <a class="m-1 btn__edit" href="{{ url_for('editor.editor', url=blogs[idx].url) }}"><i class="fas fa-edit"></i></a>
-          <form action="{{ url_for('blogs.remove', url=blogs[idx].url) }}" method="POST" class="m-1 inline_block">
-            <button class="btn__delete" type="submit" value="delete" onclick=" return confirm('確定要刪除此專欄文章?');"><i class="fas fa-trash-alt"></i></button>
-          </form>
-        </div>
-      </td>
-    </tr>
-  </tbody>
+{% if blogs[idx].url != '/blogs' %}
+<tbody>
+  <tr>
+    <td class="table__data">{{ idx+1 }}</td>
+    <td class="table__data">{{ blogs[idx].title }}</td>
+    <td class="table__data">{{ blogs[idx].date }}</td>
+    <td class="table__data"><input type="checkbox" {{ 'checked' if (blogs[idx].draft.lower()=='false' ) }}
+        onclick="toggleDraft(this,'{{ blogs[idx].url }}');" /></td>
+    <td>
+      <div class="d-flex justify-content-center">
+        <button class="btn btn_light mr-1" onclick="getHeader('{{ blogs[idx].url }}');"><b>主資訊</b> <i
+            class="fas fa-pencil-alt"></i></button>
+        <a class="m-1 btn__edit" href="{{ url_for('editor.editor', url=blogs[idx].url) }}"><i
+            class="fas fa-edit"></i></a>
+        <form action="{{ url_for('blogs.remove', url=blogs[idx].url) }}" method="POST" class="m-1 inline_block">
+          <button class="btn__delete" type="submit" value="delete" onclick=" return confirm('確定要刪除此專欄文章?');"><i
+              class="fas fa-trash-alt"></i></button>
+        </form>
+      </div>
+    </td>
+  </tr>
+</tbody>
+{% endif %}
 {% endfor %}
 {% endblock table_body %}
 {% block modal_body %}
-  <form action="{{ url_for('blogs.create') }}" method="POST" enctype="multipart/form-data">
-    <div class="form-group">
-      {{ form.title.label(class="form-control-label modal__label mb-1") }} <span class="text-danger">(建議字數: 15字內)</span>
-      {{ form.title(class="form-control form-control-lg") }}
-      {{ form.image.label(class="form-control-label modal__label mt-3 mb-1") }} <span class="text-danger">(建議尺寸/比例: 寬2664px * 高956px)</span>
-      {{ form.image(class="form-control form-control-lg modal__file") }}
-      {{ form.categories.label(class="form-control-label modal__label mt-3 mb-1") }}
-      {{ form.categories(class="form-control form-control-lg") }}
-    </div>
-    <div class="modal-footer pb-0 border-0">
-      <button type="button" class="btn btn__cancel" data-dismiss="modal">取消</button>
-      <input class="btn btn__submitadd" type="submit" value="完成">
-    </div>
-  </form>
+<form action="{{ url_for('blogs.create') }}" method="POST" enctype="multipart/form-data">
+  <div class="form-group">
+    {{ form.title.label(class="form-control-label modal__label mb-1") }} <span class="text-danger">(建議字數: 15字內)</span>
+    {{ form.title(class="form-control form-control-lg") }}
+    {{ form.image.label(class="form-control-label modal__label mt-3 mb-1") }} <span class="text-danger">(建議尺寸/比例:
+      寬2664px * 高956px)</span>
+    {{ form.image(class="form-control form-control-lg modal__file") }}
+    {{ form.categories.label(class="form-control-label modal__label mt-3 mb-1") }}
+    {{ form.categories(class="form-control form-control-lg") }}
+  </div>
+  <div class="modal-footer pb-0 border-0">
+    <button type="button" class="btn btn__cancel" data-dismiss="modal">取消</button>
+    <input class="btn btn__submitadd" type="submit" value="完成">
+  </div>
+</form>
 {% endblock modal_body %}
 
 {% block main_info_modal_body %}
@@ -68,15 +75,15 @@
               </td>
             </tr>
             <tr>
-              <tr id='scat'>
-                <td>
-                  <h4>文章分類</h4>
-                </td>
-                <td><textarea class="form-control" rows="1" id="ccategories"></textarea>
-                  <div class="mt-1 text-danger">(建議字數: 15字內)</div>
-                </td>
-              </tr>
-              <tr>
+            <tr id='scat'>
+              <td>
+                <h4>文章分類</h4>
+              </td>
+              <td><textarea class="form-control" rows="1" id="ccategories"></textarea>
+                <div class="mt-1 text-danger">(建議字數: 15字內)</div>
+              </td>
+            </tr>
+            <tr>
               <td>
                 <h4>日期</h4>
               </td>

backstage/templates/editor.html

@@ -5,7 +5,7 @@
     <!-- <div class="column column__edit"> -->
     <div class="container col-sm-12 col-md-8">
       <button id='submit_button' class="btn__submit"><b>編輯完成</b></button>
-      {% if type == 'collection' %}
+     
       <h3 class="h3 column__h3"><i class="fas fa-user-edit mr-1 mb-2"></i> 作品編輯</h3>
       <table class="table table-bordered">
         <tbody>
@@ -13,13 +13,15 @@
             <td><h4>標題</h4></td>
             <td><input class="form-control" id="ctitle" type="text" /> <div class="mt-1 text-danger">(建議字數: 15字內)</div></td>
           </tr>
+          {% if type == 'collection' %}
           <tr>
             <td><h4>描述</h4></td>
             <td><textarea class="form-control" rows="3" id="cdescription"></textarea> <div class="mt-1 text-danger">(建議字數: 50字內)</div></td>
           </tr>
+          {% endif %}
         </tbody>
       </table>
-      {% endif %}
+      
 
       <div class="d-none">
         <input id="cdate" type="text" /><br />