Pulled in the interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544

7 files changed, 59 insertions, 66 deletions

diff --git a/views/default/user/search/finishblurb.php b/views/default/user/search/finishblurb.php
index a8c14f357..8371ee4b5 100644
--- a/views/default/user/search/finishblurb.php
+++ b/views/default/user/search/finishblurb.php
@@ -1,20 +1,20 @@
-<?php

-/**

- * @package Elgg

- * @subpackage Core

- * @author Curverider Ltd

- * @link http://elgg.org/

- * @deprecated 1.7

- */

-

-elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7);

-

-if ($vars['count'] > $vars['threshold']) {

-

-?>

-<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php

-	echo elgg_echo("user:search:finishblurb");

-	?></a></div>

-<?php

-

-}

+<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ * @deprecated 1.7
+ */
+
+elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7);
+
+if ($vars['count'] > $vars['threshold']) {
+
+?>
+<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
+	echo elgg_echo("user:search:finishblurb");
+	?></a></div>
+<?php
+
+}
diff --git a/views/default/user/search/startblurb.php b/views/default/user/search/startblurb.php
index e069ec460..5ddb5ddc0 100644
--- a/views/default/user/search/startblurb.php
+++ b/views/default/user/search/startblurb.php
@@ -1,19 +1,19 @@
-<?php

-/**

- * @package Elgg

- * @subpackage Core

- * @author Curverider Ltd

- * @deprecated 1.7

- * @link http://elgg.org/

- */

-

-elgg_deprecated_notice('view user/search/startblurb was deprecated.', 1.7);

-

-?>

-<div class="contentWrapper">

-	<?php

-

-		echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);

-

-	?>

-</div>

+<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @deprecated 1.7
+ * @link http://elgg.org/
+ */
+
+elgg_deprecated_notice('view user/search/startblurb was deprecated.', 1.7);
+
+?>
+<div class="contentWrapper">
+	<?php
+
+		echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);
+
+	?>
+</div>
diff --git a/views/default/user/settings/default_access.php b/views/default/user/settings/default_access.php
index 3a6e6842c..791f3932c 100644
--- a/views/default/user/settings/default_access.php
+++ b/views/default/user/settings/default_access.php
@@ -15,6 +15,7 @@ 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>
 		<?php echo elgg_echo('default_access:label'); ?>:
@@ -24,7 +25,7 @@ if ($vars['config']->allow_user_default_access) {
 
 		?>
 	</p>
-
+</div>
 <?php
 	}
 }
\ No newline at end of file
diff --git a/views/default/user/settings/email.php b/views/default/user/settings/email.php
index 699f72583..7b6ea9f00 100644
--- a/views/default/user/settings/email.php
+++ b/views/default/user/settings/email.php
@@ -12,6 +12,7 @@ $user = page_owner_entity();
 
 if ($user) {
 ?>
+<div class="user_settings email">
 <h3><?php echo elgg_echo('email:settings'); ?></h3>
 <p>
 	<?php echo elgg_echo('email:address:label'); ?>:
@@ -21,6 +22,6 @@ if ($user) {
 
 	?>
 </p>
-
+</div>
 <?php
 }
\ No newline at end of file
diff --git a/views/default/user/settings/language.php b/views/default/user/settings/language.php
index a7a66e5c2..36964a638 100644
--- a/views/default/user/settings/language.php
+++ b/views/default/user/settings/language.php
@@ -13,6 +13,7 @@ $user = page_owner_entity();
 
 if ($user) {
 ?>
+<div class="user_settings language">
 <h3><?php echo elgg_echo('user:set:language'); ?></h3>
 <p>
 
@@ -28,6 +29,6 @@ if ($user) {
 	?>
 
 </p>
-
+</div>
 <?php
 }
\ No newline at end of file
diff --git a/views/default/user/settings/name.php b/views/default/user/settings/name.php
index 2cbfd0bb6..d1d61482a 100644
--- a/views/default/user/settings/name.php
+++ b/views/default/user/settings/name.php
@@ -1,28 +1,17 @@
 <?php
-	/**
-	 * Provide a way of setting your full name.
-	 *
-	 * @package Elgg
-	 * @subpackage Core
+/**
+ * Provide a way of setting your full name.
+ *
+ * @package Elgg
+ * @subpackage Core
 
-	 * @author Curverider Ltd
+ * @author Curverider Ltd
 
-	 * @link http://elgg.org/
-	 */
+ * @link http://elgg.org/
+ */
 
-	$user = page_owner_entity();
+$user = page_owner_entity();
 
-if ($user) {
-?>
-	<h3><?php echo elgg_echo('user:set:name'); ?></h3>
-	<p>
-		<?php echo elgg_echo('user:name:label'); ?>:
-		<?php
-
-			echo elgg_view('input/text', array('internalname' => 'name', 'value' => $user->name));
-			echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid));
-		?>
-	</p>
-
-<?php
-}
\ No newline at end of file
+// all hidden, but necessary for properly updating user details
+echo elgg_view('input/hidden', array('internalname' => 'name', 'value' => $user->name));
+echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid));
diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php
index 5cefe3821..68db18136 100644
--- a/views/default/user/settings/password.php
+++ b/views/default/user/settings/password.php
@@ -12,6 +12,7 @@ $user = page_owner_entity();
 
 if ($user) {
 ?>
+<div class="user_settings password">
 <h3><?php echo elgg_echo('user:set:password'); ?></h3>
 <p>
 	<?php echo elgg_echo('user:password:label'); ?>:
@@ -22,6 +23,6 @@ if ($user) {
 		echo elgg_view('input/password',array('internalname' => 'password2'));
 	?>
 </p>
-
+</div>
 <?php
 }
\ No newline at end of file