aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'view/tpl')
-rw-r--r--[-rwxr-xr-x]view/tpl/404.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/abook_edit.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/acl_selector.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/admin_accounts.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/admin_aside.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/admin_channels.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/admin_logs.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/admin_plugins.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/admin_plugins_details.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/admin_security.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/admin_site.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/admin_summary.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/album_edit.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/atom_feed.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/build_query.tpl6
-rw-r--r--[-rwxr-xr-x]view/tpl/cal_calendar.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/cal_event.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/categories_widget.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/channel.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/channel_import.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/channel_rename.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/channels.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/chanview.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/comment_item.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/common_friends.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/common_pills.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/common_tabs.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/connection_template.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/connections.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/contact_block.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/contact_slider.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/contact_template.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/conv.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/conv_frame.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/conv_item.tpl4
-rw-r--r--[-rwxr-xr-x]view/tpl/conv_list.tpl2
-rw-r--r--[-rwxr-xr-x]view/tpl/conversation.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/convobj.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/cover_photo.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/cover_photo_widget.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/cropbody.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/cropcover.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/crophead.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/defperms.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/directory_header.tpl3
-rw-r--r--[-rwxr-xr-x]view/tpl/direntry.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/edpost_head.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/email_notify_html.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/email_notify_text.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/event.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/event_form.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/event_head.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/event_item_header.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/events-js.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/events_cal-js.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/events_tools_side.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/failed_updates.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field_acheckbox.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field_combobox.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field_custom.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field_intcheckbox.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field_password.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field_radio.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field_richtext.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field_select_raw.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field_textarea.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field_themeselect.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/field_yesno.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/fileas_widget.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/filebrowser.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/filer_dialog.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/follow.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/generic_links_widget.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/group_edit.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/group_selection.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/group_side.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/groupeditor.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/head.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/hq.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/hq_controls.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/install.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/install_checks.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/install_db.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/install_settings.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/invite.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/item_import.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/jot-header.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/jot.tpl8
-rw-r--r--[-rwxr-xr-x]view/tpl/jot_geotag.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/js_strings.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/lang_selector.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/like_noshare.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/login.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/logout.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/lostpass.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/mail_conv.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/mail_display.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/mail_head.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/mail_list.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/main_slider.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/message_side.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/micropro_img.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/micropro_txt.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/mood_content.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/msg-header.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/myapps.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/navbar_default.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/navbar_tucson.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/new_channel.tpl0
-rw-r--r--view/tpl/notes.tpl1
-rw-r--r--[-rwxr-xr-x]view/tpl/notifications.tpl0
-rw-r--r--view/tpl/notifications_widget.tpl4
-rw-r--r--[-rwxr-xr-x]view/tpl/notify.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/oauth.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/oauth2.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/oauth2_edit.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/oauth_authorize.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/oauth_authorize_done.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/oauth_edit.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/oembed_video.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/oexchange_xrd.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/page_display.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/peoplefind.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/photo_album.tpl5
-rw-r--r--[-rwxr-xr-x]view/tpl/photo_album_portfolio.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/photo_albums.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/photo_drop.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/photo_item.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/photo_portfolio.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/photo_top.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/photo_view.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/photos_recent.tpl5
-rw-r--r--[-rwxr-xr-x]view/tpl/photos_upload.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/photosajax.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/poco_entry_xml.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/poco_xml.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/poke_content.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/posted_date_widget.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/profed_head.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/profile_advanced.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/profile_edit.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/profile_entry.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/profile_listing_header.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/profile_photo.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/profile_vcard.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/profile_vcard_short.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/prv_message.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/pwdreset.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/register.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/remote_friends_common.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/removeme.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/rmagic.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/search_item.tpl2
-rw-r--r--[-rwxr-xr-x]view/tpl/settings.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/settings_account.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/settings_addons.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/settings_display.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/settings_features.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/settings_module.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/settings_nick_set.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/siteinfo.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/suggest_friends.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/suggest_page.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/threaded_conversation.tpl4
-rw-r--r--[-rwxr-xr-x]view/tpl/viewcontact_template.tpl3
-rw-r--r--[-rwxr-xr-x]view/tpl/xchan_vcard.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/xrd_host.tpl0
-rw-r--r--[-rwxr-xr-x]view/tpl/xrd_person.tpl0
169 files changed, 33 insertions, 14 deletions
diff --git a/view/tpl/404.tpl b/view/tpl/404.tpl
index c9b51a63b..c9b51a63b 100755..100644
--- a/view/tpl/404.tpl
+++ b/view/tpl/404.tpl
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 6ff7bffcd..6ff7bffcd 100755..100644
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index c58a345e5..c58a345e5 100755..100644
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl
index 8d6506184..8d6506184 100755..100644
--- a/view/tpl/admin_accounts.tpl
+++ b/view/tpl/admin_accounts.tpl
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
index 99f139e57..99f139e57 100755..100644
--- a/view/tpl/admin_aside.tpl
+++ b/view/tpl/admin_aside.tpl
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index f8584c84a..f8584c84a 100755..100644
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
index 5643bb42f..5643bb42f 100755..100644
--- a/view/tpl/admin_logs.tpl
+++ b/view/tpl/admin_logs.tpl
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
index d8e1a6711..d8e1a6711 100755..100644
--- a/view/tpl/admin_plugins.tpl
+++ b/view/tpl/admin_plugins.tpl
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
index 309fc9569..309fc9569 100755..100644
--- a/view/tpl/admin_plugins_details.tpl
+++ b/view/tpl/admin_plugins_details.tpl
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
index 3cc23f5b2..3cc23f5b2 100755..100644
--- a/view/tpl/admin_security.tpl
+++ b/view/tpl/admin_security.tpl
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 6af867e8c..6af867e8c 100755..100644
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
index 8125703d7..8125703d7 100755..100644
--- a/view/tpl/admin_summary.tpl
+++ b/view/tpl/admin_summary.tpl
diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
index f5495f149..f5495f149 100755..100644
--- a/view/tpl/album_edit.tpl
+++ b/view/tpl/album_edit.tpl
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
index 8dc145ae9..8dc145ae9 100755..100644
--- a/view/tpl/atom_feed.tpl
+++ b/view/tpl/atom_feed.tpl
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index 83e756367..af70a9595 100755..100644
--- 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
index 93ebaa235..93ebaa235 100755..100644
--- a/view/tpl/cal_calendar.tpl
+++ b/view/tpl/cal_calendar.tpl
diff --git a/view/tpl/cal_event.tpl b/view/tpl/cal_event.tpl
index d7662786b..d7662786b 100755..100644
--- a/view/tpl/cal_event.tpl
+++ b/view/tpl/cal_event.tpl
diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl
index fd27dca44..fd27dca44 100755..100644
--- a/view/tpl/categories_widget.tpl
+++ b/view/tpl/categories_widget.tpl
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index 63e09ec05..63e09ec05 100755..100644
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
index c7cbb1742..c7cbb1742 100755..100644
--- a/view/tpl/channel_import.tpl
+++ b/view/tpl/channel_import.tpl
diff --git a/view/tpl/channel_rename.tpl b/view/tpl/channel_rename.tpl
index 9948dc647..9948dc647 100755..100644
--- a/view/tpl/channel_rename.tpl
+++ b/view/tpl/channel_rename.tpl
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index 695b3b30f..695b3b30f 100755..100644
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl
index 39fafaf8e..39fafaf8e 100755..100644
--- a/view/tpl/chanview.tpl
+++ b/view/tpl/chanview.tpl
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 0b2ef1a1c..0b2ef1a1c 100755..100644
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
diff --git a/view/tpl/common_friends.tpl b/view/tpl/common_friends.tpl
index b99075210..b99075210 100755..100644
--- a/view/tpl/common_friends.tpl
+++ b/view/tpl/common_friends.tpl
diff --git a/view/tpl/common_pills.tpl b/view/tpl/common_pills.tpl
index e2b018d26..e2b018d26 100755..100644
--- a/view/tpl/common_pills.tpl
+++ b/view/tpl/common_pills.tpl
diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl
index 29c46369b..29c46369b 100755..100644
--- a/view/tpl/common_tabs.tpl
+++ b/view/tpl/common_tabs.tpl
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 86a230c7f..86a230c7f 100755..100644
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index fedcff1e3..fedcff1e3 100755..100644
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
index 580a8a41c..580a8a41c 100755..100644
--- a/view/tpl/contact_block.tpl
+++ b/view/tpl/contact_block.tpl
diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
index 0848df673..0848df673 100755..100644
--- a/view/tpl/contact_slider.tpl
+++ b/view/tpl/contact_slider.tpl
diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl
index 7c8c02ea2..7c8c02ea2 100755..100644
--- a/view/tpl/contact_template.tpl
+++ b/view/tpl/contact_template.tpl
diff --git a/view/tpl/conv.tpl b/view/tpl/conv.tpl
index ddb959b84..ddb959b84 100755..100644
--- a/view/tpl/conv.tpl
+++ b/view/tpl/conv.tpl
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
index be74dea39..be74dea39 100755..100644
--- a/view/tpl/conv_frame.tpl
+++ b/view/tpl/conv_frame.tpl
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 78601c40d..361392796 100755..100644
--- 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
index 113cf2324..ee5dc9742 100755..100644
--- 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
index 82c7be922..82c7be922 100755..100644
--- a/view/tpl/conversation.tpl
+++ b/view/tpl/conversation.tpl
diff --git a/view/tpl/convobj.tpl b/view/tpl/convobj.tpl
index d5cee1170..d5cee1170 100755..100644
--- a/view/tpl/convobj.tpl
+++ b/view/tpl/convobj.tpl
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index a1c4a922d..a1c4a922d 100755..100644
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 7739d24b8..7739d24b8 100755..100644
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
index a8b8207cb..a8b8207cb 100755..100644
--- a/view/tpl/cropbody.tpl
+++ b/view/tpl/cropbody.tpl
diff --git a/view/tpl/cropcover.tpl b/view/tpl/cropcover.tpl
index ba91a2cce..ba91a2cce 100755..100644
--- a/view/tpl/cropcover.tpl
+++ b/view/tpl/cropcover.tpl
diff --git a/view/tpl/crophead.tpl b/view/tpl/crophead.tpl
index db1915d22..db1915d22 100755..100644
--- a/view/tpl/crophead.tpl
+++ b/view/tpl/crophead.tpl
diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl
index 29f642cff..29f642cff 100755..100644
--- a/view/tpl/defperms.tpl
+++ b/view/tpl/defperms.tpl
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 3ee9ee326..568e03cd0 100755..100644
--- 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
index 015f1102d..015f1102d 100755..100644
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
index 4f39137ab..4f39137ab 100755..100644
--- a/view/tpl/edpost_head.tpl
+++ b/view/tpl/edpost_head.tpl
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index f4e12d793..f4e12d793 100755..100644
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
index 5f1984edb..5f1984edb 100755..100644
--- a/view/tpl/email_notify_text.tpl
+++ b/view/tpl/email_notify_text.tpl
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
index cc0bfc1c7..cc0bfc1c7 100755..100644
--- a/view/tpl/event.tpl
+++ b/view/tpl/event.tpl
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index d07a06b67..d07a06b67 100755..100644
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 9d56b7fe4..9d56b7fe4 100755..100644
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl
index e81db48a1..e81db48a1 100755..100644
--- a/view/tpl/event_item_header.tpl
+++ b/view/tpl/event_item_header.tpl
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index d3f3414ff..d3f3414ff 100755..100644
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
index 2c4d961f9..2c4d961f9 100755..100644
--- a/view/tpl/events_cal-js.tpl
+++ b/view/tpl/events_cal-js.tpl
diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl
index e22f95c1e..e22f95c1e 100755..100644
--- a/view/tpl/events_tools_side.tpl
+++ b/view/tpl/events_tools_side.tpl
diff --git a/view/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl
index 598171b87..598171b87 100755..100644
--- a/view/tpl/failed_updates.tpl
+++ b/view/tpl/failed_updates.tpl
diff --git a/view/tpl/field.tpl b/view/tpl/field.tpl
index 942cfcef5..942cfcef5 100755..100644
--- a/view/tpl/field.tpl
+++ b/view/tpl/field.tpl
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index 4c8b62f36..4c8b62f36 100755..100644
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl
index 12d00a08d..12d00a08d 100755..100644
--- a/view/tpl/field_combobox.tpl
+++ b/view/tpl/field_combobox.tpl
diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl
index 907b4c50e..907b4c50e 100755..100644
--- a/view/tpl/field_custom.tpl
+++ b/view/tpl/field_custom.tpl
diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl
index abfe6e189..abfe6e189 100755..100644
--- a/view/tpl/field_intcheckbox.tpl
+++ b/view/tpl/field_intcheckbox.tpl
diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl
index fa5e14582..fa5e14582 100755..100644
--- a/view/tpl/field_password.tpl
+++ b/view/tpl/field_password.tpl
diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl
index 6b5f52de6..6b5f52de6 100755..100644
--- a/view/tpl/field_radio.tpl
+++ b/view/tpl/field_radio.tpl
diff --git a/view/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl
index 378e02a62..378e02a62 100755..100644
--- a/view/tpl/field_richtext.tpl
+++ b/view/tpl/field_richtext.tpl
diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl
index 2780df58c..2780df58c 100755..100644
--- a/view/tpl/field_select_raw.tpl
+++ b/view/tpl/field_select_raw.tpl
diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl
index 437dece93..437dece93 100755..100644
--- a/view/tpl/field_textarea.tpl
+++ b/view/tpl/field_textarea.tpl
diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl
index 7a529774c..7a529774c 100755..100644
--- a/view/tpl/field_themeselect.tpl
+++ b/view/tpl/field_themeselect.tpl
diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl
index 8a4cda55b..8a4cda55b 100755..100644
--- a/view/tpl/field_yesno.tpl
+++ b/view/tpl/field_yesno.tpl
diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl
index a6a69b89c..a6a69b89c 100755..100644
--- a/view/tpl/fileas_widget.tpl
+++ b/view/tpl/fileas_widget.tpl
diff --git a/view/tpl/filebrowser.tpl b/view/tpl/filebrowser.tpl
index 787f7c0cd..787f7c0cd 100755..100644
--- a/view/tpl/filebrowser.tpl
+++ b/view/tpl/filebrowser.tpl
diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl
index 61860d10f..61860d10f 100755..100644
--- a/view/tpl/filer_dialog.tpl
+++ b/view/tpl/filer_dialog.tpl
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index da472fa9b..da472fa9b 100755..100644
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl
index 67801e666..67801e666 100755..100644
--- a/view/tpl/generic_links_widget.tpl
+++ b/view/tpl/generic_links_widget.tpl
diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl
index 60038701e..60038701e 100755..100644
--- a/view/tpl/group_edit.tpl
+++ b/view/tpl/group_edit.tpl
diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl
index 270d2aa79..270d2aa79 100755..100644
--- a/view/tpl/group_selection.tpl
+++ b/view/tpl/group_selection.tpl
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index 14f714ae9..14f714ae9 100755..100644
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl
index 94c275c7e..94c275c7e 100755..100644
--- a/view/tpl/groupeditor.tpl
+++ b/view/tpl/groupeditor.tpl
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index ecb30afd3..ecb30afd3 100755..100644
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
diff --git a/view/tpl/hq.tpl b/view/tpl/hq.tpl
index 099d892bb..099d892bb 100755..100644
--- a/view/tpl/hq.tpl
+++ b/view/tpl/hq.tpl
diff --git a/view/tpl/hq_controls.tpl b/view/tpl/hq_controls.tpl
index d7f6d436f..d7f6d436f 100755..100644
--- a/view/tpl/hq_controls.tpl
+++ b/view/tpl/hq_controls.tpl
diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl
index 5ab722b12..5ab722b12 100755..100644
--- a/view/tpl/install.tpl
+++ b/view/tpl/install.tpl
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
index 8bbb9f26d..8bbb9f26d 100755..100644
--- a/view/tpl/install_checks.tpl
+++ b/view/tpl/install_checks.tpl
diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl
index 8b9023443..8b9023443 100755..100644
--- a/view/tpl/install_db.tpl
+++ b/view/tpl/install_db.tpl
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
index b62f8508b..b62f8508b 100755..100644
--- a/view/tpl/install_settings.tpl
+++ b/view/tpl/install_settings.tpl
diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl
index 2712cfee4..2712cfee4 100755..100644
--- a/view/tpl/invite.tpl
+++ b/view/tpl/invite.tpl
diff --git a/view/tpl/item_import.tpl b/view/tpl/item_import.tpl
index e976417e1..e976417e1 100755..100644
--- a/view/tpl/item_import.tpl
+++ b/view/tpl/item_import.tpl
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 2539c1fdf..2539c1fdf 100755..100644
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 36543ccfa..1454f038b 100755..100644
--- 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
index 60f128850..60f128850 100755..100644
--- a/view/tpl/jot_geotag.tpl
+++ b/view/tpl/jot_geotag.tpl
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 291d78fb2..291d78fb2 100755..100644
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl
index 1324442f3..1324442f3 100755..100644
--- a/view/tpl/lang_selector.tpl
+++ b/view/tpl/lang_selector.tpl
diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl
index e83b885fe..e83b885fe 100755..100644
--- a/view/tpl/like_noshare.tpl
+++ b/view/tpl/like_noshare.tpl
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index 492149abb..492149abb 100755..100644
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
diff --git a/view/tpl/logout.tpl b/view/tpl/logout.tpl
index 7548ed196..7548ed196 100755..100644
--- a/view/tpl/logout.tpl
+++ b/view/tpl/logout.tpl
diff --git a/view/tpl/lostpass.tpl b/view/tpl/lostpass.tpl
index 8ecfd215b..8ecfd215b 100755..100644
--- a/view/tpl/lostpass.tpl
+++ b/view/tpl/lostpass.tpl
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index b0497fe99..b0497fe99 100755..100644
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
index e8549a49b..e8549a49b 100755..100644
--- a/view/tpl/mail_display.tpl
+++ b/view/tpl/mail_display.tpl
diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl
index aac592a5f..aac592a5f 100755..100644
--- a/view/tpl/mail_head.tpl
+++ b/view/tpl/mail_head.tpl
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index a1784e1e6..a1784e1e6 100755..100644
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
index f5c573970..f5c573970 100755..100644
--- a/view/tpl/main_slider.tpl
+++ b/view/tpl/main_slider.tpl
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
index 2ac61bf76..2ac61bf76 100755..100644
--- a/view/tpl/message_side.tpl
+++ b/view/tpl/message_side.tpl
diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
index 5bfca615f..5bfca615f 100755..100644
--- a/view/tpl/micropro_img.tpl
+++ b/view/tpl/micropro_img.tpl
diff --git a/view/tpl/micropro_txt.tpl b/view/tpl/micropro_txt.tpl
index 295e7940d..295e7940d 100755..100644
--- a/view/tpl/micropro_txt.tpl
+++ b/view/tpl/micropro_txt.tpl
diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl
index 315ee4c8a..315ee4c8a 100755..100644
--- a/view/tpl/mood_content.tpl
+++ b/view/tpl/mood_content.tpl
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index e8542b087..e8542b087 100755..100644
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl
index 2cc747436..2cc747436 100755..100644
--- a/view/tpl/myapps.tpl
+++ b/view/tpl/myapps.tpl
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 0c8be512d..0c8be512d 100755..100644
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl
index 362b261c5..362b261c5 100755..100644
--- a/view/tpl/navbar_tucson.tpl
+++ b/view/tpl/navbar_tucson.tpl
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 8d72df55b..8d72df55b 100755..100644
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
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
index 53ff8de52..53ff8de52 100755..100644
--- a/view/tpl/notifications.tpl
+++ b/view/tpl/notifications.tpl
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
index b5bccc8a4..b5bccc8a4 100755..100644
--- a/view/tpl/notify.tpl
+++ b/view/tpl/notify.tpl
diff --git a/view/tpl/oauth.tpl b/view/tpl/oauth.tpl
index 881e22e99..881e22e99 100755..100644
--- a/view/tpl/oauth.tpl
+++ b/view/tpl/oauth.tpl
diff --git a/view/tpl/oauth2.tpl b/view/tpl/oauth2.tpl
index a5b48ffce..a5b48ffce 100755..100644
--- a/view/tpl/oauth2.tpl
+++ b/view/tpl/oauth2.tpl
diff --git a/view/tpl/oauth2_edit.tpl b/view/tpl/oauth2_edit.tpl
index 399c64977..399c64977 100755..100644
--- a/view/tpl/oauth2_edit.tpl
+++ b/view/tpl/oauth2_edit.tpl
diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
index 72701ce52..72701ce52 100755..100644
--- a/view/tpl/oauth_authorize.tpl
+++ b/view/tpl/oauth_authorize.tpl
diff --git a/view/tpl/oauth_authorize_done.tpl b/view/tpl/oauth_authorize_done.tpl
index 2e91e0125..2e91e0125 100755..100644
--- a/view/tpl/oauth_authorize_done.tpl
+++ b/view/tpl/oauth_authorize_done.tpl
diff --git a/view/tpl/oauth_edit.tpl b/view/tpl/oauth_edit.tpl
index e44b44723..e44b44723 100755..100644
--- a/view/tpl/oauth_edit.tpl
+++ b/view/tpl/oauth_edit.tpl
diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl
index b0cfed2e5..b0cfed2e5 100755..100644
--- a/view/tpl/oembed_video.tpl
+++ b/view/tpl/oembed_video.tpl
diff --git a/view/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl
index e865e07d9..e865e07d9 100755..100644
--- a/view/tpl/oexchange_xrd.tpl
+++ b/view/tpl/oexchange_xrd.tpl
diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
index a320920c7..a320920c7 100755..100644
--- a/view/tpl/page_display.tpl
+++ b/view/tpl/page_display.tpl
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index bbcc0b85b..bbcc0b85b 100755..100644
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index eb16bcc98..ad4e2a38c 100755..100644
--- 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
index 1635e0ae1..1635e0ae1 100755..100644
--- a/view/tpl/photo_album_portfolio.tpl
+++ b/view/tpl/photo_album_portfolio.tpl
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index 83bdd95e7..83bdd95e7 100755..100644
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
index 664e5338c..664e5338c 100755..100644
--- a/view/tpl/photo_drop.tpl
+++ b/view/tpl/photo_drop.tpl
diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
index b6ee4508b..b6ee4508b 100755..100644
--- a/view/tpl/photo_item.tpl
+++ b/view/tpl/photo_item.tpl
diff --git a/view/tpl/photo_portfolio.tpl b/view/tpl/photo_portfolio.tpl
index cbc8ea214..cbc8ea214 100755..100644
--- a/view/tpl/photo_portfolio.tpl
+++ b/view/tpl/photo_portfolio.tpl
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
index 16862a8d6..16862a8d6 100755..100644
--- a/view/tpl/photo_top.tpl
+++ b/view/tpl/photo_top.tpl
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 6d566cab9..6d566cab9 100755..100644
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 1e2f22e33..63c8b3515 100755..100644
--- 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
index ea173049b..ea173049b 100755..100644
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl
index 45191db85..45191db85 100755..100644
--- a/view/tpl/photosajax.tpl
+++ b/view/tpl/photosajax.tpl
diff --git a/view/tpl/poco_entry_xml.tpl b/view/tpl/poco_entry_xml.tpl
index 30b6268dc..30b6268dc 100755..100644
--- a/view/tpl/poco_entry_xml.tpl
+++ b/view/tpl/poco_entry_xml.tpl
diff --git a/view/tpl/poco_xml.tpl b/view/tpl/poco_xml.tpl
index 0e38a692c..0e38a692c 100755..100644
--- a/view/tpl/poco_xml.tpl
+++ b/view/tpl/poco_xml.tpl
diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl
index f368cb024..f368cb024 100755..100644
--- a/view/tpl/poke_content.tpl
+++ b/view/tpl/poke_content.tpl
diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
index fb43c744b..fb43c744b 100755..100644
--- a/view/tpl/posted_date_widget.tpl
+++ b/view/tpl/posted_date_widget.tpl
diff --git a/view/tpl/profed_head.tpl b/view/tpl/profed_head.tpl
index ce774052a..ce774052a 100755..100644
--- a/view/tpl/profed_head.tpl
+++ b/view/tpl/profed_head.tpl
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index e6653c130..e6653c130 100755..100644
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 8add9bb9d..8add9bb9d 100755..100644
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl
index 9ae870738..9ae870738 100755..100644
--- a/view/tpl/profile_entry.tpl
+++ b/view/tpl/profile_entry.tpl
diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
index 42abf2735..42abf2735 100755..100644
--- a/view/tpl/profile_listing_header.tpl
+++ b/view/tpl/profile_listing_header.tpl
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 61d8f4254..61d8f4254 100755..100644
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 262bf257f..262bf257f 100755..100644
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl
index 5d87d52c6..5d87d52c6 100755..100644
--- a/view/tpl/profile_vcard_short.tpl
+++ b/view/tpl/profile_vcard_short.tpl
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index b8c81539d..b8c81539d 100755..100644
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
diff --git a/view/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl
index dc17ed57a..dc17ed57a 100755..100644
--- a/view/tpl/pwdreset.tpl
+++ b/view/tpl/pwdreset.tpl
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index 9a81198c7..9a81198c7 100755..100644
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
diff --git a/view/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
index 6ef3a7dde..6ef3a7dde 100755..100644
--- a/view/tpl/remote_friends_common.tpl
+++ b/view/tpl/remote_friends_common.tpl
diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl
index 814701fff..814701fff 100755..100644
--- a/view/tpl/removeme.tpl
+++ b/view/tpl/removeme.tpl
diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
index 9d84e4a36..9d84e4a36 100755..100644
--- a/view/tpl/rmagic.tpl
+++ b/view/tpl/rmagic.tpl
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 3e986ea21..f94aaf37d 100755..100644
--- 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
index c0808272d..c0808272d 100755..100644
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
index 3eacf3f7a..3eacf3f7a 100755..100644
--- a/view/tpl/settings_account.tpl
+++ b/view/tpl/settings_account.tpl
diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
index 27cfa238a..27cfa238a 100755..100644
--- a/view/tpl/settings_addons.tpl
+++ b/view/tpl/settings_addons.tpl
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index c2dd94175..c2dd94175 100755..100644
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
index 12c4f44f3..12c4f44f3 100755..100644
--- a/view/tpl/settings_features.tpl
+++ b/view/tpl/settings_features.tpl
diff --git a/view/tpl/settings_module.tpl b/view/tpl/settings_module.tpl
index 03d16d1d7..03d16d1d7 100755..100644
--- a/view/tpl/settings_module.tpl
+++ b/view/tpl/settings_module.tpl
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
index 4dbe58d82..4dbe58d82 100755..100644
--- a/view/tpl/settings_nick_set.tpl
+++ b/view/tpl/settings_nick_set.tpl
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
index 4d9c53656..4d9c53656 100755..100644
--- a/view/tpl/siteinfo.tpl
+++ b/view/tpl/siteinfo.tpl
diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
index 95f24cd63..95f24cd63 100755..100644
--- a/view/tpl/suggest_friends.tpl
+++ b/view/tpl/suggest_friends.tpl
diff --git a/view/tpl/suggest_page.tpl b/view/tpl/suggest_page.tpl
index 97837c852..97837c852 100755..100644
--- a/view/tpl/suggest_page.tpl
+++ b/view/tpl/suggest_page.tpl
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
index 5bc7d8386..6e773088e 100755..100644
--- 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
index 005fe17ce..cbbf3a97c 100755..100644
--- 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
index 447839167..447839167 100755..100644
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl
index 2a40dcf47..2a40dcf47 100755..100644
--- a/view/tpl/xrd_host.tpl
+++ b/view/tpl/xrd_host.tpl
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
index 52adb54e3..52adb54e3 100755..100644
--- a/view/tpl/xrd_person.tpl
+++ b/view/tpl/xrd_person.tpl