Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 12 insertions, 28 deletions

diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 4a438e8fd..44d230ae0 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -3,42 +3,26 @@
 	<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}}{{include file="field_checkbox.tpl" field=$notify}}{{/if}}
+	{{if $isadir}}{{include file="field_checkbox.tpl" field=$recurse}}{{/if}}
 	<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 href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}">
+			<i class="icon-share 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>
+			<i class="icon-link jot-icons"></i>
 		</button>
 	</div>
-	<div id="attach-edit-tools-perms" class="form-group pull-right btn-group">
-		{{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}}
-		{{if !$isadir}}
-		<div id="attach-edit-activity" class="btn-group" data-toggle="buttons">
-			<label class="btn btn-default btn-xs" title="{{$activity_btn_title}}">
-				<input type="checkbox" autocomplete="off" name="no_activity" value="1"><i class="icon-ban-circle 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 id="attach-edit-perms" class="btn-group pull-right">
+		<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>
-
 	{{$aclselect}}
 
 	<div id="link-code" class="form-group">