diff --git a/app/serializers/application.js b/app/serializers/application.js index b142874..bff92af 100644 --- a/app/serializers/application.js +++ b/app/serializers/application.js @@ -79,24 +79,26 @@ export default DS.RESTSerializer.extend({ if (item.contextElement.attributes) { item.contextElement.attributes.forEach(function(attribute) { - if (attribute.type !== 'category') { + if (attribute.type !== 'category' && attribute.name !== 'timestamp') { // find metadata var timestamp = 0; var source = ""; var minValue; var maxValue; - attribute.metadatas.forEach(function(metadata) { - if (metadata.name === 'timestamp') { - timestamp = Date.parse(metadata.value); - } else if (metadata.name === 'source') { - source = metadata.value; - } else if (metadata.name === 'min') { - minValue = metadata.value; - } else if (metadata.name === 'max') { - maxValue = metadata.value; - } - }); + if (attribute.metadatas) { + attribute.metadatas.forEach(function(metadata) { + if (metadata.name === 'timestamp') { + timestamp = Date.parse(metadata.value); + } else if (metadata.name === 'source') { + source = metadata.value; + } else if (metadata.name === 'min') { + minValue = metadata.value; + } else if (metadata.name === 'max') { + maxValue = metadata.value; + } + }); + } if (timestamp === 0) { timestamp = (new Date()).getTime(); diff --git a/app/styles/app.css b/app/styles/app.css index 2b8519e..22f37d0 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -61,29 +61,29 @@ header { color: #103B7D; background-color: #fff; - height: 100px; + height: 60px; top: 0; border-bottom: 3px solid #bbb; } header #title { - font-size: 35px; + font-size: 25px; font-weight: 100; text-align: left; text-rendering: optimizeLegibility; -webkit-text-rendering: optimizeLegiblity; -moz-text-rendering: optimizeLegibitliy; - padding: 15px 0 15px 30px; + padding: 15px 0 20px 30px; float: left; } header #logos { - height: 100px; + height: 60px; - padding-top: 10px; + padding-top: 15px; float: right; } @@ -100,7 +100,7 @@ footer { } #main { - top: 100px; + top: 60px; bottom: 25px; left: 20px; @@ -108,13 +108,15 @@ footer { } .svg-image { - width: 75%; + width: 90%; height: auto; + + padding-left: 130px; } .svg-logo { width: auto; - height: 80px; + height: 30px; padding-right: 30px; @@ -122,9 +124,9 @@ footer { } #rwth-logo { - margin-top: 15px; + margin-top: 10px; - height: 40px !important; + height: 15px !important; } h1 { diff --git a/app/templates/application.hbs b/app/templates/application.hbs index da9bfe8..d5815f9 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,9 +1,7 @@
- Multi-Site Real-Time Co-Simulation Integrated Lab -
- Control Center – JRC Ispra + European Real-Time Integrated Co-Simulation Demo
diff --git a/config/environment.js b/config/environment.js index 68518d8..09925f4 100644 --- a/config/environment.js +++ b/config/environment.js @@ -60,6 +60,7 @@ module.exports = function(environment) { if (environment === 'production') { ENV.APP.API_HOST = 'http://46.101.131.212:80'; + ENV.baseURL = '/technical/'; ENV['ember-cli-mirage'] = { enabled: false diff --git a/public/assets/images/PoliTo.svg b/public/assets/images/PoliTo.svg index 0a920b9..671b64d 100644 --- a/public/assets/images/PoliTo.svg +++ b/public/assets/images/PoliTo.svg @@ -10,12 +10,12 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="615" - height="260" + width="543.74146" + height="341.14291" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="Neues Dokument 1"> + sodipodi:docname="Logo3_Polito.svg"> @@ -57,7 +57,7 @@ image/svg+xml - + @@ -65,2104 +65,12404 @@ inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-43.928577,-418.07648)"> + transform="translate(-75.285706,-369.64792)"> + height="341.14291" + width="543.74146" />