Merge remote-tracking branch 'upstream/master'

Conflicts:
	doc/html/classRedmatrix_1_1Import_1_1Import-members.html
	doc/html/classRedmatrix_1_1Import_1_1Import.js

1 files changed, 36 insertions, 28 deletions

diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index bf39e6158..0147d35ba 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -1,34 +1,42 @@
 <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
+	<input type="hidden" name="channelnick" value="{{$channelnick}}" />
+	<input type="hidden" name="filehash" value="{{$file.hash}}" />
+	<input type="hidden" name="uid" value="{{$uid}}" />
+	<input type="hidden" name="fileid" value="{{$file.id}}" />
 
-<div id="attach-edit-perms" >
-<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
-	<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
-</button>
-<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit">
-	{{$submit}}
-</button>
-</div>
+	<div id="attach-edit-tools-share" class="btn-group form-group">
+		{{if !$isadir}}
+		<a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}">
+			<i class="icon-paperclip jot-icons"></i>
+		</a>
+		{{/if}}
+		<button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}">
+			<i class="icon-share jot-icons"></i>
+		</button>
+	</div>
+	<div id="attach-edit-tools-perms" class="form-group pull-right{{if $isadir}} btn-group{{/if}}">
+		{{if $isadir}}
+		<div id="attach-edit-perms-recurse" class="btn-group" data-toggle="buttons">
+			<label class="btn btn-default btn-xs" title="{{$recurse}}">
+				<input type="checkbox" autocomplete="off" name="recurse" value="1"><i class="icon-level-down jot-icons"></i>
+			</label>
+		</div>
+		{{/if}}
+		<div id="attach-edit-perms" class="btn-group">
+			<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
+				<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
+			</button>
+			<button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit">
+				{{$submit}}
+			</button>
+		</div>
+	</div>
 
-{{$aclselect}}
-
-<input type="hidden" name="channelnick" value="{{$channelnick}}" />
-<input type="hidden" name="filehash" value="{{$file.hash}}" />
-<input type="hidden" name="uid" value="{{$uid}}" />
-<input type="hidden" name="fileid" value="{{$file.id}}" />
-
-{{if $isadir}}
-<div id="attach-edit-recurse" >
-  <label id="attach-edit-recurse-text" for="attach-recurse-input" >{{$recurse}}</label>
-  <input id="attach-recurse-input" type="checkbox" name="recurse" value="1" />
-</div>
-{{else}}
-<div class="cut-paste-desc">{{$cpdesc}}</div>
-<input type="text" id="cutpasteinput" name="cutpastelink" value="[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" onclick="this.select();" /><br />
-{{/if}}
-
-<div class="cut-paste-desc">{{$cpldesc}}</div>
-<input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br />
-<div class="clear"></div>
+	{{$aclselect}}
 
+	<div id="link-code" class="form-group">
+		<label for="">{{$cpldesc}}</label>
+		<input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/>
+	</div>
 </form>