Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 07:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
Friendika 2011-07-07 15:36:03 -07:00
commit 0470eb7805
2 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/conversation.php
View file

@ -17,7 +17,26 @@ function localize_item(&$item){
$author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
$objauthor = '[url=' . $obj['author-link'] . ']' . $obj['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]'; $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
switch($item['verb']){ switch($item['verb']){

19
view/theme/duepuntozero/style.css
View file

@ -48,8 +48,13 @@ code {
padding: 10px; padding: 10px;
margin-top: 20px; margin-top: 20px;
} }
blockquote:before { /*blockquote:before {
content: '>> '; content: '>> ';
}*/
blockquote {
background-color: #f4f8f9;
border-left: 4px solid #dae4ee;
padding: 0.4em;
} }
.icollapse-wrapper, .ccollapse-wrapper { .icollapse-wrapper, .ccollapse-wrapper {
@ -174,6 +179,16 @@ aside {
position: absolute; 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 */
section { section {
@ -204,6 +219,7 @@ section {
margin-right: 1em; margin-right: 1em;
} }
/* footer */ /* footer */
footer { footer {
display: none; display: none;
@ -479,6 +495,7 @@ input#dfrn-url {
#profile-extra-links ul { #profile-extra-links ul {
list-style-type: none; list-style-type: none;
padding: 0px;
} }