Merge branch 'release/1.9.14'

akvo · Feb 23, 2017 · b747abe · b747abe
2 parents 6300f22 + f9d052e
commit b747abe
Show file tree

Hide file tree

Showing 5 changed files with 137 additions and 24 deletions.
diff --git a/Dashboard/app/css/main.scss b/Dashboard/app/css/main.scss
@@ -4282,16 +4282,15 @@ 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;
 }
 
 footer.bottomPage div:nth-child(1n) {
     position: relative;
     margin: 0 auto;
     padding: 0;
-    width: 90%;
+    width: 100%;
     min-width: 768px;
 }
 
@@ -4316,29 +4315,52 @@ 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;
+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;
+
+        &:nth-child(2) {
+            justify-content: flex-end;
+            width: 29%;
+            float: right;
+        }
+    }
+}
+
+.publicPage footer.bottomPage nav.footItems ul {
+    width: 100%;
+    float: none;
     justify-content: center;
-    margin: 0 auto;
-    text-align: center;
 }
 
 footer.bottomPage nav.footItems ul li.footLink {
     text-align: center;
+    margin-top: 10px;
 }
 
 footer.bottomPage nav ul li a {
@@ -4358,6 +4380,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
@@ -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">

diff --git 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.
  *
@@ -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/...rg/waterforpeople/mapping/app/web/rest/security/GoogleAccountsAuthenticationProvider.java b/...rg/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 {

diff --git 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