From: Michael Vogel <icarus@dabo.de>
Date: Thu, 27 Dec 2012 00:05:59 +0000 (+0100)
Subject: Vier: Now the language of a post is shown
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=763504f0d530f8fbe3ccedbf877eae71838644b9;p=friendica.git

Vier: Now the language of a post is shown
---

diff --git a/object/Item.php b/object/Item.php
index 0c84146f9b..5cea341f02 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 b982a20693..451bf9dabd 100644
--- a/view/theme/vier/profile_vcard.tpl
+++ b/view/theme/vier/profile_vcard.tpl
@@ -17,10 +17,11 @@
 								
 			</ul>
 			</div>
+		{{ else }}
+			<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles/$profid" ></a></div>
 		{{ endif }}
 	</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 }}
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 5532c06eee..9524c73cab 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 d535704605..366493a686 100644
--- a/view/theme/vier/wall_thread.tpl
+++ b/view/theme/vier/wall_thread.tpl
@@ -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>
 			{{ endif }}
 			</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">
 
 				{{ if $item.drop.pagedrop }}
@@ -128,14 +128,16 @@
 		</div>
 	</div>
 	<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-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
 	</div>
 	
 	{{ if $item.threaded }}{{ if $item.comment }}
 	<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;">
 					$item.comment
 		</div>