harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make weblink and attach button hideable and some minor fixes

Browse Source
This commit is contained in:
Mario Vavti 2016-05-01 15:45:42 +02:00
parent 84d93cca6e
commit fa80a5c113
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Module/Editlayout.php
View File

@ -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']),

6
Zotlabs/Module/Layouts.php
View File

@ -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,

12
include/conversation.php
View File

@ -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,

8
view/tpl/jot.tpl
View File

@ -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>