From a89cb4e727cb28c44a1262b8976b06cecacbf16a Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Thu, 8 Feb 2018 16:46:24 +0200
Subject: [PATCH 01/27] Set min height for the editor

---
 assets/sass/hel/hearing-form.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/sass/hel/hearing-form.scss b/assets/sass/hel/hearing-form.scss
index ae2c1fa47..cdbafc0b8 100644
--- a/assets/sass/hel/hearing-form.scss
+++ b/assets/sass/hel/hearing-form.scss
@@ -138,6 +138,7 @@ $node_modules: "../../../node_modules";
   .rich-text-editor {
     .DraftEditor-editorContainer {
       border: 2px solid $black;
+      min-height: 90px;
     }
   }
 

From 2152a36f154a313dd228100bd0290e979ed449c7 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Thu, 8 Feb 2018 16:53:55 +0200
Subject: [PATCH 02/27] =?UTF-8?q?Replace=20rekister=C3=B6ityneet=20with=20?=
 =?UTF-8?q?kirjautuneet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/fi.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 9f74b9151..2c96942da 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -39,7 +39,7 @@
   "hearingCommenting": "Kommentointi",
   "openCommenting": "Avoin kommentointi",
   "noCommenting": "Ei kommentointia",
-  "registeredUsersOnly": "Vain rekisteröityneet käyttäjät",
+  "registeredUsersOnly": "Vain kirjautuneet käyttäjät",
   "hearingContacts": "Yhteyshenkilöt",
   "hearingContactsPlaceholder": "Valitse kuulemisen yhteyshenkilöt",
   "hearingImage": "Kuulemisen kuva",

From 58c49b2826086ac0173df9ca0c75555a0d3dc3c8 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Mon, 12 Feb 2018 10:39:24 +0200
Subject: [PATCH 03/27] Replace success and error messages with react-toastify

---
 package.json        |  1 +
 src/App.js          |  2 ++
 src/utils/notify.js | 28 ++++++++++++++++++++++++----
 yarn.lock           | 41 ++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7e549baae..f362762db 100644
--- a/package.json
+++ b/package.json
@@ -105,6 +105,7 @@
     "react-router-redux": "^5.0.0-alpha.6",
     "react-select": "^1.0.0-rc.2",
     "react-slick": "^0.15.4",
+    "react-toastify": "^3.3.2",
     "react-waypoint": "^4.1.0",
     "redux": "^3.0.4",
     "redux-actions": "0.13.0",
diff --git a/src/App.js b/src/App.js
index 7a7dbe0ef..c758c28a1 100644
--- a/src/App.js
+++ b/src/App.js
@@ -11,6 +11,7 @@ import config from './config';
 import {getUser} from './selectors/user';
 import Routes from './routes';
 import {withRouter} from 'react-router-dom';
