4 files changed, 129 insertions, 153 deletions

diff --git a/views/default/admin/appearance/default_widgets.php b/views/default/admin/appearance/default_widgets.php
new file mode 100644
index 000000000..1bf5791ac
--- /dev/null
+++ b/views/default/admin/appearance/default_widgets.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Default widgets landing page.
+ *
+ * @package Elgg.Core
+ * @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());
+
+// default to something if we can
+if (!$widget_context && $list) {
+	$widget_context = $list[0]['widget_context'];
+}
+
+$current_info = null;
+$tabs = array();
+foreach ($list as $info) {
+	$url = "admin/appearance/default_widgets?widget_context={$info['widget_context']}";
+	$selected = false;
+	if ($widget_context == $info['widget_context']) {
+		$selected = true;
+		$current_info = $info;
+	}
+
+	$tabs[] = array(
+		'title' => $info['name'],
+		'url' => $url,
+		'selected' => $selected
+	);
+}
+
+$tabs_vars = array(
+	'tabs' => $tabs
+);
+
+echo elgg_view('navigation/tabs', $tabs_vars);
+
+echo elgg_view('output/longtext', array('value' => elgg_echo('admin:default_widgets:instructions')));
+
+if (!$current_info) {
+	$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'));
+	elgg_push_context($current_info['widget_context']);
+
+	$default_widgets_input = elgg_view('input/hidden', array(
+		'name' => 'default_widgets',
+		'value' => 1
+	));
+
+	$params = array(
+		'content' => $default_widgets_input,
+		'num_columns' => $current_info['widget_columns'],
+	);
+
+	$content = elgg_view_layout('widgets', $params);
+	elgg_pop_context();
+}
+elgg_pop_context();
+
+echo $content;
diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php
index 7572d2e0c..1d5c95cf9 100644
--- a/views/default/admin/appearance/menu_items.php
+++ b/views/default/admin/appearance/menu_items.php
@@ -6,81 +6,5 @@
  * @subpackage Core
  */
 
-$builder = new ElggMenuBuilder('site');
-$menu = $builder->getMenu('name');
-$menu_items = $menu['default'];
 
-$featured_menu_names = elgg_get_config('site_featured_menu_names');
-
-$dropdown_values = array();
-foreach ($menu_items as $item) {
-	$dropdown_values[$item->getName()] = $item->getTitle();
-}
-$dropdown_values[''] = elgg_echo('none');
-
-echo elgg_view_title(elgg_echo('admin:menu_items'));
-echo "<div class='admin_settings menuitems'><h3>".elgg_echo('admin:menu_items:configure')."</h3>";
-echo "<p class='margin-top'>".strip_tags(elgg_view('output/longtext', array('value' => elgg_echo("admin:menu_items:description"))))."</p>";
-$form_body = '';
-
-// @todo Could probably make this number configurable
-for ($i=0; $i<6; $i++) {
-	if (array_key_exists($i, $featured_menu_names)) {
-		$current_value = $featured_menu_names[$i];
-	} else {
-		$current_value = '';
-	}
-
-	$form_body .= elgg_view('input/pulldown', array(
-		'options_values' => $dropdown_values,
-		'internalname' => 'featured_menu_names[]',
-		'value' => $current_value
-	));
-}
-
-// add arbitrary links
-$form_body .= "<h3>".elgg_echo('admin:add_menu_item')."</h3>";
-$form_body .= elgg_view('output/longtext', array('value' => elgg_echo("admin:add_menu_item:description")));
-
-$custom_items = elgg_get_config('site_custom_menu_items');
-
-$name_str = elgg_echo('name');
-$url_str = elgg_echo('admin:plugins:label:website');
-
-$form_body .= '<ul class="custom_menuitems">';
-
-if (is_array($custom_items)) {
-	foreach ($custom_items as $title => $url) {
-		$name_input = elgg_view('input/text', array(
-			'internalname' => 'custom_menu_titles[]',
-			'value' => $title
-		));
-
-		$url_input = elgg_view('input/text', array(
-			'internalname' => 'custom_menu_urls[]',
-			'value' => $url
-		));
-
-		$form_body .= "<li class='custom_menuitem'>$name_str: $name_input $url_str: $url_input $delete</li>";
-	}
-}
-
-$new = elgg_echo('new');
-$name_input = elgg_view('input/text', array(
-	'internalname' => 'custom_menu_titles[]',
-));
-
-$url_input = elgg_view('input/text', array(
-	'internalname' => 'custom_menu_urls[]',
-));
-
-$form_body .= "<li class='custom_menuitem'>$name_str: $name_input $url_str: $url_input</li>
-</ul>";
-
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
-
-echo elgg_view('input/form', array(
-	'body' => $form_body,
-	'action' => "action/admin/menu/save"
-));
-echo "</div>";
\ No newline at end of file
+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 f20bbaeb6..f1d78c19f 100644
--- a/views/default/admin/appearance/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
@@ -3,19 +3,22 @@
  * Admin area: edit default profile fields
  */
 
