diff options
| -rw-r--r-- | Zotlabs/Module/Editlayout.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Layouts.php | 6 | ||||
| -rw-r--r-- | include/conversation.php | 12 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 8 |
5 files changed, 24 insertions, 7 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/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c19005f11..58f216029 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1681,9 +1681,7 @@ nav .badge.mail-update:hover { .navbar-inverse .navbar-nav > li > a { - font-size: 12px; color: $nav_icon_colour; - text-shadow: 0px 0px 0px; } .navbar-inverse .navbar-nav > li > a:hover, 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> {{$expires}}</a></li> {{/if}} + {{if $feature_future}} + <li><a href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i> {{$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> {{$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> |