Skip to content
This repository has been archived by the owner on Dec 10, 2018. It is now read-only.

Commit

Permalink
iss #12: [wip] status table markup
Browse files Browse the repository at this point in the history
  • Loading branch information
maizy committed Apr 24, 2016
1 parent 70f9421 commit 35a1217
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 17 deletions.
1 change: 1 addition & 0 deletions server/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,4 @@ libraryDependencies ++= Seq(
"org.webjars.npm" % "react-dom" % reactVersion,
"org.webjars.npm" % "bootstrap" % bootstrapVersion
)
includeFilter in (Assets, LessKeys.less) := "*.page.less"
14 changes: 14 additions & 0 deletions server/src/main/assets/stylesheets/blocks/status-table.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@import "../common";

.status-table {

.extra {
font-size: @font-size * 0.5;

.value {
color: #333;
}

}

}
4 changes: 4 additions & 0 deletions server/src/main/assets/stylesheets/bootstrap-extra.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@bs-top-padding: 50px;
body {
padding-top: @bs-top-padding;
}
1 change: 1 addition & 0 deletions server/src/main/assets/stylesheets/common.less
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@font-size: 14px;
3 changes: 0 additions & 3 deletions server/src/main/assets/stylesheets/main.less

This file was deleted.

90 changes: 76 additions & 14 deletions server/src/main/public/index.html
Original file line number Diff line number Diff line change
@@ -1,27 +1,89 @@
<!DOCTYPE html>
<html lang="ru">
<html lang="en">
<head>
<title>cheesecake</title>
<title>cheesecake - status</title>
<meta charset="utf-8"/>
<link href="/assets/stylesheets/main.css" rel="stylesheet" type="text/css"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="/libs/bootstrap/3.3.6/dist/css/bootstrap.min.css" rel="stylesheet" media="screen" />

<link href="/assets/stylesheets/pages/status.page.css" rel="stylesheet" media="screen" />
</head>

<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="#">Cheesecake</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="/">Status</a></li>
</ul>
</div>
</div>
</nav>

<div class="container">

<div class="page-header">
<h1>Status</h1>
</div>


<h1>State</h1>
<div class="row">
<div id="results-container">
<table class="table table-bordered status-table">
<thead>
<tr>
<th class="service">Service</th>
<th class="endpoint">Endpoint</th>
<th class="status">Status</th>
<th class="extra">Extra</th>
</tr>
</thead>
<tbody>
<tr>
<td class="service" rowspan="3">frontik</td>
<td class="endpoint">front1:8080</td>
<td class="status">Ok</td>
<td class="extra"><ul><li>version: <span class="value">1.2.3</span></li></ul></td>
</tr>
<tr>
<td class="endpoint">front2:8080</td>
<td class="status">Unavailable</td>
<td class="extra"><ul><li>version: <span class="value">3.2.1</span></li></ul></td>
</tr>
<tr>
<td class="endpoint">front3-by:8888</td>
<td class="status">Ok</td>
<td class="extra">
<ul>
<li>version: <span class="value">0.0.0</span></li>
<li>var: <span class="value">some long value</span></li>
</ul>
</td>
</tr>
</tbody>
</table>

<div id="container"></div>
</div>
</div>

</div>

<script src="/libs/immutable/3.8.1/dist/immutable.min.js"></script>
<script src="/libs/react/15.0.1/dist/react.min.js"></script>
<script src="/libs/react-dom/15.0.1/dist/react-dom.min.js"></script>

<script src="/assets/js/http-utils.js"></script>
<script src="/assets/js/results.js"></script>
<script src="/libs/immutable/dist/immutable.min.js"></script>
<script>
cheesecake.results = new cheesecake.ResultsComponent({
container: document.getElementById("container"),
apiBase: ""
});
</script>

<!--<script src="/assets/js/results.js"></script>-->
<!--<script>-->
<!--cheesecake.results = new cheesecake.ResultsComponent({-->
<!--container: document.getElementById("container"),-->
<!--apiBase: ""-->
<!--});-->
<!--</script>-->

</body>
</html>

0 comments on commit 35a1217

Please sign in to comment.