From c26dede97f626b52b7bf8962ed55d1dbda86abe8 Mon Sep 17 00:00:00 2001
From: Hilmar R <u02@u29lx193>
Date: Sun, 28 Feb 2021 21:06:16 +0100
Subject: get dev

---
 view/tpl/404.tpl                    | 0
 view/tpl/abook_edit.tpl             | 0
 view/tpl/acl_selector.tpl           | 0
 view/tpl/admin_accounts.tpl         | 0
 view/tpl/admin_aside.tpl            | 0
 view/tpl/admin_channels.tpl         | 0
 view/tpl/admin_logs.tpl             | 0
 view/tpl/admin_plugins.tpl          | 0
 view/tpl/admin_plugins_details.tpl  | 0
 view/tpl/admin_security.tpl         | 0
 view/tpl/admin_site.tpl             | 0
 view/tpl/admin_summary.tpl          | 0
 view/tpl/album_edit.tpl             | 0
 view/tpl/atom_feed.tpl              | 0
 view/tpl/build_query.tpl            | 6 +++++-
 view/tpl/cal_calendar.tpl           | 0
 view/tpl/cal_event.tpl              | 0
 view/tpl/categories_widget.tpl      | 0
 view/tpl/channel.tpl                | 0
 view/tpl/channel_import.tpl         | 0
 view/tpl/channel_rename.tpl         | 0
 view/tpl/channels.tpl               | 0
 view/tpl/chanview.tpl               | 0
 view/tpl/comment_item.tpl           | 0
 view/tpl/common_friends.tpl         | 0
 view/tpl/common_pills.tpl           | 0
 view/tpl/common_tabs.tpl            | 0
 view/tpl/connection_template.tpl    | 0
 view/tpl/connections.tpl            | 0
 view/tpl/contact_block.tpl          | 0
 view/tpl/contact_slider.tpl         | 0
 view/tpl/contact_template.tpl       | 0
 view/tpl/conv.tpl                   | 0
 view/tpl/conv_frame.tpl             | 0
 view/tpl/conv_item.tpl              | 4 ++--
 view/tpl/conv_list.tpl              | 2 +-
 view/tpl/conversation.tpl           | 0
 view/tpl/convobj.tpl                | 0
 view/tpl/cover_photo.tpl            | 0
 view/tpl/cover_photo_widget.tpl     | 0
 view/tpl/cropbody.tpl               | 0
 view/tpl/cropcover.tpl              | 0
 view/tpl/crophead.tpl               | 0
 view/tpl/defperms.tpl               | 0
 view/tpl/directory_header.tpl       | 3 ++-
 view/tpl/direntry.tpl               | 0
 view/tpl/edpost_head.tpl            | 0
 view/tpl/email_notify_html.tpl      | 0
 view/tpl/email_notify_text.tpl      | 0
 view/tpl/event.tpl                  | 0
 view/tpl/event_form.tpl             | 0
 view/tpl/event_head.tpl             | 0
 view/tpl/event_item_header.tpl      | 0
 view/tpl/events-js.tpl              | 0
 view/tpl/events_cal-js.tpl          | 0
 view/tpl/events_tools_side.tpl      | 0
 view/tpl/failed_updates.tpl         | 0
 view/tpl/field.tpl                  | 0
 view/tpl/field_acheckbox.tpl        | 0
 view/tpl/field_combobox.tpl         | 0
 view/tpl/field_custom.tpl           | 0
 view/tpl/field_intcheckbox.tpl      | 0
 view/tpl/field_password.tpl         | 0
 view/tpl/field_radio.tpl            | 0
 view/tpl/field_richtext.tpl         | 0
 view/tpl/field_select_raw.tpl       | 0
 view/tpl/field_textarea.tpl         | 0
 view/tpl/field_themeselect.tpl      | 0
 view/tpl/field_yesno.tpl            | 0
 view/tpl/fileas_widget.tpl          | 0
 view/tpl/filebrowser.tpl            | 0
 view/tpl/filer_dialog.tpl           | 0
 view/tpl/follow.tpl                 | 0
 view/tpl/generic_links_widget.tpl   | 0
 view/tpl/group_edit.tpl             | 0
 view/tpl/group_selection.tpl        | 0
 view/tpl/group_side.tpl             | 0
 view/tpl/groupeditor.tpl            | 0
 view/tpl/head.tpl                   | 0
 view/tpl/hq.tpl                     | 0
 view/tpl/hq_controls.tpl            | 0
 view/tpl/install.tpl                | 0
 view/tpl/install_checks.tpl         | 0
 view/tpl/install_db.tpl             | 0
 view/tpl/install_settings.tpl       | 0
 view/tpl/invite.tpl                 | 0
 view/tpl/item_import.tpl            | 0
 view/tpl/jot-header.tpl             | 0
 view/tpl/jot.tpl                    | 8 ++++++++
 view/tpl/jot_geotag.tpl             | 0
 view/tpl/js_strings.tpl             | 0
 view/tpl/lang_selector.tpl          | 0
 view/tpl/like_noshare.tpl           | 0
 view/tpl/login.tpl                  | 0
 view/tpl/logout.tpl                 | 0
 view/tpl/lostpass.tpl               | 0
 view/tpl/mail_conv.tpl              | 0
 view/tpl/mail_display.tpl           | 0
 view/tpl/mail_head.tpl              | 0
 view/tpl/mail_list.tpl              | 0
 view/tpl/main_slider.tpl            | 0
 view/tpl/message_side.tpl           | 0
 view/tpl/micropro_img.tpl           | 0
 view/tpl/micropro_txt.tpl           | 0
 view/tpl/mood_content.tpl           | 0
 view/tpl/msg-header.tpl             | 0
 view/tpl/myapps.tpl                 | 0
 view/tpl/navbar_default.tpl         | 0
 view/tpl/navbar_tucson.tpl          | 0
 view/tpl/new_channel.tpl            | 0
 view/tpl/notes.tpl                  | 1 -
 view/tpl/notifications.tpl          | 0
 view/tpl/notifications_widget.tpl   | 4 ++--
 view/tpl/notify.tpl                 | 0
 view/tpl/oauth.tpl                  | 0
 view/tpl/oauth2.tpl                 | 0
 view/tpl/oauth2_edit.tpl            | 0
 view/tpl/oauth_authorize.tpl        | 0
 view/tpl/oauth_authorize_done.tpl   | 0
 view/tpl/oauth_edit.tpl             | 0
 view/tpl/oembed_video.tpl           | 0
 view/tpl/oexchange_xrd.tpl          | 0
 view/tpl/page_display.tpl           | 0
 view/tpl/peoplefind.tpl             | 0
 view/tpl/photo_album.tpl            | 5 +++--
 view/tpl/photo_album_portfolio.tpl  | 0
 view/tpl/photo_albums.tpl           | 0
 view/tpl/photo_drop.tpl             | 0
 view/tpl/photo_item.tpl             | 0
 view/tpl/photo_portfolio.tpl        | 0
 view/tpl/photo_top.tpl              | 0
 view/tpl/photo_view.tpl             | 0
 view/tpl/photos_recent.tpl          | 5 +++--
 view/tpl/photos_upload.tpl          | 0
 view/tpl/photosajax.tpl             | 0
 view/tpl/poco_entry_xml.tpl         | 0
 view/tpl/poco_xml.tpl               | 0
 view/tpl/poke_content.tpl           | 0
 view/tpl/posted_date_widget.tpl     | 0
 view/tpl/profed_head.tpl            | 0
 view/tpl/profile_advanced.tpl       | 0
 view/tpl/profile_edit.tpl           | 0
 view/tpl/profile_entry.tpl          | 0
 view/tpl/profile_listing_header.tpl | 0
 view/tpl/profile_photo.tpl          | 0
 view/tpl/profile_vcard.tpl          | 0
 view/tpl/profile_vcard_short.tpl    | 0
 view/tpl/prv_message.tpl            | 0
 view/tpl/pwdreset.tpl               | 0
 view/tpl/register.tpl               | 0
 view/tpl/remote_friends_common.tpl  | 0
 view/tpl/removeme.tpl               | 0
 view/tpl/rmagic.tpl                 | 0
 view/tpl/search_item.tpl            | 2 +-
 view/tpl/settings.tpl               | 0
 view/tpl/settings_account.tpl       | 0
 view/tpl/settings_addons.tpl        | 0
 view/tpl/settings_display.tpl       | 0
 view/tpl/settings_features.tpl      | 0
 view/tpl/settings_module.tpl        | 0
 view/tpl/settings_nick_set.tpl      | 0
 view/tpl/siteinfo.tpl               | 0
 view/tpl/suggest_friends.tpl        | 0
 view/tpl/suggest_page.tpl           | 0
 view/tpl/threaded_conversation.tpl  | 4 ++++
 view/tpl/viewcontact_template.tpl   | 3 ++-
 view/tpl/xchan_vcard.tpl            | 0
 view/tpl/xrd_host.tpl               | 0
 view/tpl/xrd_person.tpl             | 0
 169 files changed, 33 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 view/tpl/404.tpl
 mode change 100755 => 100644 view/tpl/abook_edit.tpl
 mode change 100755 => 100644 view/tpl/acl_selector.tpl
 mode change 100755 => 100644 view/tpl/admin_accounts.tpl
 mode change 100755 => 100644 view/tpl/admin_aside.tpl
 mode change 100755 => 100644 view/tpl/admin_channels.tpl
 mode change 100755 => 100644 view/tpl/admin_logs.tpl
 mode change 100755 => 100644 view/tpl/admin_plugins.tpl
 mode change 100755 => 100644 view/tpl/admin_plugins_details.tpl
 mode change 100755 => 100644 view/tpl/admin_security.tpl
 mode change 100755 => 100644 view/tpl/admin_site.tpl
 mode change 100755 => 100644 view/tpl/admin_summary.tpl
 mode change 100755 => 100644 view/tpl/album_edit.tpl
 mode change 100755 => 100644 view/tpl/atom_feed.tpl
 mode change 100755 => 100644 view/tpl/build_query.tpl
 mode change 100755 => 100644 view/tpl/cal_calendar.tpl
 mode change 100755 => 100644 view/tpl/cal_event.tpl
 mode change 100755 => 100644 view/tpl/categories_widget.tpl
 mode change 100755 => 100644 view/tpl/channel.tpl
 mode change 100755 => 100644 view/tpl/channel_import.tpl
 mode change 100755 => 100644 view/tpl/channel_rename.tpl
 mode change 100755 => 100644 view/tpl/channels.tpl
 mode change 100755 => 100644 view/tpl/chanview.tpl
 mode change 100755 => 100644 view/tpl/comment_item.tpl
 mode change 100755 => 100644 view/tpl/common_friends.tpl
 mode change 100755 => 100644 view/tpl/common_pills.tpl
 mode change 100755 => 100644 view/tpl/common_tabs.tpl
 mode change 100755 => 100644 view/tpl/connection_template.tpl
 mode change 100755 => 100644 view/tpl/connections.tpl
 mode change 100755 => 100644 view/tpl/contact_block.tpl
 mode change 100755 => 100644 view/tpl/contact_slider.tpl
 mode change 100755 => 100644 view/tpl/contact_template.tpl
 mode change 100755 => 100644 view/tpl/conv.tpl
 mode change 100755 => 100644 view/tpl/conv_frame.tpl
 mode change 100755 => 100644 view/tpl/conv_item.tpl
 mode change 100755 => 100644 view/tpl/conv_list.tpl
 mode change 100755 => 100644 view/tpl/conversation.tpl
 mode change 100755 => 100644 view/tpl/convobj.tpl
 mode change 100755 => 100644 view/tpl/cover_photo.tpl
 mode change 100755 => 100644 view/tpl/cover_photo_widget.tpl
 mode change 100755 => 100644 view/tpl/cropbody.tpl
 mode change 100755 => 100644 view/tpl/cropcover.tpl
 mode change 100755 => 100644 view/tpl/crophead.tpl
 mode change 100755 => 100644 view/tpl/defperms.tpl
 mode change 100755 => 100644 view/tpl/directory_header.tpl
 mode change 100755 => 100644 view/tpl/direntry.tpl
 mode change 100755 => 100644 view/tpl/edpost_head.tpl
 mode change 100755 => 100644 view/tpl/email_notify_html.tpl
 mode change 100755 => 100644 view/tpl/email_notify_text.tpl
 mode change 100755 => 100644 view/tpl/event.tpl
 mode change 100755 => 100644 view/tpl/event_form.tpl
 mode change 100755 => 100644 view/tpl/event_head.tpl
 mode change 100755 => 100644 view/tpl/event_item_header.tpl
 mode change 100755 => 100644 view/tpl/events-js.tpl
 mode change 100755 => 100644 view/tpl/events_cal-js.tpl
 mode change 100755 => 100644 view/tpl/events_tools_side.tpl
 mode change 100755 => 100644 view/tpl/failed_updates.tpl
 mode change 100755 => 100644 view/tpl/field.tpl
 mode change 100755 => 100644 view/tpl/field_acheckbox.tpl
 mode change 100755 => 100644 view/tpl/field_combobox.tpl
 mode change 100755 => 100644 view/tpl/field_custom.tpl
 mode change 100755 => 100644 view/tpl/field_intcheckbox.tpl
 mode change 100755 => 100644 view/tpl/field_password.tpl
 mode change 100755 => 100644 view/tpl/field_radio.tpl
 mode change 100755 => 100644 view/tpl/field_richtext.tpl
 mode change 100755 => 100644 view/tpl/field_select_raw.tpl
 mode change 100755 => 100644 view/tpl/field_textarea.tpl
 mode change 100755 => 100644 view/tpl/field_themeselect.tpl
 mode change 100755 => 100644 view/tpl/field_yesno.tpl
 mode change 100755 => 100644 view/tpl/fileas_widget.tpl
 mode change 100755 => 100644 view/tpl/filebrowser.tpl
 mode change 100755 => 100644 view/tpl/filer_dialog.tpl
 mode change 100755 => 100644 view/tpl/follow.tpl
 mode change 100755 => 100644 view/tpl/generic_links_widget.tpl
 mode change 100755 => 100644 view/tpl/group_edit.tpl
 mode change 100755 => 100644 view/tpl/group_selection.tpl
 mode change 100755 => 100644 view/tpl/group_side.tpl
 mode change 100755 => 100644 view/tpl/groupeditor.tpl
 mode change 100755 => 100644 view/tpl/head.tpl
 mode change 100755 => 100644 view/tpl/hq.tpl
 mode change 100755 => 100644 view/tpl/hq_controls.tpl
 mode change 100755 => 100644 view/tpl/install.tpl
 mode change 100755 => 100644 view/tpl/install_checks.tpl
 mode change 100755 => 100644 view/tpl/install_db.tpl
 mode change 100755 => 100644 view/tpl/install_settings.tpl
 mode change 100755 => 100644 view/tpl/invite.tpl
 mode change 100755 => 100644 view/tpl/item_import.tpl
 mode change 100755 => 100644 view/tpl/jot-header.tpl
 mode change 100755 => 100644 view/tpl/jot.tpl
 mode change 100755 => 100644 view/tpl/jot_geotag.tpl
 mode change 100755 => 100644 view/tpl/js_strings.tpl
 mode change 100755 => 100644 view/tpl/lang_selector.tpl
 mode change 100755 => 100644 view/tpl/like_noshare.tpl
 mode change 100755 => 100644 view/tpl/login.tpl
 mode change 100755 => 100644 view/tpl/logout.tpl
 mode change 100755 => 100644 view/tpl/lostpass.tpl
 mode change 100755 => 100644 view/tpl/mail_conv.tpl
 mode change 100755 => 100644 view/tpl/mail_display.tpl
 mode change 100755 => 100644 view/tpl/mail_head.tpl
 mode change 100755 => 100644 view/tpl/mail_list.tpl
 mode change 100755 => 100644 view/tpl/main_slider.tpl
 mode change 100755 => 100644 view/tpl/message_side.tpl
 mode change 100755 => 100644 view/tpl/micropro_img.tpl
 mode change 100755 => 100644 view/tpl/micropro_txt.tpl
 mode change 100755 => 100644 view/tpl/mood_content.tpl
 mode change 100755 => 100644 view/tpl/msg-header.tpl
 mode change 100755 => 100644 view/tpl/myapps.tpl
 mode change 100755 => 100644 view/tpl/navbar_default.tpl
 mode change 100755 => 100644 view/tpl/navbar_tucson.tpl
 mode change 100755 => 100644 view/tpl/new_channel.tpl
 mode change 100755 => 100644 view/tpl/notifications.tpl
 mode change 100755 => 100644 view/tpl/notify.tpl
 mode change 100755 => 100644 view/tpl/oauth.tpl
 mode change 100755 => 100644 view/tpl/oauth2.tpl
 mode change 100755 => 100644 view/tpl/oauth2_edit.tpl
 mode change 100755 => 100644 view/tpl/oauth_authorize.tpl
 mode change 100755 => 100644 view/tpl/oauth_authorize_done.tpl
 mode change 100755 => 100644 view/tpl/oauth_edit.tpl
 mode change 100755 => 100644 view/tpl/oembed_video.tpl
 mode change 100755 => 100644 view/tpl/oexchange_xrd.tpl
 mode change 100755 => 100644 view/tpl/page_display.tpl
 mode change 100755 => 100644 view/tpl/peoplefind.tpl
 mode change 100755 => 100644 view/tpl/photo_album.tpl
 mode change 100755 => 100644 view/tpl/photo_album_portfolio.tpl
 mode change 100755 => 100644 view/tpl/photo_albums.tpl
 mode change 100755 => 100644 view/tpl/photo_drop.tpl
 mode change 100755 => 100644 view/tpl/photo_item.tpl
 mode change 100755 => 100644 view/tpl/photo_portfolio.tpl
 mode change 100755 => 100644 view/tpl/photo_top.tpl
 mode change 100755 => 100644 view/tpl/photo_view.tpl
 mode change 100755 => 100644 view/tpl/photos_recent.tpl
 mode change 100755 => 100644 view/tpl/photos_upload.tpl
 mode change 100755 => 100644 view/tpl/photosajax.tpl
 mode change 100755 => 100644 view/tpl/poco_entry_xml.tpl
 mode change 100755 => 100644 view/tpl/poco_xml.tpl
 mode change 100755 => 100644 view/tpl/poke_content.tpl
 mode change 100755 => 100644 view/tpl/posted_date_widget.tpl
 mode change 100755 => 100644 view/tpl/profed_head.tpl
 mode change 100755 => 100644 view/tpl/profile_advanced.tpl
 mode change 100755 => 100644 view/tpl/profile_edit.tpl
 mode change 100755 => 100644 view/tpl/profile_entry.tpl
 mode change 100755 => 100644 view/tpl/profile_listing_header.tpl
 mode change 100755 => 100644 view/tpl/profile_photo.tpl
 mode change 100755 => 100644 view/tpl/profile_vcard.tpl
 mode change 100755 => 100644 view/tpl/profile_vcard_short.tpl
 mode change 100755 => 100644 view/tpl/prv_message.tpl
 mode change 100755 => 100644 view/tpl/pwdreset.tpl
 mode change 100755 => 100644 view/tpl/register.tpl
 mode change 100755 => 100644 view/tpl/remote_friends_common.tpl
 mode change 100755 => 100644 view/tpl/removeme.tpl
 mode change 100755 => 100644 view/tpl/rmagic.tpl
 mode change 100755 => 100644 view/tpl/search_item.tpl
 mode change 100755 => 100644 view/tpl/settings.tpl
 mode change 100755 => 100644 view/tpl/settings_account.tpl
 mode change 100755 => 100644 view/tpl/settings_addons.tpl
 mode change 100755 => 100644 view/tpl/settings_display.tpl
 mode change 100755 => 100644 view/tpl/settings_features.tpl
 mode change 100755 => 100644 view/tpl/settings_module.tpl
 mode change 100755 => 100644 view/tpl/settings_nick_set.tpl
 mode change 100755 => 100644 view/tpl/siteinfo.tpl
 mode change 100755 => 100644 view/tpl/suggest_friends.tpl
 mode change 100755 => 100644 view/tpl/suggest_page.tpl
 mode change 100755 => 100644 view/tpl/threaded_conversation.tpl
 mode change 100755 => 100644 view/tpl/viewcontact_template.tpl
 mode change 100755 => 100644 view/tpl/xchan_vcard.tpl
 mode change 100755 => 100644 view/tpl/xrd_host.tpl
 mode change 100755 => 100644 view/tpl/xrd_person.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/404.tpl b/view/tpl/404.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
