Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update wet theme #1012

Merged
merged 43 commits into from
Dec 12, 2019
Merged

Update wet theme #1012

merged 43 commits into from
Dec 12, 2019

Conversation

HoussamBedja
Copy link
Contributor

Hi Ian,

Could you please review this pull request then deploy it to staging?

This branch already includes the changes that you previously reviewed in the "add-wet-theme" + the update to WET v5 on both portal and registry sites.

Before this pull request, I was asked by Ross to first merge commits from the master branch then also from staging branch, which is why you will find lots of changes added that are not made by me, but from what was already existing in master.

I am trying to have it up on staging as soon as possible for the business team to test both sites (and will work on cleaning up unused code in parallel next week).

Thanks!

@wardi
Copy link
Member

wardi commented Oct 17, 2019

Yeah we don't want staging merged into this branch. Would you like to reset to the commit before the merge or should I?

@wardi
Copy link
Member

wardi commented Oct 17, 2019

Also please make the PR against master instead of staging

@wardi wardi changed the base branch from staging to master October 17, 2019 21:20
@wardi
Copy link
Member

wardi commented Oct 17, 2019

@HoussamBedja I force-pushed to remove the merge from staging, please reset the branch on your repo to the same commit before adding any more changes

@wardi
Copy link
Member

wardi commented Oct 17, 2019

Testing this locally I downloaded https://github.com/wet-boew/GCWeb/releases/tag/v5.1 and when I run the registry I don't see the registry menu any more. nevermind, found it.

Also the README needs to be updated for the new WET installation steps.

@wardi
Copy link
Member

wardi commented Oct 18, 2019

@HoussamBedja thanks, would you add instructions for installing the necessary files for WET as well? There were some instructions in the ckanext-wet-boew readme you can start from

@HoussamBedja
Copy link
Contributor Author

@wardi I added instructions to install the wet files. Please let me know if you have any feedback

@HoussamBedja
Copy link
Contributor Author

HoussamBedja commented Oct 23, 2019

Oh true, the GCWeb version number is changed. The --strip-components option is the same.

@wardi
Copy link
Member

wardi commented Oct 23, 2019

Are you sure? The last time I installed the gcweb package it had no "GCWeb" subdirectory because I used the "cdn" version https://github.com/wet-boew/GCWeb/releases/download/v5.1/themes-cdn-5.1-gcweb.zip should I have used the dist version instead?

@HoussamBedja
Copy link
Contributor Author

Hmm maybe I'm not sure. I just tested these commands and they give the desired output (a GCWeb directory containing the theme files as direct children, with no subdirectory)

@wardi wardi merged commit 633dec4 into master Dec 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants