Merge https://github.com/friendica/red into pending_merge

1 files changed, 20 insertions, 16 deletions

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 87a9b721f..e1b8dc906 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -36,43 +36,47 @@
 		</div>
 		<div id="profile-jot-submit-wrapper" class="jothidden">
 			<div id="profile-jot-submit-left" class="btn-group pull-left">
-				<button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" style="display: {{$visitor}};" >
+				{{if $visitor}}
+				<button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" >
 					<i class="icon-camera jot-icons"></i>
 				</button>
-				<button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" style="display: {{$visitor}};" >
+				<button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" >
 					<i id="wall-file-upload" class="icon-paper-clip jot-icons"></i>
 				</button>
-				<button id="profile-link-wrapper" class="btn btn-default btn-sm" style="display: {{$visitor}};" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
+				<button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
 					<i id="profile-link" class="icon-link jot-icons"></i>
 				</button>
-				<button id="profile-video-wrapper" class="btn btn-default btn-sm" style="display: {{$visitor}};" title="{{$video}}" onclick="jotVideoURL();return false;">
+				<button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;">
 					<i id="profile-video" class="icon-facetime-video jot-icons"></i>
 				</button>
-				<button id="profile-audio-wrapper" class="btn btn-default btn-sm" style="display: {{$visitor}};" title="{{$audio}}" onclick="jotAudioURL();return false;">
+				<button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;">
 					<i id="profile-audio" class="icon-volume-up jot-icons"></i>
 				</button>
 				<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;">
 					<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
 				</button>
-				<button id="profile-location-wrapper" class="btn btn-default btn-sm" style="display: {{$visitor}};" title="{{$setloc}}" onclick="jotGetLocation();return false;">
+				<button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
 					<i id="profile-location" class="icon-globe jot-icons"></i>
 				</button>
-				<button id="profile-expire-wrapper" class="btn btn-default btn-sm" style="display: {{$feature_expire}};" title="{{$expires}}" onclick="jotGetExpiry();return false;">
+				{{/if}}
+				{{if $feature_expire}}
+				<button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
 					<i id="profile-expires" class="icon-eraser jot-icons"></i>
 				</button>
-				<button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" style="display: {{$feature_encrypt}};" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
+				{{/if}}
+				{{if $feature_encrypt}}
+				<button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
 					<i id="profile-encrypt" class="icon-key jot-icons"></i>
 				</button>
+				{{/if}}
 			</div>
-			<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+			<div id="profile-rotator-wrapper">
 				<div id="profile-rotator"></div>
 			</div>
 			<div id="profile-jot-submit-right" class="btn-group pull-right">
-			{{if $showacl}}
-			<div class="btn btn-default btn-sm" id="profile-jot-perms" style="display: {{$pvisit}};" title="{{$permset}}" >
-				<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"></a>{{$bang}}
-			</div>
-			{{/if}}
+				{{if $showacl}}
+				<a href="#profile-jot-acl-wrapper" class="btn btn-default btn-sm jot-icons icon-{{$lockstate}}" id="jot-perms-icon" title="{{$permset}}"></a>{{$bang}}
+				{{/if}}
 				{{if $preview}}
 				<button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
 					<i class="icon-eye-open jot-icons" ></i>
@@ -82,7 +86,7 @@
 			</div>
 			<div id="profile-jot-perms-end"></div>
 			<div id="profile-jot-plugin-wrapper">
-			{{$jotplugins}}
+				{{$jotplugins}}
 			</div>
 			<div style="display: none;">
 				<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
@@ -99,7 +103,7 @@
 </div>
 
 <!-- Modal for item expiry-->
-<div class="modal fade" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
+<div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">