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

backstage/templates/news.html

@@ -32,7 +32,7 @@
 {% block modal_body %}
 <form action="{{ url_for('blogs.createNews') }}" 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.label(class="form-control-label modal__label mb-1") }} <span class="text-danger">(建議字數: 20字內)</span>
     {{ form.title(class="form-control form-control-lg") }}
   </div>
   <div class="modal-footer pb-0 border-0">
@@ -48,7 +48,7 @@
     <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>
 
@@ -60,7 +60,7 @@
                 <h4>標題</h4>
               </td>
               <td><input class="form-control" id="ctitle" type="text" />
-                <div class="mt-1 text-danger">(建議字數: 15字內)</div>
+                <div class="mt-1 text-danger">(建議字數: 20字內)</div>
               </td>
             </tr>
             <tr id='simg'>

backstage/templates/solid_wood_furniture.html

@@ -33,8 +33,29 @@
 {% block modal_body %}
 
 <div class="form-group">
-    類別：<select id="newSwfDropdown"></select><br />
-    名稱：<input id="newSwfName" type="text" /><br />
+    <table class="table table-bordered">
+        <tbody>
+            <tr>
+                <td>
+                    <h4>名稱</h4>
+                </td>
+                <td>
+                    <input class="form-control" id="newSwfName" type="text" />
+                    <div class="mt-1 text-danger">(建議字數: 15字內)</div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <h4>類別</h4>
+                </td>
+                <td><select id="newSwfDropdown"></select></td>
+            </tr>
+        </tbody>
+    </table>
+    
+    <!-- 類別：<select id="newSwfDropdown"></select><br />
+    名稱：<input id="newSwfName" type="text" /><br /> -->
+
     <!--     敘述：<input id="swfDesc" type="text" /><br />
     <hr>
     圖片：

backstage/templates/system_furniture.html

@@ -33,8 +33,29 @@
 {% block modal_body %}
 
 <div class="form-group">
-    類別：<select id="newSwfDropdown"></select><br />
-    名稱：<input id="newSwfName" type="text" /><br />
+    <table class="table table-bordered">
+        <tbody>
+            <tr>
+                <td>
+                    <h4>名稱</h4>
+                </td>
+                <td>
+                    <input class="form-control" id="newSwfName" type="text" />
+                    <div class="mt-1 text-danger">(建議字數: 15字內)</div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <h4>類別</h4>
+                </td>
+                <td><select id="newSwfDropdown"></select></td>
+            </tr>
+        </tbody>
+    </table>
+
+    <!-- 類別：<select id="newSwfDropdown"></select><br />
+    名稱：<input id="newSwfName" type="text" /><br /> -->
+    
     <!--     敘述：<input id="swfDesc" type="text" /><br />
     <hr>
     圖片：
@@ -73,7 +94,7 @@
         <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>