Merge branch 'sidebar'
authorErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 26 Nov 2015 09:51:24 +0000 (10:51 +0100)
committerErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 26 Nov 2015 09:51:24 +0000 (10:51 +0100)
* sidebar:
  [sidebar] template for showing and editing a organization unit
  [sidebar] Showing basic information on side panel
  [sidebar] Skeleton up

# Conflicts:
# src/components/app.html
# src/components/app.ts
# src/components/sidebar/sidebar.html
# src/components/sidebar/sidebar.ts

src/components/app.html
src/components/app.ts

index 153fffd..1be1056 100644 (file)
@@ -1,9 +1,5 @@
 <div class="container">
-    <div class="nav">
-        Navbar
-        <mou-search (newsearch)="sidebar.update($event)"></mou-search>
-        <mou-filter></mou-filter>
-    </div>
+    <mou-navbar (outevent)="map.update($event)"></mou-navbar>
 
     <div class="row">
         <div class="col-md-8">
index 3ce1467..183b23b 100644 (file)
@@ -2,8 +2,9 @@ import {HTTP_PROVIDERS} from 'angular2/http';
 import {Component, View, bootstrap, provide, ELEMENT_PROBE_PROVIDERS} from 'angular2/angular2';
 import {Map} from './map/map';
 import {Search} from "./search/search";
-import {Filter} from "./filter/filter";
 import {Sidebar} from "./sidebar/sidebar";
+import {Navbar} from "./navbar/navbar";
+
 
 declare var System:any;
 
@@ -11,7 +12,7 @@ declare var System:any;
     {
         selector: 'mou-app',
         templateUrl: './components/app.html',
-        directives:[Filter, Map, Search, Sidebar]
+        directives:[Navbar, Map, Search, Sidebar]
     })