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.

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

Patch 1 #14

Open
wants to merge 113 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
f62a590
test
Apr 24, 2017
e89097e
Initial commit
May 2, 2017
e3f009a
test with proxy
May 8, 2017
fd6a336
uncomment navigation
May 9, 2017
dc612b3
fixed navigation bugs
May 10, 2017
2a0164e
nav changes
May 15, 2017
17d6e48
Update index.html
vijnasu May 17, 2017
c97e2a6
Update index.html
vijnasu May 17, 2017
ab3ca31
Update videoperformance-mediasdk links
vijnasu May 18, 2017
b78d208
MeshCentral content creation
vijnasu May 18, 2017
d2ebe7d
Update Meshcentral index.html
vijnasu May 18, 2017
4d1ce76
Video Analytics Section added
ragural May 24, 2017
dfcdf41
Mesh Commander & Mesh Central
vijnasu May 19, 2017
14033eb
Intel AMT content creation
vijnasu May 19, 2017
d0f2255
MediaSDK Decoder Sample
vijnasu May 23, 2017
b04e251
Lab infrastructure
vijnasu May 25, 2017
966a07e
MSDK new sample and delete unnessary images
ragural May 28, 2017
01343fc
media sdk index.html
vijnasu May 29, 2017
b68ade7
Merge remote-tracking branch 'origin/retail-workshop' into retail-wor…
vijnasu May 29, 2017
7500e1e
media sample checked in
ragural May 29, 2017
08ccc18
Media SDK Decoder Sample
vijnasu May 29, 2017
08b38d2
Media SDK Decoder
vijnasu May 30, 2017
1a8878e
MARS Understand
vijnasu May 30, 2017
9c5155f
video cloud integration complete
ragural May 30, 2017
5c11a8c
Remote-config AMT
vijnasu May 30, 2017
dce14b5
Media SDK & MARS contents update
vijnasu May 31, 2017
470d428
Media SDK content updated
vijnasu May 31, 2017
e3e5230
Completed Configure AMT content
vijnasu May 31, 2017
93d72e1
Minor UI changes
vijnasu May 31, 2017
91e89f1
Mesh Commander recreation
vijnasu May 31, 2017
10e539b
Mesh central installation content removal
vijnasu May 31, 2017
7c47280
Mesh Central content update
ragural May 31, 2017
8c6f5c2
Mesh Central updates
ragural May 31, 2017
f87cda6
update schedule
May 31, 2017
5fc356c
Media sdk content update
ragural May 31, 2017
417394c
Media SDK Minor UI changes
ragural May 31, 2017
14b9baf
mesh central ui changes and media sdk sample changes
vijnasu Jun 1, 2017
b4e41c6
Media sdk sample completed
vijnasu Jun 1, 2017
4b2bdfa
Lab exercise and some file headers updation
vijnasu Jun 1, 2017
d8e5558
AMT image files updated
vijnasu Jun 1, 2017
80e3355
Media SDK input file path update
vijnasu Jun 1, 2017
448dcef
media sdk sample downloads file removal
vijnasu Jun 1, 2017
d5c62a7
review comments integrated
ragural Jun 1, 2017
3177202
File open dialogue snapshot update
ragural Jun 5, 2017
34e4c3d
Quit code changed from "q" to Esc
ragural Jun 5, 2017
83efdee
mars and media sdk updates
ragural Jun 5, 2017
e3dcc38
final changes complete
ragural Jun 5, 2017
c86bb7e
fixed minor bugs
ragural Jun 5, 2017
29a2e24
IDER & System defence panel content
ragural Jun 6, 2017
a260847
IDER updates
ragural Jun 6, 2017
02dba85
Updated Presentation content
ragural Jun 6, 2017
128b271
presentation updated
ragural Jun 6, 2017
2f00338
video performance presentatino updated
ragural Jun 6, 2017
1bb5d65
Updates slides
ragural Jun 6, 2017
a577929
Updated presentations
ragural Jun 14, 2017
bd988de
CPU Performance analysis instructions updated
vijnasu Jun 14, 2017
791602e
Ignoring errors
vijnasu Jun 14, 2017
5734d7c
UI changes
vijnasu Jun 14, 2017
ae919c1
Fixed hard-coded IP address
agnathan Jul 11, 2017
f87e24f
Fixed display issues with the Video Analytics presentation
agnathan Jul 11, 2017
00820f4
Modifying Meshcentral IP address
agnathan Jul 11, 2017
787f2f6
Facial Detection lab was crashing and was not taken from previous lab…
agnathan Jul 11, 2017
730e19e
Remove link to four OpenCV lab. crashes
agnathan Jul 11, 2017
615aa83
Ignore .bowerrc file
agnathan Jul 13, 2017
07c19e5
fixes for the video analytics url
agnathan Jul 13, 2017
4da52c5
Fixed HTML structure on Intel AMT USB lab
agnathan Jul 14, 2017
54916ed
Remove collapse statements
agnathan Jul 14, 2017
19106be
Adding more details and clarifying language in the Intel AMT USB lab
agnathan Jul 14, 2017
9d67f33
minor edit
agnathan Jul 14, 2017
3b1911e
minor edits
agnathan Jul 14, 2017
b69ca34
Fixing HTML structure on the Mesh Commander lab
agnathan Jul 14, 2017
be1970c
adding image of launching mesh commander
agnathan Jul 14, 2017
81f9e4d
Starting to edit the AMT lab 2
agnathan Jul 17, 2017
13f68f6
Update index.html
vijnasu Jul 18, 2017
a83ba31
Delete pseudocode.png
vijnasu Jul 18, 2017
4220ade
Create images
vijnasu Jul 18, 2017
40d9102
Delete images
vijnasu Jul 18, 2017
3d3e893
Create images folder
vijnasu Jul 18, 2017
81d6cea
Upload psuedocode.png
vijnasu Jul 18, 2017
ca96b6a
Delete temp
vijnasu Jul 18, 2017
39109fb
Update index.html
vijnasu Jul 18, 2017
6e5c834
Update index.html
vijnasu Jul 18, 2017
7225d30
Delete the npm-debug.log
agnathan Jul 18, 2017
cd6b26d
Beautify the HTML in the Video Perforance Media SDK lab
agnathan Jul 18, 2017
06fb348
Added more explanation to part 1 of the video performance lab
agnathan Jul 18, 2017
f6d600d
Update index.html
vijnasu Jul 19, 2017
bc44270
Add files via upload
vijnasu Jul 19, 2017
29f1755
Adding more description to the Mesh Central Lab.
agnathan Jul 19, 2017
9fa6beb
Added a sentence to the BIOS remote viewing section of the Mesh Comma…
agnathan Jul 20, 2017
774f6ae
Images should be right aligned
agnathan Jul 20, 2017
39bcbda
Beautified the HTML and added the OpenCV logo to the lab introduction
agnathan Jul 21, 2017
260a63a
Update navigation.html
vijnasu Aug 23, 2017
6d013c0
Setup and Deployment for Windows
vijnasu Oct 26, 2017
7739c49
Setup and deployment link added
vijnasu Oct 26, 2017
4b6f761
Update index.html
vijnasu Oct 26, 2017
cdc738d
Windows Boot Troubleshoot
vijnasu Oct 27, 2017
dd267d6
Update index.html
vijnasu Oct 30, 2017
3aa96be
Update index.html
vijnasu Oct 30, 2017
0d9a2e3
Update index.html
vijnasu Oct 30, 2017
4ca0097
Update index.html
vijnasu Nov 9, 2017
6de75e3
Update index.html
vijnasu Nov 9, 2017
5d14101
Rename index.html to index_USB.html
vijnasu Apr 2, 2018
76eb6ea
Create index.html
vijnasu Apr 2, 2018
49668f2
Update index.html
vijnasu Apr 9, 2018
a52ef99
removed setup and deployment link
ragural Apr 9, 2018
e728b4d
Ask the attendee to use the password "Intel@1234"
agnathan Apr 10, 2018
8a92ada
Ask the attendees to open the Media SDK Developer References
agnathan Apr 10, 2018
c1c10a2
AMT now uses HTTPS :)
agnathan Apr 10, 2018
c1fa3ee
Ask attendee to change the computer host name
agnathan Apr 10, 2018
cbae61a
minor edit
agnathan Apr 10, 2018
babc1b2
explain IDE-R
agnathan Apr 10, 2018
6aa8df7
Warning inserted
agnathan Apr 10, 2018
ec7db61
Update index.html
Ranganadhxkamepalli Apr 16, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ bower_components
xdk
app/styles/style.css
dist/
app/views/labs/downloads/python_sample/face/face.py
*.bowerrc
Binary file added app/.DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions app/less/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,7 @@ code {
-webkit-transition: 0.1s ease-in-out;
-moz-transition: 0.1s ease-in-out;
-o-transition: 0.1s ease-in-out;
float: right;
}