-$title = elgg_view_title(elgg_echo('admin: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
-$title
 $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 d14452f47..b9440a95d 100644
--- a/views/default/admin/appearance/profile_fields/list.php
+++ b/views/default/admin/appearance/profile_fields/list.php
@@ -1,88 +1,55 @@
 <?php
-
+/**
+ * Profile fields.
+ * 
+ * @todo Needs some review
+ */
 
 // List form elements
 $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;
 		}
 	}
 }
 ?>
-
-<script language="javascript" type="text/javascript" src="<?php echo elgg_get_site_url()?>vendors/jquery/jquery.jeditable.mini.js"></script>
-<script language="javascript" type="text/javascript">
-var reorderURL = '<?php echo elgg_add_action_tokens_to_url(elgg_get_site_url() . 'action/profile/fields/reorder', FALSE); ?>';
-function sortCallback(event, ui) {
-	var orderArr = $('#sortable_profile_fields').sortable('toArray');
-	var orderStr = orderArr.join(',');
-	jQuery.post(reorderURL, {'fieldorder': orderStr});
-}
-
-$(document).ready(function() {
-	$('#sortable_profile_fields').sortable({
-		items: 'li',
-		handle: '.handle',
-		stop: sortCallback
-	});
-});
-
-</script>
-
-<div id="list">
-	<ul id="sortable_profile_fields">
+<ul id="elgg-profile-fields" class="mvm">
 <?php
 
-	$save = elgg_echo('save');
-	$cancel = elgg_echo('cancel');
-	$edit_url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/profile/editdefault/editfield", FALSE);
-
-	foreach($items as $item) {
-		echo <<< END
-
-<script language="javascript" type="text/javascript">
-
-	$(function() {
-		$(".{$item->shortname}_editable").editable("$edit_url ", {
-			type   : 'text',
-			submitdata: { _method: "post", 'field': '{$item->shortname}' },
-			onblur: 'submit',
-			width:'300px',
-			height:'none',
-			style:'display:inline;',
-			tooltip:'Click to edit label'
-		});
-	});
-
-</script>
-
-END;
-
-		echo elgg_view("profile/", array('value' => $item->translation));
-
-		//$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
-		$url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/profile/fields/delete?id={$item->shortname}");
-		echo "<li id=\"{$item->shortname}\"><div class='delete-button'><a href=\"$url\">" . elgg_echo('delete') . "</a></div>";
-		echo "<img width='16' height='16' class='handle' alt='move' title='Drag here to reorder this item' src='".elgg_get_site_url()."mod/profile/graphics/drag-handle.png'/>";
-		echo "<b class=\"profile_field_editable\"><span class=\"{$item->shortname}_editable\">$item->translation</span></b>:  [".elgg_echo($item->type)."]";
-		echo "</li>";
-
-	}
+$save = elgg_echo('save');
+$cancel = elgg_echo('cancel');
+
+foreach ($items as $item) {
+	echo elgg_view("profile/", array('value' => $item->translation));
+
+	//$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+	$url = elgg_view('output/url', array(
+		'href' => "action/profile/fields/delete?id={$item->shortname}",
+		'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-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; ?>" />
-
+</ul>
\ No newline at end of file