Skip to content

Commit 632ab85

Browse files
fontenelefontenele
committed
Finish release candidate final
1 parent e0c2db0 commit 632ab85

File tree

5 files changed

+844
-293
lines changed

5 files changed

+844
-293
lines changed

‎app.html

+64-138
Original file line numberDiff line numberDiff line change
@@ -10,114 +10,7 @@
1010
<link rel="stylesheet" type="text/css" href="./node_modules/animate.css/animate.css" />
1111
<link rel="stylesheet" type="text/css" href="./node_modules/jquery.terminal/css/jquery.terminal.css" />
1212
<link rel="stylesheet" type="text/css" href="./css/jquery.dockmodal.css" />
13-
14-
<style>
15-
body {
16-
/*min-height: 600px;*/
17-
padding-top: 20px;
18-
}
19-
#debug {
20-
display: block;
21-
}
22-
#server-status li {
23-
height: 32px;
24-
padding: 7px 14px;
25-
}
26-
.loading {
27-
background-image: url("img/loading.gif");
28-
background-repeat: no-repeat;
29-
background-size: 32px;
30-
background-position: center;
31-
}
32-
33-
#modal-add-image .modal-dialog,
34-
#modal-add-image .modal-content {
35-
height: 80%;
36-
}
37-
38-
#modal-add-image .modal-body {
39-
/* 100% = dialog height, 120px = header + footer */
40-
height: 80%;
41-
max-height: calc(100% - 120px);
42-
overflow-y: auto;
43-
}
44-
45-
.list-ports .divisor, .list-volumes .divisor {
46-
font-size: 20px;
47-
padding-top: 6px !important;
48-
}
49-
50-
.list-ports .port > div, .list-volumes .volume > div, .list-links .link > div {
51-
padding: 1px;
52-
}
53-
54-
.terminal-input {
55-
left: -10000px;
56-
position: absolute;
57-
}
58-
59-
.dockmodal-body {
60-
padding: 0 !important;
61-
}
62-
63-
.terminal-container, .terminal {
64-
height: 100%;
65-
}
66-
67-
.terminal {
68-
overflow-x: hidden !important;
69-
}
70-
71-
.terminal-size-indicator {
72-
display: none !important;
73-
}
74-
75-
.table {
76-
table-layout:fixed;
77-
}
78-
79-
.truncate {
80-
width: 100px;
81-
white-space: nowrap;
82-
overflow: hidden;
83-
text-overflow: ellipsis;
84-
}
85-
86-
.label-right {
87-
float: right;
88-
padding: 6px 14px;
89-
margin-left: 3px;
90-
}
91-
92-
.table-without-margin-bottom {
93-
margin-bottom: 0;
94-
}
95-
96-
.modal-lg {
97-
width: 96%;
98-
}
99-
100-
/*#terminal-bar {*/
101-
/*position: fixed;*/
102-
/*background-color: gray;*/
103-
/*height: 30px;*/
104-
/*width: 100%;*/
105-
/*bottom: 0;*/
106-
/*opacity: 1.0;*/
107-
/*padding: 2px;*/
108-
/*}*/
109-
/*#terminal-bar .terminal-bar-item {*/
110-
/*display: inline-block;*/
111-
/*min-width: 160px;*/
112-
/*height: 26px;*/
113-
/*background-color: #ffffff;*/
114-
/*padding: 2px;*/
115-
/*}*/
116-
117-
.dockmodal {
118-
/*top: 60px !important;*/
119-
}
120-
</style>
13+
<link rel="stylesheet" type="text/css" href="./css/app.css" />
12114
<script type="text/javascript" src="./node_modules/wdt-loading/wdtLoading.js"></script>
12215
</head>
12316
<body>
@@ -203,13 +96,12 @@
20396
<table class="table table-bordered table-condensed table-hover table-striped table-responsive" id="containers-list">
20497
<thead>
20598
<tr>
206-
<th width="10%" class="text-center">ID</th>
207-
<th width="15%" class="text-center">Name</th>
208-
<th width="25%">Image</th>
209-
<th width="20%">Ports</th>
210-
<th width="15%">Command</th>
211-
<th width="10%">Status</th>
212-
<th style="width: 140px;" class="text-center">Actions</th>
99+
<th style="width: 120px;" class="text-center">ID</th>
100+
<th class="text-center">Name</th>
101+
<th style="width: 320px;">Image</th>
102+
<th >Ports</th>
103+
<th style="width: 110px;" class="text-center">Public IP</th>
104+
<th style="width: 130px;" class="text-center">Actions</th>
213105
</tr>
214106
</thead>
215107
<tbody></tbody>
@@ -229,9 +121,9 @@
229121
<button class="btn btn-xs pull-right" id="btn-images-refresh">
230122
<span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>
231123
</button>
232-
<!--button class="btn btn-xs pull-right" id="btn-view-add-image" data-toggle="modal" data-target="#modal-add-image" style="margin-right: 5px;">
124+
<button class="btn btn-xs pull-right" id="btn-view-add-image" data-toggle="modal" data-target="#modal-add-image" style="margin-right: 5px;">
233125
<span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span>
234-
</button-->
126+
</button>
235127
</div>
236128
<div class="panel-body">
237129
<div id="images-list"></div>
@@ -241,7 +133,7 @@
241133
</div>
242134

