Update new analytics components.

revert-dabc3590
charithag 9 years ago
parent cfbc36ff2d
commit 03c4768e7d

@ -1,4 +1,3 @@
{{#zone "topCss"}} {{#zone "topCss"}}
{{css "css/graph.css"}} {{css "css/graph.css"}}
{{/zone}} {{/zone}}
@ -22,4 +21,4 @@
{{js "js/rickshaw.min.js"}} {{js "js/rickshaw.min.js"}}
{{js "js/moment.min.js"}} {{js "js/moment.min.js"}}
{{js "js/devicetype-graph.js"}} {{js "js/devicetype-graph.js"}}
{{/zone}} {{/zone}}

@ -18,7 +18,7 @@
function onRequest(context) { function onRequest(context) {
var deviceType = context.uriParams.deviceType; var deviceType = context.uriParams.deviceType;
var deviceId = request.getParameter("id"); var deviceId = request.getParameter("deviceId");
if (deviceType != null && deviceType != undefined && deviceId != null && deviceId != undefined) { if (deviceType != null && deviceType != undefined && deviceId != null && deviceId != undefined) {
var deviceModule = require("/app/modules/device.js").deviceModule; var deviceModule = require("/app/modules/device.js").deviceModule;

@ -1,4 +1,3 @@
{{#zone "topCss"}} {{#zone "topCss"}}
{{css "css/graph.css"}} {{css "css/graph.css"}}
{{/zone}} {{/zone}}
@ -17,7 +16,7 @@
</div> </div>
</div> </div>
<a class="padding-left" <a class="padding-left"
href="{{@app.context}}/device/analytics/{{device.type}}?id={{device.deviceIdentifier}}&deviceName={{device.name}}"> href="{{@app.context}}/device/{{device.type}}/analytics?deviceId={{device.deviceIdentifier}}&deviceName={{device.name}}">
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-statistics fw-stack-1x"></i> <i class="fw fw-statistics fw-stack-1x"></i>
@ -30,4 +29,4 @@
{{js "js/moment.min.js"}} {{js "js/moment.min.js"}}
{{js "js/socket.io.min.js"}} {{js "js/socket.io.min.js"}}
{{js "js/device-stats.js"}} {{js "js/device-stats.js"}}
{{/zone}} {{/zone}}

@ -102,4 +102,4 @@
<script async defer <script async defer
src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCO-8KGLeoFkCeqID9BpY_Gh6GOKfaBPVc&callback=initMap"> src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCO-8KGLeoFkCeqID9BpY_Gh6GOKfaBPVc&callback=initMap">
</script> </script>
{{/zone}} {{/zone}}

Loading…
Cancel
Save