From c40c61c10689baaa986200b2ac09a78bda268ede Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 6 Mar 2013 23:23:04 +0100 Subject: [PATCH 1/2] 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. --- include/ostatus_conversation.php | 6 ++++++ index.php | 4 ++++ view/theme/vier/style.css | 17 +++++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php index ef9e4f179..f430d9e47 100644 --- 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 40551f388..8e2376e91 100644 --- 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 ebcab5a14..fe9ec459c 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -291,7 +291,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 +849,7 @@ ul.menu-popup .empty { right_aside { width: 0px; + top: 32px; display: block; } @@ -857,12 +858,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 +1071,7 @@ aside h4 { section { display: table-cell; vertical-align: top; + top: 32px; width: 766px; max-width: 766px; padding: 10px 10px 10px 10px; @@ -1069,6 +1079,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 { From 5d3613c8bc057392d3d43986357da6dddf60ce85 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 7 Mar 2013 19:34:54 +0100 Subject: [PATCH 2/2] Vier: The change from blue to black in links is now faded as well. --- include/enotify.php | 3 +-- view/theme/vier/style.css | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index 928d2b4b4..f294a4fc7 100644 --- 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/view/theme/vier/style.css b/view/theme/vier/style.css index fe9ec459c..1595499ee 100644 --- 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 { @@ -1210,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, @@ -1227,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; */ }