','','
",''+(b?b:"")+"
","','','
","","'+(b?b:"")+"
","- ',this.createListItem(this.classes.before,b),this.createListItem(this.classes.active,this.digit),"
- ',"
- ",''+this.meridiumText+""," ","
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+ + 647 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+ + 28 +
+
+
+
+ 
+
+
+
+
+ + 55% +
+
+
+
+
+ 
+
+
+
+
+ + 2404 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mdot/mDotServer.censis/mDotServer.censis/gulpfile.js b/mdot/mDotServer.censis/mDotServer.censis/gulpfile.js
index a3a693f..6935238 100644
--- a/mdot/mDotServer.censis/mDotServer.censis/gulpfile.js
+++ b/mdot/mDotServer.censis/mDotServer.censis/gulpfile.js
@@ -23,9 +23,8 @@ var filePath = {
var fontOptions = { };
-
gulp.task('appJS', function() {
- return gulp.src(['app/js/mdot.js'])
+ return gulp.src(['app/js/websocket.js','app/js/socketmanager.js','app/js/mdot.js'])
.pipe(stripDebug())
.pipe(jshint('.jshintrc'))
.pipe(jshint.reporter('default'))
@@ -54,6 +53,7 @@ gulp.task('appJS', function() {
.pipe(gulp.dest('dist/js'));
});
+
gulp.task('vendor', function() {
return gulp.src(['src/bower_modules/mui/packages/cdn/js/mui.min.js',
'src/bower_modules/jquery/dist/jquery.min.js',
@@ -64,17 +64,24 @@ gulp.task('vendor', function() {
'src/bower_modules/notification-js/build/notification.min.js',
'src/bower_modules/amstock3/amcharts/amcharts.js',
'src/bower_modules/amstock3/amcharts/serial.js',
- 'src/bower_modules/amstock3/amcharts/amstock.js'
+ 'src/bower_modules/amstock3/amcharts/amstock.js',
+ 'app/lib/themes/dark.js',
+ 'app/lib/dateTime.js',
+ 'app/lib/flipclock.min.js',
+ 'app/lib/jquery.flatWeatherPlugin.min.js'
])
.pipe(concat('vendor.js'))
.pipe(uglify({mangle: false}))
.pipe(gulp.dest('dist/js'));
});
-
-
gulp.task('styles', function() {
- return gulp.src(['src/bower_modules/mui/packages/cdn/css/mui.min.css','app/css/test.css','app/css/style.css','src/bower_modules/notification-js/build/notification.min.css'])
+ return gulp.src(['src/bower_modules/mui/packages/cdn/css/mui.min.css',
+ 'app/css/test.css',
+ 'app/css/style.css',
+ 'src/bower_modules/notification-js/build/notification.min.css',
+ 'app/css/flipclock.css',
+ 'css/flatWeatherPlugin.css'])
.pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1', 'ios 6', 'android 4'))
.pipe(cssnano())
.pipe(concat('app.css'))
@@ -101,6 +108,7 @@ gulp.task('index', function() {
gulp.task('partials', function() {
gulp.src(['app/fav/**/*']).pipe(gulp.dest('dist/fav'));
+ gulp.src(['app/fonts/**/*']).pipe(gulp.dest('dist/fonts'));
gulp.src(['app/lib/images/**/*']).pipe(gulp.dest('dist/amcharts/images'));
// Gulp.src(['app/libs/ejs_production.js']).pipe(gulp.dest('dist/libs'));
// gulp.src(['app/libs/microevent.js']).pipe(gulp.dest('dist/libs'));
diff --git a/mdot/mDotServer.censis/mDotServer.censis/views/test.ejs b/mdot/mDotServer.censis/mDotServer.censis/views/test.ejs
index 3dfc86b..8dae437 100644
--- a/mdot/mDotServer.censis/mDotServer.censis/views/test.ejs
+++ b/mdot/mDotServer.censis/mDotServer.censis/views/test.ejs
@@ -6,46 +6,145 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
-->
+
-
+
+
@@ -240,11 +333,45 @@
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-