mirror of
				https://github.com/gitbucket/gitbucket.git
				synced 2025-10-31 10:36:05 +01:00 
			
		
		
		
	(refs #3)Add search form to all repository related pages.
This commit is contained in:
		| @@ -5,7 +5,7 @@ | |||||||
|   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) |   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main("New Issue - " + repository.owner + "/" + repository.name){ | @html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){ | ||||||
|   @html.header("issues", repository) |   @html.header("issues", repository) | ||||||
|   @tab("", repository) |   @tab("", repository) | ||||||
|   <form action="@url(repository)/issues/new" method="POST" validate="true"> |   <form action="@url(repository)/issues/new" method="POST" validate="true"> | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ | |||||||
|   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) |   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main("%s - Issue #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){ | @html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){ | ||||||
|   @html.header("issues", repository) |   @html.header("issues", repository) | ||||||
|   @tab("issues", repository) |   @tab("issues", repository) | ||||||
|   <ul class="nav nav-tabs"> |   <ul class="nav nav-tabs"> | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ | |||||||
|   hasWritePermission: Boolean)(implicit context: app.Context) |   hasWritePermission: Boolean)(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main("Issues - " + repository.owner + "/" + repository.name){ | @html.main(s"Issues - ${repository.owner}/${repository.name}", Some(repository)){ | ||||||
|   @html.header("issues", repository) |   @html.header("issues", repository) | ||||||
|   @tab("issues", repository) |   @tab("issues", repository) | ||||||
|   <div class="row-fluid"> |   <div class="row-fluid"> | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| @(milestone: Option[model.Milestone], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | @(milestone: Option[model.Milestone], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main("Milestones - " + repository.owner + "/" + repository.name){ | @html.main(s"Milestones - ${repository.owner}/${repository.name}"){ | ||||||
|   @html.header("milestones", repository) |   @html.header("milestones", repository) | ||||||
|   @issues.html.tab("milestones", repository) |   @issues.html.tab("milestones", repository) | ||||||
|   <form method="POST" action="@url(repository)/issues/milestones/@if(milestone.isEmpty){new}else{@milestone.get.milestoneId/edit}" validate="true"> |   <form method="POST" action="@url(repository)/issues/milestones/@if(milestone.isEmpty){new}else{@milestone.get.milestoneId/edit}" validate="true"> | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|   hasWritePermission: Boolean)(implicit context: app.Context) |   hasWritePermission: Boolean)(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main("Milestones - " + repository.owner + "/" + repository.name){ | @html.main(s"Milestones - ${repository.owner}/${repository.name}"){ | ||||||
|   @html.header("milestones", repository) |   @html.header("milestones", repository) | ||||||
|   @issues.html.tab("milestones", repository) |   @issues.html.tab("milestones", repository) | ||||||
|   <div class="row-fluid"> |   <div class="row-fluid"> | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ | |||||||
|   latestCommit: util.JGitUtil.CommitInfo)(implicit context: app.Context) |   latestCommit: util.JGitUtil.CommitInfo)(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"> | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ | |||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @import util.Implicits._ | @import util.Implicits._ | ||||||
| @import org.eclipse.jgit.diff.DiffEntry.ChangeType | @import org.eclipse.jgit.diff.DiffEntry.ChangeType | ||||||
| @html.main(commit.shortMessage){ | @html.main(commit.shortMessage, Some(repository)){ | ||||||
|   @html.header("code", repository) |   @html.header("code", repository) | ||||||
|   @tab(commitId, repository, "commits") |   @tab(commitId, repository, "commits") | ||||||
|   <table class="table table-bordered"> |   <table class="table table-bordered"> | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ | |||||||
|   hasNext: Boolean)(implicit context: app.Context) |   hasNext: Boolean)(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, if(pathList.isEmpty) "commits" else "files") |   @tab(branch, repository, if(pathList.isEmpty) "commits" else "files") | ||||||
|   <div class="head"> |   <div class="head"> | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| @(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | @(repository: service.RepositoryService.RepositoryInfo)(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) | ||||||
| <h3 style="margin-top: 30px;">Create a new repository on the command line</h3> | <h3 style="margin-top: 30px;">Create a new repository on the command line</h3> | ||||||
| <pre> | <pre> | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| @(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | @(repository: service.RepositoryService.RepositoryInfo)(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(repository.repository.defaultBranch, repository, "tags", true) |   @tab(repository.repository.defaultBranch, repository, "tags", true) | ||||||
|   <h1>Tags</h1> |   <h1>Tags</h1> | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| @(collaborators: List[String], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | @(collaborators: List[String], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main("Settings"){ | @html.main("Settings", Some(repository)){ | ||||||
|   @html.header("settings", repository) |   @html.header("settings", repository) | ||||||
|   @menu("collaborators", repository){ |   @menu("collaborators", repository){ | ||||||
|     <h3>Manage Collaborators</h3> |     <h3>Manage Collaborators</h3> | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| @(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | @(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main("Delete Repository"){ | @html.main("Delete Repository", Some(repository)){ | ||||||
|   @html.header("settings", repository) |   @html.header("settings", repository) | ||||||
|   @menu("delete", repository){ |   @menu("delete", repository){ | ||||||
|     <form id="form" method="post" action="@url(repository)/settings/delete"> |     <form id="form" method="post" action="@url(repository)/settings/delete"> | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| @(repository: service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: app.Context) | @(repository: service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main("Settings"){ | @html.main("Settings", Some(repository)){ | ||||||
|   @html.header("settings", repository) |   @html.header("settings", repository) | ||||||
|   @menu("options", repository){ |   @menu("options", repository){ | ||||||
|     @helper.html.information(info) |     @helper.html.information(info) | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @import org.eclipse.jgit.diff.DiffEntry.ChangeType | @import org.eclipse.jgit.diff.DiffEntry.ChangeType | ||||||
| @html.main("Compare Revisions - " + repository.owner + "/" + repository.name){ | @html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){ | ||||||
|   @html.header("wiki", repository) |   @html.header("wiki", repository) | ||||||
|   @tab("history", repository) |   @tab("history", repository) | ||||||
|   <ul class="nav nav-tabs"> |   <ul class="nav nav-tabs"> | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ | |||||||
|   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) |   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){ | @html.main(s"${if(pageName == "") "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){ | ||||||
|   @html.header("wiki", repository) |   @html.header("wiki", repository) | ||||||
|   @tab("", repository) |   @tab("", repository) | ||||||
|   <ul class="nav nav-tabs"> |   <ul class="nav nav-tabs"> | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ | |||||||
|   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) |   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main("History - " + repository.owner + "/" + repository.name){ | @html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){ | ||||||
|   @html.header("wiki", repository) |   @html.header("wiki", repository) | ||||||
|   @tab(if(pageName.isEmpty) "history" else "", repository) |   @tab(if(pageName.isEmpty) "history" else "", repository) | ||||||
|   <ul class="nav nav-tabs"> |   <ul class="nav nav-tabs"> | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|   hasWritePermission: Boolean)(implicit context: app.Context) |   hasWritePermission: Boolean)(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main(pageName + " - " + repository.owner + "/" + repository.name){ | @html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){ | ||||||
|   @html.header("wiki", repository) |   @html.header("wiki", repository) | ||||||
|   @tab((if(pageName == "Home") "home" else ""), repository) |   @tab((if(pageName == "Home") "home" else ""), repository) | ||||||
|   <ul class="nav nav-tabs"> |   <ul class="nav nav-tabs"> | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| @(pages: List[String], repository: service.RepositoryService.RepositoryInfo, hasWritePermission: Boolean)(implicit context: app.Context) | @(pages: List[String], repository: service.RepositoryService.RepositoryInfo, hasWritePermission: Boolean)(implicit context: app.Context) | ||||||
| @import context._ | @import context._ | ||||||
| @import view.helpers._ | @import view.helpers._ | ||||||
| @html.main("Pages - " + repository.owner + "/" + repository.name){ | @html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){ | ||||||
|   @html.header("wiki", repository) |   @html.header("wiki", repository) | ||||||
|   @tab("pages", repository) |   @tab("pages", repository) | ||||||
|   <ul class="nav nav-tabs"> |   <ul class="nav nav-tabs"> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user