243135
<div class="modal fade" tabindex="-1" role="dialog" id="modal-add-image" aria-labelledby="modal-add-imageLabel">
244-
<div class="modal-dialog" role="document">
136+
<div class="modal-dialog modal-lg" role="document">
245137
<div class="modal-content">
246138
<div class="modal-header">
247139
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -273,7 +165,7 @@ <h4 class="modal-title">Add image</h4>
273165
</div>
274166

275167
<div class="modal fade" tabindex="-1" role="dialog" id="modal-rename-image" aria-labelledby="modal-rename-imageLabel">
276-
<div class="modal-dialog" role="document">
168+
<div class="modal-dialog modal-lg" role="document">
277169
<div class="modal-content">
278170
<div class="modal-header">
279171
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -295,7 +187,7 @@ <h4 class="modal-title">Rename image</h4>
295187
</div>
296188

297189
<div class="modal fade" tabindex="-1" role="dialog" id="modal-run-image" aria-labelledby="modal-run-imageLabel">
298-
<div class="modal-dialog" role="document">
190+
<div class="modal-dialog modal-lg" role="document">
299191
<div class="modal-content">
300192
<div class="modal-header">
301193
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -337,15 +229,41 @@ <h4 class="modal-title">Run image</h4>
337229

338230
<div class="text-center">
339231
<label class="checkbox-inline">
340-
<input type="checkbox" name="terminal" checked="checked" id="terminal" value="1"> Terminal
232+
<input type="checkbox" name="terminal" checked="checked" id="terminal" value="1" /> Terminal
341233
</label>
342234
<label class="checkbox-inline">
343-
<input type="checkbox" name="interactive" checked="checked" id="interactive" value="1"> Interactive
235+
<input type="checkbox" name="interactive" checked="checked" id="interactive" value="1" /> Interactive
236+
</label>
237+
<label class="checkbox-inline">
238+
<input type="checkbox" name="background" checked="checked" id="background" value="1" /> Background
344239
</label>
345240
</div>
346-
347241
<hr />
348242

243+
<ul class="nav nav-tabs" role="tablist">
244+
<li role="presentation" class="active"><a href="#run-image-ports" aria-controls="run-image-ports" role="tab" data-toggle="tab">Ports <button class="btn btn-xs btn-primary btn-add-port"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span></button></a></li>
245+
<li role="presentation"><a href="#run-image-volumes" aria-controls="run-image-volumes" role="tab" data-toggle="tab">Volumes <button class="btn btn-xs btn-primary btn-add-volume"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span></button></a></li>
246+
<li role="presentation"><a href="#run-image-links" aria-controls="run-image-links" role="tab" data-toggle="tab">Links <button class="btn btn-xs btn-primary btn-add-link"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span></button></a></li>
247+
<li role="presentation"><a href="#run-image-envs" aria-controls="run-image-envs" role="tab" data-toggle="tab">Envs <button class="btn btn-xs btn-primary btn-add-env"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span></button></a></li>
248+
</ul>
249+
250+
<div class="tab-content">
251+
<div role="tabpanel" class="tab-pane active" id="run-image-ports">
252+
<div class="list-ports" style="margin-top: 8px;"></div>
253+
</div>
254+
<div role="tabpanel" class="tab-pane" id="run-image-volumes">
255+
<div class="list-volumes" style="margin-top: 8px;"></div>
256+
</div>
257+
<div role="tabpanel" class="tab-pane" id="run-image-links">
258+
<div class="list-links" style="margin-top: 8px;"></div>
259+
</div>
260+
<div role="tabpanel" class="tab-pane" id="run-image-envs">
261+
<div class="list-envs" style="margin-top: 8px;"></div>
262+
</div>
263+
</div>
264+
265+
<!--hr />
266+
349267
<h4>Ports <button class="btn btn-xs btn-primary btn-add-port"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span></button></h4>
350268
<div class="list-ports"></div>
351269
@@ -357,7 +275,7 @@ <h4>Volumes <button class="btn btn-xs btn-primary btn-add-volume"><span class="g
357275
<hr class="clearfix" />
358276
359277
<h4>Links <button class="btn btn-xs btn-primary btn-add-link"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span></button></h4>
360-
<div class="list-links"></div>
278+
<div class="list-links"></div-->
361279

