friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

OStatus conversations: Fixed a bug when a message hadn't got an id. 

vier: Some more changes to make the side menu static.
In the index.php I did a small change to make friendica compatible with the android client for diaspora.
This commit is contained in:
Michael Vogel 2013-03-06 23:23:04 +01:00
parent 86e19dda22
commit c40c61c106
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ostatus_conversation.php
View File

@ -90,6 +90,12 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
$items = array_reverse($conv_as->items); $items = array_reverse($conv_as->items);
foreach ($items as $single_conv) { 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 == "") { if ($first_id == "") {
$first_id = $single_conv->id; $first_id = $single_conv->id;

4
index.php
View File

@ -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")) { 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"); include_once("addon/{$a->module}/{$a->module}.php");
if(function_exists($a->module . '_module')) if(function_exists($a->module . '_module'))

17
view/theme/vier/style.css
View File

@ -291,7 +291,7 @@ body {
background-color: #F2F2F2; background-color: #F2F2F2;
color: #2d2d2d; color: #2d2d2d;
/* margin: 37px 0px 0px 0px; */ /* margin: 37px 0px 0px 0px; */
margin: 32px 0px 0px 0px; margin: 0px 0px 0px 0px;
display: table; display: table;
/* width: 100% */ /* width: 100% */
} }
@ -849,6 +849,7 @@ ul.menu-popup .empty {
right_aside { right_aside {
width: 0px; width: 0px;
top: 32px;
display: block; display: block;
} }
@ -857,12 +858,20 @@ aside {
/* display: table-cell; */ /* display: table-cell; */
vertical-align: top; vertical-align: top;
width: 185px; width: 185px;
padding: 10px 10px 10px 20px; padding: 32px 10px 10px 20px;
/* border-right: 1px solid #D2D2D2; */ /* border-right: 1px solid #D2D2D2; */
/* background-color: #ECECF2; */ /* background-color: #ECECF2; */
background-color: #F2F2F2; background-color: #F2F2F2;
font-size: 13px; font-size: 13px;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
top: 0px;
overflow-y: auto;
z-index: 2;
position: fixed;
/* overflow: auto; */
height: 100%;
/* overflow: scroll; */
} }
aside .vcard .fn { aside .vcard .fn {
font-size: 18px; font-size: 18px;
@ -1062,6 +1071,7 @@ aside h4 {
section { section {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
top: 32px;
width: 766px; width: 766px;
max-width: 766px; max-width: 766px;
padding: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;
@ -1069,6 +1079,9 @@ section {
border-bottom: 1px solid lightgray; border-bottom: 1px solid lightgray;
border-right: 1px solid lightgray; border-right: 1px solid lightgray;
border-left: 1px solid lightgray; border-left: 1px solid lightgray;
position: absolute;
left: 215px;
} }
/* wall item */ /* wall item */
.tread-wrapper { .tread-wrapper {