aboutsummaryrefslogtreecommitdiffstats
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
parent0e0a4e4999583df96f74a78589231e1e7329f7d4 (diff)
downloadvolse-hubzilla-801ab709adfa808072f70fe1bf4b712ddc33df42.tar.gz
volse-hubzilla-801ab709adfa808072f70fe1bf4b712ddc33df42.tar.bz2
volse-hubzilla-801ab709adfa808072f70fe1bf4b712ddc33df42.zip
more work on files
-rw-r--r--view/css/mod_cloud.css21
-rw-r--r--view/js/main.js2
-rw-r--r--view/theme/redbasic/css/style.css59
-rw-r--r--view/tpl/attach_edit.tpl61
-rw-r--r--view/tpl/cloud_directory.tpl20
5 files changed, 97 insertions, 66 deletions
diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css
index 85d3f4ec6..302918cc4 100644
--- a/view/css/mod_cloud.css
+++ b/view/css/mod_cloud.css
@@ -2,6 +2,12 @@
#files-upload-tools,
[id^="perms-panel-"] {
display: none;
+ padding: 3px 10px 3px 10px !important;
+}
+
+#attach-code,
+#link-code {
+ display: none;
}
#cloud-index {
@@ -9,10 +15,19 @@
}
#cloud-index td:nth-child(1){
- padding: 3px 4px 3px 0px;
+ padding: 7px 3px 7px 10px;
}
-.cloud-index-tool {
- padding: 3px 4px;
+#cloud-index td:nth-child(8){
+ padding: 7px 3px;
+ white-space: nowrap;
}
+#cloud-index td:nth-child(9){
+ padding: 7px 10px 7px 7px;
+ white-space: nowrap;
+}
+
+.cloud-index-tool {
+ padding: 7px 10px;
+}
diff --git a/view/js/main.js b/view/js/main.js
index f979f6b6f..104718436 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -844,10 +844,12 @@ function updateConvItems(mode,data) {
}
function filestorage(event,nick,id) {
+ $('#cloud-index-' + last_filestorage_id).removeClass('cloud-index-active');
$('#perms-panel-' + last_filestorage_id).hide().html('');
$('#file-edit-' + id).spin('tiny');
delete acl;
$.get('filestorage/' + nick + '/' + id + '/edit', function(data) {
+ $('#cloud-index-' + id).addClass('cloud-index-active');
$('#perms-panel-' + id).html(data).show();
$('#file-edit-' + id).spin(false);
last_filestorage_id = id;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7a6c13798..6f8b2a6a6 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1774,7 +1774,6 @@ img.mail-list-sender-photo {
color: #777;
}
-#jot-perms-icon,
.jot-icons {
color: $toolicon_colour;
}
@@ -2031,6 +2030,38 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: $nav_active_icon_colour;
}
+.section-title-wrapper {
+ padding: 7px 10px;
+ background-color: $item_colour;
+ border-top-left-radius: $radiuspx;
+ border-top-right-radius: $radiuspx;
+ margin-bottom: 3px;
+}
+
+.section-title-wrapper h2 {
+ margin-top: 0px;
+ margin-bottom: 0px;
+}
+
+.section-content-tools-wrapper {
+ padding: 7px 10px;
+ background-color: $comment_item_colour;
+ margin-bottom: 3px;
+}
+
+.section-content-wrapper {
+ padding: 7px 10px;
+ background-color: $comment_item_colour;
+ border-bottom-left-radius: $radiuspx;
+ border-bottom-right-radius: $radiuspx;
+}
+
+[id^="cloud-index-"]:hover,
+.cloud-index-active {
+ background-color: $item_colour;
+}
+
+
/* bootstrap overrides */
blockquote {
@@ -2226,32 +2257,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%);
}
-.section-title-wrapper {
- padding: 7px 10px;
- background-color: $item_colour;
- border-top-left-radius: $radiuspx;
- border-top-right-radius: $radiuspx;
- margin-bottom: 3px;
-}
-
-.section-title-wrapper h2 {
- margin-top: 0px;
- margin-bottom: 0px;
-}
-
-.section-content-tools-wrapper {
- padding: 7px 10px;
- background-color: $comment_item_colour;
- margin-bottom: 3px;
-}
-
-.section-content-wrapper {
- padding: 7px 10px;
- background-color: $comment_item_colour;
- border-bottom-left-radius: $radiuspx;
- border-bottom-right-radius: $radiuspx;
-}
-
@media screen and (max-width: 767px) {
aside#region_1 {
background: rgba(0, 0, 0, .1);
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>