362280
</form>
363281
</div>
@@ -402,17 +320,22 @@ <h4 class="modal-title"><span class="container-name"></span> <span class="label
402320
</table>
403321
</div>
404322
<div class="panel panel-default panel-stats">
405-
<div class="panel-heading">Stats</div>
406-
<!--table class="tb-container-stats table table-bordered table-condensed table-hover table-striped table-without-margin-bottom" style="display: none;">
407-
<thead></thead>
408-
<tbody></tbody>
409-
</table-->
410-
<div class="panel-body">
411-
<!--<canvas id="chart" width="400" height="100"></canvas>-->
412-
<!--div id="container" style="min-width: 310px;height: 400px; margin: 0 auto;"></div-->
323+
<div class="panel-heading">Stats
324+
<div class="pull-right">
325+
<span class="label label-info"><span class="container-stats-cpu-realtime"></span></span>
326+
</div>
413327
</div>
328+
<div class="panel-body"></div>
414329
</div>
415-
<div class="panel panel-default">
330+
<div class="panel panel-default panel-network">
331+
<div class="panel-heading">Network
332+
<div class="pull-right">
333+
<span class="label label-default margin-right"><span class="container-stats-network-realtime"></span></span>
334+
</div>
335+
</div>
336+
<div class="panel-body"></div>
337+
</div>
338+
<div class="panel panel-default panel-top">
416339
<div class="panel-heading">Top</div>
417340
<table class="tb-container-top table table-bordered table-condensed table-hover table-striped table-without-margin-bottom">
418341
<thead></thead>
@@ -453,18 +376,21 @@ <h4 class="modal-title"><span class="container-name"></span> <span class="label
453376
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
454377
<h4 class="modal-title">Containers Stats</h4>
455378
</div>
456-
<div class="modal-body">
457-
<table class="table table-bordered table-condensed table-hover table-striped table-without-margin-bottom">
458-
<tbody></tbody>
459-
</table>
460-
</div>
379+
<div class="modal-body"></div>
461380
<div class="modal-footer">
462381
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
463382
</div>
464383
</div>
465384
</div>
466385
</div>
467386

387+
<footer class="footer">
388+
<div class="container">
389+
<p class="text-muted pull-left"><a rel="tooltip" title="Github Open Source Project" href="https://github.com/fontenele/docker-manager" target="_blank">GitHub Open Source</a></p>
390+
<p class="text-muted pull-right"><a rel="tooltip" title="Guilherme Fontenele" href="https://github.com/fontenele" target="_blank">Guilherme Fontenele</a></p>
391+
</div>
392+
</footer>
393+
468394
<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
469395
<script type="text/javascript" src="./node_modules/noty/js/noty/packaged/jquery.noty.packaged.js"></script>
470396
<script type="text/javascript" src="./node_modules/noty/js/noty/layouts/center.js"></script>

‎container-presets.ini

+15-12
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,35 @@ name=ssh
33
command=bash
44
terminal=true
55
interactive=true
6+
background=true
67
[ssh.ports]
78
port[]=23:22
89
[ssh.volumes]
910
volume[]=/:/mnt/storage
1011
[ssh.links]
1112
link[]=
1213

13-
[web]
14-
name=web
14+
[vd-web]
15+
name=vd-web
1516
command=bash
16-
terminal=true
17+
terminal=false
1718
interactive=true
18-
[web.ports]
19+
background=true
20+
[vd-web.ports]
1921
port[]=80:80
2022
port[]=443:443
21-
[web.volumes]
23+
[vd-web.volumes]
2224
volume[]=/home/fontenele/Documents/www:/var/www/html
23-
[web.links]
24-
link[]=db:db
25+
[vd-web.links]
26+
link[]=vd-db:db
2527

26-
[postgres]
27-
name=db
28+
[vd-postgres]
29+
name=vd-db
2830
command=bash
2931
terminal=true
3032
interactive=true
31-
[postgres.ports]
33+
background=true
34+
[vd-postgres.ports]
3235
port[]=5432:5432
33-
[postgres.volumes]
34-
volume[]=/home/fontenele/Documents/db/postgresdata:/data
36+
[vd-postgres.volumes]
37+
volume[]=/home/fontenele/Documents/db/vd3/postgresdata:/data

0 commit comments

Comments
 (0)