Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-02 03:26:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename header.scala.html to menu.scala.html

Browse Source
This commit is contained in:
takezoe
2014-05-06 02:17:11 +09:00
parent ea1e9037c4
commit 0fe30e5629
30 changed files with 288 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
etc/icons.svg
View File

@@ -35,8 +35,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.9899495"
inkscape:cx="827.57339"
inkscape:cy="496.04311"
inkscape:cx="658.37284"
inkscape:cy="201.93139"
inkscape:document-units="px"
inkscape:current-layer="layer1-9"
showgrid="false"
@@ -1185,7 +1185,7 @@
style="fill:#ffffff;stroke:#a0a0a0;stroke-width:22.72570610000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
transform="matrix(1.0049237,0,0,0.61497516,944.16607,536.33294)"
d="m 372.74629,230.89374 a 21.718279,35.140915 0 1 1 -43.43655,0 21.718279,35.140915 0 1 1 43.43655,0 z"
d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
sodipodi:ry="35.140915"
sodipodi:rx="21.718279"
sodipodi:cy="230.89374"
@@ -1195,7 +1195,7 @@
sodipodi:type="arc" />
<path
transform="matrix(1.0049237,0,0,0.61497516,942.63054,386.00935)"
d="m 372.74629,230.89374 a 21.718279,35.140915 0 1 1 -43.43655,0 21.718279,35.140915 0 1 1 43.43655,0 z"
d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
sodipodi:ry="35.140915"
sodipodi:rx="21.718279"
sodipodi:cy="230.89374"
@@ -1205,7 +1205,7 @@
sodipodi:type="arc" />
<path
transform="matrix(1.0049237,0,0,0.61497516,1056.9547,536.43446)"
d="m 372.74629,230.89374 a 21.718279,35.140915 0 1 1 -43.43655,0 21.718279,35.140915 0 1 1 43.43655,0 z"
d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
sodipodi:ry="35.140915"
sodipodi:rx="21.718279"
sodipodi:cy="230.89374"
@@ -1250,6 +1250,79 @@
x="-1617.2937"
y="306.0546"
transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
<g
id="g4016"
transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,3107.8871,982.01044)">
<rect
transform="scale(-1,-1)"
y="-1119.1083"
x="-1370.8767"
height="105.80523"
width="33.87508"
id="rect3953-82-4-1-4"
style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:16.74562263;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
transform="scale(-1,-1)"
y="-1207.0963"
x="-1358.6217"
height="113.43421"
width="9.3650599"
id="rect3953-82-4-1-7-0"
style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:9.11664104;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
transform="matrix(1.5972925,0,0,1.509886,-99.098035,-27.987625)"
d="m 936.41143,838.20984 c 0,14.50519 -11.75878,26.26396 -26.26397,26.26396 -14.50519,0 -26.26396,-11.75877 -26.26396,-26.26396 0,-14.50519 11.75877,-26.26397 26.26396,-26.26397 14.50519,0 26.26397,11.75878 26.26397,26.26397 z"
sodipodi:ry="26.263966"
sodipodi:rx="26.263966"
sodipodi:cy="838.20984"
sodipodi:cx="910.14746"
id="path3226"
style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:7.14799976;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
transform="matrix(1.1933397,0,0,1.5429659,269.38527,-37.350485)"
d="m 936.41143,838.20984 c 0,14.50519 -11.75878,26.26396 -26.26397,26.26396 -14.50519,0 -26.26396,-11.75877 -26.26396,-26.26396 0,-14.50519 11.75877,-26.26397 26.26396,-26.26397 14.50519,0 26.26397,11.75878 26.26397,26.26397 z"
sodipodi:ry="26.263966"
sodipodi:rx="26.263966"
sodipodi:cy="838.20984"
sodipodi:cx="910.14746"
id="path3226-9"
style="fill:#ffffff;fill-opacity:1;stroke:none"
sodipodi:type="arc" />
</g>
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none"
id="rect4027"
width="73.460579"
height="107.13"
x="1722.2299"
y="-207.2868"
transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
<g
id="g4022"
transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,1095.262,-713.65443)">
<rect
transform="scale(-1,-1)"
y="-1121.4039"
x="-1505.5544"
height="105.80523"
width="33.87508"
id="rect3953-82-4-1"
style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:16.74562263;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
transform="scale(-1,-1)"
y="-1222.4006"
x="-1494.0955"
height="113.43421"
width="9.3650599"
id="rect3953-82-4-1-7"
style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:9.11664104;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
id="rect3182"
d="m 1469.5507,1220.8203 20.5952,52.7426 20.6425,-52.7426 -2.0832,-5.35 -37.0713,0 -2.0832,5.35 z"
style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:7.02416945;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
</g>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 66 KiB

