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

WIP For Initial Review: Feature/cdodge/alpha microsite #2000

Closed
wants to merge 13 commits into from

Conversation

chrisndodge
Copy link
Contributor

This feature is to support domain branding (e.g. 'foo.edx.org') as required for some B2B launches soon (mid-January).

I wanted to get together a pull request so that some people can start taking a look at the diffs. In particular, @sefk can someone from Stanford look at this and make sure it'll be compatible with your theming.

Test writing is TBD, but wanted to get some eyeballs on this main implementation.

@sefk
Copy link
Contributor

sefk commented Dec 20, 2013

It feels like this is undoing the good stuff about how we had handled theming before. From my perspective there are three key pieces of what theming does:

  1. When you enable_theme, it adds directories to Django's TEMPLATE_DIRS and STATIC_DIRS variables. That way when Django is looking for the templates and static assets to serve, it can find them in another place on the filesystem. If you don't choose to override a template in the theme, Django will fall through and find the default in the search path.
  2. The theme is checked out right alongside the edx-platform on the machine, and is a place where we can encapsulate all these custom bits -- css, img, templates.
  3. There's a bit of hackery in the toolchain since we need to make both Ruby and Python aware of the theme. (this part is still pretty murky to me). But you need some way to use themed css. The existing theme handles this, but it's a bit hacky (requres a top-level env.json containing just {"THEME_NAME":"stanford"}

I really don't like having all the template changes just wedged into the microsites.py file. This is a bummer place to maintain HTML templates, in strings wedged into a python config file. You lose all the semantics of having HTML in there.

If you really want these overrides to live in a big dict, and not handled with Django loading/handling, then at least could we build that dict at runtime by loading files off disk? But even then it seems like we're working against Django instead of with it -- for example subverting Django's template searching and watching stuff.

So static assets have to be served off machine, templates are wedged into the config. What about CSS? It looks like those still have to be put in the source tree under the microsites directory. And so that takes us down the path of either a) having all the customization files checked into the master repo (yuck), or some other way for those files to get put onto a production machine and stitched into the source repo (yuck). It seems like this takes us back to a "theme" directory, and if you have to do that for CSS, why not for other pieces you want to redirect, like templates and assets.

I wonder if there's some way to keep the "theme" directory idea as it stands now, and then use the middleware you've written to adjust the Django bits to still make it handle different assets per request, instead of per instance.

I assume you tried to get native Django "sites" working and that didn't work? not familiar with that myself, so I presume not.

Sorry to be such a wet blanket. You should let me know how you want to proceed, Chris, especially giving your tight deadlines. If you plan to move forward then I'll try to see if we can recreate what Stanford is doing now with these changes (it's broken now). If you're open to discuss other approaches, then maybe we can find some time tomorrow on the phone? I know it's right before the holiday, but I am around.

