From 8a5ba84e4cb3659a9a5225300b194de32e190c84 Mon Sep 17 00:00:00 2001
From: helemork <helemork@gmail.com>
Date: Wed, 10 Apr 2019 16:45:19 +0200
Subject: [PATCH 1/5] =?UTF-8?q?fikset=20bilde-objektet=20=C3=B8verst=20p?=
 =?UTF-8?q?=C3=A5=20siden=20s=C3=A5=20den=20toggler=20mellom=20to=20klasse?=
 =?UTF-8?q?r=20p=C3=A5=20transparang=20fremfor=20inline=20kode,=20pluss=20?=
 =?UTF-8?q?fikset=20litt=20snedige=20sm=C3=A5bugs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Kodetre/Kodeliste/KodeVindu.js |  3 +--
 src/Kodetre/Kodeliste/Kodekort.js  | 38 +++++++++---------------------
 src/style/Sidebar.css              | 20 ++++++++++++++++
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/Kodetre/Kodeliste/KodeVindu.js b/src/Kodetre/Kodeliste/KodeVindu.js
index b5f9ad1a1..6df2dd9c6 100644
--- a/src/Kodetre/Kodeliste/KodeVindu.js
+++ b/src/Kodetre/Kodeliste/KodeVindu.js
@@ -70,8 +70,7 @@ const KodeVindu = ({
             square="false"
             elevation={4}
             style={{
-              position: "relative",
-              top: -72
+              position: "relative"
             }}
           >
             <Kodekort
diff --git a/src/Kodetre/Kodeliste/Kodekort.js b/src/Kodetre/Kodeliste/Kodekort.js
index 598f9777c..7d338d354 100644
--- a/src/Kodetre/Kodeliste/Kodekort.js
+++ b/src/Kodetre/Kodeliste/Kodekort.js
@@ -27,21 +27,6 @@ class Kodekort extends React.Component {
     return false;
   }
 
-  styles(url) {
-    if (this.erTransparent(url))
-      return {
-        minHeight: 297,
-        marginTop: 142,
-        marginBottom: 16,
-        filter: "drop-shadow(rgba(0, 0, 0, 0.5) 5px 5px 4px)",
-        backgroundSize: "contain"
-      };
-    return {
-      minHeight: 297,
-      _backgroundSize: "cover"
-    };
-  }
-
   render() {
     const {
       kode,
@@ -54,27 +39,26 @@ class Kodekort extends React.Component {
       onNavigate
     } = this.props;
     const tc = new tinycolor(farge);
-    //var new_url = config.getFotoOmslag(url, 408);
+    var new_url = config.getFotoOmslag(url, 408);
     return (
       <div
         square={false}
         className="sidebar_top_area sidebar_background_element"
       >
-        <CardMedia
-          className="Temporary_class_for_detection"
-          style={this.styles(url)}
-          onClick={this.handleOpen}
-          image={config.getFotoOmslag(url, 408)}
-          alt={"foto av" + tittel}
-        />
+        <div className="sidebar_element page_topic_header">
+          Header her? Midlertidig.
+        </div>
 
-        {/*
-      // for fremtidig oppgradering om vi ønsker det, isåfal må vi detektere transparang bakgrunn på et vis
         <div
-          className="sidebar_top_image"
+          className={
+            (this.erTransparent(url) &&
+              "sidebar_top_image  trasparent_image") ||
+            "sidebar_top_image"
+          }
+          onClick={this.handleOpen}
           style={{ backgroundImage: "url(" + new_url + ")" }}
+          alt={"foto av" + tittel}
         />
-        */}
 
         <Tittelblokk
           tittel={språk(tittel)}
diff --git a/src/style/Sidebar.css b/src/style/Sidebar.css
index 268a55e80..afd72895e 100644
--- a/src/style/Sidebar.css
+++ b/src/style/Sidebar.css
@@ -115,3 +115,23 @@
   white-space: none;
   color: #81b2bb;
 }
+
+.page_topic_header {
+  height: 100px;
+  width: 100%;
+  padding-top: 80px;
+}
+
+.sidebar_top_image {
+  height: 297px;
+}
+
+.sidebar_top_image.trasparent_image {
+  filter: drop-shadow(rgba(0, 0, 0, 0.5) 5px 5px 4px);
+  background-size: contain;
+  background-position: center;
+  background-repeat: no-repeat;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  height: calc(297px - 20px);
+}

From bc94fec194eec961081f09fb41b1b8ecce7a5073 Mon Sep 17 00:00:00 2001
From: helemork <helemork@gmail.com>
Date: Thu, 11 Apr 2019 14:06:19 +0200
Subject: [PATCH 2/5] =?UTF-8?q?har=20container=20og=20style=20for=20top=20?=
 =?UTF-8?q?header,=20men=20den=20er=20midlertidig=20skjult=20inntil=20vi?=
 =?UTF-8?q?=20er=20enige=20om=20bruk.=20bildene=20er=20fine=20n=C3=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Kodetre/Kodeliste/Kodekort.js |  4 +---
 src/style/App.css                 | 15 ---------------
 src/style/Sidebar.css             | 22 ++++++++++++----------
 3 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/Kodetre/Kodeliste/Kodekort.js b/src/Kodetre/Kodeliste/Kodekort.js
index 7d338d354..2d9b65d70 100644
--- a/src/Kodetre/Kodeliste/Kodekort.js
+++ b/src/Kodetre/Kodeliste/Kodekort.js
@@ -45,9 +45,7 @@ class Kodekort extends React.Component {
         square={false}
         className="sidebar_top_area sidebar_background_element"
       >
-        <div className="sidebar_element page_topic_header">
-          Header her? Midlertidig.
-        </div>
+        <div className="sidebar_element page_topic_header" />
 
         <div
           className={
diff --git a/src/style/App.css b/src/style/App.css
index c90108338..5d5e0df20 100644
--- a/src/style/App.css
+++ b/src/style/App.css
@@ -62,15 +62,6 @@ div {
   max-width: 100%;
 }
 
-.sidebar {
-  position: fixed;
-  height: 100vh;
-  overflow-x: hidden;
-  max-width: 408px;
-  background: #ededed;
-  width: 100%;
-}
-
 .mobile_navigation {
   display: none;
 }
@@ -80,12 +71,6 @@ div {
     top: calc(100vh - 150px) !important;
   }
 
-  .sidebar {
-    width: 100%;
-    max-width: 100%;
-    padding-top: 56px;
-  }
-
   .mobile_navigation {
     display: block;
     width: 100%;
diff --git a/src/style/Sidebar.css b/src/style/Sidebar.css
index afd72895e..4e0ad69d5 100644
--- a/src/style/Sidebar.css
+++ b/src/style/Sidebar.css
@@ -1,19 +1,19 @@
 /* Normalize across browsers */
 
-.sidebar div {
-  box-sizing: border-box;
-  margin: 0px;
-}
-
 .sidebar {
   position: fixed;
   height: 100vh;
   overflow-x: hidden;
   max-width: 408px;
-  background: #ededed;
+  background: #fbfbfb;
   width: 100%;
 }
 
+.sidebar div {
+  box-sizing: border-box;
+  margin: 0px;
+}
+
 @media only screen and (max-width: 678px) {
   .sidebar {
     width: 100%;
@@ -117,13 +117,15 @@
 }
 
 .page_topic_header {
-  height: 100px;
+  height: 60px;
   width: 100%;
-  padding-top: 80px;
+  padding-top: 0px;
 }
 
 .sidebar_top_image {
-  height: 297px;
+  height: 250px;
+  background-size: cover;
+  background-position: center;
 }
 
 .sidebar_top_image.trasparent_image {
@@ -133,5 +135,5 @@
   background-repeat: no-repeat;
   margin-top: 10px;
   margin-bottom: 10px;
-  height: calc(297px - 20px);
+  height: calc(250px - 20px);
 }

From c8bf1b1a717bb731ae29d1109b85efce129e93f3 Mon Sep 17 00:00:00 2001
From: helemork <helemork@gmail.com>
Date: Thu, 11 Apr 2019 14:39:23 +0200
Subject: [PATCH 3/5] plassert alt av kategorier inn i sidebar, fikset lenker

---
 src/MainDrawer/MainDrawer.js | 81 ++++++++++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 18 deletions(-)

diff --git a/src/MainDrawer/MainDrawer.js b/src/MainDrawer/MainDrawer.js
index ac51f38ee..19364cdb9 100644
--- a/src/MainDrawer/MainDrawer.js
+++ b/src/MainDrawer/MainDrawer.js
@@ -15,9 +15,14 @@ import {
   CloudUpload,
   CloudDownload,
   Comment,
-  Waves,
   Panorama,
-  Info
+  Info,
+  Pets,
+  Landscape,
+  BubbleChart,
+  Layers,
+  Healing,
+  AssignmentInd
 } from "@material-ui/icons";
 import React, { Component } from "react";
 import { withRouter } from "react-router-dom";
@@ -71,20 +76,58 @@ class MainDrawer extends Component {
                 />
                 <Menyelement
                   onClick={this.handleClickLandskap}
-                  icon={<Waves />}
+                  icon={<Landscape />}
                   primary="Landskap"
                 />
+                <Menyelement
+                  onClick={this.handleClickFylke}
+                  icon={<Layers />}
+                  primary="Fylke"
+                />
+                <Menyelement
+                  onClick={this.handleClickNaturvernområde}
+                  icon={<Healing />}
+                  primary="Naturvernområde"
+                />
+                <Menyelement
+                  onClick={this.handleClickTruet_art_natur}
+                  icon={<BubbleChart />}
+                  primary="Truet art/natur"
+                />
+                <Menyelement
+                  onClick={this.handleClickArt}
+                  icon={<Pets />}
+                  primary="Art"
+                />
+                <Divider />
                 <Menyelement
                   icon={<Info />}
                   primary="Informasjon"
                   onClick={this.handleClickInfoTab}
                 />
                 <Divider />
+                <ListSubheader>Datagrunnlag</ListSubheader>
                 <Menyelement
                   icon={<CloudDownload />}
                   primary="Last ned data"
                   onClick={this.handleClickLastNed}
                 />
+                <Menyelement
+                  onClick={this.handleClickLastOpp}
+                  icon={<CloudUpload />}
+                  primary="Levere data"
+                />
+
+                <Menyelement
+                  onClick={this.handleClickDatakilde}
+                  icon={<AssignmentInd />}
+                  primary="Datakilder"
+                />
+                <Menyelement
+                  onClick={this.handleClickSource}
+                  icon={<GitHub />}
+                  primary="Kildekode"
+                />
                 <Divider />
                 <Innstillinger
                   visKoder={context.visKoder}
@@ -93,24 +136,13 @@ class MainDrawer extends Component {
                   onNavigate={this.handleNavigate}
                 />
                 <Divider />
-                <ListSubheader>Bidra</ListSubheader>
+                <ListSubheader>Kontakt</ListSubheader>
                 <Menyelement
                   onClick={this.handleClickBidra}
                   icon={<Comment />}
                   primary="Tilbakemeldinger"
                 />
-                <Menyelement
-                  onClick={this.handleClickSource}
-                  icon={<GitHub />}
-                  primary="Kildekode"
-                />
-                <Menyelement
-                  onClick={this.handleClickLastOpp}
-                  icon={<CloudUpload />}
-                  primary="Levere data"
-                />
-                <Divider />
-                <ListSubheader>Driftes av</ListSubheader>
+
                 <ListItem onClick={this.handleClickLogo} button>
                   <div className={classes.link}>
                     <BildeAvatar
@@ -119,7 +151,7 @@ class MainDrawer extends Component {
                       size="small"
                     />
                   </div>
-                  <ListItemText primary="Artsdatabanken" />
+                  <ListItemText primary="   Artsdatabanken" />
                 </ListItem>
               </div>
             </List>
@@ -135,7 +167,7 @@ class MainDrawer extends Component {
   handleClickLastNed = () => window.open("https://data.artsdatabanken.no/");
   handleClickLastOpp = () =>
     window.open(
-      "https://github.com/Artsdatabanken/nin-kart-frontend/blob/master/docs/BidraMedData.md"
+      "https://github.com/Artsdatabanken/nin-kart-frontend/wiki/%C3%98nsker-du-%C3%A5-bidra-med-data%3F"
     );
   handleClickLogo = () => window.open("https://artsdatabanken.no");
   handleClickMap = () => this.props.history.push("/");
@@ -145,6 +177,19 @@ class MainDrawer extends Component {
   handleClickLandskap = () =>
     this.props.history.push("/Natur_i_Norge/Landskap/");
   handleClickStat = () => this.props.history.push("/Natur_i_Norge/Stats/");
+
+  handleClickFylke = () => this.props.history.push("/Fylke/");
+  handleClickNaturvernområde = () =>
+    this.props.history.push("/Naturvernområde/");
+  handleClickTruet_art_natur = () =>
+    this.props.history.push("/Truet_art_natur/");
+  handleClickArt = () => this.props.history.push("/Biota/");
+  handleClickDatakilde = () => this.props.history.push("/Datakilde/");
+  handleClickNaturvernområde = () =>
+    this.props.history.push("/Naturvernområde/");
+  handleClickNaturvernområde = () =>
+    this.props.history.push("/Naturvernområde/");
+
   handleNavigate = url => this.props.history.push(url);
 }
 

From 9dd5dc963e86b1cd6c3be57815d91a1e48bf5dae Mon Sep 17 00:00:00 2001
From: helemork <helemork@gmail.com>
Date: Thu, 11 Apr 2019 15:14:24 +0200
Subject: [PATCH 4/5] =?UTF-8?q?korrigerte=20bildelenken=20til=20=C3=A5=20h?=
 =?UTF-8?q?ente=20ut=20riktige=20bilder=20fra=20json,=20og=20skjuler=20bil?=
 =?UTF-8?q?de-elementet=20n=C3=A5r=20det=20ikke=20finnes=20noen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Kodetre/Kodeliste/KodeVindu.js |  1 +
 src/Kodetre/Kodeliste/Kodekort.js  | 16 +++++++++++++---
 src/style/Sidebar.css              |  2 ++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/Kodetre/Kodeliste/KodeVindu.js b/src/Kodetre/Kodeliste/KodeVindu.js
index 6df2dd9c6..f3282f814 100644
--- a/src/Kodetre/Kodeliste/KodeVindu.js
+++ b/src/Kodetre/Kodeliste/KodeVindu.js
@@ -86,6 +86,7 @@ const KodeVindu = ({
               erAktivert={erAktivert}
               onFitBounds={onFitBounds}
               onToggleLayer={onToggleLayer}
+              bilde={meta.foto}
             />
             {kode === "NN-LA-TI" && (
               <Detaljeringsgrad
diff --git a/src/Kodetre/Kodeliste/Kodekort.js b/src/Kodetre/Kodeliste/Kodekort.js
index 2d9b65d70..c05dd0238 100644
--- a/src/Kodetre/Kodeliste/Kodekort.js
+++ b/src/Kodetre/Kodeliste/Kodekort.js
@@ -36,10 +36,16 @@ class Kodekort extends React.Component {
       tittel,
       nivå,
       overordnet,
-      onNavigate
+      onNavigate,
+      bilde
     } = this.props;
     const tc = new tinycolor(farge);
-    var new_url = config.getFotoOmslag(url, 408);
+
+    var new_url = "no_image";
+    if (bilde.forside != null) {
+      new_url = bilde.forside.url;
+    }
+
     return (
       <div
         square={false}
@@ -54,7 +60,11 @@ class Kodekort extends React.Component {
             "sidebar_top_image"
           }
           onClick={this.handleOpen}
-          style={{ backgroundImage: "url(" + new_url + ")" }}
+          style={
+            (new_url !== "no_image" && {
+              backgroundImage: "url(" + new_url + ")"
+            }) || { height: 0 }
+          }
           alt={"foto av" + tittel}
         />
 
diff --git a/src/style/Sidebar.css b/src/style/Sidebar.css
index 4e0ad69d5..e226218ca 100644
--- a/src/style/Sidebar.css
+++ b/src/style/Sidebar.css
@@ -124,12 +124,14 @@
 
 .sidebar_top_image {
   height: 250px;
+  background: #b7d3d8;
   background-size: cover;
   background-position: center;
 }
 
 .sidebar_top_image.trasparent_image {
   filter: drop-shadow(rgba(0, 0, 0, 0.5) 5px 5px 4px);
+  background: transparent;
   background-size: contain;
   background-position: center;
   background-repeat: no-repeat;

From 3e218f7d79f2d3903bc3dbf4b406cac451b90ce7 Mon Sep 17 00:00:00 2001
From: helemork <helemork@gmail.com>
Date: Thu, 11 Apr 2019 15:25:30 +0200
Subject: [PATCH 5/5] removing unused items

---
 src/Kodetre/Kodeliste/Kodekort.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Kodetre/Kodeliste/Kodekort.js b/src/Kodetre/Kodeliste/Kodekort.js
index c05dd0238..419f6d761 100644
--- a/src/Kodetre/Kodeliste/Kodekort.js
+++ b/src/Kodetre/Kodeliste/Kodekort.js
@@ -1,6 +1,4 @@
-import { CardMedia } from "@material-ui/core";
 import React from "react";
-import config from "../../config";
 import språk from "../../språk";
 import Tittelblokk from "./Tittelblokk";
 import tinycolor from "tinycolor2";