aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/RedDAV/RedBrowser.php24
-rw-r--r--mod/filestorage.php3
-rw-r--r--view/css/mod_cloud.css5
-rw-r--r--view/js/main.js12
-rw-r--r--view/js/mod_filestorage.js1
-rw-r--r--view/theme/redbasic/css/style.css10
-rw-r--r--view/tpl/attach_edit.tpl14
-rw-r--r--view/tpl/cloud_actionspanel.tpl42
-rw-r--r--view/tpl/cloud_directory.tpl14
-rw-r--r--view/tpl/cloud_header.tpl13
10 files changed, 75 insertions, 63 deletions
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php
index eb08fd79f..78aacf92b 100644
--- a/include/RedDAV/RedBrowser.php
+++ b/include/RedDAV/RedBrowser.php
@@ -238,11 +238,21 @@ class RedBrowser extends DAV\Browser\Plugin {
$quota['limit'] = $limit;
$quota['desc'] = $quotaDesc;
- $html .= replace_macros(get_markup_template('cloud_directory.tpl'), array(
+ $output = '';
+ if ($this->enablePost) {
+ $this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output));
+ }
+
+ $html .= replace_macros(get_markup_template('cloud_header.tpl'), array(
'$header' => t('Files') . ": " . $this->escapeHTML($path) . "/",
+ '$quota' => $quota,
+ '$total' => t('Total'),
+ '$actionspanel' => $output
+ ));
+
+ $html .= replace_macros(get_markup_template('cloud_directory.tpl'), array(
'$parentpath' => $parentpath,
'$entries' => $f,
- '$quota' => $quota,
'$name' => t('Name'),
'$type' => t('Type'),
'$size' => t('Size'),
@@ -250,15 +260,9 @@ class RedBrowser extends DAV\Browser\Plugin {
'$parent' => t('parent'),
'$edit' => t('Edit'),
'$delete' => t('Delete'),
- '$total' => t('Total')
+ '$nick' => $this->auth->getCurrentUser()
));
- $output = '';
- if ($this->enablePost) {
- $this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output));
- }
- $html .= $output;
-
get_app()->page['content'] = $html;
load_pdl(get_app());
construct_page(get_app());
@@ -371,4 +375,4 @@ class RedBrowser extends DAV\Browser\Plugin {
}
return $id;
}
-} \ No newline at end of file
+}
diff --git a/mod/filestorage.php b/mod/filestorage.php
index e27087a92..1767ea6bf 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -146,7 +146,8 @@ function filestorage_content(&$a) {
'$submit' => t('Submit')
));
- return $o;
+ echo $o;
+ killme();
}
goaway(z_root() . '/cloud/' . $which);
diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css
new file mode 100644
index 000000000..cc5fe890f
--- /dev/null
+++ b/view/css/mod_cloud.css
@@ -0,0 +1,5 @@
+#files-mkdir-tools,
+#files-upload-tools {
+ display: none;
+}
+
diff --git a/view/js/main.js b/view/js/main.js
index a851e7e63..f49cea78c 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -208,6 +208,7 @@
var pageHasMoreContent = true;
var updateCountsOnly = false;
var divmore_height = 400;
+ var last_filestorage_id = null;
$(function() {
$.ajaxSetup({cache: false});
@@ -842,6 +843,17 @@ function updateConvItems(mode,data) {
});
}
+ function filestorage(event,nick,id) {
+ $('#perms-panel-' + last_filestorage_id).html('');
+ $('#file-edit-' + id).spin('tiny');
+ delete acl;
+ $.get('filestorage/' + nick + '/' + id + '/edit', function(data) {
+ $('#perms-panel-' + id).html(data);
+ $('#file-edit-' + id).spin(false);
+ last_filestorage_id = id;
+ });
+ }
+
function post_comment(id) {
unpause();
commentBusy = true;
diff --git a/view/js/mod_filestorage.js b/view/js/mod_filestorage.js
index 88c1cf7d8..bee37767f 100644
--- a/view/js/mod_filestorage.js
+++ b/view/js/mod_filestorage.js
@@ -13,4 +13,5 @@ $(document).ready(function() {
}
}).trigger('change');
+
});
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 961572652..4681ef5ba 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2055,18 +2055,8 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: $nav_active_icon_colour;
}
-/* Files */
-
-#attach-edit-perms {
- margin-top: 25px;
- margin-bottom: 20px;
- font-weight: bold;
- font-size: 17px;
-}
-
/* bootstrap overrides */
-
blockquote {
font-size: $font_size;
font-style: italic;
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}}