diff options
| author | friendica <info@friendica.com> | 2014-10-03 03:35:50 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-03 03:35:50 -0700 |
| commit | 328d72971d6cb73176f17c3403ddfb150ae217c3 (patch) | |
| tree | b23db2b8c6bf6b97417c5b2ee68469a7833b60d0 /view | |
| parent | 2bd4b362389aafc9d98f47f44672fc874d37e17a (diff) | |
| parent | dfd39ebb3cccfdce8fb6d58128279cac05cbb8e4 (diff) | |
| download | volse-hubzilla-328d72971d6cb73176f17c3403ddfb150ae217c3.tar.gz volse-hubzilla-328d72971d6cb73176f17c3403ddfb150ae217c3.tar.bz2 volse-hubzilla-328d72971d6cb73176f17c3403ddfb150ae217c3.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 26 | ||||
| -rwxr-xr-x | view/tpl/photo_top.tpl | 2 |
3 files changed, 26 insertions, 6 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9bbf996d5..7df70e714 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -75,12 +75,12 @@ a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; } a.btn-default { color: #333; - + font-weight: normal; } a.btn-success { color: #fff; -font-weight: normal; + font-weight: normal; } input[type="text"], diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index b5ea14c14..d23f7e817 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,3 +1,23 @@ -<a href="{{$photolink}}" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}"> - <img src="{{$imgsrc}}" alt="{{if $desc}}{{$desc}}{{else}}{{$imgalt}}{{/if}}" title="{{$phototitle}}" id="photo-album-photo-{{$id}}" /> -</a> +<div class="section-title-wrapper"> + <div class="btn-group btn-group-xs pull-right"> + {{if $edit}} + <a class="btn btn-default" href="{{$edit.1}}" title="{{$edit.0}}"><i class="icon-pencil"></i></a> + {{/if}} + <a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a> + {{if $can_post}} + <a class="btn btn-xs btn-success" href="{{$upload.1}}"><i class="icon-upload"></i> {{$upload.0}}</a> + {{/if}} + </div> + <h2>{{$album}}</h2> + + <div class="clear"></div> +</div> +<div id="photo-album-contents"> + {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + <div id="page-end"></div> +</div> +<div class="photos-end"></div> +<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> +<div id="page-spinner"></div> diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index 4a106c30d..ee21e5cce 100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,4 +1,4 @@ <a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> - <img src="{{$photo.src}}" alt="{{$photo.album.name}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" /> + <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{else}}{{$photo.alt}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" /> </a> |