Browse Source

add pager in commit-page, finish commit search form

FuXiaoHei 11 years ago
parent
commit
df000245d1
2 changed files with 25 additions and 7 deletions
  1. 8 4
      public/css/gogs.css
  2. 17 3
      templates/repo/commits.tmpl

+ 8 - 4
public/css/gogs.css

@@ -663,6 +663,10 @@ html, body {
     margin-top: -20px;
 }
 
+#commits-pager {
+    margin-top: 0;
+}
+
 #source .source-toolbar:after {
     clear: both;
 }
@@ -880,6 +884,10 @@ html, body {
     margin-left: .5em;
 }
 
+#commits-search-form {
+    margin-top: 4px;
+}
+
 .commit-box .avatar, .diff-head-box .avatar {
     width: 20px;
     height: 20px;
@@ -887,10 +895,6 @@ html, body {
     vertical-align: top;
 }
 
-.commit-box .search {
-    margin-top: 3px;
-}
-
 .commit-box td {
     background-color: #FFF;
 }

+ 17 - 3
templates/repo/commits.tmpl

@@ -6,9 +6,14 @@
     <div id="commits">
         <div class="panel panel-default commit-box info-box">
             <div class="panel-heading info-head">
-                <div class="search pull-right form">
-                    <input class="form-control search" type="search" placeholder="search commit"/>
-                </div>
+                <form class="search pull-right col-md-3" action="" method="post" id="commits-search-form">
+                    <div class="input-group">
+                        <input class="form-control search" type="search" placeholder="search commit" name="q"/>
+                        <div class="input-group-btn">
+                            <button type="button" class="btn btn-default">Find</button>
+                        </div>
+                    </div>
+                </form>
                 <h4>{{.CommitCount}} Commits</h4>
             </div>
             <table class="panel-footer table commit-list table table-striped">
@@ -35,6 +40,15 @@
                 </tbody>
             </table>
         </div>
+        <ul class="pagination" id="commits-pager">
+            <li><a href="#">&laquo;</a></li>
+            <li><a href="#">1</a></li>
+            <li><a href="#">2</a></li>
+            <li><a href="#">3</a></li>
+            <li><a href="#">4</a></li>
+            <li><a href="#">5</a></li>
+            <li><a href="#">&raquo;</a></li>
+        </ul>
     </div>
 </div>
 {{template "base/footer" .}}