aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 18:39:14 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 18:39:14 +0000
commit6a690361091081b9ec578487e8ef79664434cf8e (patch)
tree513de19b9a26ab59f166a688d9c47367f5f27bfc /views/default
parent653517bf635ad6ecb65738b46b11b3056ccca983 (diff)
downloadelgg-6a690361091081b9ec578487e8ef79664434cf8e.tar.gz
elgg-6a690361091081b9ec578487e8ef79664434cf8e.tar.bz2
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
Diffstat (limited to 'views/default')
-rw-r--r--views/default/admin/appearance/default_widgets.php (renamed from views/default/admin/settings/default_widgets.php)0
-rw-r--r--views/default/admin/appearance/menu_items.php (renamed from views/default/admin/settings/menu_items.php)0
-rw-r--r--views/default/admin/appearance/profile_fields.php (renamed from views/default/admin/settings/profile_fields.php)0
-rw-r--r--views/default/admin/appearance/profile_fields/list.php (renamed from views/default/admin/settings/profile_fields/list.php)0
-rw-r--r--views/default/css/admin.php2
-rw-r--r--views/default/js/admin.php3
6 files changed, 1 insertions, 4 deletions
diff --git a/views/default/admin/settings/default_widgets.php b/views/default/admin/appearance/default_widgets.php
index ce9f6a5c2..ce9f6a5c2 100644
--- a/views/default/admin/settings/default_widgets.php
+++ b/views/default/admin/appearance/default_widgets.php
diff --git a/views/default/admin/settings/menu_items.php b/views/default/admin/appearance/menu_items.php
index 4e35e032f..4e35e032f 100644
--- a/views/default/admin/settings/menu_items.php
+++ b/views/default/admin/appearance/menu_items.php
diff --git a/views/default/admin/settings/profile_fields.php b/views/default/admin/appearance/profile_fields.php
index e9dc609e3..e9dc609e3 100644
--- a/views/default/admin/settings/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
diff --git a/views/default/admin/settings/profile_fields/list.php b/views/default/admin/appearance/profile_fields/list.php
index 493129583..493129583 100644
--- a/views/default/admin/settings/profile_fields/list.php
+++ b/views/default/admin/appearance/profile_fields/list.php
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);