Multiple adjustments

Signed-off-by: Kenneth Dahlstrøm <[email protected]>

app/helpers/convert-aeoaa.js

@@ -1,8 +1,15 @@
 import Ember from 'ember';
 
-export function convertAeoaa(params/*, hash*/ ) {
-    var res = params[0].replace('æ', 'ae').replace('ø', 'oe').replace('å', 'aa').replace('å', 'aa').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-');
-    return res;
+export function convertAeoaa(params /*, hash*/ ) {
+
+    if (typeof params[0] === 'undefined') {
+        return;
+    } else {
+
+
+        var res = params[0].replace('æ', 'ae').replace('ø', 'oe').replace('å', 'aa').replace('å', 'aa').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-').replace(' ', '-');
+        return res;
+    }
 }
 
 export default Ember.Helper.helper(convertAeoaa);

app/pods/components/content-section/template.hbs

@@ -1,50 +1,55 @@
 
 
-
-
-
-
 <section class="section-content">
 
-{{#if titletype}}
-{{#if (eq titletype 1)}}
-<h1 id="{{convert-aeoaa basename}}">{{title}}</h1>
-{{/if}}
-
-{{#if (eq titletype 2)}}
-<h2 id="{{convert-aeoaa basename}}">{{title}}</h2>
-{{/if}}
-
-{{#if (eq titletype 3)}}
-<h3 id="{{convert-aeoaa basename}}">{{title}}</h3>
-{{/if}}
-{{else}}
-<h2 id="{{convert-aeoaa basename}}">{{title}}</h2>
-{{/if}}
-
-{{markdown-to-html markdown=content}}
-
-{{#if assetpath}}
-<footer>
-  <a href="https://hiof.no{{assetpath}}{{url}}" class="btn btn-primary"><span class="glyphicon glyphicon-download"></span> {{to-lower-case title}}</a>
-</footer>
-{{/if}}
+  {{#if titletype}}
+  {{#if (eq titletype 1)}}
+  <h1 id="{{convert-aeoaa basename}}">{{title}}</h1>
+  {{/if}}
+
+  {{#if (eq titletype 2)}}
+  <h2 id="{{convert-aeoaa basename}}">{{title}}</h2>
+  {{/if}}
+
+  {{#if (eq titletype 3)}}
+  <h3 id="{{convert-aeoaa basename}}">{{title}}</h3>
+  {{/if}}
+  {{else}}
+  <h2 id="{{convert-aeoaa basename}}">{{title}}</h2>
+  {{/if}}
+
+  {{markdown-to-html markdown=content}}
+
+  {{#if assetpath}}
+  <footer>
+    {{#if (is-array url)}}
+      {{#each url}}
+      <a href="https://hiof.no/assets/plugins/design-templates/public/{{this}}.zip" class="btn btn-primary"><span class="glyphicon glyphicon-download"></span> {{this}} </a>
+      {{/each}}
+    {{else}}
+      {{#if url}}
+        <a href="https://hiof.no{{assetpath}}{{url}}.zip" class="btn btn-primary"><span class="glyphicon glyphicon-download"></span> {{url}}</a>
+      {{/if}}
+    {{/if}}
+
+
+  </footer>
+  {{/if}}
 </section>
 {{#if illustration}}
 <aside class="section-illustration">
   <img {{action 'openModal' basename}} class="img-illustration" data-id="image-{{convert-aeoaa basename}}" src="https://hiof.no/assets/plugins/design-{{type}}/illustrations/{{illustration}}">
 
 
   {{#my-modal title=title basename=basename}}
-    <img src="https://hiof.no/assets/plugins/design-{{type}}/illustrations/{{illustration}}">
+  <img src="https://hiof.no/assets/plugins/design-{{type}}/illustrations/{{illustration}}">
   {{/my-modal}}
 
 </aside>
 
 {{else}}
-  <aside class="section-illustration-placeholder"></aside>
+<aside class="section-illustration-placeholder"></aside>
 {{/if}}
 <footer class="visuallyhidden">
   Oppdatert av {{author}} on {{date}}
 </footer>
-

app/pods/components/tool-presentation/component.js

@@ -0,0 +1,4 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+});

app/pods/components/tool-presentation/template.hbs

@@ -0,0 +1 @@
+{{yield}}

app/pods/template/route.js

@@ -2,8 +2,8 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
     model: function() {
-        var data = Ember.$.getJSON('http://hiof.no/api/v1/designguidelines/?type=templates');
-        //console.log(data);
+        var data = Ember.$.getJSON('http://hiof.no/api/v2/designguidelines/?type=templates');
+        console.log(data);
         return data;
     }
 });

app/pods/template/template.hbs

@@ -3,7 +3,7 @@
 <h1>Dokumentmaler</h1>
 
 {{#each model.data as |post|}}
-  {{content-section  type=post.type basename=post.attributes.slug title=post.attributes.title content=post.attributes.body  author=post.attributes.author date=post.attributes.date illustration=post.attributes.illustration assetpath=post.attributes.assetpath url=post.attributes.url}}
+  {{content-section  type=post.type basename=post.attributes.slug title=post.attributes.title content=post.attributes.body  author=post.attributes.author date=post.attributes.date illustration=post.attributes.illustration assetpath=post.attributes.assetpath url=post.attributes.relatedassets}}
 {{/each}}
 </section>
-{{nav-internal}}
+{{nav-internal}}

app/pods/webcomponent/route.js

@@ -2,8 +2,9 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
     model: function() {
+
         var data = Ember.$.getJSON('http://hiof.no/api/v1/designguidelines/?type=webcomponents');
-        //console.log(data);
+        console.log(data);
         return data;
     },
     didInsertElement: function() {

app/styles/app.scss

@@ -7,6 +7,7 @@
 @import "pod-styles";
 html {
     overflow-x: hidden;
+
 }
 
 h1,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "design",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Small description for designguidlines goes here",
   "private": true,
   "directories": {

tests/integration/pods/components/tool-presentation/component-test.js

@@ -0,0 +1,26 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+
+moduleForComponent('tool-presentation', 'Integration | Component | tool presentation', {
+  integration: true
+});
+
+test('it renders', function(assert) {
+  assert.expect(2);
+
+  // Set any properties with this.set('myProperty', 'value');
+  // Handle any actions with this.on('myAction', function(val) { ... });
+
+  this.render(hbs`{{tool-presentation}}`);
+
+  assert.equal(this.$().text().trim(), '');
+
+  // Template block usage:
+  this.render(hbs`
+    {{#tool-presentation}}
+      template block text
+    {{/tool-presentation}}
+  `);
+
+  assert.equal(this.$().text().trim(), 'template block text');
+});