old mode 100755
new mode 100644
index 83e756367..af70a9595
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -1,4 +1,4 @@
-<script> 
+<script>
 
 	var bParam_cmd = "{{$baseurl}}/update/{{$pgtype}}";
 
@@ -6,6 +6,10 @@
 	var conv_mode = '{{$conv_mode}}';
 	{{/if}}
 
+	{{if $page_mode}}
+	var page_mode = '{{$page_mode}}';
+	{{/if}}
+
 	var bParam_uid = {{$uid}};
 	var bParam_gid = {{$gid}};
 	var bParam_cid = {{$cid}};
diff --git a/view/tpl/cal_calendar.tpl b/view/tpl/cal_calendar.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/cal_event.tpl b/view/tpl/cal_event.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/channel_rename.tpl b/view/tpl/channel_rename.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/common_friends.tpl b/view/tpl/common_friends.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/common_pills.tpl b/view/tpl/common_pills.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/conv.tpl b/view/tpl/conv.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
old mode 100755
new mode 100644
index 78601c40d..361392796
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -48,7 +48,7 @@
 					</div>
 					{{if $item.lock}}
 					<div class="wall-item-lock dropdown">
-						<i class="fa fa-lock lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
+						<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
 						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
 					</div>
 					{{/if}}
@@ -141,7 +141,7 @@
 									</a>
 									<a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;">
 										 <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}
