(refs #3)Add search field to header area.

This commit is contained in:
takezoe
2013-07-16 21:58:09 +09:00
parent 0bc6102096
commit cb591925ea
2 changed files with 29 additions and 24 deletions

View File

@@ -1,4 +1,4 @@
@(title: String)(body: Html)(implicit context: app.Context) @(title: String, repository: Option[service.RepositoryService.RepositoryInfo] = None)(body: Html)(implicit context: app.Context)
@import context._ @import context._
@import view.helpers._ @import view.helpers._
<!DOCTYPE html> <!DOCTYPE html>
@@ -29,6 +29,7 @@
<script src="@assets/zclip/ZeroClipboard.min.js"></script> <script src="@assets/zclip/ZeroClipboard.min.js"></script>
</head> </head>
<body> <body>
<form action="@path/search" method="GET">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
@@ -39,6 +40,9 @@
</button> </button>
<a class="brand" href="@path/">GitBucket</a> <a class="brand" href="@path/">GitBucket</a>
<div class="nav-collapse collapse pull-right"> <div class="nav-collapse collapse pull-right">
@repository.map { repository =>
<input type="text" name="query" style="width: 300px;margin-top: 5px; margin-bottom: 0px;" placeholder="Search this repository"/>
}
@if(loginAccount.isDefined){ @if(loginAccount.isDefined){
<a href="@url(loginAccount.get.userName)" class="username menu">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</a> <a href="@url(loginAccount.get.userName)" class="username menu">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</a>
<a href="@path/new" class="menu" data-toggle="tooltip" data-placement="bottom" title="Create a new repo"><i class="icon-plus"></i></a> <a href="@path/new" class="menu" data-toggle="tooltip" data-placement="bottom" title="Create a new repo"><i class="icon-plus"></i></a>
@@ -53,6 +57,7 @@
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </div>
</form>
@defining(servlet.AutoUpdate.getCurrentVersion){ version => @defining(servlet.AutoUpdate.getCurrentVersion){ version =>
<div class="gitbucket-version">version @version.majorVersion.@version.minorVersion</div> <div class="gitbucket-version">version @version.majorVersion.@version.minorVersion</div>
} }

View File

@@ -6,7 +6,7 @@
readme: Option[String])(implicit context: app.Context) readme: Option[String])(implicit context: app.Context)
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@html.main(repository.owner + "/" + repository.name) { @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.header("code", repository) @html.header("code", repository)
@tab(branch, repository, "files") @tab(branch, repository, "files")
<div class="head"> <div class="head">