aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/conversation.php23
-rw-r--r--view/theme/duepuntozero/style.css19
2 files changed, 39 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 09623ff74..6b52f51cd 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -17,7 +17,26 @@ function localize_item(&$item){
$author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
$objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
- $post_type = (($obj['resource-id']) ? t('photo') : t('status'));
+ switch($obj['verb']){
+ case 'http://activitystrea.ms/schema/1.0/post':
+ switch ($obj['object-type']){
+ case 'http://activitystrea.ms/schema/1.0/event':
+ $post_type = t('event');
+ break;
+ default:
+ $post_type = t('status');
+ }
+ break;
+ default:
+ if($obj['resource-id']){
+ $post_type = t('photo');
+ $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
+ $rr['plink'] = $m[1];
+ } else {
+ $post_type = t('status');
+ }
+ }
+
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
switch($item['verb']){
@@ -779,4 +798,4 @@ function status_editor($a,$x, $notes_cid = 0) {
));
return $o;
-} \ No newline at end of file
+}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0ff41c92b..fccbe16d9 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -48,8 +48,13 @@ code {
padding: 10px;
margin-top: 20px;
}
-blockquote:before {
+/*blockquote:before {
content: '>> ';
+}*/
+blockquote {
+ background-color: #f4f8f9;
+ border-left: 4px solid #dae4ee;
+ padding: 0.4em;
}
.icollapse-wrapper, .ccollapse-wrapper {
@@ -174,6 +179,16 @@ aside {
position: absolute;
}
+#dfrn-request-link {
+ display: block;
+ color: #FFFFFF;
+ -webkit-border-radius: 5px ;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ padding: 5px;
+ font-weight: bold;
+ background: #3465a4 url('friendika-16.png') no-repeat 95% center;
+}
/* section */
section {
@@ -204,6 +219,7 @@ section {
margin-right: 1em;
}
+
/* footer */
footer {
display: none;
@@ -479,6 +495,7 @@ input#dfrn-url {
#profile-extra-links ul {
list-style-type: none;
+ padding: 0px;
}