-									</a> 
+									</a>
 									<a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;">
 										<i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}
 									</a>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
old mode 100755
new mode 100644
index 113cf2324..ee5dc9742
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -43,7 +43,7 @@
 					</div>
 					{{if $item.lock}}
 					<div class="wall-item-lock dropdown">
-						<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
+						<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
 						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
 					</div>
 					{{/if}}
diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/convobj.tpl b/view/tpl/convobj.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/cropcover.tpl b/view/tpl/cropcover.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/crophead.tpl b/view/tpl/crophead.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
old mode 100755
new mode 100644
index 3ee9ee326..568e03cd0
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -16,7 +16,8 @@
 	{{foreach $entries as $entry}}
 		{{include file="direntry.tpl"}}
 	{{/foreach}}
-	<div id="page-end"></div>
+	{{** make sure this element is at the bottom - we rely on that in endless scroll **}}
+	<div id="page-end" class="float-left w-100"></div>
 </div>
 <script>$(document).ready(function() { loadingPage = false;});</script>
 <div id="page-spinner" class="spinner-wrapper">
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field.tpl b/view/tpl/field.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/filebrowser.tpl b/view/tpl/filebrowser.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/hq.tpl b/view/tpl/hq.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/hq_controls.tpl b/view/tpl/hq_controls.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/item_import.tpl b/view/tpl/item_import.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
old mode 100755
new mode 100644
index 36543ccfa..1454f038b
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -36,11 +36,19 @@
 		<div id="jot-title-wrap" class="jothidden">
 			<input class="w-100 border-0" name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex="1" value="{{$title}}">
 		</div>
