Merge pull request #7828 from nupplaphil/task/move_enotify

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

diff --git a/view/theme/frio/templates/settings/settings.tpl b/view/theme/frio/templates/settings/settings.tpl
index 40b0497a0813058374c87ac175b25d4297ecf69b..4ed94b182736603c035b750546abf440867f2952 100644 (file)
--- a/view/theme/frio/templates/settings/settings.tpl
+++ b/view/theme/frio/templates/settings/settings.tpl
@@ -2,7 +2,7 @@
        {{* include the title template for the settings title *}}
        {{include file="section_title.tpl" title=$ptitle }}
 
-       {{$nickname_block}}
+       {{$nickname_block nofilter}}
 
        <form action="settings" id="settings-form" method="post" autocomplete="off" >
                <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
@@ -26,10 +26,11 @@
 
                                                {{if $oid_enable}}
                                                {{include file="field_input.tpl" field=$openid}}
+                                               {{include file="field_checkbox.tpl" field=$delete_openid}}
                                                {{/if}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
@@ -57,7 +58,7 @@
                                                {{include file="field_checkbox.tpl" field=$allowloc}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
@@ -80,28 +81,26 @@
 
                                                {{include file="field_input.tpl" field=$maxreq}}
 
-                                               {{$profile_in_dir}}
+                                               {{$profile_in_dir nofilter}}
 
-                                               {{$profile_in_net_dir}}
+                                               {{$profile_in_net_dir nofilter}}
 
-                                               {{$hide_friends}}
+                                               {{$hide_friends nofilter}}
 
-                                               {{$hide_wall}}
+                                               {{$hide_wall nofilter}}
 
-                                               {{$blockwall}}
+                                               {{$blockwall nofilter}}
 
-                                               {{$blocktags}}
+                                               {{$blocktags nofilter}}
 
-                                               {{$suggestme}}
-
-                                               {{$unkmail}}
+                                               {{$suggestme nofilter}}
 
+                                               {{$unkmail nofilter}}
 
                                                {{include file="field_input.tpl" field=$cntunkmail}}
 
                                                {{include file="field_input.tpl" field=$expire.days}}
 
-
                                                <div id="settings-advanced-expire">
                                                        <a id="advanced-expire-menu" title="{{$expire.advanced}}" data-toggle="modal" data-target="#aeModal">{{$expire.label}}</a>
 
@@ -138,7 +137,7 @@
                                                                                        <h4 class="modal-title">{{$permissions}}</h4>
                                                                                </div>
                                                                                <div class="modal-body">
-                                                                                       {{$aclselect}}
+                                                                                       {{$aclselect nofilter}}
                                                                                </div>
                                                                        </div>
                                                                </div>
@@ -147,11 +146,10 @@
                                                <br/>
                                                <div class="clear"></div>
 
-                                               {{$group_select}}
-
+                                               {{$group_select nofilter}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
@@ -241,7 +239,7 @@
                                                </div>
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
@@ -262,10 +260,35 @@
 
                                                <div id="settings-pagetype-desc">{{$h_descadvn}}</div>
 
-                                               {{$pagetype}}
+                                               {{$pagetype nofilter}}
+
+                                               <div class="form-group pull-right settings-submit-wrapper" >
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+                                               </div>
+                                               <div class="clear"></div>
+                                       </div>
+                               </div>
+                       </div>
 
+                       {{* Import contacts CSV *}}
+                       <div class="panel">
+                               <div class="section-subtitle-wrapper" role="tab" id="importcontact-settings">
+                                       <h4>
+                                               <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#importcontact-settings-collapse" aria-expanded="false" aria-controls="importcontact-settings-collapse">
+                                                       {{$importcontact}}
+                                               </a>
+                                       </h4>
+                               </div>
+                               <div id="importcontact-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="importcontact-settings">
+                                       <div class="section-content-tools-wrapper">
+
+                                               <div id="importcontact-relocate-desc">{{$importcontact_text}}</div>
+                                               <input type="hidden" name="MAX_FILE_SIZE" value="{{$importcontact_maxsize}}" />
+                                               <input type="file" name="importcontact-filename" />
+
+                                               <br/>
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="importcontact-submit" class="btn btn-primary" value="{{$importcontact_button}}">{{$importcontact_button}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
@@ -288,7 +311,7 @@
 
                                                <br/>
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="resend_relocate" class="btn btn-primary" value="{{$relocate_button|escape:'html'}}">{{$relocate_button|escape:'html'}}</button>
+                                                       <button type="submit" name="resend_relocate" class="btn btn-primary" value="{{$relocate_button}}">{{$relocate_button}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>