Skip to content

Commit d9204a2

Browse files
committed
Apply dropdown-menu to some tabs
1 parent cb04860 commit d9204a2

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

src/main/twirl/gitbucket/monitoring/information/java/memory.scala.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@gitbucket.core.html.main("Monitoring") {
44
@gitbucket.core.admin.html.menu("monitoring") {
55
@gitbucket.monitoring.html.navigation(context)
6-
@gitbucket.monitoring.information.java.html.tab(context)
76
<div class="row">
87
@gitbucket.monitoring.bootstrapPanel.html.colsm2("Free", mem.free + "MB")
98
@gitbucket.monitoring.bootstrapPanel.html.colsm2("Used", mem.used + "MB")

src/main/twirl/gitbucket/monitoring/information/java/systemproperties.scala.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@gitbucket.core.html.main("Monitoring") {
44
@gitbucket.core.admin.html.menu("monitoring") {
55
@gitbucket.monitoring.html.navigation(context)
6-
@gitbucket.monitoring.information.java.html.tab(context)
76
<table class="table table-bordered">
87
<tr>
98
<th>Property</th>

src/main/twirl/gitbucket/monitoring/information/java/tab.scala.html

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/main/twirl/gitbucket/monitoring/information/logs/gitbucketlog.scala.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
@gitbucket.core.html.main("Monitoring") {
55
@gitbucket.core.admin.html.menu("monitoring") {
66
@gitbucket.monitoring.html.navigation(context)
7-
@gitbucket.monitoring.information.logs.html.tab(context)
87
@gitbucket.monitoring.html.loading(context)
98
@log match {
109
case Left(message) => { <div class="error"> @message </div> }

src/main/twirl/gitbucket/monitoring/information/logs/logback.scala.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
@gitbucket.core.html.main("Monitoring") {
55
@gitbucket.core.admin.html.menu("monitoring") {
66
@gitbucket.monitoring.html.navigation(context)
7-
@gitbucket.monitoring.information.logs.html.tab(context)
87
@gitbucket.monitoring.html.loading(context)
98
@if(logbackSettings.enableLogging) {
109
<div class="panel panel-default">

src/main/twirl/gitbucket/monitoring/information/logs/tab.scala.html

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/main/twirl/gitbucket/monitoring/navigation.scala.html

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,26 @@
1212
<li @if(context.request.getRequestURI.endsWith("process")) {class="active"}>
1313
<a href="@context.path/admin/monitoring/process">Process</a>
1414
</li>
15-
<li @if(context.request.getRequestURI.endsWith("java/systemproperties") || context.request.getRequestURI.endsWith("java/memory")) {class="active"}>
16-
<a href="@context.path/admin/monitoring/java">Java</a>
15+
<li role="presentation" class="dropdown" @if(context.request.getRequestURI.endsWith("java/systemproperties") || context.request.getRequestURI.endsWith("java/memory")) {class="active"}>
16+
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
17+
Java<span class="caret"></span>
18+
</a>
19+
<ul class="dropdown-menu">
20+
<li>
21+
<a href="@context.path/admin/monitoring/java/systemproperties">System Properties</a>
22+
</li>
23+
<li>
24+
<a href="@context.path/admin/monitoring/java/memory">Memory</a>
25+
</li>
26+
</ul>
1727
</li>
18-
<li @if(context.request.getRequestURI.endsWith("logs/logback")|| context.request.getRequestURI.endsWith("logs/gitbucketlog")) {class="active"}>
19-
<a href="@context.path/admin/monitoring/logs">Logs</a>
28+
<li role="presentation" class="dropdown" @if(context.request.getRequestURI.endsWith("logs/logback")|| context.request.getRequestURI.endsWith("logs/gitbucketlog")) {class="active"}>
29+
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
30+
Logs<span class="caret"></span>
31+
</a>
32+
<ul class="dropdown-menu">
33+
<li><a href="@context.path/admin/monitoring/logs/logback">LogBack</a></li>
34+
<li><a href="@context.path/admin/monitoring/logs/gitbucketlog">GitBucket Log</a></li>
35+
</ul>
2036
</li>
2137
</ul>

0 commit comments

Comments
 (0)