Merge pull request #8232 from nupplaphil/task/notify_email_builder

[friendica.git] / view / templates / settings / settings.tpl

diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl
index c95c0b14307787e6935a6f60f953ac5d4482eede..3811e4f25c4169e1c25f2f3cb45568b9db63256a 100644 (file)
--- a/view/templates/settings/settings.tpl
+++ b/view/templates/settings/settings.tpl
@@ -2,7 +2,7 @@
 
 {{$nickname_block nofilter}}
 
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<form action="settings" id="settings-form" method="post" autocomplete="off" enctype="multipart/form-data" >
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 <h3 class="settings-heading"><a href="javascript:;">{{$h_pass}}</a></h3>
@@ -72,10 +72,10 @@
        <div style="display: none;">
                <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
                        <h3>{{$expire.advanced}}</h3>
-                       {{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}}
+                       {{include file="field_checkbox.tpl" field=$expire.items}}
+                       {{include file="field_checkbox.tpl" field=$expire.notes}}
+                       {{include file="field_checkbox.tpl" field=$expire.starred}}
+                       {{include file="field_checkbox.tpl" field=$expire.network_only}}
                </div>
        </div>
 
@@ -114,7 +114,7 @@
 <div class="settings-content-block">
 <div id="settings-notifications">
 
-<div id="settings-notify-desc">{{$lbl_not}}</div>
+<div id="settings-notification-desc">{{$lbl_not}}</div>
 
 <div class="group">
 {{include file="field_intcheckbox.tpl" field=$notify1}}
@@ -130,7 +130,7 @@
 {{include file="field_checkbox.tpl" field=$email_textonly}}
 {{include file="field_checkbox.tpl" field=$detailed_notif}}
 
-{{include file="field_yesno.tpl" field=$desktop_notifications}}
+{{include file="field_checkbox.tpl" field=$desktop_notifications}}
 <script>
 (function(){
     var elm = $("#id_{{$desktop_notifications.0}}_onoff");
@@ -196,6 +196,17 @@
 </div>
 </div>
 
+<h3 class="settings-heading"><a href="javascript:;">{{$importcontact}}</a></h3>
+<div class="settings-content-block">
+<input type="hidden" name="MAX_FILE_SIZE" value="{{$importcontact_maxsize}}" />
+<div id="settings-pagetype-desc">{{$importcontact_text}}</div>
+<input type="file" name="importcontact-filename" />
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="importcontact-submit" class="importcontact-submit" value="{{$importcontact_button}}" />
+</div>
+</div>
+
 <h3 class="settings-heading"><a href="javascript:;">{{$relocate}}</a></h3>
 <div class="settings-content-block">
 <div id="settings-pagetype-desc">{{$relocate_text}}</div>