harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2015-03-04 01:31:45 -08:00
commit 32968745fe
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod/settings.php
View File

@ -713,8 +713,7 @@ function settings_content(&$a) {
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$email' => array('email', t('Email Address:'), $email, ''), '$email' => array('email', t('Email Address:'), $email, ''),
'$removeme' => t('Remove Account'), '$removeme' => t('Remove Account'),
'$removeaccount' => t('Remove this account from this server including all its channels'), '$removeaccount' => t('Remove this account including all its channels'),
'$permanent' => t('Warning: This action is permanent and cannot be reversed.'),
'$account_settings' => $account_settings '$account_settings' => $account_settings
)); ));
return $o; return $o;
@ -1129,8 +1128,8 @@ function settings_content(&$a) {
'$lbl_misc' => t('Miscellaneous Settings'), '$lbl_misc' => t('Miscellaneous Settings'),
'$menus' => $menu, '$menus' => $menu,
'$menu_desc' => t('Personal menu to display in your channel pages'), '$menu_desc' => t('Personal menu to display in your channel pages'),
'$removeme' => t('Remove this channel'), '$removeme' => t('Remove Channel'),
'$permanent' => t('Warning: This action is permanent and cannot be reversed.'), '$removechannel' => t('Remove this channel.'),
)); ));
call_hooks('settings_form',$o); call_hooks('settings_form',$o);

2
view/tpl/settings.tpl
View File

@ -1,6 +1,6 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<a title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a> <a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
<h2>{{$ptitle}}</h2> <h2>{{$ptitle}}</h2>
<div class="clear"></div> <div class="clear"></div>
</div> </div>

2
view/tpl/settings_account.tpl
View File

@ -1,6 +1,6 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<a title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" href="removeaccount"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a> <a title="{{$removeaccount}}" class="btn btn-danger btn-xs pull-right" href="removeaccount"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
<h2>{{$title}}</h2> <h2>{{$title}}</h2>
<div class="clear"></div> <div class="clear"></div>
</div> </div>