clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #145 from simonlnu/master 

[fix] whitespace in photo_view and like_noshare. dispy-dark clean up
This commit is contained in:
Simon 2012-03-16 23:05:37 -07:00
parent 4a6f114ec0 87fdae2dd8
commit 2785bb413e
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
view/like_noshare.tpl
View File

@ -1,5 +1,5 @@
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
<a href="#" class="icon like"title="$likethis" onclick="dolike($id,'like'); return false"></a> <a href="#" class="icon like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a> <a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>

2
view/photo_view.tpl
View File

@ -14,7 +14,7 @@
<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div> <div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }} {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
<div id="photo-photo-end"></div> <div id="photo-photo-end"></div>
<div id="photo-caption" >$desc</div> <div id="photo-caption">$desc</div>
{{ if $tags }} {{ if $tags }}
<div id="in-this-photo-text">$tags.0</div> <div id="in-this-photo-text">$tags.0</div>
<div id="in-this-photo">$tags.1</div> <div id="in-this-photo">$tags.1</div>

13
view/theme/dispy-dark/photo_view.tpl
View File

@ -4,18 +4,15 @@
<div id="photo-edit-link-wrap"> <div id="photo-edit-link-wrap">
{{ if $tools }} {{ if $tools }}
<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a> <a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
- |
<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a> <a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
{{ endif }} {{ endif }}
{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }} {{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
</div>
<div id="photo-photo">
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
<a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
</div> </div>
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
<div id="photo-photo-end"></div> <div id="photo-photo-end"></div>
<div id="photo-caption">$desc</div> <div id="photo-caption">$desc</div>
{{ if $tags }} {{ if $tags }}

3
view/theme/dispy-dark/theme.php
View File

@ -108,9 +108,6 @@ $(document).ready(function() {
$(this).css({color: '#eec'}); $(this).css({color: '#eec'});
}); });
// make auto-complete work in more places
$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
/* $('#profile-photo-wrapper').mouseover(function() { /* $('#profile-photo-wrapper').mouseover(function() {
$('.profile-edit-side-div').css({display: 'block'}); $('.profile-edit-side-div').css({display: 'block'});
}).mouseout(function() { }).mouseout(function() {