diff --git a/app/models/item/Item.php b/app/models/item/Item.php
index d21d4c261..712570e4c 100644
--- a/app/models/item/Item.php
+++ b/app/models/item/Item.php
@@ -128,7 +128,7 @@ class Item extends Model
}
}
- public function getLogo($size = 120)
+ public function getLogo($size = false)
{
$p = new Picture;
return $p->get($this->server.$this->node, $size);
diff --git a/app/models/item/ItemDAO.php b/app/models/item/ItemDAO.php
index 242c084e7..4458b1bf5 100644
--- a/app/models/item/ItemDAO.php
+++ b/app/models/item/ItemDAO.php
@@ -290,8 +290,19 @@ class ItemDAO extends SQL
function getItem($server, $item) {
$this->_sql = '
select * from item
+ left outer join (
+ select node, count(node) as num from postn
+ where origin = :server
+ group by node) as p
+ on p.node = item.node
+ left outer join (
+ select node, count(node) as sub from subscription
+ where server = :server
+ group by node
+ ) as sub
+ on sub.node = item.node
where
- node = :node
+ item.node = :node
and server = :server';
$this->prepare(
diff --git a/app/widgets/Communities/_communities.tpl b/app/widgets/Communities/_communities.tpl
index 178376105..63932c5c6 100644
--- a/app/widgets/Communities/_communities.tpl
+++ b/app/widgets/Communities/_communities.tpl
@@ -29,9 +29,6 @@
-->
- -
-
{$c->__('group.servers')}
-
{loop="$servers"}
{if="!filter_var($value->server, FILTER_VALIDATE_EMAIL)"}
-
+
diff --git a/app/widgets/CommunityData/_communitydata.tpl b/app/widgets/CommunityData/_communitydata.tpl
index 79fec0ed8..c555a5b19 100644
--- a/app/widgets/CommunityData/_communitydata.tpl
+++ b/app/widgets/CommunityData/_communitydata.tpl
@@ -2,11 +2,19 @@
{if="$item->logo"}
-
-
+
-
{$item->name}
- {$item->created|strtotime|prepareDate:true,true}
+
+
+ {if="$item->num > 0"}
+ {$c->__('groups.num', $item->num)}
+ {/if}
+ {if="$item->sub > 0"}
+
{$c->__('groups.sub', $item->sub)}
+ {/if}
+
{/if}
diff --git a/app/widgets/Post/_post_card.tpl b/app/widgets/Post/_post_card.tpl
index 67975d48a..b2de901be 100644
--- a/app/widgets/Post/_post_card.tpl
+++ b/app/widgets/Post/_post_card.tpl
@@ -1,13 +1,27 @@
-
-
- {if="$post->isMicroblog()"}
-
+ {if="$post->isNSFW()"}
+
+ +18
+
+ {elseif="$post->isMicroblog()"}
+ {$url = $post->getContact()->getPhoto('m')}
+ {if="$url"}
+
+
+
+ {else}
+
+
+
+ {/if}
{else}
-
+
+ {$post->node|firstLetterCapitalize}
+
{/if}
-
+
{$post->title}
{if="$post->isMicroblog()"}
@@ -104,11 +118,17 @@
- {$post->countComments()}
+ {$post->countComments()}
+ {if="$post->isPublic()"}
+
+
+
+ {/if}
+
Read more
diff --git a/locales/locales.ini b/locales/locales.ini
index 3d6124d2c..03a515032 100644
--- a/locales/locales.ini
+++ b/locales/locales.ini
@@ -19,6 +19,7 @@ configuration = Configuration
public_groups = Public Groups
profile = Profile
publish = Publish
+post = Post
blog = Blog
about = About
login = Login
diff --git a/themes/material/css/style.css b/themes/material/css/style.css
index 88888eb69..a51c4ad77 100644
--- a/themes/material/css/style.css
+++ b/themes/material/css/style.css
@@ -196,10 +196,9 @@ main > section > div:first-child:nth-last-child(2) ~ div {
@media screen and (min-width: 1025px) {
main > section > aside {
- width: 33%;
+ width: calc(50% - 30rem);
right: 0;
position: absolute;
- margin-right: 2%;
}
main > section > aside > * {
@@ -211,7 +210,7 @@ main > section > div:first-child:nth-last-child(2) ~ div {
}
main > section > aside + div > * {
- margin-right: 35%;
+ margin-right: calc(50% - 30rem);
margin-left: auto;
}
}