Skip to content

Commit 4f71255

Browse files
takezoetakezoe
committed
Generalize header and menu template
1 parent 28f15c4 commit 4f71255

File tree

4 files changed

+56
-92
lines changed

4 files changed

+56
-92
lines changed

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

+2-46
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,10 @@
11
@(active: String, gist: model.Gist, files: Seq[(String, String)], editable: Boolean)(implicit context: app.Context)
22
@import context._
33
@import view.helpers._
4-
5-
@sidemenu(path: String, name: String, label: String, count: Int = 0) = {
6-
<li @if(active == name){class="active"}>
7-
<div class="@if(active == name){margin} else {gradient} pull-left"></div>
8-
<a href="@context.path/gist/@path">
9-
@if(active == name){
10-
<img src="@assets/common/images/menu-@{name}-active.png">
11-
} else {
12-
<img src="@assets/common/images/menu-@{name}-active.png" class="menu-icon-active" style="display:none;">
13-
<img src="@assets/common/images/menu-@{name}.png" class="menu-icon">
14-
}
15-
@label
16-
@if(count > 0){
17-
<div class="pull-right"><span class="label">@count</span></div>
18-
}
19-
</a>
20-
</li>
21-
}
22-
234
@html.main("Snippet"){
24-
<div class="container">
25-
<div class="head">
26-
@avatar(gist.userName, 24)
27-
<a href="@path/gist/@gist.userName">@gist.userName</a> /
28-
<a href="@path/gist/@gist.userName/@gist.repositoryName" class="strong">@gist.title</a>
29-
@if(gist.isPrivate){
30-
<span class="label label-warning">Secret</span>
31-
}
32-
@if(editable){
33-
<div class="pull-right">
34-
<a href="@path/gist/@gist.userName/@gist.repositoryName/edit" class="btn">Edit</a>
35-
<a href="@path/gist/@gist.userName/@gist.repositoryName/delete" class="btn" id="delete">Delete</a>
36-
</div>
37-
}
38-
</div>
39-
<div class="muted" style="margin-top: -10px; margin-left: 30px;">
40-
Created at @gist.registeredDate
41-
</div>
42-
</div>
43-
<hr style="margin-bottom: 20px;"/>
5+
@header(gist, editable)
446
<div class="container body">
45-
<div style="width: 170px;" class="pull-right">
46-
<ul class="sidemenu">
47-
<li style="height: 12px"><div class="gradient pull-left" style="height: 12px"></div></li>
48-
@sidemenu(s"${gist.userName}/${gist.repositoryName}", "code" , "Code")
49-
@sidemenu(s"${gist.userName}/${gist.repositoryName}/revisions", "revision", "Revision")
50-
</ul>
51-
</div>
7+
@menu(active, gist)
528
<div style="margin-right: 180px;">
539
<div style="margin-bottom: 10px;">
5410
@gist.description

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

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
@(gist: model.Gist, editable: Boolean)(implicit context: app.Context)
2+
@import context._
3+
@import view.helpers._
4+
<div class="container">
5+
<div class="head">
6+
@avatar(gist.userName, 24)
7+
<a href="@path/gist/@gist.userName">@gist.userName</a> /
8+
<a href="@path/gist/@gist.userName/@gist.repositoryName" class="strong">@gist.title</a>
9+
@if(gist.isPrivate){
10+
<span class="label label-warning">Secret</span>
11+
}
12+
@if(editable){
13+
<div class="pull-right">
14+
<a href="@path/gist/@gist.userName/@gist.repositoryName/edit" class="btn">Edit</a>
15+
<a href="@path/gist/@gist.userName/@gist.repositoryName/delete" class="btn" id="delete">Delete</a>
16+
</div>
17+
}
18+
</div>
19+
<div class="muted" style="margin-top: -10px; margin-left: 30px;">
20+
Created at @gist.registeredDate
21+
</div>
22+
</div>
23+
<hr style="margin-bottom: 20px;"/>

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

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
@(active: String, gist: model.Gist)(implicit context: app.Context)
2+
@import context._
3+
@import view.helpers._
4+
5+
@menuitem(path: String, name: String, label: String, count: Int = 0) = {
6+
<li @if(active == name){class="active"}>
7+
<div class="@if(active == name){margin} else {gradient} pull-left"></div>
8+
<a href="@context.path/gist/@path">
9+
@if(active == name){
10+
<img src="@assets/common/images/menu-@{name}-active.png">
11+
} else {
12+
<img src="@assets/common/images/menu-@{name}-active.png" class="menu-icon-active" style="display:none;">
13+
<img src="@assets/common/images/menu-@{name}.png" class="menu-icon">
14+
}
15+
@label
16+
@if(count > 0){
17+
<div class="pull-right"><span class="label">@count</span></div>
18+
}
19+
</a>
20+
</li>
21+
}
22+
23+
<div style="width: 170px;" class="pull-right">
24+
<ul class="sidemenu">
25+
<li style="height: 12px"><div class="gradient pull-left" style="height: 12px"></div></li>
26+
@menuitem(s"${gist.userName}/${gist.repositoryName}", "code" , "Code")
27+
@menuitem(s"${gist.userName}/${gist.repositoryName}/revisions", "revision", "Revision")
28+
</ul>
29+
</div>

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

+2-46
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,10 @@
33
@import context._
44
@import view.helpers._
55
@import org.eclipse.jgit.diff.DiffEntry.ChangeType
6-
7-
@sidemenu(path: String, name: String, label: String, count: Int = 0) = {
8-
<li @if(active == name){class="active"}>
9-
<div class="@if(active == name){margin} else {gradient} pull-left"></div>
10-
<a href="@context.path/gist/@path">
11-
@if(active == name){
12-
<img src="@assets/common/images/menu-@{name}-active.png">
13-
} else {
14-
<img src="@assets/common/images/menu-@{name}-active.png" class="menu-icon-active" style="display:none;">
15-
<img src="@assets/common/images/menu-@{name}.png" class="menu-icon">
16-
}
17-
@label
18-
@if(count > 0){
19-
<div class="pull-right"><span class="label">@count</span></div>
20-
}
21-
</a>
22-
</li>
23-
}
24-
256
@html.main("Snippet"){
26-
<div class="container">
27-
<div class="head">
28-
@avatar(gist.userName, 24)
29-
<a href="@path/gist/@gist.userName">@gist.userName</a> /
30-
<a href="@path/gist/@gist.userName/@gist.repositoryName" class="strong">@gist.title</a>
31-
@if(gist.isPrivate){
32-
<span class="label label-warning">Secret</span>
33-
}
34-
@if(editable){
35-
<div class="pull-right">
36-
<a href="@path/gist/@gist.userName/@gist.repositoryName/edit" class="btn">Edit</a>
37-
<a href="@path/gist/@gist.userName/@gist.repositoryName/delete" class="btn" id="delete">Delete</a>
38-
</div>
39-
}
40-
</div>
41-
<div class="muted" style="margin-top: -10px; margin-left: 30px;">
42-
Created at @gist.registeredDate
43-
</div>
44-
</div>
45-
<hr style="margin-bottom: 20px;"/>
7+
@header(gist, editable)
468
<div class="container body">
47-
<div style="width: 170px;" class="pull-right">
48-
<ul class="sidemenu">
49-
<li style="height: 12px"><div class="gradient pull-left" style="height: 12px"></div></li>
50-
@sidemenu(s"${gist.userName}/${gist.repositoryName}", "code" , "Code")
51-
@sidemenu(s"${gist.userName}/${gist.repositoryName}/revisions", "revision", "Revision")
52-
</ul>
53-
</div>
9+
@menu(active, gist)
5410
<div style="margin-right: 180px;">
5511
@revisions.map { case (revision, diffs) =>
5612
<div>

0 commit comments

Comments
 (0)