diff --git a/blt/md/md-2050 b/blt/md/md-2050 new file mode 100644 index 000000000..d7db02ba2 --- /dev/null +++ b/blt/md/md-2050 @@ -0,0 +1 @@ +amp_cyberinfrastructure_org diff --git a/composer.json b/composer.json index 7652b28ab..7be876991 100755 --- a/composer.json +++ b/composer.json @@ -130,7 +130,8 @@ "drupal/readonlymode": "^1.1", "drupal/real_aes": "^2.3", "drupal/realname": "^2.0@beta", - "drupal/recaptcha": "^3.0", + "drupal/recaptcha": "^3.2", + "drupal/recaptcha_v3": "^2.0", "drupal/recurring_events": "^2.0@RC", "drupal/redirect": "^1.8", "drupal/rel_to_abs": "^2.2", diff --git a/composer.lock b/composer.lock index 4e0243668..9e4d73d97 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0c0cdc708713c2ce3f63d44fc2fd0a4e", + "content-hash": "49cd6baa9f2a207c05cad4704907f14a", "packages": [ { "name": "access/drupal_seamless_cilogon", @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "58cfcdcccfd5158c82b4f4c98f5391632f9fdd9d" + "reference": "28a8f4d8ccc19db96b3f09f3273fa5b12c22d21f" }, "require": { "gioni06/gpt3-tokenizer": "^1.2", @@ -317,7 +317,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-05-02T20:25:11+00:00" + "time": "2024-05-21T19:17:25+00:00" }, { "name": "arthurkushman/query-path", @@ -7243,6 +7243,10 @@ "name": "See other contributors", "homepage": "https://www.drupal.org/node/147903/committers" }, + { + "name": "diolan", + "homepage": "https://www.drupal.org/user/2336786" + }, { "name": "hass", "homepage": "https://www.drupal.org/user/85918" @@ -7255,6 +7259,10 @@ "name": "kim.pepper", "homepage": "https://www.drupal.org/user/370574" }, + { + "name": "larowlan", + "homepage": "https://www.drupal.org/user/395439" + }, { "name": "Liam Morland", "homepage": "https://www.drupal.org/user/493050" @@ -7267,13 +7275,13 @@ "name": "RobLoach", "homepage": "https://www.drupal.org/user/61114" }, - { - "name": "soxofaan", - "homepage": "https://www.drupal.org/user/41478" - }, { "name": "wundo", "homepage": "https://www.drupal.org/user/25523" + }, + { + "name": "yuriseki", + "homepage": "https://www.drupal.org/user/1523064" } ], "description": "Protect your website from spam and abuse while letting real people pass through with ease.", @@ -7283,6 +7291,60 @@ "issues": "https://www.drupal.org/project/issues/recaptcha" } }, + { + "name": "drupal/recaptcha_v3", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/recaptcha_v3.git", + "reference": "2.0.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/recaptcha_v3-2.0.1.zip", + "reference": "2.0.1", + "shasum": "f2226e4227d146df17d584b5307316da182f4e2a" + }, + "require": { + "drupal/captcha": "*", + "drupal/core": "^9.5 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.1", + "datestamp": "1692375692", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "B-Prod", + "homepage": "https://www.drupal.org/user/407852" + }, + { + "name": "dench0", + "homepage": "https://www.drupal.org/user/896504" + }, + { + "name": "majid.ali", + "homepage": "https://www.drupal.org/user/1271330" + } + ], + "description": "The reCaptcha V3 module provides integration with Google reCaptcha V3 and CAPTCHA module.", + "homepage": "https://www.drupal.org/project/recaptcha_v3", + "support": { + "source": "https://git.drupalcode.org/project/recaptcha_v3", + "error": "require.drupal/captcha : invalid version constraint (Could not parse version constraint ^2.0': Invalid version string \"^2.0'\")" + } + }, { "name": "drupal/recurring_events", "version": "2.0.1", @@ -11655,7 +11717,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "402eaf2126021eb03ef86f5afc8154ddc4426675" + "reference": "7b7516b930e327c89adbdd1e1da03ba7708eda4f" }, "default-branch": true, "type": "drupal-theme", @@ -11673,7 +11735,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-05-02T20:41:39+00:00" + "time": "2024-05-21T20:21:53+00:00" }, { "name": "necyberteam/campus-champions-theme", @@ -11681,7 +11743,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/campus-champions-theme.git", - "reference": "3b245f51a6f9f2119b237ae11eb2d0311782afc3" + "reference": "4cfcfbd40000ea69b939620cf33312c21c21b364" }, "default-branch": true, "type": "drupal-theme", @@ -11699,7 +11761,7 @@ "issues": "https://github.com/necyberteam/campus-champions-theme/issues", "source": "https://github.com/necyberteam/campus-champions-theme" }, - "time": "2024-05-02T20:41:04+00:00" + "time": "2024-05-20T18:50:03+00:00" }, { "name": "necyberteam/webform_submission_search_api", diff --git a/tests/behat/features/Jasper/wip.feature b/tests/behat/features/Jasper/wip.feature index 33cbfad40..b172476ec 100644 --- a/tests/behat/features/Jasper/wip.feature +++ b/tests/behat/features/Jasper/wip.feature @@ -23,7 +23,7 @@ Feature: test individual Affinity Group page When I go to "node/327/edit" Then I should see "Edit Affinity Group ACCESS Support" # this CI link is created by amp_dev.install - When I fill in "Display CI Links on your Affinity Group" with "ci-link-for-user-200" + When I fill in "Display Knowledge Base Resources on your Affinity Group" with "ci-link-for-user-200" And I wait 1 seconds When I press "Save" And I wait 2 seconds @@ -33,7 +33,7 @@ Feature: test individual Affinity Group page Then I should see "ci-link-for-user-200" - #Scenario: Administrator user creates CI Link and adds it to an affinity group + #Scenario: Administrator user creates KB Resource and adds it to an affinity group Given I am logged in as a user with the "administrator" role When I go to "/form/resource" Then I should see "Knowledge Base Resources" diff --git a/tests/behat/features/champ/champ-affinity-auth.feature b/tests/behat/features/champ/champ-affinity-auth.feature index 7240adb06..97cbdae9c 100644 --- a/tests/behat/features/champ/champ-affinity-auth.feature +++ b/tests/behat/features/champ/champ-affinity-auth.feature @@ -47,6 +47,6 @@ Affinity Group Request page for authenticated users. Then I should see "Email" Then I should see "Coordinators" Then I should see "Events" - Then I should see "Knowledge Base Resources" + #Then I should see "Knowledge Base Resources" Then I should see "People" #Then I should see "Masquerade" diff --git a/tests/behat/features/champ/champ-affinity-unauth.feature b/tests/behat/features/champ/champ-affinity-unauth.feature index 1823d7a84..e8ca53a2c 100644 --- a/tests/behat/features/champ/champ-affinity-unauth.feature +++ b/tests/behat/features/champ/champ-affinity-unauth.feature @@ -17,16 +17,16 @@ people are listed, along with constant "Join" functionality and additional butto Then I should see "Affinity Group" #Then I should see "Join" Then I should see "Request An Affinity Group" - When I go to "/affinity-groups/cloud-computing" + When I go to "/affinity-groups/access-support" And I wait for the page to be loaded Then I should see "Members get updates" - Then I should see "Cloud Computing" - Then I should see "cloud-commercial" - Then I should see "People who use or are considering" + Then I should see "ACCESS Support" + Then I should see "ACCESS-website" + Then I should see "Become an ACCESS Support insider by joining our affinity group." Then I should see "Join" Then I should see "Slack" Then I should see "Q&A" - Then I should see "Email" + #Then I should see "Email" Then I should see "Events" Then I should see "Knowledge Base Resources" Then I should see "Announcements" diff --git a/tests/behat/features/champ/champ-homepage.feature b/tests/behat/features/champ/champ-homepage.feature index bd6b69035..fdcd03b13 100644 --- a/tests/behat/features/champ/champ-homepage.feature +++ b/tests/behat/features/champ/champ-homepage.feature @@ -28,7 +28,7 @@ Feature: For non-authenticated users, Campus Champions Specific Tests encompass Then I should see "About Us" Then I should see "Find Champions" Then I should see "Affinity Groups" - Then I should see "CI Links" + Then I should see "Resources" Then I should see "Advancing Science" Then I should see "Creating Community" Then I should see "Building Knowledge" diff --git a/tests/behat/features/templates/affinity_groups/affinity_group.feature b/tests/behat/features/templates/affinity_groups/affinity_group.feature index e8f1aeb44..552f1b6e2 100644 --- a/tests/behat/features/templates/affinity_groups/affinity_group.feature +++ b/tests/behat/features/templates/affinity_groups/affinity_group.feature @@ -75,7 +75,7 @@ Feature: Feature: test an Affinity Group page # TODO need a future event for the following # Then I should see "[4/04/2023 7:00 PM EDT]" # Then link "How to Write a Successful" should contain "/events/6593" - # TODO - once able to add a CI Link to this AG, uncomment the following + # TODO - once able to add a KB Resource to this AG, uncomment the following #Then I should see "ci-link-for-user-200" Then link "Who can get an allocation to use HPC resources through ACCESS?" should contain "/t/who-can-get-an-allocation-to-use-hpc-resources-through-access/3019" #When I click "How to Write a Successful" diff --git a/tests/behat/features/templates/ci-links/ci-links-1-add-admin.feature b/tests/behat/features/templates/ci-links/ci-links-1-add-admin.feature index 457ebdb22..0f3c4309a 100644 --- a/tests/behat/features/templates/ci-links/ci-links-1-add-admin.feature +++ b/tests/behat/features/templates/ci-links/ci-links-1-add-admin.feature @@ -14,7 +14,7 @@ Feature: test KB Resources form When I click the "#edit-submit" element When I go to "/knowledge-base/resources" - When I follow "Add a CI Link" + When I follow "Add a Resource" Then I should be on "/form/resource" And I should see "Title" And I should see "Category" @@ -68,7 +68,7 @@ Feature: test KB Resources form Given I am logged in as a user with the "administrator" role When I go to homepage When I go to "/knowledge-base/resources" - When I follow "Add a CI Link" + When I follow "Add a Resource" Then I should be on "form/resource" Then I should see "Add" When I fill in "title" with "test-login-resource" diff --git a/tests/behat/features/templates/ci-links/ci-links-add-auth.feature b/tests/behat/features/templates/ci-links/ci-links-add-auth.feature index 99ebd9cbd..77a17a372 100644 --- a/tests/behat/features/templates/ci-links/ci-links-add-auth.feature +++ b/tests/behat/features/templates/ci-links/ci-links-add-auth.feature @@ -11,7 +11,7 @@ Resource with Link Title and Link URL (must include https). Scenario: Authenticated user fills out the resource form Given I am logged in as a user with the "authenticated" role When I go to "/knowledge-base/resources" - When I follow "Add a CI Link" + When I follow "Add a Resource" Then I should be on "form/resource" And I should see "Title" And I should see "Category" diff --git a/tests/behat/features/templates/ci-links/ci-links-auth.feature b/tests/behat/features/templates/ci-links/ci-links-auth.feature index a007b4d25..9673c8bf6 100644 --- a/tests/behat/features/templates/ci-links/ci-links-auth.feature +++ b/tests/behat/features/templates/ci-links/ci-links-auth.feature @@ -10,7 +10,7 @@ descriptions, categories, tags (first 3 linked), skill levels, and affinity grou Scenario: Authenticated user Test the resource page Given I am logged in as a user with the "authenticated" role When I go to "/knowledge-base/resources" - Then I should see "Add a CI Link" - Then I should see "Use these links “vetted” by the community" + Then I should see "Add a Resource" + Then I should see "Cyberinfrastructure professionals" Then I should see "Test CI Link Title" diff --git a/tests/behat/features/templates/ci-links/ci-links-unauth.feature b/tests/behat/features/templates/ci-links/ci-links-unauth.feature index 6fb6fc81b..14659b907 100644 --- a/tests/behat/features/templates/ci-links/ci-links-unauth.feature +++ b/tests/behat/features/templates/ci-links/ci-links-unauth.feature @@ -3,7 +3,7 @@ @javascript Feature: This Behat test goes over the KB Resources Page, when accessed by an -unauthenticated user, this page does not display the "Add a CI Links" button. The search +unauthenticated user, this page does not display the "Add a Resource" button. The search function works on approved KB Resources' titles only, is case-insensitive, and shows a special message if no results are found. There is also a text description at the top of the page. @@ -12,8 +12,8 @@ a special message if no results are found. Given I am not logged in When I go to "/knowledge-base/resources" Then I should see "Knowledge Base Resources" - Then I should see "Use these links “vetted” by the community" - Then I should see "Add a CI Link" + Then I should see "Cyberinfrastructure professionals" + Then I should see "Add a Resource" Then I should see "Test CI Link Title" - When I click "Add a CI Link" + When I click "Add a Resource" Then I should be on "/user/login?destination=/form/resource" diff --git a/tests/behat/features/templates/homepage/homepage_quick-links-auth.feature b/tests/behat/features/templates/homepage/homepage_quick-links-auth.feature index 3dd616a12..867b22e4e 100644 --- a/tests/behat/features/templates/homepage/homepage_quick-links-auth.feature +++ b/tests/behat/features/templates/homepage/homepage_quick-links-auth.feature @@ -26,7 +26,7 @@ Feature: The Front Page includes a site slogan, which is region-specific, When I click "Ask the Community" Then I should be on "https://ask.cyberinfrastructure.org/" When I am on the homepage - When I click "Find CI Links" + When I click "Find Knowledge Base Resources" Then I should be on "/knowledge-base/resources" When I am on the homepage Then I should see the link "Project Submission Form" diff --git a/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js b/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js index 36a74b631..665483616 100644 --- a/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js @@ -13,19 +13,19 @@ describe("Unauthenticated user tests the ASP Homepage", () => { //Announcements block section cy.get(".block-views-blockaccess-news-latest-news-block").contains( - "announcements" + "Announcements" ); cy.get(".block-views-blockaccess-news-latest-news-block").contains( - "See all announcements" + "See all" ); //Events block section cy.get( ".block-views-blockrecurring-events-event-instances-latest-events-block" - ).contains("Upcoming Events"); + ).contains("Training and Events"); cy.get( ".block-views-blockrecurring-events-event-instances-latest-events-block" - ).contains("See all events"); + ).contains("See all"); //Search Access block section and button destination cy.get(":nth-child(1) > .mt-0").contains("Search ACCESS"); @@ -38,7 +38,7 @@ describe("Unauthenticated user tests the ASP Homepage", () => { cy.verifyCallToActionBlock( "/", "Find useful resources now", - "/knowledge-base/ci-links" + "/knowledge-base/resources" ); }); }); diff --git a/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js b/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js new file mode 100644 index 000000000..c65a036b1 --- /dev/null +++ b/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js @@ -0,0 +1,82 @@ +/* + CSSN Directory page. + + The CSSN Directory has two columns: + - left column with a search form, and facets for roles, skills, and organizations. + - right column with a list of users displaying name, role, organization, and skills. +*/ + +describe('Tests the CSSN Directory Page', () => { + it('Test CSSN Directory for anonymous user', () => { + cy.visit('/community/cssn/directory') + + const crumbs = [ + ['Support', '/'], + ['Community', '/community/overview'], + ['CSSN', '/community/cssn'], + ['Directory', null] + ]; + cy.checkBreadcrumbs(crumbs); + + // Page Title + cy.get('.page-title').contains('CSSN Directory') + + // Search form + cy.get('#edit-search-api-fulltext--2') + .type('Pasquale') + + cy.get('.cssn-directory-item').as('item') + cy.get('@item').should('have.length', 1) // Only one user with the name Pasquale + cy.get('@item').find('.cssn-photo img').verifyImage() + + // Card should link to the community persona page. + cy.get('@item') + .find('a.stretched-link') + .should("have.attr", "href") + .and("contain", '/community-persona/1373'); + + // Organization should be displayed. + cy.get('@item') + .find('.leading-5 a') + .should('contain', 'Massachusetts Green High Performance Computing Center') + + // Tags should be displayed. + cy.get('@item') + .find('.square-tags ul li') + .should('have.length.at.least', 1) + .find('a') + .should('have.attr', 'href') + .and('contain', '/tags/') + + // Check roles facet. + cy.get('#edit-search-api-fulltext--2').clear() + cy.get('#roles-cip').click() + cy.get('.cssn-directory-item').as('item') + cy.get('@item').then(($item) => { + // There are at least 14 CIPs + expect($item.length).to.be.at.least(14) + + // add the c++ facet; should reduce the number of users. + cy.get('#skills-c').click() + cy.get('.cssn-directory-item').as('item') + cy.get('@item') + .should('have.length.at.least', 1) + .should('have.length.lessThan', $item.length) + }) + + // Reset facets + cy.get('#roles-cip').click() + cy.get('#skills-reset-all').click() + + // Check the "Show more" link for Organizations facet. + cy.get('.block-facet-blockaccess-organization .facets-soft-limit-link').click() + + // Check the organizations facet. + cy.get('#access-organization-4191').click() // Massachusetts Green High Performance Computing Center + cy.get('.cssn-directory-item').as('item') + cy.get('@item') + .should('have.length.at.least', 1) + + // todo: '+ X more' tags text is not currently displaying in Cypress tests. + }) +}) \ No newline at end of file diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/knowledge-base.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/knowledge-base.cy.js index d0ad32feb..d10fb93df 100644 --- a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/knowledge-base.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/knowledge-base.cy.js @@ -64,7 +64,7 @@ describe("Tests of the knowledge-base page", () => { .should('have.attr', 'href', '/knowledge-base/resources'); cy.get('.field--type-text-with-summary') - .contains('Popular CI Links'); + .contains('Popular Resources'); // verify count of ask-ci links is 10 cy.get('.block-top-tags-from-askci > .flex-wrap') diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link-indie-auth.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-auth.cy.js similarity index 100% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link-indie-auth.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-auth.cy.js diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-unauth.cy.js similarity index 100% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-unauth.cy.js diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-links.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resources.cy.js similarity index 100% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-links.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resources.cy.js diff --git a/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual.cy.js b/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual.cy.js index 7e7c849de..4f7d86131 100644 --- a/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual.cy.js @@ -43,7 +43,7 @@ describe("Verify the the community-outreach tag page", () => { cy.wrap(row).find('.view-field-published-date-table-column') .should('not.be.empty'); }); - } + } }) } @@ -132,7 +132,7 @@ describe("Verify the the community-outreach tag page", () => { // check more button cy.get('.view-resources') - .contains('All CI Links with this tag') + .contains('All Resources with this tag') .should('have.attr', 'href', '/tags/340/resources'); } diff --git a/web/sites/default/config/default/nect.settings.yml b/web/sites/default/config/default/nect.settings.yml index 9b32e8236..93fc77a09 100644 --- a/web/sites/default/config/default/nect.settings.yml +++ b/web/sites/default/config/default/nect.settings.yml @@ -10,7 +10,7 @@ favicon: nect_front_text: 'Advanced Computing Resources for Researchers at Small and Medium Sized Institutions in Northern New England' gpct_front_text: 'The Great Plains CyberTeam is a distributed mentor-mentee workforce development program that works with institutions within the region that have growing Cyberinfrastructure needs; participants work together to determine the institution’s research computing needs and work through the process from identification to implementation, developing best practices along the way, to enhance campus capabilities that enable research.' rmacc_front_text: 'Advanced Computing Resources for Researchers and Educators at Small and Medium Sized Institutions in the Rocky Mountain Advanced Computing Consortium' -careers_front_text: "CAREERS: Bringing Computing Support to Small to Mid-Size Institutions in the Northeast U.S.\r\n
Learn more about how CAREERS can benefit your research
\r\n
About Us
" +careers_front_text: "CAREERS: Bringing Computing Support to Small to Mid-Size Institutions in the Northeast U.S.\r\n
Learn more about how CAREERS can benefit your research
\r\n
About Us
" kentucky_front_text: 'Advanced Computing Resources for Researchers and Educators at Small and Medium Sized Institutions in Kentucky and Surrounding States' sweeter_front_text: 'CC* Team: SWEETER -- SouthWest Expertise in Expanding, Training, Education and Research' mines_front_text: 'Helping Scientists Do Their Science' diff --git a/web/sites/default/config/default/views.view.access_news.yml b/web/sites/default/config/default/views.view.access_news.yml index 51ba886f1..f24cbbd28 100644 --- a/web/sites/default/config/default/views.view.access_news.yml +++ b/web/sites/default/config/default/views.view.access_news.yml @@ -2181,7 +2181,7 @@ display: plugin_id: text empty: false content: - value: 'See all announcements' + value: 'See all' format: full_html tokenize: false display_extenders: { } diff --git a/web/sites/default/config/default/views.view.recurring_events_event_instances.yml b/web/sites/default/config/default/views.view.recurring_events_event_instances.yml index 8c295209f..d078bc1b6 100644 --- a/web/sites/default/config/default/views.view.recurring_events_event_instances.yml +++ b/web/sites/default/config/default/views.view.recurring_events_event_instances.yml @@ -1319,7 +1319,7 @@ display: admin_label: '' plugin_id: text_custom empty: false - content: '

Upcoming Events

' + content: '

Training and Events

' tokenize: false footer: area: @@ -1332,7 +1332,7 @@ display: plugin_id: text empty: false content: - value: 'See all events' + value: 'See all' format: full_html tokenize: false display_extenders: { } diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php index c89888830..2705e7e4b 100755 --- a/web/sites/default/settings.php +++ b/web/sites/default/settings.php @@ -82,4 +82,5 @@ 'recaptcha', 'upgrade_status', 'symfony_mailer', + 'recaptcha_v3', ]; diff --git a/web/themes/nect-theme/templates/page--community-persona.html.twig b/web/themes/nect-theme/templates/page--community-persona.html.twig index 322fbc7f1..7656497d7 100755 --- a/web/themes/nect-theme/templates/page--community-persona.html.twig +++ b/web/themes/nect-theme/templates/page--community-persona.html.twig @@ -1,6 +1,6 @@ {% extends "page.html.twig" %} {% block main_wrapper_classes %} - {% set sidebar_first_classes = "order-1 col-lg-4 col-12 mx-auto" %} - {% set main_wrapper_classes = "order-2 col-lg-8 col-12 mx-auto" %} + {% set sidebar_first_classes = "order-1 col-lg-3 col-12 mx-auto" %} + {% set main_wrapper_classes = "order-2 col-lg-9 col-12 mx-auto" %} {{ parent() }} {% endblock %} diff --git a/web/themes/nect-theme/templates/page.html.twig b/web/themes/nect-theme/templates/page.html.twig index 2106954cf..ebd5a9b09 100755 --- a/web/themes/nect-theme/templates/page.html.twig +++ b/web/themes/nect-theme/templates/page.html.twig @@ -245,10 +245,10 @@ {% endif %} {% block main_wrapper_classes %} {% if sidebar_first_classes is null %} - {% set sidebar_first_classes = "order-2 order-lg-1 col-lg-4 col-12 mx-auto" %} + {% set sidebar_first_classes = "order-2 order-lg-1 col-lg-3 col-12 mx-auto" %} {% endif %} {% if main_wrapper_classes is null %} - {% set main_wrapper_classes = "order-1 order-lg-2 col-lg-8 col-12 mx-auto" %} + {% set main_wrapper_classes = "order-1 order-lg-2 col-lg-9 col-12 mx-auto" %} {% endif %} {% if domain_name != "ccmnet" %}