aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-07 05:10:11 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-07 05:10:11 +0000
commitea28c2c55c689be25a2212dfbdffd840c88921aa (patch)
treedf452e639f62dbf3994bcf81c5622bd82d79016b /engine
parent59ae2874efb59aeb48265c16b785756025221fb8 (diff)
downloadelgg-ea28c2c55c689be25a2212dfbdffd840c88921aa.tar.gz
elgg-ea28c2c55c689be25a2212dfbdffd840c88921aa.tar.bz2
Pulled elgg-icon and elgg-icon-* into the admin css. Pulled out profile field JS into elgg.admin obj. Fixed editing profile field names.
git-svn-id: http://code.elgg.org/elgg/trunk@8061 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/admin.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 98247c962..cab6fe4e5 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -94,6 +94,7 @@ function admin_init() {
elgg_register_action('profile/fields/reset', '', 'admin');
elgg_register_action('profile/fields/add', '', 'admin');
+ elgg_register_action('profile/fields/edit', '', 'admin');
elgg_register_action('profile/fields/delete', '', 'admin');
elgg_register_action('profile/fields/reorder', '', 'admin');
@@ -180,6 +181,9 @@ function admin_settings_page_handler($page) {
$url = elgg_view_get_simplecache_url('js', 'admin');
elgg_register_js($url, 'admin');
+ $url = elgg_get_site_url() . 'vendors/jquery/jquery.jeditable.mini.js';
+ elgg_register_js($url);
+
// default to dashboard
if (!isset($page[0]) || empty($page[0])) {
$page = array('dashboard');