mer design

diff --git a/src/components/search/search.html b/src/components/search/search.html
index 10104a5726fb1173a194f221e76f47d30a6b5c3e..4cbc484e362b49b5415ec0466aa07a1ac940b084 100644 (file)
--- a/src/components/search/search.html
+++ b/src/components/search/search.html
@@ -22,7 +22,7 @@
             <!--Show and empty filtermenu-->
             <button type="button" class="filterbutton col-md-2" (click)="toggle()"
                     data-toggle="collapse" data-target="#dropdown-menu">
-                {{ visible ? '&xdtri;' : '&cross;' }}
+                {{ visible ? '&xdtri;' : '&khcy;' }}
             </button>
         </div>
     </form>

diff --git a/src/components/sidebar/sidebar.html b/src/components/sidebar/sidebar.html
index 80c864ced6c160c62e625c11f34476b174d8dcf1..b8574268b8d67a8d7460141e3d2715999079fe83 100644 (file)
--- a/src/components/sidebar/sidebar.html
+++ b/src/components/sidebar/sidebar.html
@@ -1,7 +1,9 @@
 <div>
-    <div [hidden]="!active" class="form-background sidebar slide" style="overflow-y:auto; position:relative; float:right; ">
+    <div [hidden]="!active" class="form-background sidebar slide"
+         style="overflow-y:auto; position:relative; float:right; ">
 
-        <button id="slideout" class="btn btn-default" (click)="exit()"><span class="glyphicon glyphicon-chevron-right"></span> </button>
+        <button id="slideout" class="btn btn-default" (click)="exit()"><span
+                class="glyphicon glyphicon-chevron-right"></span></button>
 
         <form class="formsidebar" *ng-if="editmode" [(ng-form-model)]="form" (ng-submit)="onSubmit()" #of="form">
             <hr>
@@ -12,6 +14,7 @@
             <div class="form-group">
                 <label class="label-text">Name</label>
                 <input class="form-control" type="text" ng-control="name">
+
                 <p [hidden]="name.valid || name.untouched" class="alert alert-danger">
                     Name is required
                 </p>
@@ -39,7 +42,8 @@
                 <label class="label-text">Opening Date</label>
                 <input class="form-control" type="date" ng-control="openingDate" #openingDate="form">
 
-                <p [hidden]="openingdate.valid || openingdate.untouched" class="alert alert-danger">Opening date is required</p>
+                <p [hidden]="openingdate.valid || openingdate.untouched" class="alert alert-danger">Opening date is
+                    required</p>
             </div>
             <div class="form-group">
                 <label class="label-text">Closed Date</label>
@@ -53,14 +57,16 @@
             </div>
             <hr>
             <fieldset class="form-group">
-                <Legend>Coordinates</Legend>
+                <Legend><span class="glyphicon glyphicon-globe"></span> Coordinates</Legend>
                 <hr>
 
                 <div *ng-if="featureType.value == 'POINT'" class="form-group">
                     <label class="label-text">Latitude</label>
-                    <input class="form-control" type="number" ng-control="lat" #lat="form" step="any" max="90" min="-90"/>
+                    <input class="form-control" type="number" ng-control="lat" #lat="form" step="any" max="90"
+                           min="-90"/>
                     <label class="label-text">Longitude</label>
-                    <input class="form-control" type="number" ng-control="lng" #lng="form" step="any" max="180" min="-180"/>
+                    <input class="form-control" type="number" ng-control="lng" #lng="form" step="any" max="180"
+                           min="-180"/>
                 </div>
                 <div *ng-if="featureType.value == 'NONE'" class="alert alert-danger">
                     <p>This organisation unit has no associated coordinates</p>
@@ -84,7 +90,7 @@
             <hr>
             <fieldset class="form-group">
 
-                <legend>Contact information</legend>
+                <legend> <span class="glyphicon glyphicon-phone-alt"></span>Contact information</legend>
                 <hr>
                 <label class="label-text">Contact person</label>
                 <input class="form-control" type="text" ng-control="contactPerson"/>
