diff options
| author | friendica <info@friendica.com> | 2015-04-23 19:49:41 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-04-23 19:49:41 -0700 |
| commit | 6679734135fb04f4a7beccb81663bf1e9574f062 (patch) | |
| tree | 887488543d98b5dd297d917718bdd99844e83ba5 /view/tpl/settings_account.tpl | |
| parent | 08b757a22cd2804bfec8ecf682b6987b8c06ca49 (diff) | |
| parent | c696860cc53bc25558d83de5eda65d9b583da382 (diff) | |
| download | volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.tar.gz volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.tar.bz2 volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.zip | |
Merge branch 'master' into tres
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
Diffstat (limited to 'view/tpl/settings_account.tpl')
| -rwxr-xr-x | view/tpl/settings_account.tpl | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 36bb494d8..9f550fe4a 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="{{$removeaccount}}" 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> |