aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-01-21 11:48:10 +0100
committerMario Vavti <mario@mariovavti.com>2016-01-21 11:48:10 +0100
commitb711c050db39bd733f4a48cbe575b9e926aa3d0d (patch)
tree203ec54b2bbe4e5d1fe77098f4fbc46c85422ec4
parent928f1bfa7bdaa4f8a85ea4bec6ebcb182975f158 (diff)
downloadvolse-hubzilla-b711c050db39bd733f4a48cbe575b9e926aa3d0d.tar.gz
volse-hubzilla-b711c050db39bd733f4a48cbe575b9e926aa3d0d.tar.bz2
volse-hubzilla-b711c050db39bd733f4a48cbe575b9e926aa3d0d.zip
make contact block look widget alike
-rw-r--r--include/text.php4
-rw-r--r--view/theme/redbasic/css/style.css7
-rwxr-xr-xview/tpl/contact_block.tpl6
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 @@
-<div id="contact-block">
-<div id="contact-block-numcontacts">{{$contacts}}</div>
+<div id="contact-block" class="widget">
+<h3>{{$contacts}}</h3>
{{if $micropro}}
+ {{if $viewconnections}}
<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
+ {{/if}}
<div class='contact-block-content'>
{{foreach $micropro as $m}}
{{$m}}