From b711c050db39bd733f4a48cbe575b9e926aa3d0d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 21 Jan 2016 11:48:10 +0100 Subject: [PATCH] make contact block look widget alike --- include/text.php | 4 ++-- view/theme/redbasic/css/style.css | 7 ------- view/tpl/contact_block.tpl | 6 ++++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/text.php b/include/text.php index 6f7297bb0..a03648081 100644 --- a/include/text.php +++ b/include/text.php @@ -812,7 +812,7 @@ function contact_block() { ); if(count($r)) { - $contacts = sprintf( tt('%d Connection','%d Connections', $total),$total); + $contacts = t('Connections'); $micropro = Array(); foreach($r as $rr) { $rr['archived'] = (intval($rr['abook_archived']) ? true : false); @@ -825,7 +825,7 @@ function contact_block() { $o = replace_macros($tpl, array( '$contacts' => $contacts, '$nickname' => $a->profile['channel_address'], - '$viewconnections' => t('View Connections'), + '$viewconnections' => (($total > $shown) ? sprintf(t('View all %s connections'),$total) : ''), '$micropro' => $micropro, )); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8020da00a..4ae08dec8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -489,13 +489,6 @@ footer { #contact-block { width: 100%; float: left; - background-color: rgba(254,254,254,0.5); - border-bottom: 1px solid rgba(238,238,238,0.8); - -moz-border-radius: $radiuspx; - -webkit-border-radius: $radiuspx; - border-radius: $radiuspx; - padding: 10px; - margin-bottom:10px; } #contact-block-numcontacts { diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl index d1ce5ca67..a32437212 100755 --- a/view/tpl/contact_block.tpl +++ b/view/tpl/contact_block.tpl @@ -1,7 +1,9 @@ -
-
{{$contacts}}
+
+

{{$contacts}}

{{if $micropro}} + {{if $viewconnections}} {{$viewconnections}} + {{/if}}
{{foreach $micropro as $m}} {{$m}}