From 7e761fa514d8faae76e5e0e082a6959f6d17f236 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Thu, 26 Jul 2018 17:42:26 +0200 Subject: [PATCH] [frio] Fix wrongly removed content wrapper and fix CSS instead. (#5496) (#5505) --- view/theme/frio/css/style.css | 2 +- view/theme/frio/templates/photo_album.tpl | 76 +++++++++++----------- view/theme/frio/templates/vcard-widget.tpl | 12 ++-- 3 files changed, 47 insertions(+), 43 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 84964ec6c..97fe67a9f 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -2165,7 +2165,7 @@ ul.dropdown-menu li:hover { .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, -.message-content-wrapper, .apps-content-wrapper, .photos-content-wrapper, +.message-content-wrapper, .apps-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper, .viewcontacts-content-wrapper, .dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, diff --git a/view/theme/frio/templates/photo_album.tpl b/view/theme/frio/templates/photo_album.tpl index d59068182..f043ce3fa 100644 --- a/view/theme/frio/templates/photo_album.tpl +++ b/view/theme/frio/templates/photo_album.tpl @@ -1,38 +1,40 @@ -
-

{{$album}}

+
+
+

{{$album}}

+
+ +
+ {{if $can_post}} + + + {{/if}} + {{if $edit}} + + + + {{/if}} + {{if ! $noorder}} + + + {{if $order.2 == "newest"}} + + {{else}} + + {{/if}} + + {{/if}} +
+
+ +
+ {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} +
+ +
+ + {{$paginate}} + +
- -
- {{if $can_post}} - - - {{/if}} - {{if $edit}} - - - - {{/if}} - {{if ! $noorder}} - - - {{if $order.2 == "newest"}} - - {{else}} - - {{/if}} - - {{/if}} -
-
- -
-{{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} -{{/foreach}} -
- -
- -{{$paginate}} - - diff --git a/view/theme/frio/templates/vcard-widget.tpl b/view/theme/frio/templates/vcard-widget.tpl index 1eb75d467..0115abd88 100644 --- a/view/theme/frio/templates/vcard-widget.tpl +++ b/view/theme/frio/templates/vcard-widget.tpl @@ -23,14 +23,16 @@
-

{{$name}}

+
+

{{$name}}

- {{if $addr}}
{{$addr}}
{{/if}} + {{if $addr}}
{{$addr}}
{{/if}} - {{if $pdesc}}
{{$pdesc}}
{{/if}} + {{if $pdesc}}
{{$pdesc}}
{{/if}} - {{if $account_type}}{{/if}} + {{if $account_type}}{{/if}} - {{if $network_name}}
{{$network}}
{{$network_name}}
{{/if}} + {{if $network_name}}
{{$network}}
{{$network_name}}
{{/if}} +