Merge https://github.com/redmatrix/hubzilla into pending_merge

3 files changed, 75 insertions, 22 deletions

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 100dd15b9..ea68368aa 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -47,19 +47,19 @@
 		<div id="profile-jot-submit-wrapper" class="jothidden">
 			<div id="profile-jot-submit-left" class="btn-toolbar pull-left">
 				<div class="btn-group">
-					<button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b'); return false;">
+					<button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;">
 						<i class="icon-bold jot-icons"></i>
 					</button>
-					<button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i'); return false;">
+					<button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;">
 						<i class="icon-italic jot-icons"></i>
 					</button>
-					<button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u'); return false;">
+					<button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;">
 						<i class="icon-underline jot-icons"></i>
 					</button>
-					<button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote'); return false;">
+					<button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;">
 						<i class="icon-quote-left jot-icons"></i>
 					</button>
-					<button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code'); return false;">
+					<button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;">
 						<i class="icon-terminal jot-icons"></i>
 					</button>
 				</div>
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 593b3652e..3407e152c 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -57,10 +57,23 @@ else
 				onComplete: function(file,response) {
 					addmailtext(response);
 					$('#prvmail-rotator').spin(false);
-				}				 
+				}
+			}
+		);
+
+		var file_uploader_sub = new window.AjaxUpload(
+			'prvmail-attach-sub',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addmailtext(response);
+					$('#prvmail-rotator').spin(false);
+				}
 			}
 		);
 
+
 	});
 
 	function prvmailJotGetLink() {
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index c31c311cc..b0ea8b753 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -38,23 +38,63 @@
 					<div id="prvmail-submit" class="pull-right">
 						<button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
 					</div>
-					<div id="prvmail-tools" class="btn-group pull-left">
-						<button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" >
-							<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" 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" 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" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
-							<i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i>
-						</button>
+					<div id="prvmail-tools" class="btn-toolbar pull-left">
+						<div class="btn-group">
+							<button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;">
+								<i class="icon-bold jot-icons"></i>
+							</button>
+							<button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'prvmail-text'); return false;">
+								<i class="icon-italic jot-icons"></i>
+							</button>
+							<button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'prvmail-text'); return false;">
+								<i class="icon-underline jot-icons"></i>
+							</button>
+							<button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'prvmail-text'); return false;">
+								<i class="icon-quote-left jot-icons"></i>
+							</button>
+							<button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'prvmail-text'); return false;">
+								<i class="icon-terminal jot-icons"></i>
+							</button>
+						</div>
+						<div class="btn-group hidden-xs">
+							<button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" >
+								<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" onclick="prvmailJotGetLink(); return false;" >
+								<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" ></i>
+							</button>
+						</div>
+						{{if $feature_expire || $feature_encrypt}}
+						<div class="btn-group hidden-sm hidden-xs">
+							{{if $feature_expire}}
+							<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" 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>
 						{{/if}}
+
+						<div class="btn-group visible-xs visible-sm">
+							<button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+								<i id="more-tools-icon" class="icon-caret-down jot-icons"></i>
+							</button>
+							<ul class="dropdown-menu dropdown-menu-right" role="menu">
+								<li class="visible-xs"><a href="#" id="prvmail-attach-sub"><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li>
+								<li class="visible-xs"><a href="#" onclick="prvmailJotGetLink(); return false;" ><i class="icon-link"></i>&nbsp;{{$insert}}</a></li>
+								{{if $feature_expire || $feature_encrypt}}
+								<li class="divider visible-xs"></li>
+								<li class="visible-sm visible-xs"><a href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="icon-eraser"></i>&nbsp;{{$expires}}</a></li>
+								<li class="visible-sm visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="icon-key"></i>&nbsp;{{$encrypt}}</a></li>
+								{{/if}}
+							</ul>
+						</div>
+
+
 					</div>
 					<div id="prvmail-rotator-wrapper" class="pull-left">
 						<div id="prvmail-rotator"></div>