+		<div id="jot-summary-wrap" class="jothidden">
+			<input class="w-100 border-0" name="summary" id="jot-summary" type="text" placeholder="{{$placeholdersummary}}" tabindex="2" value="{{$summary}}">
+		</div>
 		{{if $catsenabled}}
 		<div id="jot-category-wrap" class="jothidden">
 			<input class="w-100 border-0" name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
 		</div>
 		{{/if}}
+		{{if $customjotheaders}}
+		<div id="jot-customjotheaders-wrap" class="jothidden">
+			{{$customjotheaders}}
+		</div>
+		{{/if}}
 		<div id="jot-text-wrap">
 			<div id="profile-jot-tools" class="btn-group d-none">
 				{{if $is_owner}}
diff --git a/view/tpl/jot_geotag.tpl b/view/tpl/jot_geotag.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/logout.tpl b/view/tpl/logout.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/lostpass.tpl b/view/tpl/lostpass.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/micropro_txt.tpl b/view/tpl/micropro_txt.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index 67da5ff37..4bee02aa0 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -16,7 +16,6 @@
 		$(document).ready(function(e){
 			noteText.on('change keyup keydown paste cut', function () {
 				noteText.height(0).height(noteText[0].scrollHeight);
-				$(document.body).trigger("sticky_kit:recalc");
 			}).change();
 		});
 
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 1a24ca7c4..1092bc155 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -137,7 +137,7 @@
 	}
 </script>
 
