Skip to content

Commit a3e2e27

Browse files
dyuliudyuliu
authored
Merge pull request #130 from HDI-Project/update
Update
2 parents ac4f9b4 + a234099 commit a3e2e27

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+24887
-654
lines changed

‎client/assets.js‎

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,17 @@
1-
const NPM = './node_modules'; // package.json
21
const STATIC = './public/lib-static'; // manually installed
3-
const THEME = './public/themes/AdminLTE-2.4.2'; // theme template
4-
52

63
let assets = {
7-
css: [
8-
`${THEME}/bower_components/bootstrap/dist/css/bootstrap.min.css`,
9-
`${THEME}/bower_components/font-awesome/css/font-awesome.min.css`,
10-
`${THEME}/bower_components/Ionicons/css/ionicons.min.css`,
11-
`${THEME}/dist/css/AdminLTE.min.css`,
12-
`${THEME}/dist/css/skins/_all-skins.min.css`,
13-
`${THEME}/bower_components/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css`,
14-
`${THEME}/bower_components/bootstrap-daterangepicker/daterangepicker.css`,
4+
css: [
155
`${STATIC}/tooltipster/css/tooltipster.css`
166
],
177
js: [
188
`${STATIC}/jquery.min.js`,
19-
// `${NPM}/jquery/dist/jquery.min.js`,
20-
`${THEME}/bower_components/jquery-ui/jquery-ui.min.js`,
21-
`${STATIC}/jquery.rest.js`,
22-
// `${NPM}/jquery.rest/dist/jquery.rest.js`,
23-
`${STATIC}/jquery-ui-resolve-conflict.js`,
24-
`${THEME}/bower_components/bootstrap/dist/js/bootstrap.min.js`,
25-
`${THEME}/bower_components/raphael/raphael.min.js`,
26-
`${THEME}/bower_components/morris.js/morris.min.js`,
27-
`${THEME}/bower_components/jquery-sparkline/dist/jquery.sparkline.min.js`,
28-
`${THEME}/plugins/jvectormap/jquery-jvectormap-1.2.2.min.js`,
29-
`${THEME}/plugins/jvectormap/jquery-jvectormap-world-mill-en.js`,
30-
`${THEME}/bower_components/jquery-knob/dist/jquery.knob.min.js`,
31-
`${THEME}/bower_components/moment/min/moment.min.js`,
32-
`${THEME}/bower_components/bootstrap-daterangepicker/daterangepicker.js`,
33-
`${THEME}/bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js`,
34-
`${THEME}/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js`,
35-
`${THEME}/bower_components/jquery-slimscroll/jquery.slimscroll.min.js`,
36-
`${THEME}/bower_components/fastclick/lib/fastclick.js`,
37-
`${THEME}/dist/js/adminlte.js`,
38-
// `${THEME}/dist/js/adminlte.min.js`,
39-
`${STATIC}/math.js`,
40-
`${STATIC}/science.js`,
41-
`${NPM}/tinycolor/tinycolor.js`
42-
// `${THEME}/dist/js/pages/dashboard.js`,
43-
// `${THEME}/dist/js/demo.js`,
9+
`${STATIC}/jquery-ui.js`,
10+
`${STATIC}/jquery.rest.js`,
11+
`${STATIC}/bootstrap.min.js`,
4412
]
4513
}
4614

47-
4815
module.exports = {
4916
css: assets.css,
5017
js: assets.js,

‎client/index.html‎

Lines changed: 35 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
<html>
22

3-
<head> <!-- build:assets-css -->
4-
<link rel="stylesheet" href="./public/themes/AdminLTE-2.4.2/bower_components/bootstrap/dist/css/bootstrap.min.css">
5-
<link rel="stylesheet" href="./public/themes/AdminLTE-2.4.2/bower_components/font-awesome/css/font-awesome.min.css">
6-
<link rel="stylesheet" href="./public/themes/AdminLTE-2.4.2/bower_components/Ionicons/css/ionicons.min.css">
7-
<link rel="stylesheet" href="./public/themes/AdminLTE-2.4.2/dist/css/AdminLTE.min.css">
8-
<link rel="stylesheet" href="./public/themes/AdminLTE-2.4.2/dist/css/skins/_all-skins.min.css">
9-
<link rel="stylesheet" href="./public/themes/AdminLTE-2.4.2/bower_components/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css">
10-
<link rel="stylesheet" href="./public/themes/AdminLTE-2.4.2/bower_components/bootstrap-daterangepicker/daterangepicker.css">
11-
<link rel="stylesheet" href="./public/lib-static/tooltipster/css/tooltipster.css">
3+
<head>
4+
<!-- tooltipster will be removed/simplified soon-->
5+
<!-- build:assets-css -->
6+
<link rel="stylesheet" href="./public/lib-static/tooltipster/css/tooltipster.css">
127
<!-- endbuild -->
13-
<!-- build:app-css -->
14-
<link rel="stylesheet" href="./public/dist/main.css">
8+
9+
<!-- build:app-css -->
10+
<link rel="stylesheet" href="./public/dist/main.css">
1511
<!-- endbuild -->
1612

1713
<link rel="shortcut icon" type="image/png" href="./public/imgs/favicon.png" />
@@ -144,16 +140,12 @@
144140
</div>
145141
<div class="box-body">
146142
<div class="chart-ctx-container scroll-style">
147-
<div data-bind="foreach: ctxs">
148-
<div class="chart-ctx">
149-
<div class="title" data-bind="
150-
text: $data,
151-
attr: {name: 'title-' + $data},
152-
click: $parent.selectCtx.bind($parent, $data)">
153-
</div>
154-
<div class="plot" data-bind="attr: {name: $data}"></div>
143+
<div data-bind="foreach: ctxs" id="sortable" class="sortable">
144+
<div class="chart-ctx" data-bind="attr: {id: 'item_' + $index()}">
145+
<i class="icon-lines-vertical" data-bind="click: $parent.selectCtx.bind($parent, $data)"></i>
146+
<span class="title" data-bind="text: $data, attr: {name: 'title-' + $data, title: $data}, click: $parent.selectCtx.bind($parent, $data)"></span>
147+
<div class="plot" data-bind="attr: {name: $data}"></div>
155148
</div>
156-
<hr class="mt-n mb-n">
157149
</div>
158150
</div>
159151
</div>
@@ -179,14 +171,12 @@
179171
Add Events
180172
</label>
181173
</div>
182-
<!-- <div>
183-
<label for="zoomMode">
184-
<input type="checkbox" id="zoomMode" data-bind="click: zoomPanMode" />
185-
<span class="switch"></span>
186-
Zoom &amp; pane mode
187-
</label>
188-
</div> -->
174+
189175
</div>
176+
<div class="line select-line pull-right select-multiple last">
177+
<select name="filterByTag" id="filterByTag" class="select2-hidden select-level" ></select>
178+
</div>
179+
<div class="clear"></div>
190180
<!-- <a type="button" class="btn btn-default" data-bind="click: () => { showPrediction(); }"
191181
title="show model prediction result">assess mode</a>
192182
<a type="button" class="btn btn-default" data-bind="click: () => { addEventMode(); }"
@@ -237,8 +227,10 @@
237227
data-bind="click: modify, visibel: event()!=='new'">Modify</button>
238228
</div>
239229
<div class="line select-line">
240-
<div> <select name="level" id="selectLevel" class="select2-hidden select-level"></select> </div>
241-
<i class="indicator not_investigate"></i>
230+
<ul>
231+
<li><select name="level" id="selectLevel" class="select2-hidden select-level"></select> </li>
232+
<li><i class="indicator not_investigate"></i></li>
233+
</ul>
242234
</div>
243235
<div class="line">
244236
<div class="form-group">
@@ -297,10 +289,9 @@
297289
</div>
298290
<div class="item">
299291
<ul class="nav nav-tabs pull-right">
300-
<li><a href="#day" data-toggle="tab">Day</a></li>
301-
<li><a href="#month" data-toggle="tab">Month</a>
302-
</li>
303-
<li class="active"><a href="#year" data-toggle="tab">Year</a></li>
292+
<li><button data-target="#day" id="dayView" data-toggle="tab">Day</button></li>
293+
<li><button data-target="#month" id="monthView" data-toggle="tab">Month</button></li>
294+
<li class="active"><button data-target="#year" id="yearView" data-toggle="tab">Year</button></li>
304295
</ul>
305296
</div>
306297

@@ -330,8 +321,8 @@
330321
<button class="btn btn-default" data-bind="click: () => { backward(); }"title="Back">back</i></button> -->
331322
</div>
332323
<div id="year" class="tab-pane active"></div>
333-
<div id="month" class="tab-pane mt-50"> </div>
334-
<div id="day" class="tab-pane mt-50"> </div>
324+
<div id="month" class="tab-pane"> </div>
325+
<div id="day" class="tab-pane"> </div>
335326
</div>
336327
</div>
337328
</div>
@@ -358,7 +349,7 @@
358349
<!-- content: end -->
359350

360351
<!-- audio modal: begin -->
361-
<div class="modal fade" id="modal-audio">
352+
<div class="modal fade" id="modal-audio" style="display: none;">
362353
<div class="modal-dialog">
363354
<div class="modal-content">
364355
<div class="modal-body">
@@ -445,51 +436,15 @@
445436
</defs>
446437
</svg>
447438

448-
<!-- <svg x="0px" y="0px" width="500px" height="500px" viewbox="0 0 500 500">
449-
<defs>
450-
<filter id="blurMe" x="0%" y="0%" height="100%" width="100%" primitiveUnits="userSpaceOnUse">
451-
<feGaussianBlur x="50" y="50" width="400" height="400" stdDeviation="40" in="SourceGraphic" result="blurSquares"/>
452-
<feComponentTransfer in="blurSquares" result="opaqueBlur">
453-
<feFuncA type="linear" intercept="1"/>
454-
</feComponentTransfer>
455-
<feBlend mode="normal" in="opaqueBlur" in2="SourceGraphic"/>
456-
</filter>
457-
</defs>
458-
<g id="squares" filter="url(#blurMe)">
459-
<rect x="10" y="10" height="235" width="235" fill="red" />
460-
<rect x="255" y="10" height="235" width="235" fill="green" />
461-
<rect x="10" y="255" height="235" width="235" fill="blue" />
462-
<rect x="255" y="255" height="235" width="235" fill="yellow" />
463-
</g> -->
464-
<!-- <rect x="50" y="50" height="400" width="400" fill="rgb(255,255,255)" fill-opacity="0.8" />
465-
</svg> -->
466-
<!-- build:assets-js -->
467-
<script src="./public/lib-static/jquery.min.js"></script>
468-
<script src="./public/themes/AdminLTE-2.4.2/bower_components/jquery-ui/jquery-ui.min.js"></script>
469-
<script src="./public/lib-static/jquery.rest.js"></script>
470-
<script src="./public/lib-static/jquery-ui-resolve-conflict.js"></script>
471-
<script src="./public/themes/AdminLTE-2.4.2/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
472-
<script src="./public/themes/AdminLTE-2.4.2/bower_components/raphael/raphael.min.js"></script>
473-
<script src="./public/themes/AdminLTE-2.4.2/bower_components/morris.js/morris.min.js"></script>
474-
<script src="./public/themes/AdminLTE-2.4.2/bower_components/jquery-sparkline/dist/jquery.sparkline.min.js"></script>
475-
<script src="./public/themes/AdminLTE-2.4.2/plugins/jvectormap/jquery-jvectormap-1.2.2.min.js"></script>
476-
<script src="./public/themes/AdminLTE-2.4.2/plugins/jvectormap/jquery-jvectormap-world-mill-en.js"></script>
477-
<script src="./public/themes/AdminLTE-2.4.2/bower_components/jquery-knob/dist/jquery.knob.min.js"></script>
478-
<script src="./public/themes/AdminLTE-2.4.2/bower_components/moment/min/moment.min.js"></script>
479-
<script src="./public/themes/AdminLTE-2.4.2/bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
480-
<script src="./public/themes/AdminLTE-2.4.2/bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script>
481-
<script src="./public/themes/AdminLTE-2.4.2/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js"></script>
482-
<script src="./public/themes/AdminLTE-2.4.2/bower_components/jquery-slimscroll/jquery.slimscroll.min.js"></script>
483-
<script src="./public/themes/AdminLTE-2.4.2/bower_components/fastclick/lib/fastclick.js"></script>
484-
<script src="./public/themes/AdminLTE-2.4.2/dist/js/adminlte.js"></script>
485-
<script src="./public/lib-static/math.js"></script>
486-
<script src="./public/lib-static/science.js"></script>
487-
<script src="./node_modules/tinycolor/tinycolor.js"></script>
488-
<!-- endbuild -->
489-
<!-- build:app-js -->
490-
<script src="./public/dist/main.js"></script>
439+
<!-- build:assets-js -->
440+
<script src="./public/lib-static/jquery.min.js"></script>
441+
<script src="./public/lib-static/jquery-ui.js"></script>
442+
<script src="./public/lib-static/jquery.rest.js"></script>
443+
<script src="./public/lib-static/bootstrap.min.js"></script>
491444
<!-- endbuild -->
492445

446+
<!-- build:app-js -->
447+
<script src="./public/dist/main.js"></script>
448+
<!-- endbuild -->
493449
</body>
494-
495450
</html>

‎client/public/bootstrap/buttons.less‎

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
//
2+
// Buttons
3+
// --------------------------------------------------
4+
5+
6+
// Base styles
7+
// --------------------------------------------------
8+
9+
.btn {
10+
display: inline-block;
11+
margin-bottom: 0; // For input.btn
12+
font-weight: @btn-font-weight;
13+
text-align: center;
14+
vertical-align: middle;
15+
touch-action: manipulation;
16+
cursor: pointer;
17+
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
18+
border: 1px solid transparent;
19+
white-space: nowrap;
20+
.button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @btn-border-radius-base);
21+
.user-select(none);
22+
23+
&,
24+
&:active,
25+
&.active {
26+
&:focus,
27+
&.focus {
28+
.tab-focus();
29+
}
30+
}
31+
32+
&:hover,
33+
&:focus,
34+
&.focus {
35+
color: @btn-default-color;
36+
text-decoration: none;
37+
}
38+
39+
&:active,
40+
&.active {
41+
outline: 0;
42+
background-image: none;
43+
.box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
44+
}
45+
46+
&.disabled,
47+
&[disabled],
48+
fieldset[disabled] & {
49+
cursor: @cursor-disabled;
50+
.opacity(.65);
51+
.box-shadow(none);
52+
}
53+
54+
a& {
55+
&.disabled,
56+
fieldset[disabled] & {
57+
pointer-events: none; // Future-proof disabling of clicks on `<a>` elements
58+
}
59+
}
60+
}
61+
62+
63+
// Alternate buttons
64+
// --------------------------------------------------
65+
66+
.btn-default {
67+
.button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
68+
}
69+
.btn-primary {
70+
.button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
71+
}
72+
// Success appears as green
73+
.btn-success {
74+
.button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
75+
}
76+
// Info appears as blue-green
77+
.btn-info {
78+
.button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
79+
}
80+
// Warning appears as orange
81+
.btn-warning {
82+
.button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
83+
}
84+
// Danger and error appear as red
85+
.btn-danger {
86+
.button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
87+
}
88+
89+
90+
// Link buttons
91+
// -------------------------
92+
93+
// Make a button look and behave like a link
94+
.btn-link {
95+
color: @link-color;
96+
font-weight: normal;
97+
border-radius: 0;
98+
99+
&,
100+
&:active,
101+
&.active,
102+
&[disabled],
103+
fieldset[disabled] & {
104+
background-color: transparent;
105+
.box-shadow(none);
106+
}
107+
&,
108+
&:hover,
109+
&:focus,
110+
&:active {
111+
border-color: transparent;
112+
}
113+
&:hover,
114+
&:focus {
115+
color: @link-hover-color;
116+
text-decoration: @link-hover-decoration;
117+
background-color: transparent;
118+
}
119+
&[disabled],
120+
fieldset[disabled] & {
121+
&:hover,
122+
&:focus {
123+
color: @btn-link-disabled-color;
124+
text-decoration: none;
125+
}
126+
}
127+
}
128+
129+
130+
// Button Sizes
131+
// --------------------------------------------------
132+
133+
.btn-lg {
134+
// line-height: ensure even-numbered height of button next to large input
135+
.button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @btn-border-radius-large);
136+
}
137+
.btn-sm {
138+
// line-height: ensure proper height of button next to small input
139+
.button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small);
140+
}
141+
.btn-xs {
142+
.button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small);
143+
}
144+
145+
146+
// Block button
147+
// --------------------------------------------------
148+
149+
.btn-block {
150+
display: block;
151+
width: 100%;
152+
}
153+
154+
// Vertically space out multiple block buttons
155+
.btn-block + .btn-block {
156+
margin-top: 5px;
157+
}
158+
159+
// Specificity overrides
160+
input[type="submit"],
161+
input[type="reset"],
162+
input[type="button"] {
163+
&.btn-block {
164+
width: 100%;
165+
}
166+
}

0 commit comments

Comments
 (0)