diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 1 | ||||
| -rw-r--r-- | view/js/mod_hq.js | 12 | ||||
| -rw-r--r-- | view/pdl/mod_hq.pdl | 3 | ||||
| -rw-r--r-- | view/tpl/cdav_widget_calendar.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/hq_controls.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 4 |
7 files changed, 31 insertions, 3 deletions
diff --git a/view/js/main.js b/view/js/main.js index c39d6c84c..1738ca7e9 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -437,6 +437,7 @@ function NavUpdate() { if($('#live-channel').length) { src = 'channel'; liveUpdate(); } if($('#live-pubstream').length) { src = 'pubstream'; liveUpdate(); } if($('#live-display').length) { src = 'display'; liveUpdate(); } + if($('#live-hq').length) { src = 'hq'; liveUpdate(); } if($('#live-search').length) { src = 'search'; liveUpdate(); } // if($('#live-cards').length) { src = 'cards'; liveUpdate(); } // if($('#live-articles').length) { src = 'articles'; liveUpdate(); } diff --git a/view/js/mod_hq.js b/view/js/mod_hq.js index 8bbd5e3ad..3ce5f1ca6 100644 --- a/view/js/mod_hq.js +++ b/view/js/mod_hq.js @@ -1,3 +1,15 @@ +$(document).on('click', '#jot-toggle', function(e) { + e.preventDefault(); + e.stopPropagation(); + + $(this).toggleClass('active'); + $(window).scrollTop(0); + $('#jot-popup').toggle(); + $('#profile-jot-text').focus(); + +}); + + function hqLiveUpdate(notify_id) { if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */ diff --git a/view/pdl/mod_hq.pdl b/view/pdl/mod_hq.pdl index e657fa88b..450fcb9a7 100644 --- a/view/pdl/mod_hq.pdl +++ b/view/pdl/mod_hq.pdl @@ -1,3 +1,6 @@ +[region=aside] +[widget=hq_controls][/widget] +[/region] [region=right_aside] [widget=notifications][/widget] [/region] diff --git a/view/tpl/cdav_widget_calendar.tpl b/view/tpl/cdav_widget_calendar.tpl index ec2257a19..8d6414ec6 100644 --- a/view/tpl/cdav_widget_calendar.tpl +++ b/view/tpl/cdav_widget_calendar.tpl @@ -14,10 +14,10 @@ <div id="share-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};"> {{if $calendar.sharees}} {{foreach $calendar.sharees as $sharee}} - <div id="sharee-{{$calendar.calendarid}}" class="form-group"> + <div id="sharee-{{$calendar.calendarid}}-{{$sharee@iteration}}" class="form-group"> <i class="fa fa-share generic-icons"></i>{{$sharee.name}} {{$sharee.access}} <div class="pull-right"> - <a href="#" onclick="dropItem('/cdav/calendar/dropsharee/{{$calendar.calendarid}}/{{$calendar.instanceid}}/{{$sharee.hash}}', '#sharee-{{$calendar.calendarid}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a> + <a href="#" onclick="dropItem('/cdav/calendar/dropsharee/{{$calendar.calendarid}}/{{$calendar.instanceid}}/{{$sharee.hash}}', '#sharee-{{$calendar.calendarid}}-{{$sharee@iteration}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a> </div> </div> {{/foreach}} diff --git a/view/tpl/hq_controls.tpl b/view/tpl/hq_controls.tpl new file mode 100755 index 000000000..d7f6d436f --- /dev/null +++ b/view/tpl/hq_controls.tpl @@ -0,0 +1,8 @@ +<div class="widget"> + <h3>{{$title}}</h3> + <ul class="nav nav-pills flex-column"> + {{foreach $menu as $m}} + <li class="nav-item"><a href="{{$m.href}}" id="{{$m.id}}" class="nav-link{{if $m.class}} {{$m.class}}{{/if}}">{{$m.label}}</a></li> + {{/foreach}} + </ul> +</div> diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 8ab9a79a0..eeb2011cd 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -36,7 +36,7 @@ {{/if}} {{if $module == 'hq'}} - if(b64mid !== 'undefined' && path !== 'pubstre') { + if(b64mid !== 'undefined') { {{else}} if(path === 'display' && b64mid) { {{/if}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 33e0aa925..0f42a6e8a 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -167,6 +167,10 @@ </div> <div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings"> <div class="section-content-tools-wrapper"> + {{if $profselect}} + <label for="contact-profile-selector">{{$profseltxt}}</label> + {{$profselect}} + {{/if}} {{if $menus}} <div class="form-group channel-menu"> <label for="channel_menu">{{$menu_desc}}</label> |