From a0d19ffb7241a1c7a4b85e6d0fd58fbb2f718468 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Sun, 6 Jan 2013 14:42:51 -0700 Subject: [PATCH] implement Smarty3 --- boot.php | 129 +++++-- include/ItemObject.php | 27 +- include/conversation.php | 3 +- include/features.php | 2 +- include/friendica_smarty.php | 43 +++ include/plugin.php | 80 +++-- include/text.php | 33 +- index.php | 22 +- mod/admin.php | 2 +- mod/channel.php | 26 +- mod/display.php | 3 +- mod/fbrowser.php | 22 +- mod/hcard.php | 3 + mod/hostxrd.php | 13 +- mod/message.php | 49 ++- mod/photos.php | 105 +++++- mod/profile.php | 31 +- mod/profile_photo.php | 12 +- mod/profiles.php | 278 ++++++++------- mod/profperm.php | 9 + mod/viewcontacts.php | 10 + mod/xrd.php | 2 +- mods/friendica-to-smarty-tpl.py | 198 +++++++++++ view/theme/fancyred/php/config.php | 2 +- view/theme/fancyred/php/theme.php | 1 + view/theme/redbasic/php/config.php | 2 +- view/theme/redbasic/php/theme.php | 1 + .../redbasic/tpl/smarty3/lang_selector.tpl | 10 + .../tpl/smarty3/moderated_comment.tpl | 61 ++++ .../redbasic/tpl/smarty3/profile_vcard.tpl | 51 +++ .../redbasic/tpl/smarty3/prv_message.tpl | 39 +++ view/tpl/admin_users.tpl | 2 +- view/tpl/directory_item.tpl | 2 +- view/tpl/filebrowser.tpl | 2 +- view/tpl/install_checks.tpl | 2 +- view/tpl/notifications_network_item.tpl | 4 +- view/tpl/smarty3/404.tpl | 1 + view/tpl/smarty3/abook_edit.tpl | 45 +++ view/tpl/smarty3/acl_selector.tpl | 28 ++ view/tpl/smarty3/admin_aside.tpl | 42 +++ view/tpl/smarty3/admin_logs.tpl | 19 ++ view/tpl/smarty3/admin_plugins.tpl | 15 + view/tpl/smarty3/admin_plugins_details.tpl | 36 ++ view/tpl/smarty3/admin_remoteupdate.tpl | 98 ++++++ view/tpl/smarty3/admin_site.tpl | 82 +++++ view/tpl/smarty3/admin_summary.tpl | 40 +++ view/tpl/smarty3/admin_users.tpl | 89 +++++ view/tpl/smarty3/album_edit.tpl | 15 + view/tpl/smarty3/api_config_xml.tpl | 66 ++++ view/tpl/smarty3/api_friends_xml.tpl | 5 + view/tpl/smarty3/api_ratelimit_xml.tpl | 6 + view/tpl/smarty3/api_status_xml.tpl | 46 +++ view/tpl/smarty3/api_test_xml.tpl | 1 + view/tpl/smarty3/api_timeline_atom.tpl | 90 +++++ view/tpl/smarty3/api_timeline_rss.tpl | 26 ++ view/tpl/smarty3/api_timeline_xml.tpl | 20 ++ view/tpl/smarty3/api_user_xml.tpl | 46 +++ view/tpl/smarty3/apps.tpl | 7 + view/tpl/smarty3/atom_feed.tpl | 29 ++ view/tpl/smarty3/atom_feed_dfrn.tpl | 29 ++ view/tpl/smarty3/atom_mail.tpl | 17 + view/tpl/smarty3/atom_suggest.tpl | 11 + view/tpl/smarty3/auto_request.tpl | 37 ++ view/tpl/smarty3/birthdays_reminder.tpl | 10 + view/tpl/smarty3/categories_widget.tpl | 12 + view/tpl/smarty3/channel.tpl | 12 + view/tpl/smarty3/channels.tpl | 22 ++ view/tpl/smarty3/comment_item.tpl | 68 ++++ view/tpl/smarty3/common_friends.tpl | 12 + view/tpl/smarty3/common_tabs.tpl | 5 + view/tpl/smarty3/contact_block.tpl | 12 + view/tpl/smarty3/contact_edit.tpl | 89 +++++ view/tpl/smarty3/contact_head.tpl | 30 ++ view/tpl/smarty3/contact_slider.tpl | 4 + view/tpl/smarty3/contact_template.tpl | 17 + view/tpl/smarty3/contacts-template.tpl | 26 ++ view/tpl/smarty3/content.tpl | 2 + view/tpl/smarty3/conv.tpl | 17 + view/tpl/smarty3/conv_frame.tpl | 11 + view/tpl/smarty3/conv_item.tpl | 121 +++++++ view/tpl/smarty3/conversation.tpl | 28 ++ view/tpl/smarty3/crepair.tpl | 46 +++ view/tpl/smarty3/cropbody.tpl | 58 ++++ view/tpl/smarty3/crophead.tpl | 4 + view/tpl/smarty3/delegate.tpl | 57 ++++ view/tpl/smarty3/dfrn_req_confirm.tpl | 21 ++ view/tpl/smarty3/dfrn_request.tpl | 59 ++++ view/tpl/smarty3/diasp_dec_hdr.tpl | 8 + view/tpl/smarty3/diaspora_comment.tpl | 11 + view/tpl/smarty3/diaspora_comment_relay.tpl | 12 + view/tpl/smarty3/diaspora_conversation.tpl | 29 ++ view/tpl/smarty3/diaspora_like.tpl | 12 + view/tpl/smarty3/diaspora_like_relay.tpl | 13 + view/tpl/smarty3/diaspora_message.tpl | 13 + view/tpl/smarty3/diaspora_photo.tpl | 13 + view/tpl/smarty3/diaspora_post.tpl | 11 + view/tpl/smarty3/diaspora_profile.tpl | 16 + .../tpl/smarty3/diaspora_relay_retraction.tpl | 10 + .../smarty3/diaspora_relayable_retraction.tpl | 11 + view/tpl/smarty3/diaspora_retract.tpl | 9 + view/tpl/smarty3/diaspora_share.tpl | 8 + view/tpl/smarty3/diaspora_signed_retract.tpl | 10 + view/tpl/smarty3/diaspora_vcard.tpl | 57 ++++ view/tpl/smarty3/directory_header.tpl | 16 + view/tpl/smarty3/directory_item.tpl | 11 + view/tpl/smarty3/display-head.tpl | 8 + view/tpl/smarty3/email_notify_html.tpl | 27 ++ view/tpl/smarty3/email_notify_text.tpl | 13 + view/tpl/smarty3/event.tpl | 10 + view/tpl/smarty3/event_form.tpl | 49 +++ view/tpl/smarty3/event_head.tpl | 139 ++++++++ view/tpl/smarty3/events-js.tpl | 6 + view/tpl/smarty3/events.tpl | 24 ++ view/tpl/smarty3/events_reminder.tpl | 10 + view/tpl/smarty3/failed_updates.tpl | 17 + view/tpl/smarty3/fake_feed.tpl | 13 + view/tpl/smarty3/field.tpl | 4 + view/tpl/smarty3/field_acheckbox.tpl | 7 + view/tpl/smarty3/field_checkbox.tpl | 6 + view/tpl/smarty3/field_combobox.tpl | 18 + view/tpl/smarty3/field_custom.tpl | 6 + view/tpl/smarty3/field_input.tpl | 7 + view/tpl/smarty3/field_intcheckbox.tpl | 6 + view/tpl/smarty3/field_openid.tpl | 6 + view/tpl/smarty3/field_password.tpl | 6 + view/tpl/smarty3/field_radio.tpl | 6 + view/tpl/smarty3/field_richtext.tpl | 6 + view/tpl/smarty3/field_select.tpl | 8 + view/tpl/smarty3/field_select_raw.tpl | 8 + view/tpl/smarty3/field_textarea.tpl | 6 + view/tpl/smarty3/field_themeselect.tpl | 9 + view/tpl/smarty3/field_yesno.tpl | 13 + view/tpl/smarty3/fileas_widget.tpl | 12 + view/tpl/smarty3/filebrowser.tpl | 84 +++++ view/tpl/smarty3/filer_dialog.tpl | 4 + view/tpl/smarty3/follow.tpl | 8 + view/tpl/smarty3/follow_slap.tpl | 25 ++ view/tpl/smarty3/generic_links_widget.tpl | 11 + view/tpl/smarty3/group_drop.tpl | 9 + view/tpl/smarty3/group_edit.tpl | 23 ++ view/tpl/smarty3/group_selection.tpl | 8 + view/tpl/smarty3/group_side.tpl | 33 ++ view/tpl/smarty3/groupeditor.tpl | 16 + view/tpl/smarty3/head.tpl | 30 ++ view/tpl/smarty3/hide_comments.tpl | 4 + view/tpl/smarty3/install.tpl | 10 + view/tpl/smarty3/install_checks.tpl | 24 ++ view/tpl/smarty3/install_db.tpl | 30 ++ view/tpl/smarty3/install_settings.tpl | 27 ++ view/tpl/smarty3/intros.tpl | 28 ++ view/tpl/smarty3/invite.tpl | 27 ++ view/tpl/smarty3/jot-header.tpl | 318 ++++++++++++++++++ view/tpl/smarty3/jot.tpl | 86 +++++ view/tpl/smarty3/jot_geotag.tpl | 8 + view/tpl/smarty3/js_strings.tpl | 34 ++ view/tpl/smarty3/lang_selector.tpl | 10 + view/tpl/smarty3/like_noshare.tpl | 5 + view/tpl/smarty3/login.tpl | 29 ++ view/tpl/smarty3/logout.tpl | 6 + view/tpl/smarty3/lostpass.tpl | 18 + view/tpl/smarty3/magicsig.tpl | 9 + view/tpl/smarty3/mail_conv.tpl | 14 + view/tpl/smarty3/mail_display.tpl | 10 + view/tpl/smarty3/mail_head.tpl | 3 + view/tpl/smarty3/mail_list.tpl | 16 + view/tpl/smarty3/main_slider.tpl | 23 ++ view/tpl/smarty3/match.tpl | 16 + view/tpl/smarty3/message_side.tpl | 10 + view/tpl/smarty3/moderated_comment.tpl | 34 ++ view/tpl/smarty3/mood_content.tpl | 20 ++ view/tpl/smarty3/msg-header.tpl | 97 ++++++ view/tpl/smarty3/nav.tpl | 109 ++++++ view/tpl/smarty3/netfriend.tpl | 14 + view/tpl/smarty3/nets.tpl | 10 + view/tpl/smarty3/new_channel.tpl | 29 ++ view/tpl/smarty3/nogroup-template.tpl | 12 + view/tpl/smarty3/notifications.tpl | 8 + .../smarty3/notifications_comments_item.tpl | 3 + .../smarty3/notifications_dislikes_item.tpl | 3 + .../smarty3/notifications_friends_item.tpl | 3 + view/tpl/smarty3/notifications_likes_item.tpl | 3 + .../smarty3/notifications_network_item.tpl | 3 + view/tpl/smarty3/notifications_posts_item.tpl | 3 + view/tpl/smarty3/notify.tpl | 3 + view/tpl/smarty3/oauth_authorize.tpl | 10 + view/tpl/smarty3/oauth_authorize_done.tpl | 4 + view/tpl/smarty3/oembed_video.tpl | 4 + view/tpl/smarty3/oexchange_xrd.tpl | 33 ++ view/tpl/smarty3/opensearch.tpl | 13 + view/tpl/smarty3/pagetypes.tpl | 5 + view/tpl/smarty3/peoplefind.tpl | 14 + view/tpl/smarty3/photo_album.tpl | 7 + view/tpl/smarty3/photo_drop.tpl | 4 + view/tpl/smarty3/photo_edit.tpl | 50 +++ view/tpl/smarty3/photo_item.tpl | 22 ++ view/tpl/smarty3/photo_top.tpl | 8 + view/tpl/smarty3/photo_view.tpl | 37 ++ view/tpl/smarty3/photos_recent.tpl | 11 + view/tpl/smarty3/photos_upload.tpl | 46 +++ view/tpl/smarty3/poco_entry_xml.tpl | 7 + view/tpl/smarty3/poco_xml.tpl | 18 + view/tpl/smarty3/poke_content.tpl | 32 ++ view/tpl/smarty3/posted_date_widget.tpl | 9 + view/tpl/smarty3/profed_head.tpl | 36 ++ view/tpl/smarty3/profile-hide-friends.tpl | 16 + view/tpl/smarty3/profile-hide-wall.tpl | 16 + view/tpl/smarty3/profile-in-directory.tpl | 16 + view/tpl/smarty3/profile-in-netdir.tpl | 16 + view/tpl/smarty3/profile_advanced.tpl | 170 ++++++++++ view/tpl/smarty3/profile_edit.tpl | 317 +++++++++++++++++ view/tpl/smarty3/profile_edlink.tpl | 2 + view/tpl/smarty3/profile_entry.tpl | 11 + view/tpl/smarty3/profile_listing_header.tpl | 8 + view/tpl/smarty3/profile_photo.tpl | 26 ++ view/tpl/smarty3/profile_publish.tpl | 16 + view/tpl/smarty3/profile_vcard.tpl | 48 +++ view/tpl/smarty3/prv_message.tpl | 33 ++ view/tpl/smarty3/pwdreset.tpl | 17 + view/tpl/smarty3/register.tpl | 45 +++ view/tpl/smarty3/remote_friends_common.tpl | 21 ++ view/tpl/smarty3/removeme.tpl | 20 ++ view/tpl/smarty3/saved_searches_aside.tpl | 14 + view/tpl/smarty3/search_item.tpl | 62 ++++ view/tpl/smarty3/settings.tpl | 134 ++++++++ view/tpl/smarty3/settings_account.tpl | 28 ++ view/tpl/smarty3/settings_addons.tpl | 10 + view/tpl/smarty3/settings_connectors.tpl | 9 + view/tpl/smarty3/settings_display.tpl | 22 ++ view/tpl/smarty3/settings_features.tpl | 16 + view/tpl/smarty3/settings_nick_set.tpl | 5 + view/tpl/smarty3/settings_nick_subdir.tpl | 6 + view/tpl/smarty3/settings_oauth.tpl | 31 ++ view/tpl/smarty3/settings_oauth_edit.tpl | 17 + view/tpl/smarty3/suggest_friends.tpl | 16 + view/tpl/smarty3/suggestions.tpl | 21 ++ view/tpl/smarty3/tag_slap.tpl | 30 ++ view/tpl/smarty3/threaded_conversation.tpl | 13 + view/tpl/smarty3/viewcontact_template.tpl | 9 + view/tpl/smarty3/wall_item.tpl | 79 +++++ view/tpl/smarty3/wall_thread.tpl | 120 +++++++ view/tpl/smarty3/wallmessage.tpl | 32 ++ view/tpl/smarty3/wallmsg-header.tpl | 82 +++++ view/tpl/smarty3/wallwall_item.tpl | 86 +++++ view/tpl/smarty3/wallwall_thread.tpl | 107 ++++++ view/tpl/smarty3/xchan_vcard.tpl | 4 + view/tpl/smarty3/xrd_diaspora.tpl | 3 + view/tpl/smarty3/xrd_host.tpl | 18 + view/tpl/smarty3/xrd_person.tpl | 29 ++ view/tpl/threaded_conversation.tpl | 6 +- view/tpl/wall_thread.tpl | 4 +- 250 files changed, 6959 insertions(+), 282 deletions(-) create mode 100644 include/friendica_smarty.php create mode 100755 mods/friendica-to-smarty-tpl.py create mode 100644 view/theme/redbasic/tpl/smarty3/lang_selector.tpl create mode 100644 view/theme/redbasic/tpl/smarty3/moderated_comment.tpl create mode 100644 view/theme/redbasic/tpl/smarty3/profile_vcard.tpl create mode 100644 view/theme/redbasic/tpl/smarty3/prv_message.tpl create mode 100644 view/tpl/smarty3/404.tpl create mode 100644 view/tpl/smarty3/abook_edit.tpl create mode 100644 view/tpl/smarty3/acl_selector.tpl create mode 100644 view/tpl/smarty3/admin_aside.tpl create mode 100644 view/tpl/smarty3/admin_logs.tpl create mode 100644 view/tpl/smarty3/admin_plugins.tpl create mode 100644 view/tpl/smarty3/admin_plugins_details.tpl create mode 100644 view/tpl/smarty3/admin_remoteupdate.tpl create mode 100644 view/tpl/smarty3/admin_site.tpl create mode 100644 view/tpl/smarty3/admin_summary.tpl create mode 100644 view/tpl/smarty3/admin_users.tpl create mode 100644 view/tpl/smarty3/album_edit.tpl create mode 100644 view/tpl/smarty3/api_config_xml.tpl create mode 100644 view/tpl/smarty3/api_friends_xml.tpl create mode 100644 view/tpl/smarty3/api_ratelimit_xml.tpl create mode 100644 view/tpl/smarty3/api_status_xml.tpl create mode 100644 view/tpl/smarty3/api_test_xml.tpl create mode 100644 view/tpl/smarty3/api_timeline_atom.tpl create mode 100644 view/tpl/smarty3/api_timeline_rss.tpl create mode 100644 view/tpl/smarty3/api_timeline_xml.tpl create mode 100644 view/tpl/smarty3/api_user_xml.tpl create mode 100644 view/tpl/smarty3/apps.tpl create mode 100644 view/tpl/smarty3/atom_feed.tpl create mode 100644 view/tpl/smarty3/atom_feed_dfrn.tpl create mode 100644 view/tpl/smarty3/atom_mail.tpl create mode 100644 view/tpl/smarty3/atom_suggest.tpl create mode 100644 view/tpl/smarty3/auto_request.tpl create mode 100644 view/tpl/smarty3/birthdays_reminder.tpl create mode 100644 view/tpl/smarty3/categories_widget.tpl create mode 100644 view/tpl/smarty3/channel.tpl create mode 100644 view/tpl/smarty3/channels.tpl create mode 100644 view/tpl/smarty3/comment_item.tpl create mode 100644 view/tpl/smarty3/common_friends.tpl create mode 100644 view/tpl/smarty3/common_tabs.tpl create mode 100644 view/tpl/smarty3/contact_block.tpl create mode 100644 view/tpl/smarty3/contact_edit.tpl create mode 100644 view/tpl/smarty3/contact_head.tpl create mode 100644 view/tpl/smarty3/contact_slider.tpl create mode 100644 view/tpl/smarty3/contact_template.tpl create mode 100644 view/tpl/smarty3/contacts-template.tpl create mode 100644 view/tpl/smarty3/content.tpl create mode 100644 view/tpl/smarty3/conv.tpl create mode 100644 view/tpl/smarty3/conv_frame.tpl create mode 100644 view/tpl/smarty3/conv_item.tpl create mode 100644 view/tpl/smarty3/conversation.tpl create mode 100644 view/tpl/smarty3/crepair.tpl create mode 100644 view/tpl/smarty3/cropbody.tpl create mode 100644 view/tpl/smarty3/crophead.tpl create mode 100644 view/tpl/smarty3/delegate.tpl create mode 100644 view/tpl/smarty3/dfrn_req_confirm.tpl create mode 100644 view/tpl/smarty3/dfrn_request.tpl create mode 100644 view/tpl/smarty3/diasp_dec_hdr.tpl create mode 100644 view/tpl/smarty3/diaspora_comment.tpl create mode 100644 view/tpl/smarty3/diaspora_comment_relay.tpl create mode 100644 view/tpl/smarty3/diaspora_conversation.tpl create mode 100644 view/tpl/smarty3/diaspora_like.tpl create mode 100644 view/tpl/smarty3/diaspora_like_relay.tpl create mode 100644 view/tpl/smarty3/diaspora_message.tpl create mode 100644 view/tpl/smarty3/diaspora_photo.tpl create mode 100644 view/tpl/smarty3/diaspora_post.tpl create mode 100644 view/tpl/smarty3/diaspora_profile.tpl create mode 100644 view/tpl/smarty3/diaspora_relay_retraction.tpl create mode 100644 view/tpl/smarty3/diaspora_relayable_retraction.tpl create mode 100644 view/tpl/smarty3/diaspora_retract.tpl create mode 100644 view/tpl/smarty3/diaspora_share.tpl create mode 100644 view/tpl/smarty3/diaspora_signed_retract.tpl create mode 100644 view/tpl/smarty3/diaspora_vcard.tpl create mode 100644 view/tpl/smarty3/directory_header.tpl create mode 100644 view/tpl/smarty3/directory_item.tpl create mode 100644 view/tpl/smarty3/display-head.tpl create mode 100644 view/tpl/smarty3/email_notify_html.tpl create mode 100644 view/tpl/smarty3/email_notify_text.tpl create mode 100644 view/tpl/smarty3/event.tpl create mode 100644 view/tpl/smarty3/event_form.tpl create mode 100644 view/tpl/smarty3/event_head.tpl create mode 100644 view/tpl/smarty3/events-js.tpl create mode 100644 view/tpl/smarty3/events.tpl create mode 100644 view/tpl/smarty3/events_reminder.tpl create mode 100644 view/tpl/smarty3/failed_updates.tpl create mode 100644 view/tpl/smarty3/fake_feed.tpl create mode 100644 view/tpl/smarty3/field.tpl create mode 100644 view/tpl/smarty3/field_acheckbox.tpl create mode 100644 view/tpl/smarty3/field_checkbox.tpl create mode 100644 view/tpl/smarty3/field_combobox.tpl create mode 100644 view/tpl/smarty3/field_custom.tpl create mode 100644 view/tpl/smarty3/field_input.tpl create mode 100644 view/tpl/smarty3/field_intcheckbox.tpl create mode 100644 view/tpl/smarty3/field_openid.tpl create mode 100644 view/tpl/smarty3/field_password.tpl create mode 100644 view/tpl/smarty3/field_radio.tpl create mode 100644 view/tpl/smarty3/field_richtext.tpl create mode 100644 view/tpl/smarty3/field_select.tpl create mode 100644 view/tpl/smarty3/field_select_raw.tpl create mode 100644 view/tpl/smarty3/field_textarea.tpl create mode 100644 view/tpl/smarty3/field_themeselect.tpl create mode 100644 view/tpl/smarty3/field_yesno.tpl create mode 100644 view/tpl/smarty3/fileas_widget.tpl create mode 100644 view/tpl/smarty3/filebrowser.tpl create mode 100644 view/tpl/smarty3/filer_dialog.tpl create mode 100644 view/tpl/smarty3/follow.tpl create mode 100644 view/tpl/smarty3/follow_slap.tpl create mode 100644 view/tpl/smarty3/generic_links_widget.tpl create mode 100644 view/tpl/smarty3/group_drop.tpl create mode 100644 view/tpl/smarty3/group_edit.tpl create mode 100644 view/tpl/smarty3/group_selection.tpl create mode 100644 view/tpl/smarty3/group_side.tpl create mode 100644 view/tpl/smarty3/groupeditor.tpl create mode 100644 view/tpl/smarty3/head.tpl create mode 100644 view/tpl/smarty3/hide_comments.tpl create mode 100644 view/tpl/smarty3/install.tpl create mode 100644 view/tpl/smarty3/install_checks.tpl create mode 100644 view/tpl/smarty3/install_db.tpl create mode 100644 view/tpl/smarty3/install_settings.tpl create mode 100644 view/tpl/smarty3/intros.tpl create mode 100644 view/tpl/smarty3/invite.tpl create mode 100644 view/tpl/smarty3/jot-header.tpl create mode 100644 view/tpl/smarty3/jot.tpl create mode 100644 view/tpl/smarty3/jot_geotag.tpl create mode 100644 view/tpl/smarty3/js_strings.tpl create mode 100644 view/tpl/smarty3/lang_selector.tpl create mode 100644 view/tpl/smarty3/like_noshare.tpl create mode 100644 view/tpl/smarty3/login.tpl create mode 100644 view/tpl/smarty3/logout.tpl create mode 100644 view/tpl/smarty3/lostpass.tpl create mode 100644 view/tpl/smarty3/magicsig.tpl create mode 100644 view/tpl/smarty3/mail_conv.tpl create mode 100644 view/tpl/smarty3/mail_display.tpl create mode 100644 view/tpl/smarty3/mail_head.tpl create mode 100644 view/tpl/smarty3/mail_list.tpl create mode 100644 view/tpl/smarty3/main_slider.tpl create mode 100644 view/tpl/smarty3/match.tpl create mode 100644 view/tpl/smarty3/message_side.tpl create mode 100644 view/tpl/smarty3/moderated_comment.tpl create mode 100644 view/tpl/smarty3/mood_content.tpl create mode 100644 view/tpl/smarty3/msg-header.tpl create mode 100644 view/tpl/smarty3/nav.tpl create mode 100644 view/tpl/smarty3/netfriend.tpl create mode 100644 view/tpl/smarty3/nets.tpl create mode 100644 view/tpl/smarty3/new_channel.tpl create mode 100644 view/tpl/smarty3/nogroup-template.tpl create mode 100644 view/tpl/smarty3/notifications.tpl create mode 100644 view/tpl/smarty3/notifications_comments_item.tpl create mode 100644 view/tpl/smarty3/notifications_dislikes_item.tpl create mode 100644 view/tpl/smarty3/notifications_friends_item.tpl create mode 100644 view/tpl/smarty3/notifications_likes_item.tpl create mode 100644 view/tpl/smarty3/notifications_network_item.tpl create mode 100644 view/tpl/smarty3/notifications_posts_item.tpl create mode 100644 view/tpl/smarty3/notify.tpl create mode 100644 view/tpl/smarty3/oauth_authorize.tpl create mode 100644 view/tpl/smarty3/oauth_authorize_done.tpl create mode 100644 view/tpl/smarty3/oembed_video.tpl create mode 100644 view/tpl/smarty3/oexchange_xrd.tpl create mode 100644 view/tpl/smarty3/opensearch.tpl create mode 100644 view/tpl/smarty3/pagetypes.tpl create mode 100644 view/tpl/smarty3/peoplefind.tpl create mode 100644 view/tpl/smarty3/photo_album.tpl create mode 100644 view/tpl/smarty3/photo_drop.tpl create mode 100644 view/tpl/smarty3/photo_edit.tpl create mode 100644 view/tpl/smarty3/photo_item.tpl create mode 100644 view/tpl/smarty3/photo_top.tpl create mode 100644 view/tpl/smarty3/photo_view.tpl create mode 100644 view/tpl/smarty3/photos_recent.tpl create mode 100644 view/tpl/smarty3/photos_upload.tpl create mode 100644 view/tpl/smarty3/poco_entry_xml.tpl create mode 100644 view/tpl/smarty3/poco_xml.tpl create mode 100644 view/tpl/smarty3/poke_content.tpl create mode 100644 view/tpl/smarty3/posted_date_widget.tpl create mode 100644 view/tpl/smarty3/profed_head.tpl create mode 100644 view/tpl/smarty3/profile-hide-friends.tpl create mode 100644 view/tpl/smarty3/profile-hide-wall.tpl create mode 100644 view/tpl/smarty3/profile-in-directory.tpl create mode 100644 view/tpl/smarty3/profile-in-netdir.tpl create mode 100644 view/tpl/smarty3/profile_advanced.tpl create mode 100644 view/tpl/smarty3/profile_edit.tpl create mode 100644 view/tpl/smarty3/profile_edlink.tpl create mode 100644 view/tpl/smarty3/profile_entry.tpl create mode 100644 view/tpl/smarty3/profile_listing_header.tpl create mode 100644 view/tpl/smarty3/profile_photo.tpl create mode 100644 view/tpl/smarty3/profile_publish.tpl create mode 100644 view/tpl/smarty3/profile_vcard.tpl create mode 100644 view/tpl/smarty3/prv_message.tpl create mode 100644 view/tpl/smarty3/pwdreset.tpl create mode 100644 view/tpl/smarty3/register.tpl create mode 100644 view/tpl/smarty3/remote_friends_common.tpl create mode 100644 view/tpl/smarty3/removeme.tpl create mode 100644 view/tpl/smarty3/saved_searches_aside.tpl create mode 100644 view/tpl/smarty3/search_item.tpl create mode 100644 view/tpl/smarty3/settings.tpl create mode 100644 view/tpl/smarty3/settings_account.tpl create mode 100644 view/tpl/smarty3/settings_addons.tpl create mode 100644 view/tpl/smarty3/settings_connectors.tpl create mode 100644 view/tpl/smarty3/settings_display.tpl create mode 100644 view/tpl/smarty3/settings_features.tpl create mode 100644 view/tpl/smarty3/settings_nick_set.tpl create mode 100644 view/tpl/smarty3/settings_nick_subdir.tpl create mode 100644 view/tpl/smarty3/settings_oauth.tpl create mode 100644 view/tpl/smarty3/settings_oauth_edit.tpl create mode 100644 view/tpl/smarty3/suggest_friends.tpl create mode 100644 view/tpl/smarty3/suggestions.tpl create mode 100644 view/tpl/smarty3/tag_slap.tpl create mode 100644 view/tpl/smarty3/threaded_conversation.tpl create mode 100644 view/tpl/smarty3/viewcontact_template.tpl create mode 100644 view/tpl/smarty3/wall_item.tpl create mode 100644 view/tpl/smarty3/wall_thread.tpl create mode 100644 view/tpl/smarty3/wallmessage.tpl create mode 100644 view/tpl/smarty3/wallmsg-header.tpl create mode 100644 view/tpl/smarty3/wallwall_item.tpl create mode 100644 view/tpl/smarty3/wallwall_thread.tpl create mode 100644 view/tpl/smarty3/xchan_vcard.tpl create mode 100644 view/tpl/smarty3/xrd_diaspora.tpl create mode 100644 view/tpl/smarty3/xrd_host.tpl create mode 100644 view/tpl/smarty3/xrd_person.tpl diff --git a/boot.php b/boot.php index c122ba075..e3c493571 100644 --- a/boot.php +++ b/boot.php @@ -488,17 +488,36 @@ if(! class_exists('App')) { // Allow themes to control internal parameters // by changing App values in theme.php - // - // Possibly should make these part of the plugin - // system, but it seems like overkill to invoke - // all the plugin machinery just to change a couple - // of values + public $sourcename = ''; public $videowidth = 425; public $videoheight = 350; public $force_max_items = 0; public $theme_thread_allow = true; + // An array for all theme-controllable parameters + // Mostly unimplemented yet. Only options 'template_engine' and + // beyond are used. + + private $theme = array( + 'sourcename' => '', + 'videowidth' => 425, + 'videoheight' => 350, + 'force_max_items' => 0, + 'thread_allow' => true, + 'stylesheet' => '', + 'template_engine' => 'internal', + ); + + private $ldelim = array( + 'internal' => '', + 'smarty3' => '{{' + ); + private $rdelim = array( + 'internal' => '', + 'smarty3' => '}}' + ); + private $scheme; private $hostname; private $baseurl; @@ -753,9 +772,29 @@ if(! class_exists('App')) { } - function init_pagehead() { - $this->page['title'] = $this->config['sitename']; - $this->page['htmlhead'] = get_markup_template('head.tpl'); + function build_pagehead() { + + $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000); + if($interval < 10000) + $interval = 40000; + + $this->page['title'] = $this->config['system']['sitename']; + + + /* put the head template at the beginning of page['htmlhead'] + * since the code added by the modules frequently depends on it + * being first + */ + $tpl = get_markup_template('head.tpl'); + $this->page['htmlhead'] = replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), + '$local_user' => local_user(), + '$generator' => FRIENDICA_PLATFORM . ' ' . FRIENDICA_VERSION, + '$update_interval' => $interval, + '$head_css' => head_get_css(), + '$head_js' => head_get_js(), + '$js_strings' => js_strings() + )) . $this->page['htmlhead']; } function set_curl_code($code) { @@ -797,6 +836,32 @@ if(! class_exists('App')) { return $this->cached_profile_image[$avatar_image]; } + function get_template_engine() { + return $this->theme['template_engine']; + } + + function set_template_engine($engine = 'internal') { + + $this->theme['template_engine'] = 'internal'; + + switch($engine) { + case 'smarty3': + if(is_writable('view/tpl/smarty3/')) + $this->theme['template_engine'] = 'smarty3'; + break; + default: + break; + } + } + + function get_template_ldelim($engine = 'internal') { + return $this->ldelim[$engine]; + } + + function get_template_rdelim($engine = 'internal') { + return $this->rdelim[$engine]; + } + } } @@ -1264,20 +1329,26 @@ function profile_load(&$a, $nickname, $profile = 0) { $_SESSION['theme'] = $a->profile['channel_theme']; - /** - * load/reload current theme info - */ + /** + * load/reload current theme info + */ - $theme_info_file = "view/theme/".current_theme()."/php/theme.php"; - if (file_exists($theme_info_file)){ - require_once($theme_info_file); - } + $a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one - $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); - - $a->set_widget('profile',profile_sidebar($a->profile, $block)); - return; + $theme_info_file = "view/theme/".current_theme()."/php/theme.php"; + if (file_exists($theme_info_file)){ + require_once($theme_info_file); } + + return; +}} + +function profile_aside(&$a) { + + $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); + + $a->set_widget('profile',profile_sidebar($a->profile, $block)); + return; } @@ -1969,23 +2040,7 @@ function construct_page(&$a) { head_add_js('mod_' . $a->module . '.js'); - - $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000); - if($interval < 10000) - $interval = 40000; - - $a->page['title'] = $a->config['system']['sitename']; - - - $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array( - '$baseurl' => $a->get_baseurl(), - '$local_user' => local_user(), - '$generator' => FRIENDICA_PLATFORM . ' ' . FRIENDICA_VERSION, - '$update_interval' => $interval, - '$head_css' => head_get_css(), - '$head_js' => head_get_js(), - '$js_strings' => js_strings() - )); + $a->build_pagehead(); $arr = $a->get_widgets(); if(count($arr)) { @@ -2022,4 +2077,4 @@ function construct_page(&$a) { ); return; -} \ No newline at end of file +} diff --git a/include/ItemObject.php b/include/ItemObject.php index 45ea6860a..8ae13e0d8 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -204,13 +204,28 @@ class Item extends BaseObject { $body = prepare_body($item,true); + if($a->theme['template_engine'] === 'internal') { + $body_e = template_escape($body); + $name_e = template_escape($profile_name); + $title_e = template_escape($item['title']); + $location_e = template_escape($location); + $owner_name_e = template_escape($this->get_owner_name()); + } + else { + $body_e = $body; + $name_e = $profile_name; + $title_e = $item['title']; + $location_e = $location; + $owner_name_e = $this->get_owner_name(); + } + $tmp_item = array( 'template' => $this->get_template(), 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), 'tags' => $tags, - 'body' => $body, - 'text' => strip_tags(template_escape($body)), + 'body' => $body_e, + 'text' => strip_tags($body_e), 'id' => $this->get_id(), 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), 'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])), @@ -219,19 +234,19 @@ class Item extends BaseObject { 'vwall' => t('via Wall-To-Wall:'), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), - 'name' => template_escape($profile_name), + 'name' => $name_e, 'thumb' => $profile_avatar, 'osparkle' => $osparkle, 'sparkle' => $sparkle, - 'title' => template_escape($item['title']), + 'title' => $title_e, 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), 'lock' => $lock, - 'location' => template_escape($location), + 'location' => $location_e, 'indent' => $indent, 'owner_url' => $this->get_owner_url(), 'owner_photo' => $this->get_owner_photo(), - 'owner_name' => template_escape($this->get_owner_name()), + 'owner_name' => $owner_name_e, // Item toolbar buttons 'like' => $like, diff --git a/include/conversation.php b/include/conversation.php index 7ad231b58..ecd6d358e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -344,7 +344,6 @@ function visible_activity($item) { return true; } - /** * "Render" a conversation or list of items for HTML display. * There are two major forms of display: @@ -886,7 +885,7 @@ function status_editor($a,$x,$popup=false) { $o = ''; - $geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : ''); + $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); $plaintext = true; if(feature_enabled(local_user(),'richtext')) diff --git a/include/features.php b/include/features.php index 738de429f..e4781518b 100644 --- a/include/features.php +++ b/include/features.php @@ -58,4 +58,4 @@ function get_features() { call_hooks('get_features',$arr); return $arr; -} \ No newline at end of file +} diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php new file mode 100644 index 000000000..b3f0d18a0 --- /dev/null +++ b/include/friendica_smarty.php @@ -0,0 +1,43 @@ + "view/theme/$theme/smarty3/"); + if( x($a->theme_info,"extends") ) + $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/smarty3/"); + $template_dirs = $template_dirs + array('base' => 'view/smarty3/'); + $this->setTemplateDir($template_dirs); + + $this->setCompileDir('view/smarty3/compiled/'); + $this->setConfigDir('view/smarty3/config/'); + $this->setCacheDir('view/smarty3/cache/'); + + $this->left_delimiter = $a->get_template_ldelim('smarty3'); + $this->right_delimiter = $a->get_template_rdelim('smarty3'); + + // Don't report errors so verbosely + $this->error_reporting = E_ALL & ~E_NOTICE; + } + + function parsed($template = '') { + if($template) { + return $this->fetch('string:' . $template); + } + return $this->fetch('file:' . $this->filename); + } +} + + + diff --git a/include/plugin.php b/include/plugin.php index 6a35a6187..be238b78c 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -465,37 +465,40 @@ function format_js_if_exists($source) { } -function theme_include($file) { +function theme_include($file, $root = '') { - global $t; // use builtin template processor + $a = get_app(); - $paths = array( - 'view/theme/$theme/$ext/$file', - 'view/theme/$theme/$file', - 'view/theme/$parent/$ext/$file', - 'view/theme/$parent/$file', - 'view/$ext/$file', - 'view/$file' - ); + // Make sure $root ends with a slash / if it's not blank + if($root !== '' && $root[strlen($root)-1] !== '/') + $root = $root . '/'; - $theme_info = get_app()->theme_info; + $theme_info = $a->theme_info; if(array_key_exists('extends',$theme_info)) $parent = $theme_info['extends']; else $parent = 'NOPATH'; + $theme = current_theme(); + + $ext = substr($file,strrpos($file,'.')+1); + + $paths = array( + "{$root}view/theme/$theme/$ext/$file", + "{$root}view/theme/$theme/$file", + "{$root}view/theme/$parent/$ext/$file", + "{$root}view/theme/$parent/$file", + "{$root}view/$ext/$file", + "{$root}view/$file" + ); + foreach($paths as $p) { - $f = $t->replace($p,array( - '$theme' => current_theme(), - '$ext' => substr($file,strrpos($file,'.')+1), - '$parent' => $parent, - '$file' => $file - )); - if(strstr($f,'NOPATH')) + // strpos() is faster than strstr when checking if one string is in another (http://php.net/manual/en/function.strstr.php) + if(strpos($p,'NOPATH') !== false) continue; - if(file_exists($f)) - return $f; + if(file_exists($p)) + return $p; } return ''; } @@ -509,19 +512,38 @@ function get_intltext_template($s) { if(! isset($a->language)) $a->language = 'en'; - if(file_exists("view/{$a->language}/$s")) - return file_get_contents("view/{$a->language}/$s"); - elseif(file_exists("view/en/$s")) - return file_get_contents("view/en/$s"); + $engine = ''; + if($a->get_template_engine() === 'smarty3') + $engine = "/smarty3"; + + if(file_exists("view/{$a->language}$engine/$s")) + return file_get_contents("view/{$a->language}$engine/$s"); + elseif(file_exists("view/en$engine/$s")) + return file_get_contents("view/en$engine/$s"); else - return file_get_contents("view/$s"); + return file_get_contents("view/tpl/$engine/$s"); }} if(! function_exists('get_markup_template')) { -function get_markup_template($s) { +function get_markup_template($s, $root = '') { - $x = theme_include($s); - if($x) - return file_get_contents($x); + $a = get_app(); + + $template_eng = $a->get_template_engine(); + if($template_eng === 'internal') { + $template_file = theme_include($s, $root); + if($template_file) + return file_get_contents($template_file); + } + else { + $template_file = theme_include("$template_eng/$s", $root); + + if($template_file) { + $template = new FriendicaSmarty(); + $template->filename = $template_file; + + return $template; + } + } }} diff --git a/include/text.php b/include/text.php index 5438aae73..83d989947 100644 --- a/include/text.php +++ b/include/text.php @@ -13,15 +13,32 @@ require_once("include/template_processor.php"); if(! function_exists('replace_macros')) { function replace_macros($s,$r) { global $t; - - //$ts = microtime(); - $r = $t->replace($s,$r); - //$tt = microtime() - $ts; - - //$a = get_app(); - //$a->page['debug'] .= "$tt
\n"; - return template_unescape($r); +// $ts = microtime(); + $a = get_app(); + + if($a->get_template_engine() === 'smarty3') { + $template = ''; + if(gettype($s) === 'string') { + $template = $s; + $s = new FriendicaSmarty(); + } + foreach($r as $key=>$value) { + if($key[0] === '$') { + $key = substr($key, 1); + } + $s->assign($key, $value); + } + $output = $s->parsed($template); + } + else { + $r = $t->replace($s,$r); + + $output = template_unescape($r); + } +// $tt = microtime() - $ts; +// $a->page['debug'] .= "$tt
\n"; + return $output; }} diff --git a/index.php b/index.php index d5739f39e..cc6249256 100644 --- a/index.php +++ b/index.php @@ -96,13 +96,6 @@ if((x($_GET,'zid')) && (! $install)) { if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login')) require("auth.php"); -/* - * Create the page head after setting the language - * and getting any auth credentials - */ - -$a->init_pagehead(); - if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array(); @@ -280,18 +273,28 @@ if($a->module_loaded) { if(! $a->error) { + // If a theme has defined an _aside() function, run that first + // + // If the theme function doesn't exist, see if this theme extends another, + // and see if that other theme has an _aside() function--if it does, run it + // + // If $aside_default is not False after the theme _aside() function, run the + // module's _aside() function too + // + // This gives themes more control over how the left sidebar looks + $aside_default = true; call_hooks($a->module . '_mod_aside',$placeholder); if(function_exists(str_replace('-','_',current_theme()) . '_' . $a->module . '_aside')) { $func = str_replace('-','_',current_theme()) . '_' . $a->module . '_aside'; $aside_default = $func($a); } - elseif(x($a->theme_info,"extends") && $aside_default + elseif($aside_default && x($a->theme_info,"extends") && (function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_' . $a->module . '_aside'))) { $func = str_replace('-','_',$a->theme_info["extends"]) . '_' . $a->module . '_aside'; $aside_default = $func($a); } - elseif(function_exists($a->module . '_aside') && $aside_default) { + if($aside_default && function_exists($a->module . '_aside')) { $func = $a->module . '_aside'; $func($a); } @@ -329,7 +332,6 @@ if(stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) { call_hooks('page_end', $a->page['content']); - construct_page($a); session_write_close(); diff --git a/mod/admin.php b/mod/admin.php index d0c904b02..13ecf7eef 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -610,7 +610,7 @@ function admin_page_users(&$a){ t('Community/Celebrity Account'), t('Automatic Friend Account') ); - $e['page-flags'] = $accounts[$e['page-flags']]; + $e['page_flags'] = $accounts[$e['page-flags']]; $e['register_date'] = relative_date($e['register_date']); $e['login_date'] = relative_date($e['login_date']); $e['lastitem_date'] = relative_date($e['lastitem_date']); diff --git a/mod/channel.php b/mod/channel.php index 8729fee2d..096c76ae2 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -2,16 +2,6 @@ function channel_init(&$a) { - $a->page['htmlhead'] .= '' . "\r\n" ; - -} - - -function channel_aside(&$a) { - - require_once('include/contact_widgets.php'); - require_once('include/items.php'); - if(argc() > 1) $which = argv(1); else { @@ -28,10 +18,24 @@ function channel_aside(&$a) { $profile = argv(1); } - $cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat']) : ''); + $a->page['htmlhead'] .= '' . "\r\n" ; + // Run profile_load() here to make sure the theme is set before + // we start loading content profile_load($a,$which,$profile); +} + + +function channel_aside(&$a) { + + require_once('include/contact_widgets.php'); + require_once('include/items.php'); + + profile_aside($a); + + $cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat']) : ''); + $a->set_widget('archive',posted_date_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$a->profile['profile_uid'],true)); $a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$cat)); diff --git a/mod/display.php b/mod/display.php index c6af8fdd2..d109d9a9b 100644 --- a/mod/display.php +++ b/mod/display.php @@ -16,7 +16,7 @@ function display_content(&$a) { $o = '
' . "\r\n"; - $a->page['htmlhead'] .= get_markup_template('display-head.tpl'); + $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array()); if(argc() > 1) @@ -60,6 +60,7 @@ function display_content(&$a) { // $nick = (($a->argc > 1) ? $a->argv[1] : ''); // profile_load($a,$nick); +// profile_aside($a); // $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); diff --git a/mod/fbrowser.php b/mod/fbrowser.php index cdcde4b17..81f47e39d 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -55,9 +55,17 @@ function fbrowser_content($a){ global $a; $types = Photo::supportedTypes(); $ext = $types[$rr['type']]; + + if($a->theme['template_engine'] === 'internal') { + $filename_e = template_escape($rr['filename']); + } + else { + $filename_e = $rr['filename']; + } + return array( $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['hiq'] . '.' .$ext, - template_escape($rr['filename']), + $filename_e, $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['loq'] . '.'. $ext ); } @@ -70,6 +78,7 @@ function fbrowser_content($a){ '$path' => $path, '$folders' => $albums, '$files' =>$files, + '$cancel' => t('Cancel'), )); @@ -83,7 +92,15 @@ function fbrowser_content($a){ function files2($rr){ global $a; list($m1,$m2) = explode("/",$rr['filetype']); $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip"); - return array( $a->get_baseurl() . '/attach/' . $rr['id'], template_escape($rr['filename']), $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); + + if($a->theme['template_engine'] === 'internal') { + $filename_e = template_escape($rr['filename']); + } + else { + $filename_e = $rr['filename']; + } + + return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); } $files = array_map("files2", $files); //echo "
"; var_dump($files); killme();
@@ -96,6 +113,7 @@ function fbrowser_content($a){
 					'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
 					'$folders' => false,
 					'$files' =>$files,
+					'$cancel' => t('Cancel'),
 				));
 				
 			}