-<div id="notifications_wrapper">
+<div id="notifications_wrapper" class="mb-4">
 	<div id="no_notifications" class="d-xl-none">
 		{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
 	</div>
@@ -154,7 +154,7 @@
 			<span class="float-right badge badge-secondary">{10}</span>
 			<img class="menu-img-1" data-src="{1}" loading="lazy">
 			<span class="">{2}</span>
-			<i class="fa fa-{11} text-muted"></i> 
+			<i class="fa fa-{11} text-muted"></i>
 		</a>
 	</div>
 	<div id="notifications" class="border border-bottom-0 rounded navbar-nav collapse">
diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/oauth.tpl b/view/tpl/oauth.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/oauth2.tpl b/view/tpl/oauth2.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/oauth2_edit.tpl b/view/tpl/oauth2_edit.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/oauth_authorize_done.tpl b/view/tpl/oauth_authorize_done.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/oauth_edit.tpl b/view/tpl/oauth_edit.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
old mode 100755
new mode 100644
index eb16bcc98..ad4e2a38c
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -18,12 +18,13 @@
 	</div>
 	{{$upload_form}}
 	{{$album_edit.1}}
-	<div class="section-content-wrapper-np">
+	<div class="section-content-wrapper-np clearfix">
 		<div id="photo-album-contents-{{$album_id}}" style="display: none">
 			{{foreach $photos as $photo}}
 				{{include file="photo_top.tpl"}}
 			{{/foreach}}
-			<span id="page-end"></span>
+			{{** make sure this element is at the bottom - we rely on that for endless scroll **}}
+			<span id="page-end" class="d-block float-left w-100" style="position: absolute; bottom: 0px"></span>
 		</div>
 	</div>
 </div>
diff --git a/view/tpl/photo_album_portfolio.tpl b/view/tpl/photo_album_portfolio.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/photo_portfolio.tpl b/view/tpl/photo_portfolio.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
old mode 100755
new mode 100644
index 1e2f22e33..63c8b3515
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -9,12 +9,13 @@
 		<div class="clear"></div>
 	</div>
 	{{$upload_form}}
-	<div class="section-content-wrapper-np">
+	<div class="section-content-wrapper-np clearfix">
 		<div id="photo-album-contents-{{$album_id}}" style="display: none">
 			{{foreach $photos as $photo}}
 				{{include file="photo_top.tpl"}}
 			{{/foreach}}
-			<span id="page-end"></span>
+			{{** make sure this element is at the bottom - we rely on that in endless scroll **}}
+			<span id="page-end" class="d-block float-left w-100" style="position: absolute; bottom: 0px"></span>
 		</div>
 	</div>
 </div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/poco_entry_xml.tpl b/view/tpl/poco_entry_xml.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/poco_xml.tpl b/view/tpl/poco_xml.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/profed_head.tpl b/view/tpl/profed_head.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
old mode 100755
new mode 100644
index 3e986ea21..f94aaf37d
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -36,7 +36,7 @@
 				</div>
 				{{if $item.lock}}
 				<div class="wall-item-lock dropdown">
-					<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+					<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
 				</div>
 				{{/if}}
 				<div class="wall-item-author">
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/settings_module.tpl b/view/tpl/settings_module.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/suggest_page.tpl b/view/tpl/suggest_page.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
old mode 100755
new mode 100644
index 5bc7d8386..6e773088e
--- a/view/tpl/threaded_conversation.tpl
+++ b/view/tpl/threaded_conversation.tpl
@@ -1,9 +1,13 @@
+{{if !$preview }}
 <div id="threads-begin"></div>
+{{/if}}
 {{if $photo_item}}
 {{$photo_item}}
 {{/if}}
 {{foreach $threads as $thread_item}}
 {{include file="{{$thread_item.template}}" item=$thread_item}}
 {{/foreach}}
+{{if !$preview }}
 <div id="threads-end"></div>
 <div id="conversation-end"></div>
+{{/if}}
diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl
old mode 100755
new mode 100644
index 005fe17ce..cbbf3a97c
--- a/view/tpl/viewcontact_template.tpl
+++ b/view/tpl/viewcontact_template.tpl
@@ -6,7 +6,8 @@
 		{{foreach $contacts as $contact}}
 		{{include file="contact_template.tpl"}}
 		{{/foreach}}
-		<div id="page-end"></div>
+		{{** make sure this element is at the bottom - we rely on that in endless scroll **}}
+		<div id="page-end" class="float-left w-100"></div>
 	</div>
 </div>
 <script>$(document).ready(function() { loadingPage = false;});</script>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl
old mode 100755
new mode 100644
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
old mode 100755
new mode 100644
-- 
cgit v1.2.3