Skip to content
This repository was archived by the owner on Mar 5, 2020. It is now read-only.

Commit fd4f909

Browse files
TobyNartowskiTobyNartowski
committed
Projects interface changed
1 parent 0b2f244 commit fd4f909

File tree

3 files changed

+51
-49
lines changed

3 files changed

+51
-49
lines changed

‎src/main/resources/public/dashboard/container.html‎

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,9 @@ <h5 style="text-align:center; color: #ff2600"><b>{{errors}}</b></h5>
1919
</div>
2020
</div>
2121

22+
2223
<div class="row">
2324
<div class="col">
24-
<div class="card card-small mb-4">
25-
<div class="card-header border-bottom">
26-
<h6 class="m-0">Current processes</h6>
27-
<div class="card-body p-0 pb-3 text-center">
28-
<table class="table mb-0">
29-
<thead class="bg-light">
30-
<tr>
31-
<th scope="col" class="border-0">UID</th>
32-
<th scope="col" class="border-0">PID</th>
33-
<th scope="col" class="border-0">STIME</th>
34-
<th scope="col" class="border-0">TIME</th>
35-
<th scope="col" class="border-0">CMD</th>
36-
</tr>
37-
</thead>
38-
<tbody>
39-
<tr ng-repeat="x in tops | limitTo:30">
40-
<td>{{x[0]}}</td>
41-
<td>{{x[1]}}</td>
42-
<td>{{x[4]}}</td>
43-
<td>{{x[6]}}</td>
44-
<td style="text-align:left;">{{x[7]}}</td>
45-
</tr>
46-
</tbody>
47-
</table>
48-
</div>
49-
</div>
50-
</div>
51-
</div>
52-
53-
54-
<div class="col-lg-3 col-md-12">
5525
<!-- Post Overview -->
5626
<div class="card card-small mb-3">
5727
<div class="card-header border-bottom">
@@ -65,23 +35,27 @@ <h6 class="m-0">General view</h6>
6535
<span ng-if="shareStatus !== null" class="d-flex mb-2"><i
6636
class="material-icons mr-1">visibility</i><strong
6737
class="mr-1">Visibility:</strong> <strong class="text-success">Available</strong>
68-
<a class="ml-auto" href="http://127.0.0.1/share/{{shareStatus}}">Share link</a></span>
38+
<a class="ml-auto" href="http://127.0.0.1/share/{{shareStatus}}"><i class="fas fa-external-link-alt"></i> Open container</a></span>
6939
<span ng-if="shareStatus === null" class="d-flex mb-2"><i
7040
class="material-icons mr-1">visibility</i><strong
7141
class="mr-1">Visibility:</strong> <strong class="text-danger"><a href=""
7242
data-toggle="modal"
7343
data-target="#local">Local access</a> </strong></span>
74-
<span class="d-flex mb-2"><i class="material-icons mr-1">calendar_today</i><strong
44+
<span class="d-flex mb-4"><i class="material-icons mr-1">calendar_today</i><strong
7545
class="mr-1">Creation time:</strong> <mydate>{{creationTime * 1000 | date:'dd-MM-yyyy HH:mm:ss'}}</mydate> </span>
7646

77-
78-
<span class="d-flex mb-2">
79-
<button type="button" class="mb-2 btn btn-danger mr-2" data-toggle="modal"
80-
data-target="#remove">Remove container</button>
81-
<button type="button" class="mb-2 btn btn-success mr-2" data-toggle="modal"
82-
data-target="#exec">Execute commands</button>
83-
<button type="button" class=" ml-auto mb-2 btn btn-warning mr-2" ng-click="dockerRestart()">Restart container</button>
47+
<span class="d-flex mb-2 btn-block">
48+
<div class="col-4">
49+
<button type="button" class="btn mb-2 btn-block btn-danger mr-2" data-toggle="modal" data-target="#remove">Remove container</button>
50+
</div>
51+
<div class="col-4">
52+
<button type="button" class="btn mb-2 btn-block btn-success mr-2" data-toggle="modal" data-target="#exec">Execute commands</button>
53+
</div>
54+
<div class="col-4">
55+
<button type="button" class="btn mb-2 btn-block btn-warning mr-2" ng-click="dockerRestart()">Restart container</button>
56+
</div>
8457
</span>
58+
8559
</ul>
8660
</div>
8761
</div>
@@ -96,9 +70,40 @@ <h6 class="m-0">Advertising</h6>
9670
</div>
9771
</div>
9872
</div>
99-
<div class="row">
10073

