diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-05 01:08:54 -0500 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-05 01:08:54 -0500 |
commit | 7de79a8c49e1cf601c0408883a02c6f6a13cd0db (patch) | |
tree | b1e812feb9175b8e79d260de9a39d3a72a1fc87c /view/theme | |
parent | fe7a6b070d59ad1b9211ba0191e791c70cfeb90c (diff) | |
parent | 9c541dbd6748bea4c93c0a83f3dee6e9451049ea (diff) | |
download | volse-hubzilla-7de79a8c49e1cf601c0408883a02c6f6a13cd0db.tar.gz volse-hubzilla-7de79a8c49e1cf601c0408883a02c6f6a13cd0db.tar.bz2 volse-hubzilla-7de79a8c49e1cf601c0408883a02c6f6a13cd0db.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
like dislike button
fixes in diabook
* master:
Diffstat (limited to 'view/theme')
-rw-r--r--[-rwxr-xr-x] | view/theme/diabook/icons/dislike.png | bin | 290 -> 385 bytes | |||
-rw-r--r--[-rwxr-xr-x] | view/theme/diabook/icons/like.png | bin | 329 -> 393 bytes | |||
-rwxr-xr-x | view/theme/diabook/jot.tpl | 14 |
3 files changed, 7 insertions, 7 deletions
diff --git a/view/theme/diabook/icons/dislike.png b/view/theme/diabook/icons/dislike.png Binary files differindex fb0f8b33d..fcf340258 100755..100644 --- a/view/theme/diabook/icons/dislike.png +++ b/view/theme/diabook/icons/dislike.png diff --git a/view/theme/diabook/icons/like.png b/view/theme/diabook/icons/like.png Binary files differindex 0006c3e2a..c9543afd5 100755..100644 --- a/view/theme/diabook/icons/like.png +++ b/view/theme/diabook/icons/like.png diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 59066a19c..387eb1f91 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -21,26 +21,26 @@ <div id="profile-jot-submit-wrapper" class="jothidden"> - <div id="profile-upload-wrapper" style="display: $visitor;" > + <div id="profile-upload-wrapper" style="/*display: $visitor;*/" > <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div> </div> - <div id="profile-attach-wrapper" style="display: $visitor;" > + <div id="profile-attach-wrapper" style="/*display: $visitor;*/" > <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div> </div> - <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > + <div id="profile-link-wrapper" style="/*display: $visitor;*/" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > <a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a> </div> - <div id="profile-video-wrapper" style="display: $visitor;" > + <div id="profile-video-wrapper" style="/*display: $visitor;*/" > <a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a> </div> - <div id="profile-audio-wrapper" style="display: $visitor;" > + <div id="profile-audio-wrapper" style="/*display: $visitor;*/" > <a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a> </div> - <div id="profile-location-wrapper" style="display: $visitor;" > + <div id="profile-location-wrapper" style="/*display: $visitor;*/" > <a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a> </div> - <div id="profile-nolocation-wrapper" style="display: none;" > + <div id="profile-nolocation-wrapper" style="/*display: none;*/" > <a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a> </div> |