Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New UI for Katib #208

Merged
merged 16 commits into from
Oct 29, 2018
Merged

New UI for Katib #208

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
58fe112
add ui
YujiOshima Oct 10, 2018
113a783
add ui
YujiOshima Oct 12, 2018
6f7f38a
update test and doc
YujiOshima Oct 15, 2018
8466ab2
fix test
YujiOshima Oct 15, 2018
201d84b
fix test
YujiOshima Oct 15, 2018
f56ae70
fix test
YujiOshima Oct 15, 2018
9e24cce
remove modelDB
YujiOshima Oct 17, 2018
929146d
fix test
YujiOshima Oct 17, 2018
6d28fb4
refactor
YujiOshima Oct 19, 2018
1c1f7ba
add loading img
YujiOshima Oct 19, 2018
9d7bfe8
fix test
YujiOshima Oct 19, 2018
1662032
Add loading image
YujiOshima Oct 19, 2018
e8df8cc
refactor
YujiOshima Oct 20, 2018
6ff8475
add root redirection
YujiOshima Oct 20, 2018
0f91653
add latestLog flag to GetWorkerFullInfo
YujiOshima Oct 22, 2018
90871fd
fix test
YujiOshima Oct 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor 
Signed-off-by: YujiOshima <yuji.oshima0x3fd@gmail.com>
  • Loading branch information
@YujiOshima
YujiOshima committed Oct 20, 2018
commit e8df8cc33a24c0ab64112d5131f56b4032f20708
5 changes: 3 additions & 2 deletions cmd/ui/static/css/bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4960,11 +4960,12 @@ input[type="button"].btn-block {
display: flex;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
padding: 0.75rem 1rem;
padding: 1rem 1rem;
margin-bottom: 1rem;
list-style: none;
background-color: #e9ecef;
border-radius: 0.25rem;
font-size: 20px;
}

.breadcrumb-item + .breadcrumb-item {
Expand All @@ -4975,7 +4976,7 @@ input[type="button"].btn-block {
display: inline-block;
padding-right: 0.5rem;
color: #7A8288;
content: "/";
content: ">";
}

.breadcrumb-item + .breadcrumb-item:hover::before {
Expand Down
141 changes: 141 additions & 0 deletions cmd/ui/static/img/klogo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 38 additions & 8 deletions cmd/ui/template/breadcrumb.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,46 @@
{{ define "breadcrumb" }}
<ol class="breadcrumb">
<li class="breadcrumb-item active"><a href="/katib"><i class="fa fa-home"></i></a></li>
{{ if ne .StudyId ""}}
{{ if eq .StudyId ""}}
<li class="breadcrumb-item active">
<a href="/katib">
Katib UI
</a>
</li>
{{ else }}
<li class="breadcrumb-item">
<a href="/katib">
Katib UI
</a>
</li>
{{ if eq .TrialId ""}}
<li class="breadcrumb-item active"><a href="/katib/{{.StudyId}}">Study</a></li>
{{ else }}
<li class="breadcrumb-item"><a href="/katib/{{.StudyId}}">Study</a></li>
<li class="breadcrumb-item active">
<a href="/katib/{{.StudyId}}">
Study : {{.StudyId}}
</a>
</li>
{{ else }}
<li class="breadcrumb-item">
<a href="/katib/{{.StudyId}}">
Study : {{.StudyId}}
</a>
</li>
{{ if eq .WorkerId ""}}
<li class="breadcrumb-item active"><a href="/katib/{{.StudyId}}/TrialID/{{.TrialId}}">Trial</a></li>
<li class="breadcrumb-item active">
<a href="/katib/{{.StudyId}}/TrialID/{{.TrialId}}">
Trial : {{.TrialId}}
</a>
</li>
{{ else }}
<li class="breadcrumb-item"><a href="/katib/{{.StudyId}}/TrialID/{{.TrialId}}">Trial</a></li>
<li class="breadcrumb-item active"><a href="/katib/{{.StudyId}}/WorkerID/{{.WorkerId}}">Worker</a></li>
<li class="breadcrumb-item">
<a href="/katib/{{.StudyId}}/TrialID/{{.TrialId}}">
Trial : {{.TrialId}}
</a>
</li>
<li class="breadcrumb-item active">
<a href="/katib/{{.StudyId}}/WorkerID/{{.WorkerId}}">
Worker : {{.WorkerId}}
</a>
</li>
{{ end }}
{{ end }}
{{ end }}
Expand Down
4 changes: 1 addition & 3 deletions cmd/ui/template/trial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@ <h2>Parameter Set</h2>
</tr>
</thead>
<tbody>
{{- with .Trial}}
{{- range .ParameterSet}}
{{- range .Trial.ParameterSet}}
<tr class="table-secondary">
<th>{{.Name}}</th>
<td>{{.Value}}</td>
</tr>
{{end}}
{{end}}
</tbody>
</table>
<h2>Worker List</h2>
Expand Down