Skip to content

Commit d299b60

Browse files
takezoetakezoe
committed
Fix layout entirely
1 parent f82695a commit d299b60

File tree

6 files changed

+217
-202
lines changed

6 files changed

+217
-202
lines changed

‎src/main/resources/gitbucket/gist/assets/style.css‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@ pre.list-code {
1818
background-color: transparent;
1919
border: 1px solid rgba(0, 0, 0, 0.15);
2020
padding-left: 25px;
21-
}
21+
}
22+
23+
@media (min-width: 767px) {
24+
div.gist-content {
25+
width: 980px;
26+
margin: auto;
27+
}
28+
}

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,36 @@
99
@gitbucket.core.html.main(if(gist.description.isEmpty) gist.repositoryName else gist.description){
1010
<link href="@context.path/plugin-assets/gist/style.css" rel="stylesheet">
1111
<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="overflow: hidden; padding-top: 10px;">
16-
<div style="margin-bottom: 10px;">
12+
<div class="gist-content">
13+
@gitbucket.gist.html.header(gist, forkedCount, editable)
14+
<div class="content body">
15+
@gitbucket.gist.html.menu("code", gist, repositoryUrl)
16+
<div style="overflow: hidden; padding-top: 10px;">
17+
<div style="margin-bottom: 10px;">
1718
@gist.description
18-
</div>
19-
@files.map { case (fileName, content) =>
19+
</div>
20+
@files.map { case (fileName, content) =>
2021
<div class="panel panel-default">
2122
<div class="panel-heading strong" style="padding: 6px; line-height: 30px;">
2223
@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>
24+
<div class="pull-right">
25+
<a href="@context.path/gist/@gist.userName/@gist.repositoryName/raw/@revision/@fileName" class="btn btn-sm btn-default">Raw</a>
26+
</div>
2627
</div>
2728
@if(helpers.isRenderable(fileName)){
2829
<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+
@helpers.renderMarkup(List(fileName), content, "master", gist.toRepositoryInfo, false, false, true)
3031
</div>
3132
} else {
3233
<div class="panel-body">
3334
<pre class="prettyprint linenums blob">@content</pre>
3435
</div>
3536
}
3637
</div>
37-
}
38-
@gitbucket.gist.html.commentlist(gist, comments, editable, gist.toRepositoryInfo)
39-
@gitbucket.gist.html.commentform(gist)
38+
}
39+
@gitbucket.gist.html.commentlist(gist, comments, editable, gist.toRepositoryInfo)
40+
@gitbucket.gist.html.commentform(gist)
41+
</div>
4042
</div>
4143
</div>
4244
</div>

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

Lines changed: 62 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -5,71 +5,73 @@
55
@gitbucket.core.html.main("Snippets"){
66
<link href="@context.path/plugin-assets/gist/style.css" rel="stylesheet">
77
<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>
19-
}
20-
@if(gist.get.mode == Mode.Private.code){
21-
<span class="label label-warning">Private</span>
22-
}
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>
8+
<div class="gist-content">
9+
<div class="head">
10+
<div id="error"></div>
11+
@if(gist.isEmpty){
12+
<h1 style="margin: 0px;">New snippet</h1>
13+
} else {
14+
@gist.map { x =>
15+
@helpers.avatar(gist.get.userName, 24)
16+
Editing
17+
<a class="strong" href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName">@gist.get.title</a>
18+
@if(gist.get.mode == Mode.Secret.code){
19+
<span class="label label-warning">Secret</span>
2920
}
30-
*@
31-
<a href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName/delete" class="btn btn-danger" id="delete">Delete</a>
32-
</div>
33-
<div class="muted" style="margin-left: 30px; font-size: 80%;">
34-
Created at @gist.get.registeredDate
35-
</div>
36-
}
37-
}
38-
</div>
39-
<div class="content 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>
21+
@if(gist.get.mode == Mode.Private.code){
22+
<span class="label label-warning">Private</span>
5223
}
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}">
55-
<input type="radio" value="PUBLIC" name="mode" @if(gist.isEmpty || gist.get.mode == Mode.Public.code ){checked}>Public
56-
</label>
57-
<label class="btn btn-default btn-mini @if(gist.isDefined && gist.get.mode == Mode.Secret.code ){active}">
58-
<input type="radio" value="SECRET" name="mode" @if(gist.isDefined && gist.get.mode == Mode.Secret.code ){checked}>Secret
59-
</label>
60-
<label class="btn btn-default btn-mini @if(gist.isDefined && gist.get.mode == Mode.Private.code){active}">
61-
<input type="radio" value="PRIVATE" name="mode" @if(gist.isDefined && gist.get.mode == Mode.Private.code){checked}>Private
62-
</label>
24+
<div class="pull-right">
25+
@*
26+
@if(gist.get.mode == "SECRET"){
27+
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/public" class="btn btn-default">Make public</a>
28+
} else {
29+
<a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/secret" class="btn btn-default">Make secret</a>
30+
}
31+
*@
32+
<a href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName/delete" class="btn btn-danger" id="delete">Delete</a>
33+
</div>
34+
<div class="muted" style="margin-left: 30px; font-size: 80%;">
35+
Created at @gist.get.registeredDate
6336
</div>
64-
@if(gist.isDefined){
65-
<input type="submit" value="Update" class="btn btn-success submit_snippet" id="update_snippet">
66-
} else {
67-
<input type="submit" value="Create" class="btn btn-success submit_snippet" id="create_snippet">
37+
}
38+
}
39+
</div>
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)
6846
}
6947
</div>
70-
</div>
71-
<input type="hidden" id="count" name="count" value="@files.size"/>
72-
</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}">
56+
<input type="radio" value="PUBLIC" name="mode" @if(gist.isEmpty || gist.get.mode == Mode.Public.code ){checked}>Public
57+
</label>
58+
<label class="btn btn-default btn-mini @if(gist.isDefined && gist.get.mode == Mode.Secret.code ){active}">
59+
<input type="radio" value="SECRET" name="mode" @if(gist.isDefined && gist.get.mode == Mode.Secret.code ){checked}>Secret
60+
</label>
61+
<label class="btn btn-default btn-mini @if(gist.isDefined && gist.get.mode == Mode.Private.code){active}">
62+
<input type="radio" value="PRIVATE" name="mode" @if(gist.isDefined && gist.get.mode == Mode.Private.code){checked}>Private
63+
</label>
64+
</div>
65+
@if(gist.isDefined){
66+
<input type="submit" value="Update" class="btn btn-success submit_snippet" id="update_snippet">
67+
} else {
68+
<input type="submit" value="Create" class="btn btn-success submit_snippet" id="create_snippet">
69+
}
70+
</div>
71+
</div>
72+
<input type="hidden" id="count" name="count" value="@files.size"/>
73+
</form>
74+
</div>
7375
</div>
7476
</div>
7577

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,21 @@
77
@gitbucket.core.html.main("Snippets"){
88
<link href="@context.path/plugin-assets/gist/style.css" rel="stylesheet">
99
<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="padding-top: 20px;">
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>
10+
<div class="gist-content">
11+
@gitbucket.gist.html.header(gist, forkedCount, editable)
12+
<div class="content body">
13+
@gitbucket.gist.html.menu("forks", gist, repositoryUrl)
14+
<div style="padding-top: 20px;">
15+
@forkedGists.map { forkedGist =>
16+
<div class="block">
17+
@helpers.avatar(forkedGist.userName, 20)
18+
<a href="@context.path/gist/@forkedGist.userName/@forkedGist.repositoryName">@forkedGist.userName</a>
19+
<div class="pull-right">
20+
<a href="@context.path/gist/@forkedGist.userName/@forkedGist.repositoryName" class="btn btn-sm btn-default">View Fork</a>
21+
</div>
2022
</div>
21-
</div>
22-
}
23+
}
24+
</div>
2325
</div>
2426
</div>
2527
</div>

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

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -7,70 +7,70 @@
77
@gitbucket.core.html.main(gistUser.map(user => s"${user.userName}'s Snippets").getOrElse("Snippets")){
88
<link href="@context.path/plugin-assets/gist/style.css" rel="stylesheet">
99
<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;">
10+
<div class="gist-content">
11+
<div class="head">
12+
@if(gistUser.isEmpty){
13+
<div class="pull-right">
14+
<a href="@context.path/gist/_new" class="btn btn-success">New snippet</a>
15+
</div>
16+
<h1 style="margin-top: 0px;">Discover Snippets</h1>
17+
} else {
18+
@helpers.avatar(gistUser.get.userName, 24)
19+
<span class="strong">@gistUser.get.fullName</span>
20+
<div class="pull-right">
21+
<a href="@context.path/@gistUser.get.userName" class="btn btn-default">@gistUser.get.userName on GitBucket</a>
22+
</div>
23+
<div class="muted" style="margin-top: -10px; margin-left: 30px;">
2324
@gistUser.get.userName
25+
</div>
26+
}
2427
</div>
25-
}
26-
</div>
27-
<div class="content 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>
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;">@gist.description</div>
58+
<div>
59+
@if(helpers.isRenderable(gistInfo.fileName)){
60+
<div class="list-markup box-content markdown-body">
61+
@helpers.renderMarkup(List(gistInfo.fileName), gistInfo.source, "master", gist.toRepositoryInfo, false, false, false)
62+
</div>
63+
} else {
64+
<pre class="list-code box-content prettyprint linenums">@gistInfo.source</pre>
65+
}
66+
</div>
6767
</div>
6868
</div>
69+
}
70+
<div class="btn-group">
71+
<button class="btn btn-default" onclick="location.href='?page=@{page - 1}'"@if(page <= 1){ disabled="true"}>Newer</button>
72+
<button class="btn btn-default" onclick="location.href='?page=@{page + 1}'"@if(!hasNext){ disabled="true"}>Older</button>
6973
</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>
7474
</div>
7575
</div>
7676
</div>

0 commit comments

Comments
 (0)