Move Branches and Tags link to repository navigation tab

This commit is contained in:
Naoki Takezoe
2016-03-24 20:08:55 +09:00
parent b66812d76c
commit d96e1fa503
12 changed files with 19 additions and 13 deletions

View File

@@ -21,6 +21,7 @@
<div class="container"> <div class="container">
@helper.html.information(info) @helper.html.information(info)
@helper.html.error(error) @helper.html.error(error)
@*
<div class="pull-right"> <div class="pull-right">
<a href="@url(repository)/commits/@encodeRefName(id.getOrElse(repository.repository.defaultBranch))" class="header-link"> <a href="@url(repository)/commits/@encodeRefName(id.getOrElse(repository.repository.defaultBranch))" class="header-link">
<i class="octicon octicon-history"></i> <i class="octicon octicon-history"></i>
@@ -39,6 +40,7 @@
<strong>@repository.tags.length</strong> releases <strong>@repository.tags.length</strong> releases
</a> </a>
</div> </div>
*@
<div class="head"> <div class="head">
@helper.html.repositoryicon(repository, true) @helper.html.repositoryicon(repository, true)
<a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a> <a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a>
@@ -55,7 +57,11 @@
} }
</div> </div>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
@menuitem("" ,"code" ,"Code") @menuitem("" ,"files" ,"Files")
@if(repository.commitCount != 0) {
@menuitem("/branches" ,"branches" ,"Branches", repository.branchList.length)
@menuitem("/tags" ,"tags" ,"Tags", repository.tags.length)
}
@menuitem("/issues" ,"issues" ,"Issues", repository.issueCount) @menuitem("/issues" ,"issues" ,"Issues", repository.issueCount)
@menuitem("/pulls" ,"pulls" ,"Pull Requests", repository.pullCount) @menuitem("/pulls" ,"pulls" ,"Pull Requests", repository.pullCount)
@menuitem("/issues/labels" ,"labels" ,"Labels") @menuitem("/issues/labels" ,"labels" ,"Labels")

View File

@@ -8,7 +8,7 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(s"${(repository.name :: pathList).mkString("/")} at ${encodeRefName(branch)} - ${repository.owner}/${repository.name}", Some(repository)) { @html.main(s"${(repository.name :: pathList).mkString("/")} at ${encodeRefName(branch)} - ${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("code", repository){ @html.menu("files", repository){
<div class="head"> <div class="head">
<div class="pull-right hide-if-blame"><div class="btn-group"> <div class="pull-right hide-if-blame"><div class="btn-group">
<a href="@url(repository)/find/@encodeRefName(branch)" class="btn btn-sm btn-default" data-hotkey="t">Find file</a> <a href="@url(repository)/find/@encodeRefName(branch)" class="btn btn-sm btn-default" data-hotkey="t">Find file</a>

View File

@@ -4,7 +4,7 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("code", repository){ @html.menu("branches", repository){
<h1>Branches</h1> <h1>Branches</h1>
<table class="table table-bordered table-hover table-issues branches"> <table class="table table-bordered table-hover table-issues branches">
<thead> <thead>

View File

@@ -11,7 +11,7 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(commit.shortMessage, Some(repository)){ @html.main(commit.shortMessage, Some(repository)){
@html.menu("code", repository){ @html.menu("files", repository){
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th class="box-header"> <th class="box-header">

View File

@@ -8,7 +8,7 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("code", repository){ @html.menu("files", repository){
<div class="head"> <div class="head">
@if(pathList.isEmpty){ @if(pathList.isEmpty){
@helper.html.branchcontrol( @helper.html.branchcontrol(

View File

@@ -6,7 +6,7 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(s"Deleting ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) { @html.main(s"Deleting ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("code", repository){ @html.menu("files", repository){
<form method="POST" action="@url(repository)/remove" validate="true"> <form method="POST" action="@url(repository)/remove" validate="true">
<div class="head"> <div class="head">
<a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> / <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /

View File

@@ -7,7 +7,7 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) { @html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("code", repository){ @html.menu("files", repository){
@if(protectedBranch){ @if(protectedBranch){
<div class="alert alert-danger">branch @branch is protected.</div> <div class="alert alert-danger">branch @branch is protected.</div>
} }

View File

@@ -21,7 +21,7 @@
} else { } else {
s"${(repository.name :: pathList).mkString("/")} at ${encodeRefName(branch)} - ${repository.owner}/${repository.name}" s"${(repository.name :: pathList).mkString("/")} at ${encodeRefName(branch)} - ${repository.owner}/${repository.name}"
}, Some(repository)) { }, Some(repository)) {
@html.menu("code", repository, Some(branch), info, error){ @html.menu("files", repository, Some(branch), info, error){
<div class="head"> <div class="head">
<div class="pull-right pc"> <div class="pull-right pc">
<div class="btn-group"> <div class="btn-group">

View File

@@ -5,7 +5,7 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("code", repository, Some(branch)){ @html.menu("files", repository, Some(branch)){
<div> <div>
<div class="find-input"> <div class="find-input">

View File

@@ -6,7 +6,7 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("fork", repository){ @html.menu("fork", repository){
<h3> <h1>
Forked repositories Forked repositories
@if(loginAccount.isEmpty){ @if(loginAccount.isEmpty){
<a href="@path/signin?redirect=@urlEncode(s"${path}/${repository.owner}/${repository.name}")" class="btn btn-success">Fork</a> <a href="@path/signin?redirect=@urlEncode(s"${path}/${repository.owner}/${repository.name}")" class="btn btn-success">Fork</a>
@@ -17,7 +17,7 @@
<a href="@path/@repository.owner/@repository.name/fork" class="btn btn-success" rel="facebox">Fork</a> <a href="@path/@repository.owner/@repository.name/fork" class="btn btn-success" rel="facebox">Fork</a>
} }
} }
</h3> </h1>
@if(loginAccount.isDefined && groupNames.isEmpty){ @if(loginAccount.isDefined && groupNames.isEmpty){
<form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork" style="display: none;"> <form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork" style="display: none;">
<input type="hidden" name="account" value="@loginAccount.get.userName"/> <input type="hidden" name="account" value="@loginAccount.get.userName"/>

View File

@@ -4,7 +4,7 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("code", repository){ @html.menu("files", repository){
@if(!hasWritePermission){ @if(!hasWritePermission){
<h3>This is an empty repository</h3> <h3>This is an empty repository</h3>
} else { } else {

View File

@@ -2,7 +2,7 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("code", repository){ @html.menu("tags", repository){
<h1>Tags</h1> <h1>Tags</h1>
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>