2
src/main/twirl/issues/create.scala.html
View File

@@ -6,7 +6,7 @@
@import context._
@import view.helpers._
@html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){
@html.header("issues", repository){
@html.menu("issues", repository){
@tab("", repository)
<form action="@url(repository)/issues/new" method="POST" validate="true">
<div class="row-fluid">

2
src/main/twirl/issues/issue.scala.html
View File

@@ -9,7 +9,7 @@
@import context._
@import view.helpers._
@html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
@html.header("issues", repository){
@html.menu("issues", repository){
@tab("issues", repository)
<ul class="nav nav-tabs">
<li class="pull-left"><a href="@url(repository)/issues"><i class="icon-arrow-left"></i> Back to issue list</a></li>

2
src/main/twirl/issues/list.scala.html
View File

@@ -16,7 +16,7 @@
@import context._
@import view.helpers._
@html.main(s"Issues - ${repository.owner}/${repository.name}", Some(repository)){
@html.header("issues", repository){
@html.menu("issues", repository){
@tab("issues", repository)
<div class="row-fluid">
<div class="span3">

2
src/main/twirl/issues/milestones/edit.scala.html
View File

@@ -2,7 +2,7 @@
@import context._
@import view.helpers._
@html.main(s"Milestones - ${repository.owner}/${repository.name}"){
@html.header("milestones", repository){
@html.menu("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">
<fieldset>

2
src/main/twirl/issues/milestones/list.scala.html
View File

@@ -5,7 +5,7 @@
@import context._
@import view.helpers._
@html.main(s"Milestones - ${repository.owner}/${repository.name}"){
@html.header("issues", repository){
@html.menu("issues", repository){
@issues.html.tab("milestones", repository)
<div class="row-fluid">
<div class="span3">

36
src/main/twirl/header.scala.html → src/main/twirl/menu.scala.html
View File

@@ -36,7 +36,7 @@ ul.sidemenu {
ul.sidemenu li.active {
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
border-right: 4px solid #bb4444;
border-right: 2px solid #bb4444;
border-left: 1px solid white;
}
@@ -58,15 +58,10 @@ ul.sidemenu li {
height: 35px;
border-left: 1px solid #eee;
margin-left:0px;
border-right: 4px solid white;
border-right: 2px solid white;
list-style-type: none;
}
ul.sidemenu li.separator {
border-top: 1px solid #eee;
height: 1px;
}
ul.sidemenu span.badge {
padding-right: 4px;
}
@@ -77,30 +72,33 @@ ul.sidemenu span.badge {
<li style="height: 12px"><div class="gradient pull-left" style="height: 12px"></div></li>
<li @if(active=="code"){class="active"}>
<div class="@if(active=="code"){margin} else {gradient} pull-left"></div>
<a href="@url(repository)"><img src="@assets/common/images/menu-code.png">@if(expand){ Code}</a>
<a href="@url(repository)" @if(!expand){data-toggle="tooltip" data-placement="left" data-original-title="Code"}><img src="@assets/common/images/menu-code.png">@if(expand){ Code}</a>
</li>
<li @if(active=="issues"){class="active"}>
<div class="@if(active=="issues"){margin} else {gradient} pull-left"></div>
<a href="@url(repository)/issues"><img src="@assets/common/images/menu-issues.png">@if(expand){ Issues}</a>
<a href="@url(repository)/issues" @if(!expand){data-toggle="tooltip" data-placement="left" data-original-title="Issues"}><img src="@assets/common/images/menu-issues.png">@if(expand){ Issues}</a>
@if(expand && repository.issueCount > 0){
<div class="pull-right"><span class="label">@repository.issueCount</span></div>
}
</li>
<li @if(active=="pulls"){class="active"}>
<div class="@if(active=="pulls"){margin} else {gradient} pull-left"></div>
<a href="@url(repository)/pulls"><img src="@assets/common/images/menu-pulls.png">@if(expand){ Pull Requests}</a>
<a href="@url(repository)/pulls" @if(!expand){data-toggle="tooltip" data-placement="left" data-original-title="Pull Requests"}><img src="@assets/common/images/menu-pulls.png">@if(expand){ Pull Requests}</a>
@if(expand && repository.pullCount > 0){
<div class="pull-right"><span class="label">@repository.pullCount</span></div>
}
</li>
<li @if(active=="wiki"){class="active"}>
<div class="@if(active=="wiki"){margin} else {gradient} pull-left"></div>
<a href="@url(repository)/wiki"><img src="@assets/common/images/menu-wiki.png">@if(expand){ Wiki}</a>
<a href="@url(repository)/wiki" @if(!expand){data-toggle="tooltip" data-placement="left" data-original-title="Wiki"}><img src="@assets/common/images/menu-wiki.png">@if(expand){ Wiki}</a>
</li>
<li class="separator"></li>
<li>
<div class="gradient pull-left"></div>@if(expand){ Settings}
@if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
<li @if(active=="settings"){class="active"}>
<div class="@if(active=="settings"){margin} else {gradient} pull-left"></div>
<a href="@url(repository)/settings" @if(!expand){data-toggle="tooltip" data-placement="left" data-original-title="Settings"}><img src="@assets/common/images/menu-settings.png">@if(expand){ Settings}</a>
</li>
}
<li style="height: 12px"><div class="gradient pull-left" style="height: 12px"></div></li>
</ul>
@if(expand){
<div class="small">
@@ -131,9 +129,6 @@ ul.sidemenu span.badge {
}
</div>
<div style="margin-right: @if(expand){180px} else {50px};">
@repository.repository.description.map { description =>
<p class="muted">@description</p>
}
<style type="text/css">
a.header-link {
color: #888;
@@ -146,6 +141,10 @@ ul.sidemenu span.badge {
text-decoration: none;
}
</style>
@if(expand){
@repository.repository.description.map { description =>
<p class="muted">@description</p>
}
<div style="border: 1px solid silver; padding: 4px; margin-bottom: 10px;">
<table style="width: 100%;">
<tr>
@@ -167,9 +166,11 @@ ul.sidemenu span.badge {
</tr>
</table>
</div>
}
@body
</div>
</div>
@*
<script type="text/javascript">
$(function(){
$('table.global-nav th.box-header').click(function(){
@@ -178,3 +179,4 @@ $(function(){
});
});
</script>
*@

2
src/main/twirl/pulls/compare.scala.html
View File

@@ -12,7 +12,7 @@
@import context._
@import view.helpers._
@html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){
@html.header("pulls", repository){
@html.menu("pulls", repository){
<div class="pullreq-info">
<div id="compare-info">
<a href="#" id="edit-compare-condition" class="btn btn-mini pull-right">Edit</a>

2
src/main/twirl/pulls/list.scala.html
View File

@@ -11,7 +11,7 @@
@import context._
@import view.helpers._
@html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){
@html.header("pulls", repository){
@html.menu("pulls", repository){
<div class="row-fluid">
<div class="span3">
<ul class="nav nav-pills nav-stacked">

2
src/main/twirl/pulls/pullreq.scala.html
View File

@@ -12,7 +12,7 @@
@import context._
@import view.helpers._
@html.main(s"${issue.title} - Pull Request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
@html.header("pulls", repository){
@html.menu("pulls", repository){
@defining(dayByDayCommits.flatten){ commits =>
<div class="pullreq-info">
@if(issue.closed) {

2
src/main/twirl/repo/blob.scala.html
View File

@@ -7,7 +7,7 @@
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.header("code", repository){
@html.menu("code", repository){
@tab(branch, repository, "files")
<div class="head">
<a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /

2
src/main/twirl/repo/branches.scala.html
View File

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

2
src/main/twirl/repo/commit.scala.html
View File

@@ -9,7 +9,7 @@
@import view.helpers._
@import util.Implicits._
@html.main(commit.shortMessage, Some(repository)){
@html.header("code", repository){
@html.menu("code", repository){
@tab(commitId, repository, "commits")
<table class="table table-bordered">
<tr>

2
src/main/twirl/repo/commits.scala.html
View File

@@ -7,7 +7,7 @@
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.header("code", repository){
@html.menu("code", repository){
@tab(branch, repository, if(pathList.isEmpty) "commits" else "files")
<div class="head">
@if(pathList.isEmpty){

2
src/main/twirl/repo/delete.scala.html
View File

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

2
src/main/twirl/repo/editor.scala.html
View File

@@ -6,7 +6,7 @@
@import context._
@import view.helpers._
@html.main(if(fileName.isEmpty) "New File" else s"Editing ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) {
@html.header("code", repository){
@html.menu("code", repository){
@tab(branch, repository, "files")
<form method="POST" action="@url(repository)/@if(fileName.isEmpty){create}else{update}" validate="true">
<span class="error" id="error-newFileName"></span>

2
src/main/twirl/repo/files.scala.html
View File

@@ -8,7 +8,7 @@
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.header("code", repository, Some(branch), pathList.isEmpty){
@html.menu("code", repository, Some(branch), pathList.isEmpty){
@tab(branch, repository, "files")
<div class="head">
<a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /

2
src/main/twirl/repo/forked.scala.html
View File

@@ -4,7 +4,7 @@
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.header("network", repository){
@html.menu("network", repository){
<ul class="nav nav-tabs">
<li class="active"><a href="@url(repository)/network/members">Members</a></li>
</ul>

2
src/main/twirl/repo/guide.scala.html
View File

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

2
src/main/twirl/repo/tags.scala.html
View File

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

2
src/main/twirl/search/menu.scala.html
View File

@@ -2,7 +2,7 @@
repository: service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: app.Context)
@import context._
@import view.helpers._
@html.header("", repository){
@html.menu("", repository){
<div class="row-fluid">
<div class="span3">
<div class="box">

2
src/main/twirl/settings/collaborators.scala.html
View File

@@ -4,7 +4,7 @@
@import context._
@import view.helpers._
@html.main("Settings", Some(repository)){
@html.header("settings", repository){
@html.menu("settings", repository){
@menu("collaborators", repository){
<h3>Manage Collaborators</h3>
<ul class="collaborator">

2
src/main/twirl/settings/danger.scala.html
View File

@@ -2,7 +2,7 @@
@import context._
@import view.helpers._
@html.main("Danger Zone", Some(repository)){
@html.header("settings", repository){
@html.menu("settings", repository){
@menu("danger", repository){
<div class="box">
<div class="box-header">Danger Zone</div>

2
src/main/twirl/settings/hooks.scala.html
View File

@@ -2,7 +2,7 @@
@import context._
@import view.helpers._
@html.main("Settings", Some(repository)){
@html.header("settings", repository){
@html.menu("settings", repository){
@menu("hooks", repository){
@helper.html.information(info)
<h3>WebHook URLs</h3>

2
src/main/twirl/settings/options.scala.html
View File

@@ -2,7 +2,7 @@
@import context._
@import view.helpers._
@html.main("Settings", Some(repository)){
@html.header("settings", repository){
@html.menu("settings", repository){
@menu("options", repository){
@helper.html.information(info)
<form id="form" method="post" action="@url(repository)/settings/options" validate="true">

2
src/main/twirl/wiki/compare.scala.html
View File

@@ -10,7 +10,7 @@
@import org.eclipse.jgit.diff.DiffEntry.ChangeType
@html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){
@helper.html.information(info)
@html.header("wiki", repository){
@html.menu("wiki", repository){
@tab("history", repository)
<ul class="nav nav-tabs">
<li>

2
src/main/twirl/wiki/edit.scala.html
View File

@@ -4,7 +4,7 @@
@import context._
@import view.helpers._
@html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
@html.header("wiki", repository){
@html.menu("wiki", repository){
@tab("", repository)
<ul class="nav nav-tabs">
<li>

2
src/main/twirl/wiki/history.scala.html
View File

@@ -4,7 +4,7 @@
@import context._
@import view.helpers._
@html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){
@html.header("wiki", repository){
@html.menu("wiki", repository){
@tab(if(pageName.isEmpty) "history" else "", repository)
<ul class="nav nav-tabs">
<li>

2
src/main/twirl/wiki/page.scala.html
View File

@@ -5,7 +5,7 @@
@import context._
@import view.helpers._
@html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
@html.header("wiki", repository){
@html.menu("wiki", repository){
@tab((if(pageName == "Home") "home" else ""), repository)
<ul class="nav nav-tabs">
<li>

2
src/main/twirl/wiki/pages.scala.html
View File

@@ -4,7 +4,7 @@
@import context._
@import view.helpers._
@html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){
@html.header("wiki", repository){
@html.menu("wiki", repository){
@tab("pages", repository)
<ul class="nav nav-tabs">
<li>