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

Add <div class="container"> to pages outside of repository.

Browse Source
This commit is contained in:
takezoe
2014-05-06 21:32:40 +09:00
parent 4e87f21405
commit f422936e34
9 changed files with 285 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/main/twirl/account/edit.scala.html
View File

@@ -2,60 +2,62 @@
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@html.main("Edit your profile"){ @html.main("Edit your profile"){
<div class="row-fluid"> <div class="container">
<div class="span3"> <div class="row-fluid">
@menu("profile", settings.ssh) <div class="span3">
</div> @menu("profile", settings.ssh)
<div class="span9"> </div>
@helper.html.information(info) <div class="span9">
<form action="@url(account.userName)/_edit" method="POST" validate="true"> @helper.html.information(info)
<div class="box"> <form action="@url(account.userName)/_edit" method="POST" validate="true">
<div class="box-header">Profile</div> <div class="box">
<div class="box-content"> <div class="box-header">Profile</div>
<div class="row-fluid"> <div class="box-content">
<div class="span6"> <div class="row-fluid">
@if(account.password.nonEmpty){ <div class="span6">
@if(account.password.nonEmpty){
<fieldset>
<label for="password" class="strong">
Password (input to change password):
</label>
<input type="password" name="password" id="password" value=""/>
<span id="error-password" class="error"></span>
</fieldset>
}
<fieldset> <fieldset>
<label for="password" class="strong"> <label for="fullName" class="strong">Full Name:</label>
Password (input to change password): <input type="text" name="fullName" id="fullName" value="@account.fullName"/>
</label> <span id="error-fullName" class="error"></span>
<input type="password" name="password" id="password" value=""/>
<span id="error-password" class="error"></span>
</fieldset> </fieldset>
} <fieldset>
<fieldset> <label for="mailAddress" class="strong">Mail Address:</label>
<label for="fullName" class="strong">Full Name:</label> <input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress"/>
<input type="text" name="fullName" id="fullName" value="@account.fullName"/> <span id="error-mailAddress" class="error"></span>
<span id="error-fullName" class="error"></span> </fieldset>
</fieldset> <fieldset>
<fieldset> <label for="url" class="strong">URL (optional):</label>
<label for="mailAddress" class="strong">Mail Address:</label> <input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/>
<input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress"/> <span id="error-url" class="error"></span>
<span id="error-mailAddress" class="error"></span> </fieldset>
</fieldset> </div>
<fieldset> <div class="span6">
<label for="url" class="strong">URL (optional):</label> <fieldset>
<input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/> <label for="avatar" class="strong">Image (optional):</label>
<span id="error-url" class="error"></span> @helper.html.uploadavatar(Some(account))
</fieldset> </fieldset>
</div>
</div> </div>
<div class="span6"> <div style="margin-top: 20px;">
<fieldset> <div class="pull-right">
<label for="avatar" class="strong">Image (optional):</label> <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
@helper.html.uploadavatar(Some(account)) </div>
</fieldset> <input type="submit" class="btn btn-success" value="Save"/>
<a href="@url(account.userName)" class="btn">Cancel</a>
</div> </div>
</div> </div>
<div style="margin-top: 20px;">
<div class="pull-right">
<a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
</div>
<input type="submit" class="btn btn-success" value="Save"/>
<a href="@url(account.userName)" class="btn">Cancel</a>
</div>
</div> </div>
</div> </form>
</form> </div>
</div> </div>
} }
<script> <script>

2
src/main/twirl/account/group.scala.html
View File

