aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-12-28 18:16:27 +0100
committermarijus <mario@mariovavti.com>2014-12-28 18:16:27 +0100
commit801ab709adfa808072f70fe1bf4b712ddc33df42 (patch)
treeccef8b25b9cf177ba8626bc81c459c0a97cab2e3 /view/tpl
parent0e0a4e4999583df96f74a78589231e1e7329f7d4 (diff)
downloadvolse-hubzilla-801ab709adfa808072f70fe1bf4b712ddc33df42.tar.gz
volse-hubzilla-801ab709adfa808072f70fe1bf4b712ddc33df42.tar.bz2
volse-hubzilla-801ab709adfa808072f70fe1bf4b712ddc33df42.zip
more work on files
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/attach_edit.tpl61
-rw-r--r--view/tpl/cloud_directory.tpl20
2 files changed, 45 insertions, 36 deletions
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index bf39e6158..033ee40a7 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -1,34 +1,41 @@
<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>
-<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit">
- {{$submit}}
-</button>
-</div>
+ <div id="attach-edit-tools" 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">
+ <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');">
+ <i class="icon-share jot-icons"></i>
+ </button>
+ </div>
+ <div id="attach-edit-perms" class="btn-group form-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}}
-{{$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}}" />
-<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>
+ {{if $isadir}}
+ <div class="form-group">
+ <label id="attach-edit-recurse-text" class="checkbox-inline" for="attach-recurse-input" >
+ <input class="checkbox-inline" id="attach-recurse-input" type="checkbox" name="recurse" value="1" />{{$recurse}}
+ </label>
+ </div>
+ {{/if}}
+ <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>
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index 99bba9474..01b9078fe 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -1,12 +1,12 @@
-<div class="section-content-wrapper generic-content-wrapper">
+<div class="generic-content-wrapper">
<table id="cloud-index">
<tr>
- <th></th>
- <th>{{$name}}</th>
- <th></th><th></th><th></th><th></th>
- <th>{{*{{$type}}*}}</th>
- <th class="hidden-xs">{{$size}}</th>
- <th class="hidden-xs">{{$lastmod}}</th>
+ <th width="1%"></th>
+ <th width="92%">{{$name}}</th>
+ <th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th>
+ <th width="1%">{{*{{$type}}*}}</th>
+ <th width="1%" class="hidden-xs">{{$size}}</th>
+ <th width="1%" class="hidden-xs">{{$lastmod}}</th>
</tr>
{{if $parentpath}}
<tr>
@@ -19,7 +19,7 @@
</tr>
{{/if}}
{{foreach $entries as $item}}
- <tr id="cloud-panel-{{$item.attachId}}">
+ <tr id="cloud-index-{{$item.attachId}}">
<td><i class="{{$item.iconFromType}}" title="{{$item.type}}"></i></td>
<td><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td>
{{if $item.is_owner}}
@@ -35,7 +35,9 @@
<td class="hidden-xs">{{$item.sizeFormatted}}</td>
<td class="hidden-xs">{{$item.lastmodified}}</td>
</tr>
- <tr><td id="perms-panel-{{$item.attachId}}" colspan="9"></td></tr>
+ <tr>
+ <td id="perms-panel-{{$item.attachId}}" colspan="9"></td>
+ </tr>
{{/foreach}}
</table>
</div>