Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

2 files changed, 23 insertions, 0 deletions

diff --git a/view/tpl/channel_rename.tpl b/view/tpl/channel_rename.tpl
new file mode 100755
index 000000000..9948dc647
--- /dev/null
+++ b/view/tpl/channel_rename.tpl
@@ -0,0 +1,20 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-danger-wrapper" id="rename-channel-desc">
+		<strong>{{$desc.0}}</strong><strong>{{$desc.1}}</strong>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<form action="{{$basedir}}/changeaddr" autocomplete="off" method="post" >
+			<input type="hidden" name="verify" value="{{$hash}}" />
+			<div class="form-group" id="rename-channel-pass-wrapper">
+				<label id="rename-channel-pass-label" for="rename-channel-pass">{{$passwd}}</label>
+				<input class="form-control" type="password" id="rename-channel-pass" autocomplete="off" name="qxz_password" value=" " />
+			</div>
+			{{include file="field_input.tpl" field=$newname}}
+			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
+		</form>
+	</div>
+</div>
+
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 0e8fb0389..48bf5de4b 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -20,6 +20,7 @@
 				$('#jot-media').val($('#jot-media').val() + data.result.message);
 			},
 			stop: function(e,data) {
+				preview_mail();
 				$('#prvmail-rotator').spin(false);
 			},
 		});
@@ -36,6 +37,7 @@
 			$('#prvmail-rotator').spin('tiny');
 			$.get('linkinfo?f=&url=' + reply, function(data) {
 				addmailtext(data);
+				preview_mail();
 				$('#prvmail-rotator').spin(false);
 			});
 		}
@@ -62,6 +64,7 @@
 			$('#prvmail-rotator').spin('tiny');
 			$.get('linkinfo?f=&url=' + reply, function(data) {
 				addmailtext(data);
+				preview_mail();
 				$('#prvmail-rotator').spin(false);
 			});
 		}