From 6a690361091081b9ec578487e8ef79664434cf8e Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 12 Mar 2011 18:39:14 +0000
Subject: Refs #2991: Readded the appearance menu under configure. Moved plugin
 settings under configure/settings.

git-svn-id: http://code.elgg.org/elgg/trunk@8665 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/admin/appearance/default_widgets.php | 65 ++++++++++++++++++++++
 views/default/admin/appearance/menu_items.php      | 10 ++++
 views/default/admin/appearance/profile_fields.php  | 18 ++++++
 .../admin/appearance/profile_fields/list.php       | 56 +++++++++++++++++++
 views/default/admin/settings/default_widgets.php   | 65 ----------------------
 views/default/admin/settings/menu_items.php        | 10 ----
 views/default/admin/settings/profile_fields.php    | 18 ------
 .../default/admin/settings/profile_fields/list.php | 56 -------------------
 views/default/css/admin.php                        |  2 +-
 views/default/js/admin.php                         |  3 -
 10 files changed, 150 insertions(+), 153 deletions(-)
 create mode 100644 views/default/admin/appearance/default_widgets.php
 create mode 100644 views/default/admin/appearance/menu_items.php
 create mode 100644 views/default/admin/appearance/profile_fields.php
 create mode 100644 views/default/admin/appearance/profile_fields/list.php
 delete mode 100644 views/default/admin/settings/default_widgets.php
 delete mode 100644 views/default/admin/settings/menu_items.php
 delete mode 100644 views/default/admin/settings/profile_fields.php
 delete mode 100644 views/default/admin/settings/profile_fields/list.php

(limited to 'views/default')

diff --git a/views/default/admin/appearance/default_widgets.php b/views/default/admin/appearance/default_widgets.php
new file mode 100644
index 000000000..ce9f6a5c2
--- /dev/null
+++ b/views/default/admin/appearance/default_widgets.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Default widgets landing page.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.DefaultWidgets
+ */
+
+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/settings/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
new file mode 100644
index 000000000..4e35e032f
--- /dev/null
+++ b/views/default/admin/appearance/menu_items.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Elgg administration menu items
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+
+echo elgg_view_form('admin/menu/save');
diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php
new file mode 100644
index 000000000..e9dc609e3
--- /dev/null
+++ b/views/default/admin/appearance/profile_fields.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Admin area: edit default profile fields
+ */
+
+$add = elgg_view_form('profile/fields/add', array(), array());
+$list = elgg_view('admin/settings/profile_fields/list');
+$reset = elgg_view_form('profile/fields/reset', array(), array());
+
+$body = <<<__HTML
+$add
+$list
+<div class="default_profile_reset">
+	$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
new file mode 100644
index 000000000..493129583
--- /dev/null
+++ b/views/default/admin/appearance/profile_fields/list.php
@@ -0,0 +1,56 @@
+<?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')) {
+	$fieldlistarray = explode(',', $fieldlist);
+	foreach ($fieldlistarray as $listitem) {
+		if ($translation = elgg_get_config("admin_defined_profile_{$listitem}")) {
+			$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}");
+			$items[] = $item;
+		}
+	}
+}
+?>
+<div id="list">
+	<ul id="sortable_profile_fields">
+<?php
+
+$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}",
+		'is_action' => TRUE,
+		'text' => elgg_view_icon('delete'),
+	));
+	$type = elgg_echo($item->type);
+	echo <<<HTML
+<li id="$item->shortname" class="clearfix">
+	<span class="elgg-icon elgg-icon-dragger 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
diff --git a/views/default/admin/settings/default_widgets.php b/views/default/admin/settings/default_widgets.php
deleted file mode 100644
index ce9f6a5c2..000000000
--- a/views/default/admin/settings/default_widgets.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Default widgets landing page.
- *
- * @package Elgg.Core
- * @subpackage Administration.DefaultWidgets
- */
-
-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/settings/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/settings/menu_items.php b/views/default/admin/settings/menu_items.php
deleted file mode 100644
index 4e35e032f..000000000
--- a/views/default/admin/settings/menu_items.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Elgg administration menu items
- *
- * @package Elgg
- * @subpackage Core
- */
-
-
-echo elgg_view_form('admin/menu/save');
diff --git a/views/default/admin/settings/profile_fields.php b/views/default/admin/settings/profile_fields.php
deleted file mode 100644
index e9dc609e3..000000000
--- a/views/default/admin/settings/profile_fields.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Admin area: edit default profile fields
- */
-
-$add = elgg_view_form('profile/fields/add', array(), array());
-$list = elgg_view('admin/settings/profile_fields/list');
-$reset = elgg_view_form('profile/fields/reset', array(), array());
-
-$body = <<<__HTML
-$add
-$list
-<div class="default_profile_reset">
-	$reset
-</div>
-__HTML;
-
-echo $body;
diff --git a/views/default/admin/settings/profile_fields/list.php b/views/default/admin/settings/profile_fields/list.php
deleted file mode 100644
index 493129583..000000000
--- a/views/default/admin/settings/profile_fields/list.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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')) {
-	$fieldlistarray = explode(',', $fieldlist);
-	foreach ($fieldlistarray as $listitem) {
-		if ($translation = elgg_get_config("admin_defined_profile_{$listitem}")) {
-			$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}");
-			$items[] = $item;
-		}
-	}
-}
-?>
-<div id="list">
-	<ul id="sortable_profile_fields">
-<?php
-
-$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}",
-		'is_action' => TRUE,
-		'text' => elgg_view_icon('delete'),
-	));
-	$type = elgg_echo($item->type);
-	echo <<<HTML
-<li id="$item->shortname" class="clearfix">
-	<span class="elgg-icon elgg-icon-dragger 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
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 37d53673a..6f2a72caa 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -313,7 +313,7 @@ table.mceLayout {
 	padding-bottom: 5px;
 }
 
-.elgg-admin-sidebar-menu ul {
+.elgg-admin-sidebar-menu ul.elgg-menu-page {
 	padding-bottom: 15px;
 }
 
diff --git a/views/default/js/admin.php b/views/default/js/admin.php
index d37dc7a81..15c74d4de 100644
--- a/views/default/js/admin.php
+++ b/views/default/js/admin.php
@@ -16,9 +16,6 @@ elgg.admin.init = function () {
 		$(this).stop().slideUp('medium');
 	});
 
-	// semi-custom menus
-	$('.elgg-admin-sidebar-menu .elgg-menu-parent').live('click', elgg.ui.toggleMenu);
-
 	// plugin screenshot modal
 	$('.elgg-plugin-screenshot a').click(elgg.admin.displayPluginScreenshot);
 
-- 
cgit v1.2.3