From ee0fd055fab86ca205c048aa4490d3fd2e499bed Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 18 Sep 2011 13:47:13 -0400 Subject: Fixes #3825 need to specify the data type as json --- mod/developers/views/default/js/developers/developers.php | 1 + 1 file changed, 1 insertion(+) (limited to 'mod/developers/views') diff --git a/mod/developers/views/default/js/developers/developers.php b/mod/developers/views/default/js/developers/developers.php index e6c249eb1..09e6ddd12 100644 --- a/mod/developers/views/default/js/developers/developers.php +++ b/mod/developers/views/default/js/developers/developers.php @@ -23,6 +23,7 @@ elgg.dev.inspectSubmit = function(event) { $("#developers-ajax-loader").show(); $(this).ajaxSubmit({ + dataType : 'json', success : function(response) { if (response) { $("#developers-inspect-results").html(response.output); -- cgit v1.2.3 From 9af2f5496a5a0a76639ca56e931e7aee0e02c50c Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 18 Sep 2011 13:49:21 -0400 Subject: Fixes #3721 reorganized the developer tools menu items in the admin area --- mod/developers/languages/en.php | 7 ++++--- mod/developers/start.php | 14 +++++++++++--- .../views/default/admin/develop_tools/inspect.php | 14 ++++++++++++++ .../views/default/admin/develop_tools/preview.php | 8 ++++++++ mod/developers/views/default/admin/developers/inspect.php | 14 -------------- mod/developers/views/default/admin/developers/preview.php | 8 -------- 6 files changed, 37 insertions(+), 28 deletions(-) create mode 100644 mod/developers/views/default/admin/develop_tools/inspect.php create mode 100644 mod/developers/views/default/admin/develop_tools/preview.php delete mode 100644 mod/developers/views/default/admin/developers/inspect.php delete mode 100644 mod/developers/views/default/admin/developers/preview.php (limited to 'mod/developers/views') diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php index 42df52134..a2682363c 100644 --- a/mod/developers/languages/en.php +++ b/mod/developers/languages/en.php @@ -6,10 +6,11 @@ $english = array( // menu + 'admin:develop_tools' => 'Tools', + 'admin:develop_tools:preview' => 'Theming Sandbox', + 'admin:develop_tools:inspect' => 'Inspect', 'admin:developers' => 'Developers', - 'admin:developers:settings' => 'Developer Settings', - 'admin:developers:preview' => 'Theming Preview', - 'admin:developers:inspect' => 'Inspect', + 'admin:developers:settings' => 'Settings', // settings 'elgg_dev_tools:settings:explanation' => 'Control your development and debugging settings below. Some of these settings are also available on other admin pages.', diff --git a/mod/developers/start.php b/mod/developers/start.php index d9e1141e0..ab9a174a4 100644 --- a/mod/developers/start.php +++ b/mod/developers/start.php @@ -59,9 +59,17 @@ function developers_process_settings() { function developers_setup_menu() { if (elgg_in_context('admin')) { - elgg_register_admin_menu_item('develop', 'settings', 'developers'); - elgg_register_admin_menu_item('develop', 'inspect', 'developers'); - elgg_register_admin_menu_item('develop', 'preview', 'developers'); + elgg_register_admin_menu_item('develop', 'inspect', 'develop_tools'); + elgg_register_admin_menu_item('develop', 'preview', 'develop_tools'); + + elgg_register_menu_item('page', array( + 'name' => 'dev_settings', + 'href' => 'admin/developers/settings', + 'text' => elgg_echo('settings'), + 'context' => 'admin', + 'priority' => 10, + 'section' => 'develop' + )); } } diff --git a/mod/developers/views/default/admin/develop_tools/inspect.php b/mod/developers/views/default/admin/develop_tools/inspect.php new file mode 100644 index 000000000..cfa3de2ea --- /dev/null +++ b/mod/developers/views/default/admin/develop_tools/inspect.php @@ -0,0 +1,14 @@ + 'developers-form-inspect')); + +echo '
'; +echo elgg_view('graphics/ajax_loader', array('id' => 'developers-ajax-loader')); diff --git a/mod/developers/views/default/admin/develop_tools/preview.php b/mod/developers/views/default/admin/develop_tools/preview.php new file mode 100644 index 000000000..920047d98 --- /dev/null +++ b/mod/developers/views/default/admin/develop_tools/preview.php @@ -0,0 +1,8 @@ + + \ No newline at end of file diff --git a/mod/developers/views/default/admin/developers/inspect.php b/mod/developers/views/default/admin/developers/inspect.php deleted file mode 100644 index cfa3de2ea..000000000 --- a/mod/developers/views/default/admin/developers/inspect.php +++ /dev/null @@ -1,14 +0,0 @@ - 'developers-form-inspect')); - -echo '
'; -echo elgg_view('graphics/ajax_loader', array('id' => 'developers-ajax-loader')); diff --git a/mod/developers/views/default/admin/developers/preview.php b/mod/developers/views/default/admin/developers/preview.php deleted file mode 100644 index 920047d98..000000000 --- a/mod/developers/views/default/admin/developers/preview.php +++ /dev/null @@ -1,8 +0,0 @@ - - \ No newline at end of file -- cgit v1.2.3