@@ -2,7 +2,7 @@
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@html.main(if(account.isEmpty) "Create group" else "Edit group"){ @html.main(if(account.isEmpty) "Create group" else "Edit group"){
<div> <div class="container">
<form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true"> <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
<div class="row-fluid"> <div class="row-fluid">
<div class="span5"> <div class="span5">

94
src/main/twirl/account/main.scala.html
View File

@@ -3,54 +3,56 @@
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@html.main(account.userName){ @html.main(account.userName){
<div class="container-fluid"> <div class="container">
<div class="row-fluid"> <div class="container-fluid">
<div class="span4"> <div class="row-fluid">
<div class="block"> <div class="span4">
<div class="account-image">@avatar(account.userName, 200)</div> <div class="block">
<div class="account-fullname">@account.fullName</div> <div class="account-image">@avatar(account.userName, 200)</div>
<div class="account-username">@account.userName</div> <div class="account-fullname">@account.fullName</div>
</div> <div class="account-username">@account.userName</div>
<div class="block">
@if(account.url.isDefined){
<div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
}
<div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
</div>
@if(groupNames.nonEmpty){
<div>
<div>Groups</div>
@groupNames.map { groupName =>
<a href="@url(groupName)">@avatar(groupName, 36, tooltip = true)</a>
}
</div> </div>
} <div class="block">
@if(account.url.isDefined){
<div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
}
<div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
</div>
@if(groupNames.nonEmpty){
<div>
<div>Groups</div>
@groupNames.map { groupName =>
<a href="@url(groupName)">@avatar(groupName, 36, tooltip = true)</a>
}
</div>
}
</div> </div>
<div class="span8"> <div class="span8">
<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){
<li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li> <li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li>
} else { } else {
<li@if(active == "activity"){ class="active"}><a href="@url(account.userName)?tab=activity">Public Activity</a></li> <li@if(active == "activity"){ class="active"}><a href="@url(account.userName)?tab=activity">Public Activity</a></li>
} }
@if(loginAccount.isDefined && loginAccount.get.userName == account.userName){ @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
<li class="pull-right"> <li class="pull-right">
<div class="button-group"> <div class="button-group">
<a href="@url(account.userName)/_edit" class="btn">Edit Your Profile</a> <a href="@url(account.userName)/_edit" class="btn">Edit Your Profile</a>
</div> </div>
</li> </li>
} }
@if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){ @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
<li class="pull-right"> <li class="pull-right">
<div class="button-group"> <div class="button-group">
<a href="@url(account.userName)/_editgroup" class="btn">Edit Group</a> <a href="@url(account.userName)/_editgroup" class="btn">Edit Group</a>
</div> </div>
</li> </li>
} }
</ul> </ul>
@body @body
</div>
</div> </div>
</div> </div>
</div> </div>

2
src/main/twirl/account/register.scala.html
View File

@@ -2,6 +2,7 @@
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@html.main("Create your account"){ @html.main("Create your account"){
<div class="container">
<h3>Create your account</h3> <h3>Create your account</h3>
<form action="@path/register" method="POST" validate="true"> <form action="@path/register" method="POST" validate="true">
<div class="row-fluid"> <div class="row-fluid">
@@ -45,4 +46,5 @@
<input type="submit" class="btn btn-success" value="Create account"/> <input type="submit" class="btn btn-success" value="Create account"/>
</fieldset> </fieldset>
</form> </form>
</div>
} }

68
src/main/twirl/account/ssh.scala.html
View File

