diff options
| author | Simon <simon@kisikew.org> | 2012-03-16 23:05:37 -0700 |
|---|---|---|
| committer | Simon <simon@kisikew.org> | 2012-03-16 23:05:37 -0700 |
| commit | 2785bb413e4d84e93cb132c0492d79702ae1de90 (patch) | |
| tree | 3efef935b0bf8fce131226cee7ee36ba2f53d514 | |
| parent | 4a6f114ec008002f439214aac1d006d8db4051ac (diff) | |
| parent | 87fdae2dd8bdb9e01ce3d98f6ea94d83664cb4c2 (diff) | |
| download | volse-hubzilla-2785bb413e4d84e93cb132c0492d79702ae1de90.tar.gz volse-hubzilla-2785bb413e4d84e93cb132c0492d79702ae1de90.tar.bz2 volse-hubzilla-2785bb413e4d84e93cb132c0492d79702ae1de90.zip | |
Merge pull request #145 from simonlnu/master
[fix] whitespace in photo_view and like_noshare. dispy-dark clean up
| -rwxr-xr-x | view/like_noshare.tpl | 8 | ||||
| -rwxr-xr-x | view/photo_view.tpl | 2 | ||||
| -rw-r--r-- | view/theme/dispy-dark/photo_view.tpl | 13 | ||||
| -rw-r--r-- | view/theme/dispy-dark/theme.php | 3 |
4 files changed, 10 insertions, 16 deletions
diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl index 2c467c3c2..2651ea1f8 100755 --- a/view/like_noshare.tpl +++ b/view/like_noshare.tpl @@ -1,5 +1,5 @@ <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 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;" /> - </div> + <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> + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> +</div> diff --git a/view/photo_view.tpl b/view/photo_view.tpl index 5dbcabadf..732caf690 100755 --- a/view/photo_view.tpl +++ b/view/photo_view.tpl @@ -14,7 +14,7 @@ <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-caption" >$desc</div> +<div id="photo-caption">$desc</div> {{ if $tags }} <div id="in-this-photo-text">$tags.0</div> <div id="in-this-photo">$tags.1</div> diff --git a/view/theme/dispy-dark/photo_view.tpl b/view/theme/dispy-dark/photo_view.tpl index f1209ec58..732caf690 100644 --- a/view/theme/dispy-dark/photo_view.tpl +++ b/view/theme/dispy-dark/photo_view.tpl @@ -4,18 +4,15 @@ <div id="photo-edit-link-wrap"> {{ if $tools }} <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> {{ 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 }} +{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }} </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-caption">$desc</div> {{ if $tags }} diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index b57971db9..700136173 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -108,9 +108,6 @@ $(document).ready(function() { $(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-edit-side-div').css({display: 'block'}); }).mouseout(function() { |