Skip to content

Commit 9a5e116

Browse files
takezoetakezoe
committed
Fix layout according to AdminLTE
1 parent e3bac82 commit 9a5e116

File tree

7 files changed

+225
-216
lines changed

7 files changed

+225
-216
lines changed

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

+28-26
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,36 @@
88
@import gitbucket.core.view.helpers
99
@gitbucket.core.html.main(if(gist.description.isEmpty) gist.repositoryName else gist.description){
1010
@gitbucket.gist.html.style()
11-
@gitbucket.gist.html.header(gist, forkedCount, editable)
12-
<div class="container body">
13-
@gitbucket.gist.html.menu("code", gist, repositoryUrl)
14-
<div style="margin-right: 260px; overflow: hidden;">
15-
<div style="margin-bottom: 10px;">
16-
@gist.description
17-
</div>
18-
@files.map { case (fileName, content) =>
19-
<div class="panel panel-default">
20-
<div class="panel-heading strong" style="padding: 6px; line-height: 30px;">
21-
@fileName
22-
<div class="pull-right">
23-
<a href="@context.path/gist/@gist.userName/@gist.repositoryName/raw/@revision/@fileName" class="btn btn-sm btn-default">Raw</a>
11+
<div class="content-wrapper main-center">
12+
@gitbucket.gist.html.header(gist, forkedCount, editable)
13+
<div class="content body">
14+
@gitbucket.gist.html.menu("code", gist, repositoryUrl)
15+
<div style="margin-right: 260px; overflow: hidden;">
16+
<div style="margin-bottom: 10px;">
17+
@gist.description
18+
</div>
19+
@files.map { case (fileName, content) =>
20+
<div class="panel panel-default">
21+
<div class="panel-heading strong" style="padding: 6px; line-height: 30px;">
22+
@fileName
23+
<div class="pull-right">
24+
<a href="@context.path/gist/@gist.userName/@gist.repositoryName/raw/@revision/@fileName" class="btn btn-sm btn-default">Raw</a>
25+
</div>
2426
</div>
27+
@if(helpers.isRenderable(fileName)){
28+
<div class="panel-body markdown-body" style="padding-left: 16px; padding-right: 16px;">
29+
@helpers.renderMarkup(List(fileName), content, "master", gist.toRepositoryInfo, false, false, true)
30+
</div>
31+
} else {
32+
<div class="panel-body">
33+
<pre class="prettyprint linenums blob">@content</pre>
34+
</div>
35+
}
2536
</div>
26-
@if(helpers.isRenderable(fileName)){
27-
<div class="panel-body markdown-body" style="padding-left: 16px; padding-right: 16px;">
28-
@helpers.renderMarkup(List(fileName), content, "master", gist.toRepositoryInfo, false, false, true)
29-
</div>
30-
} else {
31-
<div class="panel-body">
32-
<pre class="prettyprint linenums blob">@content</pre>
33-
</div>
34-
}
35-
</div>
36-
}
37-
@gitbucket.gist.html.commentlist(gist, comments, editable, gist.toRepositoryInfo)
38-
@gitbucket.gist.html.commentform(gist)
37+
}
38+
@gitbucket.gist.html.commentlist(gist, comments, editable, gist.toRepositoryInfo)
39+
@gitbucket.gist.html.commentform(gist)
40+
</div>
3941
</div>
4042
</div>
4143
<script>

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

+60-58
Original file line numberDiff line numberDiff line change
@@ -4,69 +4,71 @@
44
@import gitbucket.core.view.helpers
55
@gitbucket.core.html.main("Snippets"){
66
@gitbucket.gist.html.style()
7-
<div class="container head">
8-
<div id="error"></div>
9-
@if(gist.isEmpty){
10-
<h1 style="margin: 0px;">New snippet</h1>
11-
} else {
12-
@gist.map { x =>
13-
@helpers.avatar(gist.get.userName, 24)
14-
Editing
15-
<a class="strong" href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName">@gist.get.title</a>
16-
@if(gist.get.mode == Mode.Secret.code){
17-
<span class="label label-warning">Secret</span>
18-
}
19-
@if(gist.get.mode == Mode.Private.code){
20-
<span class="label label-warning">Private</span>
21-
}
22-
<div class="pull-right">
23-
@*
24-
@if(gist.get.mode == "SECRET"){
25-
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/public" class="btn btn-default">Make public</a>
26-
} else {
27-
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/secret" class="btn btn-default">Make secret</a>
7+
<div class="content-wrapper main-center">
8+
<div class="head">
9+
<div id="error"></div>
10+
@if(gist.isEmpty){
11+
<h1 style="margin: 0px;">New snippet</h1>
12+
} else {
13+
@gist.map { x =>
14+
@helpers.avatar(gist.get.userName, 24)
15+
Editing
16+
<a class="strong" href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName">@gist.get.title</a>
17+
@if(gist.get.mode == Mode.Secret.code){
18+
<span class="label label-warning">Secret</span>
2819
}
29-
*@
30-
<a href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName/delete" class="btn btn-danger" id="delete">Delete</a>
31-
</div>
32-
<div class="muted" style="margin-left: 30px; font-size: 80%;">
33-
Created at @gist.get.registeredDate
34-
</div>
35-
}
36-
}
37-
</div>
38-
<hr style="margin-bottom: 20px;"/>
39-
<div class="container body">
40-
<form id="form" method="POST" action="#">
41-
<input type="text" name="description" id="description" class="form-control" style="margin-bottom: 8px;" value="@gist.map(_.description)" placeholder="Snippet descriptions..."/>
42-
<div id="editors">
43-
@files.zipWithIndex.map { case ((fileName, content), i) =>
44-
@gitbucket.gist.html.editor(i, fileName, content)
45-
}
46-
</div>
47-
<div>
48-
<input type="button" value="Add file" class="btn btn-default" id="add_file">
49-
<div class="pull-right">
50-
@if(gist.isDefined){
51-
<a href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName" class="btn btn-default">Cancel</a>
20+
@if(gist.get.mode == Mode.Private.code){
21+
<span class="label label-warning">Private</span>
5222
}
53-
<div class="btn-group" data-toggle="buttons">
54-
<label class="btn btn-default btn-mini @if(gist.isEmpty || gist.get.mode == Mode.Public.code ){active}"><input type="radio" value="PUBLIC" name="mode">Public</label>
55-
<label class="btn btn-default btn-mini @if(gist.isDefined && gist.get.mode == Mode.Secret.code ){active}"><input type="radio" value="SECRET" name="mode">Secret</label>
56-
<label class="btn btn-default btn-mini @if(gist.isDefined && gist.get.mode == Mode.Private.code){active}"><input type="radio" value="PRIVATE" name="mode">Private</label>
23+
<div class="pull-right">
24+
@*
25+
@if(gist.get.mode == "SECRET"){
26+
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/public" class="btn btn-default">Make public</a>
27+
} else {
28+
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/secret" class="btn btn-default">Make secret</a>
29+
}
30+
*@
31+
<a href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName/delete" class="btn btn-danger" id="delete">Delete</a>
5732
</div>
58-
@if(gist.isDefined){
59-
<input type="submit" value="Update" class="btn btn-success submit_snippet" id="update_snippet">
60-
} else {
61-
<input type="submit" value="Create" class="btn btn-success submit_snippet" id="create_snippet">
33+
<div class="muted" style="margin-left: 30px; font-size: 80%;">
34+
Created at @gist.get.registeredDate
35+
</div>
36+
}
37+
}
38+
</div>
39+
<hr style="margin-bottom: 20px;"/>
40+
<div class="content body">
41+
<form id="form" method="POST" action="#">
42+
<input type="text" name="description" id="description" class="form-control" style="margin-bottom: 8px;" value="@gist.map(_.description)" placeholder="Snippet descriptions..."/>
43+
<div id="editors">
44+
@files.zipWithIndex.map { case ((fileName, content), i) =>
45+
@gitbucket.gist.html.editor(i, fileName, content)
6246
}
6347
</div>
64-
</div>
65-
@if(gist.isEmpty){
66-
<input type="hidden" id="private" name="private" value="false"/>
67-
}
68-
<input type="hidden" id="count" name="count" value="@files.size"/>
69-
</form>
48+
<div>
49+
<input type="button" value="Add file" class="btn btn-default" id="add_file">
50+
<div class="pull-right">
51+
@if(gist.isDefined){
52+
<a href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName" class="btn btn-default">Cancel</a>
53+
}
54+
<div class="btn-group" data-toggle="buttons">
55+
<label class="btn btn-default btn-mini @if(gist.isEmpty || gist.get.mode == Mode.Public.code ){active}"><input type="radio" value="PUBLIC" name="mode">Public</label>
56+
<label class="btn btn-default btn-mini @if(gist.isDefined && gist.get.mode == Mode.Secret.code ){active}"><input type="radio" value="SECRET" name="mode">Secret</label>
57+
<label class="btn btn-default btn-mini @if(gist.isDefined && gist.get.mode == Mode.Private.code){active}"><input type="radio" value="PRIVATE" name="mode">Private</label>
58+
</div>
59+
@if(gist.isDefined){
60+
<input type="submit" value="Update" class="btn btn-success submit_snippet" id="update_snippet">
61+
} else {
62+
<input type="submit" value="Create" class="btn btn-success submit_snippet" id="create_snippet">
63+
}
64+
</div>
65+
</div>
66+
@if(gist.isEmpty){
67+
<input type="hidden" id="private" name="private" value="false"/>
68+
}
69+
<input type="hidden" id="count" name="count" value="@files.size"/>
70+
</form>
71+
</div>
7072
</div>
7173

7274
<script src="@{gitbucket.core.view.helpers.assets}/vendors/ace/ace.js" type="text/javascript" charset="utf-8"></script>

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

+14-12
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66
@import gitbucket.core.view.helpers
77
@gitbucket.core.html.main("Snippets"){
88
@gitbucket.gist.html.style()
9-
@gitbucket.gist.html.header(gist, forkedCount, editable)
10-
<div class="container body">
11-
@gitbucket.gist.html.menu("forks", gist, repositoryUrl)
12-
<div style="margin-right: 260px;">
13-
@forkedGists.map { forkedGist =>
14-
<div class="block">
15-
@helpers.avatar(forkedGist.userName, 20)
16-
<a href="@context.path/gist/@forkedGist.userName/@forkedGist.repositoryName">@forkedGist.userName</a>
17-
<div class="pull-right">
18-
<a href="@context.path/gist/@forkedGist.userName/@forkedGist.repositoryName" class="btn btn-sm btn-default">View Fork</a>
9+
<div class="content-wrapper main-center">
10+
@gitbucket.gist.html.header(gist, forkedCount, editable)
11+
<div class="content body">
12+
@gitbucket.gist.html.menu("forks", gist, repositoryUrl)
13+
<div style="margin-right: 260px;">
14+
@forkedGists.map { forkedGist =>
15+
<div class="block">
16+
@helpers.avatar(forkedGist.userName, 20)
17+
<a href="@context.path/gist/@forkedGist.userName/@forkedGist.repositoryName">@forkedGist.userName</a>
18+
<div class="pull-right">
19+
<a href="@context.path/gist/@forkedGist.userName/@forkedGist.repositoryName" class="btn btn-sm btn-default">View Fork</a>
20+
</div>
1921
</div>
20-
</div>
21-
}
22+
}
23+
</div>
2224
</div>
2325
</div>
2426
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
editable: Boolean)(implicit context: gitbucket.core.controller.Context)
44
@import gitbucket.gist.model.Mode
55
@import gitbucket.core.view.helpers
6-
<div class="container head">
6+
<div class="head">
77
@helpers.avatar(gist.userName, 24)
88
<a href="@context.path/gist/@gist.userName">@gist.userName</a> /
99
<a href="@context.path/gist/@gist.userName/@gist.repositoryName" class="strong">@gist.title</a>

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

+62-60
Original file line numberDiff line numberDiff line change
@@ -6,71 +6,73 @@
66
@import gitbucket.core.view.helpers
77
@gitbucket.core.html.main(gistUser.map(user => s"${user.userName}'s Snippets").getOrElse("Snippets")){
88
@gitbucket.gist.html.style()
9-
<div class="container head">
10-
@if(gistUser.isEmpty){
11-
<div class="pull-right">
12-
<a href="@context.path/gist/_new" class="btn btn-success">New snippet</a>
13-
</div>
14-
<h1 style="margin-top: 0px;">Discover Snippets</h1>
15-
} else {
16-
@helpers.avatar(gistUser.get.userName, 24)
17-
<span class="strong">@gistUser.get.fullName</span>
18-
<div class="pull-right">
19-
<a href="@context.path/@gistUser.get.userName" class="btn btn-default">@gistUser.get.userName on GitBucket</a>
20-
</div>
21-
<div class="muted" style="margin-top: -10px; margin-left: 30px;">
22-
@gistUser.get.userName
9+
<div class="content-wrapper main-center">
10+
<div class="head">
11+
@if(gistUser.isEmpty){
12+
<div class="pull-right">
13+
<a href="@context.path/gist/_new" class="btn btn-success">New snippet</a>
14+
</div>
15+
<h1 style="margin-top: 0px;">Discover Snippets</h1>
16+
} else {
17+
@helpers.avatar(gistUser.get.userName, 24)
18+
<span class="strong">@gistUser.get.fullName</span>
19+
<div class="pull-right">
20+
<a href="@context.path/@gistUser.get.userName" class="btn btn-default">@gistUser.get.userName on GitBucket</a>
21+
</div>
22+
<div class="muted" style="margin-top: -10px; margin-left: 30px;">
23+
@gistUser.get.userName
24+
</div>
25+
}
2326
</div>
24-
}
25-
</div>
26-
<hr style="margin-bottom: 20px;"/>
27-
<div class="container body">
28-
@gists.map { case (gist, gistInfo) =>
29-
<div class="panel panel-default">
30-
<div class="panel-heading">
31-
@helpers.avatar(gist.userName, 20)
32-
<a class="strong" href="@context.path/gist/@gist.userName">@gist.userName</a> /
33-
<a class="strong" href="@context.path/gist/@gist.userName/@gist.repositoryName">@gist.title</a>
34-
<span class="muted small">Created at @gist.registeredDate</span>
35-
@if(gist.mode == Mode.Secret.code){
36-
<span class="label label-warning">Secret</span>
37-
}
38-
@if(gist.mode == Mode.Private.code){
39-
<span class="label label-warning">Private</span>
40-
}
41-
<div class="pull-right">
42-
<a href="@context.path/gist/@gist.userName/@gist.repositoryName" class="header-link">
43-
<i class="octicon octicon-gist"></i> <strong>@gistInfo.fileCount @helpers.plural(gistInfo.fileCount, "file")</strong>
44-
</a>
45-
&nbsp;&nbsp;
46-
<a href="@context.path/gist/@gist.userName/@gist.repositoryName/forks" class="header-link">
47-
<i class="octicon octicon-git-branch"></i> <strong>@gistInfo.forkedCount @helpers.plural(gistInfo.forkedCount, "fork")</strong>
48-
</a>
49-
&nbsp;&nbsp;
50-
<a href="@context.path/gist/@gist.userName/@gist.repositoryName" class="header-link">
51-
<i class="octicon octicon-comment"></i> <strong>@gistInfo.commentCount @helpers.plural(gistInfo.commentCount, "comment")</strong>
52-
</a>
53-
</div>
54-
</div>
55-
<div class="panel-body">
56-
<div style="margin-bottom: 10px;">
57-
@gist.description
58-
</div>
59-
<div>
60-
@if(helpers.isRenderable(gistInfo.fileName)){
61-
<div class="list-markup box-content markdown-body">
62-
@helpers.renderMarkup(List(gistInfo.fileName), gistInfo.source, "master", gist.toRepositoryInfo, false, false, false)
63-
</div>
64-
} else {
65-
<pre class="list-code box-content prettyprint linenums">@gistInfo.source</pre>
27+
<hr style="margin-bottom: 20px;"/>
28+
<div class="content body">
29+
@gists.map { case (gist, gistInfo) =>
30+
<div class="panel panel-default">
31+
<div class="panel-heading">
32+
@helpers.avatar(gist.userName, 20)
33+
<a class="strong" href="@context.path/gist/@gist.userName">@gist.userName</a> /
34+
<a class="strong" href="@context.path/gist/@gist.userName/@gist.repositoryName">@gist.title</a>
35+
<span class="muted small">Created at @gist.registeredDate</span>
36+
@if(gist.mode == Mode.Secret.code){
37+
<span class="label label-warning">Secret</span>
6638
}
39+
@if(gist.mode == Mode.Private.code){
40+
<span class="label label-warning">Private</span>
41+
}
42+
<div class="pull-right">
43+
<a href="@context.path/gist/@gist.userName/@gist.repositoryName" class="header-link">
44+
<i class="octicon octicon-gist"></i> <strong>@gistInfo.fileCount @helpers.plural(gistInfo.fileCount, "file")</strong>
45+
</a>
46+
&nbsp;&nbsp;
47+
<a href="@context.path/gist/@gist.userName/@gist.repositoryName/forks" class="header-link">
48+
<i class="octicon octicon-git-branch"></i> <strong>@gistInfo.forkedCount @helpers.plural(gistInfo.forkedCount, "fork")</strong>
49+
</a>
50+
&nbsp;&nbsp;
51+
<a href="@context.path/gist/@gist.userName/@gist.repositoryName" class="header-link">
52+
<i class="octicon octicon-comment"></i> <strong>@gistInfo.commentCount @helpers.plural(gistInfo.commentCount, "comment")</strong>
53+
</a>
54+
</div>
55+
</div>
56+
<div class="panel-body">
57+
<div style="margin-bottom: 10px;">
58+
@gist.description
59+
</div>
60+
<div>
61+
@if(helpers.isRenderable(gistInfo.fileName)){
62+
<div class="list-markup box-content markdown-body">
63+
@helpers.renderMarkup(List(gistInfo.fileName), gistInfo.source, "master", gist.toRepositoryInfo, false, false, false)
64+
</div>
65+
} else {
66+
<pre class="list-code box-content prettyprint linenums">@gistInfo.source</pre>
67+
}
68+
</div>
6769
</div>
6870
</div>
71+
}
72+
<div class="btn-group">
73+
<button class="btn btn-default" onclick="location.href='?page=@{page - 1}'"@if(page <= 1){ disabled="true"}>Newer</button>
74+
<button class="btn btn-default" onclick="location.href='?page=@{page + 1}'"@if(!hasNext){ disabled="true"}>Older</button>
6975
</div>
70-
}
71-
<div class="btn-group">
72-
<button class="btn btn-default" onclick="location.href='?page=@{page - 1}'"@if(page <= 1){ disabled="true"}>Newer</button>
73-
<button class="btn btn-default" onclick="location.href='?page=@{page + 1}'"@if(!hasNext){ disabled="true"}>Older</button>
7476
</div>
7577
</div>
7678
}

0 commit comments

Comments
 (0)