aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-01 22:31:02 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-01 22:31:02 -0400
commit4ed5d6573c69157721d484ba0ce506788fcc8024 (patch)
treee9307ef5b75b0336f79de193d4f3f922513e9a93
parentc2d15e6c3bd8a29bae89d184a999ddac15fcb807 (diff)
parentb4bf71dd0642e58fab6151e1df3c071d05650492 (diff)
downloadvolse-hubzilla-4ed5d6573c69157721d484ba0ce506788fcc8024.tar.gz
volse-hubzilla-4ed5d6573c69157721d484ba0ce506788fcc8024.tar.bz2
volse-hubzilla-4ed5d6573c69157721d484ba0ce506788fcc8024.zip
Merge remote-tracking branch 'upstream/dev' into plugin-repo
-rw-r--r--Zotlabs/Module/Editlayout.php3
-rw-r--r--Zotlabs/Module/Layouts.php6
-rw-r--r--include/conversation.php12
-rw-r--r--view/js/autocomplete.js16
-rw-r--r--view/tpl/cloud_directory.tpl2
-rwxr-xr-xview/tpl/jot.tpl8
6 files changed, 35 insertions, 12 deletions
diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php
index 2d20de52d..c5b50235a 100644
--- a/Zotlabs/Module/Editlayout.php
+++ b/Zotlabs/Module/Editlayout.php
@@ -114,6 +114,9 @@ class Editlayout extends \Zotlabs\Web\Controller {
'hide_voting' => true,
'hide_future' => true,
'hide_expire' => true,
+ 'hide_location' => true,
+ 'hide_weblink' => true,
+ 'hide_attach' => true,
'hide_preview' => true,
'ptyp' => $itm[0]['obj_type'],
'body' => undo_post_tagging($itm[0]['body']),
diff --git a/Zotlabs/Module/Layouts.php b/Zotlabs/Module/Layouts.php
index aafe4342e..8a7207fc2 100644
--- a/Zotlabs/Module/Layouts.php
+++ b/Zotlabs/Module/Layouts.php
@@ -117,11 +117,13 @@ class Layouts extends \Zotlabs\Web\Controller {
'is_owner' => true,
'nickname' => \App::$profile['channel_address'],
'showacl' => false,
- 'visitor' => false,
'hide_voting' => true,
'hide_future' => true,
'hide_expire' => true,
- 'hide_preview'=> true,
+ 'hide_location' => true,
+ 'hide_weblink' => true,
+ 'hide_attach' => true,
+ 'hide_preview' => true,
'ptlabel' => t('Layout Name'),
'profile_uid' => intval($owner),
'expanded' => true,
diff --git a/include/conversation.php b/include/conversation.php
index ba9d551a7..ea5be221f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1138,6 +1138,14 @@ function status_editor($a, $x, $popup = false) {
if(x($x, 'hide_location'))
$geotag = $setloc = $clearloc = '';
+ $weblink = t('Insert web link');
+ if(x($x, 'hide_weblink'))
+ $weblink = '';
+
+ $writefiles = perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage');
+ if(x($x, 'hide_attach'))
+ $writefiles = false;
+
$mimeselect = '';
if(array_key_exists('mimetype', $x) && $x['mimetype']) {
if($x['mimetype'] != 'text/bbcode')
@@ -1213,14 +1221,14 @@ function status_editor($a, $x, $popup = false) {
'$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''),
'$id_select' => $id_select,
'$id_seltext' => t('Post as'),
- '$writefiles' => perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage'),
+ '$writefiles' => $writefiles,
'$bold' => t('Bold'),
'$italic' => t('Italic'),
'$underline' => t('Underline'),
'$quote' => t('Quote'),
'$code' => t('Code'),
'$attach' => t('Attach file'),
- '$weblink' => t('Insert web link'),
+ '$weblink' => $weblink,
'$setloc' => $setloc,
'$voting' => t('Toggle voting'),
'$feature_voting' => $feature_voting,
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 41077d427..33d825b55 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -143,8 +143,11 @@ function listNewLineAutocomplete(id) {
if (word != null) {
var textBefore = text.value.substring(0, caretPos);
var textAfter = text.value.substring(caretPos, text.length);
- $('#' + id).val(textBefore + '\r\n[*] ' + textAfter);
- setCaretPosition(text, caretPos + 5);
+ var textInsert = (word.indexOf('[/dl]') > 0) ? '\r\n[*=] ' : '\r\n[*] ';
+ var caretPositionDiff = (word.indexOf('[/dl]') > 0) ? 3 : 1;
+
+ $('#' + id).val(textBefore + textInsert + textAfter);
+ setCaretPosition(text, caretPos + (textInsert.length - caretPositionDiff));
return true;
}
else {
@@ -296,10 +299,11 @@ function string2bb(element) {
replace: function (element) {
element = string2bb(element);
if(open_elements.indexOf(element) < 0) {
- if(element === 'list' || element === 'ol' || element === 'ul' || element === 'dl') {
- return ['\[' + element + '\]' + '\n\[*\] ', '\n\[/' + element + '\]'];
- }
- else if(element === 'table') {
+ if(element === 'list' || element === 'ol' || element === 'ul') {
+ return ['\[' + element + '\]' + '\n\[*\] ', '\n\[/' + element + '\]'];
+ } else if (element === 'dl') {
+ return ['\[' + element + '\]' + '\n\[*=Item name\] ', '\n\[/' + element + '\]'];
+ } else if(element === 'table') {
return ['\[' + element + '\]' + '\n\[tr\]', '\[/tr\]\n\[/' + element + '\]'];
}
else {
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index c0207c623..870f7e9e1 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -20,7 +20,7 @@
{{/if}}
{{foreach $entries as $item}}
<tr id="cloud-index-{{$item.attachId}}">
- <td><i class="{{$item.iconFromType}}" title="{{$item.type}}"></i></td>
+ <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>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 3de92cddb..a9f6766dc 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -138,6 +138,9 @@
{{if $feature_expire}}
<li><a href="#" onclick="jotGetExpiry(); return false;"><i class="fa fa-eraser"></i>&nbsp;{{$expires}}</a></li>
{{/if}}
+ {{if $feature_future}}
+ <li><a href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i>&nbsp;{{$future_txt}}</a></li>
+ {{/if}}
{{if $feature_encrypt}}
<li><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a></li>
{{/if}}
@@ -176,6 +179,7 @@
<div id="jot-preview-content" style="display:none;"></div>
+{{if $feature_expire}}
<!-- Modal for item expiry-->
<div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
<div class="modal-dialog">
@@ -196,7 +200,9 @@
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
+{{/if}}
+{{if $feature_future}}
<!-- Modal for item created-->
<div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true">
<div class="modal-dialog">
@@ -217,7 +223,7 @@
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
-
+{{/if}}
{{if $content || $attachment || $expanded}}
<script>initEditor();</script>