@@ -2,44 +2,46 @@
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@html.main("SSH Keys"){ @html.main("SSH Keys"){
<div class="row-fluid"> <div class="container">
<div class="span3"> <div class="row-fluid">
@menu("ssh", settings.ssh) <div class="span3">
</div> @menu("ssh", settings.ssh)
<div class="span9">
<div class="box">
<div class="box-header">SSH Keys</div>
<div class="box-content">
@if(sshKeys.isEmpty){
No keys
}
@sshKeys.zipWithIndex.map { case (key, i) =>
@if(i != 0){
<hr>
}
<strong>@key.title</strong> (@_root_.ssh.SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid."))
<a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
}
</div>
</div> </div>
<form method="POST" action="@path/@account.userName/_ssh" validate="true"> <div class="span9">
<div class="box"> <div class="box">
<div class="box-header">Add an SSH Key</div> <div class="box-header">SSH Keys</div>
<div class="box-content"> <div class="box-content">
<fieldset> @if(sshKeys.isEmpty){
<label for="title" class="strong">Title</label> No keys
<div><span id="error-title" class="error"></span></div> }
<input type="text" name="title" id="title" style="width: 400px;"/> @sshKeys.zipWithIndex.map { case (key, i) =>
</fieldset> @if(i != 0){
<fieldset> <hr>
<label for="publicKey" class="strong">Key</label> }
<div><span id="error-publicKey" class="error"></span></div> <strong>@key.title</strong> (@_root_.ssh.SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid."))
<textarea name="publicKey" id="publicKey" style="width: 600px; height: 250px;"></textarea> <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
</fieldset> }
<input type="submit" class="btn btn-success" value="Add"/>
</div> </div>
</div> </div>
</form> <form method="POST" action="@path/@account.userName/_ssh" validate="true">
<div class="box">
<div class="box-header">Add an SSH Key</div>
<div class="box-content">
<fieldset>
<label for="title" class="strong">Title</label>
<div><span id="error-title" class="error"></span></div>
<input type="text" name="title" id="title" style="width: 400px;"/>
</fieldset>
<fieldset>
<label for="publicKey" class="strong">Key</label>
<div><span id="error-publicKey" class="error"></span></div>
<textarea name="publicKey" id="publicKey" style="width: 600px; height: 250px;"></textarea>
</fieldset>
<input type="submit" class="btn btn-success" value="Add"/>
</div>
</div>
</form>
</div>
</div> </div>
</div> </div>
} }

38
src/main/twirl/admin/menu.scala.html
View File

@@ -1,22 +1,24 @@
@(active: String)(body: Html)(implicit context: app.Context) @(active: String)(body: Html)(implicit context: app.Context)
@import context._ @import context._
<div class="row-fluid"> <div class="container">
<div class="span3"> <div class="row-fluid">
<div class="box"> <div class="span3">
<ul class="nav nav-tabs nav-stacked side-menu"> <div class="box">
<li@if(active=="users"){ class="active"}> <ul class="nav nav-tabs nav-stacked side-menu">
<a href="@path/admin/users">User Management</a> <li@if(active=="users"){ class="active"}>
</li> <a href="@path/admin/users">User Management</a>
<li@if(active=="system"){ class="active"}> </li>
<a href="@path/admin/system">System Settings</a> <li@if(active=="system"){ class="active"}>
</li> <a href="@path/admin/system">System Settings</a>
<li> </li>
<a href="@path/console/login.jsp">H2 Console</a> <li>
</li> <a href="@path/console/login.jsp">H2 Console</a>
</ul> </li>
</div> </ul>
</div> </div>
<div class="span9"> </div>
@body <div class="span9">
@body
</div>
</div> </div>
</div> </div>

72
src/main/twirl/dashboard/issues.scala.html
View File

@@ -8,41 +8,43 @@
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@html.main("Your Issues"){ @html.main("Your Issues"){
@dashboard.html.tab("issues") <div class="container">
<div class="row-fluid"> @dashboard.html.tab("issues")
<div class="span3"> <div class="row-fluid">
<ul class="nav nav-pills nav-stacked"> <div class="span3">
<li@if(filter == "all"){ class="active"}> <ul class="nav nav-pills nav-stacked">
<a href="@path/dashboard/issues/repos@condition.toURL"> <li@if(filter == "all"){ class="active"}>
<span class="count-right">@allCount</span> <a href="@path/dashboard/issues/repos@condition.toURL">
In your repositories <span class="count-right">@allCount</span>
</a> In your repositories
</li> </a>
<li@if(filter == "assigned"){ class="active"}> </li>
<a href="@path/dashboard/issues/assigned@condition.toURL"> <li@if(filter == "assigned"){ class="active"}>
<span class="count-right">@assignedCount</span> <a href="@path/dashboard/issues/assigned@condition.toURL">
Assigned to you <span class="count-right">@assignedCount</span>
</a> Assigned to you
</li> </a>
<li@if(filter == "created_by"){ class="active"}> </li>
<a href="@path/dashboard/issues/created_by@condition.toURL"> <li@if(filter == "created_by"){ class="active"}>
<span class="count-right">@createdByCount</span> <a href="@path/dashboard/issues/created_by@condition.toURL">
Created by you <span class="count-right">@createdByCount</span>
</a> Created by you
</li> </a>
</ul> </li>
<hr/> </ul>
<ul class="nav nav-pills nav-stacked small"> <hr/>
@repositories.map { case (owner, name, count) => <ul class="nav nav-pills nav-stacked small">
<li@if(condition.repo == Some(owner + "/" + name)){ class="active"}> @repositories.map { case (owner, name, count) =>
<a href="@condition.copy(repo = Some(owner + "/" + name)).toURL"> <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
<span class="count-right">@count</span> <a href="@condition.copy(repo = Some(owner + "/" + name)).toURL">
@owner/@name <span class="count-right">@count</span>
</a> @owner/@name
</li> </a>
} </li>
</ul> }
</ul>
</div>
@listparts
</div> </div>
@listparts
</div> </div>
} }

60
src/main/twirl/dashboard/pulls.scala.html
View File

@@ -6,35 +6,37 @@
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@html.main("Your Issues"){ @html.main("Your Issues"){
@dashboard.html.tab("pulls") <div class="container">
<div class="row-fluid"> @dashboard.html.tab("pulls")
<div class="span3"> <div class="row-fluid">
<ul class="nav nav-pills nav-stacked"> <div class="span3">
<li@if(filter == "created_by"){ class="active"}> <ul class="nav nav-pills nav-stacked">
<a href="@path/dashboard/pulls/owned@condition.toURL"> <li@if(filter == "created_by"){ class="active"}>
<span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count).getOrElse(0)</span> <a href="@path/dashboard/pulls/owned@condition.toURL">
Yours <span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count).getOrElse(0)</span>
</a> Yours
</li> </a>
<li@if(filter == "not_created_by"){ class="active"}> </li>
<a href="@path/dashboard/pulls/public@condition.toURL"> <li@if(filter == "not_created_by"){ class="active"}>
<span class="count-right">@counts.filter(_.userName != loginAccount.get.userName).map(_.count).sum</span> <a href="@path/dashboard/pulls/public@condition.toURL">
Public <span class="count-right">@counts.filter(_.userName != loginAccount.get.userName).map(_.count).sum</span>
</a> Public
</li> </a>
</ul> </li>
<hr/> </ul>
<ul class="nav nav-pills nav-stacked small"> <hr/>
@repositories.map { case (owner, name, count) => <ul class="nav nav-pills nav-stacked small">
<li@if(condition.repo == Some(owner + "/" + name)){ class="active"}> @repositories.map { case (owner, name, count) =>
<a href="@path/dashboard/pulls/for/@owner/@name"> <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
<span class="count-right">@count</span> <a href="@path/dashboard/pulls/for/@owner/@name">
@owner/@name <span class="count-right">@count</span>
</a> @owner/@name
</li> </a>
} </li>
</ul> }
</ul>
</div>
@listparts
</div> </div>
@listparts
</div> </div>
} }

