friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

[frio] Fix wrongly removed content wrapper and fix CSS instead. (#5496) (#5505)

This commit is contained in:
Andreas Neustifter 2018-07-26 17:42:26 +02:00 committed by Hypolite Petovan
parent 986106a8f7
commit 7e761fa514
3 changed files with 47 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
view/theme/frio/css/style.css
View File

@ -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,

76
view/theme/frio/templates/photo_album.tpl
View File

@ -1,38 +1,40 @@
<div class="pull-left">
<h3 id="photo-album-title">{{$album}}</h3>
<div class="generic-page-wrapper">
<div class="pull-left">
<h3 id="photo-album-title">{{$album}}</h3>
</div>
<div class="photo-album-actions pull-right">
{{if $can_post}}
<a class="photos-upload-link" href="{{$upload.1}}" title="{{$upload.0}}" data-toggle="tooltip">
<i class="faded-icon fa fa-plus"></i></a>
{{/if}}
{{if $edit}}
<span class="icon-padding"> </span>
<a id="album-edit-link" href="{{$edit.1}}" title="{{$edit.0}}" data-toggle="tooltip">
<i class="faded-icon fa fa-pencil"></i></a>
{{/if}}
{{if ! $noorder}}
<span class="icon-padding"> </span>
<a class="photos-order-link" href="{{$order.1}}" title="{{$order.0}}" data-toggle="tooltip">
{{if $order.2 == "newest"}}
<i class="faded-icon fa fa-sort-numeric-desc"></i>
{{else}}
<i class="faded-icon fa fa-sort-numeric-asc"></i>
{{/if}}
</a>
{{/if}}
</div>
<div class="clear"></div>
<div class="photo-album-wrapper" id="photo-album-contents">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}
</div>
<div class="photo-album-end"></div>
{{$paginate}}
<script type="text/javascript">$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
</div>
<div class="photo-album-actions pull-right">
{{if $can_post}}
<a class="photos-upload-link" href="{{$upload.1}}" title="{{$upload.0}}" data-toggle="tooltip">
<i class="faded-icon fa fa-plus"></i></a>
{{/if}}
{{if $edit}}
<span class="icon-padding"> </span>
<a id="album-edit-link" href="{{$edit.1}}" title="{{$edit.0}}" data-toggle="tooltip">
<i class="faded-icon fa fa-pencil"></i></a>
{{/if}}
{{if ! $noorder}}
<span class="icon-padding"> </span>
<a class="photos-order-link" href="{{$order.1}}" title="{{$order.0}}" data-toggle="tooltip">
{{if $order.2 == "newest"}}
<i class="faded-icon fa fa-sort-numeric-desc"></i>
{{else}}
<i class="faded-icon fa fa-sort-numeric-asc"></i>
{{/if}}
</a>
{{/if}}
</div>
<div class="clear"></div>
<div class="photo-album-wrapper" id="photo-album-contents">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}
</div>
<div class="photo-album-end"></div>
{{$paginate}}
<script type="text/javascript">$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>

12
view/theme/frio/templates/vcard-widget.tpl
View File

@ -23,14 +23,16 @@
</div>
<div class="panel-body">
<h3 class="fn p-name">{{$name}}</h3>
<div class="profile-header">
<h3 class="fn p-name">{{$name}}</h3>
{{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
{{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$pdesc}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$pdesc}}</div>{{/if}}
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
{{if $network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_name}}</dd></dl>{{/if}}
{{if $network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_name}}</dd></dl>{{/if}}
</div>
</div>
</div>