7 files changed, 19 insertions, 22 deletions
diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php
index 91d14b874..f1d78c19f 100644
--- a/views/default/admin/appearance/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
@@ -5,12 +5,20 @@
 
 $add = elgg_view_form('profile/fields/add', array('class' => 'elgg-form-settings'), array());
 $list = elgg_view('admin/appearance/profile_fields/list');
-$reset = elgg_view_form('profile/fields/reset', array(), array());
+
+$reset = elgg_view('output/confirmlink', array(
+	'text' => elgg_echo('reset'),
+	'href' => 'action/profile/fields/reset',
+	'title' => elgg_echo('profile:resetdefault'),
+	'confirm' => elgg_echo('profile:resetdefault:confirm'),
+	'class' => 'elgg-button elgg-button-cancel',
+	'is_trusted' => 'true',
+));
 
 $body = <<<__HTML
 $add
 $list
-$reset
+<div class="mtl">$reset</div>
 __HTML;
 
 echo $body;
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 9891510e0..22a8d9211 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -55,13 +55,13 @@ HTML;
 
 	//@todo need link to actual comment!
 
-	$on = elgg_echo('on');
+	$commented_on = elgg_echo('generic_comment:on', array($commenter_link, $entity_link));
 
 	$excerpt = elgg_get_excerpt($comment->value, 80);
 
 	$body = <<<HTML
 <span class="elgg-subtext">
-	$commenter_link $on $entity_link ($friendlytime): $excerpt
+	$commented_on ($friendlytime): $excerpt
 </span>
 HTML;
 
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index 25a2bffb7..9d92752b4 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -118,4 +118,4 @@
 }
 .elgg-page-footer a:hover {
 	color: #666;
-}
-\ No newline at end of file
+}
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index 74092c774..a37ae094b 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -191,4 +191,4 @@ a.elgg-widget-collapsed:before {
 .elgg-widget-placeholder {
 	border: 2px dashed #dedede;
 	margin-bottom: 15px;
-}
-\ No newline at end of file
+}
diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index 4c2c3c774..c044cb1cc 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -157,6 +157,6 @@ h6 { font-size: 0.8em; }
 	padding: 3px 5px;
 }
 .elgg-output img {
-    max-width: 100%;
-    height: auto;
-}
-\ No newline at end of file
+	max-width: 100%;
+	height: auto;
+}
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
deleted file mode 100644
index c0bb1b7f4..000000000
--- a/views/default/forms/profile/fields/reset.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Reset profile fields form
- */
-
-echo '<div class="elgg-foot">';
-$params = array(
-	'value' => elgg_echo('profile:resetdefault'),
-	'class' => 'elgg-button-cancel',
-);
-echo elgg_view('input/submit', $params);
-echo '</div>';
diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php
index b82d98ce4..6fe03484d 100644
--- a/views/default/js/elgg.php
+++ b/views/default/js/elgg.php
@@ -56,7 +56,8 @@ if (0) { ?><script><?php }
 elgg.version = '<?php echo get_version(); ?>';
 elgg.release = '<?php echo get_version(true); ?>';
 elgg.config.wwwroot = '<?php echo elgg_get_site_url(); ?>';
-elgg.security.interval = 5 * 60 * 1000; <?php //@todo make this configurable ?>
+<?php //@todo make this configurable ?>
+elgg.security.interval = 5 * 60 * 1000;
 elgg.config.domReady = false;
 elgg.config.language = '<?php echo isset($CONFIG->language) ? $CONFIG->language : 'en'; ?>';
 elgg.config.languageReady = false;