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

4 files changed, 51 insertions, 49 deletions

diff --git a/mod/settings.php b/mod/settings.php
index 71ca38d91..a40a1deca 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -708,9 +708,8 @@ function settings_content(&$a) {
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_account"),
 			'$title'	=> t('Account Settings'),
-			'$h_pass' 	=> t('Password Settings'),
-			'$password1'=> array('npassword', t('New Password:'), '', ''),
-			'$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
+			'$password1'=> array('npassword', t('Enter New Password:'), '', ''),
+			'$password2'=> array('confirm', t('Confirm New Password:'), '', t('Leave password fields blank unless changing')),
 			'$submit' 	=> t('Submit'),
 			'$email' 	=> array('email', t('Email Address:'), $email, ''),
 			'$removeme' => t('Remove Account'),
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 787deb6ea..87e12a9b3 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1938,6 +1938,8 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	color: #31708f;
 	background-color: #d9edf7;
 	margin-bottom: 3px;
+	border-radius: $radiuspx;
+	text-align: center;
 }
 .section-content-wrapper {
 	padding: 7px 10px;
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>&nbsp;{{$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>