diff options
| -rw-r--r-- | Zotlabs/Module/Bookmarks.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Cal.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Events.php | 5 | ||||
| -rw-r--r-- | include/bookmarks.php | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 5 | ||||
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 2 |
7 files changed, 17 insertions, 10 deletions
diff --git a/Zotlabs/Module/Bookmarks.php b/Zotlabs/Module/Bookmarks.php index cea0d9759..cee86a47d 100644 --- a/Zotlabs/Module/Bookmarks.php +++ b/Zotlabs/Module/Bookmarks.php @@ -59,7 +59,7 @@ class Bookmarks extends \Zotlabs\Web\Controller { killme(); } - function get() { + function get() { if(! local_channel()) { notice( t('Permission denied.') . EOL); return; diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php index 87c13ef4e..14c109515 100644 --- a/Zotlabs/Module/Cal.php +++ b/Zotlabs/Module/Cal.php @@ -6,6 +6,7 @@ require_once('include/bbcode.php'); require_once('include/datetime.php'); require_once('include/event.php'); require_once('include/items.php'); +require_once('include/html2plain.php'); class Cal extends \Zotlabs\Web\Controller { @@ -293,6 +294,7 @@ class Cal extends \Zotlabs\Web\Controller { } $html = format_event_html($rr); $rr['desc'] = zidify_links(smilies(bbcode($rr['desc']))); + $rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8',false); $rr['location'] = zidify_links(smilies(bbcode($rr['location']))); $events[] = array( 'id'=>$rr['id'], diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index 33c8b8249..213fa6bff 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -6,7 +6,7 @@ require_once('include/bbcode.php'); require_once('include/datetime.php'); require_once('include/event.php'); require_once('include/items.php'); - +require_once('include/html2plain.php'); class Events extends \Zotlabs\Web\Controller { @@ -641,6 +641,7 @@ class Events extends \Zotlabs\Web\Controller { } $html = format_event_html($rr); $rr['desc'] = zidify_links(smilies(bbcode($rr['desc']))); + $rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8',false); $rr['location'] = zidify_links(smilies(bbcode($rr['location']))); $events[] = array( 'id'=>$rr['id'], @@ -659,8 +660,6 @@ class Events extends \Zotlabs\Web\Controller { 'html'=>$html, 'plink' => array($rr['plink'],t('Link to Source'),'',''), ); - - } } diff --git a/include/bookmarks.php b/include/bookmarks.php index 0db103054..21456c871 100644 --- a/include/bookmarks.php +++ b/include/bookmarks.php @@ -59,9 +59,10 @@ function bookmark_add($channel,$sender,$taxonomy,$private,$opts = null) { ); if($r) logger('add_bookmark: duplicate menu entry', LOGGER_DEBUG); - if(! $r) + if(! $r) { $r = menu_add_item($menu_id,$channel_id,$iarr); - + menu_sync_packet($channel_id,get_observer_hash(),$menu_id); + } return $r; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0a879cb71..a9ea29ba1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1514,11 +1514,15 @@ blockquote { left: 0px; } - #nav-app-link-wrapper { + #nav-app-link-wrapper.has_location { min-width: 0; flex-basis: 25%; } + #nav-app-link-wrapper { + margin-right: 0.5rem; + } + #navbar-collapse-2 .navbar-app i { font-size: 1rem; margin-right: 0.5rem; diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 70d196a02..688e92148 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -20,7 +20,8 @@ $(document).ready(function() { if($(window).width() >= 992) { $('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({ offset_top: parseInt($('aside').css('padding-top')), - parent: 'main' + parent: 'main', + spacer: '.aside_spacer' }); } @@ -42,7 +43,7 @@ $(document).ready(function() { }); - var right_aside_height = $('#rightt_aside_wrapper').height(); + var right_aside_height = $('#right_aside_wrapper').height(); $('#right_aside_wrapper').on('click', function() { if(right_aside_height != $('#right_aside_wrapper').height()) { diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index a11b9b5ea..a0e8edaf7 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -63,7 +63,7 @@ {{/if}} </div> {{if $sel.name}} -<div id="nav-app-link-wrapper" class="navbar-nav mr-auto"> +<div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation}} has_location mr-auto{{/if}}"> <a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate"> {{$sel.name}} {{if $sitelocation}} |