From c437399993b36560bb0d4956947a5ea3c4c524d0 Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Thu, 20 Aug 2015 11:15:14 +0200
Subject: [PATCH] update to movim 20150820 to fix #5

---
 README.md                                        |  5 ++++-
 sources/app/models/contact/Contact.php           |  4 ++--
 sources/app/widgets/Group/locales.ini            |  2 +-
 sources/app/widgets/Notification/notification.js | 10 +++++-----
 sources/themes/material/css/style.css            | 14 ++++++++++++++
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index b4fd772..393f3dc 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,13 @@ Movim is a decentralized social network, written in PHP and HTML5 and based on t
 
 Warning: BETA.
 
-Current Movim version : 20150818.
+Current Movim version : 20150820.
 
 **Changelog**
 
+0.7b 2015-08-20
+- Update to upstream Movim 20150820 to fix #5
+
 0.6b 2015-08-19
 - Replace 'www-data' system user with 'movim'
 - Update to upstream Movim 20150818.
diff --git a/sources/app/models/contact/Contact.php b/sources/app/models/contact/Contact.php
index 3da798b..ae332cd 100644
--- a/sources/app/models/contact/Contact.php
+++ b/sources/app/models/contact/Contact.php
@@ -259,9 +259,9 @@ class Contact extends Model {
     }
 
     public function setVcard4($vcard) {
-        if(isset($vcard->bday->date) && !empty((string)$vcard->bday->date))
+        if(isset($vcard->bday->date))
             $this->date    = (string)$vcard->bday->date;
-        else
+        if($empty($this->date))
             $this->date    = null;
 
         $this->name    = (string)$vcard->nickname->text;
diff --git a/sources/app/widgets/Group/locales.ini b/sources/app/widgets/Group/locales.ini
index 9dec033..40a499b 100644
--- a/sources/app/widgets/Group/locales.ini
+++ b/sources/app/widgets/Group/locales.ini
@@ -20,6 +20,6 @@ subscriptions      = Subscriptions
 servers            = Groups servers
 search_server      = Search for a new server
 help_info1         = "Groups are the perfect way to share posts about topics that you like with all the other Movim's users."
-help_info2         = Choose a server and a Group and subscribe to it using the %s button in the header. You can alse create a new one using the %s button.
+help_info2         = Choose a server and a Group and subscribe to it using the %s button in the header. You can also create a new one using the %s button.
 help_info3         = Done? You can now publish a new post in the Group by using the %s button.
 help_info4         = You will find a list of all your subscribed Groups in My Subscriptions and receive instantly all the new incoming posts in the %sNews%s page.
diff --git a/sources/app/widgets/Notification/notification.js b/sources/app/widgets/Notification/notification.js
index 9d409c8..6a8cf24 100644
--- a/sources/app/widgets/Notification/notification.js
+++ b/sources/app/widgets/Notification/notification.js
@@ -76,11 +76,11 @@ var Notification = {
     },
     toast : function(html) {
         target = document.getElementById('toast');
-        
+
         if(target) {
             target.innerHTML = html;
         }
-        
+
         setTimeout(function() {
             target = document.getElementById('toast');
             target.innerHTML = '';
@@ -91,11 +91,11 @@ var Notification = {
         if(Notification.inhibed == true) return;
 
         target = document.getElementById('snackbar');
-        
+
         if(target) {
             target.innerHTML = html;
         }
-        
+
         setTimeout(function() {
             target = document.getElementById('snackbar');
             target.innerHTML = '';
@@ -105,7 +105,7 @@ var Notification = {
     desktop : function(title, body, picture) {
         if(Notification.inhibed == true
         || Notification.focused) return;
-
+console.log(DesktopNotification);
         var notification = new DesktopNotification(title, { icon: picture, body: body });
     }
 }
diff --git a/sources/themes/material/css/style.css b/sources/themes/material/css/style.css
index bf505b3..38cf2da 100644
--- a/sources/themes/material/css/style.css
+++ b/sources/themes/material/css/style.css
@@ -200,6 +200,20 @@ body > nav li { /* Little hack for the navbar */
     }
 }
 
+@media screen and (min-width: 1680px) {
+    body > nav,
+    body > nav:hover {
+        width: 32rem;
+        box-shadow: none;
+    }
+
+    body > nav + main,
+    body > nav:hover + main {
+        opacity: 1;
+        width: calc(100% - 32rem);
+    }
+}
+
 body > nav.active:before,
 body > nav:hover:before {
     display: none;