diff --git a/app/styles/app.css b/app/styles/app.css index 63a5b51..60903e5 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -26,16 +26,32 @@ body { header { color: #fff; - background-color: #8080C9; + background-color: #3B843C; - padding: 10px 0 10px 0; + /*padding: 10px 0 10px 0;*/ + + height: 100px; +} +header #title { font-size: 60px; font-weight: 100; text-align: center; text-rendering: optimizeLegibility; -webkit-text-rendering: optimizeLegiblity; -moz-text-rendering: optimizeLegibitliy; + + padding: 10px 0 10px 20px; + + float: left; +} + +header #logos { + height: 100px; + + padding-top: 10px; + + float: right; } footer { @@ -95,8 +111,8 @@ footer { box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.1); - margin: 10px; - padding: 10px; + margin: 20px; + padding: 20px; height: 100%; } @@ -151,3 +167,18 @@ footer { width: 100%; height: auto; } + +.svg-logo { + width: auto; + height: 80px; + + padding-right: 30px; + + float: left; +} + +#rwth-logo { + margin-top: 15px; + + height: 50px !important; +} diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 085e48a..095e1ed 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,6 +1,13 @@
{{outlet}} diff --git a/app/templates/components/entity-chart.hbs b/app/templates/components/entity-chart.hbs index f79c280..26ea39d 100644 --- a/app/templates/components/entity-chart.hbs +++ b/app/templates/components/entity-chart.hbs @@ -1,25 +1,29 @@ - - {{#if entityName}} +{{#if entity}} +
+ {{#if entityName}} + + + + {{/if}} - + + - {{/if}} - - - - -
+

{{entityName}}

+
-

{{entityName}}

- 		+ {{property-table model=entity showProperty="showPropertyValues"}} + + {{#if visibleProperty}} +

{{visibleProperty.name}}

+ {{/if}} + + {{line-chart data=visibleProperty.values}} + + {{#if visibleProperty}} +

{{visibleProperty.type}}

+ {{/if}} +
- {{property-table model=entity showProperty="showPropertyValues"}} - - {{#if visibleProperty}} -

{{visibleProperty.name}}

- {{/if}} - - {{line-chart data=visibleProperty.values}} - - {{#if visibleProperty}} -

{{visibleProperty.type}}

- {{/if}} -
+ +{{else}} +

No entitiy found

+{{/if}} diff --git a/public/assets/images/EU.svg b/public/assets/images/EU.svg new file mode 100755 index 0000000..a7df4b9 --- /dev/null +++ b/public/assets/images/EU.svg @@ -0,0 +1,600 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/images/PoliTo.svg b/public/assets/images/PoliTo.svg new file mode 100755 index 0000000..85744a8 --- /dev/null +++ b/public/assets/images/PoliTo.svg @@ -0,0 +1,855 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/images/RWTH.svg b/public/assets/images/RWTH.svg new file mode 100755 index 0000000..a14b6f1 --- /dev/null +++ b/public/assets/images/RWTH.svg @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +