diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-31 22:46:13 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-31 22:46:13 -0400 |
| commit | ed8c5954a9189569a94e9a519f86ca2c8c88db50 (patch) | |
| tree | 1fdb0401ee9bf7156477841d8d69f8316122499e /view/theme/diabook-red/jot.tpl | |
| parent | 6b086cd266f5e93c5b254f7a661747d889169505 (diff) | |
| parent | e6fd6bfd89ada9b5aeea8fcac1614546deba85aa (diff) | |
| download | volse-hubzilla-ed8c5954a9189569a94e9a519f86ca2c8c88db50.tar.gz volse-hubzilla-ed8c5954a9189569a94e9a519f86ca2c8c88db50.tar.bz2 volse-hubzilla-ed8c5954a9189569a94e9a519f86ca2c8c88db50.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
more error handling
ensure all new users get a timezone. We'll use UTC until they choose otherwise.
handle escaped file chars in display and search
escape % in file_tag_query as it is ultimately embedded in a sprintf
diabook-themes: move "common tabs" to left side on settings page
move the common tabs to right_aside in diabook-derivates
register hooks for a COPA plugin
some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus
bug fix in diabook-aerith and -red
bug-fixes in diabook-derivates
settings for unknown private mail acceptance
* master:
Diffstat (limited to 'view/theme/diabook-red/jot.tpl')
| -rwxr-xr-x | view/theme/diabook-red/jot.tpl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl index 387eb1f91..9aef99787 100755 --- a/view/theme/diabook-red/jot.tpl +++ b/view/theme/diabook-red/jot.tpl @@ -21,23 +21,23 @@ <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;*/" > |