aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/admin_site.tpl1
-rw-r--r--view/tpl/breadcrumb.tpl11
-rwxr-xr-xview/tpl/build_query.tpl5
-rwxr-xr-xview/tpl/categories_widget.tpl6
-rw-r--r--view/tpl/cloud_actionspanel.tpl89
-rw-r--r--view/tpl/cloud_directory.tpl322
-rw-r--r--view/tpl/cloud_header.tpl2
-rwxr-xr-xview/tpl/conv_item.tpl2
-rw-r--r--view/tpl/field_select.tpl3
-rwxr-xr-xview/tpl/head.tpl3
-rw-r--r--view/tpl/item_filer.tpl2
-rwxr-xr-xview/tpl/jot-header.tpl42
-rwxr-xr-xview/tpl/js_strings.tpl9
-rwxr-xr-xview/tpl/settings_display.tpl1
-rwxr-xr-xview/tpl/xchan_vcard.tpl31
15 files changed, 386 insertions, 143 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 5e10e6eea..8d32ba9a4 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -95,6 +95,7 @@
</div>
<h3>{{$advanced}}</h3>
+ {{include file="field_checkbox.tpl" field=$sse_enabled}}
{{include file="field_input.tpl" field=$imagick_path}}
{{include file="field_input.tpl" field=$proxy}}
{{include file="field_input.tpl" field=$proxyuser}}
diff --git a/view/tpl/breadcrumb.tpl b/view/tpl/breadcrumb.tpl
new file mode 100644
index 000000000..205b712d9
--- /dev/null
+++ b/view/tpl/breadcrumb.tpl
@@ -0,0 +1,11 @@
+<nav aria-label="breadcrumb">
+ <ol class="breadcrumb bg-transparent">
+ {{foreach $breadcrumbs as $breadcrumb}}
+ {{if $breadcrumb@last}}
+ <li class="breadcrumb-item active h3 pt-3 pb-3" aria-current="page">{{$breadcrumb.name}}</li>
+ {{else}}
+ <li class="breadcrumb-item h3 cloud-index attach-drop pt-3 pb-3" data-folder="{{$breadcrumb.hash}}" title="{{$breadcrumb.hash}}"><a href="{{$breadcrumb.path}}">{{$breadcrumb.name}}</a></li>
+ {{/if}}
+ {{/foreach}}
+ </ol>
+</nav>
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index bbe0ac7ee..83e756367 100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -2,6 +2,9 @@
var bParam_cmd = "{{$baseurl}}/update/{{$pgtype}}";
+ {{if $conv_mode}}
+ var conv_mode = '{{$conv_mode}}';
+ {{/if}}
var bParam_uid = {{$uid}};
var bParam_gid = {{$gid}};
@@ -18,7 +21,6 @@
var bParam_list = {{$list}};
var bParam_fh = {{$fh}};
var bParam_dm = {{$dm}};
- var bParam_static = {{$static}};
var bParam_search = "{{$search}}";
var bParam_xchan = "{{$xchan}}";
@@ -42,7 +44,6 @@
if(bParam_cmax != (-1)) bCmd = bCmd + "&cmax=" + bParam_cmax;
if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else
if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; }
- if(bParam_static != 0) { bCmd = bCmd + "&static=" + bParam_static; }
if(bParam_star != 0) bCmd = bCmd + "&star=" + bParam_star;
if(bParam_liked != 0) bCmd = bCmd + "&liked=" + bParam_liked;
if(bParam_conv!= 0) bCmd = bCmd + "&conv=" + bParam_conv;
diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl
index 1341c652c..fd27dca44 100755
--- a/view/tpl/categories_widget.tpl
+++ b/view/tpl/categories_widget.tpl
@@ -1,12 +1,12 @@
<div id="categories-sidebar" class="widget">
<h3>{{$title}}</h3>
<div id="categories-sidebar-desc">{{$desc}}</div>
-
+
<ul class="nav nav-pills flex-column">
<li class="nav-item"><a href="{{$base}}" class="nav-link{{if $sel_all}} active{{/if}}">{{$all}}</a></li>
{{foreach $terms as $term}}
- <li class="nav-item"><a href="{{$base}}?f=&cat={{$term.name|urlencode}}" class="nav-link{{if $term.selected}} active{{/if}}">{{$term.name}}</a></li>
+ <li class="nav-item"><a href="{{$base}}/?cat={{$term.name|urlencode}}" class="nav-link{{if $term.selected}} active{{/if}}">{{$term.name}}</a></li>
{{/foreach}}
</ul>
-
+
</div>
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 292452cca..8cab175ff 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -1,44 +1,57 @@
<input id="invisible-cloud-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple>
-<div id="files-mkdir-tools" class="section-content-tools-wrapper">
- <label for="files-mkdir">{{$folder_header}}</label>
- <form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
- <input type="hidden" name="folder" value="{{$folder}}" />
- <input type="hidden" name="channick" value="{{$channick}}" />
- <input type="hidden" name="return_url" value="{{$return_url}}" />
- <input id="files-mkdir" type="text" name="filename" class="form-control form-group">
- <div class="pull-right btn-group">
- <div class="btn-group">
- {{if $lockstate}}
- <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
- <i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
- </button>
- {{/if}}
- <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
+<div id="files-mkdir-tools">
+ <div class="section-content-tools-wrapper">
+ <label for="files-mkdir">{{$folder_header}}</label>
+ <form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+ <input type="hidden" name="folder" value="{{$folder}}" />
+ <input type="hidden" name="channick" value="{{$channick}}" />
+ <input type="hidden" name="return_url" value="{{$return_url}}" />
+ <input id="files-mkdir" type="text" name="filename" class="form-control form-group">
+ <div class="pull-right btn-group">
+ <div class="btn-group">
+ {{if $lockstate}}
+ <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
+ <i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
+ </button>
+ {{/if}}
+ <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
+ </div>
</div>
- </div>
- </form>
- <div class="clear"></div>
+ </form>
+ <div class="clear"></div>
+ </div>
+ <hr class="m-0">
</div>
-<div id="files-upload-tools" class="section-content-tools-wrapper">
- {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}</div>{{/if}}
- <form id="ajax-upload-files" method="post" action="#" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
- <input type="hidden" name="directory" value="{{$path}}" />
- <input type="hidden" name="channick" value="{{$channick}}" />
- <input type="hidden" name="return_url" value="{{$return_url}}" />
- <!--label for="files-upload">{{$upload_header}}</label>
- <input class="form-group pull-left" id="files-upload" type="file" name="files[]" multiple -->
- {{include file="field_checkbox.tpl" field=$notify}}
- <div class="pull-right btn-group">
- <div class="btn-group">
- {{if $lockstate}}
- <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
- <i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
- </button>
- {{/if}}
- <button id="upload-submit" class="btn btn-primary btn-sm pull-right">{{$upload_submit}}</button>
+<div id="files-upload-tools">
+ <div class="section-content-tools-wrapper ">
+ {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}</div>{{/if}}
+ <form id="ajax-upload-files" method="post" action="#" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+ <input id="file-folder"type="hidden" name="folder" value="{{$folder}}" />
+ <input type="hidden" name="channick" value="{{$channick}}" />
+ <input type="hidden" name="return_url" value="{{$return_url}}" />
+ {{include file="field_checkbox.tpl" field=$notify}}
+ <div class="cloud-index attach-drop attach-drop-zone text-center p-4 mb-3" data-folder="{{$folder}}">
+ <span class="text-muted">{{$drop_area_label}}</span>
</div>
- </div>
- </form>
- <div class="clear"></div>
+ <div class="pull-right btn-group">
+ <div class="btn-group">
+ {{if $lockstate}}
+ <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
+ <i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
+ </button>
+ {{/if}}
+ <button id="upload-submit" class="btn btn-primary btn-sm pull-right">{{$upload_submit}}</button>
+ </div>
+ </div>
+ </form>
+ <div class="clear"></div>
+ </div>
+ <hr class="m-0">
</div>
+{{if $aclselect}}
{{$aclselect}}
+{{/if}}
+{{if $breadcrumbs_html}}
+{{$breadcrumbs_html}}
+<hr class="m-0">
+{{/if}}
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index 90347d274..ac8304b96 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -1,84 +1,272 @@
-<div id="cloud-drag-area" class="section-content-wrapper-np">
-{{if $tiles}}
+<div class="{{if $tiles}}section-content-wrapper{{else}}section-content-wrapper-np{{/if}}">
+ {{if $tiles}}
<table id="cloud-index">
<tr id="new-upload-progress-bar-1"></tr> {{* this is needed to append the upload files in the right order *}}
</table>
-
- {{if $parentpath}}
- <div class="cloud-container" >
-
- <div class="cloud-icon tiles"><a href="{{$parentpath.path}}">
- <div class="cloud-icon-container"><i class="fa fa-fw fa-level-up" ></i></div>
- </a>
+ <div class="row row-cols-2 row-cols-md-4">
+ {{if $parentpath}}
+ <div class="col mb-4">
+ <div class="card h-100">
+ <a href="{{$parentpath}}" class="text-decoration-none">
+ <div class="d-flex align-items-center justify-content-center m-1" style="height: 4.5rem;">
+ <i class="fa fa-fw fa-level-up fa-5x" style="font-size: 4rem"></i>
+ </div>
+ <div class="card-footer text-center">
+ <small class="text-muted text-truncate">..</small>
+ </div>
+ </a>
+ </div>
+ </div>
+ {{/if}}
+ {{foreach $entries as $item}}
+ <div class="col mb-4">
+ <div class="card h-100">
+ <a href="{{$item.rel_path}}" title="{{$item.name}}" class="text-decoration-none">
+ <div class="d-flex align-items-center justify-content-center m-1" style="height: 4.5rem;">
+ {{if $item.photo_icon}}
+ <img src="{{$item.photo_icon}}" class="rounded" alt="{{$item.photo_icon}}" title="{{$item.size_formatted}}" style="max-height: 4rem; width: auto; max-width: 100%;">
+ {{else}}
+ <i class="fa fa-fw {{$item.icon_from_type}}" title="{{$item.size_formatted}}" style="font-size: 4rem"></i>
+ {{/if}}
+ </div>
+ <div class="card-footer text-truncate text-center">
+ <small class="text-muted">{{$item.name}}</small>
+ </div>
+ </a>
+ </div>
+ </div>
+ {{/foreach}}
</div>
- <div class="cloud-title"><a href="{{$parentpath.path}}">..</a>
- </div>
- </div>
- {{/if}}
-
- {{foreach $entries as $item}}
- <div class="cloud-container">
- <div class="cloud-icon tiles"><a href="{{$item.fullPath}}">
- {{if $item.photo_icon}}
- <img src="{{$item.photo_icon}}" title="{{$item.type}}" >
{{else}}
- <div class="cloud-icon-container"><i class="fa fa-fw {{$item.iconFromType}}" title="{{$item.type}}"></i></div>
- {{/if}}
- </a>
- </div>
- <div class="cloud-title"><a href="{{$item.fullPath}}">
- {{$item.displayName}}
- </a>
- </div>
- {{if $item.is_owner}}
-
- {{/if}}
- </div>
- {{/foreach}}
- <div class="clear"></div>
-{{else}}
<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%">{{* multi tool checkbox *}}</th>
+ <th width="1%">{{* icon *}}</th>
+ <th width="93%">{{$name}}</th>
+ <th width="1%">{{* categories *}}</th>
+ <th width="1%">{{* lock icon *}}</th>
+ <th width="1%">{{* tools icon *}}</th>
<th width="1%" class="d-none d-md-table-cell">{{$size}}</th>
<th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th>
</tr>
- {{if $parentpath}}
- <tr>
- <td><i class="fa fa-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="d-none d-md-table-cell"></td>
- <td class="d-none d-md-table-cell"></td>
+ {{if $parentpath}}
+ <tr id="cloud-index-up" class="cloud-index{{if ! $is_root_folder}} attach-drop{{/if}}"{{if ! $is_root_folder}} data-folder="{{$folder_parent}}"/{{/if}}>
+ <td></td>
+ <td><i class="fa fa-level-up"></i></td>
+ <td colspan="6"><a href="{{$parentpath}}" title="{{$parent}}" class="p-2" draggable="false">..</a></td>
+ </tr>
+ <tr class="cloud-tools">
+ <td colspan="8" class="attach-edit-panel">{{* this is for display consistency *}}</td>
+ </tr>
+ {{/if}}
+ {{if $channel_id && $is_owner && $entries.0}}
+ <tr id="cloud-multi-actions">
+ <td colspan="2">
+ <div class="form-check form-check-inline">
+ <input class="form-check-input" type="checkbox" id="cloud-multi-tool-select-all" value="" title="{{$select_all_label}}">
+ </div>
+ </td>
+ <td colspan="3">
+ <div class="form-check form-check-inline">
+ <label class="form-check-label" for="cloud-multi-tool-select-all">{{$select_all_label}}</label>
+ </div>
+ </td>
+ <td colspan="3">
+ {{if $is_owner}}
+ <div class="dropdown">
+ <button class="btn btn-warning btn-sm" id="multi-dropdown-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <i class="fa fa-fw fa-ellipsis-v d-table-cell"></i><span class="d-none d-md-table-cell">{{$bulk_actions_label}}</span>
+ </button>
+ <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button">
+ {{if $is_owner}}
+ <a id="cloud-multi-tool-perms-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-lock"></i> {{$adjust_permissions_label}}</a>
+ {{/if}}
+ <a id="cloud-multi-tool-move-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-copy"></i> {{$move_copy_label}}</a>
+ <a id="cloud-multi-tool-categories-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-asterisk"></i> {{$categories_label}}</a>
+ <a id="cloud-multi-tool-download-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a>
+ <a id="cloud-multi-tool-delete-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-trash-o"></i> {{$delete_label}}</a>
+ </div>
+ </div>
+ {{else if $is_admin}}
+ <div class="dropdown">
+ <button class="btn btn-warning btn-sm" id="multi-dropdown-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <i class="fa fa-fw fa-ellipsis-v d-table-cell"></i><span class="d-none d-md-table-cell">{{$bulk_actions_label}}</span>
+ </button>
+ <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button">
+ <a id="cloud-multi-tool-delete-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-trash-o"></i> {{$admin_delete_label}}</a>
+ </div>
+ </div>
+ {{/if}}
+ </td>
</tr>
- {{/if}}
+ <tr id="cloud-multi-tools">
+ <td id="attach-multi-edit-panel" colspan="8">
+ <form id="attach_multi_edit_form" action="attach_edit" method="post" class="acl-form" data-form_id="attach_multi_edit_form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+ <input type="hidden" name="channel_id" value="{{$channel_id}}" />
+ <input id="multi-perms" type="hidden" name="permissions" value="0">
+ <input type="hidden" name="return_path" value="{{$return_path}}">
+ <div id="cloud-multi-tool-move" class="cloud-multi-tool">
+ {{include file="field_select.tpl" field=$newfolder}}
+ {{include file="field_checkbox.tpl" field=$copy}}
+ </div>
+ <div id="cloud-multi-tool-categories" class="cloud-multi-tool">
+ {{include file="field_input.tpl" field=$categories}}
+ </div>
+ <div id="cloud-multi-tool-submit" class="cloud-multi-tool">
+ {{if $is_owner}}
+ {{include file="field_checkbox.tpl" field=$recurse}}
+ {{/if}}
+ <div id="attach-multi-submit" class="form-group">
+ <button id="cloud-multi-tool-cancel-btn" class="btn btn-outline-secondary btn-sm cloud-multi-tool-cancel-btn" type="button">
+ {{$cancel_label}}
+ </button>
+ <div id="attach-multi-edit-perms" class="btn-group float-right">
+ {{if $is_owner}}
+ <button id="multi-dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button">
+ <i id="multi-jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons jot-perms-icon"></i>
+ </button>
+ {{/if}}
+ <button id="multi-dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit">
+ {{$submit_label}}
+ </button>
+ </div>
+ </div>
+ </div>
+ </form>
+ </td>
+ </tr>
+ {{/if}}
<tr id="new-upload-progress-bar-1"></tr> {{* this is needed to append the upload files in the right order *}}
- {{foreach $entries as $item}}
- <tr id="cloud-index-{{$item.attachId}}">
- <td><i class="fa {{$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 class="cloud-index-tool"><div id="file-edit-{{$item.attachId}}" class="spinner-wrapper"><div class="spinner s"></div></div></td>
- <td class="cloud-index-tool"><i class="fakelink fa fa-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td>
- <td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete/json', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
-
- {{else}}
- <td></td><td></td><td></td>{{if $is_admin || $item.is_creator}}<td class="cloud-index-tool"><a href="#" title="{{if $is_admin}}{{$admin_delete}}{{else}}{{$delete}}{{/if}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete/json', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>{{else}}<td>{{/if}}</td>
- {{/if}}
- <td>{{*{{$item.type}}*}}</td>
- <td class="d-none d-md-table-cell">{{$item.sizeFormatted}}</td>
- <td class="d-none d-md-table-cell">{{$item.lastmodified}}</td>
+ {{foreach $entries as $item}}
+ <tr id="cloud-index-{{$item.attach_id}}" class="cloud-index{{if $item.collection}} attach-drop{{/if}}"{{if $item.collection}} data-folder="{{$item.resource}}"{{/if}} data-id="{{$item.attach_id}}" draggable="true">
+ <td>
+ {{if $channel_id && $is_owner}}
+ <div class="form-check form-check-inline">
+ <input class="form-check-input cloud-multi-tool-checkbox" type="checkbox" id="cloud-multi-tool-checkbox-{{$item.attach_id}}" name="attach_ids[]" value="{{$item.attach_id}}">
+ </div>
+ {{/if}}
+ </td>
+ <td><i class="fa {{$item.icon_from_type}}" title="{{$item.type}}"></i></td>
+ <td><a href="{{$item.rel_path}}" class="p-2" draggable="false">{{$item.name}}</a></td>
+ <td>{{$item.terms}}</td>
+ <td class="cloud-index-tool p-2">
+ {{if $item.lockstate == 'lock'}}
+ <i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('attach',{{$item.attach_id}});"></i>
+ <ul id="panel-{{$item.attach_id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
+ {{/if}}
+ </td>
+ <td class="cloud-index-tool">
+ {{if ($is_owner || $item.is_creator) && $item.attach_id}}
+ <div class="dropdown">
+ <button class="btn btn-link btn-sm" id="dropdown-button-{{$item.attach_id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <i class="fa fa-fw fa-ellipsis-v"></i>
+ </button>
+ <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button-{{$item.attach_id}}">
+ <a id="cloud-tool-info-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-info-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-info"></i> {{$info_label}}</a>
+ {{if $is_owner}}
+ <a id="cloud-tool-perms-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-perms-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-{{$item.lockstate}}"></i> {{$adjust_permissions_label}}</a>
+ {{/if}}
+ <a id="cloud-tool-rename-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-rename-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-pencil"></i> {{$rename_label}}</a>
+ <a id="cloud-tool-move-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-move-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-copy"></i> {{$move_copy_label}}</a>
+ <a id="cloud-tool-categories-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-categories-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-asterisk"></i> {{$categories_label}}</a>
+ {{if $item.collection}}
+ <a id="cloud-tool-dir-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-dir-download-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a>
+ {{else}}
+ {{if $is_owner}}
+ <a id="cloud-tool-share-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-share-btn" href="/rpost?attachment=[attachment]{{$item.resource}},{{$item.revision}}[/attachment]&acl[allow_cid]={{$item.raw_allow_cid}}&acl[allow_gid]={{$item.raw_allow_gid}}&acl[deny_cid]={{$item.raw_deny_cid}}&acl[deny_gid]={{$item.raw_deny_gid}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-share-square-o"></i> {{$post_label}}</a>
+ {{/if}}
+ <a id="cloud-tool-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-download-btn" href="/attach/{{$item.resource}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a>
+ {{/if}}
+ <a id="cloud-tool-delete-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-delete-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-trash-o"></i> {{$delete_label}}</a>
+ </div>
+ </div>
+ {{else}}
+ {{if $is_admin || $item.attach_id}}
+ <div class="dropdown">
+ <button class="btn btn-link btn-sm" id="dropdown-button-{{$item.attach_id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <i class="fa fa-fw fa-ellipsis-v"></i>
+ </button>
+ <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button-{{$item.attach_id}}">
+ {{if $item.collection}}
+ <a id="cloud-tool-dir-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-dir-download-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a>
+ {{else}}
+ <a id="cloud-tool-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-download-btn" href="/attach/{{$item.resource}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a>
+ {{/if}}
+ {{if $is_admin}}
+ <a id="cloud-tool-delete-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-delete-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-trash-o"></i> {{$admin_delete_label}}</a>
+ {{/if}}
+ </div>
+ </div>
+ {{/if}}
+ </td>
+ {{/if}}
+ <td class="d-none d-md-table-cell p-2">{{$item.size_formatted}}</td>
+ <td class="d-none d-md-table-cell p-2">{{$item.last_modified}}</td>
</tr>
- <tr id="cloud-tools-{{$item.attachId}}">
- <td id="perms-panel-{{$item.attachId}}" colspan="9"></td>
+ <tr id="cloud-tools-{{$item.attach_id}}" class="cloud-tools">
+ <td id="attach-edit-panel-{{$item.attach_id}}" class="attach-edit-panel" colspan="8">
+ <form id="attach_edit_form_{{$item.attach_id}}" action="attach_edit" method="post" class="acl-form" data-form_id="attach_edit_form_{{$item.attach_id}}" data-allow_cid='{{$item.allow_cid}}' data-allow_gid='{{$item.allow_gid}}' data-deny_cid='{{$item.deny_cid}}' data-deny_gid='{{$item.deny_gid}}'>
+ <input type="hidden" name="attach_id" value="{{$item.attach_id}}" />
+ <input type="hidden" name="channel_id" value="{{$channel_id}}" />
+ <input type="hidden" name="return_path" value="{{$return_path}}">
+ <div id="cloud-tool-rename-{{$item.attach_id}}" class="cloud-tool">
+ {{include file="field_input.tpl" field=$item.newfilename}}
+ </div>
+ <div id="cloud-tool-info-{{$item.attach_id}}" class="cloud-tool">
+ {{if ! $item.collection}}
+ <div class="form-group">
+ <label for="attach-code-input-{{$item.attach_id}}">{{$attach_bbcode_label}}</label>
+ <input type="text" class="form-control" id="attach-code-input-{{$item.attach_id}}" name="attach-code-input-{{$item.attach_id}}" value="{{$item.attach_bbcode}}" onclick="this.select();" />
+ </div>
+ {{if $item.embed_bbcode}}
+ <div class="form-group">
+ <label for="embed-code-input-{{$item.attach_id}}">{{$embed_bbcode_label}}</label>
+ <input type="text" class="form-control" id="embed-code-input-{{$item.attach_id}}" name="embed-code-input-{{$item.attach_id}}" value="{{$item.embed_bbcode}}" onclick="this.select();" />
+ </div>
+ {{/if}}
+ {{/if}}
+ <div class="form-group">
+ <label for="link-code-input-{{$item.attach_id}}">{{$link_bbcode_label}}</label>
+ <input type="text" class="form-control" id="link-code-input-{{$item.attach_id}}" name="link-code-input-{{$item.attach_id}}" value="{{$item.link_bbcode}}" onclick="this.select();" />
+ </div>
+ <div class="form-group">
+ <button id="cloud-tool-close-btn-{{$item.attach_id}}" class="btn btn-outline-secondary btn-sm cloud-tool-cancel-btn" type="button" data-id="{{$item.attach_id}}">
+ {{$close_label}}
+ </button>
+ </div>
+ </div>
+ <div id="cloud-tool-move-{{$item.attach_id}}" class="cloud-tool">
+ {{include file="field_select.tpl" field=$item.newfolder}}
+ {{include file="field_checkbox.tpl" field=$item.copy}}
+ </div>
+ <div id="cloud-tool-categories-{{$item.attach_id}}" class="cloud-tool">
+ {{include file="field_input.tpl" field=$item.categories}}
+ </div>
+ <div id="cloud-tool-submit-{{$item.attach_id}}" class="cloud-tool">
+ {{if $is_owner}}
+ {{if !$item.collection}}{{include file="field_checkbox.tpl" field=$item.notify}}{{/if}}
+ {{if $item.collection}}{{include file="field_checkbox.tpl" field=$item.recurse}}{{/if}}
+ {{/if}}
+ <div id="attach-submit-{{$item.attach_id}}" class="form-group">
+ <button id="cloud-tool-cancel-btn-{{$item.attach_id}}" class="btn btn-outline-secondary btn-sm cloud-tool-cancel-btn" type="button" data-id="{{$item.attach_id}}">
+ {{$cancel_label}}
+ </button>
+ <div id="attach-edit-perms-{{$item.attach_id}}" class="btn-group float-right">
+ {{if $is_owner}}
+ <button id="dbtn-acl-{{$item.attach_id}}" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button">
+ <i id="jot-perms-icon-{{$item.attach_id}}" class="fa fa-{{$item.lockstate}} jot-icons jot-perms-icon"></i>
+ </button>
+ {{/if}}
+ <button id="dbtn-submit-{{$item.attach_id}}" class="btn btn-primary btn-sm" type="submit" name="submit">
+ {{$submit_label}}
+ </button>
+ </div>
+ </div>
+ </div>
+ </form>
+ </td>
</tr>
-
- {{/foreach}}
+ {{/foreach}}
</table>
{{/if}}
</div>
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
index 642fb1866..285363a12 100644
--- a/view/tpl/cloud_header.tpl
+++ b/view/tpl/cloud_header.tpl
@@ -1,6 +1,6 @@
<div class="section-title-wrapper">
<div class="pull-right">
- <a href="cloud_tiles/{{$cpath}}" class="btn btn-sm btn-outline-secondary"><i class="fa fa-fw {{if $tiles}}fa-list-ul{{else}}fa-table{{/if}}"></i></a>
+ <a href="cloud_tiles/{{$cpath}}" class="btn btn-sm btn-outline-secondary"><i class="fa fa-fw {{if $tiles}}fa-th-list{{else}}fa-th-large{{/if}}"></i></a>
{{if $actionspanel}}
{{if $is_owner}}
<a href="/sharedwithme" class="btn btn-sm btn-outline-secondary"><i class="fa fa-cloud-download"></i>&nbsp;{{$shared}}</a>
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index d7eaefe7e..78601c40d 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -259,7 +259,7 @@
{{/foreach}}
{{/if}}
{{if $item.comment}}
- <div class="p-2 wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" >
+ <div id="wall-item-comment-wrapper-{{$item.id}}" class="p-2 wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" >
{{$item.comment}}
</div>
{{/if}}
diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl
index 6c090ceb5..57be3b1ab 100644
--- a/view/tpl/field_select.tpl
+++ b/view/tpl/field_select.tpl
@@ -1,4 +1,4 @@
- <div class="form-group">
+ <div id="id_{{$field.0}}_wrapper" class="form-group">
<label for="id_{{$field.0}}">{{$field.1}}{{if $field.5}}<sup class="required zuiqmid"> {{$field.5}}</sup>{{/if}}</label>
<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}">
{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
@@ -19,3 +19,4 @@
.required, .code
.form-group, .form-control, .form-text, .text-muted
*}}
+
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index bd4cf3747..ecb30afd3 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -9,11 +9,12 @@
{{$plugins}}
<script>
var updateInterval = {{$update_interval}};
+ var sse_enabled = {{$sse_enabled}};
var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}};
var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
var justifiedGalleryActive = false;
{{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}
- {{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}}
+ var channelId = {{if $channel_id}}{{$channel_id}}{{else}}false{{/if}};{{* Used in e.g. autocomplete *}}
var preloadImages = {{$preload_images}};
var auto_save_draft = {{$auto_save_draft}};
</script>
diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl
index 4eb621f93..f814b374c 100644
--- a/view/tpl/item_filer.tpl
+++ b/view/tpl/item_filer.tpl
@@ -1,7 +1,7 @@
{{if $categories}}
<!--div class="filesavetags"-->
{{foreach $categories as $cat}}
-<span class="item-category badge badge-pill badge-danger"><i class="fa fa-folder-o"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="text-white" title="{{$remove}}"><i class="fa fa-close"></i></a></span>
+<span class="item-category badge badge-pill badge-danger"><i class="fa fa-folder-o"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="text-white" title="{{$remove}}" onClick="itemFilerRm({{$cat.id}}, '{{$cat.term}}'); return false;"><i class="fa fa-close"></i></a></span>
{{/foreach}}
<!--/div-->
{{/if}}
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index d519fd666..2539c1fdf 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -61,13 +61,11 @@ var activeCommentText = '';
$('#jot-add-option').on('click', jotAddOption);
$(document).on('click', '.poll-option-close', jotRemoveOption);
- function jotSetMime() {
- var mtype = $('#id_mimetype').val();
- if(mtype == 'text/bbcode')
- $('#profile-jot-submit-left').show();
- else
- $('#profile-jot-submit-left').hide();
- }
+ $('#profile-jot-form').keydown(function(e) {
+ if (e.ctrlKey && e.keyCode === 13) {
+ $(this).trigger('submit');
+ }
+ });
$('#invisible-wall-file-upload').fileupload({
url: 'wall_attach/{{$nickname}}',
@@ -91,11 +89,10 @@ var activeCommentText = '';
$('#wall-file-upload').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
$('#wall-file-upload-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
- // call initialization file
- if (window.File && window.FileList && window.FileReader) {
- DragDropUploadInit();
- }
-
+ // call initialization file
+ if (window.File && window.FileList && window.FileReader) {
+ DragDropUploadInit();
+ }
$('#invisible-comment-upload').fileupload({
url: 'wall_attach/{{$nickname}}',
@@ -128,6 +125,14 @@ var activeCommentText = '';
});
+ function jotSetMime() {
+ var mtype = $('#id_mimetype').val();
+ if(mtype == 'text/bbcode')
+ $('#profile-jot-submit-left').show();
+ else
+ $('#profile-jot-submit-left').hide();
+ }
+
function deleteCheckedItems() {
var checkedstr = '';
@@ -298,13 +303,9 @@ var activeCommentText = '';
if(reply && reply.length) {
reply = reply.replace('#','');
if(reply.length) {
-
commentBusy = true;
$('body').css('cursor', 'wait');
-
- $.get('{{$baseurl}}/tagger/' + id + '?term=' + reply);
- if(timer) clearTimeout(timer);
- timer = setTimeout(updateInit,3000);
+ $.get('{{$baseurl}}/tagger/' + id + '?term=' + reply, updateInit);
liking = 1;
}
}
@@ -353,6 +354,13 @@ var activeCommentText = '';
}
+ function itemFilerRm(id, term) {
+ commentBusy = true;
+ $('body').css('cursor', 'wait');
+ $.get('{{$baseurl}}/filerm/' + id + '?f=&term=' + term, updateInit);
+ liking = 1;
+ }
+
function itemBookmark(id) {
$.get('{{$baseurl}}/bookmarks?f=&item=' + id);
if(timer) clearTimeout(timer);
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 58426e20c..291d78fb2 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -66,8 +66,13 @@
'month' : "{{$month}}",
'week' : "{{$week}}",
'day' : "{{$day}}",
- 'allday' : "{{$allday}}"
+ 'allday' : "{{$allday}}",
+
+ // mod cloud
+
+ 'download_info' : "{{$download_info}}"
+
};
</script>
-
+
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index c93efb4aa..c2dd94175 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -63,7 +63,6 @@
{{include file="field_checkbox.tpl" field=$title_tosource}}
{{include file="field_checkbox.tpl" field=$user_scalable}}
{{include file="field_checkbox.tpl" field=$preload_images}}
- {{include file="field_checkbox.tpl" field=$manual_update}}
{{include file="field_checkbox.tpl" field=$start_menu}}
<div class="settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index 9c357bba8..447839167 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,10 +1,25 @@
-<div id="vcard" class="vcard h-card">
-<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo u-photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
-{{if $connect}}
-<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm" rel="nofollow"><i class="fa fa-plus"></i> {{$connect}}</a></div>
-{{/if}}
-<div class="fn p-name">{{$name}}</div>
+<div class="card mb-3 h-card">
+ <div class="row">
+ <div class="col-4">
+ <a href="{{$link}}" >
+ <img class="u-photo" src="{{$photo}}" alt="{{$name}}" width="80px" height="80px">
+ </a>
+ </div>
+ <div class="col m-1">
+ <div class="row">
+ <strong class="fn p-name">{{$name}}</strong>
+ </div>
+ <div class="row">
+ <small class="text-muted p-adr">{{$addr}}</small>
+ </div>
+ {{if $connect}}
+ <div class="row mt-2">
+ <a href="follow?f=&url={{$follow}}" class="btn btn-success btn-sm" rel="nofollow">
+ <i class="fa fa-plus"></i> {{$connect}}
+ </a>
+ </div>
+ {{/if}}
+ </div>
+ </div>
</div>
-
-