Skip to content

Commit f9d5f57

Browse files
takezoetakezoe
committed
Move to Bootstrap3 default theme
1 parent 4842723 commit f9d5f57

13 files changed

+109
-134
lines changed

‎src/main/twirl/gitbucket/gist/commentedit.scala.html

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
@(content: String, commentId: Int, userName: String, repoName: String)(implicit context: gitbucket.core.controller.Context)
22
@import context._
33
<span id="error-edit-content-@commentId" class="error"></span>
4-
@gitbucket.core.helper.html.attached(userName, repoName){
5-
<textarea class="form-control" style="width: 635px; height: 100px;" id="edit-content-@commentId">@content</textarea>
6-
}
7-
<div>
8-
<input type="button" id="cancel-comment-@commentId" class="btn btn-lg btn-danger" value="Cancel"/>
9-
<input type="button" id="update-comment-@commentId" class="btn btn-lg btn-default pull-right" value="Update comment"/>
4+
<textarea class="form-control" style="height: 100px;" id="edit-content-@commentId">@content</textarea>
5+
<div style="margin-top: 6px;">
6+
<input type="button" id="cancel-comment-@commentId" class="btn btn-danger" value="Cancel"/>
7+
<input type="button" id="update-comment-@commentId" class="btn btn-default pull-right" value="Update comment"/>
108
</div>
119
<script>
1210
$(function(){

‎src/main/twirl/gitbucket/gist/commentform.scala.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
@gitbucket.gist.html.commentpreview(
1111
gist = gist,
1212
content = "",
13-
style = "width: 635px; height: 100px; max-height: 150px;",
13+
style = "height: 100px; max-height: 150px;",
1414
elastic = true
1515
)
16-
<div style="text-align: right;">
17-
<input type="submit" class="btn btn-lg btn-success" value="Comment"/>
16+
<div class="text-right" style="margin-top: 6px;">
17+
<input type="submit" class="btn btn-success" value="Comment"/>
1818
</div>
1919
</div>
2020
</div>

‎src/main/twirl/gitbucket/gist/commentlist.scala.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@
66
@import gitbucket.core.view.helpers._
77
@comments.map { comment =>
88
<div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
9-
<div class="issue-comment-box" id="[email protected]">
10-
<div class="box-header-small">
9+
<div class="panel panel-default issue-comment-box" id="[email protected]">
10+
<div class="panel-heading">
1111
@user(comment.commentedUserName, styleClass="username strong")
1212
<span class="muted">
1313
commented
1414
@gitbucket.core.helper.html.datetimeago(comment.registeredDate)
1515
</span>
1616
<span class="pull-right">
1717
@if((hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
18-
<a href="#" data-comment-id="@comment.commentId"><i class="icon-pencil" aria-label="Edit"></i></a>&nbsp;
19-
<a href="#" data-comment-id="@comment.commentId"><i class="icon-remove-circle" aria-label="Remove"></i></a>
18+
<a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-pencil" aria-label="Edit"></i></a>&nbsp;
19+
<a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-x" aria-label="Remove"></i></a>
2020
}
2121
</span>
2222
</div>
23-
<div class="box-content-bottom issue-content" id="[email protected]">
24-
<div class="markdown-body">@markdown(comment.content, repository, false, true, true, hasWritePermission)</div>
23+
<div class="panel-body issue-content markdown-body" id="[email protected]">
24+
@markdown(comment.content, repository, false, true, true, hasWritePermission)
2525
</div>
2626
</div>
2727
}
2828
<script>
2929
$(function(){
30-
$('.issue-comment-box i.icon-pencil').click(function(){
30+
$('.issue-comment-box i.octicon-pencil').click(function(){
3131
var id = $(this).closest('a').data('comment-id');
3232
var url = '@path/gist/@gist.userName/@gist.repositoryName/_comments/' + id;
3333
var $content = $('#commentContent-' + id);
@@ -43,7 +43,7 @@
4343
});
4444
return false;
4545
});
46-
$('.issue-comment-box i.icon-remove-circle').click(function(){
46+
$('.issue-comment-box i.octicon-x').click(function(){
4747
if(confirm('Are you sure you want to delete this?')) {
4848
var id = $(this).closest('a').data('comment-id');
4949
$.post('@path/gist/@gist.userName/@gist.repositoryName/_comments/' + id + '/_delete',

‎src/main/twirl/gitbucket/gist/commentpreview.scala.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
@import gitbucket.core._
99
@import gitbucket.core.view.helpers._
1010
<div class="tabbable">
11-
<ul class="nav nav-tabs" style="height: 37px;">
11+
<ul class="nav nav-tabs fill-width" style="margin-bottom: 10px;">
1212
<li class="active"><a href="#tab@uid" data-toggle="tab">Write</a></li>
1313
<li><a href="#tab@(uid+1)" data-toggle="tab" id="preview@uid">Preview</a></li>
1414
</ul>
1515
<div class="tab-content">
16-
<div class="tab-pane active" id="tab@uid">
16+
<div class="tab-pane active" style="margin-top: 4px;" id="tab@uid">
1717
<span id="error-content" class="error"></span>
1818
<textarea id="content@uid" name="content" class="form-control" placeholder="@placeholder" @if(style.nonEmpty){style="@style"}>@content</textarea>
1919
</div>

‎src/main/twirl/gitbucket/gist/detail.scala.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
@import context._
99
@import gitbucket.core.view.helpers._
1010
@gitbucket.core.html.main(if(gist.description.isEmpty) gist.repositoryName else gist.description){
11+
@gitbucket.gist.html.style()
1112
@gitbucket.gist.html.header(gist, forkedCount, editable)
1213
<div class="container body">
1314
@gitbucket.gist.html.menu("code", gist, repositoryUrl)
@@ -17,7 +18,7 @@
1718
</div>
1819
@files.map { case (fileName, content) =>
1920
<div class="panel panel-default">
20-
<div class="panel-heading strong">
21+
<div class="panel-heading strong" style="padding: 6px; line-height: 30px;">
2122
@fileName
2223
<div class="pull-right">
2324
<a href="@path/gist/@gist.userName/@gist.repositoryName/raw/@revision/@fileName" class="btn btn-sm btn-default">Raw</a>

‎src/main/twirl/gitbucket/gist/edit.scala.html

+18-20
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@import context._
55
@import gitbucket.core.view.helpers._
66
@gitbucket.core.html.main("Snippets"){
7-
<div class="container">
7+
<div class="container head">
88
<div id="error"></div>
99
@if(gist.isEmpty){
1010
<div>
@@ -29,21 +29,19 @@
2929
</div>
3030
} else {
3131
@gist.map { x =>
32-
<div class="head">
33-
@avatar(gist.get.userName, 24)
34-
Editing
35-
<a class="strong" href="@path/gist/@gist.get.userName/@gist.get.repositoryName">@gist.get.title</a>
32+
@avatar(gist.get.userName, 24)
33+
Editing
34+
<a class="strong" href="@path/gist/@gist.get.userName/@gist.get.repositoryName">@gist.get.title</a>
35+
@if(gist.get.isPrivate){
36+
<span class="label label-warning">Secret</span>
37+
}
38+
<div class="pull-right">
3639
@if(gist.get.isPrivate){
37-
<span class="label label-warning">Secret</span>
40+
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/public" class="btn btn-default">Make public</a>
41+
} else {
42+
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/secret" class="btn btn-default">Make secret</a>
3843
}
39-
<div class="pull-right">
40-
@if(gist.get.isPrivate){
41-
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/public" class="btn btn-default">Make public</a>
42-
} else {
43-
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/secret" class="btn btn-default">Make secret</a>
44-
}
45-
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/delete" class="btn btn-default" id="delete">Delete</a>
46-
</div>
44+
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/delete" class="btn btn-default" id="delete">Delete</a>
4745
</div>
4846
<div class="muted" style="margin-top: -10px; margin-left: 30px;">
4947
Created at @gist.get.registeredDate
@@ -54,21 +52,21 @@
5452
<hr style="margin-bottom: 20px;"/>
5553
<div class="container body">
5654
<form id="form" method="POST" action="#" class="form-inline">
57-
<input type="text" name="description" id="description" class="form-control input-lg" style="width: 950px; margin-bottom: 8px;" value="@gist.map(_.description)" placeholder="Snippet descriptions..."/>
55+
<input type="text" name="description" id="description" class="form-control" style="width: 950px; margin-bottom: 8px;" value="@gist.map(_.description)" placeholder="Snippet descriptions..."/>
5856
<div id="editors">
5957
@files.zipWithIndex.map { case ((fileName, content), i) =>
6058
@gitbucket.gist.html.editor(i, fileName, content)
6159
}
6260
</div>
6361
<div>
64-
<input type="button" value="Add file" class="btn btn-lg btn-default" id="add_file">
62+
<input type="button" value="Add file" class="btn btn-default" id="add_file">
6563
<div class="pull-right">
6664
@if(gist.isDefined){
67-
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName" class="btn btn-lg btn-default">Cancel</a>
68-
<input type="submit" value="Update" class="btn btn-lg btn-success submit_snippet" id="update_snippet">
65+
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName" class="btn btn-default">Cancel</a>
66+
<input type="submit" value="Update" class="btn btn-success submit_snippet" id="update_snippet">
6967
} else {
70-
<input type="submit" value="Create private Snippet" class="btn btn-lg btn-default submit_snippet" id="create_private_snippet">
71-
<input type="submit" value="Create public Snippet" class="btn btn-lg btn-default submit_snippet" id="create_public_snippet">
68+
<input type="submit" value="Create private Snippet" class="btn btn-default submit_snippet" id="create_private_snippet">
69+
<input type="submit" value="Create public Snippet" class="btn btn-default submit_snippet" id="create_public_snippet">
7270
}
7371
</div>
7472
</div>

‎src/main/twirl/gitbucket/gist/editor.scala.html

+16-20
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,22 @@
33
content: gitbucket.core.util.JGitUtil.ContentInfo)(implicit context: gitbucket.core.controller.Context)
44
@import context._
55
@import gitbucket.core.view.helpers._
6-
<table class="table table-bordered">
7-
<tr>
8-
<th>
9-
<div class="pull-right">
10-
<select id="wrap-@i" class="form-control input-medium" style="margin-bottom: 0px; height: 26px; padding: 0px;">
11-
<optgroup label="Line Wrap Mode">
12-
<option value="false">No wrap</option>
13-
<option value="true">Soft wrap</option>
14-
</optgroup>
15-
</select>
16-
</div>
17-
<input type="text" id="fileName-@i" name="fileName-@i" class="form-control input-medium" value="@fileName" placeholder="Name this file..." style="margin-bottom: 0px;">
18-
</th>
19-
</tr>
20-
<tr>
21-
<td>
22-
<div id="editor-@i" class="editor" data-index="@i" style="width: 100%; height: 400px;"></div>
23-
</td>
24-
</tr>
25-
</table>
6+
<div class="panel panel-default">
7+
<div class="panel-heading" style="padding: 6px;">
8+
<div class="pull-right">
9+
<select id="wrap-@i" class="form-control" style="margin-bottom: 0px; padding: 0px;">
10+
<optgroup label="Line Wrap Mode">
11+
<option value="false">No wrap</option>
12+
<option value="true">Soft wrap</option>
13+
</optgroup>
14+
</select>
15+
</div>
16+
<input type="text" id="fileName-@i" name="fileName-@i" class="form-control" value="@fileName" placeholder="Name this file..." style="width: 300px; margin-bottom: 0px;">
17+
</div>
18+
<div class="panel-body">
19+
<div id="editor-@i" class="editor" data-index="@i" style="width: 100%; height: 400px;"></div>
20+
</div>
21+
</div>
2622
<input type="hidden" id="content-@i" name="content-@i" value=""/>
2723
<input type="hidden" id="charset-@i" name="charset-@i" value="@content.charset"/>
2824
<input type="hidden" id="lineSeparator-@i" name="lineSeparator-@i" value="@content.lineSeparator"/>

‎src/main/twirl/gitbucket/gist/forks.scala.html

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@import context._
77
@import gitbucket.core.view.helpers._
88
@gitbucket.core.html.main("Snippets"){
9+
@gitbucket.gist.html.style()
910
@gitbucket.gist.html.header(gist, forkedCount, editable)
1011
<div class="container body">
1112
@gitbucket.gist.html.menu("forks", gist, repositoryUrl)

‎src/main/twirl/gitbucket/gist/header.scala.html

+21-30
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,31 @@
33
editable: Boolean)(implicit context: gitbucket.core.controller.Context)
44
@import context._
55
@import gitbucket.core.view.helpers._
6-
<div class="container">
7-
<div class="head">
8-
@avatar(gist.userName, 24)
9-
<a href="@path/gist/@gist.userName">@gist.userName</a> /
10-
<a href="@path/gist/@gist.userName/@gist.repositoryName" class="strong">@gist.title</a>
11-
@if(gist.isPrivate){
12-
<span class="label label-warning">Secret</span>
6+
<div class="container head">
7+
@avatar(gist.userName, 24)
8+
<a href="@path/gist/@gist.userName">@gist.userName</a> /
9+
<a href="@path/gist/@gist.userName/@gist.repositoryName" class="strong">@gist.title</a>
10+
@if(gist.isPrivate){
11+
<span class="label label-warning">Secret</span>
12+
}
13+
<div class="pull-right">
14+
@if(editable){
15+
<a href="@path/gist/@gist.userName/@gist.repositoryName/edit" class="btn btn-default">Edit</a>
16+
<a href="@path/gist/@gist.userName/@gist.repositoryName/delete" class="btn btn-danger" id="delete">Delete</a>
1317
}
14-
<div class="pull-right">
15-
@if(editable){
16-
<a href="@path/gist/@gist.userName/@gist.repositoryName/edit" class="btn btn-default">Edit</a>
17-
<a href="@path/gist/@gist.userName/@gist.repositoryName/delete" class="btn btn-default" id="delete">Delete</a>
18+
@if(gist.originUserName.isEmpty){
19+
@if(loginAccount.isEmpty){
20+
<a href="@path/signin?redirect=@urlEncode(s"${path}/gist/${gist.userName}/${gist.repositoryName}")" class="btn btn-default">Fork <span class="badge">@forkedCount</span></a>
21+
} else {
22+
<a id="fork-link" href="javascript:void(0);" class="btn btn-default">Fork <span class="badge">@forkedCount</span></a>
1823
}
19-
@if(gist.originUserName.isEmpty){
20-
<div class="input-group pull-right">
21-
<span class="fork">
22-
<span class="input-group-btn">
23-
@if(loginAccount.isEmpty){
24-
<a title="You must be signed in to fork a repository" href="@path/signin?redirect=@urlEncode(s"${path}/gist/${gist.userName}/${gist.repositoryName}")" class="btn btn-default">Fork</a>
25-
} else {
26-
<a id="fork-link" href="javascript:void(0);" class="btn btn-default">Fork</a>
27-
}
28-
</span>
29-
<span class="count"><a href="@path/gist/@gist.userName/@gist.repositoryName/forks">@forkedCount</a></span>
30-
</span>
31-
</div>
32-
@if(loginAccount.isDefined){
33-
<form id="fork-form" method="post" action="@path/gist/@gist.userName/@gist.repositoryName/fork">
34-
</form>
35-
}
24+
@if(loginAccount.isDefined){
25+
<form id="fork-form" method="post" action="@path/gist/@gist.userName/@gist.repositoryName/fork">
26+
</form>
3627
}
37-
</div>
28+
}
3829
</div>
39-
<div class="muted small" style="margin-top: -10px; margin-left: 30px;">
30+
<div class="muted" style="margin-left: 30px; font-size: 80%;">
4031
Created at @gist.registeredDate
4132
@if(gist.originUserName.isDefined){
4233
- forked from <a href="@path/gist/@gist.originUserName/@gist.originRepositoryName">@gist.originUserName/@gist.originRepositoryName</a>

‎src/main/twirl/gitbucket/gist/list.scala.html

+25-29
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,19 @@
44
hasNext: Boolean)(implicit context: gitbucket.core.controller.Context)
55
@import context._
66
@import gitbucket.core.view.helpers._
7-
@gitbucket.core.html.main(gistUser.map(user => s"${user.userName}'s Snippets").getOrElse("")){
7+
@gitbucket.core.html.main(gistUser.map(user => s"${user.userName}'s Snippets").getOrElse("Snippets")){
88
@gitbucket.gist.html.style()
9-
<div class="container">
9+
<div class="container head">
1010
@if(gistUser.isEmpty){
11-
<div class="head">
12-
Discover Snippets
13-
<div class="pull-right">
14-
<a href="@path/gist/_new" class="btn btn-default">New snippet</a>
15-
</div>
11+
Discover Snippets
12+
<div class="pull-right">
13+
<a href="@path/gist/_new" class="btn btn-success">New snippet</a>
1614
</div>
1715
} else {
18-
<div class="head">
19-
@avatar(gistUser.get.userName, 24)
20-
<span class="strong">@gistUser.get.fullName</span>
21-
<div class="pull-right">
22-
<a href="@path/@gistUser.get.userName" class="btn btn-default">@gistUser.get.userName on GitBucket</a>
23-
</div>
16+
@avatar(gistUser.get.userName, 24)
17+
<span class="strong">@gistUser.get.fullName</span>
18+
<div class="pull-right">
19+
<a href="@path/@gistUser.get.userName" class="btn btn-default">@gistUser.get.userName on GitBucket</a>
2420
</div>
2521
<div class="muted" style="margin-top: -10px; margin-left: 30px;">
2622
@gistUser.get.userName
@@ -30,11 +26,12 @@
3026
<hr style="margin-bottom: 20px;"/>
3127
<div class="container body">
3228
@gists.map { case (gist, gistInfo) =>
33-
<div>
34-
<div>
29+
<div class="panel panel-default">
30+
<div class="panel-heading">
3531
@avatar(gist.userName, 20)
3632
<a class="strong" href="@path/gist/@gist.userName">@gist.userName</a> /
3733
<a class="strong" href="@path/gist/@gist.userName/@gist.repositoryName">@gist.title</a>
34+
<span class="muted small">Created at @gist.registeredDate</span>
3835
@if(gist.isPrivate){
3936
<span class="label label-warning">Secret</span>
4037
}
@@ -52,20 +49,19 @@
5249
</a>
5350
</div>
5451
</div>
55-
<div class="muted small" style="margin-left: 22px;">
56-
Created at @gist.registeredDate
57-
</div>
58-
<div class="small" style="margin-left: 22px; margin-top: 2px; margin-bottom: 2px;">
59-
@gist.description
60-
</div>
61-
<div>
62-
@if(isRenderable(gistInfo.fileName)){
63-
<div class="list-markup box-content markdown-body">
64-
@renderMarkup(List(gistInfo.fileName), gistInfo.source, "master", gist.toRepositoryInfo, false, false, false)
65-
</div>
66-
} else {
67-
<pre class="list-code box-content prettyprint linenums">@gistInfo.source</pre>
68-
}
52+
<div class="panel-body">
53+
<div class="small" style="margin-left: 22px; margin-top: 2px; margin-bottom: 2px;">
54+
@gist.description
55+
</div>
56+
<div>
57+
@if(isRenderable(gistInfo.fileName)){
58+
<div class="list-markup box-content markdown-body">
59+
@renderMarkup(List(gistInfo.fileName), gistInfo.source, "master", gist.toRepositoryInfo, false, false, false)
60+
</div>
61+
} else {
62+
<pre class="list-code box-content prettyprint linenums">@gistInfo.source</pre>
63+
}
64+
</div>
6965
</div>
7066
</div>
7167
}

0 commit comments

Comments
 (0)