From 9fe063022e08a4b6fa5f5935f8f185d5d95814a4 Mon Sep 17 00:00:00 2001 From: Sem Date: Wed, 25 Apr 2012 19:09:22 +0200 Subject: Upgraded to Elgg 1.8.4. --- mod/developers/actions/developers/settings.php | 6 +++--- mod/developers/languages/en.php | 6 +++--- .../views/default/admin/developers/settings.php | 4 ++-- mod/developers/views/default/theme_preview/components.php | 15 +++++++++++---- .../views/default/theme_preview/components/table.php | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) (limited to 'mod/developers') diff --git a/mod/developers/actions/developers/settings.php b/mod/developers/actions/developers/settings.php index 811fd22c0..7c91e2f5f 100644 --- a/mod/developers/actions/developers/settings.php +++ b/mod/developers/actions/developers/settings.php @@ -11,10 +11,10 @@ if (get_input('simple_cache')) { elgg_disable_simplecache(); } -if (get_input('view_path_cache')) { - elgg_enable_filepath_cache(); +if (get_input('system_cache')) { + elgg_enable_system_cache(); } else { - elgg_disable_filepath_cache(); + elgg_disable_system_cache(); } $debug = get_input('debug_level'); diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php index 812f779fa..262759e23 100644 --- a/mod/developers/languages/en.php +++ b/mod/developers/languages/en.php @@ -16,9 +16,9 @@ $english = array( // settings 'elgg_dev_tools:settings:explanation' => 'Control your development and debugging settings below. Some of these settings are also available on other admin pages.', 'developers:label:simple_cache' => 'Use simple cache', - 'developers:help:simple_cache' => 'Turn off the file cache when developing. Otherwise, changes to your views (including css) will be ignored.', - 'developers:label:view_path_cache' => 'Use view path cache', - 'developers:help:view_path_cache' => 'Turn this off when developing. Otherwise, new views in your plugins will not be registered.', + 'developers:help:simple_cache' => 'Turn off this cache when developing. Otherwise, changes to your CSS and JavaScript will be ignored.', + 'developers:label:system_cache' => 'Use system cache', + 'developers:help:system_cache' => 'Turn this off when developing. Otherwise, changes in your plugins will not be registered.', 'developers:label:debug_level' => "Trace level", 'developers:help:debug_level' => "This controls the amount of information logged. See elgg_log() for more information.", 'developers:label:display_errors' => 'Display fatal PHP errors', diff --git a/mod/developers/views/default/admin/developers/settings.php b/mod/developers/views/default/admin/developers/settings.php index dcc0a3e4f..459cbabad 100644 --- a/mod/developers/views/default/admin/developers/settings.php +++ b/mod/developers/views/default/admin/developers/settings.php @@ -10,10 +10,10 @@ $data = array( 'checked' => elgg_get_config('simplecache_enabled') == 1, ), - 'view_path_cache' => array( + 'system_cache' => array( 'type' => 'checkbox', 'value' => 1, - 'checked' => elgg_get_config('viewpath_cache_enabled') == 1, + 'checked' => elgg_get_config('system_cache_enabled') == 1, ), 'display_errors' => array( diff --git a/mod/developers/views/default/theme_preview/components.php b/mod/developers/views/default/theme_preview/components.php index ab5a6e941..45f520f2c 100644 --- a/mod/developers/views/default/theme_preview/components.php +++ b/mod/developers/views/default/theme_preview/components.php @@ -3,10 +3,17 @@ * CSS Objects: list, module, image_block, table, messages */ -echo elgg_view_module('info', 'Image Block (.elgg-image-block)', elgg_view('theme_preview/components/image_block')); +$body = elgg_view('theme_preview/components/image_block'); +echo elgg_view_module('info', 'Image Block (.elgg-image-block)', $body); -echo elgg_view_module('info', 'List (.elgg-list)', elgg_view('theme_preview/components/list')); +$body = elgg_view('theme_preview/components/list'); +echo elgg_view_module('info', 'List (.elgg-list)', $body); -echo elgg_view_module('info', 'Table (.elgg-table)', elgg_view('theme_preview/components/table')); +$body = elgg_view('theme_preview/components/table', array('class' => 'elgg-table')); +echo elgg_view_module('info', 'Table (.elgg-table)', $body); -echo elgg_view_module('info', 'Messages (.elgg-message)', elgg_view('theme_preview/components/messages')); +$body = elgg_view('theme_preview/components/table', array('class' => 'elgg-table-alt')); +echo elgg_view_module('info', 'Table Alternate (.elgg-table-alt)', $body); + +$body = elgg_view('theme_preview/components/messages'); +echo elgg_view_module('info', 'Messages (.elgg-message)', $body); diff --git a/mod/developers/views/default/theme_preview/components/table.php b/mod/developers/views/default/theme_preview/components/table.php index e9ef32143..8b8b13e76 100644 --- a/mod/developers/views/default/theme_preview/components/table.php +++ b/mod/developers/views/default/theme_preview/components/table.php @@ -1,4 +1,4 @@ - +
"; for ($i = 1; $i < 5; $i++) { -- cgit v1.2.3
column 1column 2