111
src/main/twirl/index.scala.html
View File

@@ -4,67 +4,68 @@
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@main("GitBucket"){ @main("GitBucket"){
@dashboard.html.tab() <div class="container">
<div class="row-fluid"> @dashboard.html.tab()
<div class="span8"> <div class="row-fluid">
@helper.html.activities(activities) <div class="span8">
</div> @helper.html.activities(activities)
<div class="span4"> </div>
@if(loginAccount.isEmpty){ <div class="span4">
@signinform(settings) @if(loginAccount.isEmpty){
} else { @signinform(settings)
<table class="table table-bordered">
<tr>
<th class="metal">
<div class="pull-right">
<a href="@path/new" class="btn btn-success btn-mini">New repository</a>
</div>
Your repositories (@userRepositories.size)
</th>
</tr>
@if(userRepositories.isEmpty){
<tr>
<td>No repositories</td>
</tr>
} else { } else {
@userRepositories.map { repository => <table class="table table-bordered">
<tr> <tr>
<td> <th class="metal">
@helper.html.repositoryicon(repository, false) <div class="pull-right">
@if(repository.owner == loginAccount.get.userName){ <a href="@path/new" class="btn btn-success btn-mini">New repository</a>
<a href="@url(repository)"><span class="strong">@repository.name</span></a> </div>
} else { Your repositories (@userRepositories.size)
<a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a> </th>
}
</td>
</tr> </tr>
} @if(userRepositories.isEmpty){
<tr>
<td>No repositories</td>
</tr>
} else {
@userRepositories.map { repository =>
<tr>
<td>
@helper.html.repositoryicon(repository, false)
@if(repository.owner == loginAccount.get.userName){
<a href="@url(repository)"><span class="strong">@repository.name</span></a>
} else {
<a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
}
</td>
</tr>
}
}
</table>
} }
</table>
}
<table class="table table-bordered"> <table class="table table-bordered">
<tr>
<th class="metal">
Recent updated repositories
</th>
</tr>
@if(recentRepositories.isEmpty){2
<tr>
<td>No repositories</td>
</tr>
} else {
@recentRepositories.map { repository =>
<tr> <tr>
<td> <th class="metal">
@helper.html.repositoryicon(repository, false) Recent updated repositories
<a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a> </th>
</td>
</tr> </tr>
} @if(recentRepositories.isEmpty){2
} <tr>
</table> <td>No repositories</td>
</tr>
} else {
@recentRepositories.map { repository =>
<tr>
<td>
@helper.html.repositoryicon(repository, false)
<a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
</td>
</tr>
}
}
</table>
</div>
</div>
</div> </div>
</div>
} }