diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-04-11 12:14:16 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-04-11 12:14:16 -0400 |
| commit | 23e318f85a912d84c5621eb0a8e09465bf37a3cb (patch) | |
| tree | 25f8097e27752cd61d1540404f3d5f3f797e304f /templates | |
| parent | 11f54b142699b59a74b9babc195e712414a3c78a (diff) | |
| parent | 555b6976a32318c8decce521bdc61765eb6642c9 (diff) | |
| download | gitea-23e318f85a912d84c5621eb0a8e09465bf37a3cb.tar.gz gitea-23e318f85a912d84c5621eb0a8e09465bf37a3cb.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base/navbar.tmpl | 19 | ||||
| -rw-r--r-- | templates/repo/commits.tmpl | 20 |
2 files changed, 33 insertions, 6 deletions
diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl index c0855d81ef..1f908f39c3 100644 --- a/templates/base/navbar.tmpl +++ b/templates/base/navbar.tmpl @@ -1,9 +1,22 @@ <div class="masthead navbar" id="masthead"> <div class="container"> <nav class="nav"> - <a id="nav-logo" class="nav-item{{if .PageIsHome}} active{{end}}" href="/"><img src="/img/favicon.png" alt="Gogs Logo" id="logo"></a> - <a class="nav-item{{if .PageIsUserDashboard}} active{{end}}" href="/">Dashboard</a> - <a class="nav-item{{if .PageIsHelp}} active{{end}}" href="https://github.com/gogits/gogs/wiki">Help</a>{{if .IsSigned}} + <a id="nav-logo" class="nav-item pull-left{{if .PageIsHome}} active{{end}}" href="/"><img src="/img/favicon.png" alt="Gogs Logo" id="logo"></a> + <a class="nav-item pull-left{{if .PageIsUserDashboard}} active{{end}}" href="/">Dashboard</a> + <a class="nav-item pull-left{{if .PageIsHelp}} active{{end}}" href="https://github.com/gogits/gogs/wiki">Help</a>{{if .IsSigned}} + <form class="nav-item pull-left{{if .PageIsNewRepo}} active{{end}}" id="nav-search-form"> + <div class="input-group"> + <div class="input-group-btn"> + <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">All Repositories <span class="caret"></span></button> + <ul class="dropdown-menu"> + <li><a href="#">All Repositories</a></li> + <li class="divider"></li> + <li><a href="#">This Repository</a></li> + </ul> + </div> + <input type="search" class="form-control input-sm" name="q" placeholder="search code, commits and issues"/> + </div> + </form> <a id="nav-out" class="nav-item navbar-right navbar-btn btn btn-danger" href="/user/logout/"><i class="fa fa-power-off fa-lg"></i></a> <a id="nav-avatar" class="nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}"> <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/> diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index efe35936c4..842a2a6d8f 100644 --- a/templates/repo/commits.tmpl +++ b/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="#">«</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="#">»</a></li> + </ul> </div> </div> {{template "base/footer" .}} |