diff --git a/mod/hcard.php b/mod/hcard.php
index cc6d326b5..83ae7c7af 100644
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -48,3 +48,6 @@ function hcard_init(&$a) {
 
 }
 
+function hcard_aside(&$a) {
+	profile_aside($a);
+}
diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index 9b2411f26..0a66dcc84 100644
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -14,10 +14,15 @@ function hostxrd_init(&$a) {
 		set_config('system','site_pubkey', $res['pubkey']);
 	}
 
-	$tpl = file_get_contents('view/xrd_host.tpl');
-	echo str_replace(array(
-		'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
+	$tpl = get_markup_template('xrd_host.tpl');
+	echo replace_macros($tpl, array(
+		'$zhost' => $a->get_hostname(),
+		'$zroot' => z_root(),
+		'$domain' => z_path(),
+		'$zot_post' => z_root() . '/post',
+		'$bigkey' => salmon_key(get_config('system','site_pubkey')),
+	));
 	session_write_close();
 	exit();
 
-}
\ No newline at end of file
+}
diff --git a/mod/message.php b/mod/message.php
index 3e88362a0..1a1ce4813 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -362,6 +362,19 @@ function message_content(&$a) {
 			$rr['to']   = find_xchan_in_array($rr['to_xchan'],$c);
 			$rr['seen'] = (($rr['mail_flags'] & MAIL_SEEN) ? 1 : "");
 
+			if($a->theme['template_engine'] === 'internal') {
+				$from_name_e = template_escape($rr['from']['xchan_name']);
+				$subject_e = template_escape((($rr['seen']) ? $rr['title'] : '' . $rr['title'] . ''));
+				$body_e = template_escape($rr['body']);
+				$to_name_e = template_escape($rr['to']['xchan_name']);
+			}
+			else {
+				$from_name_e = $rr['from']['xchan_name'];
+				$subject_e = (($rr['seen']) ? $rr['title'] : '' . $rr['title'] . '');
+				$body_e = $rr['body'];
+				$to_name_e = $rr['to']['xchan_name'];
+			}
+			
 			$o .= replace_macros($tpl, array(
 				'$id' => $rr['id'],
 				'$from_name' => template_escape($rr['from']['xchan_name']),
@@ -385,6 +398,10 @@ function message_content(&$a) {
 
 		$o .= $header;
 
+		$plaintext = true;
+		if( local_user() && feature_enabled(local_user(),'richtext') )
+			$plaintext = false;
+
 		$r = q("SELECT parent_uri from mail WHERE channel_id = %d and id = %d limit 1",
 			intval(local_user()),
 			intval(argv(1))
@@ -433,6 +450,8 @@ function message_content(&$a) {
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$nickname' => $channel['channel_addr'],
 			'$baseurl' => $a->get_baseurl(true)
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+			'$linkurl' => t('Please enter a link URL:')
 		));
 
 
@@ -451,16 +470,29 @@ logger('message: ' . print_r($message,true));
 //			if($extracted['images'])
 //				$message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']);
 
+			if($a->theme['template_engine'] === 'internal') {
+				$from_name_e = template_escape($message['from']['xchan_name']);
+				$subject_e = template_escape($message['title']);
+				$body_e = template_escape(smilies(bbcode($message['body'])));
+				$to_name_e = template_escape($message['to']['xchan_name']);
+			}
+			else {
+				$from_name_e = $message['from']['xchan_name'];
+				$subject_e = $message['title'];
+				$body_e = smilies(bbcode($message['body']));
+				$to_name_e = $message['to']['xchan_name'];
+			}
+
 			$mails[] = array(
 				'id' => $message['id'],
-				'from_name' => template_escape($message['from']['xchan_name']),
+				'from_name' => $from_name_e,
 				'from_url' =>  z_root() . '/chanview/?f=&hash=' . $message['from_xchan'],
 				'from_photo' => $message['from']['xchan_photo_m'],
-				'to_name' => template_escape($message['to']['xchan_name']),
+				'to_name' => $to_name_e,
 				'to_url' =>  z_root() . '/chanview/?f=&hash=' . $message['to_xchan'],
 				'to_photo' => $message['to']['xchan_photo_m'],
-				'subject' => template_escape($message['title']),
-				'body' => template_escape(smilies(bbcode($message['body']))),
+				'subject' => $subject_e,
+				'body' => $body_e,
 				'delete' => t('Delete message'),
 				'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
 			);
@@ -476,6 +508,13 @@ logger('message: ' . print_r($message,true));
 		$select = $message[$recp]['xchan_name'] . '';
 		$parent = '';
 
+		if($a->theme['template_engine'] === 'internal') {
+			$subjtxt_e = template_escape($message['title']);
+		}
+		else {
+			$subjtxt_e = $message['title'];
+		}
+
 		$tpl = get_markup_template('mail_display.tpl');
 		$o = replace_macros($tpl, array(
 			'$thread_id' => $a->argv[1],
@@ -491,7 +530,7 @@ logger('message: ' . print_r($message,true));
 			'$to' => t('To:'),
 			'$showinputs' => '',
 			'$subject' => t('Subject:'),
-			'$subjtxt' => template_escape($message['title']),
+			'$subjtxt' => $subjtxt_e,
 			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
 			'$yourmessage' => t('Your message:'),
 			'$text' => '',
diff --git a/mod/photos.php b/mod/photos.php
index ee0a930fd..2cd2646d5 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1063,6 +1063,15 @@ function photos_content(&$a) {
  		}
 
 
+		if($a->theme['template_engine'] === 'internal') {
+			$albumselect_e = template_escape($albumselect);
+			$aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb)));
+		}
+		else {
+			$albumselect_e = $albumselect;
+			$aclselect_e = (($visitor) ? '' : populate_acl($a->user, $celeb));
+		}
+
 		$tpl = get_markup_template('photos_upload.tpl');
 		$o .= replace_macros($tpl,array(
 			'$pagename' => t('Upload Photos'),
@@ -1072,9 +1081,9 @@ function photos_content(&$a) {
 			'$newalbum' => t('New album name: '),
 			'$existalbumtext' => t('or existing album name: '),
 			'$nosharetext' => t('Do not show a status post for this upload'),
-			'$albumselect' => template_escape($albumselect),
+			'$albumselect' => $albumselect_e,
 			'$permissions' => t('Permissions'),
-			'$aclselect' => (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb))),
+			'$aclselect' => $aclselect_e,
 			'$uploader' => $ret['addon_text'],
 			'$default' => (($ret['default_upload']) ? $default_upload : ''),
 			'$uploadurl' => $ret['post_url']
@@ -1116,11 +1125,18 @@ function photos_content(&$a) {
 		if($cmd === 'edit') {		
 			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if($can_post) {
+					if($a->theme['template_engine'] === 'internal') {
+						$album_e = template_escape($album);
+					}
+					else {
+						$album_e = $album;
+					}
+
 					$edit_tpl = get_markup_template('album_edit.tpl');
 					$o .= replace_macros($edit_tpl,array(
 						'$nametext' => t('New album name: '),
 						'$nickname' => $a->data['channel']['channel_address'],
-						'$album' => template_escape($album),
+						'$album' => $album_e,
 						'$hexalbum' => bin2hex($album),
 						'$submit' => t('Submit'),
 						'$dropsubmit' => t('Delete Album')
@@ -1160,6 +1176,15 @@ function photos_content(&$a) {
 				
 				$ext = $phototypes[$rr['type']];
 
+				if($a->theme['template_engine'] === 'internal') {
+					$imgalt_e = template_escape($rr['filename']);
+					$desc_e = template_escape($rr['desc']);
+				}
+				else {
+					$imgalt_e = $rr['filename'];
+					$desc_e = $rr['desc'];
+				}
+
 				$o .= replace_macros($tpl,array(
 					'$id' => $rr['id'],
 					'$twist' => ' ' . $twist . rand(2,4),
@@ -1167,8 +1192,8 @@ function photos_content(&$a) {
 						. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''),
 					'$phototitle' => t('View Photo'),
 					'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['scale'] . '.' .$ext,
-					'$imgalt' => template_escape($rr['filename']),
-					'$desc'=> template_escape($rr['desc'])
+					'$imgalt' => $imgalt_e,
+					'$desc'=> $desc_e
 				));
 
 		}
@@ -1365,21 +1390,32 @@ function photos_content(&$a) {
 
 		$edit = Null;
 		if(($cmd === 'edit') && ($can_post)) {
+			if($a->theme['template_engine'] === 'internal') {
+				$album_e = template_escape($ph[0]['album']);
+				$caption_e = template_escape($ph[0]['desc']);
+				$aclselect_e = template_escape(populate_acl($ph[0]));
+			}
+			else {
+				$album_e = $ph[0]['album'];
+				$caption_e = $ph[0]['desc'];
+				$aclselect_e = populate_acl($ph[0]);
+			}
+
 			$edit_tpl = get_markup_template('photo_edit.tpl');
 			$edit = replace_macros($edit_tpl, array(
 				'$id' => $ph[0]['id'],
 				'$rotatecw' => t('Rotate CW (right)'),
 				'$rotateccw' => t('Rotate CCW (left)'),
-				'$album' => template_escape($ph[0]['album']),
+				'$album' => $album_e,
 				'$newalbum' => t('New album name'), 
 				'$nickname' => $a->data['channel']['channel_address'],
 				'$resource_id' => $ph[0]['resource_id'],
 				'$capt_label' => t('Caption'),
-				'$caption' => template_escape($ph[0]['desc']),
+				'$caption' => $caption_e,
 				'$tag_label' => t('Add a Tag'),
 				'$tags' => $link_item['tag'],
 				'$permissions' => t('Permissions'),
-				'$aclselect' => template_escape(populate_acl($ph[0])),
+				'$aclselect' => $aclselect_e,
 				'$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
 				'$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
 				'$submit' => t('Submit'),
@@ -1516,14 +1552,25 @@ function photos_content(&$a) {
 						$drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 
+					if($a->theme['template_engine'] === 'internal') {
+						$name_e = template_escape($profile_name);
+						$title_e = template_escape($item['title']);
+						$body_e = template_escape(bbcode($item['body']));
+					}
+					else {
+						$name_e = $profile_name;
+						$title_e = $item['title'];
+						$body_e = bbcode($item['body']);
+					}
+
 					$comments .= replace_macros($template,array(
 						'$id' => $item['item_id'],
 						'$profile_url' => $profile_link,
-						'$name' => template_escape($profile_name),
+						'$name' => $name_e,
 						'$thumb' => $profile_avatar,
 						'$sparkle' => $sparkle,
-						'$title' => template_escape($item['title']),
-						'$body' => template_escape(bbcode($item['body'])),
+						'$title' => $title_e,
+						'$body' => $body_e,
 						'$ago' => relative_date($item['created']),
 						'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
 						'$drop' => $drop,
@@ -1535,21 +1582,34 @@ function photos_content(&$a) {
 			$paginate = paginate($a);
 		}
 		
+		if($a->theme['template_engine'] === 'internal') {
+			$album_e = array($album_link,template_escape($ph[0]['album']));
+			$tags_e = template_escape($tags);
+			$like_e = template_escape($like);
+			$dislike_e = template_escape($dislike);
+		}
+		else {
+			$album_e = array($album_link,$ph[0]['album']);
+			$tags_e = $tags;
+			$like_e = $like;
+			$dislike_e = $dislike;
+		}
+
 		$photo_tpl = get_markup_template('photo_view.tpl');
 		$o .= replace_macros($photo_tpl, array(
 			'$id' => $ph[0]['id'],
-			'$album' => array($album_link,template_escape($ph[0]['album'])),
+			'$album' => $album_e,
 			'$tools' => $tools,
 			'$lock' => $lock,
 			'$photo' => $photo,
 			'$prevlink' => $prevlink,
 			'$nextlink' => $nextlink,
 			'$desc' => $ph[0]['desc'],
-			'$tags' => template_escape($tags),
+			'$tags' => $tags_e,
 			'$edit' => $edit,	
 			'$likebuttons' => $likebuttons,
-			'$like' => template_escape($like),
-			'$dislike' => template_escape($dislike),
+			'$like' => $like_e,
+			'$dislike' => $dislike_e,
 			'$comments' => $comments,
 			'$paginate' => $paginate,
 		));
@@ -1593,16 +1653,25 @@ function photos_content(&$a) {
 				$twist = 'rotright';
 			$ext = $phototypes[$rr['type']];
 			
+			if($a->theme['template_engine'] === 'internal') {
+				$alt_e = template_escape($rr['filename']);
+				$name_e = template_escape($rr['album']);
+			}
+			else {
+				$alt_e = $rr['filename'];
+				$name_e = $rr['album'];
+			}
+
 			$photos[] = array(
 				'id'       => $rr['id'],
 				'twist'    => ' ' . $twist . rand(2,4),
 				'link'  	=> $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/image/' . $rr['resource_id'],
 				'title' 	=> t('View Photo'),
 				'src'     	=> $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
-				'alt'     	=> template_escape($rr['filename']),
+				'alt'     	=> $alt_e,
 				'album'	=> array(
 					'link'  => $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($rr['album']),
-					'name'  => template_escape($rr['album']),
+					'name'  => $name_e,
 					'alt'   => t('View Album'),
 				),
 				
@@ -1611,7 +1680,7 @@ function photos_content(&$a) {
 	}
 	
 	$tpl = get_markup_template('photos_recent.tpl'); 
-	$o .= replace_macros($tpl,array(
+	$o .= replace_macros($tpl, array(
 		'$title' => t('Recent Photos'),
 		'$can_post' => $can_post,
 		'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
diff --git a/mod/profile.php b/mod/profile.php
index ce2d92f9b..8f15766b6 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -2,16 +2,6 @@
 
 function profile_init(&$a) {
 
-	$a->page['htmlhead'] .= '' . "\r\n" ;
-
-}
-
-
-function profile_aside(&$a) {
-
-	require_once('include/contact_widgets.php');
-	require_once('include/items.php');
-
 	if(argc() > 1)
 		$which = argv(1);
 	else {
@@ -28,6 +18,7 @@ function profile_aside(&$a) {
 		$profile = argv(1);		
 	}
 
+	$a->page['htmlhead'] .= '' . "\r\n" ;
 
 	$x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
 		dbesc(argv(1))
@@ -37,13 +28,33 @@ function profile_aside(&$a) {
 		$channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format');
 		if(! $channel_display)
 			profile_load($a,$which,$profile);
+	}
+
+}
+
+
+function profile_aside(&$a) {
+
+	require_once('include/contact_widgets.php');
+	require_once('include/items.php');
+
+	$x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
+		dbesc(argv(1))
+	);
+	if($x) {
+		$channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format');
+		if(! $channel_display)
+			profile_aside($a);
+
 		if($channel_display === 'full')
 			$a->page['template'] = 'full';
 		else {
+			$cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat']) : '');
 			$a->set_widget('archive',posted_date_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$a->profile['profile_uid'],true));	
 			$a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$cat));
 		}
 	}
+
 }
 
 
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index e78d2ca6f..e7be543c6 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -14,6 +14,16 @@ function profile_photo_init(&$a) {
 }
 
 
+function profile_photo_init(&$a) {
+
+	if(! local_user()) {
+		return;
+	}
+
+	profile_aside($a);
+}
+
+
 function profile_photo_post(&$a) {
 
 	if(! local_user()) {
@@ -318,7 +328,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
 	$a->config['imagecrop'] = $hash;
 	$a->config['imagecrop_resolution'] = $smallest;
 	$a->config['imagecrop_ext'] = $ph->getExt();
-	$a->page['htmlhead'] .= get_markup_template("crophead.tpl");
+	$a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array());
 	return;
 }}
 
diff --git a/mod/profiles.php b/mod/profiles.php
index 37be9bd08..5b2102852 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,6 +1,162 @@
  2) && (argv(1) === "drop") && intval(argv(2))) {
+		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is_default` = 0 LIMIT 1",
+			intval($a->argv[2]),
+			intval(local_user())
+		);
+		if(! count($r)) {
+			notice( t('Profile not found.') . EOL);
+			goaway($a->get_baseurl(true) . '/profiles');
+			return; // NOTREACHED
+		}
+		$profile_guid = $r['profile_guid'];
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
+
+		// move every contact using this profile as their default to the user default
+
+		$r = q("UPDATE abook SET abook_profile = (SELECT profile_guid AS FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ",
+			intval(local_user()),
+			dbesc($profile_guid),
+			intval(local_user())
+		);
+		$r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval(argv(2)),
+			intval(local_user())
+		);
+		if($r)
+			info( t('Profile deleted.') . EOL);
+
+		goaway($a->get_baseurl(true) . '/profiles');
+		return; // NOTREACHED
+	}
+
+
+
+
+
+	if((argc() > 1) && (argv(1) === 'new')) {
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
+
+		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+			intval(local_user()));
+		$num_profiles = count($r0);
+
+		$name = t('Profile-') . ($num_profiles + 1);
+
+		$r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is_default` = 1 LIMIT 1",
+			intval(local_user()));
+		
+		$r2 = q("INSERT INTO `profile` (`aid`, `uid` , `profile_guid`, `profile_name` , `name`, `photo`, `thumb`)
+			VALUES ( %d, '%s', '%s', '%s', '%s' )",
+			intval(get_account_id()),
+			intval(local_user()),
+			dbesc(random_string()),
+			dbesc($name),
+			dbesc($r1[0]['name']),
+			dbesc($r1[0]['photo']),
+			dbesc($r1[0]['thumb'])
+		);
+
+		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile_name` = '%s' LIMIT 1",
+			intval(local_user()),
+			dbesc($name)
+		);
+
+		info( t('New profile created.') . EOL);
+		if(count($r3) == 1)
+			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
+		
+		goaway($a->get_baseurl(true) . '/profiles');
+	} 
+
+	if((argc() > 2) && (argv(1) === 'clone')) {
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
+
+		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+			intval(local_user()));
+		$num_profiles = count($r0);
+
+		$name = t('Profile-') . ($num_profiles + 1);
+		$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			intval(local_user()),
+			intval($a->argv[2])
+		);
+		if(! count($r1)) {
+			notice( t('Profile unavailable to clone.') . EOL);
+			$a->error = 404;
+			return;
+		}
+		unset($r1[0]['id']);
+		$r1[0]['is_default'] = 0;
+		$r1[0]['publish'] = 0;	
+		$r1[0]['profile_name'] = dbesc($name);
+		$r1[0]['profile_guid'] = dbesc(random_string());
+
+		dbesc_array($r1[0]);
+
+		$r2 = dbq("INSERT INTO `profile` (`" 
+			. implode("`, `", array_keys($r1[0])) 
+			. "`) VALUES ('" 
+			. implode("', '", array_values($r1[0])) 
+			. "')" );
+
+		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile_name` = '%s' LIMIT 1",
+			intval(local_user()),
+			dbesc($name)
+		);
+		info( t('New profile created.') . EOL);
+		if(count($r3) == 1)
+			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
+		
+		goaway($a->get_baseurl(true) . '/profiles');
+		
+		return; // NOTREACHED
+	}
+
+
+	// Run profile_load() here to make sure the theme is set before
+	// we start loading content
+	if((argc() > 1) && (intval(argv(1)))) {
+		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($a->argv[1]),
+			intval(local_user())
+		);
+		if(! count($r)) {
+			notice( t('Profile not found.') . EOL);
+			$a->error = 404;
+			return;
+		}
+
+		$chan = $a->get_channel();
+
+		profile_load($a,$chan['channel_address'],$r[0]['id']);
+	}
+}
+
+function profiles_aside(&$a) {
+
+	if(! local_user()) {
+		return;
+	}
+
+	if((argc() > 1) && (intval(argv(1)))) {
+		profile_aside($a);
+	}
+}
+
 function profiles_post(&$a) {
 
 	if(! local_user()) {
@@ -307,130 +463,12 @@ function profiles_post(&$a) {
 function profiles_content(&$a) {
 
 	$o = '';
-	nav_set_selected('profiles');
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	if((argc() > 2) && (argv(1) === "drop") && intval(argv(2))) {
-		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is_default` = 0 LIMIT 1",
-			intval($a->argv[2]),
-			intval(local_user())
-		);
-		if(! count($r)) {
-			notice( t('Profile not found.') . EOL);
-			goaway($a->get_baseurl(true) . '/profiles');
-			return; // NOTREACHED
-		}
-		$profile_guid = $r['profile_guid'];
-		
-		check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
-
-		// move every contact using this profile as their default to the user default
-
-		$r = q("UPDATE abook SET abook_profile = (SELECT profile_guid AS FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ",
-			intval(local_user()),
-			dbesc($profile_guid),
-			intval(local_user())
-		);
-		$r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval(argv(2)),
-			intval(local_user())
-		);
-		if($r)
-			info( t('Profile deleted.') . EOL);
-
-		goaway($a->get_baseurl(true) . '/profiles');
-		return; // NOTREACHED
-	}
-
-
-
-
-
-	if((argc() > 1) && (argv(1) === 'new')) {
-		
-		check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
-
-		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
-			intval(local_user()));
-		$num_profiles = count($r0);
-
-		$name = t('Profile-') . ($num_profiles + 1);
-
-		$r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is_default` = 1 LIMIT 1",
-			intval(local_user()));
-		
-		$r2 = q("INSERT INTO `profile` (`aid`, `uid` , `profile_guid`, `profile_name` , `name`, `photo`, `thumb`)
-			VALUES ( %d, '%s', '%s', '%s', '%s' )",
-			intval(get_account_id()),
-			intval(local_user()),
-			dbesc(random_string()),
-			dbesc($name),
-			dbesc($r1[0]['name']),
-			dbesc($r1[0]['photo']),
-			dbesc($r1[0]['thumb'])
-		);
-
-		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile_name` = '%s' LIMIT 1",
-			intval(local_user()),
-			dbesc($name)
-		);
-
-		info( t('New profile created.') . EOL);
-		if(count($r3) == 1)
-			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
-		
-		goaway($a->get_baseurl(true) . '/profiles');
-	} 
-
-	if((argc() > 2) && (argv(1) === 'clone')) {
-		
-		check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
-
-		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
-			intval(local_user()));
-		$num_profiles = count($r0);
-
-		$name = t('Profile-') . ($num_profiles + 1);
-		$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-			intval(local_user()),
-			intval($a->argv[2])
-		);
-		if(! count($r1)) {
-			notice( t('Profile unavailable to clone.') . EOL);
-			return;
-		}
-		unset($r1[0]['id']);
-		$r1[0]['is_default'] = 0;
-		$r1[0]['publish'] = 0;	
-		$r1[0]['profile_name'] = dbesc($name);
-		$r1[0]['profile_guid'] = dbesc(random_string());
-
-		dbesc_array($r1[0]);
-
-		$r2 = dbq("INSERT INTO `profile` (`" 
-			. implode("`, `", array_keys($r1[0])) 
-			. "`) VALUES ('" 
-			. implode("', '", array_values($r1[0])) 
-			. "')" );
-
-		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile_name` = '%s' LIMIT 1",
-			intval(local_user()),
-			dbesc($name)
-		);
-		info( t('New profile created.') . EOL);
-		if(count($r3) == 1)
-			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
-		
-		goaway($a->get_baseurl(true) . '/profiles');
-		
-		return; // NOTREACHED
-	}
-
-
 	if((argc() > 1) && (intval(argv(1)))) {
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($a->argv[1]),
@@ -441,10 +479,6 @@ function profiles_content(&$a) {
 			return;
 		}
 
-		$chan = $a->get_channel();
-
-		profile_load($a,$chan['channel_address'],$r[0]['id']);
-
 		require_once('include/profile_selectors.php');
 
 
diff --git a/mod/profperm.php b/mod/profperm.php
index b31dfc128..7c7fe7b11 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -13,6 +13,15 @@ function profperm_init(&$a) {
 }
 
 
+function profperm_aside(&$a) {
+
+	if(! local_user())
+		return;
+
+	profile_aside($a);
+}
+
+
 function profperm_content(&$a) {
 
 	if(! local_user()) {
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 8133fb4a0..7f5050d5d 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -11,6 +11,16 @@ function viewcontacts_init(&$a) {
 }
 
 
+function viewcontacts_aside(&$a) {
+
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		return;
+	}
+
+	profile_aside($a);
+}
+
+
 function viewcontacts_content(&$a) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
diff --git a/mod/xrd.php b/mod/xrd.php
index d22ff4699..a576f76c4 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -29,7 +29,7 @@ function xrd_init(&$a) {
 
 	$dspr = '';
 
-	$tpl = file_get_contents('view/xrd_person.tpl');
+	$tpl = get_markup_template('view/xrd_person.tpl');
 
 	$o = replace_macros($tpl, array(
 		'$nick'        => $r[0]['nickname'],
diff --git a/mods/friendica-to-smarty-tpl.py b/mods/friendica-to-smarty-tpl.py
new file mode 100755
index 000000000..b82aa912a
--- /dev/null
+++ b/mods/friendica-to-smarty-tpl.py
@@ -0,0 +1,198 @@
+#!/usr/bin/python
+#
+# Script to convert Friendica internal template files into Smarty template files
+# Copyright 2012 Zach Prezkuta
+# Licensed under GPL v3
+
+import os, re, string
+
+ldelim = '{{'
+rdelim = '}}'
+
+def fToSmarty(matches):
+	match = matches.group(0)
+	if match == '$j':
+		return match
+	match = string.replace(match, '[', '')
+	match = string.replace(match, ']', '')
+
+	ldel = ldelim
+	rdel = rdelim
+	if match.find("'") > -1:
+		match = string.replace(match, "'", '')
+		ldel = "'" + ldel
+		rdel = rdel + "'"
+	elif match.find('"') > -1:
+		match = string.replace(match, '"', '')
+		ldel = '"' + ldel
+		rdel = rdel + '"'
+
+	return ldel + match + rdel
+
+
+def fix_element(element):
+	# Much of the positioning here is important, e.g. if you do element.find('if ') before you do
+	# element.find('endif'), then you may get some multiply-replaced delimiters
+
+	if element.find('endif') > -1:
+		element = ldelim + '/if' + rdelim
+		return element
+
+	if element.find('if ') > -1:
+		element = string.replace(element, '{{ if', ldelim + 'if')
+		element = string.replace(element, '{{if', ldelim + 'if')
+		element = string.replace(element, ' }}', rdelim)
+		element = string.replace(element, '}}', rdelim)
+		return element
+
+	if element.find('else') > -1:
+		element = ldelim + 'else' + rdelim
+		return element
+
+	if element.find('endfor') > -1:
+		element = ldelim + '/foreach' + rdelim
+		return element
+
+	if element.find('for ') > -1:
+		element = string.replace(element, '{{ for ', ldelim + 'foreach ')
+		element = string.replace(element, '{{for ', ldelim + 'foreach ')
+		element = string.replace(element, ' }}', rdelim)
+		element = string.replace(element, '}}', rdelim)
+		return element
+
+	if element.find('endinc') > -1:
+		element = ''
+		return element
+
+	if element.find('inc ') > -1:
+		parts = element.split(' ')
+		element = ldelim + 'include file="'
+
+		# We need to find the file name. It'll either be in parts[1] if the element was written as {{ inc file.tpl }}
+		# or it'll be in parts[2] if the element was written as {{inc file.tpl}}
+		if parts[0].find('inc') > -1:
+			first = 0
+		else:
+			first = 1
+
+		if parts[first+1][0] == '$':
+			# This takes care of elements where the filename is a variable, e.g. {{ inc $file }}
+			element += ldelim + parts[first+1].rstrip('}') + rdelim
+		else:
+			# This takes care of elements where the filename is a path, e.g. {{ inc file.tpl }}
+			element += parts[first+1].rstrip('}') 
+
+		element += '"'
+
+		if len(parts) > first + 1 and parts[first+2] == 'with':
+			# Take care of variable substitutions, e.g. {{ inc file.tpl with $var=this_var }}
+			element += ' ' + parts[first+3].rstrip('}')[1:]
+
+		element += rdelim
+		return element
+
+
+def convert(filename, tofilename, php_tpl):
+	for line in filename:
+		newline = ''
+		st_pos = 0
+		brack_pos = line.find('{{')
+
+		if php_tpl:
+			# If php_tpl is True, this script will only convert variables in quotes, like '$variable'
+			# or "$variable". This is for .tpl files that produce PHP scripts, where you don't want
+			# all the PHP variables converted into Smarty variables
+			pattern1 = re.compile(r"""
+([\'\"]\$\[[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+\][\'\"])
+""", re.VERBOSE)
+			pattern2 = re.compile(r"""
+([\'\"]\$[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+[\'\"])
+""", re.VERBOSE)
+		else:
+			# Compile the pattern for bracket-style variables, e.g. $[variable.key|filter:arg1:arg2|filter2:arg1:arg2]
+			# Note that dashes are only allowed in array keys if the key doesn't start
+			# with a number, e.g. $[variable.key-id] is ok but $[variable.12-id] isn't
+			#
+			# Doesn't currently process the argument position key 'x', i.e. filter:arg1:x:arg2 doesn't get
+			# changed to arg1|filter:variable:arg2 like Smarty requires
+			#
+			# Filter arguments can be variables, e.g. $variable, but currently can't have array keys with dashes
+			# like filter:$variable.key-name
+			pattern1 = re.compile(r"""
+(\$\[[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+\])
+""", re.VERBOSE)
+
+			# Compile the pattern for normal style variables, e.g. $variable.key
+			pattern2 = re.compile(r"""
+(\$[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+)
+""", re.VERBOSE)
+
+		while brack_pos > -1:
+			if brack_pos > st_pos:
+				line_segment = line[st_pos:brack_pos]
+				line_segment = pattern2.sub(fToSmarty, line_segment)
+				newline += pattern1.sub(fToSmarty, line_segment)
+
+			end_brack_pos = line.find('}}', brack_pos)
+			if end_brack_pos < 0:
+				print "Error: no matching bracket found"
+
+			newline += fix_element(line[brack_pos:end_brack_pos + 2])
+			st_pos = end_brack_pos + 2
+
+			brack_pos = line.find('{{', st_pos)
+
+		line_segment = line[st_pos:]
+		line_segment = pattern2.sub(fToSmarty, line_segment)
+		newline += pattern1.sub(fToSmarty, line_segment)
+		newline = newline.replace("{#", ldelim + "*")
+		newline = newline.replace("#}", "*" + rdelim)
+		tofilename.write(newline)
+
+
+path = raw_input('Path to template folder to convert: ')
+if path[-1:] != '/':
+	path = path + '/'
+
+outpath = path + 'smarty3/'
+
+if not os.path.exists(outpath):
+	os.makedirs(outpath)
+
+files = os.listdir(path)
+for a_file in files:
+	if a_file == 'htconfig.tpl':
+		php_tpl = True
+	else:
+		php_tpl = False
+
+	filename = os.path.join(path,a_file)
+	ext = a_file.split('.')[-1]
+	if os.path.isfile(filename) and ext == 'tpl':
+		with open(filename, 'r') as f:
+			newfilename = os.path.join(outpath,a_file)
+			with open(newfilename, 'w') as outf:
+				print "Converting " + filename + " to " + newfilename
+				convert(f, outf, php_tpl)
+
+
diff --git a/view/theme/fancyred/php/config.php b/view/theme/fancyred/php/config.php
index 48035f507..833d09050 100644
--- a/view/theme/fancyred/php/config.php
+++ b/view/theme/fancyred/php/config.php
@@ -65,7 +65,7 @@ function fancyred_form(&$a, $font_size, $line_height, $colour) {
 		'dark' => 'dark',						
 	);
 
-	$t = file_get_contents( dirname(__file__). "/../tpl/theme_settings.tpl" );
+	$t = get_markup_template('theme_settings.tpl');
 	$o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(),
diff --git a/view/theme/fancyred/php/theme.php b/view/theme/fancyred/php/theme.php
index b77664567..1ac6d4d21 100644
--- a/view/theme/fancyred/php/theme.php
+++ b/view/theme/fancyred/php/theme.php
@@ -1,5 +1,6 @@
 set_template_engine('smarty3');
 //	head_add_js('redbasic.js');
 }
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 1ca9cc5ed..ad5df57ce 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -65,7 +65,7 @@ function redbasic_form(&$a, $font_size, $line_height, $colour) {
 		'dark' => 'dark',						
 	);
 
-	$t = file_get_contents( dirname(__file__). "/../tpl/theme_settings.tpl" );
+	$t = get_markup_template('theme_settings.tpl');
 	$o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(),
diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index 47e1df5d1..52e571f0a 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -1,5 +1,6 @@
 set_template_engine('smarty3');
 //	head_add_js('redbasic.js');
 }
diff --git a/view/theme/redbasic/tpl/smarty3/lang_selector.tpl b/view/theme/redbasic/tpl/smarty3/lang_selector.tpl
new file mode 100644
index 000000000..945cbf51e
--- /dev/null
+++ b/view/theme/redbasic/tpl/smarty3/lang_selector.tpl
@@ -0,0 +1,10 @@
+

+
diff --git a/view/theme/redbasic/tpl/smarty3/moderated_comment.tpl b/view/theme/redbasic/tpl/smarty3/moderated_comment.tpl
new file mode 100644
index 000000000..8fbdf4bc4
--- /dev/null
+++ b/view/theme/redbasic/tpl/smarty3/moderated_comment.tpl
@@ -0,0 +1,61 @@
+		

+			

+				
+				
+				
+				
+				
+				
+
+				

+					{{$mytitle}}
+				

+				

+				
+				
    
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+				
	
+				

+							
+
+				

+				
+
+				

+			

+
+		

diff --git a/view/theme/redbasic/tpl/smarty3/profile_vcard.tpl b/view/theme/redbasic/tpl/smarty3/profile_vcard.tpl
new file mode 100644
index 000000000..048c461f4
--- /dev/null
+++ b/view/theme/redbasic/tpl/smarty3/profile_vcard.tpl
@@ -0,0 +1,51 @@
+

+
+	
{{$profile.name}}

+	
+				
+	
+	{{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
+	
{{$profile.name}}

+
+
+
+	{{if $location}}
+		
{{$location}}
 
+		

+			{{if $profile.address}}
{{$profile.address}}
{{/if}}
+			
+				{{$profile.locality}}{{if $profile.locality}}, {{/if}}
+				{{$profile.region}}
+				{{$profile.postal-code}}
+			
+			{{if $profile.country-name}}{{$profile.country-name}}{{/if}}
+		

+		

+	{{/if}}
+
+	{{if $gender}}
{{$gender}}
 
{{$profile.gender}}
{{/if}}
+	
+	{{if $profile.pubkey}}{{/if}}
+
+	{{if $marital}}
♥{{$marital}}
{{$profile.marital}}
{{/if}}
+
+	{{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	
	
+	
+

+
+{{$contact_block}}
+
+
diff --git a/view/theme/redbasic/tpl/smarty3/prv_message.tpl b/view/theme/redbasic/tpl/smarty3/prv_message.tpl
new file mode 100644
index 000000000..9023540c4
--- /dev/null
+++ b/view/theme/redbasic/tpl/smarty3/prv_message.tpl
@@ -0,0 +1,39 @@
+
+
{{$header}}

+
+

+

+
+{{$parent}}
+
+
{{$to}}

+
+{{if $showinputs}}
+
+
+{{else}}
+{{$select}}
+{{/if}}
+
+
{{$subject}}

+
+
+
{{$yourmessage}}

+
+
+
+

+	
+	

+		

+	
 
+	 
+	

+		
+	
 
+

+

+

+

diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index f67e4a0f7..727030f5d 100644
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -70,7 +70,7 @@
 						$u.register_date
 						$u.login_date
 						$u.lastitem_date
-						$u.page-flags
+						$u.page_flags
 						
 						
 							
diff --git a/view/tpl/directory_item.tpl b/view/tpl/directory_item.tpl
index b45da4465..d496cb2ad 100644
--- a/view/tpl/directory_item.tpl
+++ b/view/tpl/directory_item.tpl
@@ -2,7 +2,7 @@
 

 	
 
 		

-			$alt-text
+			$alt_text
 		

 	

 
diff --git a/view/tpl/filebrowser.tpl b/view/tpl/filebrowser.tpl
index 1e97237f4..7db31d716 100644
--- a/view/tpl/filebrowser.tpl
+++ b/view/tpl/filebrowser.tpl
@@ -77,7 +77,7 @@
 		

 	
 	

-		
+		
 	
	
 	
 	
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
index 1d8a4b263..76287c4a3 100644
--- a/view/tpl/install_checks.tpl
+++ b/view/tpl/install_checks.tpl
@@ -3,7 +3,7 @@
 

 
 {{ for $checks as $check }}
-	
+	
 	{{if $check.help }}
 	
 	{{endif}}
diff --git a/view/tpl/notifications_network_item.tpl b/view/tpl/notifications_network_item.tpl
index bd86548fc..261ab3643 100644
--- a/view/tpl/notifications_network_item.tpl
+++ b/view/tpl/notifications_network_item.tpl
@@ -1,3 +1,3 @@
 

-	{$item_text} {$item_when}
-

\ No newline at end of file
+	$item_text $item_when
+
diff --git a/view/tpl/smarty3/404.tpl b/view/tpl/smarty3/404.tpl
new file mode 100644
index 000000000..518ad1d29
--- /dev/null
+++ b/view/tpl/smarty3/404.tpl
@@ -0,0 +1 @@
+
{{$message}}

diff --git a/view/tpl/smarty3/abook_edit.tpl b/view/tpl/smarty3/abook_edit.tpl
new file mode 100644
index 000000000..2a2711a66
--- /dev/null
+++ b/view/tpl/smarty3/abook_edit.tpl
@@ -0,0 +1,45 @@
+
+
{{$header}}

+
+
+

+{{$tabs}}
+

+
+

+

+
Slide to adjust your degree of friendship

+
+{{$slide}}
+
+
+
+
Permissions

+
+
+
+
+
+

+Quick Links:
+Full SharingCautious SharingFollow Only

+

+
+
+
+
+
+
+
+
+

diff --git a/view/tpl/smarty3/acl_selector.tpl b/view/tpl/smarty3/acl_selector.tpl
new file mode 100644
index 000000000..d21073b56
--- /dev/null
+++ b/view/tpl/smarty3/acl_selector.tpl
@@ -0,0 +1,28 @@
+

+	
+	{{$showall}}
+	

+		

+		

+	

+	
+

+
+
+
+
diff --git a/view/tpl/smarty3/admin_aside.tpl b/view/tpl/smarty3/admin_aside.tpl
new file mode 100644
index 000000000..acf58668d
--- /dev/null
+++ b/view/tpl/smarty3/admin_aside.tpl
@@ -0,0 +1,42 @@
+
+
{{$admtxt}}

+
+
+{{if $admin.update}}
+
+{{/if}}
+
+
+{{if $admin.plugins_admin}}
{{$plugadmtxt}}
{{/if}}
+
    
+	{{foreach $admin.plugins_admin as $l}}
+	
  • {{$l.1}}
    • 
+	{{/foreach}}
+

+	
+	
+
{{$logtxt}}

+
+
diff --git a/view/tpl/smarty3/admin_logs.tpl b/view/tpl/smarty3/admin_logs.tpl
new file mode 100644
index 000000000..e5412429f
--- /dev/null
+++ b/view/tpl/smarty3/admin_logs.tpl
@@ -0,0 +1,19 @@
+

+	
{{$title}} - {{$page}}

+	
+	

+    
+
+	{{include file="field_checkbox.tpl" field=$debugging}}
+	{{include file="field_input.tpl" field=$logfile}}
+	{{include file="field_select.tpl" field=$loglevel}}
+	
+	

+	
+	
+	
+	
{{$logname}}

+	
{{$data}}

+
+	
+

diff --git a/view/tpl/smarty3/admin_plugins.tpl b/view/tpl/smarty3/admin_plugins.tpl
new file mode 100644
index 000000000..01c178c3e
--- /dev/null
+++ b/view/tpl/smarty3/admin_plugins.tpl
@@ -0,0 +1,15 @@
+

+	
{{$title}} - {{$page}}

+	
+		
    
+		{{foreach $plugins as $p}}
+			
  • 
+				
+				{{$p.2.name}} - {{$p.2.version}}
+				{{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
+
+					
    {{$p.2.description}}
    
+			
    • 
+		{{/foreach}}
+		

+

diff --git a/view/tpl/smarty3/admin_plugins_details.tpl b/view/tpl/smarty3/admin_plugins_details.tpl
new file mode 100644
index 000000000..47c33bec3
--- /dev/null
+++ b/view/tpl/smarty3/admin_plugins_details.tpl
@@ -0,0 +1,36 @@
+

+	
{{$title}} - {{$page}}

+	
+	
 {{$info.name}} - {{$info.version}} : {{$action}}

+	
{{$info.description}}

+	
+	
{{$str_author}}
+	{{foreach $info.author as $a}}
+		{{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}},
+	{{/foreach}}
+	

+
+	
{{$str_maintainer}}
+	{{foreach $info.maintainer as $a}}
+		{{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}},
+	{{/foreach}}
+	

+	
+	{{if $screenshot}}
+	{{$screenshot.1}}
+	{{/if}}
+
+	{{if $admin_form}}
+	
{{$settings}}

+	

+		{{$admin_form}}
+	
+	{{/if}}
+
+	{{if $readme}}
+	
Readme

+	

+		{{$readme}}
+	

+	{{/if}}
+

diff --git a/view/tpl/smarty3/admin_remoteupdate.tpl b/view/tpl/smarty3/admin_remoteupdate.tpl
new file mode 100644
index 000000000..6260741ed
--- /dev/null
+++ b/view/tpl/smarty3/admin_remoteupdate.tpl
@@ -0,0 +1,98 @@
+
+
+
+

+	
 
Your version:
{{$localversion}}
 

+{{if $needupdate}}
+	
 
New version:
{{$remoteversion}}
 

+
+	

+	
+
+	{{if $canwrite}}
+		

+	{{else}}
+		
Your friendica installation is not writable by web server.

+		{{if $canftp}}
+			
You can try to update via FTP

+			{{include file="field_input.tpl" field=$ftphost}}
+			{{include file="field_input.tpl" field=$ftppath}}
+			{{include file="field_input.tpl" field=$ftpuser}}
+			{{include file="field_password.tpl" field=$ftppwd}}
+			

+		{{/if}}
+	{{/if}}
+	
+{{else}}
+
No updates

+{{/if}}
+

diff --git a/view/tpl/smarty3/admin_site.tpl b/view/tpl/smarty3/admin_site.tpl
new file mode 100644
index 000000000..86cac214f
--- /dev/null
+++ b/view/tpl/smarty3/admin_site.tpl
@@ -0,0 +1,82 @@
+
+

+	
{{$title}} - {{$page}}

+	
+	

+    
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
+	
+	

+	
+	
{{$registration}}

+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	
+	

+
+	
{{$upload}}

+	{{include file="field_input.tpl" field=$maximagesize}}
+	
+	
{{$corporate}}

+	{{include file="field_input.tpl" field=$allowed_sites}}
+	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$no_community_page}}
+	{{include file="field_input.tpl" field=$global_directory}}
+	
+	

+	
+	
{{$advanced}}

+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	
+	

+	
+	
+

diff --git a/view/tpl/smarty3/admin_summary.tpl b/view/tpl/smarty3/admin_summary.tpl
new file mode 100644
index 000000000..339dbddb6
--- /dev/null
+++ b/view/tpl/smarty3/admin_summary.tpl
@@ -0,0 +1,40 @@
+

+	
{{$title}} - {{$page}}

+
+	

+		
{{$queues.label}}

+		
{{$queues.deliverq}} - {{$queues.queue}}

+	

+	

+		
{{$pending.0}}

+		
{{$pending.1}}
+	

+
+	

+		
{{$users.0}}

+		
{{$users.1}}

+	

+	{{foreach $accounts as $p}}
+		

+			
{{$p.0}}

+			
{{if $p.1}}{{$p.1}}{{else}}0{{/if}}

+		

+	{{/foreach}}
+
+
+	

+		
{{$plugins.0}}

+		
+		{{foreach $plugins.1 as $p}}
+			
{{$p}}

+		{{/foreach}}
+		
+	

+
+	

+		
{{$version.0}}

+		
{{$version.1}} - {{$build}}
+	

+
+
+

diff --git a/view/tpl/smarty3/admin_users.tpl b/view/tpl/smarty3/admin_users.tpl
new file mode 100644
index 000000000..d71d770f3
--- /dev/null
+++ b/view/tpl/smarty3/admin_users.tpl
@@ -0,0 +1,89 @@
+
+

+	
{{$title}} - {{$page}}

+	
+	

+        
+		
+		
{{$h_pending}}

+		{{if $pending}}
+			
$check.title {{if $check.required}}(required){{endif}}
$check.title {{if $check.required}}(required){{endif}}
$check.help

+				
+				
+					{{foreach $th_pending as $th}}{{/foreach}}
+					
+					
+				
+				
+				
+			{{foreach $pending as $u}}
+				
+					
+					
+					
+					
+					
+				
+			{{/foreach}}
+				
+			
{{$th}}
{{$u.created}}{{$u.name}}
+						
+						
+					

+			
{{$select_all}}

+			
 
			
+		{{else}}
+			
{{$no_pending}}

+		{{/if}}
+	
+	
+		
+	
+		
{{$h_users}}

+		{{if $users}}
+			
+				
+				
+					
+					{{foreach $th_users as $th}}{{/foreach}}
+					
+					
+				
+				
+				
+				{{foreach $users as $u}}
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+				{{/foreach}}
+				
+			
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}}
+							
+							
+						

+			
{{$select_all}}

+			
 
						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	
+
diff --git a/view/tpl/smarty3/album_edit.tpl b/view/tpl/smarty3/album_edit.tpl
new file mode 100644
index 000000000..61653c47c
--- /dev/null
+++ b/view/tpl/smarty3/album_edit.tpl
@@ -0,0 +1,15 @@
+

+

+
+
+
+
+
+

+
+
+
+
+

+

+

diff --git a/view/tpl/smarty3/api_config_xml.tpl b/view/tpl/smarty3/api_config_xml.tpl
new file mode 100644
index 000000000..8c0766c73
--- /dev/null
+++ b/view/tpl/smarty3/api_config_xml.tpl
@@ -0,0 +1,66 @@
+
+ 
+  {{$config.site.name}}
+  {{$config.site.server}}
+  default
+  
+  {{$config.site.logo}}
+
+  true
+  en
+  {{$config.site.email}}
+  
+  
+  UTC
+  {{$config.site.closed}}
+
+  false
+  {{$config.site.private}}
+  {{$config.site.textlimit}}
+  {{$config.site.ssl}}
+  {{$config.site.sslserver}}
+  30
+
+
+ 
+  cc
+  
+  http://creativecommons.org/licenses/by/3.0/
+  Creative Commons Attribution 3.0
+  http://i.creativecommons.org/l/by/3.0/80x15.png
+
+
+ 
+  
+
+ 
+  
+
+ 
+  
+
+ 
+
+  
+
+ 
+  false
+  20
+  600
+
+ 
+
+  false
+  INVALID SERVER
+  5222
+  update
+
+ 
+  StatusNet
+
+
+ 
+  false
+  0
+
+
diff --git a/view/tpl/smarty3/api_friends_xml.tpl b/view/tpl/smarty3/api_friends_xml.tpl
new file mode 100644
index 000000000..f2a7234d1
--- /dev/null
+++ b/view/tpl/smarty3/api_friends_xml.tpl
@@ -0,0 +1,5 @@
+
+	{{foreach $users as $user}}
+	{{include file="api_user_xml.tpl"}}
+	{{/foreach}}
+
diff --git a/view/tpl/smarty3/api_ratelimit_xml.tpl b/view/tpl/smarty3/api_ratelimit_xml.tpl
new file mode 100644
index 000000000..e4b470a25
--- /dev/null
+++ b/view/tpl/smarty3/api_ratelimit_xml.tpl
@@ -0,0 +1,6 @@
+
+ {{$hash.remaining_hits}}
+ {{$hash.hourly_limit}}
+ {{$hash.reset_time}}
+ {{$hash.resettime_in_seconds}}
+
diff --git a/view/tpl/smarty3/api_status_xml.tpl b/view/tpl/smarty3/api_status_xml.tpl
new file mode 100644
index 000000000..cbb736e22
--- /dev/null
+++ b/view/tpl/smarty3/api_status_xml.tpl
@@ -0,0 +1,46 @@
+{{if $status}}
+    {{$status.created_at}}
+    {{$status.id}}
+    {{$status.text}}
+    {{$status.source}}
+    {{$status.truncated}}
+    {{$status.in_reply_to_status_id}}
+    {{$status.in_reply_to_user_id}}
+    {{$status.favorited}}
+    {{$status.in_reply_to_screen_name}}
+    {{$status.geo}}
+    {{$status.coordinates}}
+    {{$status.place}}
+    {{$status.contributors}}
+	
+	  {{$status.user.id}}
+	  {{$status.user.name}}
+	  {{$status.user.screen_name}}
+	  {{$status.user.location}}
+	  {{$status.user.description}}
+	  {{$status.user.profile_image_url}}
+	  {{$status.user.url}}
+	  {{$status.user.protected}}
+	  {{$status.user.followers}}
+	  {{$status.user.profile_background_color}}
+  	  {{$status.user.profile_text_color}}
+  	  {{$status.user.profile_link_color}}
+  	  {{$status.user.profile_sidebar_fill_color}}
+  	  {{$status.user.profile_sidebar_border_color}}
+  	  {{$status.user.friends_count}}
+  	  {{$status.user.created_at}}
+  	  {{$status.user.favourites_count}}
+  	  {{$status.user.utc_offset}}
+  	  {{$status.user.time_zone}}
+  	  {{$status.user.profile_background_image_url}}
+  	  {{$status.user.profile_background_tile}}
+  	  {{$status.user.profile_use_background_image}}
+  	  
+  	  {{$status.user.geo_enabled}}
+  	  {{$status.user.verified}}
+  	  
+  	  {{$status.user.statuses_count}}
+  	  {{$status.user.lang}}
+  	  {{$status.user.contributors_enabled}}
+	  
+{{/if}}
diff --git a/view/tpl/smarty3/api_test_xml.tpl b/view/tpl/smarty3/api_test_xml.tpl
new file mode 100644
index 000000000..80a541c39
--- /dev/null
+++ b/view/tpl/smarty3/api_test_xml.tpl
@@ -0,0 +1 @@
+{{$ok}}
diff --git a/view/tpl/smarty3/api_timeline_atom.tpl b/view/tpl/smarty3/api_timeline_atom.tpl
new file mode 100644
index 000000000..e8bfb689e
--- /dev/null
+++ b/view/tpl/smarty3/api_timeline_atom.tpl
@@ -0,0 +1,90 @@
+
+ StatusNet
+ {{$rss.self}}
+ Friendika
+ Friendika API feed
+ {{$rss.logo}}
+ {{$rss.atom_updated}}
+ 
+ 
+ 
+ 
+ 
+	http://activitystrea.ms/schema/1.0/person
+	{{$user.url}}
+	{{$user.name}}
+	
+	
+	
+	
+	
+	
+	{{$user.screen_name}}
+	{{$user.name}}
+	
+		homepage
+		{{$user.url}}
+		true
+	
+	
+ 
+
+ 
+ 
+	http://activitystrea.ms/schema/1.0/person
+	{{$user.contact_url}}
+	{{$user.name}}
+	
+	
+	
+	
+	
+	{{$user.screen_name}}
+	{{$user.name}}
+	
+		homepage
+		{{$user.url}}
+		true
+	
+	
+ 
+ 
+ 
+  	{{foreach $statuses as $status}}
+	
+		{{$status.objecttype}}
+		{{$status.message_id}}
+		{{$status.text}}
+		{{$status.statusnet_html}}
+		
+		{{$status.verb}}
+		{{$status.published}}
+		{{$status.updated}}
+
+		
+		
+		
+		
+
+		
+			http://activitystrea.ms/schema/1.0/person
+			{{$status.user.url}}
+			{{$status.user.name}}
+			
+			
+
+			
+			{{$status.user.screen_name}}
+			{{$status.user.name}}
+			
+			
+				homepage
+				{{$status.user.url}}
+				true
+			
+		
+		 
+
+	    
+    {{/foreach}}
+
diff --git a/view/tpl/smarty3/api_timeline_rss.tpl b/view/tpl/smarty3/api_timeline_rss.tpl
new file mode 100644
index 000000000..86c645e99
--- /dev/null
+++ b/view/tpl/smarty3/api_timeline_rss.tpl
@@ -0,0 +1,26 @@
+
+  
+    Friendika
+    {{$rss.alternate}}
+    
+    Friendika timeline
+    {{$rss.language}}
+    40
+	
+		{{$user.link}}
+		{{$user.name}}'s items
+		{{$user.profile_image_url}}
+	
+	
+{{foreach $statuses as $status}}
+  
+    {{$status.user.name}}: {{$status.text}}
+    {{$status.text}}
+    {{$status.created_at}}
+    {{$status.url}}
+    {{$status.url}}
+    {{$status.source}}
+  
+{{/foreach}}
+  
+
diff --git a/view/tpl/smarty3/api_timeline_xml.tpl b/view/tpl/smarty3/api_timeline_xml.tpl
new file mode 100644
index 000000000..f14d73e9c
--- /dev/null
+++ b/view/tpl/smarty3/api_timeline_xml.tpl
@@ -0,0 +1,20 @@
+
+{{foreach $statuses as $status}} 
+  {{$status.text}}
+  {{$status.truncated}}
+  {{$status.created_at}}
+  {{$status.in_reply_to_status_id}}
+  {{$status.source}}
+  {{$status.id}}
+  {{$status.in_reply_to_user_id}}
+  {{$status.in_reply_to_screen_name}}
+  {{$status.geo}}
+  {{$status.favorited}}
+{{include file="api_user_xml.tpl" user=$status.user}}  {{$status.statusnet_html}}
+  {{$status.statusnet_conversation_id}}
+  {{$status.url}}
+  {{$status.coordinates}}
+  {{$status.place}}
+  {{$status.contributors}}
+ 
+{{/foreach}}
diff --git a/view/tpl/smarty3/api_user_xml.tpl b/view/tpl/smarty3/api_user_xml.tpl
new file mode 100644
index 000000000..3b51992f6
--- /dev/null
+++ b/view/tpl/smarty3/api_user_xml.tpl
@@ -0,0 +1,46 @@
+  
+   {{$user.id}}
+   {{$user.name}}
+   {{$user.screen_name}}
+   {{$user.location}}
+   {{$user.description}}
+   {{$user.profile_image_url}}
+   {{$user.url}}
+   {{$user.protected}}
+   {{$user.followers_count}}
+   {{$user.friends_count}}
+   {{$user.created_at}}
+   {{$user.favourites_count}}
+   {{$user.utc_offset}}
+   {{$user.time_zone}}
+   {{$user.statuses_count}}
+   {{$user.following}}
+   {{$user.profile_background_color}}
+   {{$user.profile_text_color}}
+   {{$user.profile_link_color}}
+   {{$user.profile_sidebar_fill_color}}
+   {{$user.profile_sidebar_border_color}}
+   {{$user.profile_background_image_url}}
+   {{$user.profile_background_tile}}
+   {{$user.profile_use_background_image}}
+   {{$user.notifications}}
+   {{$user.geo_enabled}}
+   {{$user.verified}}
+   {{$user.lang}}
+   {{$user.contributors_enabled}}
+   {{if $user.status}}
+    {{$user.status.created_at}}
+    {{$user.status.id}}
+    {{$user.status.text}}
+    {{$user.status.source}}
+    {{$user.status.truncated}}
+    {{$user.status.in_reply_to_status_id}}
+    {{$user.status.in_reply_to_user_id}}
+    {{$user.status.favorited}}
+    {{$user.status.in_reply_to_screen_name}}
+    {{$user.status.geo}}
+    {{$user.status.coordinates}}
+    {{$user.status.place}}
+    {{$user.status.contributors}}
+  {{/if}}
+  
diff --git a/view/tpl/smarty3/apps.tpl b/view/tpl/smarty3/apps.tpl
new file mode 100644
index 000000000..335e0ca97
--- /dev/null
+++ b/view/tpl/smarty3/apps.tpl
@@ -0,0 +1,7 @@
+
{{$title}}

+
+
    
+	{{foreach $apps as $ap}}
+	
  • {{$ap}}
    • 
+	{{/foreach}}
+

diff --git a/view/tpl/smarty3/atom_feed.tpl b/view/tpl/smarty3/atom_feed.tpl
new file mode 100644
index 000000000..ccb85a48a
--- /dev/null
+++ b/view/tpl/smarty3/atom_feed.tpl
@@ -0,0 +1,29 @@
+
+ 
+
+  {{$feed_id}}
+  {{$feed_title}}
+  Friendica
+  
+  {{$hub}}
+  {{$salmon}}
+  {{$community}}
+
+  {{$feed_updated}}
+
+  
+    {{$name}}
+    {{$profile_page}}
+    
+    
+    {{$birthday}}
+  
diff --git a/view/tpl/smarty3/atom_feed_dfrn.tpl b/view/tpl/smarty3/atom_feed_dfrn.tpl
new file mode 100644
index 000000000..307001fbe
--- /dev/null
+++ b/view/tpl/smarty3/atom_feed_dfrn.tpl
@@ -0,0 +1,29 @@
+
+ 
+
+  {{$feed_id}}
+  {{$feed_title}}
+  Friendica
+  
+  {{$hub}}
+  {{$salmon}}
+  {{$community}}
+
+  {{$feed_updated}}
+
+  
+    {{$name}}
+    {{$profile_page}}
+    
+    
+    {{$birthday}}
+  
diff --git a/view/tpl/smarty3/atom_mail.tpl b/view/tpl/smarty3/atom_mail.tpl
new file mode 100644
index 000000000..9b843f585
--- /dev/null
+++ b/view/tpl/smarty3/atom_mail.tpl
@@ -0,0 +1,17 @@
+
+
+
+	
+		{{$name}}
+		{{$profile_page}}
+		{{$thumb}}
+	
+
+	{{$item_id}}
+	{{$parent_id}}
+	{{$created}}
+	{{$subject}}
+	{{$content}}
+
+
+
diff --git a/view/tpl/smarty3/atom_suggest.tpl b/view/tpl/smarty3/atom_suggest.tpl
new file mode 100644
index 000000000..972b9bc0b
--- /dev/null
+++ b/view/tpl/smarty3/atom_suggest.tpl
@@ -0,0 +1,11 @@
+
+
+
+	{{$url}}
+	{{$name}}
+	{{$photo}}
+	{{$request}}
+	{{$note}}
+
+
+
diff --git a/view/tpl/smarty3/auto_request.tpl b/view/tpl/smarty3/auto_request.tpl
new file mode 100644
index 000000000..dfc5a4c80
--- /dev/null
+++ b/view/tpl/smarty3/auto_request.tpl
@@ -0,0 +1,37 @@
+
+
{{$header}}

+
+

+{{$page_desc}}

+

+

+

+{{$invite_desc}}
+

+

+{{$desc}}
+

+
+

+
+

+	
+	
+	

+

+
+
+

+
+

+
+	

+		
+		
+	

+

diff --git a/view/tpl/smarty3/birthdays_reminder.tpl b/view/tpl/smarty3/birthdays_reminder.tpl
new file mode 100644
index 000000000..d0500364a
--- /dev/null
+++ b/view/tpl/smarty3/birthdays_reminder.tpl
@@ -0,0 +1,10 @@
+{{if $count}}
+
+
+{{/if}}
+
diff --git a/view/tpl/smarty3/categories_widget.tpl b/view/tpl/smarty3/categories_widget.tpl
new file mode 100644
index 000000000..2c0b3bcc2
--- /dev/null
+++ b/view/tpl/smarty3/categories_widget.tpl
@@ -0,0 +1,12 @@
+

+	
{{$title}}

+	
{{$desc}}

+	
+	
+	
+

diff --git a/view/tpl/smarty3/channel.tpl b/view/tpl/smarty3/channel.tpl
new file mode 100644
index 000000000..d6462d1e4
--- /dev/null
+++ b/view/tpl/smarty3/channel.tpl
@@ -0,0 +1,12 @@
+

+{{if $channel.default_links}}
+{{if $channel.default}}
+
{{$msg_default}}

+{{else}}
+
{{$msg_make_default}}

+{{/if}}
+{{/if}}
+{{$channel.channel_name}}
+
{{$channel.channel_name}}

+

+

diff --git a/view/tpl/smarty3/channels.tpl b/view/tpl/smarty3/channels.tpl
new file mode 100644
index 000000000..a3acaac06
--- /dev/null
+++ b/view/tpl/smarty3/channels.tpl
@@ -0,0 +1,22 @@
+
{{$header}}

+
+
+{{if $links}}
+{{foreach $links as $l}}
+{{$l.2}}
+{{/foreach}}
+{{/if}} 
+
+{{if $selected}}
+
{{$msg_selected}}

+{{include file="channel.tpl" channel=$selected}}
+

+{{/if}}
+
+
{{$desc}}

+
+{{foreach $all_channels as $chn}}
+{{include file="channel.tpl" channel=$chn}}
+{{/foreach}} 
+
+

diff --git a/view/tpl/smarty3/comment_item.tpl b/view/tpl/smarty3/comment_item.tpl
new file mode 100644
index 000000000..1f67dba47
--- /dev/null
+++ b/view/tpl/smarty3/comment_item.tpl
@@ -0,0 +1,68 @@
+		{{if $threaded}}
+		

+		{{else}}
+		

+		{{/if}}
+			

+				
+				
+				
+				
+				
+				
+				
+
+				

+					{{$mytitle}}
+				

+				

+				
    
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+				
	
+				

+							
+				{{if $qcomment}}
+					
+				{{/if}}
+
+				

+				
+
+				

+			

+
+		

diff --git a/view/tpl/smarty3/common_friends.tpl b/view/tpl/smarty3/common_friends.tpl
new file mode 100644
index 000000000..9adb30b71
--- /dev/null
+++ b/view/tpl/smarty3/common_friends.tpl
@@ -0,0 +1,12 @@
+

+	

+		
+			{{$name}}
+		
+	

+	

+	

+		{{$name}}
+	

+	

+

\ No newline at end of file
diff --git a/view/tpl/smarty3/common_tabs.tpl b/view/tpl/smarty3/common_tabs.tpl
new file mode 100644
index 000000000..ef8b3d356
--- /dev/null
+++ b/view/tpl/smarty3/common_tabs.tpl
@@ -0,0 +1,5 @@
+
diff --git a/view/tpl/smarty3/contact_block.tpl b/view/tpl/smarty3/contact_block.tpl
new file mode 100644
index 000000000..e688af287
--- /dev/null
+++ b/view/tpl/smarty3/contact_block.tpl
@@ -0,0 +1,12 @@
+

+
{{$contacts}}

+{{if $micropro}}
+		{{$viewcontacts}}
+		

+		{{foreach $micropro as $m}}
+			{{$m}}
+		{{/foreach}}
+		

+{{/if}}
+

+

diff --git a/view/tpl/smarty3/contact_edit.tpl b/view/tpl/smarty3/contact_edit.tpl
new file mode 100644
index 000000000..9f7420c0d
--- /dev/null
+++ b/view/tpl/smarty3/contact_edit.tpl
@@ -0,0 +1,89 @@
+
+
{{$header}}

+
+

+
+	{{$tab_str}}
+
+	
+
+	
+
+
+	

+		
+	

+	

+
+
+

+
+
+
+	{{if $poll_enabled}}
+		

+			
{{$lastupdtext}} {{$last_update}}

+			{{$updpub}} {{$poll_interval}} {{$udnow}}
+		

+	{{/if}}
+	

+
+	{{include file="field_checkbox.tpl" field=$hidden}}
+
+

+
{{$lbl_info1}}

+	
+	
+

+

+
+
+

+
{{$lbl_vis1}}

+
{{$lbl_vis2}}
 
+

+{{$profile_select}}
+

+
+
+
+

+

diff --git a/view/tpl/smarty3/contact_head.tpl b/view/tpl/smarty3/contact_head.tpl
new file mode 100644
index 000000000..72e7edbfb
--- /dev/null
+++ b/view/tpl/smarty3/contact_head.tpl
@@ -0,0 +1,30 @@
+
+          
+
diff --git a/view/tpl/smarty3/contact_slider.tpl b/view/tpl/smarty3/contact_slider.tpl
new file mode 100644
index 000000000..33cd3fb71
--- /dev/null
+++ b/view/tpl/smarty3/contact_slider.tpl
@@ -0,0 +1,4 @@
+

+
diff --git a/view/tpl/smarty3/contact_template.tpl b/view/tpl/smarty3/contact_template.tpl
new file mode 100644
index 000000000..31b42fe87
--- /dev/null
+++ b/view/tpl/smarty3/contact_template.tpl
@@ -0,0 +1,17 @@
+
+

+	

+		

+
+			{{$contact.name}}
+
+		

+			
+	

+	

+		
{{$contact.name}}

+
+	

+

diff --git a/view/tpl/smarty3/contacts-template.tpl b/view/tpl/smarty3/contacts-template.tpl
new file mode 100644
index 000000000..0c7e01038
--- /dev/null
+++ b/view/tpl/smarty3/contacts-template.tpl
@@ -0,0 +1,26 @@
+
{{$header}}{{if $total}} ({{$total}}){{/if}}

+
+{{if $finding}}
{{$finding}}
{{/if}}
+
+

+

+{{$desc}}
+
+
+

+

+

+
+{{$tabs}}
+
+
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+

+
+{{$paginate}}
+
+
+
+
diff --git a/view/tpl/smarty3/content.tpl b/view/tpl/smarty3/content.tpl
new file mode 100644
index 000000000..466045d39
--- /dev/null
+++ b/view/tpl/smarty3/content.tpl
@@ -0,0 +1,2 @@
+

+

diff --git a/view/tpl/smarty3/conv.tpl b/view/tpl/smarty3/conv.tpl
new file mode 100644
index 000000000..ddb959b84
--- /dev/null
+++ b/view/tpl/smarty3/conv.tpl
@@ -0,0 +1,17 @@
+{{foreach $threads as $thread}}
+

+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			

+			{{$thread.num_comments}} {{$thread.hide_text}}
+			

+			{{/if}}
+		
+		{{include file="{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+

+{{/foreach}}
diff --git a/view/tpl/smarty3/conv_frame.tpl b/view/tpl/smarty3/conv_frame.tpl
new file mode 100644
index 000000000..7f65b64d2
--- /dev/null
+++ b/view/tpl/smarty3/conv_frame.tpl
@@ -0,0 +1,11 @@
+

+

+

+
+{{if $dropping}}
+
+

+{{/if}}
diff --git a/view/tpl/smarty3/conv_item.tpl b/view/tpl/smarty3/conv_item.tpl
new file mode 100644
index 000000000..01e7bcb12
--- /dev/null
+++ b/view/tpl/smarty3/conv_item.tpl
@@ -0,0 +1,121 @@
+{{if $item.comment_firstcollapsed}}
+	

+	{{$item.num_comments}} {{$item.hide_text}}
+	

+	{{/if}}
diff --git a/view/tpl/smarty3/conversation.tpl b/view/tpl/smarty3/conversation.tpl
new file mode 100644
index 000000000..8948fd474
--- /dev/null
+++ b/view/tpl/smarty3/conversation.tpl
@@ -0,0 +1,28 @@
+

+{{foreach $threads as $thread}}
+

+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			

+			{{$thread.num_comments}} {{$thread.hide_text}}
+			

+			{{/if}}
+		
+		{{include file="{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+

+{{/foreach}}
+

+

+
+{{if $dropping}}
+
+

+{{/if}}
diff --git a/view/tpl/smarty3/crepair.tpl b/view/tpl/smarty3/crepair.tpl
new file mode 100644
index 000000000..2a05b9678
--- /dev/null
+++ b/view/tpl/smarty3/crepair.tpl
@@ -0,0 +1,46 @@
+
+

+
+
{{$contact_name}}

+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+

+ 
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+

+
+
diff --git a/view/tpl/smarty3/cropbody.tpl b/view/tpl/smarty3/cropbody.tpl
new file mode 100644
index 000000000..da5b1e859
--- /dev/null
+++ b/view/tpl/smarty3/cropbody.tpl
@@ -0,0 +1,58 @@
+
{{$title}}

+

+{{$desc}}
+

+

+{{$title}}
+

+

+

+

+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+

+
+

+
+

diff --git a/view/tpl/smarty3/crophead.tpl b/view/tpl/smarty3/crophead.tpl
new file mode 100644
index 000000000..48f375426
--- /dev/null
+++ b/view/tpl/smarty3/crophead.tpl
@@ -0,0 +1,4 @@
+      
+      
+      
+      
diff --git a/view/tpl/smarty3/delegate.tpl b/view/tpl/smarty3/delegate.tpl
new file mode 100644
index 000000000..cbaa8da86
--- /dev/null
+++ b/view/tpl/smarty3/delegate.tpl
@@ -0,0 +1,57 @@
+
{{$header}}

+
+
{{$desc}}

+
+{{if $managers}}
+
{{$head_managers}}

+
+{{foreach $managers as $x}}
+
+

+
+
+
+

+
+{{/foreach}}
+

+

+{{/if}}
+
+
+
{{$head_delegates}}

+
+{{if $delegates}}
+{{foreach $delegates as $x}}
+
+

+
+
+
+

+
+{{/foreach}}
+

+{{else}}
+{{$none}}
+{{/if}}
+

+
+
+
{{$head_potentials}}

+{{if $potentials}}
+{{foreach $potentials as $x}}
+
+

+
+
+
+

+
+{{/foreach}}
+

+{{else}}
+{{$none}}
+{{/if}}
+

+
diff --git a/view/tpl/smarty3/dfrn_req_confirm.tpl b/view/tpl/smarty3/dfrn_req_confirm.tpl
new file mode 100644
index 000000000..655af22d4
--- /dev/null
+++ b/view/tpl/smarty3/dfrn_req_confirm.tpl
@@ -0,0 +1,21 @@
+
+

+{{$welcome}}
+

+{{$please}}
+
+

+
 
+
+
+
+{{$aes_allow}}
+
+
+
+
+
+

+
+

+

\ No newline at end of file
diff --git a/view/tpl/smarty3/dfrn_request.tpl b/view/tpl/smarty3/dfrn_request.tpl
new file mode 100644
index 000000000..ce7b3eb55
--- /dev/null
+++ b/view/tpl/smarty3/dfrn_request.tpl
@@ -0,0 +1,59 @@
+
+
{{$header}}

+
+

+{{$page_desc}}

+{{$invite_desc}}
+

+

+{{$desc}}
+

+
+

+
+

+	
+	
+	

+

+
+

+{{$pls_answer}}
+

+
+

+
+
+

+{{$does_know}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

+
+
+

+{{$add_note}}
+

+	

+	
+	

+
+
+

+
+	

+		
+		
+	

+

diff --git a/view/tpl/smarty3/diasp_dec_hdr.tpl b/view/tpl/smarty3/diasp_dec_hdr.tpl
new file mode 100644
index 000000000..636ff7bd0
--- /dev/null
+++ b/view/tpl/smarty3/diasp_dec_hdr.tpl
@@ -0,0 +1,8 @@
+
+  {{$inner_iv}}
+  {{$inner_key}}
+  
+    {{$author_name}}
+    {{$author_uri}}
+  
+
diff --git a/view/tpl/smarty3/diaspora_comment.tpl b/view/tpl/smarty3/diaspora_comment.tpl
new file mode 100644
index 000000000..27ec3dffc
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_comment.tpl
@@ -0,0 +1,11 @@
+
+  
+    
+      {{$guid}}
+      {{$parent_guid}}
+      {{$authorsig}}
+      {{$body}}
+      {{$handle}}
+    
+  
+
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_comment_relay.tpl b/view/tpl/smarty3/diaspora_comment_relay.tpl
new file mode 100644
index 000000000..37a9e88b3
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_comment_relay.tpl
@@ -0,0 +1,12 @@
+
+  
+    
+      {{$guid}}
+      {{$parent_guid}}
+      {{$parentsig}}
+      {{$authorsig}}
+      {{$body}}
+      {{$handle}}
+    
+  
+
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_conversation.tpl b/view/tpl/smarty3/diaspora_conversation.tpl
new file mode 100644
index 000000000..dc4482e4b
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_conversation.tpl
@@ -0,0 +1,29 @@
+
+  
+    
+      {{$conv.guid}}
+      {{$conv.subject}}
+      {{$conv.created_at}}
+
+      {{foreach $conv.messages as $msg}}
+
+      
+        {{$msg.guid}}
+        {{$msg.parent_guid}}
+        {{if $msg.parent_author_signature}}
+        {{$msg.parent_author_signature}}
+        {{/if}}
+        {{$msg.author_signature}}
+        {{$msg.text}}
+        {{$msg.created_at}}
+        {{$msg.diaspora_handle}}
+        {{$msg.conversation_guid}}
+      
+
+      {{/foreach}}
+
+      {{$conv.diaspora_handle}}
+      {{$conv.participant_handles}}
+    
+  
+
diff --git a/view/tpl/smarty3/diaspora_like.tpl b/view/tpl/smarty3/diaspora_like.tpl
new file mode 100644
index 000000000..b03aef37a
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_like.tpl
@@ -0,0 +1,12 @@
+
+  
+    
+      {{$target_type}}
+      {{$guid}}
+      {{$parent_guid}}
+      {{$authorsig}}
+      {{$positive}}
+      {{$handle}}
+    
+  
+
diff --git a/view/tpl/smarty3/diaspora_like_relay.tpl b/view/tpl/smarty3/diaspora_like_relay.tpl
new file mode 100644
index 000000000..30df4cac6
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_like_relay.tpl
@@ -0,0 +1,13 @@
+
+  
+    
+      {{$guid}}
+      {{$target_type}}
+      {{$parent_guid}}
+      {{$parentsig}}
+      {{$authorsig}}
+      {{$positive}}
+      {{$handle}}
+    
+  
+
diff --git a/view/tpl/smarty3/diaspora_message.tpl b/view/tpl/smarty3/diaspora_message.tpl
new file mode 100644
index 000000000..3413d79b0
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_message.tpl
@@ -0,0 +1,13 @@
+
+  
+      
+        {{$msg.guid}}
+        {{$msg.parent_guid}}
+        {{$msg.author_signature}}
+        {{$msg.text}}
+        {{$msg.created_at}}
+        {{$msg.diaspora_handle}}
+        {{$msg.conversation_guid}}
+      
+  
+
diff --git a/view/tpl/smarty3/diaspora_photo.tpl b/view/tpl/smarty3/diaspora_photo.tpl
new file mode 100644
index 000000000..cd7ef5802
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_photo.tpl
@@ -0,0 +1,13 @@
+
+  
+    
+      {{$path}}
+      {{$filename}}
+      {{$msg_guid}}
+      {{$guid}}
+      {{$handle}}
+      {{$public}}
+      {{$created_at}}
+    
+  
+
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_post.tpl b/view/tpl/smarty3/diaspora_post.tpl
new file mode 100644
index 000000000..abbcc4c61
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_post.tpl
@@ -0,0 +1,11 @@
+
+  
+    
+      {{$body}}
+      {{$guid}}
+      {{$handle}}
+      {{$public}}
+      {{$created}}
+    
+  
+
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_profile.tpl b/view/tpl/smarty3/diaspora_profile.tpl
new file mode 100644
index 000000000..04f2e2948
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_profile.tpl
@@ -0,0 +1,16 @@
+
+ 
+  {{$handle}}
+  {{$first}}
+  {{$last}}
+  {{$large}}
+  {{$small}}
+  {{$medium}}
+  {{$dob}}
+  {{$gender}}
+  {{$about}}
+  {{$location}}
+  {{$searchable}}
+  {{$tags}}
+
+      
diff --git a/view/tpl/smarty3/diaspora_relay_retraction.tpl b/view/tpl/smarty3/diaspora_relay_retraction.tpl
new file mode 100644
index 000000000..5e7aed41f
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_relay_retraction.tpl
@@ -0,0 +1,10 @@
+
+  
+    
+      {{$type}}
+      {{$guid}}
+      {{$signature}}
+      {{$handle}}
+    
+  
+
diff --git a/view/tpl/smarty3/diaspora_relayable_retraction.tpl b/view/tpl/smarty3/diaspora_relayable_retraction.tpl
new file mode 100644
index 000000000..927e394f3
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_relayable_retraction.tpl
@@ -0,0 +1,11 @@
+
+  
+    
+      {{$target_type}}
+      {{$guid}}
+      {{$parentsig}}
+      {{$authorsig}}
+      {{$handle}}
+    
+  
+
diff --git a/view/tpl/smarty3/diaspora_retract.tpl b/view/tpl/smarty3/diaspora_retract.tpl
new file mode 100644
index 000000000..26e2cb94e
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_retract.tpl
@@ -0,0 +1,9 @@
+
+  
+    
+      {{$guid}}
+      {{$type}}
+      {{$handle}}
+    
+  
+
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_share.tpl b/view/tpl/smarty3/diaspora_share.tpl
new file mode 100644
index 000000000..59eb06124
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_share.tpl
@@ -0,0 +1,8 @@
+
+  
+    
+      {{$sender}}
+      {{$recipient}}
+    
+  
+
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_signed_retract.tpl b/view/tpl/smarty3/diaspora_signed_retract.tpl
new file mode 100644
index 000000000..f0f346da8
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_signed_retract.tpl
@@ -0,0 +1,10 @@
+
+  
+    
+      {{$guid}}
+      {{$type}}
+      {{$handle}}
+      {{$signature}}
+    
+  
+
diff --git a/view/tpl/smarty3/diaspora_vcard.tpl b/view/tpl/smarty3/diaspora_vcard.tpl
new file mode 100644
index 000000000..0ab6879f9
--- /dev/null
+++ b/view/tpl/smarty3/diaspora_vcard.tpl
@@ -0,0 +1,57 @@
+

+	

+		
Nickname

+		
		
+			{{$diaspora.nickname}}
+		

+	

+	

+		
Full name

+		

+			{{$diaspora.fullname}}
+		

+	

+
+	

+		
First name

+		

+		{{$diaspora.firstname}}
+		

+	

+	

+		
Family name

+		

+		{{$diaspora.lastname}}
+		

+	

+	

+		
URL

+		

+			{{$diaspora.podloc}}/
+		

+	

+	

+		
Photo

+		

+			
+		

+	

+	

+		
Photo

+		
 
+			
+		

+	

+	

+		
Photo

+		

+			
+		

+	

+	

+		
Searchable

+		

+			{{$diaspora.searchable}}
+		

+	

+

diff --git a/view/tpl/smarty3/directory_header.tpl b/view/tpl/smarty3/directory_header.tpl
new file mode 100644
index 000000000..c2ca64682
--- /dev/null
+++ b/view/tpl/smarty3/directory_header.tpl
@@ -0,0 +1,16 @@
+
{{$sitedir}}

+
+{{$globaldir}}
+{{$admin}}
+
+{{$finding}}
+
+

+

+{{$desc}}
+
+
+

+

+

+
diff --git a/view/tpl/smarty3/directory_item.tpl b/view/tpl/smarty3/directory_item.tpl
new file mode 100644
index 000000000..f4bd66d77
--- /dev/null
+++ b/view/tpl/smarty3/directory_item.tpl
@@ -0,0 +1,11 @@
+
+

+	
 
+		

+			{{$alt_text}}
+		

+	

+
+	
{{$name}}

+	
{{$details}}

+

diff --git a/view/tpl/smarty3/display-head.tpl b/view/tpl/smarty3/display-head.tpl
new file mode 100644
index 000000000..3d4e7e96a
--- /dev/null
+++ b/view/tpl/smarty3/display-head.tpl
@@ -0,0 +1,8 @@
+
+
diff --git a/view/tpl/smarty3/email_notify_html.tpl b/view/tpl/smarty3/email_notify_html.tpl
new file mode 100644
index 000000000..38c933aac
--- /dev/null
+++ b/view/tpl/smarty3/email_notify_html.tpl
@@ -0,0 +1,27 @@
+
+
+
+	{{$banner}}
+	
+
+
+
+	
+	
+
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+	
+
{{$product}}
{{$preamble}}
{{$source_name}}
{{$title}}
{{$htmlversion}}
{{$hsitelink}}
{{$hitemlink}}
{{$thanks}}
{{$site_admin}}

+
+
diff --git a/view/tpl/smarty3/email_notify_text.tpl b/view/tpl/smarty3/email_notify_text.tpl
new file mode 100644
index 000000000..3de006095
--- /dev/null
+++ b/view/tpl/smarty3/email_notify_text.tpl
@@ -0,0 +1,13 @@
+
+{{$preamble}}
+	
+{{$title}}
+
+{{$textversion}}
+				
+{{$tsitelink}}
+{{$titemlink}}
+
+{{$thanks}}
+{{$site_admin}}
+
diff --git a/view/tpl/smarty3/event.tpl b/view/tpl/smarty3/event.tpl
new file mode 100644
index 000000000..7ce2572a4
--- /dev/null
+++ b/view/tpl/smarty3/event.tpl
@@ -0,0 +1,10 @@
+{{foreach $events as $event}}
+	

+	
+	{{if $event.item.author-name}}{{$event.item.author-name}}{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}{{/if}}
+	{{if $event.edit}}{{/if}}
+	

+	

+{{/foreach}}
diff --git a/view/tpl/smarty3/event_form.tpl b/view/tpl/smarty3/event_form.tpl
new file mode 100644
index 000000000..0091b59aa
--- /dev/null
+++ b/view/tpl/smarty3/event_form.tpl
@@ -0,0 +1,49 @@
+
{{$title}}

+
+

+{{$desc}}
+

+
+

+
+
+
+
+
+
{{$s_text}}

+{{$s_dsel}} {{$s_tsel}}
+
+
{{$f_text}}

+{{$f_dsel}} {{$f_tsel}}
+
+

+
+ 
{{$n_text}}

+
+

+
+ 
{{$a_text}}

+
+

+
+
{{$t_text}}

+
+
+
+
{{$d_text}}

+
+
+
+
{{$l_text}}

+
+
+ 
{{$sh_text}}

+

+
+{{$acl}}
+
+

+
+

+
+
diff --git a/view/tpl/smarty3/event_head.tpl b/view/tpl/smarty3/event_head.tpl
new file mode 100644
index 000000000..2e2992e07
--- /dev/null
+++ b/view/tpl/smarty3/event_head.tpl
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
+
+
diff --git a/view/tpl/smarty3/events-js.tpl b/view/tpl/smarty3/events-js.tpl
new file mode 100644
index 000000000..c87d20529
--- /dev/null
+++ b/view/tpl/smarty3/events-js.tpl
@@ -0,0 +1,6 @@
+{{$tabs}}
+
{{$title}}

+
+
+
+

diff --git a/view/tpl/smarty3/events.tpl b/view/tpl/smarty3/events.tpl
new file mode 100644
index 000000000..48bd82d96
--- /dev/null
+++ b/view/tpl/smarty3/events.tpl
@@ -0,0 +1,24 @@
+{{$tabs}}
+
{{$title}}

+
+
+
+

+	
+	{{$calendar}}
+	
+

+

+
+
+{{foreach $events as $event}}
+	

+	{{if $event.is_first}}
{{$event.d}}
{{/if}}
+	{{if $event.item.author-name}}{{$event.item.author-name}}{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}{{/if}}
+	{{if $event.edit}}{{/if}}
+	

+	

+
+{{/foreach}}
diff --git a/view/tpl/smarty3/events_reminder.tpl b/view/tpl/smarty3/events_reminder.tpl
new file mode 100644
index 000000000..fd6a1a5c7
--- /dev/null
+++ b/view/tpl/smarty3/events_reminder.tpl
@@ -0,0 +1,10 @@
+{{if $count}}
+
+
+{{/if}}
+
diff --git a/view/tpl/smarty3/failed_updates.tpl b/view/tpl/smarty3/failed_updates.tpl
new file mode 100644
index 000000000..68c0bcdf2
--- /dev/null
+++ b/view/tpl/smarty3/failed_updates.tpl
@@ -0,0 +1,17 @@
+
{{$banner}}

+
+
{{$desc}}

+
+{{if $failed}}
+{{foreach $failed as $f}}
+
+
{{$f}}

+
+
+

+{{/foreach}}
+{{/if}}
+
diff --git a/view/tpl/smarty3/fake_feed.tpl b/view/tpl/smarty3/fake_feed.tpl
new file mode 100644
index 000000000..c37071cf4
--- /dev/null
+++ b/view/tpl/smarty3/fake_feed.tpl
@@ -0,0 +1,13 @@
+
+
+
+  fake feed
+  fake title
+
+  1970-01-01T00:00:00Z
+
+  
+    Fake Name
+    http://example.com
+  
+
diff --git a/view/tpl/smarty3/field.tpl b/view/tpl/smarty3/field.tpl
new file mode 100644
index 000000000..b7111ce5c
--- /dev/null
+++ b/view/tpl/smarty3/field.tpl
@@ -0,0 +1,4 @@
+
+ {{if $field.0==select}}
+ {{include file="field_select.tpl"}}
+ {{/if}}
diff --git a/view/tpl/smarty3/field_acheckbox.tpl b/view/tpl/smarty3/field_acheckbox.tpl
new file mode 100644
index 000000000..818c59721
--- /dev/null
+++ b/view/tpl/smarty3/field_acheckbox.tpl
@@ -0,0 +1,7 @@
+	
+	

+		
+		
+		
+		{{$field.6}}
+	

diff --git a/view/tpl/smarty3/field_checkbox.tpl b/view/tpl/smarty3/field_checkbox.tpl
new file mode 100644
index 000000000..ab9c0478e
--- /dev/null
+++ b/view/tpl/smarty3/field_checkbox.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/tpl/smarty3/field_combobox.tpl b/view/tpl/smarty3/field_combobox.tpl
new file mode 100644
index 000000000..3d69e2d27
--- /dev/null
+++ b/view/tpl/smarty3/field_combobox.tpl
@@ -0,0 +1,18 @@
+	
+	

+		
+		{{* html5 don't work on Chrome, Safari and IE9
+		
+		
+		   {{foreach $field.4 as $opt=>$val}} *}}
+		
+		
+		
+		
+		{{$field.3}}
+	

+
diff --git a/view/tpl/smarty3/field_custom.tpl b/view/tpl/smarty3/field_custom.tpl
new file mode 100644
index 000000000..e1bf318da
--- /dev/null
+++ b/view/tpl/smarty3/field_custom.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		{{$field.2}}
+		{{$field.3}}
+	

diff --git a/view/tpl/smarty3/field_input.tpl b/view/tpl/smarty3/field_input.tpl
new file mode 100644
index 000000000..2c5b2b238
--- /dev/null
+++ b/view/tpl/smarty3/field_input.tpl
@@ -0,0 +1,7 @@
+	
+	

+		
+		
+		{{$field.3}}
+		

+	

diff --git a/view/tpl/smarty3/field_intcheckbox.tpl b/view/tpl/smarty3/field_intcheckbox.tpl
new file mode 100644
index 000000000..a6ef7cc8f
--- /dev/null
+++ b/view/tpl/smarty3/field_intcheckbox.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.4}}
+	

diff --git a/view/tpl/smarty3/field_openid.tpl b/view/tpl/smarty3/field_openid.tpl
new file mode 100644
index 000000000..53dbfdde0
--- /dev/null
+++ b/view/tpl/smarty3/field_openid.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/tpl/smarty3/field_password.tpl b/view/tpl/smarty3/field_password.tpl
new file mode 100644
index 000000000..e840a312d
--- /dev/null
+++ b/view/tpl/smarty3/field_password.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/tpl/smarty3/field_radio.tpl b/view/tpl/smarty3/field_radio.tpl
new file mode 100644
index 000000000..cff8881f5
--- /dev/null
+++ b/view/tpl/smarty3/field_radio.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/tpl/smarty3/field_richtext.tpl b/view/tpl/smarty3/field_richtext.tpl
new file mode 100644
index 000000000..641493989
--- /dev/null
+++ b/view/tpl/smarty3/field_richtext.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/tpl/smarty3/field_select.tpl b/view/tpl/smarty3/field_select.tpl
new file mode 100644
index 000000000..18192e1d8
--- /dev/null
+++ b/view/tpl/smarty3/field_select.tpl
@@ -0,0 +1,8 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/tpl/smarty3/field_select_raw.tpl b/view/tpl/smarty3/field_select_raw.tpl
new file mode 100644
index 000000000..4e495dcf8
--- /dev/null
+++ b/view/tpl/smarty3/field_select_raw.tpl
@@ -0,0 +1,8 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/tpl/smarty3/field_textarea.tpl b/view/tpl/smarty3/field_textarea.tpl
new file mode 100644
index 000000000..8c311563f
--- /dev/null
+++ b/view/tpl/smarty3/field_textarea.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/tpl/smarty3/field_themeselect.tpl b/view/tpl/smarty3/field_themeselect.tpl
new file mode 100644
index 000000000..c02eee328
--- /dev/null
+++ b/view/tpl/smarty3/field_themeselect.tpl
@@ -0,0 +1,9 @@
+	
+	

+		
+		
+		{{$field.3}}
+		

+	

diff --git a/view/tpl/smarty3/field_yesno.tpl b/view/tpl/smarty3/field_yesno.tpl
new file mode 100644
index 000000000..e36e775c7
--- /dev/null
+++ b/view/tpl/smarty3/field_yesno.tpl
@@ -0,0 +1,13 @@
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/tpl/smarty3/fileas_widget.tpl b/view/tpl/smarty3/fileas_widget.tpl
new file mode 100644
index 000000000..70d68c56e
--- /dev/null
+++ b/view/tpl/smarty3/fileas_widget.tpl
@@ -0,0 +1,12 @@
+

+	
{{$title}}

+	
{{$desc}}

+	
+	
+	
+

diff --git a/view/tpl/smarty3/filebrowser.tpl b/view/tpl/smarty3/filebrowser.tpl
new file mode 100644
index 000000000..787f7c0cd
--- /dev/null
+++ b/view/tpl/smarty3/filebrowser.tpl
@@ -0,0 +1,84 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	

+		
    
+			
  • FileBrowser
    • 
+		

+	

+	

+
+		

+			

+				{{foreach $path as $p}}{{$p.1}}{{/foreach}}
+			

+			

+				
    
+					{{foreach $folders as $f}}
  • {{$f.1}}
    • {{/foreach}}
+				

+			

+			

+				
    
+				{{foreach $files as $f}}
+					
  • {{$f.1}}
    • 
+				{{/foreach}}
+				

+			

+		

+	

+	

+		
+	
	
+	
+	
+
diff --git a/view/tpl/smarty3/filer_dialog.tpl b/view/tpl/smarty3/filer_dialog.tpl
new file mode 100644
index 000000000..ae59ab713
--- /dev/null
+++ b/view/tpl/smarty3/filer_dialog.tpl
@@ -0,0 +1,4 @@
+{{include file="field_combobox.tpl"}}
+

+	
+

diff --git a/view/tpl/smarty3/follow.tpl b/view/tpl/smarty3/follow.tpl
new file mode 100644
index 000000000..350f8d910
--- /dev/null
+++ b/view/tpl/smarty3/follow.tpl
@@ -0,0 +1,8 @@
+

+	
{{$connect}}

+	
{{$desc}}

+	

+		
+	

+

+
diff --git a/view/tpl/smarty3/follow_slap.tpl b/view/tpl/smarty3/follow_slap.tpl
new file mode 100644
index 000000000..4222387fa
--- /dev/null
+++ b/view/tpl/smarty3/follow_slap.tpl
@@ -0,0 +1,25 @@
+	
+		
+			{{$name}}
+			{{$profile_page}}
+			
+			
+		
+
+		{{$item_id}}
+		{{$title}}
+		{{$published}}
+		{{$content}}
+
+		
+		http://activitystrea.ms/schema/1.0/person
+		{{$profile_page}}
+		
+ 		
+		
+		{{$nick}}
+		{{$name}}
+		
+ 		{{$verb}}
+		{{$ostat_follow}}
+	
diff --git a/view/tpl/smarty3/generic_links_widget.tpl b/view/tpl/smarty3/generic_links_widget.tpl
new file mode 100644
index 000000000..8b4c67b6f
--- /dev/null
+++ b/view/tpl/smarty3/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+

+	{{if $title}}
{{$title}}
{{/if}}
+	{{if $desc}}
{{$desc}}
{{/if}}
+	
+	
+	
+

diff --git a/view/tpl/smarty3/group_drop.tpl b/view/tpl/smarty3/group_drop.tpl
new file mode 100644
index 000000000..670136db7
--- /dev/null
+++ b/view/tpl/smarty3/group_drop.tpl
@@ -0,0 +1,9 @@
+

+	
+

+

diff --git a/view/tpl/smarty3/group_edit.tpl b/view/tpl/smarty3/group_edit.tpl
new file mode 100644
index 000000000..e4fb987ac
--- /dev/null
+++ b/view/tpl/smarty3/group_edit.tpl
@@ -0,0 +1,23 @@
+
{{$title}}

+
+
+

+	

+		
+		
+		{{include file="field_input.tpl" field=$gname}}
+		{{if $drop}}{{$drop}}{{/if}}
+		

+			
+		

+		

+	

+

+
+
+{{if $groupeditor}}
+	

+		{{include file="groupeditor.tpl"}}
+	

+{{/if}}
+{{if $desc}}
{{$desc}}
{{/if}}
diff --git a/view/tpl/smarty3/group_selection.tpl b/view/tpl/smarty3/group_selection.tpl
new file mode 100644
index 000000000..2223125ea
--- /dev/null
+++ b/view/tpl/smarty3/group_selection.tpl
@@ -0,0 +1,8 @@
+

+
+
+

diff --git a/view/tpl/smarty3/group_side.tpl b/view/tpl/smarty3/group_side.tpl
new file mode 100644
index 000000000..ebc820530
--- /dev/null
+++ b/view/tpl/smarty3/group_side.tpl
@@ -0,0 +1,33 @@
+

+
{{$title}}

+
+
+  
+  {{if $ungrouped}}
+  
+  {{/if}}
+

+
+
diff --git a/view/tpl/smarty3/groupeditor.tpl b/view/tpl/smarty3/groupeditor.tpl
new file mode 100644
index 000000000..c79bb0a2a
--- /dev/null
+++ b/view/tpl/smarty3/groupeditor.tpl
@@ -0,0 +1,16 @@
+

+
{{$groupeditor.label_members}}

+

+{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
+

+

+

+

+
+

+
{{$groupeditor.label_contacts}}

+

+{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
+

+

+

diff --git a/view/tpl/smarty3/head.tpl b/view/tpl/smarty3/head.tpl
new file mode 100644
index 000000000..06650648d
--- /dev/null
+++ b/view/tpl/smarty3/head.tpl
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+{{$head_css}}
+
+{{$js_strings}}
+
+{{$head_js}}
+
+
+
+
+
+
+
+
+
diff --git a/view/tpl/smarty3/hide_comments.tpl b/view/tpl/smarty3/hide_comments.tpl
new file mode 100644
index 000000000..f4ed9c552
--- /dev/null
+++ b/view/tpl/smarty3/hide_comments.tpl
@@ -0,0 +1,4 @@
+

+{{$num_comments}} {{$hide_text}}
+

+

diff --git a/view/tpl/smarty3/install.tpl b/view/tpl/smarty3/install.tpl
new file mode 100644
index 000000000..81475f587
--- /dev/null
+++ b/view/tpl/smarty3/install.tpl
@@ -0,0 +1,10 @@
+
+
{{$title}}

+
{{$pass}}

+
+
+{{if $status}}
+
{{$status}}

+{{/if}}
+
+{{$text}}
diff --git a/view/tpl/smarty3/install_checks.tpl b/view/tpl/smarty3/install_checks.tpl
new file mode 100644
index 000000000..2068df916
--- /dev/null
+++ b/view/tpl/smarty3/install_checks.tpl
@@ -0,0 +1,24 @@
+
{{$title}}

+
{{$pass}}

+

+
+{{foreach $checks as $check}}
+	
+	{{if $check.help}}
+	
+	{{/if}}
+{{/foreach}}
+
{{$check.title}} {{if $check.required}}(required){{/if}}
{{$check.help}}

+
+{{if $phpath}}
+	
+{{/if}}
+
+{{if $passed}}
+	
+	
+{{else}}
+	
+	
+{{/if}}
+

diff --git a/view/tpl/smarty3/install_db.tpl b/view/tpl/smarty3/install_db.tpl
new file mode 100644
index 000000000..5425b2c48
--- /dev/null
+++ b/view/tpl/smarty3/install_db.tpl
@@ -0,0 +1,30 @@
+
+
{{$title}}

+
{{$pass}}

+
+
+

+{{$info_01}}

+{{$info_02}}

+{{$info_03}}
+

+
+{{if $status}}
+
{{$status}}

+{{/if}}
+
+

+
+
+
+
+{{include file="field_input.tpl" field=$dbhost}}
+{{include file="field_input.tpl" field=$dbuser}}
+{{include file="field_password.tpl" field=$dbpass}}
+{{include file="field_input.tpl" field=$dbdata}}
+
+
+ 
+
+

+
diff --git a/view/tpl/smarty3/install_settings.tpl b/view/tpl/smarty3/install_settings.tpl
new file mode 100644
index 000000000..9fd93239a
--- /dev/null
+++ b/view/tpl/smarty3/install_settings.tpl
@@ -0,0 +1,27 @@
+
+
{{$title}}

+
{{$pass}}

+
+
+{{if $status}}
+
{{$status}}

+{{/if}}
+
+

+
+
+
+
+
+
+
+
+{{include file="field_input.tpl" field=$adminmail}}
+{{include file="field_input.tpl" field=$siteurl}}
+
+{{$timezone}}
+
+ 
+
+

+
diff --git a/view/tpl/smarty3/intros.tpl b/view/tpl/smarty3/intros.tpl
new file mode 100644
index 000000000..6132bfc75
--- /dev/null
+++ b/view/tpl/smarty3/intros.tpl
@@ -0,0 +1,28 @@
+
+

+
+
{{$str_notifytype}} {{$notify_type}}

+
{{$fullname}}

+{{$fullname}}
+
{{$knowyou}}

+
{{$note}}

+

+

+
+
+

+

+
+

+{{include file="field_checkbox.tpl" field=$hidden}}
+{{include file="field_checkbox.tpl" field=$activity}}
+
+
+
+
+{{$dfrn_text}}
+
+
+

+

+

diff --git a/view/tpl/smarty3/invite.tpl b/view/tpl/smarty3/invite.tpl
new file mode 100644
index 000000000..117ee7cd6
--- /dev/null
+++ b/view/tpl/smarty3/invite.tpl
@@ -0,0 +1,27 @@
+

+

+
+
{{$invite}}

+
+

+{{$addr_text}}
+

+
+

+
+

+
+

+{{$msg_text}}
+

+
+

+
+

+
+

+
+

+
+

+

diff --git a/view/tpl/smarty3/jot-header.tpl b/view/tpl/smarty3/jot-header.tpl
new file mode 100644
index 000000000..26c8f2a86
--- /dev/null
+++ b/view/tpl/smarty3/jot-header.tpl
@@ -0,0 +1,318 @@
+
+
+
+
+
diff --git a/view/tpl/smarty3/jot.tpl b/view/tpl/smarty3/jot.tpl
new file mode 100644
index 000000000..7c35dd8d7
--- /dev/null
+++ b/view/tpl/smarty3/jot.tpl
@@ -0,0 +1,86 @@
+
+

+	

+		
 

+		

+	

+	

+
+	

+		
+		
+		
+		
+		
+		
+		
+		

+		{{if $catsenabled}}
+		

+		{{/if}}
+		

+		
+		
+		

+
+

+	
+
+	

+		

+	
 
+	

+		

+	
 
+
+	 
+	

+		
+	
 
+	

+		
+	
 
+	

+		
+	
 
+	 
+
+	

+		{{$bang}}
+	

+
+	{{if $preview}}{{$preview}}{{/if}}
+
+
+	

+
+
+	

+	{{$jotplugins}}
+	

+
+	

+		
+	
 
+	
+	
+
+	

+		

+			{{$acl}}
+			

+			{{$jotnets}}
+		

+	

+
+
+

+
+

+

+

+		{{if $content}}{{/if}}
diff --git a/view/tpl/smarty3/jot_geotag.tpl b/view/tpl/smarty3/jot_geotag.tpl
new file mode 100644
index 000000000..b0f71e73b
--- /dev/null
+++ b/view/tpl/smarty3/jot_geotag.tpl
@@ -0,0 +1,8 @@
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
+			$('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/tpl/smarty3/js_strings.tpl b/view/tpl/smarty3/js_strings.tpl
new file mode 100644
index 000000000..5316f52ab
--- /dev/null
+++ b/view/tpl/smarty3/js_strings.tpl
@@ -0,0 +1,34 @@
+
+
+		
diff --git a/view/tpl/smarty3/lang_selector.tpl b/view/tpl/smarty3/lang_selector.tpl
new file mode 100644
index 000000000..945cbf51e
--- /dev/null
+++ b/view/tpl/smarty3/lang_selector.tpl
@@ -0,0 +1,10 @@
+

+
diff --git a/view/tpl/smarty3/like_noshare.tpl b/view/tpl/smarty3/like_noshare.tpl
new file mode 100644
index 000000000..b01064add
--- /dev/null
+++ b/view/tpl/smarty3/like_noshare.tpl
@@ -0,0 +1,5 @@
+
diff --git a/view/tpl/smarty3/login.tpl b/view/tpl/smarty3/login.tpl
new file mode 100644
index 000000000..dbd193017
--- /dev/null
+++ b/view/tpl/smarty3/login.tpl
@@ -0,0 +1,29 @@
+
+

+	
+
+	

+	{{include file="field_input.tpl" field=$lname}}
+	{{include file="field_password.tpl" field=$lpassword}}
+	

+	
+	
+	
+	

+
+	

+		
+	

+	
+	{{foreach $hiddens as $k=>$v}}
+		
+	{{/foreach}}
+	
+	
+

+
+
+
diff --git a/view/tpl/smarty3/logout.tpl b/view/tpl/smarty3/logout.tpl
new file mode 100644
index 000000000..7548ed196
--- /dev/null
+++ b/view/tpl/smarty3/logout.tpl
@@ -0,0 +1,6 @@
+

+

+
+
+

+

diff --git a/view/tpl/smarty3/lostpass.tpl b/view/tpl/smarty3/lostpass.tpl
new file mode 100644
index 000000000..f6fdb28d7
--- /dev/null
+++ b/view/tpl/smarty3/lostpass.tpl
@@ -0,0 +1,18 @@
+
{{$title}}

+
+

+{{$desc}}
+

+
+

+

+        
+        
+

+

+

+        
+

+

+

+
diff --git a/view/tpl/smarty3/magicsig.tpl b/view/tpl/smarty3/magicsig.tpl
new file mode 100644
index 000000000..78d8bbbd3
--- /dev/null
+++ b/view/tpl/smarty3/magicsig.tpl
@@ -0,0 +1,9 @@
+
+
+
+{{$data}}
+
+{{$encoding}}
+{{$algorithm}}
+{{$signature}}
+
diff --git a/view/tpl/smarty3/mail_conv.tpl b/view/tpl/smarty3/mail_conv.tpl
new file mode 100644
index 000000000..1bff55108
--- /dev/null
+++ b/view/tpl/smarty3/mail_conv.tpl
@@ -0,0 +1,14 @@
+

+	

+		{{$mail.from_name}}
+	

+	

+		
{{$mail.from_name}}

+		
{{$mail.date}}

+		
{{$mail.subject}}

+		
{{$mail.body}}

+	

+	

+

+

+

diff --git a/view/tpl/smarty3/mail_display.tpl b/view/tpl/smarty3/mail_display.tpl
new file mode 100644
index 000000000..76e4d1859
--- /dev/null
+++ b/view/tpl/smarty3/mail_display.tpl
@@ -0,0 +1,10 @@
+
+{{foreach $mails as $mail}}
+	{{include file="mail_conv.tpl"}}
+{{/foreach}}
+
+{{if $canreply}}
+{{include file="prv_message.tpl"}}
+{{else}}
+{{$unknown_text}}
+{{/if}}
\ No newline at end of file
diff --git a/view/tpl/smarty3/mail_head.tpl b/view/tpl/smarty3/mail_head.tpl
new file mode 100644
index 000000000..1cd7145e7
--- /dev/null
+++ b/view/tpl/smarty3/mail_head.tpl
@@ -0,0 +1,3 @@
+
{{$messages}}

+
+{{$tab_content}}
diff --git a/view/tpl/smarty3/mail_list.tpl b/view/tpl/smarty3/mail_list.tpl
new file mode 100644
index 000000000..b08c2ca7a
--- /dev/null
+++ b/view/tpl/smarty3/mail_list.tpl
@@ -0,0 +1,16 @@
+

+	

+		{{$from_name}}
+	

+	

+		
{{$from_name}}

+		
{{$date}}

+		
{{$subject}}

+	

+		
+	

+

+

+

+
+

diff --git a/view/tpl/smarty3/main_slider.tpl b/view/tpl/smarty3/main_slider.tpl
new file mode 100644
index 000000000..04ce72733
--- /dev/null
+++ b/view/tpl/smarty3/main_slider.tpl
@@ -0,0 +1,23 @@
+

+
diff --git a/view/tpl/smarty3/match.tpl b/view/tpl/smarty3/match.tpl
new file mode 100644
index 000000000..0688ca26b
--- /dev/null
+++ b/view/tpl/smarty3/match.tpl
@@ -0,0 +1,16 @@
+

+	

+		
+			{{$name}}
+		
+	

+	

+	

+		{{$name}}
+	

+	

+	{{if $connlnk}}
+	
{{$conntxt}}

+	{{/if}}
+
+

diff --git a/view/tpl/smarty3/message_side.tpl b/view/tpl/smarty3/message_side.tpl
new file mode 100644
index 000000000..ba7e28272
--- /dev/null
+++ b/view/tpl/smarty3/message_side.tpl
@@ -0,0 +1,10 @@
+

+	
+	
+	
+	
+

diff --git a/view/tpl/smarty3/moderated_comment.tpl b/view/tpl/smarty3/moderated_comment.tpl
new file mode 100644
index 000000000..79ce8f99b
--- /dev/null
+++ b/view/tpl/smarty3/moderated_comment.tpl
@@ -0,0 +1,34 @@
+		

+			

+				
+				
+				
+				
+				
+				
+
+				

+					{{$mytitle}}
+				

+				

+				
+				
+
+				

+				
+
+				

+			

+
+		

diff --git a/view/tpl/smarty3/mood_content.tpl b/view/tpl/smarty3/mood_content.tpl
new file mode 100644
index 000000000..63eaa2d8d
--- /dev/null
+++ b/view/tpl/smarty3/mood_content.tpl
@@ -0,0 +1,20 @@
+
{{$title}}

+
+
{{$desc}}

+
+

+

+

+
+
+
+
+

+

+
+

+
diff --git a/view/tpl/smarty3/msg-header.tpl b/view/tpl/smarty3/msg-header.tpl
new file mode 100644
index 000000000..0d2ca72be
--- /dev/null
+++ b/view/tpl/smarty3/msg-header.tpl
@@ -0,0 +1,97 @@
+
+
+
+
+
+
diff --git a/view/tpl/smarty3/nav.tpl b/view/tpl/smarty3/nav.tpl
new file mode 100644
index 000000000..649ec67f6
--- /dev/null
+++ b/view/tpl/smarty3/nav.tpl
@@ -0,0 +1,109 @@
+

+	
{{$sitelocation}}

+	
+

+
+
+
+
{{$langselector}}

+
diff --git a/view/tpl/smarty3/netfriend.tpl b/view/tpl/smarty3/netfriend.tpl
new file mode 100644
index 000000000..ec6b3b6cc
--- /dev/null
+++ b/view/tpl/smarty3/netfriend.tpl
@@ -0,0 +1,14 @@
+
{{$approve_as}}

+
+

+	
+	
+	
	
+

+

+

+	
+	
+	

+

+

diff --git a/view/tpl/smarty3/nets.tpl b/view/tpl/smarty3/nets.tpl
new file mode 100644
index 000000000..f514626ac
--- /dev/null
+++ b/view/tpl/smarty3/nets.tpl
@@ -0,0 +1,10 @@
+

+	
{{$title}}

+	
{{$desc}}

+	{{$all}}
+	
+

diff --git a/view/tpl/smarty3/new_channel.tpl b/view/tpl/smarty3/new_channel.tpl
new file mode 100644
index 000000000..79e2ac85e
--- /dev/null
+++ b/view/tpl/smarty3/new_channel.tpl
@@ -0,0 +1,29 @@
+
{{$title}}

+
+

+
+	
{{$desc}}

+
+	
+	
+	
+	

+
+	
{{$help_name}}

+
+	
+	
+	
+	

+
+	
{{$nick_desc}}

+
+
+	
+	
+	

+
+	
+	

+
+

diff --git a/view/tpl/smarty3/nogroup-template.tpl b/view/tpl/smarty3/nogroup-template.tpl
new file mode 100644
index 000000000..15094b2d6
--- /dev/null
+++ b/view/tpl/smarty3/nogroup-template.tpl
@@ -0,0 +1,12 @@
+
{{$header}}

+
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+

+
+{{$paginate}}
+
+
+
+
diff --git a/view/tpl/smarty3/notifications.tpl b/view/tpl/smarty3/notifications.tpl
new file mode 100644
index 000000000..0289c41d4
--- /dev/null
+++ b/view/tpl/smarty3/notifications.tpl
@@ -0,0 +1,8 @@
+
+
{{$notif_header}}

+
+{{include file="common_tabs.tpl"}}
+
+

+	{{$notif_content}}
+

diff --git a/view/tpl/smarty3/notifications_comments_item.tpl b/view/tpl/smarty3/notifications_comments_item.tpl
new file mode 100644
index 000000000..9c454a3ed
--- /dev/null
+++ b/view/tpl/smarty3/notifications_comments_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/tpl/smarty3/notifications_dislikes_item.tpl b/view/tpl/smarty3/notifications_dislikes_item.tpl
new file mode 100644
index 000000000..9c454a3ed
--- /dev/null
+++ b/view/tpl/smarty3/notifications_dislikes_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/tpl/smarty3/notifications_friends_item.tpl b/view/tpl/smarty3/notifications_friends_item.tpl
new file mode 100644
index 000000000..9c454a3ed
--- /dev/null
+++ b/view/tpl/smarty3/notifications_friends_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/tpl/smarty3/notifications_likes_item.tpl b/view/tpl/smarty3/notifications_likes_item.tpl
new file mode 100644
index 000000000..ed020a245
--- /dev/null
+++ b/view/tpl/smarty3/notifications_likes_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/tpl/smarty3/notifications_network_item.tpl b/view/tpl/smarty3/notifications_network_item.tpl
new file mode 100644
index 000000000..856955424
--- /dev/null
+++ b/view/tpl/smarty3/notifications_network_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

diff --git a/view/tpl/smarty3/notifications_posts_item.tpl b/view/tpl/smarty3/notifications_posts_item.tpl
new file mode 100644
index 000000000..9c454a3ed
--- /dev/null
+++ b/view/tpl/smarty3/notifications_posts_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/tpl/smarty3/notify.tpl b/view/tpl/smarty3/notify.tpl
new file mode 100644
index 000000000..9c454a3ed
--- /dev/null
+++ b/view/tpl/smarty3/notify.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/tpl/smarty3/oauth_authorize.tpl b/view/tpl/smarty3/oauth_authorize.tpl
new file mode 100644
index 000000000..2b7afa80e
--- /dev/null
+++ b/view/tpl/smarty3/oauth_authorize.tpl
@@ -0,0 +1,10 @@
+
{{$title}}

+
+

+	
+	
{{$app.name}}

+

+
{{$authorize}}

+

+

+

diff --git a/view/tpl/smarty3/oauth_authorize_done.tpl b/view/tpl/smarty3/oauth_authorize_done.tpl
new file mode 100644
index 000000000..2e91e0125
--- /dev/null
+++ b/view/tpl/smarty3/oauth_authorize_done.tpl
@@ -0,0 +1,4 @@
+
{{$title}}

+
+
{{$info}}

+{{$code}}
diff --git a/view/tpl/smarty3/oembed_video.tpl b/view/tpl/smarty3/oembed_video.tpl
new file mode 100644
index 000000000..4ad75a82e
--- /dev/null
+++ b/view/tpl/smarty3/oembed_video.tpl
@@ -0,0 +1,4 @@
+
+	
+	

+
diff --git a/view/tpl/smarty3/oexchange_xrd.tpl b/view/tpl/smarty3/oexchange_xrd.tpl
new file mode 100644
index 000000000..74ef22874
--- /dev/null
+++ b/view/tpl/smarty3/oexchange_xrd.tpl
@@ -0,0 +1,33 @@
+
+
+        
+    {{$base}}
+
+    Friendika
+    Friendika Social Network
+    Friendika
+    Send to Friendika
+
+    
+
+    
+
+    
+
+
diff --git a/view/tpl/smarty3/opensearch.tpl b/view/tpl/smarty3/opensearch.tpl
new file mode 100644
index 000000000..1b57a9d04
--- /dev/null
+++ b/view/tpl/smarty3/opensearch.tpl
@@ -0,0 +1,13 @@
+
+
+	Friendika@{{$nodename}}
+	Search in Friendika@{{$nodename}}
+	http://bugs.friendika.com/
+	{{$baseurl}}/images/friendika-16.png
+	{{$baseurl}}/images/friendika-64.png
+	
+	        
+
\ No newline at end of file
diff --git a/view/tpl/smarty3/pagetypes.tpl b/view/tpl/smarty3/pagetypes.tpl
new file mode 100644
index 000000000..d5fcd9968
--- /dev/null
+++ b/view/tpl/smarty3/pagetypes.tpl
@@ -0,0 +1,5 @@
+	{{include file="field_radio.tpl" field=$page_normal}}
+	{{include file="field_radio.tpl" field=$page_community}}
+	{{include file="field_radio.tpl" field=$page_prvgroup}}
+	{{include file="field_radio.tpl" field=$page_soapbox}}
+	{{include file="field_radio.tpl" field=$page_freelove}}
diff --git a/view/tpl/smarty3/peoplefind.tpl b/view/tpl/smarty3/peoplefind.tpl
new file mode 100644
index 000000000..1492db120
--- /dev/null
+++ b/view/tpl/smarty3/peoplefind.tpl
@@ -0,0 +1,14 @@
+

+	
{{$findpeople}}

+	
{{$desc}}

+	

+		
+	

+	
+	
+	
+	{{if $inv}} 
+	
+	{{/if}}
+

+
diff --git a/view/tpl/smarty3/photo_album.tpl b/view/tpl/smarty3/photo_album.tpl
new file mode 100644
index 000000000..3308bf500
--- /dev/null
+++ b/view/tpl/smarty3/photo_album.tpl
@@ -0,0 +1,7 @@
+
+

diff --git a/view/tpl/smarty3/photo_drop.tpl b/view/tpl/smarty3/photo_drop.tpl
new file mode 100644
index 000000000..94ef5a3ee
--- /dev/null
+++ b/view/tpl/smarty3/photo_drop.tpl
@@ -0,0 +1,4 @@
+

+	
+

+

diff --git a/view/tpl/smarty3/photo_edit.tpl b/view/tpl/smarty3/photo_edit.tpl
new file mode 100644
index 000000000..4c7eed833
--- /dev/null
+++ b/view/tpl/smarty3/photo_edit.tpl
@@ -0,0 +1,50 @@
+
+

+
+	
+
+	
+	
+
+	

+
+	
+	
+
+	

+
+	
+	
+
+	

+	

+		

+			{{$rotatecw}}

+			{{$rotateccw}}
+		

+		

+		
+	

+	

+
+	

+		
+			{{$permissions}}
+		
+		

+		
+		

+			

+				{{$aclselect}}
+			

+		

+	

+	

+
+	
+	
+
+	

+

+
+
diff --git a/view/tpl/smarty3/photo_item.tpl b/view/tpl/smarty3/photo_item.tpl
new file mode 100644
index 000000000..e7d25fd55
--- /dev/null
+++ b/view/tpl/smarty3/photo_item.tpl
@@ -0,0 +1,22 @@
+

+	

+		
+		{{$name}}
+	

+
+	

+		{{$name}}
+		
{{$ago}}

+	

+	

+		
{{$title}}

+		
{{$body}}

+	

+	{{$drop}}
+	

+	

+	{{$comment}}
+
+

+

+
diff --git a/view/tpl/smarty3/photo_top.tpl b/view/tpl/smarty3/photo_top.tpl
new file mode 100644
index 000000000..826266aff
--- /dev/null
+++ b/view/tpl/smarty3/photo_top.tpl
@@ -0,0 +1,8 @@
+
+
+
diff --git a/view/tpl/smarty3/photo_view.tpl b/view/tpl/smarty3/photo_view.tpl
new file mode 100644
index 000000000..543130113
--- /dev/null
+++ b/view/tpl/smarty3/photo_view.tpl
@@ -0,0 +1,37 @@
+

+
{{$album.1}}

+
+
+
+{{if $prevlink}}{{/if}}
+

+{{if $nextlink}}{{/if}}
+

+
{{$desc}}

+{{if $tags}}
+
{{$tags.0}}

+
{{$tags.1}}

+{{/if}}
+{{if $tags.2}}{{/if}}
+
+{{if $edit}}{{$edit}}{{/if}}
+
+{{if $likebuttons}}
+

+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+

+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+
diff --git a/view/tpl/smarty3/photos_recent.tpl b/view/tpl/smarty3/photos_recent.tpl
new file mode 100644
index 000000000..43a22a017
--- /dev/null
+++ b/view/tpl/smarty3/photos_recent.tpl
@@ -0,0 +1,11 @@
+
{{$title}}

+{{if $can_post}}
+{{$upload.0}}
+{{/if}}
+
+

+{{foreach $photos as $photo}}
+	{{include file="photo_top.tpl"}}
+{{/foreach}}
+

+

diff --git a/view/tpl/smarty3/photos_upload.tpl b/view/tpl/smarty3/photos_upload.tpl
new file mode 100644
index 000000000..a0b2368ec
--- /dev/null
+++ b/view/tpl/smarty3/photos_upload.tpl
@@ -0,0 +1,46 @@
+
{{$pagename}}

+
+
{{$usage}}

+
+

+	

+		

+			
+		

+		
+	

+	

+	

+		
{{$existalbumtext}}

+		{{$albumselect}}
+	

+	

+
+	

+		
+		
+	

+
+
+	
+	

+
+	

+		

+			{{$aclselect}}
+		

+	

+
+	

+
+	{{$uploader}}
+
+	{{$default}}
+
+	

+

+
diff --git a/view/tpl/smarty3/poco_entry_xml.tpl b/view/tpl/smarty3/poco_entry_xml.tpl
new file mode 100644
index 000000000..869894852
--- /dev/null
+++ b/view/tpl/smarty3/poco_entry_xml.tpl
@@ -0,0 +1,7 @@
+
+{{if $entry.id}}{{$entry.id}}{{/if}}
+{{if $entry.displayName}}{{$entry.displayName}}{{/if}}
+{{if $entry.preferredUsername}}{{$entry.preferredUsername}}{{/if}}
+{{if $entry.urls}}{{foreach $entry.urls as $url}}{{$url.value}}{{$url.type}}{{/foreach}}{{/if}}
+{{if $entry.photos}}{{foreach $entry.photos as $photo}}{{$photo.value}}{{$photo.type}}{{/foreach}}{{/if}}
+
diff --git a/view/tpl/smarty3/poco_xml.tpl b/view/tpl/smarty3/poco_xml.tpl
new file mode 100644
index 000000000..0e38a692c
--- /dev/null
+++ b/view/tpl/smarty3/poco_xml.tpl
@@ -0,0 +1,18 @@
+
+
+{{if $response.sorted}}{{$response.sorted}}{{/if}}
+{{if $response.filtered}}{{$response.filtered}}{{/if}}
+{{if $response.updatedSince}}{{$response.updatedSince}}{{/if}}
+{{$response.startIndex}}
+{{$response.itemsPerPage}}
+{{$response.totalResults}}
+
+
+{{if $response.totalResults}}
+{{foreach $response.entry as $entry}}
+{{include file="poco_entry_xml.tpl"}}
+{{/foreach}}
+{{else}}
+
+{{/if}}
+
diff --git a/view/tpl/smarty3/poke_content.tpl b/view/tpl/smarty3/poke_content.tpl
new file mode 100644
index 000000000..22a0b291f
--- /dev/null
+++ b/view/tpl/smarty3/poke_content.tpl
@@ -0,0 +1,32 @@
+
{{$title}}

+
+
{{$desc}}

+
+

+

+

+
+
{{$clabel}}

+

+
+
+
+

+

+
{{$choice}}

+

+

+
+

+

+
{{$prv_desc}}

+
+

+

+
+

+
diff --git a/view/tpl/smarty3/posted_date_widget.tpl b/view/tpl/smarty3/posted_date_widget.tpl
new file mode 100644
index 000000000..009fa60a6
--- /dev/null
+++ b/view/tpl/smarty3/posted_date_widget.tpl
@@ -0,0 +1,9 @@
+

+	
{{$title}}

+
+
+

diff --git a/view/tpl/smarty3/profed_head.tpl b/view/tpl/smarty3/profed_head.tpl
new file mode 100644
index 000000000..103960a76
--- /dev/null
+++ b/view/tpl/smarty3/profed_head.tpl
@@ -0,0 +1,36 @@
+
+          
+
diff --git a/view/tpl/smarty3/profile-hide-friends.tpl b/view/tpl/smarty3/profile-hide-friends.tpl
new file mode 100644
index 000000000..590730a7c
--- /dev/null
+++ b/view/tpl/smarty3/profile-hide-friends.tpl
@@ -0,0 +1,16 @@
+

+{{$desc}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

diff --git a/view/tpl/smarty3/profile-hide-wall.tpl b/view/tpl/smarty3/profile-hide-wall.tpl
new file mode 100644
index 000000000..6a118982e
--- /dev/null
+++ b/view/tpl/smarty3/profile-hide-wall.tpl
@@ -0,0 +1,16 @@
+

+{{$desc}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

diff --git a/view/tpl/smarty3/profile-in-directory.tpl b/view/tpl/smarty3/profile-in-directory.tpl
new file mode 100644
index 000000000..b36739514
--- /dev/null
+++ b/view/tpl/smarty3/profile-in-directory.tpl
@@ -0,0 +1,16 @@
+

+{{$desc}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

diff --git a/view/tpl/smarty3/profile-in-netdir.tpl b/view/tpl/smarty3/profile-in-netdir.tpl
new file mode 100644
index 000000000..23d4642ac
--- /dev/null
+++ b/view/tpl/smarty3/profile-in-netdir.tpl
@@ -0,0 +1,16 @@
+

+{{$desc}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

diff --git a/view/tpl/smarty3/profile_advanced.tpl b/view/tpl/smarty3/profile_advanced.tpl
new file mode 100644
index 000000000..812132f0c
--- /dev/null
+++ b/view/tpl/smarty3/profile_advanced.tpl
@@ -0,0 +1,170 @@
+
{{$title}}

+
+

+ 
{{$profile.fullname.0}}

+ 
{{$profile.fullname.1}}

+

+
+{{if $profile.gender}}
+

+ 
{{$profile.gender.0}}

+ 
{{$profile.gender.1}}

+

+{{/if}}
+
+{{if $profile.birthday}}
+

+ 
{{$profile.birthday.0}}

+ 
{{$profile.birthday.1}}

+

+{{/if}}
+
+{{if $profile.age}}
+

+ 
{{$profile.age.0}}

+ 
{{$profile.age.1}}

+

+{{/if}}
+
+{{if $profile.marital}}
+

+ 
♥  {{$profile.marital.0}}

+ 
{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}

+

+{{/if}}
+
+{{if $profile.sexual}}
+

+ 
{{$profile.sexual.0}}

+ 
{{$profile.sexual.1}}

+

+{{/if}}
+
+{{if $profile.pub_keywords}}
+

+ 
{{$profile.pub_keywords.0}}

+ 
{{$profile.pub_keywords.1}}

+

+{{/if}}
+
+{{if $profile.homepage}}
+

+ 
{{$profile.homepage.0}}

+ 
{{$profile.homepage.1}}

+

+{{/if}}
+
+{{if $profile.hometown}}
+

+ 
{{$profile.hometown.0}}

+ 
{{$profile.hometown.1}}

+

+{{/if}}
+
+{{if $profile.politic}}
+

+ 
{{$profile.politic.0}}

+ 
{{$profile.politic.1}}

+

+{{/if}}
+
+{{if $profile.religion}}
+

+ 
{{$profile.religion.0}}

+ 
{{$profile.religion.1}}

+

+{{/if}}
+
+{{if $profile.about}}
+

+ 
{{$profile.about.0}}

+ 
{{$profile.about.1}}

+

+{{/if}}
+
+{{if $profile.interest}}
+

+ 
{{$profile.interest.0}}

+ 
{{$profile.interest.1}}

+

+{{/if}}
+
+{{if $profile.likes}}
+

+ 
{{$profile.likes.0}}

+ 
{{$profile.likes.1}}

+

+{{/if}}
+
+{{if $profile.dislikes}}
+

+ 
{{$profile.dislikes.0}}

+ 
{{$profile.dislikes.1}}

+

+{{/if}}
+
+{{if $profile.contact}}
+

+ 
{{$profile.contact.0}}

+ 
{{$profile.contact.1}}

+

+{{/if}}
+
+
+{{if $profile.music}}
+

+ 
{{$profile.music.0}}

+ 
{{$profile.music.1}}

+

+{{/if}}
+
+
+{{if $profile.book}}
+

+ 
{{$profile.book.0}}

+ 
{{$profile.book.1}}

+

+{{/if}}
+
+
+{{if $profile.tv}}
+

+ 
{{$profile.tv.0}}

+ 
{{$profile.tv.1}}

+

+{{/if}}
+
+
+{{if $profile.film}}
+

+ 
{{$profile.film.0}}

+ 
{{$profile.film.1}}

+

+{{/if}}
+
+
+{{if $profile.romance}}
+

+ 
{{$profile.romance.0}}

+ 
{{$profile.romance.1}}

+

+{{/if}}
+
+
+{{if $profile.work}}
+

+ 
{{$profile.work.0}}

+ 
{{$profile.work.1}}

+

+{{/if}}
+
+{{if $profile.education}}
+

+ 
{{$profile.education.0}}

+ 
{{$profile.education.1}}

+

+{{/if}}
+
+
+
+
diff --git a/view/tpl/smarty3/profile_edit.tpl b/view/tpl/smarty3/profile_edit.tpl
new file mode 100644
index 000000000..d4647ad5f
--- /dev/null
+++ b/view/tpl/smarty3/profile_edit.tpl
@@ -0,0 +1,317 @@
+{{$default}}
+
+
{{$banner}}

+
+
+
+
+
+
+

+

+
+
+

+
+
*

+

+

+
+

+
+
+

+

+
+

+
+
+

+

+
+
+

+
+{{$gender}}
+

+

+
+

+
+

+{{$dob}} {{$age}}
+

+

+

+
+{{$hide_friends}}
+
+

+
+

+

+
+
+

+
+
+

+

+
+

+
+
+

+

+
+
+

+
+
+

+

+
+
+

+
+
+

+

+
+

+
+
+

+

+
+

+
+
+

+

+
+

+
+

+

+
+

+
+{{$marital}}
+

+
+
+
+
+
+

+
+

+
+{{$sexual}}
+

+

+
+
+
+

+
+
+

+

+
+

+
+
+

+

+
+

+
+
+

+

+
+

+
+
+
{{$lbl_pubdsc}}

+

+
+

+
+
+
{{$lbl_prvdsc}}

+

+
+
+

+
+

+

+
+

+

+{{$lbl_about}}
+

+
+
+
+

+

+
+
+

+

+{{$lbl_hobbies}}
+

+
+
+
+

+

+
+
+

+

+{{$lbl_likes}}
+

+
+
+
+

+

+
+
+

+

+{{$lbl_dislikes}}
+

+
+
+
+

+

+
+
+

+

+{{$lbl_social}}
+

+
+
+
+

+

+
+
+

+
+

+

+
+
+

+

+{{$lbl_music}}
+

+
+
+
+

+

+
+

+

+{{$lbl_book}}
+

+
+
+
+

+

+
+
+
+

+

+{{$lbl_tv}} 
+

+
+
+
+

+

+
+
+
+

+

+{{$lbl_film}}
+

+
+
+
+

+

+
+
+

+
+

+

+
+
+

+

+{{$lbl_love}}
+

+
+
+
+

+

+
+
+
+

+

+{{$lbl_work}}
+

+
+
+
+

+

+
+
+
+

+

+{{$lbl_school}} 
+

+
+
+
+

+

+
+
+
+

+
+

+

+
+
+

+

+
diff --git a/view/tpl/smarty3/profile_edlink.tpl b/view/tpl/smarty3/profile_edlink.tpl
new file mode 100644
index 000000000..2f4600a87
--- /dev/null
+++ b/view/tpl/smarty3/profile_edlink.tpl
@@ -0,0 +1,2 @@
+

+

\ No newline at end of file
diff --git a/view/tpl/smarty3/profile_entry.tpl b/view/tpl/smarty3/profile_entry.tpl
new file mode 100644
index 000000000..e06307c8b
--- /dev/null
+++ b/view/tpl/smarty3/profile_entry.tpl
@@ -0,0 +1,11 @@
+
+

+

+{{$alt}}
+

+

+
+
{{$visible}}

+

+

+
diff --git a/view/tpl/smarty3/profile_listing_header.tpl b/view/tpl/smarty3/profile_listing_header.tpl
new file mode 100644
index 000000000..b771a1ea2
--- /dev/null
+++ b/view/tpl/smarty3/profile_listing_header.tpl
@@ -0,0 +1,8 @@
+
{{$header}}

+

+{{$chg_photo}}
+

+
+
diff --git a/view/tpl/smarty3/profile_photo.tpl b/view/tpl/smarty3/profile_photo.tpl
new file mode 100644
index 000000000..d73779e20
--- /dev/null
+++ b/view/tpl/smarty3/profile_photo.tpl
@@ -0,0 +1,26 @@
+
{{$title}}

+
+

+
+
+

+
+
+

+
+
+
+
+

+
+

+
+

+
+
\ No newline at end of file
diff --git a/view/tpl/smarty3/profile_publish.tpl b/view/tpl/smarty3/profile_publish.tpl
new file mode 100644
index 000000000..265c0c63c
--- /dev/null
+++ b/view/tpl/smarty3/profile_publish.tpl
@@ -0,0 +1,16 @@
+

+{{$pubdesc}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

diff --git a/view/tpl/smarty3/profile_vcard.tpl b/view/tpl/smarty3/profile_vcard.tpl
new file mode 100644
index 000000000..d9bbd177c
--- /dev/null
+++ b/view/tpl/smarty3/profile_vcard.tpl
@@ -0,0 +1,48 @@
+

+
+	
{{$profile.name}}

+	
+				
+	
+	{{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
+	
{{$profile.name}}

+
+
+
+	{{if $location}}
+		
{{$location}}
 
+		

+			{{if $profile.address}}
{{$profile.address}}
{{/if}}
+			
+				{{$profile.locality}}{{if $profile.locality}}, {{/if}}
+				{{$profile.region}}
+				{{$profile.postal_code}}
+			
+			{{if $profile.country_name}}{{$profile.country_name}}{{/if}}
+		

+		

+	{{/if}}
+
+	{{if $gender}}
{{$gender}}
 
{{$profile.gender}}
{{/if}}
+	
+
+	{{if $marital}}
♥{{$marital}}
{{$profile.marital}}
{{/if}}
+
+	{{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}}
+
+	
+	
+

+
+{{$contact_block}}
+
+
diff --git a/view/tpl/smarty3/prv_message.tpl b/view/tpl/smarty3/prv_message.tpl
new file mode 100644
index 000000000..66007f803
--- /dev/null
+++ b/view/tpl/smarty3/prv_message.tpl
@@ -0,0 +1,33 @@
+
+
{{$header}}

+
+

+

+
+{{$parent}}
+
+
{{$to}}

+{{$select}}
+
+
{{$subject}}

+
+
+
{{$yourmessage}}

+
+
+
+

+	
+	

+		

+	
 
+	 
+	

+		
+	
 
+

+

+

+

diff --git a/view/tpl/smarty3/pwdreset.tpl b/view/tpl/smarty3/pwdreset.tpl
new file mode 100644
index 000000000..3993dec64
--- /dev/null
+++ b/view/tpl/smarty3/pwdreset.tpl
@@ -0,0 +1,17 @@
+
{{$lbl1}}

+
+

+{{$lbl2}}
+

+

+{{$lbl3}}
+

+

+{{$newpass}}
+

+

+{{$lbl4}} {{$lbl5}}
+

+

+{{$lbl6}}
+

diff --git a/view/tpl/smarty3/register.tpl b/view/tpl/smarty3/register.tpl
new file mode 100644
index 000000000..48c1ba525
--- /dev/null
+++ b/view/tpl/smarty3/register.tpl
@@ -0,0 +1,45 @@
+
{{$title}}

+
+

+
+{{if $registertext}}
+
{{$registertext}}

+{{/if}}
+
+{{if $invitations}}
+	
{{$invite_desc}}

+
+	
+	
+	

+	

+{{/if}}
+
+	
+	
+	

+	

+
+	
+	
+	

+	

+
+	
+	
+	

+	

+
+	{{if $enable_tos}}
+	
+	
+	

+	

+	{{else}}
+	
+	{{/if}}
+
+	
+	

+
+

diff --git a/view/tpl/smarty3/remote_friends_common.tpl b/view/tpl/smarty3/remote_friends_common.tpl
new file mode 100644
index 000000000..b68e1c347
--- /dev/null
+++ b/view/tpl/smarty3/remote_friends_common.tpl
@@ -0,0 +1,21 @@
+

+	
{{$desc}}      {{if $linkmore}}{{$more}}{{/if}}

+	{{if $items}}
+	{{foreach $items as $item}}
+	

+		

+			
+				{{$item.name}}
+			
+		

+		

+		

+			{{$item.name}}
+		

+		

+	

+	{{/foreach}}
+	{{/if}}
+	

+

+
diff --git a/view/tpl/smarty3/removeme.tpl b/view/tpl/smarty3/removeme.tpl
new file mode 100644
index 000000000..496f91ff5
--- /dev/null
+++ b/view/tpl/smarty3/removeme.tpl
@@ -0,0 +1,20 @@
+
{{$title}}

+
+

+
+
{{$desc}}

+
+

+
+
+

+
+
+

+

+
+
+
+

+

+
diff --git a/view/tpl/smarty3/saved_searches_aside.tpl b/view/tpl/smarty3/saved_searches_aside.tpl
new file mode 100644
index 000000000..27c7d86a0
--- /dev/null
+++ b/view/tpl/smarty3/saved_searches_aside.tpl
@@ -0,0 +1,14 @@
+

+	
+	{{$searchbox}}
+	
+	
+	

+

diff --git a/view/tpl/smarty3/search_item.tpl b/view/tpl/smarty3/search_item.tpl
new file mode 100644
index 000000000..226c985cd
--- /dev/null
+++ b/view/tpl/smarty3/search_item.tpl
@@ -0,0 +1,62 @@
+
+

+	

+		

+			

+				
+				{{$item.name}}
+				menu
+				

+					
    
+						{{$item.item_photo_menu}}
+					

+				

+			

+			
	
+			

+				{{if $item.lock}}
{{$item.lock}}

+				{{else}}
{{/if}}	
+				
{{$item.location}}

+			

+		

+		

+				{{$item.name}}
+
+				
{{$item.ago}}{{if $item.app}}{{$item.str_app}}{{/if}}

+				
+		
			
+		

+			
{{$item.title}}

+			

+			
{{$item.body}}
+				

+				{{foreach $item.tags as $tag}}
+					{{$tag}}
+				{{/foreach}}
+				

+			

+		

+		

+			

+				{{if $item.drop.dropping}}{{/if}}
+			

+				{{if $item.drop.pagedropping}}{{/if}}
+			

+		

+	

+	

+
+
+	

+	{{if $item.conv}}
+			{{$item.conv.title}}
+	{{/if}}
+	

+
+

+
+

+
+
diff --git a/view/tpl/smarty3/settings.tpl b/view/tpl/smarty3/settings.tpl
new file mode 100644
index 000000000..70664a6f2
--- /dev/null
+++ b/view/tpl/smarty3/settings.tpl
@@ -0,0 +1,134 @@
+
{{$ptitle}}

+
+{{$nickname_block}}
+
+

+
+
+
{{$h_basic}}

+
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_input.tpl" field=$defloc}}
+{{include file="field_checkbox.tpl" field=$allowloc}}
+
+
+

+
+

+
+
+
{{$h_prv}}

+
+
+
+
+
+
+

+{{foreach $permiss_arr as $permit}}
+{{include file="field_select.tpl" field=$permit}}
+{{/foreach}}
+

+
+
+

+
+

+
+
+
+{{$profile_in_dir}}
+
+{{$blocktags}}
+
+{{$suggestme}}
+
+
+{{include file="field_input.tpl" field=$maxreq}}
+
+{{include file="field_input.tpl" field=$cntunkmail}}
+
+{{include file="field_input.tpl" field=$expire.days}}
+
+
+

+	{{$expire.label}}
+	

+		

+			
{{$expire.advanced}}

+			{{include file="field_yesno.tpl" field=$expire.items}}
+			{{include file="field_yesno.tpl" field=$expire.notes}}
+			{{include file="field_yesno.tpl" field=$expire.starred}}
+			{{include file="field_yesno.tpl" field=$expire.network_only}}
+		

+	

+
+

+
+

+	{{$permissions}} {{$permdesc}}
+	

+
+	
+

+

+

+
+{{$group_select}}
+
+
+

+
+

+
+
+
+
{{$h_not}}

+

+
+
{{$activity_options}}

+
+{{include file="field_checkbox.tpl" field=$post_newfriend}}
+{{include file="field_checkbox.tpl" field=$post_joingroup}}
+{{include file="field_checkbox.tpl" field=$post_profilechange}}
+
+
+
{{$lbl_not}}

+
+

+{{include file="field_intcheckbox.tpl" field=$notify1}}
+{{include file="field_intcheckbox.tpl" field=$notify2}}
+{{include file="field_intcheckbox.tpl" field=$notify3}}
+{{include file="field_intcheckbox.tpl" field=$notify4}}
+{{include file="field_intcheckbox.tpl" field=$notify5}}
+{{include file="field_intcheckbox.tpl" field=$notify6}}
+{{include file="field_intcheckbox.tpl" field=$notify7}}
+{{include file="field_intcheckbox.tpl" field=$notify8}}
+

+
+

+
+

+
+

+
+
+
{{$h_advn}}

+
{{$h_descadvn}}

+
+{{$pagetype}}
+
+

+
+

+
+
diff --git a/view/tpl/smarty3/settings_account.tpl b/view/tpl/smarty3/settings_account.tpl
new file mode 100644
index 000000000..198ac9565
--- /dev/null
+++ b/view/tpl/smarty3/settings_account.tpl
@@ -0,0 +1,28 @@
+
{{$title}}

+
+
+
+
+
+
+
+
+{{include file="field_input.tpl" field=$email}}
+
+
+
{{$h_pass}}

+
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
+
+
+

+
+

+
+{{$account_settings}}
+
+
+
diff --git a/view/tpl/smarty3/settings_addons.tpl b/view/tpl/smarty3/settings_addons.tpl
new file mode 100644
index 000000000..afddafb36
--- /dev/null
+++ b/view/tpl/smarty3/settings_addons.tpl
@@ -0,0 +1,10 @@
+
{{$title}}

+
+
+
+
+
+{{$settings_addons}}
+
+

+
diff --git a/view/tpl/smarty3/settings_connectors.tpl b/view/tpl/smarty3/settings_connectors.tpl
new file mode 100644
index 000000000..a8bde4c1e
--- /dev/null
+++ b/view/tpl/smarty3/settings_connectors.tpl
@@ -0,0 +1,9 @@
+
{{$title}}

+
+

+
+
+{{$settings_connectors}}
+
+

+
diff --git a/view/tpl/smarty3/settings_display.tpl b/view/tpl/smarty3/settings_display.tpl
new file mode 100644
index 000000000..f8b4c5130
--- /dev/null
+++ b/view/tpl/smarty3/settings_display.tpl
@@ -0,0 +1,22 @@
+
{{$ptitle}}

+
+

+
+
+{{include file="field_themeselect.tpl" field=$theme}}
+{{include file="field_themeselect.tpl" field=$mobile_theme}}
+{{include file="field_input.tpl" field=$ajaxint}}
+{{include file="field_input.tpl" field=$itemspage_network}}
+{{include file="field_checkbox.tpl" field=$nosmile}}
+
+
+

+
+

+
+{{if $theme_config}}
+
Theme settings

+{{$theme_config}}
+{{/if}}
+
+

diff --git a/view/tpl/smarty3/settings_features.tpl b/view/tpl/smarty3/settings_features.tpl
new file mode 100644
index 000000000..3145f60ee
--- /dev/null
+++ b/view/tpl/smarty3/settings_features.tpl
@@ -0,0 +1,16 @@
+
{{$title}}

+
+
+

+
+
+{{foreach $features as $f}}
+	{{include file="field_yesno.tpl" field=$f}}
+{{/foreach}}
+
+

+
+

+
+

+
diff --git a/view/tpl/smarty3/settings_nick_set.tpl b/view/tpl/smarty3/settings_nick_set.tpl
new file mode 100644
index 000000000..85956d97c
--- /dev/null
+++ b/view/tpl/smarty3/settings_nick_set.tpl
@@ -0,0 +1,5 @@
+
+

+
{{$desc}} '{{$nickname}}@{{$basepath}}'{{$subdir}}

+

+

diff --git a/view/tpl/smarty3/settings_nick_subdir.tpl b/view/tpl/smarty3/settings_nick_subdir.tpl
new file mode 100644
index 000000000..a271e0f05
--- /dev/null
+++ b/view/tpl/smarty3/settings_nick_subdir.tpl
@@ -0,0 +1,6 @@
+

+It appears that your website is located in a subdirectory of the

+{{$hostname}} website, so this setting may not work reliably.

+

+
If you have any issues, you may have better results using the profile
 address '{{$baseurl}}/profile/{{$nickname}}'.
+

\ No newline at end of file
diff --git a/view/tpl/smarty3/settings_oauth.tpl b/view/tpl/smarty3/settings_oauth.tpl
new file mode 100644
index 000000000..11c61a43e
--- /dev/null
+++ b/view/tpl/smarty3/settings_oauth.tpl
@@ -0,0 +1,31 @@
+
{{$title}}

+
+
+

+
+
+	
+
+	{{foreach $apps as $app}}
+	

+		
+		{{if $app.name}}
{{$app.name}}
{{else}}
{{$noname}}
{{/if}}
+		{{if $app.my}}
+			{{if $app.oauth_token}}
+			

+			{{/if}}
+		{{/if}}
+		{{if $app.my}}
+		 
+		 
+		{{/if}}		
+	

+	{{/foreach}}
+
+

diff --git a/view/tpl/smarty3/settings_oauth_edit.tpl b/view/tpl/smarty3/settings_oauth_edit.tpl
new file mode 100644
index 000000000..bf805363c
--- /dev/null
+++ b/view/tpl/smarty3/settings_oauth_edit.tpl
@@ -0,0 +1,17 @@
+
{{$title}}

+
+

+
+
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$key}}
+{{include file="field_input.tpl" field=$secret}}
+{{include file="field_input.tpl" field=$redirect}}
+{{include file="field_input.tpl" field=$icon}}
+
+

+
+
+

+
+

diff --git a/view/tpl/smarty3/suggest_friends.tpl b/view/tpl/smarty3/suggest_friends.tpl
new file mode 100644
index 000000000..c8b9dd28d
--- /dev/null
+++ b/view/tpl/smarty3/suggest_friends.tpl
@@ -0,0 +1,16 @@
+

+	
+	

+		
+			{{$name}}
+		
+	

+	

+	

+		{{$name}}
+	

+	

+	{{if $connlnk}}
+	
{{$conntxt}}

+	{{/if}}
+

\ No newline at end of file
diff --git a/view/tpl/smarty3/suggestions.tpl b/view/tpl/smarty3/suggestions.tpl
new file mode 100644
index 000000000..02460b6ad
--- /dev/null
+++ b/view/tpl/smarty3/suggestions.tpl
@@ -0,0 +1,21 @@
+
+

+
+
{{$str_notifytype}} {{$notify_type}}

+
{{$madeby}}

+
{{$fullname}}

+{{$fullname}}
+
{{$note}}

+

+

+
+
+

+

+
+

+{{include file="field_checkbox.tpl" field=$hidden}}
+
+

+

+

diff --git a/view/tpl/smarty3/tag_slap.tpl b/view/tpl/smarty3/tag_slap.tpl
new file mode 100644
index 000000000..c5ed8d148
--- /dev/null
+++ b/view/tpl/smarty3/tag_slap.tpl
@@ -0,0 +1,30 @@
+	
+		
+			{{$name}}
+			{{$profile_page}}
+			
+			
+		
+
+		{{$item_id}}
+		{{$title}}
+		{{$published}}
+		{{$content}}
+		
+		
+		http://activitystrea.ms/schema/1.0/person
+		{{$profile_page}}
+		
+ 		
+		
+		{{$nick}}
+		{{$name}}
+		
+ 		{{$verb}}
+		
+		
+		
+		
+		
+		
+	
diff --git a/view/tpl/smarty3/threaded_conversation.tpl b/view/tpl/smarty3/threaded_conversation.tpl
new file mode 100644
index 000000000..e452fc0b5
--- /dev/null
+++ b/view/tpl/smarty3/threaded_conversation.tpl
@@ -0,0 +1,13 @@
+{{foreach $threads as $thread}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{/foreach}}
+
+

+
+{{if $dropping}}
+
+

+{{/if}}
diff --git a/view/tpl/smarty3/viewcontact_template.tpl b/view/tpl/smarty3/viewcontact_template.tpl
new file mode 100644
index 000000000..18fed6bb4
--- /dev/null
+++ b/view/tpl/smarty3/viewcontact_template.tpl
@@ -0,0 +1,9 @@
+
{{$title}}

+
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+
+

+
+{{$paginate}}
diff --git a/view/tpl/smarty3/wall_item.tpl b/view/tpl/smarty3/wall_item.tpl
new file mode 100644
index 000000000..e810290e6
--- /dev/null
+++ b/view/tpl/smarty3/wall_item.tpl
@@ -0,0 +1,79 @@
+
+

+	

+		

+			

+				
+					{{$item.name}}
+				
+				menu
+				

+					
    
+						{{$item.item_photo_menu}}
+					

+				

+			

+			

+			

+				{{if $item.lock}}
{{$item.lock}}

+				{{else}}
{{/if}}	
+				
{{$item.location}}
				
+			

+		

+		

+				{{$item.name}}
+				
{{$item.ago}}{{if $item.app}}{{$item.str_app}}{{/if}}

+				
+		
	
+		

+			
{{$item.title}}

+			

+			
{{$item.body}}
+					

+						{{foreach $item.tags as $tag}}
+							{{$tag}}
+						{{/foreach}}
+					

+			

+		

+		

+			{{if $item.vote}}
+			
+			{{/if}}
+			{{if $item.plink}}
+				

+			{{/if}}
+			{{if $item.edpost}}
+				
+			{{/if}}
+			 
+			{{if $item.star}}
+			
+			
+			{{/if}}
+			{{if $item.filer}}
+			
+			{{/if}}			
+			

+				{{if $item.drop.dropping}}{{/if}}
+			

+				{{if $item.drop.pagedropping}}{{/if}}
+			

+		

+	

+	

+	
+	
{{$item.dislike}}

+	

+	{{$item.comment}}
+	

+
+

+

diff --git a/view/tpl/smarty3/wall_thread.tpl b/view/tpl/smarty3/wall_thread.tpl
new file mode 100644
index 000000000..6b5d34d84
--- /dev/null
+++ b/view/tpl/smarty3/wall_thread.tpl
@@ -0,0 +1,120 @@
+{{if $item.comment_firstcollapsed}}
+	

+	{{$item.num_comments}} {{$item.hide_text}}
+	

+	{{/if}}
diff --git a/view/tpl/smarty3/wallmessage.tpl b/view/tpl/smarty3/wallmessage.tpl
new file mode 100644
index 000000000..bea386b95
--- /dev/null
+++ b/view/tpl/smarty3/wallmessage.tpl
@@ -0,0 +1,32 @@
+
+
{{$header}}

+
+
{{$subheader}}

+
+

+

+
+{{$parent}}
+
+
{{$to}}

+{{$recipname}}
+
+
{{$subject}}

+
+
+
{{$yourmessage}}

+
+
+
+

+	
+	 
+	

+		
+	
 
+

+

+

+

diff --git a/view/tpl/smarty3/wallmsg-header.tpl b/view/tpl/smarty3/wallmsg-header.tpl
new file mode 100644
index 000000000..09f5b30a7
--- /dev/null
+++ b/view/tpl/smarty3/wallmsg-header.tpl
@@ -0,0 +1,82 @@
+
+
+
+
+
diff --git a/view/tpl/smarty3/wallwall_item.tpl b/view/tpl/smarty3/wallwall_item.tpl
new file mode 100644
index 000000000..4616cf0fa
--- /dev/null
+++ b/view/tpl/smarty3/wallwall_item.tpl
@@ -0,0 +1,86 @@
+
+

+	

+		

+			

+				
+				{{$item.owner_name}}
+			

+			
{{$item.wall}}

+			

+				
+				{{$item.name}}
+				menu
+                

+                    
    
+                        {{$item.item_photo_menu}}
+                    

+                

+
+			

+			

+			

+				{{if $item.lock}}
{{$item.lock}}

+				{{else}}
{{/if}}	
+				
{{$item.location}}

+			

+		

+		

+				{{$item.name}} {{$item.to}} {{$item.owner_name}} {{$item.vwall}}

+				
{{$item.ago}}{{if $item.app}}{{$item.str_app}}{{/if}}

+		
			
+		

+			
{{$item.title}}

+			

+			
{{$item.body}}
+					

+						{{foreach $item.tags as $tag}}
+							{{$tag}}
+						{{/foreach}}
+					

+			

+		

+		

+			{{if $item.vote}}
+			
+			{{/if}}
+			{{if $item.plink}}
+				

+			{{/if}}
+			{{if $item.edpost}}
+				
+			{{/if}}
+			 
+			{{if $item.star}}
+			
+			
+			{{/if}}
+			{{if $item.filer}}
+			
+			{{/if}}			
+			
+			

+				{{if $item.drop.dropping}}{{/if}}
+			

+				{{if $item.drop.pagedropping}}{{/if}}
+			

+		

+	
	
+	

+	
+	
{{$item.dislike}}

+	

+	

+	{{$item.comment}}
+	

+
+

+

+
diff --git a/view/tpl/smarty3/wallwall_thread.tpl b/view/tpl/smarty3/wallwall_thread.tpl
new file mode 100644
index 000000000..cc059429b
--- /dev/null
+++ b/view/tpl/smarty3/wallwall_thread.tpl
@@ -0,0 +1,107 @@
+{{if $item.comment_firstcollapsed}}
+	

+	{{$item.num_comments}} {{$item.hide_text}}
+	

+	{{/if}}
diff --git a/view/tpl/smarty3/xchan_vcard.tpl b/view/tpl/smarty3/xchan_vcard.tpl
new file mode 100644
index 000000000..ed0adb966
--- /dev/null
+++ b/view/tpl/smarty3/xchan_vcard.tpl
@@ -0,0 +1,4 @@
+

+
{{$name}}

+
name

+

diff --git a/view/tpl/smarty3/xrd_diaspora.tpl b/view/tpl/smarty3/xrd_diaspora.tpl
new file mode 100644
index 000000000..aa0d8c740
--- /dev/null
+++ b/view/tpl/smarty3/xrd_diaspora.tpl
@@ -0,0 +1,3 @@
+	
+	
+	
diff --git a/view/tpl/smarty3/xrd_host.tpl b/view/tpl/smarty3/xrd_host.tpl
new file mode 100644
index 000000000..4bcc5bbdb
--- /dev/null
+++ b/view/tpl/smarty3/xrd_host.tpl
@@ -0,0 +1,18 @@
+
+
+ 
+    {{$zhost}}
+ 
+    
+    
+    
+	
+
+    {{$bigkey}}
+
+
+
diff --git a/view/tpl/smarty3/xrd_person.tpl b/view/tpl/smarty3/xrd_person.tpl
new file mode 100644
index 000000000..035ab251f
--- /dev/null
+++ b/view/tpl/smarty3/xrd_person.tpl
@@ -0,0 +1,29 @@
+
+
+ 
+    {{$accturi}}
+	{{$accturi}}
+    {{$profile_url}}
+ 
+    
+    
+    
+    
+    
+    
+ 
+	{{$bigkey}}
+
+
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
index e91c49bb1..0f949265c 100644
--- a/view/tpl/threaded_conversation.tpl
+++ b/view/tpl/threaded_conversation.tpl
@@ -1,6 +1,6 @@
-{{ for $threads as $xyz }}
-{{ for $xyz.items as $item }} 
-{{ inc $item.template }}{{ endinc }}
+{{ for $threads as $thread }}
+{{ for $thread.items as $thread_item }} 
+{{ inc $thread_item.template with $item=$thread_item }}{{ endinc }}
 {{ endfor }}
 {{ endfor }}
 
diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl
index 0ee9594c8..9a02b2103 100644
--- a/view/tpl/wall_thread.tpl
+++ b/view/tpl/wall_thread.tpl
@@ -107,8 +107,8 @@
 
 

 

-{{ for $item.children as $item }}
-	{{ inc $item.template }}{{ endinc }}
+{{ for $item.children as $child }}
+	{{ inc $child.template with $item=$child }}{{ endinc }}
 {{ endfor }}
 
 {{ if $item.flatten }}