diff --git a/view/templates/admin_aside.tpl b/view/templates/admin_aside.tpl
index a9d26a89f0..0f28a1cf37 100644
--- a/view/templates/admin_aside.tpl
+++ b/view/templates/admin_aside.tpl
@@ -40,3 +40,8 @@
{{$admin.logs.1}}
+{{$diagnosticstxt}}
+
diff --git a/view/templates/admin_logs.tpl b/view/templates/admin_logs.tpl
index e5412429f4..4cc0acb66c 100644
--- a/view/templates/admin_logs.tpl
+++ b/view/templates/admin_logs.tpl
@@ -2,13 +2,13 @@
{{$title}} - {{$page}}
diff --git a/view/templates/admin_remoteupdate.tpl b/view/templates/admin_remoteupdate.tpl
index 24f7f9bfa6..c3e85f2e80 100644
--- a/view/templates/admin_remoteupdate.tpl
+++ b/view/templates/admin_remoteupdate.tpl
@@ -66,7 +66,7 @@
Friendica Update
-
+
@@ -77,10 +77,10 @@
- New version:
- {{$remoteversion}}
diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 166b35e7d4..6880f0fd91 100644
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -46,7 +46,10 @@
{{include file="field_input.tpl" field=$sitename}}
{{include file="field_input.tpl" field=$hostname}}
+ {{include file="field_input.tpl" field=$sender_email}}
{{include file="field_textarea.tpl" field=$banner}}
+ {{include file="field_input.tpl" field=$shortcut_icon}}
+ {{include file="field_input.tpl" field=$touch_icon}}
{{include file="field_textarea.tpl" field=$info}}
{{include file="field_select.tpl" field=$language}}
{{include file="field_select.tpl" field=$theme}}
@@ -58,7 +61,7 @@
{{include file="field_select.tpl" field=$singleuser}}
-
+
{{$registration}}
{{include file="field_input.tpl" field=$register_text}}
@@ -68,7 +71,7 @@
{{include file="field_checkbox.tpl" field=$no_openid}}
{{include file="field_checkbox.tpl" field=$no_regfullname}}
-
+
{{$upload}}
{{include file="field_input.tpl" field=$maximagesize}}
@@ -80,7 +83,8 @@
{{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_select.tpl" field=$community_page_style}}
+ {{include file="field_input.tpl" field=$max_author_posts_community_page}}
{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
{{include file="field_select.tpl" field=$ostatus_poll_interval}}
{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
@@ -92,7 +96,7 @@
{{include file="field_checkbox.tpl" field=$private_addons}}
{{include file="field_checkbox.tpl" field=$disable_embedded}}
{{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
-
+
{{$advanced}}
{{include file="field_checkbox.tpl" field=$no_utf}}
@@ -108,15 +112,17 @@
{{include file="field_input.tpl" field=$temppath}}
{{include file="field_input.tpl" field=$basepath}}
{{include file="field_checkbox.tpl" field=$suppress_language}}
+ {{include file="field_checkbox.tpl" field=$suppress_tags}}
{{$performance}}
- {{include file="field_checkbox.tpl" field=$disable_noscrape}}
{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
+ {{include file="field_checkbox.tpl" field=$only_tag_search}}
{{include file="field_input.tpl" field=$itemcache}}
{{include file="field_input.tpl" field=$itemcache_duration}}
{{include file="field_input.tpl" field=$max_comments}}
{{include file="field_checkbox.tpl" field=$proxy_disabled}}
-
+ {{include file="field_checkbox.tpl" field=$old_pager}}
+
@@ -125,8 +131,8 @@
{{$relocate}}
{{include file="field_input.tpl" field=$relocate_url}}
-
-
+
+
diff --git a/view/templates/admin_users.tpl b/view/templates/admin_users.tpl
index 4e0b9650ef..fc3c6377f1 100644
--- a/view/templates/admin_users.tpl
+++ b/view/templates/admin_users.tpl
@@ -43,7 +43,7 @@
-
+
{{else}}
{{$no_pending}}
{{/if}}
@@ -88,7 +88,7 @@
-
+
{{else}}
NO USERS?!?
{{/if}}
@@ -133,6 +133,6 @@
-
+
diff --git a/view/templates/album_edit.tpl b/view/templates/album_edit.tpl
index 72aedd8b70..3d1d7573d7 100644
--- a/view/templates/album_edit.tpl
+++ b/view/templates/album_edit.tpl
@@ -4,12 +4,12 @@
-
+
-
-
+
+
diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl
index 8d7d3ff3d9..b987b7849c 100644
--- a/view/templates/auto_request.tpl
+++ b/view/templates/auto_request.tpl
@@ -26,9 +26,9 @@
{{if $myaddr}}
{{$myaddr}}
-
+
{{else}}
-
+
{{/if}}
@@ -39,7 +39,7 @@
-
-
+
+
diff --git a/view/templates/comment_item.tpl b/view/templates/comment_item.tpl
index 621c15d43e..fa360df3a8 100644
--- a/view/templates/comment_item.tpl
+++ b/view/templates/comment_item.tpl
@@ -22,14 +22,14 @@
{{/if}}
diff --git a/view/templates/confirm.tpl b/view/templates/confirm.tpl
index 6744ac4f74..bb9e159078 100644
--- a/view/templates/confirm.tpl
+++ b/view/templates/confirm.tpl
@@ -4,11 +4,11 @@
{{$message}}
{{foreach $extra_inputs as $input}}
-
+
{{/foreach}}
-
-
+
+
diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index 9b57f17417..65af34c6bb 100644
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -73,7 +73,7 @@
{{$lbl_info1}}
-
+
@@ -85,7 +85,7 @@
{{$profile_select}}
-
+
diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl
index 5797196ebb..896f9af4c9 100644
--- a/view/templates/contacts-template.tpl
+++ b/view/templates/contacts-template.tpl
@@ -6,8 +6,8 @@
@@ -21,7 +21,7 @@
{{foreach $batch_actions as $n=>$l}}
-
+
{{/foreach}}
diff --git a/view/templates/crepair.tpl b/view/templates/crepair.tpl
index 37e2ef417b..a94f1f2d3c 100644
--- a/view/templates/crepair.tpl
+++ b/view/templates/crepair.tpl
@@ -3,35 +3,35 @@
{{$contact_name}}
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -42,7 +42,7 @@
{{include file="field_select.tpl" field=$remote_self}}
{{/if}}
-
+
diff --git a/view/templates/cropbody.tpl b/view/templates/cropbody.tpl
index 47bb73b47a..4cf030bc9d 100644
--- a/view/templates/cropbody.tpl
+++ b/view/templates/cropbody.tpl
@@ -52,7 +52,7 @@
-
+
diff --git a/view/templates/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl
index accfd4f83f..d49b5bbf2d 100644
--- a/view/templates/dfrn_req_confirm.tpl
+++ b/view/templates/dfrn_req_confirm.tpl
@@ -17,6 +17,6 @@
-
+
\ No newline at end of file
diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
index d724785865..44c8ef1e6a 100644
--- a/view/templates/dfrn_request.tpl
+++ b/view/templates/dfrn_request.tpl
@@ -25,9 +25,9 @@
{{if $myaddr}}
{{$myaddr}}
-
+
{{else}}
-
+
{{/if}}
@@ -69,7 +69,7 @@
-
-
+
+
diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
index 29393aeda3..2274f2e1f8 100644
--- a/view/templates/directory_header.tpl
+++ b/view/templates/directory_header.tpl
@@ -9,8 +9,8 @@
diff --git a/view/templates/event_form.tpl b/view/templates/event_form.tpl
index cb7ba53af0..45e2ea71e0 100644
--- a/view/templates/event_form.tpl
+++ b/view/templates/event_form.tpl
@@ -28,7 +28,7 @@
{{$t_text}}
-
+
{{$d_text}}
@@ -44,7 +44,7 @@
{{$acl}}
-
+
diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl
index 3d69e2d272..a2f7c3f27e 100644
--- a/view/templates/field_combobox.tpl
+++ b/view/templates/field_combobox.tpl
@@ -4,13 +4,13 @@
{{* html5 don't work on Chrome, Safari and IE9
*}}
{{$field.3}}
diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl
index ae8fe844a3..6a3328c5cc 100644
--- a/view/templates/field_input.tpl
+++ b/view/templates/field_input.tpl
@@ -1,6 +1,6 @@
-
+
{{$field.3}}
diff --git a/view/templates/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl
index dd77e50018..2f3c27d920 100644
--- a/view/templates/field_intcheckbox.tpl
+++ b/view/templates/field_intcheckbox.tpl
@@ -2,6 +2,6 @@
-
+
{{$field.4}}
diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl
index d8a9394a15..e5f236c679 100644
--- a/view/templates/field_openid.tpl
+++ b/view/templates/field_openid.tpl
@@ -1,6 +1,6 @@
-
+
{{$field.3}}
diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl
index 2e9e91529a..8a9f0dc330 100644
--- a/view/templates/field_password.tpl
+++ b/view/templates/field_password.tpl
@@ -1,6 +1,6 @@
-
+
{{$field.3}}
diff --git a/view/templates/field_radio.tpl b/view/templates/field_radio.tpl
index 09db114720..86cc8fc47e 100644
--- a/view/templates/field_radio.tpl
+++ b/view/templates/field_radio.tpl
@@ -2,6 +2,6 @@
-
+
{{$field.3}}
diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl
index a3274f51af..4fbbd4beb0 100644
--- a/view/templates/field_select.tpl
+++ b/view/templates/field_select.tpl
@@ -3,7 +3,7 @@
{{$field.3}}
diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl
index b250520d7b..edd25dbe0f 100644
--- a/view/templates/field_themeselect.tpl
+++ b/view/templates/field_themeselect.tpl
@@ -3,7 +3,7 @@
{{$field.3}}
{{if $field.5}}
{{/if}}
diff --git a/view/templates/field_yesno.tpl b/view/templates/field_yesno.tpl
index 4a471ccdc1..de70c5ae6d 100644
--- a/view/templates/field_yesno.tpl
+++ b/view/templates/field_yesno.tpl
@@ -2,7 +2,7 @@
-
+
{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
diff --git a/view/templates/filebrowser.tpl b/view/templates/filebrowser.tpl
index cde4e603ca..b207277a7b 100644
--- a/view/templates/filebrowser.tpl
+++ b/view/templates/filebrowser.tpl
@@ -78,7 +78,7 @@
-
+