Skip to content

Commit 5ff3efb

Browse files
takezoetakezoe
committed
(refs #48) Improve layout
1 parent 2bbc1f8 commit 5ff3efb

File tree

8 files changed

+93
-58
lines changed

8 files changed

+93
-58
lines changed

‎build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ organization := "io.github.gitbucket"
22
name := "gitbucket-gist-plugin"
33
version := "4.13.0"
44
scalaVersion := "2.12.4"
5-
gitbucketVersion := "4.23.0"
5+
gitbucketVersion := "4.23.1"
66

77
scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps")
88
javacOptions in compile ++= Seq("-target", "8", "-source", "8")

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
div.head {
2-
padding: 15px;
2+
padding-top: 15px;
3+
padding-left: 15px;
4+
padding-right: 15px;
35
}
46

57
div.list-markup {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@gitbucket.gist.html.header(gist, forkedCount, editable)
1313
<div class="content body">
1414
@gitbucket.gist.html.menu("code", gist, repositoryUrl)
15-
<div style="margin-right: 260px; overflow: hidden;">
15+
<div style="overflow: hidden; padding-top: 10px;">
1616
<div style="margin-bottom: 10px;">
1717
@gist.description
1818
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@gitbucket.gist.html.header(gist, forkedCount, editable)
1111
<div class="content body">
1212
@gitbucket.gist.html.menu("forks", gist, repositoryUrl)
13-
<div style="margin-right: 260px;">
13+
<div style="padding-top: 20px;">
1414
@forkedGists.map { forkedGist =>
1515
<div class="block">
1616
@helpers.avatar(forkedGist.userName, 20)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
}
3838
</div>
3939
</div>
40-
<hr style="margin-bottom: 20px;"/>
4140
<script>
4241
$(function(){
4342
@if(context.loginAccount.isDefined){

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ <h1 style="margin-top: 0px;">Discover Snippets</h1>
2424
</div>
2525
}
2626
</div>
27-
<hr style="margin-bottom: 20px;"/>
2827
<div class="content body">
2928
@gists.map { case (gist, gistInfo) =>
3029
<div class="panel panel-default">

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

Lines changed: 86 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,66 @@
1111
</a>
1212
</li>
1313
}
14-
15-
<div style="width: 250px;" class="pull-right">
16-
<ul class="nav nav-pills nav-stacked">
17-
<li style="height: 12px"><div class="gradient pull-left" style="height: 12px"></div></li>
18-
@menuitem(
19-
"code",
20-
s"${gist.userName}/${gist.repositoryName}",
21-
"Code")
14+
<div class="pull-right pc">
15+
<a href="@context.path/gist/@{gist.userName}/@{gist.repositoryName}/download/@{gist.repositoryName}.zip" class="btn btn-default btn-sm"><i class="octicon octicon-cloud-download"></i>Download ZIP</a>
16+
</div>
17+
<div class="pull-right pc" style="margin-right: 5px;">
18+
<div class="input-group" style="margin-bottom: 0px; width: 240px;">
19+
<div class="btn-group input-group-btn">
20+
<button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
21+
<span id="repository-url-proto">HTTP</span> <span class="caret"></span>
22+
</button>
23+
<ul class="dropdown-menu">
24+
<li>
25+
<a href="javascript:void(0);" id="repository-url-embed">
26+
<strong>Embed</strong><br>
27+
Embed this snippet in your website.
28+
</a>
29+
</li>
30+
<li>
31+
<a href="javascript:void(0);" id="repository-url-http">
32+
<strong>HTTP</strong><br>
33+
Clone with Git using the repository's web address.
34+
</a>
35+
</li>
36+
@if(context.settings.ssh && context.loginAccount.isDefined){
37+
<li>
38+
<a href="javascript:void(0);" id="repository-url-ssh">
39+
<strong>SSH</strong><br>
40+
Clone with an SSH key and passphrase from your GitBucket Settings.
41+
</a>
42+
</li>
43+
}
44+
</ul>
45+
</div>
46+
@gitbucket.core.helper.html.copy("repository-url", "repository-url-copy", repositoryUrl.httpUrl){
47+
<input type="text" value="@repositoryUrl.httpUrl" id="repository-url" class="form-control input-sm" readonly>
48+
}
49+
</div>
50+
</div>
51+
<ul class="nav nav-tabs fill-width">
52+
@menuitem(
53+
"code",
54+
s"${gist.userName}/${gist.repositoryName}",
55+
"Code")
56+
@menuitem(
57+
"revision",
58+
s"${gist.userName}/${gist.repositoryName}/revisions",
59+
"Revision")
60+
@if(gist.originUserName.isEmpty){
2261
@menuitem(
23-
"revision",
24-
s"${gist.userName}/${gist.repositoryName}/revisions",
25-
"Revision")
26-
@if(gist.originUserName.isEmpty){
27-
@menuitem(
28-
"forks",
29-
s"${gist.userName}/${gist.repositoryName}/forks",
30-
"Forks")
31-
}
32-
</ul>
33-
<div class="pull-right pc">
62+
"forks",
63+
s"${gist.userName}/${gist.repositoryName}/forks",
64+
"Forks")
65+
}
66+
@*
67+
<div class="pull-right">
3468
<div class="input-group" style="margin-bottom: 0px;">
3569
<div class="btn-group input-group-btn">
36-
<button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
70+
<button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
3771
<span id="repository-url-proto">HTTP</span> <span class="caret"></span>
38-
</button>
39-
<ul class="dropdown-menu">
72+
</button>
73+
<ul class="dropdown-menu">
4074
<li>
4175
<a href="javascript:void(0);" id="repository-url-embed">
4276
<strong>Embed</strong><br>
@@ -57,36 +91,37 @@
5791
</a>
5892
</li>
5993
}
60-
</ul>
94+
</ul>
95+
</div>
96+
@gitbucket.core.helper.html.copy("repository-url", "repository-url-copy", repositoryUrl.httpUrl){
97+
<input type="text" value="@repositoryUrl.httpUrl" id="repository-url" class="form-control input-sm" readonly>
98+
}
99+
</div>
100+
<div style="margin-top: 10px;">
101+
<a href="@context.path/gist/@{gist.userName}/@{gist.repositoryName}/download/@{gist.repositoryName}.zip"
102+
class="btn btn-default btn-block"><i class="octicon octicon-cloud-download"></i>Download ZIP</a>
61103
</div>
62-
@gitbucket.core.helper.html.copy("repository-url", "repository-url-copy", repositoryUrl.httpUrl){
63-
<input type="text" value="@repositoryUrl.httpUrl" id="repository-url" class="form-control input-sm" readonly>
64-
}
65-
</div>
66-
<div style="margin-top: 10px;">
67-
<a href="@context.path/gist/@{gist.userName}/@{gist.repositoryName}/download/@{gist.repositoryName}.zip"
68-
class="btn btn-default btn-block"><i class="octicon octicon-cloud-download"></i>Download ZIP</a>
69104
</div>
70-
</div>
71-
</div>
72-
<script>
73-
$(function(){
74-
$('#repository-url-embed').click(function(){
75-
$('#repository-url-proto').text('Embed');
76-
$('#repository-url').val('<script src="@repositoryUrl.embedUrl\"><\/script>');
77-
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
78-
});
79-
$('#repository-url-http').click(function(){
80-
$('#repository-url-proto').text('HTTP');
81-
$('#repository-url').val('@repositoryUrl.httpUrl');
82-
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
83-
});
105+
*@
106+
</ul>
107+
<script>
108+
$(function(){
109+
$('#repository-url-embed').click(function(){
110+
$('#repository-url-proto').text('Embed');
111+
$('#repository-url').val('<script src="@repositoryUrl.embedUrl\"><\/script>');
112+
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
113+
});
114+
$('#repository-url-http').click(function(){
115+
$('#repository-url-proto').text('HTTP');
116+
$('#repository-url').val('@repositoryUrl.httpUrl');
117+
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
118+
});
84119
@if(context.settings.ssh && context.loginAccount.isDefined){
85-
$('#repository-url-ssh').click(function(){
86-
$('#repository-url-proto').text('SSH');
87-
$('#repository-url').val('@repositoryUrl.sshUrl(context.loginAccount.get.userName)');
88-
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
89-
});
90-
}
120+
$('#repository-url-ssh').click(function(){
121+
$('#repository-url-proto').text('SSH');
122+
$('#repository-url').val('@repositoryUrl.sshUrl(context.loginAccount.get.userName)');
123+
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
91124
});
92-
</script>
125+
}
126+
});
127+
</script>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@gitbucket.gist.html.header(gist, forkedCount, editable)
1212
<div class="content body">
1313
@gitbucket.gist.html.menu("revision", gist, repositoryUrl)
14-
<div style="margin-right: 260px;">
14+
<div style="padding-top: 20px;">
1515
@revisions.map { case (revision, diffs) =>
1616
<div>
1717
<div style="margin-bottom: 8px;">

0 commit comments

Comments
 (0)