+import {ToastContainer} from 'react-toastify';
 
 class App extends React.Component {
   getChildContext() {
@@ -58,6 +59,7 @@ class App extends React.Component {
             <Routes />
           </main>
           <Footer />
+          <ToastContainer />
         </div>
       </IntlProvider>
     );
diff --git a/src/utils/notify.js b/src/utils/notify.js
index b67712a48..a82d1b4c2 100644
--- a/src/utils/notify.js
+++ b/src/utils/notify.js
@@ -1,5 +1,21 @@
 // This module uses `require` and late imports to support isomorphic rendering.
 import getMessage from "./getMessage";
+import {toast} from 'react-toastify';
+
+const successOptions = {
+  autoClose: 6000,
+  type: toast.TYPE.SUCCESS,
+  hideProgressBar: false,
+  position: toast.POSITION.BOTTOM_RIGHT,
+  pauseOnHover: true,
+};
+
+const errorOptions = {
+  autoClose: false,
+  type: toast.TYPE.ERROR,
+  hideProgressBar: false,
+  position: toast.POSITION.BOTTOM_RIGHT,
+};
 
 export function alert(message, title = "Kerrokantasi") {
   if (typeof window !== 'undefined') {
@@ -9,13 +25,15 @@ export function alert(message, title = "Kerrokantasi") {
 
 export function notifyError(message) {
   if (typeof window !== 'undefined') {
-    require("alertifyjs").notify(message, 'error', 0);
+    // require("alertifyjs").notify(message, 'error', 0);
+    toast.error(message, errorOptions); // add type: 'success' to options
   }
 }
 
 export function notifySuccess(message) {
   if (typeof window !== 'undefined') {
-    require("alertifyjs").notify(message, 'success', 5);
+    // require("alertifyjs").notify(message, 'success', 5);
+    toast.success(message, successOptions); // add type: 'success' to options
   }
 }
 
@@ -24,9 +42,11 @@ export function localizedAlert(string) {
 }
 
 export function localizedNotifyError(string) {
-  return notifyError(getMessage(string));
+  // return notifyError(getMessage(string));
+  toast.error(getMessage(string), errorOptions); // add type: 'success' to options
 }
 
 export function localizedNotifySuccess(string) {
-  return notifySuccess(getMessage(string));
+  // notifySuccess(getMessage(string));
+  toast.success(getMessage(string), successOptions); // add type: 'success' to options
 }
diff --git a/yarn.lock b/yarn.lock
index fd2afceb9..9cbbcf5de 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1131,6 +1131,10 @@ bops@~0.1.1:
     base64-js "0.0.2"
     to-utf8 "0.0.1"
 
+bowser@^1.7.3:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.9.2.tgz#d66fc868ca5f4ba895bee1363c343fe7b37d3394"
+
 boxen@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-0.3.1.tgz#a7d898243ae622f7abb6bb604d740a76c6a5461b"
@@ -1819,6 +1823,12 @@ css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
+css-in-js-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-2.0.0.tgz#5af1dd70f4b06b331f48d22a3d86e0786c0b9435"
+  dependencies:
+    hyphenate-style-name "^1.0.2"
+
 css-loader@^0.28.4:
   version "0.28.7"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
@@ -2771,7 +2781,7 @@ fbjs@0.1.0-alpha.10:
     promise "^7.0.3"
     whatwg-fetch "^0.9.0"
 
-fbjs@^0.8.1, fbjs@^0.8.15, fbjs@^0.8.16, fbjs@^0.8.9:
+fbjs@^0.8.1, fbjs@^0.8.12, fbjs@^0.8.15, fbjs@^0.8.16, fbjs@^0.8.9:
   version "0.8.16"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
   dependencies:
@@ -3069,6 +3079,16 @@ github@0.2.4:
   dependencies:
     mime "^1.2.11"
 
+glamor@^2.20.40:
+  version "2.20.40"
+  resolved "https://registry.yarnpkg.com/glamor/-/glamor-2.20.40.tgz#f606660357b7cf18dface731ad1a2cfa93817f05"
+  dependencies:
+    fbjs "^0.8.12"
+    inline-style-prefixer "^3.0.6"
+    object-assign "^4.1.1"
+    prop-types "^15.5.10"
+    through "^2.3.8"
+
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -3453,6 +3473,10 @@ https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
+hyphenate-style-name@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
+
 iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
@@ -3534,6 +3558,13 @@ ini@^1.3.0, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
+inline-style-prefixer@^3.0.6:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-3.0.8.tgz#8551b8e5b4d573244e66a34b04f7d32076a2b534"
+  dependencies:
+    bowser "^1.7.3"
+    css-in-js-utils "^2.0.0"
+
 inquirer@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.0.3.tgz#ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"
@@ -6296,6 +6327,14 @@ react-test-utils@0.0.1:
     envify "~0.2.0"
     react "~0.8.0"
 
+react-toastify@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-3.3.2.tgz#c1d68729213a9f21b9c69380b9ee1f100144475d"
+  dependencies:
+    glamor "^2.20.40"
+    prop-types "^15.6.0"
+    react-transition-group "^2.2.1"
+
 react-transition-group@^2.0.0, react-transition-group@^2.2.0, react-transition-group@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10"

From a4b71a59ac68348a07d2205730316e49a8d4f5fa Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Mon, 12 Feb 2018 11:45:47 +0200
Subject: [PATCH 04/27] Fix navbar on IE

---
 src/components/Header/index.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/Header/index.js b/src/components/Header/index.js
index 5ba45f0e7..05ce39fa5 100644
--- a/src/components/Header/index.js
+++ b/src/components/Header/index.js
@@ -14,11 +14,16 @@ import throttle from 'lodash/throttle';
 import scrolltop from 'scrolltop';
 
 class Header extends React.Component {
+
   componentDidMount() {
     if (typeof window !== 'undefined') {
       this._handleNavFix = throttle(() => {
         const scrollY = scrolltop();
-        document.body.classList.toggle('nav-fixed', scrollY > 115);
+        if (scrollY > 115) {
+          document.body.classList.add('nav-fixed');
+        } else {
+          document.body.classList.remove('nav-fixed');
+        }
       }, 25);
       window.addEventListener('scroll', this._handleNavFix, false);
     }

From 7c73731cf2f0d2fcefb0fca0b10a638ba738294c Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Mon, 12 Feb 2018 11:50:39 +0200
Subject: [PATCH 05/27] Update snapshots

---
 .../Hearing/__snapshots__/HearingContainer.react-test.js.snap | 4 ++--
 .../Hearings/__snapshots__/HearingList.react-test.js.snap     | 2 +-
 __tests__/Hearings/__snapshots__/Hearings.react-test.js.snap  | 2 +-
 .../Home/__snapshots__/FullWidthHearing.react-test.js.snap    | 2 +-
 .../__snapshots__/SortableCommentList.react-test.js.snap      | 2 +-
 src/components/Header/index.js                                | 1 -
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap b/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
index 715a2cb22..44f4b7196 100644
--- a/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
+++ b/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
@@ -348,7 +348,7 @@ exports[`HearingContainer component should render as expected 1`] = `
               "publishingQueue": "Julkaisujono",
               "register": "Rekisteröidy",
               "registered": "rekisteröitynyt",
-              "registeredUsersOnly": "Vain rekisteröityneet käyttäjät",
+              "registeredUsersOnly": "Vain kirjautuneet käyttäjät",
               "removeImage": "Poista kuva",
               "revertPublishing": "Peru julkaisu",
               "saveAndPreviewHearing": "Tallenna ja tarkastele luonnosta",
@@ -738,7 +738,7 @@ exports[`HearingContainer component should render as expected 1`] = `
               "publishingQueue": "Julkaisujono",
               "register": "Rekisteröidy",
               "registered": "rekisteröitynyt",
-              "registeredUsersOnly": "Vain rekisteröityneet käyttäjät",
+              "registeredUsersOnly": "Vain kirjautuneet käyttäjät",
               "removeImage": "Poista kuva",
               "revertPublishing": "Peru julkaisu",
               "saveAndPreviewHearing": "Tallenna ja tarkastele luonnosta",
diff --git a/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap b/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap
index cdc5b5f79..b0a227689 100644
--- a/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap
+++ b/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap
@@ -177,7 +177,7 @@ exports[`HearingsList component should render as expected 1`] = `
                   "publishingQueue": "Julkaisujono",
                   "register": "Rekisteröidy",
                   "registered": "rekisteröitynyt",
-                  "registeredUsersOnly": "Vain rekisteröityneet käyttäjät",
+                  "registeredUsersOnly": "Vain kirjautuneet käyttäjät",
                   "removeImage": "Poista kuva",
                   "revertPublishing": "Peru julkaisu",
                   "saveAndPreviewHearing": "Tallenna ja tarkastele luonnosta",
diff --git a/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap b/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap
index c9981e6d3..3b587cd60 100644
--- a/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap
+++ b/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap
@@ -235,7 +235,7 @@ exports[`Hearings component should render as expected 1`] = `
           "publishingQueue": "Julkaisujono",
           "register": "Rekisteröidy",
           "registered": "rekisteröitynyt",
-          "registeredUsersOnly": "Vain rekisteröityneet käyttäjät",
+          "registeredUsersOnly": "Vain kirjautuneet käyttäjät",
           "removeImage": "Poista kuva",
           "revertPublishing": "Peru julkaisu",
           "saveAndPreviewHearing": "Tallenna ja tarkastele luonnosta",
diff --git a/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap b/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap
index ae8fb26c0..d439d5e67 100644
--- a/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap
+++ b/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap
@@ -161,7 +161,7 @@ exports[`FullWidthHearing component should render as expected 1`] = `
         "publishingQueue": "Julkaisujono",
         "register": "Rekisteröidy",
         "registered": "rekisteröitynyt",
-        "registeredUsersOnly": "Vain rekisteröityneet käyttäjät",
+        "registeredUsersOnly": "Vain kirjautuneet käyttäjät",
         "removeImage": "Poista kuva",
         "revertPublishing": "Peru julkaisu",
         "saveAndPreviewHearing": "Tallenna ja tarkastele luonnosta",
diff --git a/__tests__/__snapshots__/SortableCommentList.react-test.js.snap b/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
index 36eb5042d..01a7fad4e 100644
--- a/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
+++ b/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
@@ -276,7 +276,7 @@ exports[`SortableCommentList component should render as expected 1`] = `
                 "publishingQueue": "Julkaisujono",
                 "register": "Rekisteröidy",
                 "registered": "rekisteröitynyt",
-                "registeredUsersOnly": "Vain rekisteröityneet käyttäjät",
+                "registeredUsersOnly": "Vain kirjautuneet käyttäjät",
                 "removeImage": "Poista kuva",
                 "revertPublishing": "Peru julkaisu",
                 "saveAndPreviewHearing": "Tallenna ja tarkastele luonnosta",
diff --git a/src/components/Header/index.js b/src/components/Header/index.js
index 05ce39fa5..2f50801e8 100644
--- a/src/components/Header/index.js
+++ b/src/components/Header/index.js
@@ -14,7 +14,6 @@ import throttle from 'lodash/throttle';
 import scrolltop from 'scrolltop';
 
 class Header extends React.Component {
-
   componentDidMount() {
     if (typeof window !== 'undefined') {
       this._handleNavFix = throttle(() => {

From 04f569989fa23943a3330ecba0ff6c3b44d61fcc Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Mon, 12 Feb 2018 13:22:05 +0200
Subject: [PATCH 06/27] Fix social buttons so they update the shared url when
 changing subsection

---
 assets/sass/hel/common.scss          |  4 +++-
 package.json                         |  1 +
 src/components/SocialBar/Facebook.js |  5 +++++
 src/components/SocialBar/Twitter.js  | 17 ++---------------
 yarn.lock                            | 19 ++++++++++++++++++-
 5 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/assets/sass/hel/common.scss b/assets/sass/hel/common.scss
index 266d592c5..91a9fe0a3 100644
--- a/assets/sass/hel/common.scss
+++ b/assets/sass/hel/common.scss
@@ -135,10 +135,12 @@ a.fullwidth {
 }
 
 .social-bar {
+  display: flex;
+  flex-direction: row;
   margin: 12px 0;
 }
 
 // These styles could be eventually introduced to common Bootstrap theme
 .btn.btn-default {
   background-color: transparent;
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index f362762db..9aa0958ce 100644
--- a/package.json
+++ b/package.json
@@ -106,6 +106,7 @@
     "react-select": "^1.0.0-rc.2",
     "react-slick": "^0.15.4",
     "react-toastify": "^3.3.2",
+    "react-twitter-widgets": "^1.7.1",
     "react-waypoint": "^4.1.0",
     "redux": "^3.0.4",
     "redux-actions": "0.13.0",
diff --git a/src/components/SocialBar/Facebook.js b/src/components/SocialBar/Facebook.js
index 304bfeeda..2bed687f3 100644
--- a/src/components/SocialBar/Facebook.js
+++ b/src/components/SocialBar/Facebook.js
@@ -11,6 +11,11 @@ export default class Facebook extends React.Component {
     loadScriptThenCall("facebook-jssdk", "//connect.facebook.net/en_US/sdk.js", "FB", setup);
   }
 
+  componentDidUpdate() {
+    const setup = this.setupFacebookWidget.bind(this);
+    loadScriptThenCall("facebook-jssdk", "//connect.facebook.net/en_US/sdk.js", "FB", setup);
+  }
+
   setupFacebookWidget(FB) {
     FB.init({version: 'v2.4'});
     FB.XFBML.parse(this.refs.container);
diff --git a/src/components/SocialBar/Twitter.js b/src/components/SocialBar/Twitter.js
index 83722c8f9..06bb64fee 100644
--- a/src/components/SocialBar/Twitter.js
+++ b/src/components/SocialBar/Twitter.js
@@ -1,21 +1,8 @@
 import React from "react";
-import {loadScriptThenCall} from "./utils";
+import {Share} from 'react-twitter-widgets';
 
 export default class Twitter extends React.Component {
-  componentWillMount() {
-    this.setState({id: Math.random().toString(36)});
-  }
-
-  componentDidMount() {
-    const setup = this.setupTwitterWidget.bind(this);
-    loadScriptThenCall("twitter-wjs", "//platform.twitter.com/widgets.js", "twttr", setup);
-  }
-
-  setupTwitterWidget(twttr) {
-    twttr.widgets.createShareButton(typeof window !== 'undefined' ? window.location.href : '', this.refs.container, {});
-  }
-
   render() {
-    return <span ref="container" className="twitter-tweet-ctr" id={"twitter-" + this.state.id}/>;
+    return <div style={{marginRight: '8px'}}><Share className="twitter-tweet-ctr" url={window.location.href} /></div>; // <span ref="container" className="twitter-tweet-ctr" id={"twitter-" + this.state.id}/>;
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 9cbbcf5de..46a234bab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2661,6 +2661,10 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+exenv@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
+
 exit-hook@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
@@ -5904,7 +5908,7 @@ prop-types-extra@^1.0.1:
   dependencies:
     warning "^3.0.0"
 
-prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0:
+prop-types@^15.3.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0:
   version "15.6.0"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
   dependencies:
@@ -6346,6 +6350,15 @@ react-transition-group@^2.0.0, react-transition-group@^2.2.0, react-transition-g
     prop-types "^15.5.8"
     warning "^3.0.0"
 
+react-twitter-widgets@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/react-twitter-widgets/-/react-twitter-widgets-1.7.1.tgz#60061f37a8c4f361c27f3d1d7ceba98d3cd80a40"
+  dependencies:
+    exenv "^1.2.1"
+    lodash "^4.17.4"
+    prop-types "^15.3.0"
+    scriptjs "^2.5.8"
+
 react-waypoint@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/react-waypoint/-/react-waypoint-4.1.0.tgz#40f0b78c20add9d6cfd861e6e806f894495119c0"
@@ -6816,6 +6829,10 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
+scriptjs@^2.5.8:
+  version "2.5.8"
+  resolved "https://registry.yarnpkg.com/scriptjs/-/scriptjs-2.5.8.tgz#d0c43955c2e6bad33b6e4edf7b53b8965aa7ca5f"
+
 scroll@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/scroll/-/scroll-2.0.1.tgz#b4c7d27e8bcf3ae8a58a042f27268ae3f55f9ccd"

From 108554f2b57a9c6ff8bce0338ce45f5bf13d9887 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Mon, 12 Feb 2018 13:49:11 +0200
Subject: [PATCH 07/27] Add title for pages

---
 src/components/HearingList.js | 2 ++
 src/i18n/en.json              | 4 +++-
 src/i18n/fi.json              | 4 +++-
 src/i18n/sv.json              | 4 +++-
 src/views/Info/index.js       | 9 +++++++--
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/HearingList.js b/src/components/HearingList.js
index 337c1c763..78d7f988c 100644
--- a/src/components/HearingList.js
+++ b/src/components/HearingList.js
@@ -15,6 +15,7 @@ import config from '../config';
 import OverviewMap from '../components/OverviewMap';
 import {keys, capitalize} from 'lodash';
 import Waypoint from 'react-waypoint';
+import Helmet from 'react-helmet';
 
 import {labelShape} from '../types';
 
@@ -171,6 +172,7 @@ export const HearingList = ({
 
   const hearingListMap = hearingsToShow ? (
     <Col xs={12}>
+      <Helmet title={formatMessage({ id: 'mapView' })} />
       <div className="hearing-list-map map">
         <Checkbox inline readOnly checked={showOnlyOpen} onChange={toggleShowOnlyOpen} style={{marginBottom: 10}}>
           <FormattedMessage id="showOnlyOpen" />
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 93854defd..910e0ebab 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -126,5 +126,7 @@
   "searchPlaceholder": "Search...",
   "help": "Help",
   "moveUp": "Move up",
-  "moveDown": "Move down"
+  "moveDown": "Move down",
+  "infoPage": "About service",
+  "mapView": "All hearings on map"
 }
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 2c96942da..de4e5797f 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -189,5 +189,7 @@
   "sectionContentPlaceholder": "Varsinainen tekstisisältö, johon voit lisätä muotoiluja, linkkejä ja kuvia",
   "hearingOpeningTimePlaceholder": "Valitse...",
   "hearingClosingTimePlaceholder": "Valitse...",
-  "slugInUse": "Valitsemasi osoite oli käytössä ja siksi vaihdettiin."
+  "slugInUse": "Valitsemasi osoite oli käytössä ja siksi vaihdettiin.",
+  "infoPage": "Tietoa palvelusta",
+  "mapView": "Kaikki kuulemiset kartalla"
 }
diff --git a/src/i18n/sv.json b/src/i18n/sv.json
index 986f81cee..032d41ee6 100644
--- a/src/i18n/sv.json
+++ b/src/i18n/sv.json
@@ -119,5 +119,7 @@
   "searchPlaceholder": "Söka...",
   "help": "Hjälp",
   "moveUp": "Flytta upp",
-  "moveDown": "Flytta ner"
+  "moveDown": "Flytta ner",
+  "infoPage": "Tietoa palvelusta",
+  "mapView": "Kaikki kuulemiset kartalla"
 }
diff --git a/src/views/Info/index.js b/src/views/Info/index.js
index 1b123d3a1..646e41b2f 100644
--- a/src/views/Info/index.js
+++ b/src/views/Info/index.js
@@ -4,6 +4,8 @@ import {connect} from 'react-redux';
 import Col from 'react-bootstrap/lib/Col';
 import Row from 'react-bootstrap/lib/Row';
 import trackLink from '../../utils/trackLink';
+import {injectIntl, intlShape} from 'react-intl';
+import Helmet from 'react-helmet';
 
 function getContent(language) {
   if (typeof window === "undefined") return "";
@@ -20,8 +22,10 @@ class Info extends React.Component {
 
   render() {
     const content = getContent(this.props.language);
+    const {intl} = this.props;
     return (
       <div className="container">
+        <Helmet title={intl.formatMessage({ id: 'infoPage' })} />
         <Row>
           <Col md={8}>
             <div dangerouslySetInnerHTML={{__html: content}}/>
@@ -33,7 +37,8 @@ class Info extends React.Component {
 }
 
 Info.propTypes = {
-  language: PropTypes.string
+  language: PropTypes.string,
+  intl: intlShape
 };
 
-export default connect((state) => ({language: state.language}))(Info);
+export default injectIntl(connect((state) => ({language: state.language}))(Info));

From 30de01537b7f65c688e39ba906f75c2ee4e612ba Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Mon, 12 Feb 2018 14:03:06 +0200
Subject: [PATCH 08/27] Add swedish translations

---
 src/i18n/sv.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/sv.json b/src/i18n/sv.json
index 032d41ee6..d409e747c 100644
--- a/src/i18n/sv.json
+++ b/src/i18n/sv.json
@@ -120,6 +120,6 @@
   "help": "Hjälp",
   "moveUp": "Flytta upp",
   "moveDown": "Flytta ner",
-  "infoPage": "Tietoa palvelusta",
-  "mapView": "Kaikki kuulemiset kartalla"
+  "infoPage": "Information om tjänsten",
+  "mapView": "Alla höranden på kartan"
 }

From 013b20bca6fa1e20f9b5c007d9d8eaa2f240774c Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Mon, 12 Feb 2018 14:08:06 +0200
Subject: [PATCH 09/27] Update snapshots

---
 .../Hearing/__snapshots__/HearingContainer.react-test.js.snap | 4 ++++
 .../Hearings/__snapshots__/HearingList.react-test.js.snap     | 2 ++
 __tests__/Hearings/__snapshots__/Hearings.react-test.js.snap  | 2 ++
 .../Home/__snapshots__/FullWidthHearing.react-test.js.snap    | 2 ++
 .../__snapshots__/SortableCommentList.react-test.js.snap      | 2 ++
 src/components/SocialBar/Twitter.js                           | 2 +-
 6 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap b/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
index 44f4b7196..74dc5c7cc 100644
--- a/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
+++ b/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
@@ -304,6 +304,7 @@ exports[`HearingContainer component should render as expected 1`] = `
               "inLanguage-sv": "ruotsiksi",
               "infoHeaderDescription": "Tämä on palvelun väliaikainen prototyyppi, josta toivomme käyttäjien kommentteja",
               "infoHeaderText": "Tietoa palvelusta",
+              "infoPage": "Tietoa palvelusta",
               "labelPlaceholder": "Anna asiasanan nimi...",
               "lang-en": "English",
               "lang-fi": "Suomi",
@@ -317,6 +318,7 @@ exports[`HearingContainer component should render as expected 1`] = `
               "logout": "Kirjaudu ulos",
               "mainSection": "Pääosio",
               "map": "Kartta",
+              "mapView": "Kaikki kuulemiset kartalla",
               "mostCommented": "Eniten kommentoitu",
               "moveDown": "Siirrä alas",
               "moveUp": "Siirrä ylös",
@@ -694,6 +696,7 @@ exports[`HearingContainer component should render as expected 1`] = `
               "inLanguage-sv": "ruotsiksi",
               "infoHeaderDescription": "Tämä on palvelun väliaikainen prototyyppi, josta toivomme käyttäjien kommentteja",
               "infoHeaderText": "Tietoa palvelusta",
+              "infoPage": "Tietoa palvelusta",
               "labelPlaceholder": "Anna asiasanan nimi...",
               "lang-en": "English",
               "lang-fi": "Suomi",
@@ -707,6 +710,7 @@ exports[`HearingContainer component should render as expected 1`] = `
               "logout": "Kirjaudu ulos",
               "mainSection": "Pääosio",
               "map": "Kartta",
+              "mapView": "Kaikki kuulemiset kartalla",
               "mostCommented": "Eniten kommentoitu",
               "moveDown": "Siirrä alas",
               "moveUp": "Siirrä ylös",
diff --git a/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap b/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap
index b0a227689..197a3d3d0 100644
--- a/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap
+++ b/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap
@@ -133,6 +133,7 @@ exports[`HearingsList component should render as expected 1`] = `
                   "inLanguage-sv": "ruotsiksi",
                   "infoHeaderDescription": "Tämä on palvelun väliaikainen prototyyppi, josta toivomme käyttäjien kommentteja",
                   "infoHeaderText": "Tietoa palvelusta",
+                  "infoPage": "Tietoa palvelusta",
                   "labelPlaceholder": "Anna asiasanan nimi...",
                   "lang-en": "English",
                   "lang-fi": "Suomi",
@@ -146,6 +147,7 @@ exports[`HearingsList component should render as expected 1`] = `
                   "logout": "Kirjaudu ulos",
                   "mainSection": "Pääosio",
                   "map": "Kartta",
+                  "mapView": "Kaikki kuulemiset kartalla",
                   "mostCommented": "Eniten kommentoitu",
                   "moveDown": "Siirrä alas",
                   "moveUp": "Siirrä ylös",
diff --git a/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap b/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap
index 3b587cd60..b32a4df2a 100644
--- a/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap
+++ b/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap
@@ -191,6 +191,7 @@ exports[`Hearings component should render as expected 1`] = `
           "inLanguage-sv": "ruotsiksi",
           "infoHeaderDescription": "Tämä on palvelun väliaikainen prototyyppi, josta toivomme käyttäjien kommentteja",
           "infoHeaderText": "Tietoa palvelusta",
+          "infoPage": "Tietoa palvelusta",
           "labelPlaceholder": "Anna asiasanan nimi...",
           "lang-en": "English",
           "lang-fi": "Suomi",
@@ -204,6 +205,7 @@ exports[`Hearings component should render as expected 1`] = `
           "logout": "Kirjaudu ulos",
           "mainSection": "Pääosio",
           "map": "Kartta",
+          "mapView": "Kaikki kuulemiset kartalla",
           "mostCommented": "Eniten kommentoitu",
           "moveDown": "Siirrä alas",
           "moveUp": "Siirrä ylös",
diff --git a/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap b/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap
index d439d5e67..b618d463b 100644
--- a/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap
+++ b/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap
@@ -117,6 +117,7 @@ exports[`FullWidthHearing component should render as expected 1`] = `
         "inLanguage-sv": "ruotsiksi",
         "infoHeaderDescription": "Tämä on palvelun väliaikainen prototyyppi, josta toivomme käyttäjien kommentteja",
         "infoHeaderText": "Tietoa palvelusta",
+        "infoPage": "Tietoa palvelusta",
         "labelPlaceholder": "Anna asiasanan nimi...",
         "lang-en": "English",
         "lang-fi": "Suomi",
@@ -130,6 +131,7 @@ exports[`FullWidthHearing component should render as expected 1`] = `
         "logout": "Kirjaudu ulos",
         "mainSection": "Pääosio",
         "map": "Kartta",
+        "mapView": "Kaikki kuulemiset kartalla",
         "mostCommented": "Eniten kommentoitu",
         "moveDown": "Siirrä alas",
         "moveUp": "Siirrä ylös",
diff --git a/__tests__/__snapshots__/SortableCommentList.react-test.js.snap b/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
index 01a7fad4e..ded63a2f1 100644
--- a/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
+++ b/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
@@ -232,6 +232,7 @@ exports[`SortableCommentList component should render as expected 1`] = `
                 "inLanguage-sv": "ruotsiksi",
                 "infoHeaderDescription": "Tämä on palvelun väliaikainen prototyyppi, josta toivomme käyttäjien kommentteja",
                 "infoHeaderText": "Tietoa palvelusta",
+                "infoPage": "Tietoa palvelusta",
                 "labelPlaceholder": "Anna asiasanan nimi...",
                 "lang-en": "English",
                 "lang-fi": "Suomi",
@@ -245,6 +246,7 @@ exports[`SortableCommentList component should render as expected 1`] = `
                 "logout": "Kirjaudu ulos",
                 "mainSection": "Pääosio",
                 "map": "Kartta",
+                "mapView": "Kaikki kuulemiset kartalla",
                 "mostCommented": "Eniten kommentoitu",
                 "moveDown": "Siirrä alas",
                 "moveUp": "Siirrä ylös",
diff --git a/src/components/SocialBar/Twitter.js b/src/components/SocialBar/Twitter.js
index 06bb64fee..3dd0e0689 100644
--- a/src/components/SocialBar/Twitter.js
+++ b/src/components/SocialBar/Twitter.js
@@ -3,6 +3,6 @@ import {Share} from 'react-twitter-widgets';
 
 export default class Twitter extends React.Component {
   render() {
-    return <div style={{marginRight: '8px'}}><Share className="twitter-tweet-ctr" url={window.location.href} /></div>; // <span ref="container" className="twitter-tweet-ctr" id={"twitter-" + this.state.id}/>;
+    return <div className="twitter-tweet-ctr" style={{marginRight: '8px'}}><Share url={window.location.href} /></div>; // <span ref="container" className="twitter-tweet-ctr" id={"twitter-" + this.state.id}/>;
   }
 }

From 148fbc4a26c4dd447a5dd6b7f335d048360e3fa9 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Tue, 13 Feb 2018 11:20:46 +0200
Subject: [PATCH 10/27] Show ContactList only in main section

---
 src/components/Hearing/Section/SectionContainer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Hearing/Section/SectionContainer.js b/src/components/Hearing/Section/SectionContainer.js
index 063da9447..025353417 100644
--- a/src/components/Hearing/Section/SectionContainer.js
+++ b/src/components/Hearing/Section/SectionContainer.js
@@ -198,7 +198,7 @@ export class SectionContainerComponent extends React.Component {
                       </div>
                     }
                     {showSectionBrowser && <SectionBrowser sectionNav={this.getSectionNav()} />}
-                    <ContactList contacts={contacts} />
+                    {section.id === mainSection.id && <ContactList contacts={contacts} />}
                     {hasFullscreenMapPlugin(hearing) &&
                       <Link to={{path: `/${match.params.hearingSlug}/fullscreen`}}>
                         <Button style={{marginBottom: '48px'}} bsStyle="primary" bsSize="large" block>

From 6aab46b2fe557896752bb1919df0a10c6eacc2f6 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Tue, 13 Feb 2018 15:00:38 +0200
Subject: [PATCH 11/27] Add react-images Lightbox to open hearing image in
 fullscreen if clicked

---
 assets/sass/hel/common.scss                   |  4 +-
 assets/sass/hel/footer.scss                   |  2 +-
 assets/sass/hel/hearing-page.scss             |  4 ++
 package.json                                  |  1 +
 .../Hearing/Section/SectionContainer.js       | 15 +++++-
 .../Hearing/Section/SectionImage.js           | 17 +++++--
 yarn.lock                                     | 49 +++++++++++++++++--
 7 files changed, 80 insertions(+), 12 deletions(-)

diff --git a/assets/sass/hel/common.scss b/assets/sass/hel/common.scss
index 91a9fe0a3..e9e5cbc73 100644
--- a/assets/sass/hel/common.scss
+++ b/assets/sass/hel/common.scss
@@ -6,9 +6,9 @@ html {
 body {
     position: relative;
     min-height: 100%;
-    @media (min-width: $screen-md-min) {
+    /* @media (min-width: $screen-md-min) {
         padding-bottom: $site-footer-height + ($line-height-computed * 3);
-    }
+    } */
 }
 
 p {
diff --git a/assets/sass/hel/footer.scss b/assets/sass/hel/footer.scss
index e862fad5a..01e2b8096 100644
--- a/assets/sass/hel/footer.scss
+++ b/assets/sass/hel/footer.scss
@@ -7,7 +7,7 @@
 
   @media (min-width: $screen-md-min) {
       height: $site-footer-height;
-      position: absolute;
+      //  position: absolute;
       bottom: 0;
       left: 0;
       right: 0;
diff --git a/assets/sass/hel/hearing-page.scss b/assets/sass/hel/hearing-page.scss
index d4c8c4724..14daa8919 100644
--- a/assets/sass/hel/hearing-page.scss
+++ b/assets/sass/hel/hearing-page.scss
@@ -5,6 +5,10 @@
 
 .hearing-content-section {
   padding-top: $line-height-computed * 2;
+
+  .section-image:hover {
+    cursor: pointer;
+  }
 }
 
 .hearing-header {
diff --git a/package.json b/package.json
index 9aa0958ce..38e756ba5 100644
--- a/package.json
+++ b/package.json
@@ -93,6 +93,7 @@
     "react-dropzone": "^3.13.3",
     "react-helmet": "^2.2.0",
     "react-hot-loader": "^3.0.0-beta.6",
+    "react-images": "^0.5.17",
     "react-intl": "2.0.0-rc-1",
     "react-leaflet": "^1.7.4",
     "react-leaflet-draw": "^0.17.0",
diff --git a/src/components/Hearing/Section/SectionContainer.js b/src/components/Hearing/Section/SectionContainer.js
index 025353417..79eca61c9 100644
--- a/src/components/Hearing/Section/SectionContainer.js
+++ b/src/components/Hearing/Section/SectionContainer.js
@@ -45,7 +45,8 @@ import Link from '../../LinkWithLang';
 export class SectionContainerComponent extends React.Component {
   state = {
     showDeleteModal: false,
-    commentToDelete: {}
+    commentToDelete: {},
+    showLightbox: false
   };
 
   getSectionNav = () => {
@@ -135,6 +136,14 @@ export class SectionContainerComponent extends React.Component {
     return isSectionCommentable(hearing, section, user) && !hasPlugin;
   }
 
+  openLightbox = () => {
+    this.setState({showLightbox: true});
+  }
+
+  closeLightbox = () => {
+    this.setState({showLightbox: false});
+  }
+
   render() {
     const {
       hearing,
@@ -148,6 +157,7 @@ export class SectionContainerComponent extends React.Component {
       fetchAllComments,
       mainSectionComments
     } = this.props;
+    const {showLightbox} = this.state;
     const mainSection = sections.find(sec => sec.type === SectionTypes.MAIN);
     const section = sections.find(sec => sec.id === match.params.sectionId) || mainSection;
     const sectionImage = section.images[0];
@@ -169,6 +179,9 @@ export class SectionContainerComponent extends React.Component {
                         image={sectionImage}
                         caption={getAttr(sectionImage.caption, language)}
                         title={getAttr(sectionImage.title, language)}
+                        showLightbox={showLightbox}
+                        openLightbox={this.openLightbox}
+                        closeLightbox={this.closeLightbox}
                       />
                     }
                     {!isEmpty(section.abstract) &&
diff --git a/src/components/Hearing/Section/SectionImage.js b/src/components/Hearing/Section/SectionImage.js
index b15ff6edf..9a4d82e91 100644
--- a/src/components/Hearing/Section/SectionImage.js
+++ b/src/components/Hearing/Section/SectionImage.js
@@ -1,14 +1,22 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import Lightbox from 'react-images';
 
-export const SectionImageComponent = ({image, caption, title}) => {
+export const SectionImageComponent = ({image, caption, title, showLightbox, openLightbox, closeLightbox}) => {
   return (
-    <div key={image.url}>
+    <div className="section-image" key={image.url}>
       <img
         className="img-responsive"
         alt={title}
         title={title}
         src={image.url}
+        onClick={openLightbox}
+        onKeyPress={openLightbox}
+      />
+      <Lightbox
+        images={[{ src: image.url }]}
+        isOpen={showLightbox}
+        onClose={closeLightbox}
       />
       <div className="image-caption">{caption}</div>
     </div>
@@ -18,7 +26,10 @@ export const SectionImageComponent = ({image, caption, title}) => {
 SectionImageComponent.propTypes = {
   image: PropTypes.object,
   caption: PropTypes.string,
-  title: PropTypes.string
+  title: PropTypes.string,
+  showLightbox: PropTypes.bool,
+  openLightbox: PropTypes.func,
+  closeLightbox: PropTypes.func
 };
 
 export default SectionImageComponent;
diff --git a/yarn.lock b/yarn.lock
index 46a234bab..ecf9218ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -185,6 +185,13 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
+aphrodite@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/aphrodite/-/aphrodite-0.5.0.tgz#a4b9a8902662395d2702e70ac7a2b4ca66f25703"
+  dependencies:
+    asap "^2.0.3"
+    inline-style-prefixer "^2.0.0"
+
 append-transform@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
@@ -269,7 +276,7 @@ arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
-asap@~2.0.3:
+asap@^2.0.3, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
@@ -1131,7 +1138,7 @@ bops@~0.1.1:
     base64-js "0.0.2"
     to-utf8 "0.0.1"
 
-bowser@^1.7.3:
+bowser@^1.0.0, bowser@^1.7.3:
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.9.2.tgz#d66fc868ca5f4ba895bee1363c343fe7b37d3394"
 
@@ -2661,7 +2668,7 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-exenv@^1.2.1:
+exenv@^1.2.1, exenv@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
 
@@ -3477,7 +3484,7 @@ https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
-hyphenate-style-name@^1.0.2:
+hyphenate-style-name@^1.0.1, hyphenate-style-name@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
 
@@ -3562,6 +3569,13 @@ ini@^1.3.0, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
+inline-style-prefixer@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz#c153c7e88fd84fef5c602e95a8168b2770671fe7"
+  dependencies:
+    bowser "^1.0.0"
+    hyphenate-style-name "^1.0.1"
+
 inline-style-prefixer@^3.0.6:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-3.0.8.tgz#8551b8e5b4d573244e66a34b04f7d32076a2b534"
@@ -5908,7 +5922,7 @@ prop-types-extra@^1.0.1:
   dependencies:
     warning "^3.0.0"
 
-prop-types@^15.3.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0:
+prop-types@^15.3.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0:
   version "15.6.0"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
   dependencies:
@@ -6142,6 +6156,15 @@ react-hot-loader@^3.0.0-beta.6:
     redbox-react "^1.3.6"
     source-map "^0.6.1"
 
+react-images@^0.5.17:
+  version "0.5.17"
+  resolved "https://registry.yarnpkg.com/react-images/-/react-images-0.5.17.tgz#6f76fd03b370176bead7d22cec06afe82fe1cec0"
+  dependencies:
+    aphrodite "^0.5.0"
+    prop-types "^15.6.0"
+    react-scrolllock "^2.0.1"
+    react-transition-group "^1.1.3"
+
 react-input-autosize@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.0.1.tgz#e92190497b4026c2780ad0f2fd703c835ba03e33"
@@ -6291,6 +6314,12 @@ react-scrollbar-size@^2.0.2:
     prop-types "^15.5.10"
     react-event-listener "^0.5.0"
 
+react-scrolllock@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/react-scrolllock/-/react-scrolllock-2.0.1.tgz#dd323f5da9de75f0bb64b997ee5967dd47f0a3ff"
+  dependencies:
+    exenv "^1.2.2"
+
 react-select@^1.0.0-rc.2:
   version "1.0.0-rc.10"
   resolved "https://registry.yarnpkg.com/react-select/-/react-select-1.0.0-rc.10.tgz#f137346250f9255c979fbfa21860899928772350"
@@ -6339,6 +6368,16 @@ react-toastify@^3.3.2:
     prop-types "^15.6.0"
     react-transition-group "^2.2.1"
 
+react-transition-group@^1.1.3:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6"
+  dependencies:
+    chain-function "^1.0.0"
+    dom-helpers "^3.2.0"
+    loose-envify "^1.3.1"
+    prop-types "^15.5.6"
+    warning "^3.0.0"
+
 react-transition-group@^2.0.0, react-transition-group@^2.2.0, react-transition-group@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10"

From da68397842910f9f943229b5d405ebe5649daa61 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Tue, 13 Feb 2018 15:01:48 +0200
Subject: [PATCH 12/27] Update snapshots

---
 .../SectionContainer.react-test.js.snap       |  3 +++
 .../SectionImage.react-test.js.snap           | 27 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/__tests__/Hearing/__snapshots__/SectionContainer.react-test.js.snap b/__tests__/Hearing/__snapshots__/SectionContainer.react-test.js.snap
index a4abad4a3..a4f566364 100644
--- a/__tests__/Hearing/__snapshots__/SectionContainer.react-test.js.snap
+++ b/__tests__/Hearing/__snapshots__/SectionContainer.react-test.js.snap
@@ -25,6 +25,7 @@ exports[`SectionContainer component should render as expected 1`] = `
           >
             <SectionImageComponent
               caption="A Wonderfull caption"
+              closeLightbox={[Function]}
               image={
                 Object {
                   "caption": Object {
@@ -37,6 +38,8 @@ exports[`SectionContainer component should render as expected 1`] = `
                   "width": 893,
                 }
               }
+              openLightbox={[Function]}
+              showLightbox={false}
             />
             <div
               className="section-abstract lead"
diff --git a/__tests__/Hearing/__snapshots__/SectionImage.react-test.js.snap b/__tests__/Hearing/__snapshots__/SectionImage.react-test.js.snap
index e5108049b..59a288a65 100644
--- a/__tests__/Hearing/__snapshots__/SectionImage.react-test.js.snap
+++ b/__tests__/Hearing/__snapshots__/SectionImage.react-test.js.snap
@@ -2,6 +2,7 @@
 
 exports[`SectionImage component should render as expected 1`] = `
 <div
+  className="section-image"
   key="https://api.hel.fi/kerrokantasi-test/media/images/2017/10/LzqVMrMI.jpeg"
 >
   <img
@@ -10,6 +11,32 @@ exports[`SectionImage component should render as expected 1`] = `
     src="https://api.hel.fi/kerrokantasi-test/media/images/2017/10/LzqVMrMI.jpeg"
     title="Amazing Title"
   />
+  <Lightbox
+    closeButtonTitle="Close (Esc)"
+    currentImage={0}
+    enableKeyboardInput={true}
+    imageCountSeparator=" of "
+    images={
+      Array [
+        Object {
+          "src": "https://api.hel.fi/kerrokantasi-test/media/images/2017/10/LzqVMrMI.jpeg",
+        },
+      ]
+    }
+    leftArrowTitle="Previous (Left arrow key)"
+    onClickShowNextImage={true}
+    preloadNextImage={true}
+    preventScroll={true}
+    rightArrowTitle="Next (Right arrow key)"
+    showCloseButton={true}
+    showImageCount={true}
+    spinner={[Function]}
+    spinnerColor="white"
+    spinnerSize={100}
+    theme={Object {}}
+    thumbnailOffset={2}
+    width={1024}
+  />
   <div
     className="image-caption"
   >

From 61382318009982c7710d43b3e24a07e9a0c7dea7 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Wed, 14 Feb 2018 10:26:28 +0200
Subject: [PATCH 13/27] Dangerously set closure info as html to support old
 closure messages

---
 src/components/Hearing/Section/SectionClosureInfo.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/Hearing/Section/SectionClosureInfo.js b/src/components/Hearing/Section/SectionClosureInfo.js
index 07dd94245..99dc17446 100644
--- a/src/components/Hearing/Section/SectionClosureInfo.js
+++ b/src/components/Hearing/Section/SectionClosureInfo.js
@@ -3,9 +3,7 @@ import PropTypes from 'prop-types';
 
 export const SectionClosureInfoComponent = ({content}) => {
   return (
-    <div className="closure-info">
-      {content}
-    </div>
+    <div className="closure-info" dangerouslySetInnerHTML={{__html: content}} />
   );
 };
 

From 89b717fe0d47d62527bd451e1e5b9ae2933078e0 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Wed, 14 Feb 2018 11:22:58 +0200
Subject: [PATCH 14/27] Translate zoom control tooltips

---
 src/components/admin/HearingFormStep3.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/admin/HearingFormStep3.js b/src/components/admin/HearingFormStep3.js
index 1ec631e1c..2548a9b26 100644
--- a/src/components/admin/HearingFormStep3.js
+++ b/src/components/admin/HearingFormStep3.js
@@ -7,6 +7,7 @@ import Button from 'react-bootstrap/lib/Button';
 import ControlLabel from 'react-bootstrap/lib/ControlLabel';
 import FormGroup from 'react-bootstrap/lib/FormGroup';
 import isEmpty from 'lodash/isEmpty';
+import {ZoomControl} from 'react-leaflet';
 
 import {hearingShape} from '../../types';
 
@@ -177,11 +178,12 @@ class HearingFormStep3 extends React.Component {
           <Map
             ref={this.refCallBack}
             // onResize={this.invalidateMap.bind(this)}
+            zoomControl={false}
             center={position}
             zoom={11}
-            zoomControl
             className="hearing-map"
           >
+            <ZoomControl zoomInTitle="Lähennä" zoomOutTitle="Loitonna"/>
             <TileLayer
               attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
               url="http://{s}.tile.osm.org/{z}/{x}/{y}.png"

From bbc39a1c9284a919b35cddc479bd4a5368fc3171 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Wed, 14 Feb 2018 12:24:43 +0200
Subject: [PATCH 15/27] Fix #557, show spinner when loading section comments

---
 src/components/SortableCommentList.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/SortableCommentList.js b/src/components/SortableCommentList.js
index c143f11ee..0f1185ee6 100644
--- a/src/components/SortableCommentList.js
+++ b/src/components/SortableCommentList.js
@@ -230,14 +230,14 @@ export class SortableCommentListComponent extends Component {
                   />
                   <Waypoint onEnter={this.handleReachBottom} />
                 </div>}
-              {this.state.showLoader ? (
-                <div className="sortable-comment-list__loader">
-                  <LoadSpinner />
-                </div>
-              ) : null}
             </div>
           </div>
           : null}
+        {this.state.showLoader && (
+          <div className="sortable-comment-list__loader">
+            <LoadSpinner />
+          </div>
+        )}
       </div>
     );
   }

From d6aece9ec0abb9c0919d98b87933d586004063bf Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Wed, 14 Feb 2018 13:44:17 +0200
Subject: [PATCH 16/27] Add custom prevButton to carousel to fix slick caused
 bug

---
 src/components/Carousel.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/Carousel.js b/src/components/Carousel.js
index 63b92b403..571b345b8 100644
--- a/src/components/Carousel.js
+++ b/src/components/Carousel.js
@@ -16,6 +16,24 @@ import {FormattedMessage, intlShape} from 'react-intl';
 import Icon from '../utils/Icon';
 import {Grid} from 'react-bootstrap';
 
+// Custom prev button is used because for some reason Slicks default button is always disabled...
+const PrevButton = ({slidePrev, currentSlide}) => (
+  <button
+    className={currentSlide === 0 ? "slick-arrow slick-prev slick-disabled" : "slick-arrow slick-prev"}
+    type="button"
+    onClick={() => {
+      if (currentSlide !== 0) slidePrev();
+    }}
+  >
+    Prev
+  </button>
+);
+
+PrevButton.propTypes = {
+  slidePrev: PropTypes.func,
+  currentSlide: PropTypes.number
+};
+
 export class SectionCarousel extends React.Component {
   componentWillReceiveProps(nextProps) {
     const {hearing, match: {params}} = this.props;
@@ -90,6 +108,7 @@ export class SectionCarousel extends React.Component {
                 ref={slider => {
                   this.slider = slider;
                 }}
+                prevArrow={<PrevButton slidePrev={this.slider && (() => this.slider.slickPrev())} currentSlide={this.slider && this.slider.state.currentSlide} />}
                 initialSlide={getInitialSlideIndex(hearing, params)}
                 infinite={false}
                 focusOnSelect
@@ -166,7 +185,6 @@ const SliderItem = ({section, to, language, hearingTitle, active}) => {
   );
 };
 
-
 SliderItem.propTypes = {
   section: PropTypes.object,
   to: PropTypes.object,

From 886ebe281d74c992658491dc04adedf333a22324 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Wed, 14 Feb 2018 13:44:25 +0200
Subject: [PATCH 17/27] Update snapshots

---
 __tests__/__snapshots__/Carousel.react-test.js.snap | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/__tests__/__snapshots__/Carousel.react-test.js.snap b/__tests__/__snapshots__/Carousel.react-test.js.snap
index 185feae4a..a8a3528a8 100644
--- a/__tests__/__snapshots__/Carousel.react-test.js.snap
+++ b/__tests__/__snapshots__/Carousel.react-test.js.snap
@@ -26,6 +26,12 @@ exports[`Carousel component should render as expected 1`] = `
           focusOnSelect={true}
           infinite={false}
           initialSlide={1}
+          prevArrow={
+            <PrevButton
+              currentSlide={undefined}
+              slidePrev={undefined}
+            />
+          }
           responsive={
             Array [
               Object {

From 67ddccfd1bc77e829ca7aed1c7cd84f590a464a4 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Mon, 19 Feb 2018 09:42:55 +0200
Subject: [PATCH 18/27] Add handling for specific errors

---
 src/actions/index.js | 26 ++++++++++++++++++++++++--
 src/i18n/en.json     |  4 +++-
 src/i18n/fi.json     |  4 +++-
 src/i18n/sv.json     |  4 +++-
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/actions/index.js b/src/actions/index.js
index 561690d1c..82a42e381 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -32,6 +32,28 @@ export function requestErrorHandler() {
   };
 }
 
+export const postCommentErrorHandler = () => {
+  return (err) => {
+    Raven.captureException(err);
+    if (err.response.status === 403) {
+      localizedNotifyError("loginToComment");
+    } else {
+      localizedNotifyError(err.message);
+    }
+  };
+};
+
+export const voteCommentErrorHandler = () => {
+  return (err) => {
+    Raven.captureException(err);
+    if (err.response.status === 403) {
+      localizedNotifyError("loginToVoteComment");
+    } else {
+      localizedNotifyError(err.message);
+    }
+  };
+};
+
 export function fetchInitialHearingList(listId, endpoint, params) {
   return (dispatch, getState) => {
     const fetchAction = createAction("beginFetchHearingList")({listId, params});
@@ -178,7 +200,7 @@ export function postSectionComment(hearingSlug, sectionId, commentData = {}) {
       // we must update hearing comment count
       dispatch(fetchHearing(hearingSlug));
       localizedAlert("commentReceived");
-    }).catch(requestErrorHandler());
+    }).catch(postCommentErrorHandler());
   };
 }
 
@@ -223,6 +245,6 @@ export function postVote(commentId, hearingSlug, sectionId) {
         dispatch(createAction("postedCommentVote")({commentId, sectionId}));
         localizedNotifySuccess("voteReceived");
       }
-    }).catch(requestErrorHandler());
+    }).catch(voteCommentErrorHandler());
   };
 }
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 910e0ebab..26e218f29 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -128,5 +128,7 @@
   "moveUp": "Move up",
   "moveDown": "Move down",
   "infoPage": "About service",
-  "mapView": "All hearings on map"
+  "mapView": "All hearings on map",
+  "loginToComment": "Login to comment this hearing.",
+  "logintToVoteComment": "Login to vote a comment."
 }
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index de4e5797f..2b15d9e16 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -191,5 +191,7 @@
   "hearingClosingTimePlaceholder": "Valitse...",
   "slugInUse": "Valitsemasi osoite oli käytössä ja siksi vaihdettiin.",
   "infoPage": "Tietoa palvelusta",
-  "mapView": "Kaikki kuulemiset kartalla"
+  "mapView": "Kaikki kuulemiset kartalla",
+  "loginToComment": "Kirjaudu sisään kommentoidaksesi.",
+  "loginToVoteComment": "Kirjaudu sisään äänestääksesi kommenttia."
 }
diff --git a/src/i18n/sv.json b/src/i18n/sv.json
index d409e747c..a5a467efe 100644
--- a/src/i18n/sv.json
+++ b/src/i18n/sv.json
@@ -121,5 +121,7 @@
   "moveUp": "Flytta upp",
   "moveDown": "Flytta ner",
   "infoPage": "Information om tjänsten",
-  "mapView": "Alla höranden på kartan"
+  "mapView": "Alla höranden på kartan",
+  "loginToComment": "Logga in för att kommentera.",
+  "logintToVoteComment": "Logga in för att rösta på kommentaren."
 }

From c9473e88d03789542082af2fd6c6688a6fe60251 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Mon, 19 Feb 2018 10:05:38 +0200
Subject: [PATCH 19/27] Update snapshots

---
 .../Hearing/__snapshots__/HearingContainer.react-test.js.snap | 4 ++++
 .../Hearings/__snapshots__/HearingList.react-test.js.snap     | 2 ++
 __tests__/Hearings/__snapshots__/Hearings.react-test.js.snap  | 2 ++
 .../Home/__snapshots__/FullWidthHearing.react-test.js.snap    | 2 ++
 .../__snapshots__/SortableCommentList.react-test.js.snap      | 2 ++
 5 files changed, 12 insertions(+)

diff --git a/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap b/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
index 77b0a4e6a..590a5e68d 100644
--- a/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
+++ b/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
@@ -315,7 +315,9 @@ exports[`HearingContainer component should render as expected 1`] = `
               "leastCommented": "Vähiten kommentoitu",
               "list": "Lista",
               "login": "Kirjaudu sisään",
+              "loginToComment": "Kirjaudu sisään kommentoidaksesi.",
               "loginToContinue": "Kirjaudu sisään jatkaaksesi",
+              "loginToVoteComment": "Kirjaudu sisään äänestääksesi kommenttia.",
               "logout": "Kirjaudu ulos",
               "mainSection": "Pääosio",
               "map": "Kartta",
@@ -708,7 +710,9 @@ exports[`HearingContainer component should render as expected 1`] = `
               "leastCommented": "Vähiten kommentoitu",
               "list": "Lista",
               "login": "Kirjaudu sisään",
+              "loginToComment": "Kirjaudu sisään kommentoidaksesi.",
               "loginToContinue": "Kirjaudu sisään jatkaaksesi",
+              "loginToVoteComment": "Kirjaudu sisään äänestääksesi kommenttia.",
               "logout": "Kirjaudu ulos",
               "mainSection": "Pääosio",
               "map": "Kartta",
diff --git a/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap b/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap
index 33aa40168..23c323bba 100644
--- a/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap
+++ b/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap
@@ -144,7 +144,9 @@ exports[`HearingsList component should render as expected 1`] = `
                   "leastCommented": "Vähiten kommentoitu",
                   "list": "Lista",
                   "login": "Kirjaudu sisään",
+                  "loginToComment": "Kirjaudu sisään kommentoidaksesi.",
                   "loginToContinue": "Kirjaudu sisään jatkaaksesi",
+                  "loginToVoteComment": "Kirjaudu sisään äänestääksesi kommenttia.",
                   "logout": "Kirjaudu ulos",
                   "mainSection": "Pääosio",
                   "map": "Kartta",
diff --git a/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap b/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap
index 26062666e..c53a1be2e 100644
--- a/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap
+++ b/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap
@@ -202,7 +202,9 @@ exports[`Hearings component should render as expected 1`] = `
           "leastCommented": "Vähiten kommentoitu",
           "list": "Lista",
           "login": "Kirjaudu sisään",
+          "loginToComment": "Kirjaudu sisään kommentoidaksesi.",
           "loginToContinue": "Kirjaudu sisään jatkaaksesi",
+          "loginToVoteComment": "Kirjaudu sisään äänestääksesi kommenttia.",
           "logout": "Kirjaudu ulos",
           "mainSection": "Pääosio",
           "map": "Kartta",
diff --git a/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap b/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap
index b740bbc73..419b02aa9 100644
--- a/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap
+++ b/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap
@@ -128,7 +128,9 @@ exports[`FullWidthHearing component should render as expected 1`] = `
         "leastCommented": "Vähiten kommentoitu",
         "list": "Lista",
         "login": "Kirjaudu sisään",
+        "loginToComment": "Kirjaudu sisään kommentoidaksesi.",
         "loginToContinue": "Kirjaudu sisään jatkaaksesi",
+        "loginToVoteComment": "Kirjaudu sisään äänestääksesi kommenttia.",
         "logout": "Kirjaudu ulos",
         "mainSection": "Pääosio",
         "map": "Kartta",
diff --git a/__tests__/__snapshots__/SortableCommentList.react-test.js.snap b/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
index d947b91a8..e9a89acb0 100644
--- a/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
+++ b/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
@@ -243,7 +243,9 @@ exports[`SortableCommentList component should render as expected 1`] = `
                 "leastCommented": "Vähiten kommentoitu",
                 "list": "Lista",
                 "login": "Kirjaudu sisään",
+                "loginToComment": "Kirjaudu sisään kommentoidaksesi.",
                 "loginToContinue": "Kirjaudu sisään jatkaaksesi",
+                "loginToVoteComment": "Kirjaudu sisään äänestääksesi kommenttia.",
                 "logout": "Kirjaudu ulos",
                 "mainSection": "Pääosio",
                 "map": "Kartta",

From 2e101f23842cbe5ec6ab9139ac4456d1c3bd0422 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Tue, 20 Feb 2018 14:45:08 +0200
Subject: [PATCH 20/27] Style notifications

---
 src/App.js          | 9 ++++++++-
 src/utils/notify.js | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/App.js b/src/App.js
index c758c28a1..b55d5da3f 100644
--- a/src/App.js
+++ b/src/App.js
@@ -59,7 +59,14 @@ class App extends React.Component {
             <Routes />
           </main>
           <Footer />
-          <ToastContainer />
+          <ToastContainer
+            bodyClassName={
+              {
+                padding: '7px 7px 7px 12px',
+                fontFamily: '"HelsinkiGrotesk", Arial, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif'
+              }
+            }
+          />
         </div>
       </IntlProvider>
     );
diff --git a/src/utils/notify.js b/src/utils/notify.js
index a82d1b4c2..5e610c4b8 100644
--- a/src/utils/notify.js
+++ b/src/utils/notify.js
@@ -5,7 +5,7 @@ import {toast} from 'react-toastify';
 const successOptions = {
   autoClose: 6000,
   type: toast.TYPE.SUCCESS,
-  hideProgressBar: false,
+  hideProgressBar: true,
   position: toast.POSITION.BOTTOM_RIGHT,
   pauseOnHover: true,
 };
@@ -13,7 +13,7 @@ const successOptions = {
 const errorOptions = {
   autoClose: false,
   type: toast.TYPE.ERROR,
-  hideProgressBar: false,
+  hideProgressBar: true,
   position: toast.POSITION.BOTTOM_RIGHT,
 };
 

From afd89007e4a5058d1d72b83bcc87461da600a586 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Tue, 20 Feb 2018 14:45:29 +0200
Subject: [PATCH 21/27] Change hearing page title to title of the hearing

---
 src/views/Hearing/HearingContainer.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/Hearing/HearingContainer.js b/src/views/Hearing/HearingContainer.js
index 4ac501847..48e6c8210 100644
--- a/src/views/Hearing/HearingContainer.js
+++ b/src/views/Hearing/HearingContainer.js
@@ -16,6 +16,8 @@ import * as HearingEditorSelector from '../../selectors/hearingEditor';
 import { fetchHearingEditorMetaData } from '../../actions/hearingEditor';
 import {getUser} from '../../selectors/user';
 import config from '../../config';
+import getAttr from '../../utils/getAttr';
+import Helmet from 'react-helmet';
 
 export class HearingContainerComponent extends React.Component {
   componentWillMount() {
@@ -57,6 +59,7 @@ export class HearingContainerComponent extends React.Component {
 
         {!isEmpty(hearing) ?
           <div>
+            <Helmet title={getAttr(hearing.title, language)} />
             {(!isEmpty(user) && canEdit(user, hearing)) &&
               <HearingEditor
                 hearing={hearingDraft}

From 0fcfc415510c18420120bdd279a755a5d188c496 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Tue, 20 Feb 2018 14:46:29 +0200
Subject: [PATCH 22/27] Show spinner in same position as the list and update
 render logic of the list

---
 .../Hearing/Section/SectionContainer.js       |   1 +
 src/components/SortableCommentList.js         | 120 +++++++++---------
 2 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/src/components/Hearing/Section/SectionContainer.js b/src/components/Hearing/Section/SectionContainer.js
index 3f1189714..3c1f39e96 100644
--- a/src/components/Hearing/Section/SectionContainer.js
+++ b/src/components/Hearing/Section/SectionContainer.js
@@ -240,6 +240,7 @@ export class SectionContainerComponent extends React.Component {
                       fetchComments={this.props.fetchCommentsForSortableList}
                       fetchMoreComments={this.props.fetchMoreComments}
                       displayVisualization={userIsAdmin || hearing.closed}
+                      published={hearing.published} // Needed so comments are not diplayed in hearing drafts
                     />
                   </Col>
                 </Row>
diff --git a/src/components/SortableCommentList.js b/src/components/SortableCommentList.js
index 0f1185ee6..9c3ebe009 100644
--- a/src/components/SortableCommentList.js
+++ b/src/components/SortableCommentList.js
@@ -156,7 +156,8 @@ export class SortableCommentListComponent extends Component {
       section,
       sectionComments,
       canVote,
-      user
+      user,
+      published
     } = this.props;
 
     const showCommentList =
@@ -177,67 +178,65 @@ export class SortableCommentListComponent extends Component {
     const pluginContent = showCommentList && displayVisualization ? this.renderPluginContent() : null;
     return (
       <div>
-        {canComment || showCommentList ?
-          <div className="sortable-comment-list">
-            {commentForm}
-            <div>
-              {showCommentList &&
-              <h2>
-                <FormattedMessage id="comments" />
-                <div className="commenticon">
-                  <Icon name="comment-o" />&nbsp;{get(sectionComments, 'count') ? sectionComments.count : '0'}
-                </div>
-              </h2>}
-              {pluginContent}
-              {showCommentList &&
-                <div className="row">
-                  <form className="sort-selector">
-                    <FormGroup controlId="sort-select">
-                      <ControlLabel>
-                        <FormattedMessage id="commentOrder" />
-                      </ControlLabel>
-                      <div className="select">
-                        <FormControl
-                          componentClass="select"
-                          onChange={event => {
-                            this.fetchComments(section.id, event.target.value);
-                          }}
-                          value={get(sectionComments, 'ordering')}
-                        >
-                          {keys(ORDERING_CRITERIA).map(key =>
-                            <FormattedMessage id={key} key={key}>
-                              {(message) => <option value={ORDERING_CRITERIA[key]}>{message}</option>}
-                            </FormattedMessage>
-                          )}
-                        </FormControl>
-                      </div>
-                    </FormGroup>
-                  </form>
-                </div>}
+        {(section.commenting !== 'none' && published) &&
+        <div className="sortable-comment-list">
+          {commentForm}
+          <div>
+            <h2>
+              <FormattedMessage id="comments" />
+              <div className="commenticon">
+                <Icon name="comment-o" />&nbsp;{get(sectionComments, 'count') ? sectionComments.count : '0'}
+              </div>
+            </h2>
+            {pluginContent}
+            {this.state.showLoader && (
+              <div className="sortable-comment-list__loader">
+                <LoadSpinner />
+              </div>
+            )}
+            {showCommentList && !this.state.showLoader &&
+              <div className="row">
+                <form className="sort-selector">
+                  <FormGroup controlId="sort-select">
+                    <ControlLabel>
+                      <FormattedMessage id="commentOrder" />
+                    </ControlLabel>
+                    <div className="select">
+                      <FormControl
+                        componentClass="select"
+                        onChange={event => {
+                          this.fetchComments(section.id, event.target.value);
+                        }}
+                        value={get(sectionComments, 'ordering')}
+                      >
+                        {keys(ORDERING_CRITERIA).map(key =>
+                          <FormattedMessage id={key} key={key}>
+                            {(message) => <option value={ORDERING_CRITERIA[key]}>{message}</option>}
+                          </FormattedMessage>
+                        )}
+                      </FormControl>
+                    </div>
+                  </FormGroup>
+                </form>
+              </div>}
 
-              {showCommentList &&
-                <div>
-                  <WrappedCommentList
-                    canVote={canVote}
-                    section={section}
-                    comments={sectionComments.results}
-                    totalCount={sectionComments.count}
-                    onEditComment={this.props.onEditComment}
-                    onDeleteComment={this.props.onDeleteComment}
-                    onPostVote={this.props.onPostVote}
-                    isLoading={this.state.showLoader}
-                    intl={intl}
-                  />
-                  <Waypoint onEnter={this.handleReachBottom} />
-                </div>}
-            </div>
+            {showCommentList &&
+              <div>
+                <WrappedCommentList
+                  canVote={canVote}
+                  section={section}
+                  comments={sectionComments.results}
+                  totalCount={sectionComments.count}
+                  onEditComment={this.props.onEditComment}
+                  onDeleteComment={this.props.onDeleteComment}
+                  onPostVote={this.props.onPostVote}
+                  isLoading={this.state.showLoader}
+                  intl={intl}
+                />
+                <Waypoint onEnter={this.handleReachBottom} />
+              </div>}
           </div>
-          : null}
-        {this.state.showLoader && (
-          <div className="sortable-comment-list__loader">
-            <LoadSpinner />
-          </div>
-        )}
+        </div>}
       </div>
     );
   }
@@ -260,6 +259,7 @@ SortableCommentListComponent.propTypes = {
   canVote: PropTypes.bool,
   canComment: PropTypes.bool,
   hearingId: PropTypes.string,
+  published: PropTypes.bool
 };
 
 const mapStateToProps = (state, {section: {id: sectionId}}) => ({

From 1ffd35da62ce9f225aece5935ba1acbb4bd4428d Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Tue, 20 Feb 2018 14:55:41 +0200
Subject: [PATCH 23/27] Hide form in hearing drafts

---
 src/components/SortableCommentList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/SortableCommentList.js b/src/components/SortableCommentList.js
index 9c3ebe009..3feae02cc 100644
--- a/src/components/SortableCommentList.js
+++ b/src/components/SortableCommentList.js
@@ -162,7 +162,7 @@ export class SortableCommentListComponent extends Component {
 
     const showCommentList =
       section && sectionComments && get(sectionComments, 'results') && !isEmpty(sectionComments.results);
-    const commentForm = canComment ? (
+    const commentForm = canComment && published ? (
       <div className="row">
         <div className="comment-form-container">
           <CommentForm
@@ -178,7 +178,7 @@ export class SortableCommentListComponent extends Component {
     const pluginContent = showCommentList && displayVisualization ? this.renderPluginContent() : null;
     return (
       <div>
-        {(section.commenting !== 'none' && published) &&
+        {section.commenting !== 'none' &&
         <div className="sortable-comment-list">
           {commentForm}
           <div>

From 0d28e9624246125088127210c26111e87c34671b Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Tue, 20 Feb 2018 15:15:31 +0200
Subject: [PATCH 24/27] Update test

---
 __tests__/SortableCommentList.react-test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/__tests__/SortableCommentList.react-test.js b/__tests__/SortableCommentList.react-test.js
index beffabdc3..be2bec3cf 100644
--- a/__tests__/SortableCommentList.react-test.js
+++ b/__tests__/SortableCommentList.react-test.js
@@ -20,6 +20,7 @@ const setup = propOverrides => {
     hearingId: mockHearingWithSections.data.id,
     section: mockHearingWithSections.data.sections[1],
     language: 'fi',
+    published: true,
     fetchComments: () => {}
   }, propOverrides);
 

From fef8e35998113500aad6e4836242f74228d8bd06 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Tue, 20 Feb 2018 15:18:30 +0200
Subject: [PATCH 25/27] Update snapshots

---
 .../Hearing/__snapshots__/HearingContainer.react-test.js.snap  | 3 +++
 .../Hearing/__snapshots__/SectionContainer.react-test.js.snap  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap b/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
index 590a5e68d..b50526c78 100644
--- a/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
+++ b/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
@@ -5,6 +5,9 @@ exports[`HearingContainer component should render as expected 1`] = `
   className="hearing-page"
 >
   <div>
+    <HelmetWrapper
+      title="Ideoi Isosaaren tulevaisuutta"
+    />
     <div
       className="hearing-wrapper"
       id="hearing-wrapper"
diff --git a/__tests__/Hearing/__snapshots__/SectionContainer.react-test.js.snap b/__tests__/Hearing/__snapshots__/SectionContainer.react-test.js.snap
index 784d2f437..b55df944e 100644
--- a/__tests__/Hearing/__snapshots__/SectionContainer.react-test.js.snap
+++ b/__tests__/Hearing/__snapshots__/SectionContainer.react-test.js.snap
@@ -132,6 +132,7 @@ exports[`SectionContainer component should render as expected 1`] = `
               onEditComment={[Function]}
               onPostComment={[Function]}
               onPostVote={[Function]}
+              published={true}
               section={
                 Object {
                   "abstract": Object {

From 2c6e0ec0f78107c169351d402aba4594f0945a35 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Thu, 22 Feb 2018 14:17:30 +0200
Subject: [PATCH 26/27] use n_comments instead of count

---
 src/components/SortableCommentList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/SortableCommentList.js b/src/components/SortableCommentList.js
index 3feae02cc..8863e5aa5 100644
--- a/src/components/SortableCommentList.js
+++ b/src/components/SortableCommentList.js
@@ -185,7 +185,7 @@ export class SortableCommentListComponent extends Component {
             <h2>
               <FormattedMessage id="comments" />
               <div className="commenticon">
-                <Icon name="comment-o" />&nbsp;{get(sectionComments, 'count') ? sectionComments.count : '0'}
+                <Icon name="comment-o" />&nbsp;{section.n_comments}
               </div>
             </h2>
             {pluginContent}
@@ -194,7 +194,7 @@ export class SortableCommentListComponent extends Component {
                 <LoadSpinner />
               </div>
             )}
-            {showCommentList && !this.state.showLoader &&
+            {showCommentList &&
               <div className="row">
                 <form className="sort-selector">
                   <FormGroup controlId="sort-select">

From 6aaab9799efcc82e6876b02633fa3f609a647c43 Mon Sep 17 00:00:00 2001
From: jonnetanninen <jonne.tanninen@gmail.com>
Date: Thu, 22 Feb 2018 14:20:00 +0200
Subject: [PATCH 27/27] Update snapshot

---
 __tests__/__snapshots__/SortableCommentList.react-test.js.snap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__tests__/__snapshots__/SortableCommentList.react-test.js.snap b/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
index e9a89acb0..cbe835d85 100644
--- a/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
+++ b/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
@@ -35,7 +35,7 @@ exports[`SortableCommentList component should render as expected 1`] = `
             name="comment-o"
           />
            
-          1
+          59
         </div>
       </h2>
       <div