Skip to content

Commit

Permalink
Merge pull request #854 from openeuropa/update-EPIC-ECL-v3
Browse files Browse the repository at this point in the history
Update epic branch ecl v3.
  • Loading branch information
ademarco authored Jun 22, 2021
2 parents 7ec862e + c7a4eb8 commit 3e4b6ae
Show file tree
Hide file tree
Showing 175 changed files with 5,787 additions and 423 deletions.
5 changes: 5 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ services:
environment:
- DISPLAY=:99
- SE_OPTS=-debug
- DISPLAY=:99
- SCREEN_WIDTH=1280
- SCREEN_HEIGHT=800
- NODE_MAX_INSTANCES=5
- NODE_MAX_SESSION=5

pipeline:
npm-build:
Expand Down
85 changes: 85 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,94 @@
# Changelog

## [2.20.0](https://github.com/openeuropa/oe_theme/tree/2.20.0) (2021-06-17)

[Full Changelog](https://github.com/openeuropa/oe_theme/compare/2.19.0...2.20.0)

**Merged pull requests:**

- EWPP-1170: Remove dev branch from dependencies. [\#849](https://github.com/openeuropa/oe_theme/pull/849) ([imanoleguskiza](https://github.com/imanoleguskiza))
- EWPP-1112: Style the iframe paragraph. [\#809](https://github.com/openeuropa/oe_theme/pull/809) ([yenyasinn](https://github.com/yenyasinn))
- EWPP-1049: Address field should have only Country as mandatory. [\#792](https://github.com/openeuropa/oe_theme/pull/792) ([yenyasinn](https://github.com/yenyasinn))

## [2.19.0](https://github.com/openeuropa/oe_theme/tree/2.19.0) (2021-06-15)

[Full Changelog](https://github.com/openeuropa/oe_theme/compare/2.18.0...2.19.0)

**Merged pull requests:**

- Prepare release 2.19.0. [\#848](https://github.com/openeuropa/oe_theme/pull/848) ([imanoleguskiza](https://github.com/imanoleguskiza))
- EWPP-851: Update EPIC branch. [\#846](https://github.com/openeuropa/oe_theme/pull/846) ([sergepavle](https://github.com/sergepavle))
- EWPP-953: Organisation version 2 epic [\#845](https://github.com/openeuropa/oe_theme/pull/845) ([ademarco](https://github.com/ademarco))
- EWPP-953: Update epic. [\#844](https://github.com/openeuropa/oe_theme/pull/844) ([nagyad](https://github.com/nagyad))
- EWPP-851: Update EPIC branch. [\#843](https://github.com/openeuropa/oe_theme/pull/843) ([sergepavle](https://github.com/sergepavle))
- Update epic org v2 [\#842](https://github.com/openeuropa/oe_theme/pull/842) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-993: Add string translations for 'Leadership and organisation'. [\#841](https://github.com/openeuropa/oe_theme/pull/841) ([22Alexandra](https://github.com/22Alexandra))
- Update org v2 epic [\#840](https://github.com/openeuropa/oe_theme/pull/840) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-851: Update EPIC branch. [\#838](https://github.com/openeuropa/oe_theme/pull/838) ([sergepavle](https://github.com/sergepavle))
- EPIC EWPP-1041: Contact entity link field. [\#835](https://github.com/openeuropa/oe_theme/pull/835) ([upchuk](https://github.com/upchuk))
- Updating epic EWPP-1041 [\#834](https://github.com/openeuropa/oe_theme/pull/834) ([upchuk](https://github.com/upchuk))
- EWPP-851: Update EPIC branch of EWPP-851 in-page navigation. [\#833](https://github.com/openeuropa/oe_theme/pull/833) ([sergepavle](https://github.com/sergepavle))
- EWPP-1153: Fix breadcrumb page title cache. [\#831](https://github.com/openeuropa/oe_theme/pull/831) ([nagyad](https://github.com/nagyad))
- EWPP-953: Update organisation v2 epic. [\#826](https://github.com/openeuropa/oe_theme/pull/826) ([nagyad](https://github.com/nagyad))
- EWPP-1169: Realign with release branch. [\#825](https://github.com/openeuropa/oe_theme/pull/825) ([hernani](https://github.com/hernani))
- EWPP-851: Update EPIC branch. [\#823](https://github.com/openeuropa/oe_theme/pull/823) ([sergepavle](https://github.com/sergepavle))
- Merge 2.x into EWPP-1041 Contacts. [\#822](https://github.com/openeuropa/oe_theme/pull/822) ([yenyasinn](https://github.com/yenyasinn))
- EWPP-1101: Implement overridable js for adjusting layout on disappeared in-page navigation block. [\#821](https://github.com/openeuropa/oe_theme/pull/821) ([sergepavle](https://github.com/sergepavle))
- EWPP-1143: Apply access checks for media render. [\#820](https://github.com/openeuropa/oe_theme/pull/820) ([nagyad](https://github.com/nagyad))
- EWPP-900: Using master branch of oe\_media. [\#819](https://github.com/openeuropa/oe_theme/pull/819) ([upchuk](https://github.com/upchuk))
- EWPP-1129: Use short title with fallback logic for rendering title on teaser view modes. [\#818](https://github.com/openeuropa/oe_theme/pull/818) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-000: Fix theme installation instructions. [\#816](https://github.com/openeuropa/oe_theme/pull/816) ([ademarco](https://github.com/ademarco))
- EWPP-0000: Use latest dev version of oe\_media to fix test failures. [\#815](https://github.com/openeuropa/oe_theme/pull/815) ([brummbar](https://github.com/brummbar))
- Updating the EWPP-1041 epic [\#814](https://github.com/openeuropa/oe_theme/pull/814) ([upchuk](https://github.com/upchuk))
- EWPP-963: Add navigation block in template. [\#813](https://github.com/openeuropa/oe_theme/pull/813) ([sergepavle](https://github.com/sergepavle))
- EWPP-851 Update epic branch. [\#812](https://github.com/openeuropa/oe_theme/pull/812) ([sergepavle](https://github.com/sergepavle))
- EWPP-0000: Fixing oe\_multilingual\_install\(\) call. [\#810](https://github.com/openeuropa/oe_theme/pull/810) ([hernani](https://github.com/hernani))
- Epic-EWPP-851 in page nav [\#807](https://github.com/openeuropa/oe_theme/pull/807) ([hernani](https://github.com/hernani))
- EWPP-1087: Make tables created via WYSIWYG behave correctly when disp… [\#804](https://github.com/openeuropa/oe_theme/pull/804) ([yenyasinn](https://github.com/yenyasinn))
- EWPP-1015: Update to ECL 2.38. [\#803](https://github.com/openeuropa/oe_theme/pull/803) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-1105: Add link to person node entity in OpenEuropa Compact Teaser view mode. [\#801](https://github.com/openeuropa/oe_theme/pull/801) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-1104: Update drupal-driver to 2.1.0. [\#798](https://github.com/openeuropa/oe_theme/pull/798) ([nagyad](https://github.com/nagyad))
- EWPP-902: Gallery item to use icons for images as well. [\#797](https://github.com/openeuropa/oe_theme/pull/797) ([upchuk](https://github.com/upchuk))
- Merging 2.x into EPIC-EWPP-1041-Contacts [\#796](https://github.com/openeuropa/oe_theme/pull/796) ([yenyasinn](https://github.com/yenyasinn))
- Update organisation epic branch. [\#793](https://github.com/openeuropa/oe_theme/pull/793) ([22Alexandra](https://github.com/22Alexandra))
- Updates Epic EWPP-953-Organisation [\#791](https://github.com/openeuropa/oe_theme/pull/791) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-1044: Include the Link field in the Contact rendering [\#789](https://github.com/openeuropa/oe_theme/pull/789) ([yenyasinn](https://github.com/yenyasinn))
- EWPP-851: Update EPIC branch. [\#788](https://github.com/openeuropa/oe_theme/pull/788) ([sergepavle](https://github.com/sergepavle))
- EWPP-989: Theme "Leadership and organisation" section. [\#787](https://github.com/openeuropa/oe_theme/pull/787) ([22Alexandra](https://github.com/22Alexandra))
- Release 2.17.x into 2.x [\#786](https://github.com/openeuropa/oe_theme/pull/786) ([imanoleguskiza](https://github.com/imanoleguskiza))
- EWPP-1047: Parallelize tests on oe\_theme [\#784](https://github.com/openeuropa/oe_theme/pull/784) ([ademarco](https://github.com/ademarco))
- EWPP-1039: Fix organisation\_teaser and text\_featured\_media pattern preview [\#783](https://github.com/openeuropa/oe_theme/pull/783) ([ademarco](https://github.com/ademarco))
- EWPP-992: Update contacts rendering on full and teaser view displays. [\#782](https://github.com/openeuropa/oe_theme/pull/782) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-990: Remove body field label from full view display. [\#781](https://github.com/openeuropa/oe_theme/pull/781) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-987: Adds overview field group to full view display. [\#779](https://github.com/openeuropa/oe_theme/pull/779) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-978: Update IEF to RC9 with the patch. [\#778](https://github.com/openeuropa/oe_theme/pull/778) ([nagyad](https://github.com/nagyad))
- EWPP-865: Trim spaces in field--bare.html.twig. [\#777](https://github.com/openeuropa/oe_theme/pull/777) ([sergepavle](https://github.com/sergepavle))
- EWPP-942: Order of languages in language switcher. [\#773](https://github.com/openeuropa/oe_theme/pull/773) ([yenyasinn](https://github.com/yenyasinn))
- EWPP-856: Create inpage navigation block. [\#772](https://github.com/openeuropa/oe_theme/pull/772) ([sergepavle](https://github.com/sergepavle))
- EWPP 855: Create in-page visibility plugin for the block. [\#766](https://github.com/openeuropa/oe_theme/pull/766) ([sergepavle](https://github.com/sergepavle))
- EWPP-854: Create new in-page navigation entity meta. [\#763](https://github.com/openeuropa/oe_theme/pull/763) ([sergepavle](https://github.com/sergepavle))
- EWPP-832: Print description in highlight variant of list item pattern. [\#761](https://github.com/openeuropa/oe_theme/pull/761) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-765: Allowing the navigation list to have optional URLs. [\#750](https://github.com/openeuropa/oe_theme/pull/750) ([upchuk](https://github.com/upchuk))
- EWPP-721: Update xdebug configuration. [\#722](https://github.com/openeuropa/oe_theme/pull/722) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-722: Add theme suggestions for text fields to replace multiple field templates. [\#721](https://github.com/openeuropa/oe_theme/pull/721) ([22Alexandra](https://github.com/22Alexandra))
- EWPP-402: Rework theme content type tests to use pattern assertion and drop behat [\#629](https://github.com/openeuropa/oe_theme/pull/629) ([yenyasinn](https://github.com/yenyasinn))

## [2.18.0](https://github.com/openeuropa/oe_theme/tree/2.18.0) (2021-05-10)

[Full Changelog](https://github.com/openeuropa/oe_theme/compare/2.17.1...2.18.0)

**Merged pull requests:**

- EWPP-1059: Add translation for arabic, catalan and turhish languages. [\#800](https://github.com/openeuropa/oe_theme/pull/800) ([imanoleguskiza](https://github.com/imanoleguskiza))
- Release 2.17.x into 2.x. [\#786](https://github.com/openeuropa/oe_theme/pull/786) ([nagyad](https://github.com/nagyad))

## [2.17.1](https://github.com/openeuropa/oe_theme/tree/2.17.1) (2021-04-20)

[Full Changelog](https://github.com/openeuropa/oe_theme/compare/2.17.0...2.17.1)

**Merged pull requests:**

- Update CHANGELOG.md for release 2.17.1. [\#785](https://github.com/openeuropa/oe_theme/pull/785) ([ademarco](https://github.com/ademarco))
- EWPP-1031: Fix tests that use role reference field. [\#780](https://github.com/openeuropa/oe_theme/pull/780) ([imanoleguskiza](https://github.com/imanoleguskiza))
- EWPP-969: Move Social media links outside Media fieldgroup on Person full view display. [\#776](https://github.com/openeuropa/oe_theme/pull/776) ([22Alexandra](https://github.com/22Alexandra))

Expand All @@ -14,6 +98,7 @@

**Merged pull requests:**

- Release 2.17.0: Update changelog. [\#775](https://github.com/openeuropa/oe_theme/pull/775) ([nagyad](https://github.com/nagyad))
- EWPP-649: Person epic. [\#774](https://github.com/openeuropa/oe_theme/pull/774) ([nagyad](https://github.com/nagyad))
- Update person content type epic with latest 2.x [\#771](https://github.com/openeuropa/oe_theme/pull/771) ([ademarco](https://github.com/ademarco))
- EWPP-945: Drop legacy ECL presets and update version [\#770](https://github.com/openeuropa/oe_theme/pull/770) ([ademarco](https://github.com/ademarco))
Expand Down
43 changes: 38 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,54 @@ This depends on the following software:

The recommended way of installing the OpenEuropa theme is via [Composer][2].

Before proceeding, please note that theme releases are built by a continuous integration system, and include code coming
from third-party libraries, such as [ECL][1] templates and other assets. Simply Running `composer require openeuropa/oe_theme`
will download the raw theme source code, which misses required third-party code.

In order to instruct Composer to download the actual built artifact, you need to require and configure the
[Composer Artifacts][19] project. To do so run:

```
composer require openeuropa/composer-artifacts
```

Then add the following section, in your project's `composer.json`:

```
"extra": {
"artifacts": {
"openeuropa/oe_theme": {
"dist": {
"url": "https://github.com/{name}/releases/download/{pretty-version}/{project-name}-{pretty-version}.tar.gz",
"type": "tar"
}
}
},
}
```

Once you are done, run:

```bash
composer require openeuropa/oe_theme
```

If you are not using Composer then download the [release package][3] and install it as described [here][10].
This will download the fully built artifact, as opposed to the raw theme source code.

**Note:** Release archives are built by the continuous integration system and include code coming from third-party
libraries, such as [ECL][1] templates and other assets. Make sure you use an actual release and not the source code
archives.
If you are not using Composer, then simply download a release artifact [here][3] (i.e. a `oe_theme-[x.y.z].tar.gz` file)
and install it as described [here][10].

### Enable the theme

In order to enable the theme in your project perform the following steps:

1. Enable the OpenEuropa Theme Helper module ```./vendor/bin/drush en oe_theme_helper```
2. Enable the OpenEuropa Theme and set it as default ```./vendor/bin/drush config-set system.theme default oe_theme```
2. Enable the OpenEuropa Theme and set it as default

```
./vendor/bin/drush theme:enable oe_theme
./vendor/bin/drush config-set system.theme default oe_theme
```

Step 1. is necessary until the following [Drupal core issue][8] is resolved. Alternatively you can patch Drupal core
with [this patch][9] and enable the theme: the patched core will then enable the required OpenEuropa Theme Helper
Expand Down Expand Up @@ -467,3 +499,4 @@ We use [SemVer](http://semver.org/) for versioning. For the available versions,
[16]: https://github.com/openeuropa/ecl-twig-loader
[17]: https://drone.io
[18]: https://www.npmjs.com/package/patch-package
[19]: https://github.com/openeuropa/composer-artifacts
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@
"drupal/config_devel": "~1.2",
"drupal/datetime_testing": "1.x-dev",
"drupal/description_list_field": "1.0.x-dev",
"drupal/drupal-driver": "~2.0.0-alpha6",
"drupal/drupal-driver": "^2.1.1",
"drupal/drupal-extension": "~4.0",
"drupal/emr": "~1.0-beta9",
"drupal/entity_reference_revisions": "~1.3",
"drupal/entity_browser": "^2.5",
"drupal/extra_field": "^1.1",
Expand Down Expand Up @@ -80,7 +81,7 @@
"psr-4": {
"Drupal\\Tests\\oe_theme\\": "./tests/",
"Drupal\\Tests\\oe_content\\": "./build/modules/contrib/oe_content/tests/",
"Drupal\\Tests\\oe_media\\": "./build/modules/contrib/oe_media/tests/src"
"Drupal\\Tests\\oe_media\\": "./build/modules/contrib/oe_media/tests/src/"
}
},
"repositories": {
Expand All @@ -100,7 +101,7 @@
},
"patches": {
"drupal/drupal-driver": {
"allow-date-only-date-fields": "https://patch-diff.githubusercontent.com/raw/jhedstrom/DrupalDriver/pull/201.patch"
"allow-date-only-date-fields": "https://patch-diff.githubusercontent.com/raw/jhedstrom/DrupalDriver/pull/235.patch"
},
"drupal/address": {
"https://www.drupal.org/project/address/issues/3144823": "https://www.drupal.org/files/issues/2020-11-05/3144823-6.patch"
Expand Down
Loading

0 comments on commit 3e4b6ae

Please sign in to comment.