Merge branch 'master' of http://git.choozmo.com:3000/choozmo/bhouse_backstage

backstage/editor/routes.py

@@ -6,5 +6,10 @@ editor_app = Blueprint('editor', __name__)
 
 @editor_app.route('/backstage/editor')
 def editor():
+    type = ""
     url = request.args.get('url', type=str)
-    return render_template('editor.html', title='Type Editor', url=url, bhouse_server=BHOUSE_SERVER)
+    if "collection" in url: # 作品集
+        type = "collection"
+    elif "blog" in url: # 設計專欄
+        type = "blog"
+    return render_template('editor.html', title='Type Editor', url=url, type=type, bhouse_server=BHOUSE_SERVER)

backstage/templates/blogs.html

@@ -12,7 +12,7 @@
           <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"><i class="fas fa-trash-alt"></i></button>
+            <button class="btn__delete" type="submit" value="delete" onclick=" return confirm('確定要刪除此專欄文章?');"><i class="fas fa-trash-alt"></i></button>
           </form>
         </div>
       </td>
@@ -23,9 +23,9 @@
 {% 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") }}
+      {{ 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") }}
+      {{ 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") }}
@@ -36,3 +36,77 @@
     </div>
   </form>
 {% endblock modal_body %}
+
+{% block main_info_modal_body %}
+<div class="modal fade" id="myModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+
+      <div class="modal-header">
+        <h4 class="modal-title">設計專欄-主資訊修改</h4>
+        <button type="button" class="close" data-dismiss="modal">×</button>
+      </div>
+
+      <div class="modal-body">
+        <table class="table table-bordered">
+          <tbody>
+            <tr>
+              <td>
+                <h4>標題</h4>
+              </td>
+              <td><input class="form-control" id="ctitle" type="text" />
+                <div class="mt-1 text-danger">(建議字數: 15字內)</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <h4>圖片</h4>
+              </td>
+              <td>
+                <input class="form-control" id="cfile" type="file" />
+                <div class="mt-1 text-danger">(建議尺寸/比例: 寬2664px * 高956px)</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>
+              <td><input class="form-control" id="cdate" type="text" /></td>
+            </tr>
+            <tr>
+              <td>
+                <h4>是否顯示</h4>
+              </td>
+              <td><input id="cdraft" type="checkbox" checked="true" /></td>
+            </tr>
+          </tbody>
+        </table>
+        <div class="d-none">
+          <input id="ctype" type="text" /><br />
+          <input id="curl" type="text" /><br />
+          <input id="cimage" type="text" /><br />
+          <input id="cweight" type="text" /><br />
+          <input id="ctag" type="text" /><br />
+          <input id="ccategories" type="text" /><br />
+          <input id="ccol1" type="text" /><br />
+          <input id="ccol2" type="text" /><br />
+        </div>
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" id="uptbtn" class="btn btn-danger" onclick="updateHeader();">完成修改</button>
+      </div>
+
+    </div>
+  </div>
+</div>
+{% endblock %}

backstage/templates/collections.html

@@ -41,4 +41,76 @@
     </div>
   </form>
 {% endblock modal_body %}
-      
+
+{% block main_info_modal_body %}
+<div class="modal fade" id="myModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+
+      <div class="modal-header">
+        <h4 class="modal-title">作品集-主資訊修改</h4>
+        <button type="button" class="close" data-dismiss="modal">×</button>
+      </div>
+
+      <div class="modal-body">
+        <table class="table table-bordered">
+          <tbody>
+            <tr>
+              <td>
+                <h4>標題</h4>
+              </td>
+              <td><input class="form-control" id="ctitle" type="text" />
+                <div class="mt-1 text-danger">(建議字數: 15字內)</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <h4>圖片</h4>
+              </td>
+              <td>
+                <input class="form-control" id="cfile" type="file" />
+                <div class="mt-1 text-danger">(建議尺寸/比例: 寬2048px * 高1365px)</div>
+              </td>
+            </tr>
+            <tr id='sdesc'>
+              <td>
+                <h4>描述</h4>
+              </td>
+              <td><textarea class="form-control" rows="3" id="cdescription"></textarea>
+                <div class="mt-1 text-danger">(建議字數: 50字內)</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <h4>日期</h4>
+              </td>
+              <td><input class="form-control" id="cdate" type="text" /></td>
+            </tr>
+            <tr>
+              <td>
+                <h4>是否顯示</h4>
+              </td>
+              <td><input id="cdraft" type="checkbox" checked="true" /></td>
+            </tr>
+          </tbody>
+        </table>
+        <div class="d-none">
+          <input id="ctype" type="text" /><br />
+          <input id="curl" type="text" /><br />
+          <input id="cimage" type="text" /><br />
+          <input id="cweight" type="text" /><br />
+          <input id="ctag" type="text" /><br />
+          <input id="ccategories" type="text" /><br />
+          <input id="ccol1" type="text" /><br />
+          <input id="ccol2" type="text" /><br />
+        </div>
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" id="uptbtn" class="btn btn-danger" onclick="updateHeader();">完成修改</button>
+      </div>
+
+    </div>
+  </div>
+</div>
+{% endblock %}

backstage/templates/editor.html

@@ -5,6 +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>
@@ -18,6 +19,7 @@
           </tr>
         </tbody>
       </table>
+      {% endif %}
 
       <div class="d-none">
         <input id="cdate" type="text" /><br />

backstage/templates/tables/editor_table.html

@@ -24,12 +24,13 @@
 <script type="text/javascript" src="{{url_for('static', filename='config.js')}}"></script>
 <script type="text/javascript" src="{{url_for('static', filename='js/yo.js')}}"></script>
 
-<div class="modal fade" id="myModal">
+{% block main_info_modal_body %}{% endblock %}
+<!-- <div class="modal fade" id="myModal">
   <div class="modal-dialog">
     <div class="modal-content">
 
       <div class="modal-header">
-        <h4 class="modal-title">作品主資訊修改</h4>
+        <h4 class="modal-title">主資訊修改</h4>
         <button type="button" class="close" data-dismiss="modal">×</button>
       </div>
 
@@ -102,7 +103,7 @@
 
     </div>
   </div>
-</div>
+</div> -->
 
 <!-- <div id="dialog-form">
   <input id="ctitle" type="text" /><br />