Merge pull request #646 from annando/master

OStatus conversations, "vier" and diaspora android client

diff --git a/include/enotify.php b/include/enotify.php
index 928d2b4b484c2b818618e6b600b271ec6a4f3d1e..f294a4fc771746c033c07e4a86b89473a1d23f3f 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -214,11 +214,10 @@ function notification($params) {
        }
 
        if($params['type'] == NOTIFY_CONFIRM) {
-
        }
 
        if($params['type'] == NOTIFY_SYSTEM) {
-               
+
        }
 
        $h = array(

diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php
index ef9e4f17937b11cf5f5369ce7bf3be89c33dce63..f430d9e47aba4c6085469e05c2c6f0761e94c943 100644 (file)
--- a/include/ostatus_conversation.php
+++ b/include/ostatus_conversation.php
@@ -90,6 +90,12 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
                $items = array_reverse($conv_as->items);
 
                foreach ($items as $single_conv) {
+                       if (@!$single_conv->id AND $single_conv->provider->url AND $single_conv->statusnet_notice_info->local_id)
+                               $single_conv->id = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
+
+                       if (@!$single_conv->id)
+                               continue;
+
                        if ($first_id == "") {
                                $first_id = $single_conv->id;
 

diff --git a/index.php b/index.php
index 40551f3881cf22860f0fd89b797c15513e88c345..8e2376e918120c4d0c7319c28c8c30a643376ae2 100644 (file)
--- a/index.php
+++ b/index.php
@@ -183,6 +183,10 @@ if(strlen($a->module)) {
         *
         */
 
+       // Compatibility with the Android Diaspora client
+       if ($a->module == "stream")
+               $a->module = "network";
+
        if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
                include_once("addon/{$a->module}/{$a->module}.php");
                if(function_exists($a->module . '_module'))

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index ebcab5a144be38b157d43247efa33d6b0c60dd6d..1595499ee01f73383feab23e1421cb5d58c04ac4 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -240,6 +240,11 @@ div.pager {
 
 .shared_header a {
   color: black;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
 }
 
 .shared_header a:hover {
@@ -291,7 +296,7 @@ body {
   background-color: #F2F2F2;
   color: #2d2d2d;
   /* margin: 37px 0px 0px 0px; */
-  margin: 32px 0px 0px 0px;
+  margin: 0px 0px 0px 0px;
   display: table;
   /* width: 100% */
 }
@@ -849,6 +854,7 @@ ul.menu-popup .empty {
 
 right_aside {
   width: 0px;
+  top: 32px;
   display: block;
 }
 
@@ -857,12 +863,20 @@ aside {
   /* display: table-cell; */
   vertical-align: top;
   width: 185px;
-  padding: 10px 10px 10px 20px;
+  padding: 32px 10px 10px 20px;
   /* border-right: 1px solid #D2D2D2; */
   /* background-color: #ECECF2; */
   background-color: #F2F2F2;
   font-size: 13px;
   /* background: #F1F1F1; */
+  top: 0px;
+  overflow-y: auto;
+  z-index: 2;
+
+  position: fixed;
+  /* overflow: auto; */
+  height: 100%;
+  /* overflow: scroll; */
 }
 aside .vcard .fn {
   font-size: 18px;
@@ -1062,6 +1076,7 @@ aside h4 {
 section {
   display: table-cell;
   vertical-align: top;
+  top: 32px;
   width: 766px;
   max-width: 766px;
   padding: 10px 10px 10px 10px;
@@ -1069,6 +1084,9 @@ section {
   border-bottom: 1px solid lightgray;
   border-right: 1px solid lightgray;
   border-left: 1px solid lightgray;
+
+  position: absolute;
+  left: 215px;
 }
 /* wall item */
 .tread-wrapper {
@@ -1197,6 +1215,11 @@ border-bottom: 1px solid #D2D2D2;
 .wall-item-container .wall-item-name {
   color: black;
   font-weight: bold;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
 }
 
 .toplevel_item:hover .wall-item-name,
@@ -1214,6 +1237,11 @@ border-bottom: 1px solid #D2D2D2;
 .toplevel_item .fakelink,
 .wall-item-container .fakelink {
   color: black;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
   /* color: darkblue; */
   /* color: #3E3E8C; */
 }