strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Vier: Now the language of a post is shown

Browse source
This commit is contained in:
Michael Vogel 2012-12-27 01:05:59 +01:00
parent 5bc6896671
commit 763504f0d5
4 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
object/Item.php
View file

@ -115,10 +115,10 @@ class Item extends BaseObject {
$drop = array( $drop = array(
'dropping' => $dropping, 'dropping' => $dropping,
'pagedrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $item['pagedrop'] : ''), 'pagedrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $item['pagedrop'] : ''),
'select' => t('Select'), 'select' => t('Select'),
'delete' => t('Delete'), 'delete' => t('Delete'),
); );
$filer = (($conv->get_profile_owner() == local_user()) ? t("save to folder") : false); $filer = (($conv->get_profile_owner() == local_user()) ? t("save to folder") : false);
$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true); $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
@ -133,7 +133,7 @@ class Item extends BaseObject {
if($sp) if($sp)
$sparkle = ' sparkle'; $sparkle = ' sparkle';
else else
$profile_link = zrl($profile_link); $profile_link = zrl($profile_link);
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
@ -212,13 +212,18 @@ class Item extends BaseObject {
localize_item($item); localize_item($item);
if ($item["postopts"]) {
$langdata = explode(";", $item["postopts"]);
$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)";
}
$body = prepare_body($item,true); $body = prepare_body($item,true);
list($categories, $folders) = get_cats_and_terms($item); list($categories, $folders) = get_cats_and_terms($item);
$tmp_item = array( $tmp_item = array(
'template' => $this->get_template(), 'template' => $this->get_template(),
'type' => implode("",array_slice(explode("/",$item['verb']),-1)), 'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
'tags' => $tags, 'tags' => $tags,
'hashtags' => $hashtags, 'hashtags' => $hashtags,
@ -268,7 +273,8 @@ class Item extends BaseObject {
'comment' => $this->get_comment_box($indent), 'comment' => $this->get_comment_box($indent),
'previewing' => ($conv->is_preview() ? ' preview ' : ''), 'previewing' => ($conv->is_preview() ? ' preview ' : ''),
'wait' => t('Please wait'), 'wait' => t('Please wait'),
'thread_level' => $thread_level 'thread_level' => $thread_level,
'postopts' => $langstr
); );
$arr = array('item' => $item, 'output' => $tmp_item); $arr = array('item' => $item, 'output' => $tmp_item);

5
view/theme/vier/profile_vcard.tpl
View file

@ -17,10 +17,11 @@
</ul> </ul>
</div> </div>
{{ else }}
<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles/$profid" ></a></div>
{{ endif }} {{ endif }}
</div> </div>
<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}

20
view/theme/vier/style.css
View file

@ -1067,8 +1067,9 @@ border-bottom: 1px solid #D2D2D2;
text-align: left; text-align: left;
width: 80px; width: 80px;
} }
.wall-item-container .wall-item-location { .wall-item-container {
padding-right: 40px; /* padding-right: 30px; */
padding-right: 0px;
} }
.wall-item-container .wall-item-ago { .wall-item-container .wall-item-ago {
word-wrap: break-word; word-wrap: break-word;
@ -1077,7 +1078,7 @@ border-bottom: 1px solid #D2D2D2;
color: #999; color: #999;
} }
.wall-item-location { .wall-item-location {
width: 180px; width: 350px;
float: left; float: left;
} }
@ -1282,6 +1283,10 @@ border-bottom: 1px solid #D2D2D2;
height: 100px; height: 100px;
} }
#profile-jot-perms {
float: right;
}
#jot-preview-content { #jot-preview-content {
padding-top: 25px; padding-top: 25px;
} }
@ -1816,10 +1821,15 @@ div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit-
} }
.profile-edit-side-div { .profile-edit-side-div {
display: none; /* display: none; */
/* float: right; */ float: right;
} }
/* aside div.clear {
clear: none;
float: left;
} */
#register-form label, #register-form label,
#profile-edit-form label { #profile-edit-form label {
width: 300px; float: left; width: 300px; float: left;

8
view/theme/vier/wall_thread.tpl
View file

@ -111,7 +111,7 @@
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"><i class="icon-folder-close icon-large"></i></a> <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"><i class="icon-folder-close icon-large"></i></a>
{{ endif }} {{ endif }}
</div> </div>
<div class="wall-item-location">$item.location</div> <div class="wall-item-location">$item.location $item.postopts</div>
<div class="wall-item-actions-tools"> <div class="wall-item-actions-tools">
{{ if $item.drop.pagedrop }} {{ if $item.drop.pagedrop }}
@ -128,14 +128,16 @@
</div> </div>
</div> </div>
<div class="wall-item-bottom"> <div class="wall-item-bottom">
<div class="wall-item-links"></div> <div class="wall-item-links">
</div>
<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
</div> </div>
{{ if $item.threaded }}{{ if $item.comment }} {{ if $item.threaded }}{{ if $item.comment }}
<div class="wall-item-bottom"> <div class="wall-item-bottom">
<div class="wall-item-links"></div> <div class="wall-item-links">
</div>
<div class="wall-item-comment-wrapper" id="item-comments-$item.id" style="display: none;"> <div class="wall-item-comment-wrapper" id="item-comments-$item.id" style="display: none;">
$item.comment $item.comment
</div> </div>