diff --git a/README.md b/README.md index e91250c..9954d6b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Elgg Landing Theme ================== -![Elgg 4.3](https://img.shields.io/badge/Elgg-4.3-green.svg?style=flat-square) +![Elgg 5.0](https://img.shields.io/badge/Elgg-5.0-green.svg?style=flat-square) Responsive Elgg theme with landing page. diff --git a/composer.json b/composer.json index 6b3fae8..4ac8a18 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ } ], "conflict": { - "elgg/elgg": "<4.3", + "elgg/elgg": "<5.0", "elgg/custom_index": "*" }, "support": { diff --git a/elgg-plugin.php b/elgg-plugin.php index e74d95f..3192d3e 100644 --- a/elgg-plugin.php +++ b/elgg-plugin.php @@ -10,7 +10,7 @@ return [ 'plugin' => [ 'name' => 'Elgg Landing Theme', - 'version' => '1.1.0', + 'version' => '2.0.0', 'dependencies' => [ 'activity' => [ 'position' => 'after', diff --git a/views/default/js/elgg_theme/settings.js b/views/default/js/elgg_theme/settings.js index c414722..0a31618 100644 --- a/views/default/js/elgg_theme/settings.js +++ b/views/default/js/elgg_theme/settings.js @@ -1,7 +1,6 @@ -define(['jquery', 'elgg'], function ($, elgg) { - elgg.provide('elgg.settings'); +define(['jquery'], function ($) { - elgg.settings.landing_action = function(elem) { + landing_action = function(elem) { if ($(elem).is(':checked')) { $('#settings-landing-action').show(); } else { @@ -9,7 +8,7 @@ define(['jquery', 'elgg'], function ($, elgg) { } }; - elgg.settings.display_members = function(elem) { + display_members = function(elem) { if ($(elem).is(':checked')) { $('#settings-display-members').show(); } else { @@ -17,7 +16,7 @@ define(['jquery', 'elgg'], function ($, elgg) { } }; - elgg.settings.display_groups = function(elem) { + display_groups = function(elem) { if ($(elem).is(':checked')) { $('#settings-display-groups').show(); } else { @@ -25,7 +24,7 @@ define(['jquery', 'elgg'], function ($, elgg) { } }; - elgg.settings.activity_sidebar = function(elem) { + activity_sidebar = function(elem) { if ($(elem).is(':checked')) { $('#settings-activity-sidebar').show(); } else { diff --git a/views/default/page/layouts/front_page.php b/views/default/page/layouts/front_page.php index 1aec8b9..a24f9c8 100644 --- a/views/default/page/layouts/front_page.php +++ b/views/default/page/layouts/front_page.php @@ -4,6 +4,10 @@ echo elgg_view('elgg_theme/elements/featured'); +$action_content = ''; +$members_content = ''; +$groups_content = ''; + // call to action section if ((bool) $entity->landing_action) { $header = ''; @@ -46,6 +50,7 @@ ]); $header = ''; + $items = ''; if (!empty($entity->members_h1)) { $h1 = elgg_format_element('h1', [], $entity->members_h1); @@ -96,6 +101,7 @@ ]); $header = ''; + $group_items = ''; if (!empty($entity->groups_h1)) { $h1 = elgg_format_element('h1', [], elgg_view('output/url', [ diff --git a/views/default/plugins/elgg_theme/settings.php b/views/default/plugins/elgg_theme/settings.php index 727bda3..2a8e284 100644 --- a/views/default/plugins/elgg_theme/settings.php +++ b/views/default/plugins/elgg_theme/settings.php @@ -40,7 +40,7 @@ 'name' => 'params[landing_action]', 'checked' => (bool) $entity->landing_action, 'switch' => true, - 'onchange' => 'elgg.settings.landing_action(this);', + 'onchange' => 'landing_action(this);', ]); echo elgg_view_field([ @@ -82,7 +82,7 @@ 'name' => 'params[display_members]', 'checked' => (bool) $entity->display_members, 'switch' => true, - 'onchange' => 'elgg.settings.display_members(this);', + 'onchange' => 'display_members(this);', ]); echo elgg_view_field([ @@ -106,7 +106,7 @@ 'name' => 'params[display_groups]', 'checked' => (bool) $entity->display_groups, 'switch' => true, - 'onchange' => 'elgg.settings.display_groups(this);', + 'onchange' => 'display_groups(this);', ]); echo elgg_view_field([ @@ -134,7 +134,7 @@ 'name' => 'params[activity_sidebar]', 'checked' => (bool) $entity->activity_sidebar, 'switch' => true, - 'onchange' => 'elgg.settings.activity_sidebar(this);', + 'onchange' => 'activity_sidebar(this);', ], ], ]); diff --git a/views/default/resources/index.php b/views/default/resources/index.php index c16de54..8e0c289 100644 --- a/views/default/resources/index.php +++ b/views/default/resources/index.php @@ -11,16 +11,15 @@ } else if (elgg_is_logged_in() && !$activity_enable) { $title = elgg_echo('welcome:user', [$user->getDisplayName()]); - echo elgg_view_page(null, [ + echo elgg_view_page('', [ 'title' => $title, 'content' => elgg_echo('index:content'), - 'sidebar' => false, - 'filter' => false, + 'filter_id' => 'index', ]); } else { elgg_push_context('elgg_theme'); $class = ['class' => 'elgg-landing-page']; $body = elgg_view_layout('front_page'); - echo elgg_view_page(null, $body, 'default', ['body_attrs' => $class]); + echo elgg_view_page('', $body, 'default', ['body_attrs' => $class]); } diff --git a/views/default/resources/walled_garden.php b/views/default/resources/walled_garden.php index 8521ac9..414004c 100644 --- a/views/default/resources/walled_garden.php +++ b/views/default/resources/walled_garden.php @@ -5,7 +5,7 @@ $class = ['class' => 'elgg-landing-page']; $body = elgg_view_layout('front_page'); - echo elgg_view_page(null, $body, 'default', ['body_attrs' => $class]); + echo elgg_view_page('', $body, 'default', ['body_attrs' => $class]); } else { echo elgg_view_page('', [ 'content' => elgg_view('core/account/login_box', ['title' => false]),