- Merge with myself, MEH

app/models/contact/ContactDAO.php

@@ -578,9 +578,8 @@ class ContactDAO extends SQL {
     function getTop($limit = 5) {
         $this->_sql = '
             select *, jidfrom from (
-                select jidfrom, count(*) from message
-                where published > :date
-                    and jidfrom not like :jid
+                select jidfrom, count(*) as count from message
+                where jidfrom not like :jid
                     and session = :jid
                 group by jidfrom 
                 order by count desc
@@ -591,7 +590,6 @@ class ContactDAO extends SQL {
         $this->prepare(
             'Contact', 
             array(
-                'date' => date('Y-m-d H:i:s', time()-3600*24*7),
                 'jid' => $this->_user,
                 'tunelenght' => $limit // And an another hack…
             )

app/views/page.tpl

@@ -8,6 +8,7 @@
     <title><?php $this->title();?></title>
     
     <meta name="description" content="<?php echo $config->description; ?>" />
+    <meta name="theme-color" content="#1C1D5B" />
     
     <link rel="shortcut icon" href="<?php $this->linkFile('img/favicon.ico');?>" />
     <link rel="stylesheet" href="<?php echo BASE_URI; ?>app/assets/js/leaflet.css" />

app/widgets/Login/login.css

@@ -1,10 +1,10 @@
 body main {
-    background-color: #212121;
+    background-color: #1C1D5B;
 
     background-image: url(img/logo.svg);
     background-repeat: no-repeat;
     background-position: center 90%;
-    background-size: 30rem auto;
+    background-size: 30rem auto, 100% 100%;
 }
 
 @media screen and (max-width: 600px) {

manifest.webapp

@@ -2,11 +2,12 @@
     "version": "0.9",
     "name": "Movim",
     "description": "Kick Ass Social Network, decentralized and fully based on XMPP ",
-	"icons": {
-		"16": "/themes/movim/img/icons/app/16.png",
-		"48": "/themes/movim/img/icons/app/48.png",
-		"128": "/themes/movim/img/icons/app/128.png"
-	},
+    "icons": {
+        "16": "/themes/material/img/app/16.png",
+        "48": "/themes/material/img/app/48.png",
+        "128": "/themes/material/img/app/128.png",
+        "512": "/themes/material/img/app/512.png"
+    },
     "developer": {
         "name": "Jaussoin Timothée",
         "url": "http://movim.eu"