@benpatterson benpatterson deleted the feature/cdodge/alpha-microsite branch January 21, 2015 13:12
shimulch pushed a commit to open-craft/edx-platform that referenced this pull request Jan 26, 2021
shimulch pushed a commit to open-craft/edx-platform that referenced this pull request Jan 26, 2021
* MCKIN-22396 Fix samesite cookie issue for Scorm Shell login flow (openedx#1879)

* Adds django-cookies-sameseite middleware

and settings to set SameSite=None for all secure cookies.

* Fix `SameSite` cookie issue for LTI Provider. EW-449

(cherry picked from commit 28479a2)

* Fix tests, conflicts resolved

Co-authored-by: Jillian Vogel <jill@opencraft.com>
Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu>

* MCKIN-19584: add support for inline discussions translations (openedx#1863)

* MCKIN-19584: add support for inline discussions translations (openedx#1830)

* add support for inline discussions translations

* mark js string for translation on discussions

* ironwood fix

* MCKIN-19840 EOC (End of course Journal) - None of the strings are translated in any language (openedx#1857)

* MCKIN-19840 Add version bump for EOC 0.7.1 (openedx#1867)

* MCKIN-23062 purge cohorts of deleted groups

* MCKIN-23098 404 error on opening the module having EOC with no translations (openedx#1870)

* MCKIN-23098 404 error on opening the module having EOC with no translations integrated

* fix typo and chinese translation on discussions page (openedx#1875)

* Fix mismatching versions for api integration

* security fixes patch

* MCKIN-23604 Match fork code with upstream (openedx#1880)

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)

* MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871)

* MCKIN-22507 Updated GW submission API to accept TA email id

* Fixed typo

* MCKIN-22509 VB

* [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887)

* MCKIN-22509 Added API to check/create anonymous user id (openedx#1882)

* MCKIN-23249 Threw error if any of group has submissions (openedx#1884)

* Added ignore condition for generated files

* Release freeze (openedx#1895)

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)

* MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871)

* MCKIN-22507 Updated GW submission API to accept TA email id

* Fixed typo

* MCKIN-22509 VB

* [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887)

* MCKIN-22509 Added API to check/create anonymous user id (openedx#1882)

* MCKIN-23249 Threw error if any of group has submissions (openedx#1884)

* Added ignore condition for generated files

Co-authored-by: Piotr Surowiec <piotr@opencraft.com>
Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com>
Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com>
Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com>

* Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)"

This reverts commit 5dad4f0.

* Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)"

This reverts commit 5dad4f0.

* MCKIN-23061 Fix enlarged buttons on studio (openedx#1892)

* Revert "Updated subsections grade percentage to start rounding"

This reverts commit fde830b.

* MCKIN-22514 problem builder verion bump

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions`

* [BB-2765] Add `reverse_sql` to `database_fixups/0002` migration

* MCKIN-24492 version bump api-integration (openedx#1898)

* MCKIN-21527 Problem Builder (FTE, Assessment, MCQ, MRQ) - On opening these modules, none of the text is translated on notifications dropdown. (openedx#1889)

* MCKIN-21918 Inline discussion japanese buttons (openedx#1891)

Co-authored-by: murad-hubib <murad.habib@arbisoft.com>

* bump xblock problem-builder version to 3.5.1 (openedx#1899)

* MCKIN-24501 api-integration version bump (openedx#1903)

* Security patch from aug 26 (openedx#1894)

Co-authored-by: Ned Batchelder <ned@edx.org>

* sustaining xss security fixes 3 (openedx#1893)

Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>

* Sustaining security fixes 4 & 5 (openedx#1901)

Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>

* MCKIN-24663 sorting alphanumeric list (openedx#1908)

* MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917)

* MCKIN-24559 - Organization extensions VB (openedx#1905)

Releasing `v2.0.6`

* MCKIN-24565 - Organizations extensions VB (openedx#1907)

Releasing `v2.0.7`

* MCKIN-24511 Projects extension VB (openedx#1915)

* Resolved conflits

* Resloved conflicts

* MCKIN-21919 Inline Discussion - The following strings are not translated in Korean Language (openedx#1906)

* Resolved conflict

* Resolved conflicts

* MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917)

* MCKIN-25170 translation for review grade

* MCKIN-24296 missing translations added (openedx#1926)

* missing translations added (openedx#1927)

* MCKIN-25091 fixed Discussion post Anonymously (openedx#1925)

* VB for VR and eoc (openedx#1933)

* MCKIN-25752 discussion and question posted translations (openedx#1934)

* MCKIN-26123 Plateform Issues (openedx#1939)

* MCKIN-26123 Plateform Issues (openedx#1940)

* MCKIN-26123 Drag and Drop Version update (openedx#1942)

* MCKIN-23104 version upgrade of EOC journal (openedx#1941)

* MCKIN-26505 Version update of Problem Builder (openedx#1945)

* MCKIN-26123 Drag&Drop Version Update (openedx#1947)

* MCKIN-26589 Integrate translations of FIND DISCUSSIONS for main discussions page for all languages (openedx#1949)

* [v1.54.0] complied mo files

* MCKIN-24786 - api-integration version bump

* MCKIN-26967 - EOC VB

* MCKIN-23037 - Ooyala xblock version bump

* MCKIN-27119 - Missing strings added

* MCKIN-26468 - projects extensions VB (openedx#1951)

Releasing `v3.0.4`

* MCKIN-24382 Scorm VB (openedx#1966)

* Scorm VB

* MCKIN-26967 EOC VB

* MCKIN-24385: bump xblock diagnostic feedback version to v0.4.0 (openedx#1971)

* MCKIN-24468 McKA - Update Scorm xblock to Python 3.5 fix bug (openedx#1979)

* MCKIN-24385 bump xblock-diagnosticfeedback version to v0.4.1 (openedx#1987)

* MCKIN-26471 API integration VB (openedx#1995)

* bump xblock scorm version to v3.2.1 (openedx#1996)

* MCKIN-26850 EOC-journal version bump (openedx#2001)

* MCKIN-24383 & 24384 VB for GP v2 and Adventure (openedx#1961)

* MCKIN-24383 GW v2 version bump (openedx#2000)

* vb gp (openedx#2002)

* vb gp (openedx#2004)

* MCKIN-28139 Pinned pyopenssl version to 18.0.0

* vb gp (openedx#2004)

* MCKIN-28122 Traslations for all languages (openedx#2015)

* MCKIN-28123 vb gp (openedx#2018)

* Versions update.

Co-authored-by: Moeez Zahid <moeezzahid1996@gmail.com>
Co-authored-by: Jillian Vogel <jill@opencraft.com>
Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu>
Co-authored-by: Saqib <msaqib52@gmail.com>
Co-authored-by: Wasif ur Rehman <wasifarbisoft@users.noreply.github.com>
Co-authored-by: Mudassir Hafeez <mudassir.hafeez@arbisoft.com>
Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com>
Co-authored-by: ihtram <iulhaq@edx.org>
Co-authored-by: Piotr Surowiec <piotr@opencraft.com>
Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com>
Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Mudassir Hafeez <41048311+mudassir-hafeez@users.noreply.github.com>
Co-authored-by: murad-hubib <murad.habib@arbisoft.com>
Co-authored-by: Ned Batchelder <ned@edx.org>
Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>
Co-authored-by: Naeem Ilyas <naeem-ilyas@live.com>
Co-authored-by: Muhammad Usman <43761905+musmanmalik@users.noreply.github.com>
Co-authored-by: Mudassir Hafeez <mudasir5761@gmail.com>
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