mirror of
https://git.rwth-aachen.de/acs/public/villas/web/
synced 2025-03-09 00:00:01 +01:00
Fix release v0.1
This commit is contained in:
parent
0309959cf8
commit
2989ece4b1
5 changed files with 12434 additions and 2131 deletions
|
@ -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();
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
<section id="lapMashupApp">
|
||||
<header class="row">
|
||||
<div id="title">
|
||||
Multi-Site Real-Time Co-Simulation Integrated Lab
|
||||
<br />
|
||||
Control Center – JRC Ispra
|
||||
European Real-Time Integrated Co-Simulation Demo
|
||||
</div>
|
||||
<div id="logos">
|
||||
<img src={{"assets/images/EU.svg"}} class="svg-logo" />
|
||||
|
|
|
@ -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
|
||||
|
|
File diff suppressed because it is too large
Load diff
Before Width: | Height: | Size: 159 KiB After Width: | Height: | Size: 934 KiB |
Loading…
Add table
Reference in a new issue