Merge remote-tracking branch 'upstream/master'

4 files changed, 30 insertions, 24 deletions

diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index b9a966e93..aec1a78ab 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -104,7 +104,12 @@
 						</ul>
 					</div>
 					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
-					<div class="wall-item-tools-left{{if $item.like_count &&  $item.dislike_count}} btn-group{{/if}}">
+					<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count}} btn-group{{/if}}">
+
+
+				<div class="wall-item-list-comments btn-group"><button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.llink}}'; return false;">{{$item.comment_count_txt}}{{if $item.unseen_comments}}
+<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}{{/if}}</span></button></div>{{if $item.unseen_comments}}<div class="unseen-wall-indicator-{{$item.id}} btn-group"><button class="btn btn-default btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"><i class="icon-check"></i></div>{{/if}}
+
 						{{if $item.like_count}}
 						<div class="btn-group">
 							<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-like-{{$item.id}}">{{$item.like_count}} {{$item.like_button_label}}</button>
@@ -164,8 +169,6 @@
 					{{/if}}
 				</div>
 				<div class="clear"></div>
-				<div class="wall-item-list-comments"><a href="{{$item.llink}}">{{$item.comment_count_txt}}{{if $item.unseen_comments}}
-<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}{{/if}}</span></a>{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">&nbsp;&nbsp;&nbsp;<button class="btn btn-default" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"><i class="icon-check"></i></span>{{/if}}</div>
 			</div>
 			<div class="wall-item-wrapper-end"></div>
 			<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 503e4c8cc..85fa51b0a 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -52,10 +52,10 @@ else
 			'prvmail-upload-wrapper',
 			{ action: 'wall_upload/{{$nickname}}',
 				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
 				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').spin(false);
+					addmailtext(response);
+					$('#prvmail-rotator').spin(false);
 				}				 
 			}
 		);
@@ -64,23 +64,23 @@ else
 			'prvmail-attach-wrapper',
 			{ action: 'wall_attach/{{$nickname}}',
 				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
 				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').spin(false);
+					addmailtext(response);
+					$('#prvmail-rotator').spin(false);
 				}				 
 			}
 		);
 
 	});
 
-	function jotGetLink() {
+	function prvmailJotGetLink() {
 		reply = prompt("{{$linkurl}}");
 		if(reply && reply.length) {
-			$('#profile-rotator').spin('tiny');
+			$('#prvmail-rotator').spin('tiny');
 			$.get('parse_url?url=' + reply, function(data) {
-				addeditortext(response);
-				$('#profile-rotator').spin(false);
+				addmailtext(data);
+				$('#prvmail-rotator').spin(false);
 			});
 		}
 	}
@@ -103,15 +103,15 @@ else
 		event.target.textContent = reply;
 		event.preventDefault();
 		if(reply && reply.length) {
-			$('#profile-rotator').spin('tiny');
+			$('#prvmail-rotator').spin('tiny');
 			$.get('parse_url?url=' + reply, function(data) {
-				addeditortext(response);
-				$('#profile-rotator').spin(false);
+				addmailtext(data);
+				$('#prvmail-rotator').spin(false);
 			});
 		}
 	}
 
-	function addeditortext(data) {
+	function addmailtext(data) {
 		if(plaintext == 'none') {
 			var currentText = $("#prvmail-text").val();
 			$("#prvmail-text").val(currentText + data);
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index a741a5ce7..45a7cd7e5 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -59,9 +59,12 @@
 				<label class="radio-inline" id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw"><input id="photo-edit-rotate-cw" type="radio" name="rotate" value="1" />{{$edit.rotatecw}}</label>
 				<label class="radio-inline" id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw"><input id="photo-edit-rotate-ccw" type="radio" name="rotate" value="2" />{{$edit.rotateccw}}</label>
 			</div>
+			{{if $edit.adult_enabled}}
 			<div class="form-group">
 			{{include file="field_checkbox.tpl" field=$edit.adult}}
 			</div>
+			{{/if}}
+
 			{{$edit.aclselect}}
 
 			<div class="form-group pull-left">
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 709943541..c6f393aa4 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -34,21 +34,21 @@
 		<i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i>
 	</button> 
 
-	<button id="prvmail-link-wrapper" class="btn btn-default btn-sm" >
-		<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i>
+	<button id="prvmail-link-wrapper" class="btn btn-default btn-sm" onclick="prvmailJotGetLink(); return false;" >
+		<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" ></i>
 	</button> 
 	{{if $feature_expire}}
-	<button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" >
-		<i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i>
+	<button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" onclick="prvmailGetExpiry();return false;" >
+		<i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" ></i>
 	</button>
 	{{/if}}
 	{{if $feature_encrypt}}
-	<button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" >
-		<i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i>
+	<button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
+		<i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i>
 	</button> 
 	{{/if}}
 	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+		<div id="prvmail-rotator"></div>
 	</div> 
 </div>
 <div id="prvmail-end"></div>