@@ -97,7 +103,8 @@
             </fieldset>
             <hr>
             <button type="button" (click)="cancel()" class="btn btn-default buttonsidebar">Cancel</button>
-            <button type="submit" [disabled]="!of.form.valid" class="btn btn-default buttonsidebar">{{newObject? "Add":"Update"}}
+            <button type="submit" [disabled]="!of.form.valid" class="btn btn-default buttonsidebar">{{newObject?
+                "Add":"Update"}}
             </button>
 
         </form>
@@ -107,40 +114,49 @@
 
 
             <hr>
-            <legend>Facility</legend>
+            <legend><span class="glyphicon glyphicon-map-marker"></span> Facility</legend>
             <hr>
 
             <label class="label-text" for="actOrgUnitName">Name</label>
+
             <p id="actOrgUnitName">{{(form.controls.name.value) || "[None]"}}</p>
 
             <label class="label-text" for="actOrgUnitShortName">Short Name</label>
+
             <p id="actOrgUnitShortName">{{(form.controls.shortName.value)||["None"]}}</p>
 
             <label class="label-text" for="actOrgUnitDescription">Description</label>
+
             <p id="actOrgUnitDescription">{{(form.controls.description.value)||"None"}}</p>
 
             <label class="label-text" for="actOrgUnitCode">Code</label>
+
             <p id="actOrgUnitCode">{{(form.controls.code.value)||["None"]}}</p>
 
             <label class="label-text" for="actOrgUnitOpeningDate">Opening Date</label>
+
             <p id="actOrgUnitOpeningDate">{{form.controls.openingDate.value||["None"]}}</p>
 
             <label class="label-text" for="actOrgUnitClosingDate">Closed Date</label>
+
             <p id="actOrgUnitClosingDate">{{form.controls.closedDate.value||["None"]}}</p>
 
             <label class="label-text" for="actOrgUnitURL">Url</label>
+
             <p id="actOrgUnitURL">{{(form.controls.url.value) ||["None"]}}</p>
             <hr>
 
 
             <fieldset>
-                <legend>Coordinates</legend>
+                <legend><span class="glyphicon glyphicon-globe"></span> Coordinates</legend>
                 <hr>
 
                 <div *ng-if="featureType.value == 'POINT'" class="form-group">
                     <label class="label-text">Latitude</label>
+
                     <p>{{form.controls.lat.value}}</p>
                     <label class="label-text">Longitude</label>
+
                     <p>{{form.controls.lng.value}}</p>
                 </div>
                 <div *ng-if="featureType.value == 'NONE'" class="alert alert-danger">
@@ -153,16 +169,20 @@
             <hr>
 
             <fieldset>
-                <legend>Contact Information</legend>
+                <legend><span class="glyphicon glyphicon-phone-alt"></span> Contact Information</legend>
                 <hr>
 
                 <label class="label-text">Contact person</label>
+
                 <p>{{form.controls.contactPerson.value || ["None"]}}</p>
                 <label class="label-text">Address</label>
+
                 <p>{{form.controls.address.value || ["None"]}}</p>
                 <label class="label-text">E-mail</label>
+
                 <p>{{form.controls.email.value || ["None"]}}</p>
                 <label class="label-text">Phone number</label>
+
                 <p>{{form.controls.phoneNumber.vaule || ["None"]}}</p>
             </fieldset>
             <hr>

diff --git a/src/css/map.css b/src/css/map.css
index 5403b3d0f5837d74ed581d6aee2ed36b9eba0e6b..8b44bfa26e6e7acb77e58fd5516bd7f1dc06e696 100644 (file)
--- a/src/css/map.css
+++ b/src/css/map.css
@@ -332,3 +332,8 @@ label{
     margin: 0 !important;
 }
 
+.glyphicon{
+    font-size: 16px;
+    color: darkgrey;
+}
+