diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_cloud.css | 34 | ||||
| -rw-r--r-- | view/js/autocomplete.js | 3 | ||||
| -rw-r--r-- | view/js/main.js | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 68 | ||||
| -rw-r--r-- | view/tpl/attach_edit.tpl | 61 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 82 |
6 files changed, 150 insertions, 104 deletions
diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css index cc5fe890f..56f4c415b 100644 --- a/view/css/mod_cloud.css +++ b/view/css/mod_cloud.css @@ -1,5 +1,37 @@ #files-mkdir-tools, -#files-upload-tools { +#files-upload-tools, +[id^="perms-panel-"] { display: none; + padding: 3px 10px 3px 10px !important; } +#attach-code, +#link-code { + display: none; +} + +#cloud-index { + width: 100%; +} + +#cloud-index th { + padding-top: 7px; +} + +#cloud-index td:nth-child(1){ + padding: 7px 3px 7px 10px; +} + +#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/autocomplete.js b/view/js/autocomplete.js index ba71bb2f5..7c3145769 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -7,7 +7,6 @@ function mysearch(term, callback, backend_url) { var postdata = { start:0, count:100, - //search:term.substring(1), search:term, type:'c', } @@ -40,7 +39,7 @@ function replace(item) { // Autocomplete contacts contacts = { - match: /(^|\s)(@!?)(\w{2,})$/, + match: /(^|\s)(@\!*)([^ \n]+)$/, index: 3, search: function(term, callback) { mysearch(term, callback, backend_url); }, replace: replace, diff --git a/view/js/main.js b/view/js/main.js index f49cea78c..104718436 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -844,11 +844,13 @@ function updateConvItems(mode,data) { } function filestorage(event,nick,id) { - $('#perms-panel-' + last_filestorage_id).html(''); + $('#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) { - $('#perms-panel-' + id).html(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 0d1f45bda..357718623 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1234,10 +1234,6 @@ footer { margin-bottom: 15px; } -#cloud-index td { - padding:5px; -} - /** * Plugins settings */ @@ -1778,7 +1774,6 @@ img.mail-list-sender-photo { color: #777; } -#jot-perms-icon, .jot-icons { color: $toolicon_colour; } @@ -2035,6 +2030,43 @@ 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; +} + +.section-content-wrapper-np { + 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 { @@ -2230,32 +2262,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 f37895e09..77d861224 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,43 +1,43 @@ -<div class="generic-content-wrapper-styled"> +<div class="generic-content-wrapper section-content-wrapper-np"> + <table id="cloud-index"> + <tr> + <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> + <td><i class="icon-level-up"></i>{{*{{$parentpath.icon}}*}}</td> + <td><a href="{{$parentpath.path}}" title="{{$parent}}">..</a></td> + <td></td><td></td><td></td><td></td> + <td>{{*[{{$parent}}]*}}</td> + <td class="hidden-xs"></td> + <td class="hidden-xs"></td> + </tr> + {{/if}} + {{foreach $entries as $item}} + <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}} + <td class="cloud-index-tool">{{$item.attachIcon}}</td> + <td id="file-edit-{{$item.attachId}}" class="cloud-index-tool"></td> + <td class="cloud-index-tool"><i class="fakelink icon-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td> + <td class="cloud-index-tool"><a href="{{$item.fileStorageUrl}}/{{$item.attachId}}/delete" title="{{$delete}}" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a></td> -<table id="cloud-index"> - <tr> - <th></th> - <th>{{$name}} </th> - <th></th><th></th><th></th> - <th>{{$type}} </th> - <th>{{$size}} </th> - <th>{{$lastmod}}</th> - </tr> - <tr><td colspan="8"><hr></td></tr> -{{if $parentpath}} - <tr> - <td>{{$parentpath.icon}}</td> - <td><a href="{{$parentpath.path}}" title="{{$parent}}">..</a></td> - <td></td><td></td><th></td> - <td>[{{$parent}}]</td> - <td></td> - <td></td> - </tr> -{{/if}} -{{foreach $entries as $item}} - <tr> - <td>{{$item.icon}}</td> - <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;"><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}} - <td>{{$item.type}}</td> - <td>{{$item.sizeFormatted}}</td> - <td>{{$item.lastmodified}}</td> - </tr> - <tr><td id="perms-panel-{{$item.attachId}}" colspan="8"></td></tr> -{{/foreach}} - -</table> + {{else}} + <td></td><td></td><td></td><td></td> + {{/if}} + <td>{{*{{$item.type}}*}}</td> + <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> + {{/foreach}} + </table> </div> |