aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-04-18 08:19:56 +0200
committerMario Vavti <mario@mariovavti.com>2018-04-18 08:19:56 +0200
commit440ccf19d1b21d293f134e03233f0dd564cdc5ba (patch)
tree752bc8e1210197e2eff3ee8c1cad96bf74ac4a9c /view
parentc0794a83b490031590bc1488b3f15a0cb4f7a2e4 (diff)
parentfc7d9c235cf845e687095d4f30d32eca4c12bc4a (diff)
downloadvolse-hubzilla-440ccf19d1b21d293f134e03233f0dd564cdc5ba.tar.gz
volse-hubzilla-440ccf19d1b21d293f134e03233f0dd564cdc5ba.tar.bz2
volse-hubzilla-440ccf19d1b21d293f134e03233f0dd564cdc5ba.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view')
-rw-r--r--view/pdl/mod_pubstream.pdl4
-rw-r--r--view/theme/redbasic/css/style.css4
-rwxr-xr-xview/tpl/cover_photo.tpl5
3 files changed, 11 insertions, 2 deletions
diff --git a/view/pdl/mod_pubstream.pdl b/view/pdl/mod_pubstream.pdl
index 95f069031..abb1a4931 100644
--- a/view/pdl/mod_pubstream.pdl
+++ b/view/pdl/mod_pubstream.pdl
@@ -1,3 +1,7 @@
+[region=aside]
+[widget=pubtagcloud][var=trending]8[/var][var=limit]20[/var][/widget]
+[widget=pubtagcloud][/widget]
+[/region]
[region=right_aside]
[widget=notifications][/widget]
[widget=newmember][/widget]
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a9dcc292a..6e516b21e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1795,3 +1795,7 @@ dl.bb-dl > dd > li {
position: absolute;
text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
}
+
+.cover-photo-review {
+ margin-bottom: 10px;
+}
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index 829a3a556..92efcdf02 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -86,10 +86,11 @@
<h2>{{$title}}</h2>
</div>
<div class="section-content-wrapper">
-
+ {{if $existing}}
+ <img class="cover-photo-review" style="max-width: 100%;" src="{{$existing.url}}" alt="{{t('Cover Photo')}}" />
+ {{/if}}
<form enctype="multipart/form-data" action="cover_photo" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
<div id="profile-photo-upload-wrapper">
<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>