3 files changed, 43 insertions, 36 deletions

diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php
index 108e7f9f2..cb0a37ca4 100644
--- a/views/default/forms/profile/edit.php
+++ b/views/default/forms/profile/edit.php
@@ -7,16 +7,22 @@
 
 ?>
 
-<p>
+<div>
 	<label><?php echo elgg_echo('user:name:label'); ?></label>
-	<?php echo elgg_view('input/text',array('internalname' => 'name', 'value' => $vars['entity']->name)); ?>
-</p>
+	<?php echo elgg_view('input/text', array('name' => 'name', 'value' => $vars['entity']->name)); ?>
+</div>
 <?php
 
+$sticky_values = elgg_get_sticky_values('profile:edit');
+
 $profile_fields = elgg_get_config('profile_fields');
 if (is_array($profile_fields) && count($profile_fields) > 0) {
 	foreach ($profile_fields as $shortname => $valtype) {
-		$metadata = get_metadata_byname($vars['entity']->guid, $shortname);
+		$metadata = elgg_get_metadata(array(
+			'guid' => $vars['entity']->guid,
+			'metadata_name' => $shortname,
+			'limit' => false
+		));
 		if ($metadata) {
 			if (is_array($metadata)) {
 				$value = '';
@@ -36,29 +42,40 @@ if (is_array($profile_fields) && count($profile_fields) > 0) {
 			$access_id = ACCESS_DEFAULT;
 		}
 
+		// sticky form values take precedence over saved ones
+		if (isset($sticky_values[$shortname])) {
+			$value = $sticky_values[$shortname];
+		}
+		if (isset($sticky_values['accesslevel'][$shortname])) {
+			$access_id = $sticky_values['accesslevel'][$shortname];
+		}
+
 ?>
-<p>
+<div>
 	<label><?php echo elgg_echo("profile:{$shortname}") ?></label>
 	<?php
 		$params = array(
-			'internalname' => $shortname,
+			'name' => $shortname,
 			'value' => $value,
 		);
 		echo elgg_view("input/{$valtype}", $params);
 		$params = array(
-			'internalname' => "accesslevel[$shortname]",
+			'name' => "accesslevel[$shortname]",
 			'value' => $access_id,
 		);
 		echo elgg_view('input/access', $params);
 	?>
-</p>
+</div>
 <?php
 	}
 }
+
+elgg_clear_sticky_form('profile:edit');
+
 ?>
-<p>
+<div class="elgg-foot">
 <?php
-	echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $vars['entity']->guid));
+	echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid));
 	echo elgg_view('input/submit', array('value' => elgg_echo('save')));
 ?>
-</p>
+</div>
diff --git a/views/default/forms/profile/fields/add.php b/views/default/forms/profile/fields/add.php
index 50d1600fd..2087ec299 100644
--- a/views/default/forms/profile/fields/add.php
+++ b/views/default/forms/profile/fields/add.php
@@ -1,29 +1,29 @@
 <?php
 /**
- * Elgg profile index
- * 
- * @package ElggProfile
+ * Add a new field to the set of custom profile fields
  */
 
 $label_text = elgg_echo('profile:label');
 $type_text = elgg_echo('profile:type');
 
-$label_control = elgg_view('input/text', array('internalname' => 'label'));
-$type_control = elgg_view('input/pulldown', array('internalname' => 'type', 'options_values' => array(
-	'text' => elgg_echo('text'),
-	'longtext' => elgg_echo('longtext'),
-	'tags' => elgg_echo('tags'),
-	'url' => elgg_echo('url'),
-	'email' => elgg_echo('email')
+$label_control = elgg_view('input/text', array('name' => 'label'));
+$type_control = elgg_view('input/dropdown', array('name' => 'type', 'options_values' => array(
+	'text' => elgg_echo('profile:field:text'),
+	'longtext' => elgg_echo('profile:field:longtext'),
+	'tags' => elgg_echo('profile:field:tags'),
+	'url' => elgg_echo('profile:field:url'),
+	'email' => elgg_echo('profile:field:email'),
+	'location' => elgg_echo('profile:field:location'),
+	'date' => elgg_echo('profile:field:date'),
 )));
 
-$submit_control = elgg_view('input/submit', array('internalname' => elgg_echo('add'), 'value' => elgg_echo('add')));
+$submit_control = elgg_view('input/submit', array('name' => elgg_echo('add'), 'value' => elgg_echo('add')));
 
 $formbody = <<< END
-		<p>$label_text: $label_control
-		$type_text: $type_control
-		$submit_control</p>
+		<div>$label_text: $label_control</div>
+		<div class="elgg-foot">$type_text: $type_control
+		$submit_control</div>
 END;
 
-echo "<p class='margin-top'>" . elgg_echo('profile:explainchangefields') . "</p>";
+echo elgg_autop(elgg_echo('profile:explainchangefields'));
 echo $formbody;
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
deleted file mode 100644
index 86ab16e24..000000000
--- a/views/default/forms/profile/fields/reset.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Reset profile fields form
- */
-
-$params = array(
-	'value' => elgg_echo('profile:resetdefault'),
-	'class' => 'elgg-action-button disabled',
-);
-echo elgg_view('input/submit', $params);