diff options
| author | friendica <info@friendica.com> | 2015-03-04 01:26:29 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-04 01:26:29 -0800 |
| commit | b471d2a3d19d21543ab84a64db2439dc1b36c77f (patch) | |
| tree | 20942cb0b032dbdb270e88db3ccde18bb33b2ac6 /view/tpl | |
| parent | 64e7c8b20f241f7f63ad78c23fdf872f3422d561 (diff) | |
| parent | 4b08ccd873a02dcbcd8603f4b8681de47776e31f (diff) | |
| download | volse-hubzilla-b471d2a3d19d21543ab84a64db2439dc1b36c77f.tar.gz volse-hubzilla-b471d2a3d19d21543ab84a64db2439dc1b36c77f.tar.bz2 volse-hubzilla-b471d2a3d19d21543ab84a64db2439dc1b36c77f.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/settings_account.tpl | 44 | ||||
| -rwxr-xr-x | view/tpl/settings_features.tpl | 49 |
2 files changed, 47 insertions, 46 deletions
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 36bb494d8..5f1f9c9b1 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -1,28 +1,20 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> - - -<form action="settings/account" id="settings-account-form" method="post" autocomplete="off" > -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - -{{include file="field_input.tpl" field=$email}} - - -<h3 class="settings-heading">{{$h_pass}}</h3> - -{{include file="field_password.tpl" field=$password1}} -{{include file="field_password.tpl" field=$password2}} - - -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <a title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" href="removeaccount"><i class="icon-trash"></i> {{$removeme}}</a> + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> + <form action="settings/account" id="settings-account-form" method="post" autocomplete="off" > + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <div class="section-content-tools-wrapper"> + {{include file="field_input.tpl" field=$email}} + {{include file="field_password.tpl" field=$password1}} + {{include file="field_password.tpl" field=$password2}} + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + {{$account_settings}} + </div> + </form> </div> -{{$account_settings}} - -<div id="settings-remove-account-link"> -<h3 class="settings-heading">{{$removeme}}</h3> -<div id="settings-remove-account-desc">{{$removeaccount}}</div> -<button title="{{$permanent}}" class="btn btn-danger" type="submit" formaction="removeaccount">{{$removeme}}</button> -</div> -</div> diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index 3ede4c76d..75eb34fb9 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,21 +1,30 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> - - -<form action="settings/features" method="post" autocomplete="off"> -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - -{{foreach $features as $f}} -<h3 class="settings-heading">{{$f.0}}</h3> - -{{foreach $f.1 as $fcat}} - {{include file="field_checkbox.tpl" field=$fcat}} -{{/foreach}} -{{/foreach}} - -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" /> -</div> - -</form> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <form action="settings/features" method="post" autocomplete="off"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <div class="panel-group" id="settings" role="tablist" aria-multiselectable="true"> + {{foreach $features as $g => $f}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title"> + <h3> + <a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse"> + {{$f.0}} + </a> + </h3> + </div> + <div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} in{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title"> + <div class="section-content-tools-wrapper"> + {{foreach $f.1 as $fcat}} + {{include file="field_checkbox.tpl" field=$fcat}} + {{/foreach}} + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + {{/foreach}} + </div> </div> |