Updated ember to v2.6

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

.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "4"
 
 sudo: false
 
@@ -10,12 +10,11 @@ cache:
     - node_modules
 
 before_install:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - npm install phantomjs-prebuilt
 
 install:
-  - npm install -g bower
   - npm install
   - bower install
 

.watchmanconfig

@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp"]
+  "ignore_dirs": ["tmp", "dist"]
 }

README.md

@@ -1,7 +1,7 @@
 # Design
 
 This README outlines the details of collaborating on this Ember application.
-A short introduction of this app could easily go here.
+
 
 ## Prerequisites
 
@@ -10,7 +10,7 @@ You will need the following things properly installed on your computer.
 * [Git](http://git-scm.com/)
 * [Node.js](http://nodejs.org/) (with NPM)
 * [Bower](http://bower.io/)
-* [Ember CLI](http://www.ember-cli.com/)
+* [Ember CLI](http://ember-cli.com/)
 * [PhantomJS](http://phantomjs.org/)
 
 ## Installation
@@ -46,8 +46,14 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 * [ember.js](http://emberjs.com/)
-* [ember-cli](http://www.ember-cli.com/)
+* [ember-cli](http://ember-cli.com/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
 
+## Todo
+
+
+[ ] Resources formats with descriptions
+[ ] Make section-links available for deep-linking straight to content.
+[ ] Feedback for each

app/app.js

@@ -1,16 +1,16 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-var App;
+let App;
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
-  Resolver: Resolver
+  Resolver
 });
 
 loadInitializers(App, config.modulePrefix);

app/pods/components/content-section/component.js

@@ -19,7 +19,8 @@ export default Ember.Component.extend({
   },
   actions: {
     openModal(element){
-      Ember.$('#modal-image-'+element).modal();
+      console.log("#"+element + "-modal");
+      Ember.$("#"+element + "-modal").modal();
       //console.log('modal-image-'+element);
     }
   }

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

@@ -41,9 +41,10 @@
   <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}}
+  {{#bs-modal title=title basename=basename footer=false open=false id=basename}}
   <img src="https://hiof.no/assets/plugins/design-{{type}}/illustrations/{{illustration}}">
-  {{/my-modal}}
+  {{bs-modal-footer closeTitle="Cancel" submitTitle="Ok"}}
+  {{/bs-modal}}
 
 </aside>
 

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

@@ -26,9 +26,9 @@
 
 
   <ul id="nav-internal" class="nav navbar-nav  navbar-right">
-      <li>{{#link-to 'guide'}}Designmal{{/link-to}}</li>
       <li>{{#link-to 'template'}}Dokumentmaler{{/link-to}}</li>
-      <li>{{#link-to 'webcomponent'}}Web komponenter{{/link-to}}</li>
+      <li>{{#link-to 'guide'}}Design spesifikasjon{{/link-to}}</li>
+      <li>{{#link-to 'webcomponent'}}Web-komponenter spesifikasjon{{/link-to}}</li>
       <!--
       <li class="dropdown">
       <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Nettsidekomponenter<span class="caret"></span></a><ul class="dropdown-menu collapse" role="menu">
@@ -62,5 +62,3 @@
 
 </div>
 </nav>
-
-

app/pods/components/my-modal/template.hbs

@@ -11,8 +11,3 @@
     </div>
   </div>
 </div>
-
-
-
-
-

app/pods/components/nav-internal/component.js

@@ -1,28 +1,30 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-    tagName: 'aside',
-    classNames: ['internal-nav'],
-    didInsertElement: function() {
-        Ember.$('.nav-internal').toc({
-            title: '',
-            listType: 'ul'
-        });
-        //Ember.$('body').scrollspy({ target: 'nav.nav-internal' });
-        Ember.$('.nav-internal ul').addClass('nav nav-pills nav-stacked');
+  tagName: 'aside',
+  classNames: ['internal-nav'],
+  didInsertElement: function() {
+    Ember.$('.nav-internal').toc({
+      title: '',
+      listType: 'ul',
+      headers: '.content h1, .content h2, .content h3, .content h4, .content h5, .content h6',
+      showEffect: 'fadeIn'
+    });
+    //Ember.$('body').scrollspy({ target: 'nav.nav-internal' });
+    Ember.$('.nav-internal ul').addClass('nav nav-pills nav-stacked');
 
-        Ember.$('.nav-internal a').on('click', function(e) {
-            e.preventDefault();
-            var el = Ember.$(this).attr('href');
+    Ember.$('.nav-internal a').on('click', function(e) {
+      e.preventDefault();
+      var el = Ember.$(this).attr('href');
 
 
 
-            Ember.$('html, body').animate({
-                scrollTop: Ember.$(el).offset().top
-            }, 200);
+      Ember.$('html, body').animate({
+        scrollTop: Ember.$(el).offset().top
+      }, 200);
 
-            //Ember.$.scrolTo($(this).attr('href'));
-            //console.log(this);
-        });
-    }
+      //Ember.$.scrolTo($(this).attr('href'));
+      //console.log(this);
+    });
+  }
 });

app/resolver.js

@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;

app/styles/_bootstrap-custom.scss

@@ -1,50 +1,50 @@
-// Core variables and mixins
-@import "bootstrap/variables";
-@import "bootstrap/mixins";
-
-// Reset and dependencies
-@import "bootstrap/normalize";
-//@import "bootstrap/print";
-@import "bootstrap/glyphicons";
-
-// Core CSS
-@import "bootstrap/scaffolding";
-@import "bootstrap/type";
-@import "bootstrap/code";
-//@import "bootstrap/grid";
-@import "bootstrap/tables";
-@import "bootstrap/forms";
-@import "bootstrap/buttons";
-
-// Components
-@import "bootstrap/component-animations";
-@import "bootstrap/dropdowns";
-@import "bootstrap/button-groups";
-@import "bootstrap/input-groups";
-@import "bootstrap/navs";
-@import "bootstrap/navbar";
-@import "bootstrap/breadcrumbs";
-@import "bootstrap/pagination";
-@import "bootstrap/pager";
-@import "bootstrap/labels";
-@import "bootstrap/badges";
-@import "bootstrap/jumbotron";
-@import "bootstrap/thumbnails";
-@import "bootstrap/alerts";
-@import "bootstrap/progress-bars";
-@import "bootstrap/media";
-@import "bootstrap/list-group";
-@import "bootstrap/panels";
-@import "bootstrap/responsive-embed";
-@import "bootstrap/wells";
-@import "bootstrap/close";
-
-// Components w/ JavaScript
-@import "bootstrap/modals";
-@import "bootstrap/tooltip";
-@import "bootstrap/popovers";
-//@import "bootstrap/carousel";
-
-// Utility classes
-@import "bootstrap/utilities";
-//@import "bootstrap/responsive-utilities";
+//   // Core variables and mixins
+//   @import "bootstrap/variables";
+//   @import "bootstrap/mixins";
+//   
+//   // Reset and dependencies
+//   @import "bootstrap/normalize";
+//   //@import "bootstrap/print";
+//   @import "bootstrap/glyphicons";
+//   
+//   // Core CSS
+//   @import "bootstrap/scaffolding";
+//   @import "bootstrap/type";
+//   @import "bootstrap/code";
+//   //@import "bootstrap/grid";
+//   @import "bootstrap/tables";
+//   @import "bootstrap/forms";
+//   @import "bootstrap/buttons";
+//   
+//   // Components
+//   @import "bootstrap/component-animations";
+//   @import "bootstrap/dropdowns";
+//   @import "bootstrap/button-groups";
+//   @import "bootstrap/input-groups";
+//   @import "bootstrap/navs";
+//   @import "bootstrap/navbar";
+//   @import "bootstrap/breadcrumbs";
+//   @import "bootstrap/pagination";
+//   @import "bootstrap/pager";
+//   @import "bootstrap/labels";
+//   @import "bootstrap/badges";
+//   @import "bootstrap/jumbotron";
+//   @import "bootstrap/thumbnails";
+//   @import "bootstrap/alerts";
+//   @import "bootstrap/progress-bars";
+//   @import "bootstrap/media";
+//   @import "bootstrap/list-group";
+//   @import "bootstrap/panels";
+//   @import "bootstrap/responsive-embed";
+//   @import "bootstrap/wells";
+//   @import "bootstrap/close";
+//   
+//   // Components w/ JavaScript
+//   @import "bootstrap/modals";
+//   @import "bootstrap/tooltip";
+//   @import "bootstrap/popovers";
+//   //@import "bootstrap/carousel";
+//   
+//   // Utility classes
+//   @import "bootstrap/utilities";
+//   //@import "bootstrap/responsive-utilities";

app/styles/app.scss

@@ -1,10 +1,10 @@
-@import 'bootstrap-custom';
+//@import 'bootstrap-custom';
 @import '../../bower_components/sass-mq/mq';
 @import '../../bower_components/hiof-layout/dist/layout';
 @import '../../bower_components/hiof-colors/dist/colors';
 @import '../../bower_components/hiof-typography/dist/typography';
 @import '../../bower_components/highlightjs/styles/github';
-@import "pod-styles";
+//@import "pod-styles";
 html {
     overflow-x: hidden;
 
@@ -41,7 +41,9 @@ body {
         color: #111;
     }
 }
-
+.nav-stacked > li + li{
+  margin-left: 2.4rem;
+}
 .container-fluid {
     max-width: 104rem;
     margin: 0 auto;

bower.json

@@ -1,22 +1,17 @@
 {
   "name": "design",
   "dependencies": {
-    "ember": "1.13.5",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.13.7",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.7",
-    "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.18",
-    "jquery": "^1.11.1",
-    "loader.js": "ember-cli/loader.js#3.2.0",
-    "qunit": "~1.17.1",
+    "ember": "~2.6.0",
+    "ember-cli-shims": "0.1.1",
+    "ember-cli-test-loader": "0.2.2",
+    "ember-qunit-notifications": "0.1.0",
+    "showdown": "^1.4.2",
+    "toc": "[email protected]:ghiculescu/jekyll-table-of-contents.git",
     "hiof-layout": "[email protected]:hiof/layout.git",
     "hiof-colors": "[email protected]:hiof/colors.git",
     "hiof-typography": "[email protected]:hiof/typography.git",
-    "toc": "[email protected]:ghiculescu/jekyll-table-of-contents.git",
     "sass-mq": "~3.2.4",
-    "highlightjs": "~8.8.0"
+    "highlightjs": "~8.8.0",
+    "bootstrap": "~3.3.5"
   }
 }