Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 15:35:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move the repository menu to the sidebar

Browse Source
This commit is contained in:
Naoki Takezoe
2016-03-27 19:05:09 +09:00
parent a581871a89
commit ba61891510
11 changed files with 202 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/twirl/gitbucket/core/account/application.scala.html
View File

@@ -5,11 +5,8 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main("Applications"){ @html.main("Applications"){
<div class="container body"> <div class="container body">
<div class="row">
<div class="col-md-3">
@menu("application", settings.ssh) @menu("application", settings.ssh)
</div> <div style="margin-left: 260px;">
<div class="col-md-9">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading strong">Personal access tokens</div> <div class="panel-heading strong">Personal access tokens</div>
<div class="panel-body"> <div class="panel-body">
@@ -56,5 +53,4 @@
</form> </form>
</div> </div>
</div> </div>
</div>
} }

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

@@ -4,11 +4,8 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main("Edit your profile"){ @html.main("Edit your profile"){
<div class="container body"> <div class="container body">
<div class="row">
<div class="col-md-3">
@menu("profile", settings.ssh) @menu("profile", settings.ssh)
</div> <div style="margin-left: 260px;">
<div class="col-md-9">
@helper.html.information(info) @helper.html.information(info)
@if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>} @if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
<form action="@url(account.userName)/_edit" method="POST" validate="true"> <form action="@url(account.userName)/_edit" method="POST" validate="true">

11
src/main/twirl/gitbucket/core/account/main.scala.html
View File

@@ -4,11 +4,9 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(account.userName){ @html.main(account.userName){
<div class="container body"> <div class="container body">
<div class="container-fluid"> <div style="float: left; width: 250px;">
<div class="row">
<div class="col-md-4">
<div class="block"> <div class="block">
<div class="account-image">@avatar(account.userName, 270)</div> <div class="account-image">@avatar(account.userName, 240)</div>
<div class="account-fullname">@account.fullName</div> <div class="account-fullname">@account.fullName</div>
<div class="account-username">@account.userName</div> <div class="account-username">@account.userName</div>
</div> </div>
@@ -26,9 +24,8 @@
} }
</div> </div>
} }
</div> </div>
<div class="col-md-8"> <div style="margin-left: 260px; overflow: hidden;">
<ul class="nav nav-tabs" style="margin-bottom: 5px;"> <ul class="nav nav-tabs" style="margin-bottom: 5px;">
<li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li> <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
@if(account.isGroupAccount){ @if(account.isGroupAccount){
@@ -54,6 +51,4 @@
@body @body
</div> </div>
</div> </div>
</div>
</div>
} }

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

@@ -1,6 +1,6 @@
@(active: String, ssh: Boolean)(implicit context: gitbucket.core.controller.Context) @(active: String, ssh: Boolean)(implicit context: gitbucket.core.controller.Context)
@import context._ @import context._
<div class="box"> <div style="float: left; width: 250px;">
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
<li@if(active=="profile"){ class="active"}> <li@if(active=="profile"){ class="active"}>
<a href="@path/@loginAccount.get.userName/_edit">Profile</a> <a href="@path/@loginAccount.get.userName/_edit">Profile</a>

6
src/main/twirl/gitbucket/core/account/ssh.scala.html
View File

@@ -4,11 +4,8 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main("SSH Keys"){ @html.main("SSH Keys"){
<div class="container body"> <div class="container body">
<div class="row">
<div class="col-md-3">
@menu("ssh", settings.ssh) @menu("ssh", settings.ssh)
</div> <div style="margin-left: 260px;">
<div class="col-md-9">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading strong">SSH Keys</div> <div class="panel-heading strong">SSH Keys</div>
<div class="panel-body"> <div class="panel-body">
@@ -44,5 +41,4 @@
</form> </form>
</div> </div>
</div> </div>
</div>
} }

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

@@ -1,8 +1,7 @@
@(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context) @(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context)
@import context._ @import context._
<div class="container body"> <div class="container body">
<div class="row"> <div style="width: 250px; float: left;">
<div class="col-md-3">
<ul class="nav nav-pills nav-stacked" id="system-admin-menu-container"> <ul class="nav nav-pills nav-stacked" id="system-admin-menu-container">
<li@if(active=="users"){ class="active"}> <li@if(active=="users"){ class="active"}>
<a href="@path/admin/users">User Management</a> <a href="@path/admin/users">User Management</a>
@@ -18,8 +17,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="col-md-9"> <div style="margin-left: 260px;">
@body @body
</div> </div>
</div> </div>
</div>

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