74+
75+
<div class="row">
76+
<div class="col">
77+
<div class="card card-small mb-4">
78+
<div class="card-header border-bottom">
79+
<h6 class="m-0">Current processes</h6>
80+
<div class="card-body p-0 pb-3 text-center">
81+
<table class="table mb-0">
82+
<thead class="bg-light">
83+
<tr>
84+
<th scope="col" class="border-0">UID</th>
85+
<th scope="col" class="border-0">PID</th>
86+
<th scope="col" class="border-0">STIME</th>
87+
<th scope="col" class="border-0">TIME</th>
88+
<th scope="col" class="border-0">CMD</th>
89+
</tr>
90+
</thead>
91+
<tbody>
92+
<tr ng-repeat="x in tops | limitTo:30">
93+
<td>{{x[0]}}</td>
94+
<td>{{x[1]}}</td>
95+
<td>{{x[4]}}</td>
96+
<td>{{x[6]}}</td>
97+
<td style="text-align:left;">{{x[7]}}</td>
98+
</tr>
99+
</tbody>
100+
</table>
101+
</div>
102+
</div>
103+
</div>
104+
</div>
101105
</div>
106+
102107
<div class="row">
103108
<div class="col">
104109
<div class="card card-small mb-4">
@@ -112,9 +117,6 @@ <h6 class="m-0">Logs from the machine</h6>
112117

113118

114119
<div class="modal" tabindex="-1" role="dialog" id="local">
115-
<style>.modal-lg {
116-
max-width: 65% !important;
117-
}</style>
118120
<div class="modal-dialog modal-lg" role="document">
119121
<div class="modal-content">
120122
<div class="modal-header">
@@ -145,7 +147,7 @@ <h5 class="modal-title">Warning!</h5>
145147
</button>
146148
</div>
147149
<div class="modal-body">
148-
<div style="text-align: center"><h5>Are you sure about delete the container?</h5>
150+
<div style="text-align: center"><h5>Are you sure?</h5>
149151
<button type="button" class="mb-2 btn btn-danger mr-2" ng-click="dockerRemove()">Remove container
150152
</button>
151153
</div>

‎src/main/resources/public/dashboard/containercreate.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h3>Basic information</h3>
3434
<span class="d-flex mb-2"><strong
3535
class="mr-1">Ram memory:</strong> {{rammemory/1000000000}} GB</span>
3636
<span class="d-flex mb-2"><strong
37-
class="mr-1">Disc space:</strong> {{diskquota/1000000000}} GB</span>
37+
class="mr-1">Disk space:</strong> {{diskquota/1000000000}} GB</span>
3838

3939
</div>
4040
</div>

‎src/main/resources/public/dashboard/projects.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ <h5 style="text-align:center; color: #ff2600"><b>{{errors}}</b></h5>
2222
<div class="col">
2323
<div class="card card-small mb-4">
2424
<div class="card-header border-bottom">
25+
<div class="card-body p-0 pb-3 text-center">
26+
<h5 style="text-align:center;"><b>We're exploring your repository. Please stand by</b></h5>
27+
</div>
2528
<div style=" width: 0%;margin: 0 auto;">
2629
<div class="loading-overlay" style="text-align: center">
2730
<div class="spinner"></div>
2831
</div>
2932
</div>
30-
<div class="card-body p-0 pb-3 text-center">
31-
<h5 style="text-align:center;"><b>We're exploring your repository. Please stand by</b></h5>
32-
</div>
3333
</div>
3434
</div>
3535
</div>

0 commit comments

Comments
 (0)