Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-04 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add search form on issues and wiki

Browse Source
This commit is contained in:
Naoki Takezoe
2016-12-19 00:09:16 +09:00
parent 6b3218dd43
commit 2618f54442
9 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/twirl/gitbucket/core/issues/list.scala.html
View File

@@ -21,15 +21,22 @@
<a href="@condition.copy(state = "closed").toURL">Closed <span class="badge">@closedCount</span></a>
</li>
</ul>
<form method="GET" id="search-filter-form" class="form-inline pull-right">
@if(isEditable){
@if(target == "issues"){
<a class="btn btn-success" href="@helpers.url(repository)/issues/new">New issue</a>
<form method="GET" action="@helpers.url(repository)/search" id="search-filter-form" class="form-inline pull-right">
<div class="input-group">
<input type="text" class="form-control" name="q" placeholder="Search..."/>
<input type="hidden" name="type" value="issue"/>
<span class="input-group-btn">
<button type="submit" id="search-btn" class="btn btn-default"><i class="fa fa-search"></i></button>
</span>
</div>
@if(isEditable){
@if(target == "issues"){
<a class="btn btn-success" href="@helpers.url(repository)/issues/new">New issue</a>
}
@if(target == "pulls"){
<a class="btn btn-success" href="@helpers.url(repository)/compare">New pull request</a>
}
}
@if(target == "pulls"){
<a class="btn btn-success" href="@helpers.url(repository)/compare">New pull request</a>
}
}
</form>
@gitbucket.core.issues.html.listparts(target, issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), isManageable)
@if(isManageable){

1
src/main/twirl/gitbucket/core/menu.scala.html
View File

@@ -67,7 +67,6 @@
<div class="head">
@gitbucket.core.helper.html.repositoryicon(repository, true)
<a href="@helpers.url(repository.owner)">@repository.owner</a> / <a href="@helpers.url(repository)" class="strong">@repository.name</a>
<a href="@helpers.url(repository)/search"><i class="octicon octicon-search"></i></a>
@defining(repository.repository){ x =>
@if(repository.repository.originRepositoryName.isDefined){

2
src/main/twirl/gitbucket/core/search/code.scala.html
View File

@@ -5,7 +5,7 @@
@import gitbucket.core.view.helpers
@import gitbucket.core.service.RepositorySearchService
@gitbucket.core.html.main("Search Results", Some(repository)){
@gitbucket.core.search.html.menu("code", query, repository){
@gitbucket.core.search.html.menu("files", query, repository){
@if(query.nonEmpty) {
@if(files.isEmpty) {
<h4>We couldn't find any code matching '@query'</h4>

2
src/main/twirl/gitbucket/core/search/issues.scala.html
View File

@@ -5,7 +5,7 @@
@import gitbucket.core.view.helpers
@import gitbucket.core.service.RepositorySearchService
@gitbucket.core.html.main("Search Results", Some(repository)){
@gitbucket.core.search.html.menu("issue", query, repository){
@gitbucket.core.search.html.menu("issues", query, repository){
@if(query.nonEmpty) {
@if(issues.isEmpty) {
<h4>We couldn't find any code matching '@query'</h4>

14
src/main/twirl/gitbucket/core/search/menu.scala.html
View File

@@ -1,14 +1,18 @@
@(active: String, query: String,
repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@gitbucket.core.html.menu("", repository){
@gitbucket.core.html.menu(active, repository){
<form action="@helpers.url(repository)/search" method="GET" class="form-inline">
<select class="form-control" name="type">
<option value="code" @if(active=="code" ){ selected }>Files</option>
<option value="issue" @if(active=="issue"){ selected }>Issues</option>
<option value="wiki" @if(active=="wiki" ){ selected }>Wiki</option>
<option value="code" @if(active == "files"){ selected }>Files</option>
@if(repository.repository.options.issuesOption != "DISABLE") {
<option value="issue" @if(active == "issues"){ selected }>Issues</option>
}
@if(repository.repository.options.wikiOption != "DISABLE") {
<option value="wiki" @if(active == "wiki"){ selected }>Wiki</option>
}
</select>
<input type="text" name="q" value="@query" class="form-control" style="width: 250px; margin-bottom: 0px;"/>
<input type="text" name="q" value="@query" class="form-control" style="width: 250px;" placeholder="Search..."/>
<input type="submit" value="Search" class="btn btn-default"/>
<input type="hidden" name="type" value="@active"/>
</form>

5
src/main/twirl/gitbucket/core/wiki/edit.scala.html
View File

@@ -7,10 +7,9 @@
@gitbucket.core.html.menu("wiki", repository){
<div class="pull-right">
@if(page.isDefined){
<a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Page History</a>
<a class="btn btn-small btn-danger" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_delete" id="delete">Delete Page</a>
<a class="btn btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Page History</a>
<a class="btn btn-danger" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_delete" id="delete">Delete Page</a>
}
<a class="btn btn-small btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
</div>
<h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
<form action="@helpers.url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">

10
src/main/twirl/gitbucket/core/wiki/history.scala.html
View File

@@ -8,12 +8,12 @@
@if(isEditable) {
<div class="pull-right">
@if(pageName.isEmpty) {
<a class="btn btn-small" href="@helpers.url(repository)/wiki/_new">New Page</a>
<a class="btn" href="@helpers.url(repository)/wiki/_new">New Page</a>
} else {
<a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_edit">Edit Page</a>
<a class="btn btn-small btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
<a class="btn btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_edit">Edit Page</a>
<a class="btn btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
}
</div>
</div>
}
<h1 class="wiki-title">
@if(pageName.isEmpty){
@@ -28,7 +28,7 @@
<th colspan="3">
<div class="pull-left" style="padding-top: 4px;">Revisions</div>
<div class="pull-right">
<input type="button" id="compare" value="Compare Revisions" class="btn btn-dm btn-default"/>
<input type="button" id="compare" value="Compare Revisions" class="btn btn-sm btn-default"/>
</div>
</th>
</tr>

13
src/main/twirl/gitbucket/core/wiki/page.scala.html
View File

@@ -10,13 +10,20 @@
@gitbucket.core.html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
@gitbucket.core.html.menu("wiki", repository){
<div>
<div class="pull-right">
<a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Page History</a>
<form method="GET" action="@helpers.url(repository)/search" id="search-filter-form" class="form-inline pull-right">
<div class="input-group">
<input type="text" class="form-control" name="q" placeholder="Search..."/>
<input type="hidden" name="type" value="wiki"/>
<span class="input-group-btn">
<button type="submit" id="search-btn" class="btn btn-default"><i class="fa fa-search"></i></button>
</span>
</div>
<a class="btn btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Page History</a>
@if(isEditable){
<a class="btn btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_edit">Edit Page</a>
<a class="btn btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
}
</div>
</form>
<h1 class="body-title">@pageName</h1>
<div>
<span class="muted"><strong>@page.committer</strong> edited this page @gitbucket.core.helper.html.datetimeago(page.time)</span>

8
src/main/twirl/gitbucket/core/wiki/pages.scala.html
View File

@@ -9,11 +9,9 @@
<h1 class="wiki-title"><span class="muted">Pages</span></h1>
</li>
<li class="pull-right">
<div class="btn-group">
@if(isEditable){
<a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/_new">New Page</a>
}
</div>
@if(isEditable){
<a class="btn btn-default" href="@helpers.url(repository)/wiki/_new">New Page</a>
}
</li>
</ul>
<ul class="pull-left">