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

Use lowercase for the first character of most 2nd words

Browse Source 
Unchanged: Mail Address, Full Name
This commit is contained in:
Uli Heller
2016-12-03 10:39:38 +01:00
parent fe3b40557a
commit 134c0010b5
16 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,10 +43,10 @@
<fieldset class="border-top"> <fieldset class="border-top">
@if(account.isDefined){ @if(account.isDefined){
<div class="pull-right"> <div class="pull-right">
<a href="@helpers.url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete Group</a> <a href="@helpers.url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete group</a>
</div> </div>
} }
<input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/> <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create group} else {Update group}"/>
@if(account.isDefined){ @if(account.isDefined){
<a href="@helpers.url(account.get.userName)" class="btn btn-default">Cancel</a> <a href="@helpers.url(account.get.userName)" class="btn btn-default">Cancel</a>
} }
@@ -136,4 +136,4 @@ $(function(){
$('#members').val(members); $('#members').val(members);
} }
}); });
</script> </script>

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

@@ -38,7 +38,7 @@
@if(account.isGroupAccount){ @if(account.isGroupAccount){
<li@if(active == "members"){ class="active"}><a href="@helpers.url(account.userName)?tab=members">Members</a></li> <li@if(active == "members"){ class="active"}><a href="@helpers.url(account.userName)?tab=members">Members</a></li>
} else { } else {
<li@if(active == "activity"){ class="active"}><a href="@helpers.url(account.userName)?tab=activity">Public Activity</a></li> <li@if(active == "activity"){ class="active"}><a href="@helpers.url(account.userName)?tab=activity">Public activity</a></li>
} }
@gitbucket.core.plugin.PluginRegistry().getProfileTabs.map { tab => @gitbucket.core.plugin.PluginRegistry().getProfileTabs.map { tab =>
@tab(account, context).map { link => @tab(account, context).map { link =>
@@ -48,14 +48,14 @@
@if(context.loginAccount.isDefined && context.loginAccount.get.userName == account.userName){ @if(context.loginAccount.isDefined && context.loginAccount.get.userName == account.userName){
<li class="pull-right"> <li class="pull-right">
<div class="button-group"> <div class="button-group">
<a href="@helpers.url(account.userName)/_edit" class="btn btn-default">Edit Your Profile</a> <a href="@helpers.url(account.userName)/_edit" class="btn btn-default">Edit your profile</a>
</div> </div>
</li> </li>
} }
@if(context.loginAccount.isDefined && account.isGroupAccount && isGroupManager){ @if(context.loginAccount.isDefined && account.isGroupAccount && isGroupManager){
<li class="pull-right"> <li class="pull-right">
<div class="button-group"> <div class="button-group">
<a href="@helpers.url(account.userName)/_editgroup" class="btn btn-default">Edit Group</a> <a href="@helpers.url(account.userName)/_editgroup" class="btn btn-default">Edit group</a>
</div> </div>
</li> </li>
} }

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

@@ -3,10 +3,10 @@
<div class="sidebar"> <div class="sidebar">
<ul class="sidebar-menu" id="system-admin-menu-container"> <ul class="sidebar-menu" id="system-admin-menu-container">
<li@if(active=="users"){ class="active"}> <li@if(active=="users"){ class="active"}>
<a href="@context.path/admin/users">User Management</a> <a href="@context.path/admin/users">User management</a>
</li> </li>
<li@if(active=="system"){ class="active"}> <li@if(active=="system"){ class="active"}>
<a href="@context.path/admin/system">System Settings</a> <a href="@context.path/admin/system">System settings</a>
</li> </li>
<li@if(active=="plugins"){ class="active"}> <li@if(active=="plugins"){ class="active"}>
<a href="@context.path/admin/plugins">Plugins</a> <a href="@context.path/admin/plugins">Plugins</a>
@@ -15,7 +15,7 @@
<a href="@context.path/admin/data">Data export / import</a> <a href="@context.path/admin/data">Data export / import</a>
</li> </li>
<li> <li>
<a href="@context.path/console/login.jsp" target="_blank">H2 Console</a> <a href="@context.path/console/login.jsp" target="_blank">H2 console</a>
</li> </li>
@gitbucket.core.plugin.PluginRegistry().getSystemSettingMenus.map { menu => @gitbucket.core.plugin.PluginRegistry().getSystemSettingMenus.map { menu =>
@menu(context).map { link => @menu(context).map { link =>

4
src/main/twirl/gitbucket/core/admin/system.scala.html
View File

@@ -1,10 +1,10 @@
@(info: Option[Any])(implicit context: gitbucket.core.controller.Context) @(info: Option[Any])(implicit context: gitbucket.core.controller.Context)
@gitbucket.core.html.main("System Settings"){ @gitbucket.core.html.main("System settings"){
@gitbucket.core.admin.html.menu("system"){ @gitbucket.core.admin.html.menu("system"){
@gitbucket.core.helper.html.information(info) @gitbucket.core.helper.html.information(info)
<form action="@context.path/admin/system" method="POST" validate="true" class="form-horizontal"> <form action="@context.path/admin/system" method="POST" validate="true" class="form-horizontal">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading strong">System Settings</div> <div class="panel-heading strong">System settings</div>
<div class="panel-body"> <div class="panel-body">
<!--====================================================================--> <!--====================================================================-->
<!-- System properties --> <!-- System properties -->

4
src/main/twirl/gitbucket/core/admin/user.scala.html
View File

@@ -1,5 +1,5 @@
@(account: Option[gitbucket.core.model.Account], error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context) @(account: Option[gitbucket.core.model.Account], error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context)
@gitbucket.core.html.main(if(account.isEmpty) "New User" else "Update User"){ @gitbucket.core.html.main(if(account.isEmpty) "New user" else "Update user"){
@gitbucket.core.admin.html.menu("users"){ @gitbucket.core.admin.html.menu("users"){
@gitbucket.core.helper.html.error(error) @gitbucket.core.helper.html.error(error)
<form method="POST" action="@if(account.isEmpty){@context.path/admin/users/_newuser} else {@context.path/admin/users/@account.get.userName/_edituser}" validate="true"> <form method="POST" action="@if(account.isEmpty){@context.path/admin/users/_newuser} else {@context.path/admin/users/@account.get.userName/_edituser}" validate="true">
@@ -75,7 +75,7 @@
</div> </div>
</div> </div>
<fieldset class="border-top"> <fieldset class="border-top">
<input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create User} else {Update User}"/> <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create user} else {Update user}"/>
<a href="@context.path/admin/users" class="btn btn-default">Cancel</a> <a href="@context.path/admin/users" class="btn btn-default">Cancel</a>
</fieldset> </fieldset>
</form> </form>

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

@@ -1,5 +1,5 @@
@(account: Option[gitbucket.core.model.Account], members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context) @(account: Option[gitbucket.core.model.Account], members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
@gitbucket.core.html.main(if(account.isEmpty) "New Group" else "Update Group"){ @gitbucket.core.html.main(if(account.isEmpty) "New group" else "Update group"){
@gitbucket.core.admin.html.menu("users"){ @gitbucket.core.admin.html.menu("users"){
<form method="POST" action="@if(account.isEmpty){@context.path/admin/users/_newgroup} else {@context.path/admin/users/@account.get.userName/_editgroup}" validate="true"> <form method="POST" action="@if(account.isEmpty){@context.path/admin/users/_newgroup} else {@context.path/admin/users/@account.get.userName/_editgroup}" validate="true">
<div class="row"> <div class="row">
@@ -44,7 +44,7 @@
</div> </div>
</div> </div>
<fieldset class="border-top"> <fieldset class="border-top">
<input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/> <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create group} else {Update group}"/>
<a href="@context.path/admin/users" class="btn btn-default">Cancel</a> <a href="@context.path/admin/users" class="btn btn-default">Cancel</a>
</fieldset> </fieldset>
</form> </form>
@@ -127,4 +127,4 @@ $(function(){
$('#members').val(members); $('#members').val(members);
} }
}); });
</script> </script>

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

@@ -3,8 +3,8 @@
@gitbucket.core.html.main("Manage Users"){ @gitbucket.core.html.main("Manage Users"){
@gitbucket.core.admin.html.menu("users"){ @gitbucket.core.admin.html.menu("users"){
<div class="pull-right" style="margin-bottom: 4px;"> <div class="pull-right" style="margin-bottom: 4px;">
<a href="@context.path/admin/users/_newuser" class="btn btn-default">New User</a> <a href="@context.path/admin/users/_newuser" class="btn btn-default">New user</a>
<a href="@context.path/admin/users/_newgroup" class="btn btn-default">New Group</a> <a href="@context.path/admin/users/_newgroup" class="btn btn-default">New group</a>
</div> </div>
<label for="includeRemoved"> <label for="includeRemoved">
<input type="checkbox" id="includeRemoved" name="includeRemoved" @if(includeRemoved){checked}/> <input type="checkbox" id="includeRemoved" name="includeRemoved" @if(includeRemoved){checked}/>
@@ -67,4 +67,4 @@ $(function(){
location.href = '@context.path/admin/users?includeRemoved=' + this.checked; location.href = '@context.path/admin/users?includeRemoved=' + this.checked;
}); });
}); });
</script> </script>

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

@@ -7,7 +7,7 @@
groups: List[String], groups: List[String],
recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo], recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context) userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
@gitbucket.core.html.main("Pull Requests"){ @gitbucket.core.html.main("Pull requests"){
@gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){ @gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){
@gitbucket.core.dashboard.html.tab("pulls") @gitbucket.core.dashboard.html.tab("pulls")
<div class="container"> <div class="container">

4
src/main/twirl/gitbucket/core/dashboard/tab.scala.html
View File

@@ -1,8 +1,8 @@
@(active: String = "")(implicit context: gitbucket.core.controller.Context) @(active: String = "")(implicit context: gitbucket.core.controller.Context)
<ul class="nav nav-tabs" style="margin-bottom: 20px;"> <ul class="nav nav-tabs" style="margin-bottom: 20px;">
<li @if(active == ""){ class="active"}><a href="@context.path/">News Feed</a></li> <li @if(active == ""){ class="active"}><a href="@context.path/">News feed</a></li>
@if(context.loginAccount.isDefined){ @if(context.loginAccount.isDefined){
<li @if(active == "pulls" ){ class="active"}><a href="@context.path/dashboard/pulls">Pull Requests</a></li> <li @if(active == "pulls" ){ class="active"}><a href="@context.path/dashboard/pulls">Pull requests</a></li>
<li @if(active == "issues"){ class="active"}><a href="@context.path/dashboard/issues">Issues</a></li> <li @if(active == "issues"){ class="active"}><a href="@context.path/dashboard/issues">Issues</a></li>
@gitbucket.core.plugin.PluginRegistry().getDashboardTabs.map { tab => @gitbucket.core.plugin.PluginRegistry().getDashboardTabs.map { tab =>
@tab(context).map { link => @tab(context).map { link =>

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

@@ -15,7 +15,7 @@
<span class="muted"> <span class="muted">
commented commented
@if(comment.issueId.isDefined){ @if(comment.issueId.isDefined){
on this Pull Request on this Pull request
} else { } else {
@if(comment.fileName.isDefined){ @if(comment.fileName.isDefined){
on @comment.fileName.get on @comment.fileName.get

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

@@ -29,7 +29,7 @@
} }
@if(repository.repository.options.issuesOption != "DISABLE") { @if(repository.repository.options.issuesOption != "DISABLE") {
@menuitem("/issues", "issues", "Issues", "issue-opened", repository.issueCount) @menuitem("/issues", "issues", "Issues", "issue-opened", repository.issueCount)
@menuitem("/pulls", "pulls", "Pull Requests", "git-pull-request", repository.pullCount) @menuitem("/pulls", "pulls", "Pull requests", "git-pull-request", repository.pullCount)
@menuitem("/issues/labels", "labels", "Labels", "tag") @menuitem("/issues/labels", "labels", "Labels", "tag")
@menuitem("/issues/milestones", "milestones", "Milestones", "milestone") @menuitem("/issues/milestones", "milestones", "Milestones", "milestone")
} else { } else {

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

@@ -15,7 +15,7 @@
milestones: List[gitbucket.core.model.Milestone], milestones: List[gitbucket.core.model.Milestone],
labels: List[gitbucket.core.model.Label])(implicit context: gitbucket.core.controller.Context) labels: List[gitbucket.core.model.Label])(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers @import gitbucket.core.view.helpers
@gitbucket.core.html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){ @gitbucket.core.html.main(s"Pull requests - ${repository.owner}/${repository.name}", Some(repository)){
@gitbucket.core.html.menu("pulls", repository){ @gitbucket.core.html.menu("pulls", repository){
<div class="pullreq-info"> <div class="pullreq-info">
<div id="compare-edit"> <div id="compare-edit">

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

@@ -14,7 +14,7 @@
@import gitbucket.core.view.helpers @import gitbucket.core.view.helpers
@import gitbucket.core.model.IssueComment @import gitbucket.core.model.IssueComment
@import gitbucket.core.model.CommitComment @import gitbucket.core.model.CommitComment
@gitbucket.core.html.main(s"${issue.title} - Pull Request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){ @gitbucket.core.html.main(s"${issue.title} - Pull request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
@gitbucket.core.html.menu("pulls", repository){ @gitbucket.core.html.menu("pulls", repository){
@defining(dayByDayCommits.flatten){ commits => @defining(dayByDayCommits.flatten){ commits =>
<div> <div>

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

@@ -56,7 +56,7 @@
helpers.urlEncode(parent) + ":" + helpers.encodeRefName(repository.repository.defaultBranch) helpers.urlEncode(parent) + ":" + helpers.encodeRefName(repository.repository.defaultBranch)
}.getOrElse { }.getOrElse {
helpers.encodeRefName(repository.repository.defaultBranch) helpers.encodeRefName(repository.repository.defaultBranch)
}}...@{helpers.encodeRefName(branch.name)}?expand=1" class="btn btn-default">New Pull Request</a> }}...@{helpers.encodeRefName(branch.name)}?expand=1" class="btn btn-default">New Pull request</a>
} else { } else {
<a href="@helpers.url(repository)/compare/@{repository.repository.parentUserName.map { parent => <a href="@helpers.url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
helpers.urlEncode(parent) + ":" + helpers.encodeRefName(repository.repository.defaultBranch) helpers.urlEncode(parent) + ":" + helpers.encodeRefName(repository.repository.defaultBranch)

4
src/main/twirl/gitbucket/core/settings/edithooks.scala.html
View File

@@ -66,8 +66,8 @@
--> -->
<label class="checkbox"><input type="checkbox" @check("events",IssueComment) />Issue comment <span class="help-block normal">Issue commented on. </span> </label> <label class="checkbox"><input type="checkbox" @check("events",IssueComment) />Issue comment <span class="help-block normal">Issue commented on. </span> </label>
<label class="checkbox"><input type="checkbox" @check("events",Issues) />Issues <span class="help-block normal">Issue opened, closed<!-- , assigned, or labeled -->. </span> </label> <label class="checkbox"><input type="checkbox" @check("events",Issues) />Issues <span class="help-block normal">Issue opened, closed<!-- , assigned, or labeled -->. </span> </label>
<label class="checkbox"><input type="checkbox" @check("events",PullRequest) />Pull Request <span class="help-block normal">Pull Request opened, closed<!-- , assigned, labeled -->, or synchronized. </span> </label> <label class="checkbox"><input type="checkbox" @check("events",PullRequest) />Pull request <span class="help-block normal">Pull request opened, closed<!-- , assigned, labeled -->, or synchronized. </span> </label>
<label class="checkbox"><input type="checkbox" @check("events",PullRequestReviewComment) />Pull Request review comment <span class="help-block normal">Pull Request diff commented on. </span> </label> <label class="checkbox"><input type="checkbox" @check("events",PullRequestReviewComment) />Pull request review comment <span class="help-block normal">Pull request diff commented on. </span> </label>
<label class="checkbox"><input type="checkbox" @check("events",Push) />Push <span class="help-block normal">Git push to a repository. </span> </label> <label class="checkbox"><input type="checkbox" @check("events",Push) />Push <span class="help-block normal">Git push to a repository. </span> </label>
<div class="text-right"> <div class="text-right">
@if(!create){ @if(!create){

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

@@ -941,7 +941,7 @@ pre.reset.discussion-item-content-text{
} }
/****************************************************************************/ /****************************************************************************/
/* Pull Request */ /* Pull request */
/****************************************************************************/ /****************************************************************************/
div.pullreq-info { div.pullreq-info {
border: 1px solid #ddd; border: 1px solid #ddd;