5 files changed, 70 insertions, 57 deletions

diff --git a/views/default/core/settings/account/default_access.php b/views/default/core/settings/account/default_access.php
index e7c280198..3fbf3d32d 100644
--- a/views/default/core/settings/account/default_access.php
+++ b/views/default/core/settings/account/default_access.php
@@ -13,16 +13,20 @@ if ($vars['config']->allow_user_default_access) {
 			$default_access = $vars['config']->default_access;
 		}
 ?>
-<div class="user-settings access">
-	<h3><?php echo elgg_echo('default_access:settings'); ?></h3>
-	<p>
+<div class="elgg-module elgg-info-module">
+	<div class="elgg-head">
+		<h3><?php echo elgg_echo('default_access:settings'); ?></h3>
+	</div>
+	<div class="elgg-body">
+		<p>
 		<?php echo elgg_echo('default_access:label'); ?>:
 		<?php
 
 			echo elgg_view('input/access',array('internalname' => 'default_access', 'value' => $default_access));
 
 		?>
-	</p>
+		</p>
+	</div>
 </div>
 <?php
 	}
diff --git a/views/default/core/settings/account/email.php b/views/default/core/settings/account/email.php
index 396f8e79b..b0d69eb82 100644
--- a/views/default/core/settings/account/email.php
+++ b/views/default/core/settings/account/email.php
@@ -10,16 +10,18 @@ $user = elgg_get_page_owner();
 
 if ($user) {
 ?>
-<div class="user-settings email">
-<h3><?php echo elgg_echo('email:settings'); ?></h3>
-<p>
-	<?php echo elgg_echo('email:address:label'); ?>:
-	<?php
-
-		echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email));
-
-	?>
-</p>
+<div class="elgg-module elgg-info-module">
+	<div class="elgg-head">
+		<h3><?php echo elgg_echo('email:settings'); ?></h3>
+	</div>
+	<div class="elgg-body">
+		<p>
+			<?php echo elgg_echo('email:address:label'); ?>:
+			<?php
+			echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email));
+			?>
+		</p>
+	</div>
 </div>
 <?php
 }
\ No newline at end of file
diff --git a/views/default/core/settings/account/language.php b/views/default/core/settings/account/language.php
index ada133791..45d121c15 100644
--- a/views/default/core/settings/account/language.php
+++ b/views/default/core/settings/account/language.php
@@ -11,22 +11,22 @@ $user = elgg_get_page_owner();
 
 if ($user) {
 ?>
-<div class="user-settings language">
-<h3><?php echo elgg_echo('user:set:language'); ?></h3>
-<p>
-
-	<?php echo elgg_echo('user:language:label'); ?>: <?php
-
-		$value = $CONFIG->language;
-		if ($user->language) {
-			$value = $user->language;
-		}
-
-		echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations()));
-
-	?>
-
-</p>
+<div class="elgg-module elgg-info-module">
+	<div class="elgg-head">
+		<h3><?php echo elgg_echo('user:set:language'); ?></h3>
+	</div>
+	<div class="elgg-body">
+		<p>
+			<?php echo elgg_echo('user:language:label'); ?>:
+			<?php
+			echo elgg_view("input/pulldown", array(
+				'internalname' => 'language',
+				'value' => $value,
+				'options_values' => get_installed_translations()
+			));
+			?>
+		</p>
+	</div>
 </div>
 <?php
 }
\ No newline at end of file
diff --git a/views/default/core/settings/account/notifications.php b/views/default/core/settings/account/notifications.php
index afb142ebe..1a54b1a98 100644
--- a/views/default/core/settings/account/notifications.php
+++ b/views/default/core/settings/account/notifications.php
@@ -10,8 +10,11 @@ global $NOTIFICATION_HANDLERS;
 $notification_settings = get_user_notification_settings(elgg_get_page_owner_guid());
 
 ?>
-<div class="user-settings notifications">
-<h3><?php echo elgg_echo('notifications:usersettings'); ?></h3>
+<div class="elgg-module elgg-info-module">
+	<div class="elgg-head">
+		<h3><?php echo elgg_echo('notifications:usersettings'); ?></h3>
+	</div>
+	<div class="elgg-body">
 
 <p><?php echo elgg_echo('notifications:methods'); ?>
 
@@ -48,4 +51,5 @@ $notification_settings = get_user_notification_settings(elgg_get_page_owner_guid
 	}
 ?>
 </table>
+	</div>
 </div>
\ No newline at end of file
diff --git a/views/default/core/settings/account/password.php b/views/default/core/settings/account/password.php
index 0bd7f38f8..8e200754e 100644
--- a/views/default/core/settings/account/password.php
+++ b/views/default/core/settings/account/password.php
@@ -10,33 +10,36 @@ $user = elgg_get_page_owner();
 
 if ($user) {
 ?>
-<div class="user-settings password">
-<h3><?php echo elgg_echo('user:set:password'); ?></h3>
+<div class="elgg-module elgg-info-module">
+	<div class="elgg-head">
+		<h3><?php echo elgg_echo('user:set:password'); ?></h3>
+	</div>
+	<div class="elgg-body">
+		<?php
+			// only make the admin user enter current password for changing his own password.
+			if (!isadminloggedin() || isadminloggedin() && $user->guid == get_loggedin_userid()) {
+		?>
+		<p>
+		<?php echo elgg_echo('user:current_password:label'); ?>:
+		<?php
+			echo elgg_view('input/password', array('internalname' => 'current_password'));
+		?>
+		</p>
+		<?php } ?>
 
-	<?php
-		// only make the admin user enter current password for changing his own password.
-		if (!isadminloggedin() || isadminloggedin() && $user->guid == get_loggedin_userid()) {
-	?>
-	<p>
-	<?php echo elgg_echo('user:current_password:label'); ?>:
-	<?php
-		echo elgg_view('input/password', array('internalname' => 'current_password'));
-	?>
-	</p>
-	<?php } ?>
+		<p>
+		<?php echo elgg_echo('user:password:label'); ?>:
+		<?php
+			echo elgg_view('input/password', array('internalname' => 'password'));
+		?>
+		</p>
 
-	<p>
-	<?php echo elgg_echo('user:password:label'); ?>:
-	<?php
-		echo elgg_view('input/password', array('internalname' => 'password'));
-	?>
-	</p>
-
-	<p>
-	<?php echo elgg_echo('user:password2:label'); ?>: <?php
-		echo elgg_view('input/password', array('internalname' => 'password2'));
-	?>
-	</p>
+		<p>
+		<?php echo elgg_echo('user:password2:label'); ?>: <?php
+			echo elgg_view('input/password', array('internalname' => 'password2'));
+		?>
+		</p>
+	</div>
 </div>
 <?php
 }
\ No newline at end of file