diff options
author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
---|---|---|
committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
commit | 355c42cb309eb1313097411067ca999b699aa620 (patch) | |
tree | d00d1af9dceecdf114cadff924c5ba4a864fbf43 /view/theme/diabook/jot.tpl | |
parent | cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff) | |
parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
download | volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2 volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip |
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
Diffstat (limited to 'view/theme/diabook/jot.tpl')
-rw-r--r--[-rwxr-xr-x] | view/theme/diabook/jot.tpl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 387eb1f91..bd43994b5 100755..100644 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -2,7 +2,6 @@ <div id="profile-jot-wrapper" > <div id="profile-jot-banner-wrapper"> <div id="profile-jot-desc" > </div> - <div id="character-counter" class="grey"></div> </div> <div id="profile-jot-banner-end"></div> @@ -15,29 +14,30 @@ <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> + <div id="character-counter" class="grey"></div> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> <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;*/" > |