Merge branch 'navbar' of git.uio.no:u/erikhf/frm into navbar
authorYrjan A. F. Fraschetti <yrjanaff@1x-193-157-251-118.uio.no>
Thu, 26 Nov 2015 09:13:37 +0000 (10:13 +0100)
committerYrjan A. F. Fraschetti <yrjanaff@1x-193-157-251-118.uio.no>
Thu, 26 Nov 2015 09:13:37 +0000 (10:13 +0100)
# Conflicts:
# src/components/navbar/navbar.html

1  2 
src/components/search/search.html
src/components/search/search.ts

  
  <div>
  <ul id="dropdown-menu" class="dropdown-menu">
 +    <li><select id="ownershipSelector" (click)="setFilter()">
 +        <option value="">-- All Facility Ownerships --</option>
 +        <option value="Mission">Mission</option>
 +        <option value="NGO">NGO</option>
 +        <option value="Private Clinic">Private Clinic</option>
 +        <option value="Public facilities">Public facilities</option>
 +    </select></li>
 +    <li><select id="typeSelector" (click)="setFilter()">
 +        <option value="">-- All Facility Types --</option>
 +        <option value="CHC">CHC</option>
 +        <option value="CHP">CHP</option>
 +        <option value="Clinic">Clinic</option>
 +        <option value="Hospital">Hospital</option>
 +        <option value="MCHP">MCHP</option>
 +    </select></li>
 +    <li><select id="locationSelector" (click)="setFilter()">
 +        <option value="">-- All locations --</option>
 +        <option value="Rural">Rural</option>
 +        <option value="Urban">Urban</option>
 +    </select></li>
  
 -    <li><a href="#">Another action</a></li>
 -    <li><a href="#">Something else here</a></li>
      <li role="separator" class="divider"></li>
      <li><a href="#">Separated link</a></li>
+     <li>
+         <select class="form-control filtervalg">
+             <option selected="selected"> Alle </option>
+             <option value="volvo">Volvo</option>
+             <option value="saab">Saab</option>
+             <option value="opel">Opel</option>
+             <option value="audi">Audi</option>
+         </select>
+     </li>
+     <li>
+     <select class="form-control filtervalg">
+         <option selected="selected"> Alle </option>
+         <option value="volvo">Volvo</option>
+         <option value="saab">Saab</option>
+         <option value="opel">Opel</option>
+         <option value="audi">Audi</option>
+     </select>
+     </li>
  </ul>
  
  </div>
Simple merge