@@ -44,7 +44,7 @@
<body> <body>
<form id="search" action="@path/search" method="POST" class="form-inline"> <form id="search" action="@path/search" method="POST" class="form-inline">
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="container" style="width: 980px;"> <div class="container">
@* TODO: for plugi-ins? @* TODO: for plugi-ins?
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>

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

@@ -56,7 +56,10 @@
} }
} }
</div> </div>
<ul class="nav nav-tabs"> </div>
</div>
<div class="container body">
<ul class="nav nav-pills nav-stacked" style="width: 250px; float: left;">
@menuitem("" ,"files" ,"Files") @menuitem("" ,"files" ,"Files")
@if(repository.commitCount != 0) { @if(repository.commitCount != 0) {
@menuitem("/branches" ,"branches" ,"Branches", repository.branchList.length) @menuitem("/branches" ,"branches" ,"Branches", repository.branchList.length)
@@ -67,13 +70,13 @@
@menuitem("/issues/labels" ,"labels" ,"Labels") @menuitem("/issues/labels" ,"labels" ,"Labels")
@menuitem("/issues/milestones" ,"milestones" ,"Milestones") @menuitem("/issues/milestones" ,"milestones" ,"Milestones")
@menuitem("/wiki" ,"wiki" ,"Wiki") @menuitem("/wiki" ,"wiki" ,"Wiki")
@menuitem("/network/members", "fork", "Forks", repository.forkedCount)
@if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
@menuitem("/settings" , "settings" , "Settings") @menuitem("/settings" , "settings" , "Settings")
} }
@menuitem("/network/members", "fork", "Forks", repository.forkedCount)
</ul> </ul>
</div> <div style="margin-left: 260px;">
</div>
<div class="container body">
@body @body
</div> </div>
</div>

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

@@ -1,10 +1,8 @@
@(active: String, repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context) @(active: String, repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context)
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
<div class="row"> <div style="overflow: hidden;">
<div class="col-md-3"> <ul class="nav nav-tabs" style="margin-bottom: 20px;">
<div class="box">
<ul class="nav nav-pills nav-stacked">
<li@if(active=="options"){ class="active"}> <li@if(active=="options"){ class="active"}>
<a href="@url(repository)/settings/options">Options</a> <a href="@url(repository)/settings/options">Options</a>
</li> </li>
@@ -23,9 +21,5 @@
<a href="@url(repository)/settings/danger">Danger Zone</a> <a href="@url(repository)/settings/danger">Danger Zone</a>
</li> </li>
</ul> </ul>
</div>
</div>
<div class="col-md-9">
@body @body
</div> </div>
</div>

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

@@ -10,23 +10,20 @@
@import gitbucket.core.service.WikiService.{wikiHttpUrl, wikiSshUrl} @import gitbucket.core.service.WikiService.{wikiHttpUrl, wikiSshUrl}
@html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){ @html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
@html.menu("wiki", repository){ @html.menu("wiki", repository){
<ul class="nav nav-tabs fill-width">
<li>
<h1 class="wiki-title">@pageName</h1>
<div> <div>
<span class="muted"><strong>@page.committer</strong> edited this page @helper.html.datetimeago(page.time)</span>
</div>
</li>
<li class="pull-right">
@if(hasWritePermission){ @if(hasWritePermission){
<div> <div class="pull-right">
<a class="btn btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a> <a class="btn btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
<a class="btn btn-success" href="@url(repository)/wiki/_new">New Page</a> <a class="btn btn-success" href="@url(repository)/wiki/_new">New Page</a>
</div> </div>
} }
</li> <h1 class="wiki-title">@pageName</h1>
</ul> <div>
<div style="width: 200px; margin-top: 20px;" class="pull-right pc"> <span class="muted"><strong>@page.committer</strong> edited this page @helper.html.datetimeago(page.time)</span>
</div>
<hr>
</div>
<div style="width: 250px; margin-top: 20px;" class="pull-right pc">
@defining(15){ max => @defining(15){ max =>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading strong"> <div class="panel-heading strong">
@@ -76,7 +73,7 @@
</div> </div>
} }
</div> </div>
<div style="width: 740px;" class="pull-left"> <div style="margin-right: 260px;">
<div class="markdown-body"> <div class="markdown-body">
@markdown( @markdown(
markdown = page.content, markdown = page.content,

5
src/main/webapp/assets/common/css/gitbucket.css
View File

@@ -180,7 +180,12 @@ div.head div.forked {
} }
div.container { div.container {
/*
width: 980px; width: 980px;
*/
width: 100%;
padding-left: 10px;
padding-right: 10px;
} }
div.container-wide { div.container-wide {