Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 11 insertions, 11 deletions

diff --git a/views/default/forms/profile/fields/add.php b/views/default/forms/profile/fields/add.php
index 7961037e6..1ea9c57a9 100644
--- a/views/default/forms/profile/fields/add.php
+++ b/views/default/forms/profile/fields/add.php
@@ -1,8 +1,6 @@
 <?php
 /**
- * Elgg profile index
- * 
- * @package ElggProfile
+ * Add a new field to the set of custom profile fields
  */
 
 $label_text = elgg_echo('profile:label');
@@ -10,19 +8,21 @@ $type_text = elgg_echo('profile:type');
 
 $label_control = elgg_view('input/text', array('name' => 'label'));
 $type_control = elgg_view('input/dropdown', array('name' => 'type', 'options_values' => array(
-	'text' => elgg_echo('text'),
-	'longtext' => elgg_echo('longtext'),
-	'tags' => elgg_echo('tags'),
-	'url' => elgg_echo('url'),
-	'email' => elgg_echo('email')
+	'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('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 autop(elgg_echo('profile:explainchangefields'));