Skip to content

Revert "Revert 'saleem-latif/WL-328: Multi-Site Comprehensive Theming'" - #12184

Closed
mattdrayer wants to merge 1 commit into
masterfrom
saleem-latif/WL-328-rebase
Closed

Revert "Revert 'saleem-latif/WL-328: Multi-Site Comprehensive Theming'"#12184
mattdrayer wants to merge 1 commit into
masterfrom
saleem-latif/WL-328-rebase

Conversation

@mattdrayer

Copy link
Copy Markdown
Contributor

@saleem-latif, FYI -- in order to rebase the WL-328 changes submitted and merged as #11885, then reverted in #12116, I had to 'revert the revert' and this branch+PR represents this process. It looks mainly correct although I had to address a couple of small conflicts which were also present during the initial revert. Let's see what Jenkins has to say.

This reverts commit 392ee7d.

Conflicts:
cms/envs/common.py
cms/envs/devstack.py
lms/envs/common.py
lms/envs/devstack.py
openedx/core/storage.py
pavelib/assets.py
pavelib/paver_tests/test_assets.py

@mattdrayer
mattdrayer force-pushed the saleem-latif/WL-328-rebase branch from d228031 to 30954b8 Compare April 19, 2016 02:33
@saleem-latif
saleem-latif force-pushed the saleem-latif/WL-328-rebase branch from 4ec9ec4 to 0b15bbb Compare April 19, 2016 11:21
@saleem-latif

Copy link
Copy Markdown
Contributor

@mattdrayer I have also added changes for WL-418 an WL-419 into this PR.

SiteTheme object for given site or a default site set by `DEFAULT_SITE_THEME`
"""

theme = site.themes.first()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like the perfect place to insert the ability to provide a theme override through URL parameter.

https://openedx.atlassian.net/browse/FEDX-31

It would be incredibly useful to be able to dynamically switch themes on a sandbox when verifying changes. I'm thinking this would be equivalent to the current preview_lang URL parameter for dynamically switching locale.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only problem I can see here is dealing with the cache timeout, which makes it hard to switch back and forth quickly between themes even using the Django admin -- so if we can work around (ie, ignore) that mechanism I think a URL parameter would be a useful add, yes -- if it ends up being a lot of work I think we'll need to log it as a follow-on story/feature, though.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andy-armstrong I think it would be better to do this after this PR, so that it can be properly tested and verified, I have logged a story to get this done https://openedx.atlassian.net/browse/WL-434,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@saleem-latif Makes sense. It would be great if possible if we could get it in this week so that we can use it to diagnose any issues that come up during the release. It seems like it should be a very simple change.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really don't want this to roll back again!

@andy-armstrong

Copy link
Copy Markdown
Contributor

@mattdrayer @saleem-latif FYI, the JS test failures are a known bug on master: https://openedx.atlassian.net/browse/TE-1280

@andy-armstrong

Copy link
Copy Markdown
Contributor

@mattdrayer Can you make a sandbox again with the various themes installed on it. Since I gave thumbs to this before and it had to be reverted, I'd like to really think through what we need to test.

@andy-armstrong

Copy link
Copy Markdown
Contributor

@mattdrayer @saleem-latif I'm done with my first pass review. This all looks great, but then I thought that last time. :-) Let me know when there's a sandbox I can look at, and when my feedback has been addressed.

@mattdrayer

Copy link
Copy Markdown
Contributor Author

I believe @saleem-latif has a sandbox in the works so we should be able to verify this branch over the course of the next cycle

@saleem-latif

Copy link
Copy Markdown
Contributor

@andy-armstrong I have update sandbox (theming.sandbox.edx.org) with the latest code, here are the links for different themes

  1. https://theming.sandbox.edx.org applied theme is 'edx.org' via DEFAULT_SITE_THEME settings defined in lms.env.json
  2. https://red-theme.sandbox.edx.org applied theme is 'red-theme' applied via SiteTheme
  3. https://red-theme-2.sandbox.edx.org applied theme is 'red-theme' applied via SiteTheme
  4. https://stanford-theme.sandbox.edx.org applied theme is 'stanford-style' applied via SiteTheme

@mattdrayer

Copy link
Copy Markdown
Contributor Author

@bjacobel -- would it be possible for you to take a look at this PR to ensure the asset watcher/management changes from #11849 were properly preserved? Thanks!

@bjacobel

Copy link
Copy Markdown
Contributor

@mattdrayer Hard for me to check it at a code level because it was an OSPR, but it looks like paver watch_assets is still working with this branch checked out so everything should be 👍

@andy-armstrong

Copy link
Copy Markdown
Contributor

@saleem-latif Thanks for setting up the sandboxes. Everything looks great from my side (but I did say that last time too!). 👍

@andy-armstrong

Copy link
Copy Markdown
Contributor

@mattdrayer Is it worth trying to land this as a separate release so that it doesn't get tangled in with everything else? How else can we ensure that we don't have to rollback? Also, we should probably do an RCA on the issues that we ran into here.

@saleem-latif
saleem-latif force-pushed the saleem-latif/WL-328-rebase branch from 2029577 to fb7a7dc Compare April 21, 2016 12:17
@mattdrayer

Copy link
Copy Markdown
Contributor Author

@andy-armstrong -- sorry for the delayed reply -- we are indeed planning to deploy this feature via patch release, versus a ride on the regular release train.

@mattdrayer

Copy link
Copy Markdown
Contributor Author

Closing this inactive PR in favor of #12218

@mattdrayer mattdrayer closed this Apr 26, 2016
@saleem-latif
saleem-latif deleted the saleem-latif/WL-328-rebase branch July 27, 2016 10:52
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.

4 participants