Merge pull request #399 from git-marijus/master

change the way jot tools are displayed/hidden

12 files changed, 44 insertions, 54 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index ee26bbf47..6fbc86df6 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -30,10 +30,6 @@
 	margin-top: 10px;
 }
 
-#jot-perms-icon {
-	margin: 1px;
-}
-
 #profile-jot-perms-end {
 	height: 30px;
 }
diff --git a/view/js/acl.js b/view/js/acl.js
index 6c3d9b462..308e65131 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -162,23 +162,11 @@ ACL.prototype.set_deny = function(itemid){
 }
 
 ACL.prototype.update_view = function(){
-	var jotpermslock;
-	var jotpermsunlock;
-	if (document.jotpermslock == null) {
-		jotpermslock = 'lock';
-	} else {
-		jotpermslock = document.jotpermslock;
-	}
-	if (document.jotpermsunlock == null) {
-		jotpermsunlock = 'unlock';
-	} else {
-		jotpermsunlock = document.jotpermsunlock;
-	}
 	if (that.allow_gid.length==0 && that.allow_cid.length==0 &&
 		that.deny_gid.length==0 && that.deny_cid.length==0){
 			that.showall.addClass("selected");
 			/* jot acl */
-				$('#jot-perms-icon').removeClass(jotpermslock).addClass(jotpermsunlock);
+				$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
 				$('#jot-public').show();
 				$('.profile-jot-net input').attr('disabled', false);			
 				if(typeof editor != 'undefined' && editor != false) {
@@ -188,7 +176,7 @@ ACL.prototype.update_view = function(){
 	} else {
 			that.showall.removeClass("selected");
 			/* jot acl */
-				$('#jot-perms-icon').removeClass(jotpermsunlock).addClass(jotpermslock);
+				$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
 				$('#jot-public').hide();
 				$('.profile-jot-net input').attr('disabled', 'disabled');			
 				$('#profile-jot-desc').html(' ');
diff --git a/view/js/mod_chat.js b/view/js/mod_chat.js
index 82957ae44..88c1cf7d8 100644
--- a/view/js/mod_chat.js
+++ b/view/js/mod_chat.js
@@ -4,11 +4,11 @@ $(document).ready(function() {
 		var selstr;
 		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
 			selstr = $(this).text();
-			$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+			$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
 			$('#jot-public').hide();
 		});
 		if(selstr == null) { 
-			$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+			$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
 			$('#jot-public').show();
 		}
 
diff --git a/view/js/mod_filestorage.js b/view/js/mod_filestorage.js
index 82957ae44..88c1cf7d8 100644
--- a/view/js/mod_filestorage.js
+++ b/view/js/mod_filestorage.js
@@ -4,11 +4,11 @@ $(document).ready(function() {
 		var selstr;
 		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
 			selstr = $(this).text();
-			$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+			$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
 			$('#jot-public').hide();
 		});
 		if(selstr == null) { 
-			$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+			$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
 			$('#jot-public').show();
 		}
 
diff --git a/view/js/mod_mitem.js b/view/js/mod_mitem.js
index d33713ee3..979a15297 100644
--- a/view/js/mod_mitem.js
+++ b/view/js/mod_mitem.js
@@ -10,11 +10,11 @@ $(document).ready(function() {
 		var selstr;
 		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
 			selstr = $(this).text();
-			$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+			$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
 			$('#jot-public').hide();
 		});
 		if(selstr == null) { 
-			$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+			$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
 			$('#jot-public').show();
 		}
 
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index d9497af1e..aaa86df40 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -17,11 +17,11 @@ $(document).ready(function() {
 		var selstr;
 		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
 			selstr = $(this).text();
-			$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+			$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
 			$('#jot-public').hide();
 		});
 		if(selstr == null) { 
-			$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+			$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
 			$('#jot-public').show();
 		}
 
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 8cd062f43..fa788280d 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -12,11 +12,11 @@ $(document).ready(function() {
 		var selstr;
 		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
 			selstr = $(this).text();
-			$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+			$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
 			$('#jot-public').hide();
 		});
 		if(selstr == null) { 
-			$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+			$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
 			$('#jot-public').show();
 		}
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d078d4473..6ee71a1bd 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1896,6 +1896,7 @@ img.mail-list-sender-photo {
 	color: #777;
 }
 
+#jot-perms-icon,
 .jot-icons {
 	color: $toolicon_colour;
 }
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">
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index f5e5bb7b5..067073b23 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -53,7 +53,7 @@
 	<div id="photo-edit-rotate-end"></div>
 
 	<div id="settings-default-perms" class="settings-default-perms" >
-		<span id="jot-perms-icon" class="icon {{$edit.lockstate}}" ></span>
+		<span id="jot-perms-icon" class="{{$edit.lockstate}}" ></span>
 		<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$edit.permissions}}</a>
 		<div id="settings-default-perms-menu-end"></div>
 		<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 3f1906086..1ab80d346 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -24,9 +24,8 @@
 
 
 	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" />
-		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
-		</a>
+		<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" />{{$permissions}}</a>
 	</div>
 	<div id="photos-upload-perms-end"></div>
 
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 3330a338f..118bd846f 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -37,14 +37,16 @@
 	<div id="prvmail-link-wrapper" >
 		<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i>
 	</div> 
-
-    <div id="prvmail-expire-wrapper" style="display: {{$feature_expire}};" >
-        <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i>
-    </div>
-	<div id="prvmail-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
+	{{if $feature_expire}}
+	<div id="prvmail-expire-wrapper" >
+		<i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i>
+	</div>
+	{{/if}}
+	{{if $feature_encrypt}}
+	<div id="prvmail-encrypt-wrapper" >
 		<i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i>
 	</div> 
-
+	{{/if}}
 	<div id="prvmail-rotator-wrapper" >
 		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 	</div>