瀏覽代碼

操作按钮调整,新增编辑 和 历史版本

Chente 8 年之前
父節點
當前提交
166f4e3e50
共有 2 個文件被更改,包括 64 次插入25 次删除
  1. 21 20
      .idea/workspace.xml
  2. 43 5
      w-project-section-files.html

+ 21 - 20
.idea/workspace.xml

@@ -54,21 +54,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="w-project-section-files.html" pinned="false" current-in-tab="false">
+      <file leaf-file-name="w-project-section-files.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/w-project-section-files.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2684">
-              <caret line="122" column="34" selection-start-line="122" selection-start-column="34" selection-end-line="122" selection-end-column="34" />
+            <state relative-caret-position="91">
+              <caret line="230" column="22" selection-start-line="230" selection-start-column="22" selection-end-line="230" selection-end-column="22" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="w-project-section-files-recover.html" pinned="false" current-in-tab="true">
+      <file leaf-file-name="w-project-section-files-recover.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/w-project-section-files-recover.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="457">
-              <caret line="147" column="102" selection-start-line="147" selection-start-column="102" selection-end-line="147" selection-end-column="102" />
+            <state relative-caret-position="237">
+              <caret line="113" column="49" selection-start-line="113" selection-start-column="49" selection-end-line="113" selection-end-column="49" />
               <folding>
                 <element signature="n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
               </folding>
@@ -140,8 +140,8 @@
         <option value="$PROJECT_DIR$/sign-view-page.html" />
         <option value="$PROJECT_DIR$/js/jl.js" />
         <option value="$PROJECT_DIR$/css/style.css" />
-        <option value="$PROJECT_DIR$/w-project-section-files.html" />
         <option value="$PROJECT_DIR$/w-project-section-files-recover.html" />
+        <option value="$PROJECT_DIR$/w-project-section-files.html" />
       </list>
     </option>
   </component>
@@ -216,8 +216,8 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -309,12 +309,13 @@
       <workItem from="1476082648945" duration="3852000" />
       <workItem from="1476150323463" duration="10217000" />
       <workItem from="1476236493960" duration="1194000" />
-      <workItem from="1476254310309" duration="855000" />
+      <workItem from="1476254310309" duration="1452000" />
+      <workItem from="1476328814950" duration="2009000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="55904000" />
+    <option name="totallyTimeSpent" value="58510000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="71" width="1456" height="886" extended-state="0" />
@@ -754,23 +755,23 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/w-project-section-files.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2684">
-          <caret line="122" column="34" selection-start-line="122" selection-start-column="34" selection-end-line="122" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/w-project-section-files-recover.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="457">
-          <caret line="147" column="102" selection-start-line="147" selection-start-column="102" selection-end-line="147" selection-end-column="102" />
+        <state relative-caret-position="237">
+          <caret line="113" column="49" selection-start-line="113" selection-start-column="49" selection-end-line="113" selection-end-column="49" />
           <folding>
             <element signature="n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/w-project-section-files.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="91">
+          <caret line="230" column="22" selection-start-line="230" selection-start-column="22" selection-end-line="230" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 43 - 5
w-project-section-files.html

@@ -125,10 +125,8 @@
                     </a>
                     <ul class="dropdown-menu">
                       <li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>
+                      <li><a href="#file-edit" data-toggle="modal"><i class="icon-pencil"></i>&nbsp;编辑</a></li>
                       <li><a><i class="icon-download-alt"></i>&nbsp;下载</a></li>
-                      <li><a href="#file-replace" data-toggle="modal"><i class="icon-retweet"></i>&nbsp;替换</a></li>
-                      <li class="divider"></li>
-                      <li><a href="#file-del" data-toggle="modal"><i class="icon-remove"></i>&nbsp;删除</a></li>
                     </ul>
                     </div>
                   </td>
@@ -189,10 +187,20 @@
               <tr><th width="60">操作</th>
                   <td colspan="3">
                     <button class="btn btn-mini" type="button"><i class="icon-eye-open"></i>预览</button>
+                    <button class="btn btn-mini btn-primary" type="button" href="#file-edit" data-toggle="modal"><i class="icon-pencil icon-white"></i>编辑</button>
                     <button class="btn btn-mini btn-primary" type="button"><i class="icon-download-alt icon-white"></i>下载</button>
                     <button class="btn btn-mini btn-info" type="button" href="#file-replace" data-toggle="modal"><i class="icon-retweet icon-white"></i>替换</button>
-                    &nbsp;&nbsp;&nbsp;&nbsp;
-                    <button class="btn btn-mini btn-danger" type="button" href="#file-del" data-toggle="modal"><i class="icon-remove icon-white"></i>删除</button>
+                    <div class="btn-group">
+                      <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
+                        更多
+                        <span class="caret"></span>
+                      </a>
+                      <ul class="dropdown-menu">
+                        <li><a><i class="icon-time"></i>&nbsp;历史版本</a></li>
+                        <li class="divider"></li>
+                        <li><a href="#file-del" data-toggle="modal"><i class="icon-remove"></i>&nbsp;删除</a></li>
+                      </ul>
+                    </div>
               </td></tr>
             </table>
           </div>
@@ -202,6 +210,36 @@
   <!--内容-->
   </div>
 </div>
+<!-- 编辑弹出 -->
+<div id="file-edit" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="myModalLabel">文件编辑</h3>
+  </div>
+  <div class="modal-body">
+    <div class="form">
+      <form class="form-horizontal">
+        <div class="control-group">
+          <label class="control-label" for="inputEmail">文件名称</label>
+          <div class="controls">
+            <input type="text">
+          </div>
+        </div>
+        <div class="control-group">
+          <label class="control-label" for="inputEmail">备注/描述</label>
+          <div class="controls">
+            <textarea></textarea>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <button class="btn btn-primary">确定修改</button>
+  </div>
+</div>
+<!-- 编辑弹出 -->
 <!-- 替换弹出 -->
 <div id="file-replace" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-header">