4 files changed, 46 insertions, 24 deletions

diff --git a/views/default/admin/appearance/default_widgets.php b/views/default/admin/appearance/default_widgets.php
index 01ea1653c..1bf5791ac 100644
--- a/views/default/admin/appearance/default_widgets.php
+++ b/views/default/admin/appearance/default_widgets.php
@@ -6,6 +6,23 @@
  * @subpackage Administration.DefaultWidgets
  */
 
+$object = elgg_get_entities(array(
+	'type' => 'object',
+	'subtype' => 'moddefaultwidgets',
+	'limit' => 1,
+));
+
+if ($object) {
+	echo elgg_view('output/url', array(
+		'text' => elgg_echo('upgrade'),
+		'href' => 'action/widgets/upgrade',
+		'is_action' => true,
+		'is_trusted' => true,
+		'class' => 'elgg_button elgg-button-submit',
+		'title' => 'Upgrade your default widgets to work on Elgg 1.8',
+	));
+}
+
 elgg_push_context('default_widgets');
 $widget_context = get_input('widget_context');
 $list = elgg_trigger_plugin_hook('get_list', 'default_widgets', null, array());
@@ -18,7 +35,7 @@ if (!$widget_context && $list) {
 $current_info = null;
 $tabs = array();
 foreach ($list as $info) {
-	$url = "pg/admin/appearance/default_widgets?widget_context={$info['widget_context']}";
+	$url = "admin/appearance/default_widgets?widget_context={$info['widget_context']}";
 	$selected = false;
 	if ($widget_context == $info['widget_context']) {
 		$selected = true;
@@ -38,10 +55,10 @@ $tabs_vars = array(
 
 echo elgg_view('navigation/tabs', $tabs_vars);
 
-echo elgg_view('output/longtext', array('value' => elgg_echo('admin:appearance:default_widgets:instructions')));
+echo elgg_view('output/longtext', array('value' => elgg_echo('admin:default_widgets:instructions')));
 
 if (!$current_info) {
-	$content = elgg_echo('admin:appearance:default_widgets:unknown_type');
+	$content = elgg_echo('admin:default_widgets:unknown_type');
 } else {
 	// default widgets are owned and saved to the site.
 	elgg_set_page_owner_guid(elgg_get_config('site_guid'));
@@ -62,4 +79,4 @@ if (!$current_info) {
 }
 elgg_pop_context();
 
-echo $content;
\ No newline at end of file
+echo $content;
diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php
index 4e35e032f..1d5c95cf9 100644
--- a/views/default/admin/appearance/menu_items.php
+++ b/views/default/admin/appearance/menu_items.php
@@ -7,4 +7,4 @@
  */
 
 
-echo elgg_view_form('admin/menu/save');
+echo elgg_view_form('admin/menu/save', array('class' => 'elgg-form-settings'));
diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php
index 7077687cc..f1d78c19f 100644
--- a/views/default/admin/appearance/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
@@ -3,16 +3,22 @@
  * Admin area: edit default profile fields
  */
 
-$add = elgg_view_form('profile/fields/add', array(), array());
+$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
-<div class="default_profile_reset">
-	$reset
-</div>
+<div class="mtl">$reset</div>
 __HTML;
 
 echo $body;
diff --git a/views/default/admin/appearance/profile_fields/list.php b/views/default/admin/appearance/profile_fields/list.php
index 493129583..b9440a95d 100644
--- a/views/default/admin/appearance/profile_fields/list.php
+++ b/views/default/admin/appearance/profile_fields/list.php
@@ -9,22 +9,24 @@
 $n = 0;
 $loaded_defaults = array();
 $items = array();
-if ($fieldlist = elgg_get_config('profile_custom_fields')) {
+$fieldlist = elgg_get_config('profile_custom_fields');
+if ($fieldlist) {
 	$fieldlistarray = explode(',', $fieldlist);
 	foreach ($fieldlistarray as $listitem) {
-		if ($translation = elgg_get_config("admin_defined_profile_{$listitem}")) {
+		$translation = elgg_get_config("admin_defined_profile_$listitem");
+		$type = elgg_get_config("admin_defined_profile_type_$listitem");
+		if ($translation && $type) {
 			$item = new stdClass;
 			$item->translation = $translation;
 			$item->shortname = $listitem;
-			$item->name = "admin_defined_profile_{$listitem}";
-			$item->type = elgg_get_config("admin_defined_profile_type_{$listitem}");
+			$item->name = "admin_defined_profile_$listitem";
+			$item->type = elgg_echo("profile:field:$type");
 			$items[] = $item;
 		}
 	}
 }
 ?>
-<div id="list">
-	<ul id="sortable_profile_fields">
+<ul id="elgg-profile-fields" class="mvm">
 <?php
 
 $save = elgg_echo('save');
@@ -36,21 +38,18 @@ foreach ($items as $item) {
 	//$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
 	$url = elgg_view('output/url', array(
 		'href' => "action/profile/fields/delete?id={$item->shortname}",
-		'is_action' => TRUE,
-		'text' => elgg_view_icon('delete'),
+		'text' => elgg_view_icon('delete-alt'),
+		'is_action' => true,
+		'is_trusted' => true,
 	));
 	$type = elgg_echo($item->type);
 	echo <<<HTML
 <li id="$item->shortname" class="clearfix">
-	<span class="elgg-icon elgg-icon-dragger elgg-state-draggable"></span>
+	<span class="elgg-icon elgg-icon-drag-arrow elgg-state-draggable"></span>
 	<b><span id="elgg-profile-field-{$item->shortname}" class="elgg-state-editable">$item->translation</span></b> [$type] $url
 </li>
 HTML;
 }
 
 ?>
-	</ul>
-</div>
-<div id="tempList"></div>
-
-<input name="sortableListOrder" type="hidden" id="sortableListOrder" value="<?php echo $fieldlist; ?>" />
\ No newline at end of file
+</ul>
\ No newline at end of file