From 763504f0d530f8fbe3ccedbf877eae71838644b9 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 27 Dec 2012 01:05:59 +0100 Subject: [PATCH] Vier: Now the language of a post is shown --- object/Item.php | 18 ++++++++++++------ view/theme/vier/profile_vcard.tpl | 5 +++-- view/theme/vier/style.css | 20 +++++++++++++++----- view/theme/vier/wall_thread.tpl | 8 +++++--- 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/object/Item.php b/object/Item.php index 0c84146f9..5cea341f0 100644 --- a/object/Item.php +++ b/object/Item.php @@ -115,10 +115,10 @@ class Item extends BaseObject { $drop = array( 'dropping' => $dropping, 'pagedrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $item['pagedrop'] : ''), - 'select' => t('Select'), + 'select' => t('Select'), 'delete' => t('Delete'), ); - + $filer = (($conv->get_profile_owner() == local_user()) ? t("save to folder") : false); $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true); @@ -133,7 +133,7 @@ class Item extends BaseObject { if($sp) $sparkle = ' sparkle'; else - $profile_link = zrl($profile_link); + $profile_link = zrl($profile_link); $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) @@ -212,13 +212,18 @@ class Item extends BaseObject { 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); - list($categories, $folders) = get_cats_and_terms($item); + list($categories, $folders) = get_cats_and_terms($item); $tmp_item = array( 'template' => $this->get_template(), - + 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), 'tags' => $tags, 'hashtags' => $hashtags, @@ -268,7 +273,8 @@ class Item extends BaseObject { 'comment' => $this->get_comment_box($indent), 'previewing' => ($conv->is_preview() ? ' preview ' : ''), 'wait' => t('Please wait'), - 'thread_level' => $thread_level + 'thread_level' => $thread_level, + 'postopts' => $langstr ); $arr = array('item' => $item, 'output' => $tmp_item); diff --git a/view/theme/vier/profile_vcard.tpl b/view/theme/vier/profile_vcard.tpl index b982a2069..451bf9dab 100644 --- a/view/theme/vier/profile_vcard.tpl +++ b/view/theme/vier/profile_vcard.tpl @@ -17,10 +17,11 @@ + {{ else }} +
{{ endif }} - - +
$profile.name
{{ if $pdesc }}
$profile.pdesc
{{ endif }} diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 5532c06ee..9524c73ca 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1067,8 +1067,9 @@ border-bottom: 1px solid #D2D2D2; text-align: left; width: 80px; } -.wall-item-container .wall-item-location { - padding-right: 40px; +.wall-item-container { + /* padding-right: 30px; */ + padding-right: 0px; } .wall-item-container .wall-item-ago { word-wrap: break-word; @@ -1077,7 +1078,7 @@ border-bottom: 1px solid #D2D2D2; color: #999; } .wall-item-location { - width: 180px; + width: 350px; float: left; } @@ -1282,6 +1283,10 @@ border-bottom: 1px solid #D2D2D2; height: 100px; } +#profile-jot-perms { + float: right; +} + #jot-preview-content { padding-top: 25px; } @@ -1816,10 +1821,15 @@ div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit- } .profile-edit-side-div { - display: none; -/* float: right; */ +/* display: none; */ + float: right; } +/* aside div.clear { + clear: none; + float: left; +} */ + #register-form label, #profile-edit-form label { width: 300px; float: left; diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl index d53570460..366493a68 100644 --- a/view/theme/vier/wall_thread.tpl +++ b/view/theme/vier/wall_thread.tpl @@ -111,7 +111,7 @@ {{ endif }} -
$item.location
+
$item.location $item.postopts
{{ if $item.drop.pagedrop }} @@ -128,14 +128,16 @@
- +
$item.dislike
{{ if $item.threaded }}{{ if $item.comment }}
- +