Merge https://github.com/friendica/red into pending_merge

5 files changed, 47 insertions, 48 deletions

diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index a2a4af16b..bf39e6158 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -1,16 +1,16 @@
-<div id="attach-edit-backlink">< <a href="{{$parentpath}}">{{$backlink}}</a></div>
-
-<h1>{{$header}}</h1>
-
 <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
 
 <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>
-{{$aclselect}} {{$file.filename}}
+<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit">
+	{{$submit}}
+</button>
 </div>
 
+{{$aclselect}}
+
 <input type="hidden" name="channelnick" value="{{$channelnick}}" />
 <input type="hidden" name="filehash" value="{{$file.hash}}" />
 <input type="hidden" name="uid" value="{{$uid}}" />
@@ -28,9 +28,7 @@
 
 <div class="cut-paste-desc">{{$cpldesc}}</div>
 <input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br />
-
 <div class="clear"></div>
-<input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" />
-</form>
 
+</form>
 
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 00f243c1e..d88bc94c4 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -1,27 +1,17 @@
-<div class="generic-content-wrapper-styled">
-
-<table>
-	<tr>
-		<td><strong>{{$folder_header}}</strong>&nbsp;&nbsp;&nbsp;</td>
-		<td>
-			<form method="post" action="">
-				<input type="hidden" name="sabreAction" value="mkcol">
-				<input type="text" name="name">
-				<input type="submit" value="{{$folder_submit}}">
-			</form>
-		</td>
-	</tr>
-	<tr>
-		<td><strong>{{$upload_header}}</strong>&nbsp;&nbsp;&nbsp;</td>
-		<td>
-			<form method="post" action="" enctype="multipart/form-data">
-				<input type="hidden" name="sabreAction" value="put">
-				<input type="file" name="file" style="display: inline;">
-				<input type="submit" value="{{$upload_submit}}">
-				<!-- Name (optional): <input type="text" name="name"> we should rather provide a rename action in edit form-->
-			</form>
-		</td>
-	</tr>
-</table>
-
+<div id="files-mkdir-tools" class="section-content-tools-wrapper form-group">
+	<label for="files-mkdir">{{$folder_header}}</label>
+	<form method="post" action="">
+		<input type="hidden" name="sabreAction" value="mkcol">
+		<input id="files-mkdir" type="text" name="name">
+		<input type="submit" value="{{$folder_submit}}">
+	</form>
+</div>
+<div id="files-upload-tools" class="section-content-tools-wrapper form-group">
+	<label for="files-upload">{{$upload_header}}</label>
+	<form method="post" action="" enctype="multipart/form-data">
+		<input type="hidden" name="sabreAction" value="put">
+		<input id="files-upload" type="file" name="file" style="display: inline;">
+		<input type="submit" value="{{$upload_submit}}">
+		<!-- Name (optional): <input type="text" name="name"> we should rather provide a rename action in edit form-->
+	</form>
 </div>
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index 639a6bf61..f37895e09 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -1,5 +1,5 @@
 <div class="generic-content-wrapper-styled">
-<h1>{{$header}}</h1>
+
 <table id="cloud-index">
 	<tr>
 		<th></th>
@@ -26,8 +26,9 @@
 		<td style="min-width: 15em"><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td>
 {{if $item.is_owner}}
 		<td>{{$item.attachIcon}}</td>
-		<td style="position:relative;"><a href="{{$item.fileStorageUrl}}/{{$item.attachId}}/edit" title="{{$edit}}"><i class="icon-pencil btn btn-default"></i></a></td>
-		<td><a href="{{$item.fileStorageUrl}}/{{$item.attachId}}/delete" title="{{$delete}}" onclick="return confirmDelete();"><i class="icon-remove btn btn-default drop-icons"></i></a></td>
+		<td style="position:relative;"><i id="file-edit-{{$item.attachId}}" class="fakelink icon-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td>
+		<td><a href="{{$item.fileStorageUrl}}/{{$item.attachId}}/delete" title="{{$delete}}" onclick="return confirmDelete();"><i class="icon-remove drop-icons"></i></a></td>
+
 {{else}}
 		<td></td><td></td><td></td>
 {{/if}}
@@ -35,11 +36,8 @@
 		<td>{{$item.sizeFormatted}}</td>
 		<td>{{$item.lastmodified}}</td>
 	</tr>
+	<tr><td id="perms-panel-{{$item.attachId}}" colspan="8"></td></tr>
 {{/foreach}}
-	<tr><td colspan="8"><hr></td></tr>
-</table>
 
-{{if $quota.limit || $quota.used}}
-	<p><strong>{{$total}}</strong> {{$quota.desc}}</p>
-{{/if}}
+</table>
 </div>
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
new file mode 100644
index 000000000..f5f123edb
--- /dev/null
+++ b/view/tpl/cloud_header.tpl
@@ -0,0 +1,13 @@
+<div class="section-title-wrapper">
+	{{if $actionspanel}}
+	<div class="pull-right">
+		<button id="files-create-btn"class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i>&nbsp;Create</button>		
+		<button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i>&nbsp;Upload</button>		
+	</div>
+	{{/if}}
+	<h2>{{$header}}</h2>
+	<div class="clear"></div>
+</div>
+{{if $actionspanel}}
+	{{$actionspanel}}
+{{/if}}
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 34acce879..00ef77d93 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -19,17 +19,17 @@
 			<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
 			</div>
 		{{/if}}
-		<div id="jot-title-wrap">
-			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none">
+		<div id="jot-title-wrap"  class="jothidden" style="display:none">
+			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}">
 		</div>
 		{{if $catsenabled}}
-		<div id="jot-category-wrap">
-			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" />
+		<div id="jot-category-wrap"  class="jothidden" style="display:none">
+			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="tagsinput"/>
 		</div>
 		{{/if}}
 		{{if $webpage}}
-		<div id="jot-pagetitle-wrap">
-			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" />
+		<div id="jot-pagetitle-wrap" class="jothidden" style="display:none">
+			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}"  />
 		</div>
 		{{/if}}
 		<div id="jot-text-wrap">