.img-zoom:hover {
Expand Down
211 changes: 163 additions & 48 deletions app/scripts/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
pageTitle: 'Slides View'
}
})
.state('index.videos', {
/* .state('index.videos', {
url: "/videos",
templateUrl: "views/videos.html",
data: {
pageTitle: 'Videos'
}
})
}) */
.state('labs', {
abstract: true,
url: "/labs",
Expand All @@ -52,11 +52,11 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
pageTitle: ''
}
})
.state('labs.hdc', {
url: "/hdc",
templateUrl: "views/labs/hdc/index.html",
.state('labs.laboverview', {
url: "/laboverview",
templateUrl: "views/labs/laboverview/index.html",
data: {
pageTitle: 'The Helix Device Cloud'
pageTitle: 'Lab Overview'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
Expand All @@ -75,11 +75,11 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
}
}
})
.state('labs.protocols-javascript-http', {
url: "/protocols-javascript-http",
templateUrl: "views/labs/protocols-javascript-http/index.html",
.state('labs.labInfrastructure', {
url: "/laboverview",
templateUrl: "views/labs/labInfrastructure/index.html",
data: {
pageTitle: 'Application Protocols: MQTT and HTTP'
pageTitle: 'Lab Infrastructure'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
Expand All @@ -98,11 +98,34 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
}
}
})
.state('labs.protocols-javascript-mqtt', {
url: "/protocols-javascript-mqtt",
templateUrl: "views/labs/protocols-javascript-mqtt/index.html",
.state('labs.videoperformance-maarssetup', {
url: "/videoperformance-maarssetup",
templateUrl: "views/labs/videoperformance-maarssetup/index.html",
data: {
pageTitle: ''
pageTitle: 'MAARS Source Setup'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
return $ocLazyLoad.load([{
serie: true,
files: [
'bower_components/codemirror/lib/codemirror.css',
'bower_components/codemirror/theme/ambiance.css',
'bower_components/codemirror/lib/codemirror.js',
'bower_components/codemirror/mode/javascript/javascript.js'
]
}, {
name: 'ui.codemirror',
files: ['bower_components/angular-ui-codemirror/ui-codemirror.min.js']
}]);
}
}
})
.state('labs.videoperformance-marsunderstand', {
url: "/videoperformance-marsunderstand",
templateUrl: "views/labs/videoperformance-marsunderstand/index.html",
data: {
pageTitle: 'MARS Application Walkthrough'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
Expand All @@ -121,11 +144,11 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
}
}
})
.state('labs.protocols-javascript', {
url: "/protocols-javascript",
templateUrl: "views/labs/protocols-javascript/index.html",
.state('labs.videoperformance-maarscustomize', {
url: "/videoperformance-maarsunderstand",
templateUrl: "views/labs/videoperformance-maarscustomize/index.html",
data: {
pageTitle: 'IoT Protocols: JavaScript'
pageTitle: 'MAARS Customize'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
Expand All @@ -145,11 +168,11 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
}
})

.state('labs.protocols-node-red', {
url: "/protocols-node-red",
templateUrl: "views/labs/protocols-node-red/index.html",
.state('labs.videoperformance-maarscustomsoln', {
url: "/videoperformance-maarscustomsoln",
templateUrl: "views/labs/videoperformance-maarscustomsoln/index.html",
data: {
pageTitle: 'IoT Protocols: Node-Red'
pageTitle: 'Integrate MAARs into custom solution'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
Expand All @@ -168,11 +191,12 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
}
}
})
.state('labs.databases', {
url: "/databases",
templateUrl: "views/labs/databases/index.html",

.state('labs.videoperformance-mediasdk', {
url: "/videoperformance-mediasdk",
templateUrl: "views/labs/videoperformance-mediasdk/index.html",
data: {
pageTitle: 'Build an Edge Device'
pageTitle: 'Explore Intel Media SDK'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
Expand All @@ -191,18 +215,36 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
}
}
})
.state('labs.admin-interface', {
url: "/admin-interface",
templateUrl: "views/labs/admin-interface/index.html",

.state('labs.videoperformance-mediasdksamples', {
url: "/videoperformance-mediasdksamples",
templateUrl: "views/labs/videoperformance-mediasdksamples/index.html",
data: {
pageTitle: 'Custom Administrative Interface'
pageTitle: 'Understand Media Acceleration Reference Software'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
return $ocLazyLoad.load([{
serie: true,
files: [
'bower_components/codemirror/lib/codemirror.css',
'bower_components/codemirror/theme/ambiance.css',
'bower_components/codemirror/lib/codemirror.js',
'bower_components/codemirror/mode/javascript/javascript.js'
]
}, {
name: 'ui.codemirror',
files: ['bower_components/angular-ui-codemirror/ui-codemirror.min.js']
}]);
}
}
})
.state('labs.automation', {
url: "/automation",
templateUrl: "views/labs/automation/index.html",

.state('labs.remote-configamt', {
url: "/remote-configamt",
templateUrl: "views/labs/remote-configamt/index.html",
data: {
pageTitle: 'Automation on the Internet of Things'
pageTitle: 'Configure AMT'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
Expand All @@ -221,12 +263,36 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
}
}
})
.state('labs.security', {
url: "/security",
templateUrl: "views/labs/security/index.html",
data: {
pageTitle: 'Security on the Internet of Things'
},

.state('labs.remote-configintelmc', {
url: "/remote-configintelmc",
templateUrl: "views/labs/remote-configintelmc/index.html",
data: {
pageTitle: 'Manage remote systems'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
return $ocLazyLoad.load([{
serie: true,
files: [
'bower_components/codemirror/lib/codemirror.css',
'bower_components/codemirror/theme/ambiance.css',
'bower_components/codemirror/lib/codemirror.js',
'bower_components/codemirror/mode/javascript/javascript.js'
]
}, {
name: 'ui.codemirror',
files: ['bower_components/angular-ui-codemirror/ui-codemirror.min.js']
}]);
}
}
})
.state('labs.remote-configmeshcentral', {
url: "/remote-configmeshcentral",
templateUrl: "views/labs/remote-configmeshcentral/index.html",
data: {
pageTitle: 'Manage remote systems using opensource cloud'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
return $ocLazyLoad.load([{
Expand All @@ -245,11 +311,37 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
}
})

.state('labs.security-tls', {
url: "/security-tls",
templateUrl: "views/labs/security-tls/index.html",

.state('labs.analytics-opencvinit', {
url: "/labs.analytics-opencvinit",
templateUrl: "views/labs/analytics-opencvinit/index.html",
data: {
pageTitle: 'Simple Video capture using OpenCV'
},
resolve: {
loadPlugin: function ($ocLazyLoad) {
return $ocLazyLoad.load([{
serie: true,
files: [
'bower_components/codemirror/lib/codemirror.css',
'bower_components/codemirror/theme/ambiance.css',
'bower_components/codemirror/lib/codemirror.js',
'bower_components/codemirror/mode/javascript/javascript.js'
]
}, {
name: 'ui.codemirror',
files: ['bower_components/angular-ui-codemirror/ui-codemirror.min.js']
}]);
}
}
})


.state('labs.analytics-opencvmotion', {
url: "/analytics-opencvmotion",
templateUrl: "views/labs/analytics-opencvmotion/index.html",
data: {
pageTitle: 'Setup TLS'
pageTitle: 'Motion detection using OpenCV'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
Expand All @@ -268,11 +360,11 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
}
}
})
.state('labs.security-mcafee', {
url: "/security-mcafee",
templateUrl: "views/labs/security-mcafee/index.html",
.state('labs.analytics-opencvface', {
url: "/analytics-opencvface",
templateUrl: "views/labs/analytics-opencvface/index.html",
data: {
pageTitle: 'McAfee'
pageTitle: 'Face detection with OpenCV'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
Expand All @@ -292,6 +384,29 @@ function config($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
}
})

.state('labs.analytics-analyse', {
url: "/analytics-analyse",
templateUrl: "views/labs/analytics-analyse/index.html",
data: {
pageTitle: 'Analyse face data'
},
resolve: {
loadPlugin: function($ocLazyLoad) {
return $ocLazyLoad.load([{
serie: true,
files: [
'bower_components/codemirror/lib/codemirror.css',
'bower_components/codemirror/theme/ambiance.css',
'bower_components/codemirror/lib/codemirror.js',
'bower_components/codemirror/mode/javascript/javascript.js'
]
}, {
name: 'ui.codemirror',
files: ['bower_components/angular-ui-codemirror/ui-codemirror.min.js']
}]);
}
}
})
.state('labs.security-systemd', {
url: "/security-systemd",
templateUrl: "views/labs/security-systemd/index.html",
Expand Down
6 changes: 4 additions & 2 deletions app/scripts/directives.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ function pageTitle($rootScope, $timeout) {
link: function(scope, element) {
var listener = function(event, toState, toParams, fromState, fromParams) {
// Default title - load on Dashboard 1
var title = 'Intel Commercial IoT Workshop';
var title = 'Intel Retail Workshop';
// Create your own title pattern
if (toState.data && toState.data.pageTitle) title = 'Intel Commercial IoT Workshop | ' + toState.data.pageTitle;
if (toState.data && toState.data.pageTitle) title = 'Intel Retail Workshop | ' + toState.data.pageTitle;
$timeout(function() {
element.text(title);
});
Expand Down Expand Up @@ -128,6 +128,8 @@ function labels($timeout) {
scope.xdk = 'xdk' in attrs;
scope.nodered = 'nodered' in attrs;
scope.windows = 'windows' in attrs;
scope.laptop = 'laptop' in attrs;
scope.nuc = 'nuc' in attrs;
scope.apple = 'apple' in attrs;
scope.linux = 'linux' in attrs;
}
Expand Down
Binary file added app/views/.DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions app/views/common/labels.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<span ng-show="xdk" class="label label-warning">Intel&reg; XDK</span>
<span ng-show="nodered" class="label label-danger">Node-Red</span>
<span ng-show="windows" class="fa fa-windows"></span>
<span ng-show="laptop" class="label label-warning">Laptop</span>
<span ng-show="nuc" class="label label-success">Intel &reg; NUC</span>
<span ng-show="apple" class="fa fa-apple"></span>
<span ng-show="linux" class="fa fa-linux"></span>
</div>
Loading