From c67b34c6660e918f1bc30c1ecafb886bb819b89c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Sans?= <loic.sans@gmail.com>
Date: Tue, 14 Feb 2017 13:21:06 +0200
Subject: [PATCH 1/7] [#1920] Separated language selector from core links in
 footer

---
 Dashboard/app/css/main.scss                   | 140 +++++++++++++++---
 .../templates/application/footer.handlebars   |   2 +
 2 files changed, 120 insertions(+), 22 deletions(-)

diff --git a/Dashboard/app/css/main.scss b/Dashboard/app/css/main.scss
index a8f89c0c11..2c4fe91431 100644
--- a/Dashboard/app/css/main.scss
+++ b/Dashboard/app/css/main.scss
@@ -4282,8 +4282,7 @@ footer.bottomPage {
     margin: 20px 0 0 0;
     padding: 10px 0 0 0;
     width: 100%;
-    background: white;
-    border-top: thin solid rgba($akvoBlack, 0.1);
+    background: rgb(252, 252, 255);
     z-index: 1001;
 }
 
@@ -4291,7 +4290,7 @@ footer.bottomPage div:nth-child(1n) {
     position: relative;
     margin: 0 auto;
     padding: 0;
-    width: 90%;
+    width: 100%;
     min-width: 768px;
 }
 
@@ -4316,29 +4315,46 @@ footer.bottomPage nav.footItems {
     text-align: center;
 }
 
-footer.bottomPage nav.footItems ul {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-    -webkit-flex-direction: row;
-    -ms-flex-direction: row;
-    flex-direction: row;
-    -webkit-flex-wrap: wrap;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    -webkit-box-pack: center;
-    -webkit-justify-content: center;
-    -ms-flex-pack: center;
-    justify-content: center;
-    margin: 0 auto;
-    text-align: center;
+footer.bottomPage nav.footItems {
+    clear: both;
+    background: rgba($akvoBlack, 0.05);
+    border-top: thin solid rgba($akvoBlack, 0.05);
+
+                                          /*     
+border-bottom: thin solid rgba($akvoBlack, 0.05); */
+    padding: 5px 0 7px 0;
+
+    ul {
+        width: 69%;
+        float: left;
+        display: -webkit-box;
+        display: -webkit-flex;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-box-orient: horizontal;
+        -webkit-box-direction: normal;
+        -webkit-flex-direction: row;
+        -ms-flex-direction: row;
+        flex-direction: row;
+        -webkit-flex-wrap: wrap;
+        -ms-flex-wrap: wrap;
+        flex-wrap: wrap;
+        -webkit-box-pack: center;
+        -webkit-justify-content: flex-start;
+        -ms-flex-pack: center;
+        justify-content: flex-start;
+
+        &:last-child {
+            justify-content: flex-end;
+            width: 29%;
+            float: right;
+        }
+    }
 }
 
 footer.bottomPage nav.footItems ul li.footLink {
     text-align: center;
+    margin-top: 10px;
 }
 
 footer.bottomPage nav ul li a {
@@ -4358,6 +4374,86 @@ footer.bottomPage a[rel="self"] {}
 
 footer.bottomPage a[rel="self"]:hover {}
 
+label.languageSelector select {
+    padding: 10px 42px 10px 10px;
+    background: #f8f8f8;
+    color: #444;
+    border: 1px solid rgba($akvoBlack, 0.1);
+    border-radius: 0;
+    display: inline-block;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    cursor: pointer;
+    outline: none;
+}
+
+label.languageSelector select:-moz-focusring {
+    color: transparent;
+    text-shadow: 0 0 0 #444;
+}
+
+label.languageSelector select::-ms-expand {
+    display: none;
+}
+
+label.languageSelector:before {
+    content: '';
+    right: 5px;
+    top: -7px;
+    width: 30px;
+    height: 33px;
+    position: absolute;
+    pointer-events: none;
+    display: block;
+}
+
+label.languageSelector {
+    position: relative;
+}
+
+label.languageSelector:after {
+    content: '>';
+    font: 16px Consolas, monospace;
+    color: #444;
+    -webkit-transform: rotate(90deg);
+    -moz-transform: rotate(90deg);
+    -ms-transform: rotate(90deg);
+    transform: rotate(90deg);
+    right: 2px;
+    top: 2px;
+    position: absolute;
+    pointer-events: none;
+    width: 35px;
+    padding: 0 0 5px 0;
+    text-indent: 14px;
+}
+
+@media screen\0  {
+    label.languageSelector:after {
+        width: 38px;
+        text-indent: 15px;
+        right: 0;
+    }
+}
+
+@media screen and (min--moz-device-pixel-ratio: 0) {
+    label.languageSelector select {
+        padding-right: 40px;
+    }
+
+    label.languageSelector:before {
+        right: 6px;
+    }
+
+    label.languageSelector:after {
+        text-indent: 14px;
+        right: 6px;
+        top: -5px;
+        width: 36px;
+    }
+}
+
 /******************************************************************************************************
                                             Survey Preview
 ******************************************************************************************************/
diff --git a/Dashboard/app/js/templates/application/footer.handlebars b/Dashboard/app/js/templates/application/footer.handlebars
index 242dc95be8..2938b874df 100644
--- a/Dashboard/app/js/templates/application/footer.handlebars
+++ b/Dashboard/app/js/templates/application/footer.handlebars
@@ -6,6 +6,8 @@
 			<li class="footLink"><a href="https://github.com/akvo/akvo-flow/releases" title="Go to Software Updates" target="_blank" > {{t _software_updates}}</a></li>
 			<li class="footLink"><a href="http://flowsupport.akvo.org/" title="Help and Support" target="_blank" > {{t _help_support}}</a></li>
 			<li class="footLink"><a href="http://akvo.org/help/akvo-policies-and-terms-2/akvo-flow-terms-of-use/" title="Terms of Service" target="_blank" >{{t _terms_of_service}}</a></li>
+		</ul>
+		<ul>
 			<li>
 				<form>
 				   <label class="languageSelector">

From bc541811b7c35d6db3af3129c23f7e04b48d6bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Sans?= <loic.sans@gmail.com>
Date: Wed, 15 Feb 2017 07:14:18 +0200
Subject: [PATCH 2/7] [#1920] public page footer is now back to centered

---
 Dashboard/app/css/main.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Dashboard/app/css/main.scss b/Dashboard/app/css/main.scss
index 2c4fe91431..6392a81f98 100644
--- a/Dashboard/app/css/main.scss
+++ b/Dashboard/app/css/main.scss
@@ -4344,7 +4344,7 @@ border-bottom: thin solid rgba($akvoBlack, 0.05); */
         -ms-flex-pack: center;
         justify-content: flex-start;
 
-        &:last-child {
+        &:nth-child(2) {
             justify-content: flex-end;
             width: 29%;
             float: right;
@@ -4352,6 +4352,12 @@ border-bottom: thin solid rgba($akvoBlack, 0.05); */
     }
 }
 
+.publicPage footer.bottomPage nav.footItems ul {
+    width: 100%;
+    float: none;
+    justify-content: center;
+}
+
 footer.bottomPage nav.footItems ul li.footLink {
     text-align: center;
     margin-top: 10px;

From b9f08b63089dece914189ab00a146f969a12f985 Mon Sep 17 00:00:00 2001
From: Emmanuel Mulo <emmanuel@akvo.org>
Date: Wed, 22 Feb 2017 15:56:50 +0100
Subject: [PATCH 3/7] [#1959] Check for null superAdmin on user entity

---
 .../waterforpeople/mapping/app/web/rest/UserRestService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
index a2c639bfbf..5c598ee63e 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
@@ -110,7 +110,7 @@ private boolean isUserAdminRole(User user) {
     }
 
     private boolean isSuperAdminRole(User user) {
-        return user.isSuperAdmin()
+        return (user.isSuperAdmin() != null && user.isSuperAdmin())
                 || user.getPermissionList()
                         .equals(Integer.toString(AppRole.SUPER_ADMIN.getLevel()));
     }

From 7c99f924320830cc0c2eb6dcc85ae6ec50193bd9 Mon Sep 17 00:00:00 2001
From: Emmanuel Mulo <emmanuel@akvo.org>
Date: Wed, 22 Feb 2017 16:49:39 +0100
Subject: [PATCH 4/7] [#1959] Ensure no NPE when `User.isSuperAdmin()` is
 called

* Remove redundant null checks
---
 GAE/src/com/gallatinsystems/user/domain/User.java               | 2 +-
 .../waterforpeople/mapping/app/web/rest/UserRestService.java    | 2 +-
 .../web/rest/security/GoogleAccountsAuthenticationProvider.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/GAE/src/com/gallatinsystems/user/domain/User.java b/GAE/src/com/gallatinsystems/user/domain/User.java
index 2099a637c8..d50119f965 100644
--- a/GAE/src/com/gallatinsystems/user/domain/User.java
+++ b/GAE/src/com/gallatinsystems/user/domain/User.java
@@ -77,7 +77,7 @@ public void setEmailAddress(String emailAddress) {
     }
 
     public Boolean isSuperAdmin() {
-        return superAdmin;
+        return Boolean.TRUE.equals(superAdmin);
     }
 
     public void setSuperAdmin(Boolean superAdmin) {
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
index 5c598ee63e..bdbfde8863 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
@@ -110,7 +110,7 @@ private boolean isUserAdminRole(User user) {
     }
 
     private boolean isSuperAdminRole(User user) {
-        return (user.isSuperAdmin() != null && user.isSuperAdmin())
+        return (user.isSuperAdmin()
                 || user.getPermissionList()
                         .equals(Integer.toString(AppRole.SUPER_ADMIN.getLevel()));
     }
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GoogleAccountsAuthenticationProvider.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GoogleAccountsAuthenticationProvider.java
index 180b29a4d3..d4307eb84d 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GoogleAccountsAuthenticationProvider.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/security/GoogleAccountsAuthenticationProvider.java
@@ -88,7 +88,7 @@ private GaeUser findUser(String email) {
     }
 
     private int getAuthorityLevel(com.gallatinsystems.user.domain.User user) {
-        if (user.isSuperAdmin() != null && user.isSuperAdmin()) {
+        if (user.isSuperAdmin()) {
             return AppRole.SUPER_ADMIN.getLevel();
         }
         try {

From 0d0c3d6ab0c72273cec14d80e0db541f0538c319 Mon Sep 17 00:00:00 2001
From: Emmanuel Mulo <emmanuel@akvo.org>
Date: Wed, 22 Feb 2017 16:52:47 +0100
Subject: [PATCH 5/7] [#1959] Fix missing bracket

---
 .../waterforpeople/mapping/app/web/rest/UserRestService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java b/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
index bdbfde8863..a2c639bfbf 100644
--- a/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
+++ b/GAE/src/org/waterforpeople/mapping/app/web/rest/UserRestService.java
@@ -110,7 +110,7 @@ private boolean isUserAdminRole(User user) {
     }
 
     private boolean isSuperAdminRole(User user) {
-        return (user.isSuperAdmin()
+        return user.isSuperAdmin()
                 || user.getPermissionList()
                         .equals(Integer.toString(AppRole.SUPER_ADMIN.getLevel()));
     }

From 76533a3a003fcf7b34aa7809ad519e741bbb2fea Mon Sep 17 00:00:00 2001
From: Emmanuel Mulo <emmanuel@akvo.org>
Date: Thu, 23 Feb 2017 05:45:44 +0100
Subject: [PATCH 6/7] [#1959] Update copyright notice

---
 GAE/src/com/gallatinsystems/user/domain/User.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GAE/src/com/gallatinsystems/user/domain/User.java b/GAE/src/com/gallatinsystems/user/domain/User.java
index d50119f965..ab2701e0c5 100644
--- a/GAE/src/com/gallatinsystems/user/domain/User.java
+++ b/GAE/src/com/gallatinsystems/user/domain/User.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2016 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2017 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *

From f9d052ed089974a620f95dbbfdc002c5dcfe1acb Mon Sep 17 00:00:00 2001
From: Emmanuel Mulo <emmanuel@akvo.org>
Date: Thu, 23 Feb 2017 16:00:39 +0100
Subject: [PATCH 7/7] [#1964] Release notes 1.9.14

---
 RELEASE_NOTES.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 9db8c0f535..7a95e912b9 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,14 @@
 # Akvo Flow Release Notes
 ----
+#1.9.14 Masterful Mouse
+Date: 23 February 2017
+
+# Resolved issues
+* **Dashboard footer design improvements** [#1920] - Slight design improvements to the layout of the footer on the dashboard
+
+* **Fix bug that prevents users tab from loading** [#1959] - The users tab was not loading because of an error while retrieving the list of dashboard users
+
+
 #1.9.13.1 Laughing Liger hotfix
 Date: 17 February 2017