10000 build: Prepare v3.11.2 by merging develop into release/3.11.x by fsbraun · Pull Request #7525 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

build: Prepare v3.11.2 by merging develop into release/3.11.x #7525

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

Merged
merged 78 commits into from
Apr 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
28f45b6
ci: stale bot added (#7298)
marksweb Jun 29, 2022
c1290c9
ci: Added codespell (#7355)
marksweb Jul 3, 2022
d5a9f49
fix: Added language to page cache key (#7354)
marksweb Jul 3, 2022
b80b4de
ci: Remove a superfluous installation of codespell (#7356)
cclauss Jul 3, 2022
908b800
build: bump django from 3.2.13 to 3.2.14 in /docs (#7358)
dependabot[bot] Jul 6, 2022
9948c68
typo (#7360)
Husseinfo Jul 14, 2022
3c7c9bd
Update install.rst (#7368)
dapoadedire Jul 24, 2022
3b2dc10
ci: Flake8 fixes (#7372)
marksweb Aug 1, 2022
3c01311
build: bump django from 3.2.14 to 3.2.15 in /docs (#7379)
dependabot[bot] Aug 11, 2022
abc6e6c
fix: default light mode (#7381)
viliammihalik Aug 15, 2022
fef9158
ci: Merging release/3.11.0 (#7377)
marksweb Aug 19, 2022
9858b77
docs: Bump requirements (#7382)
marksweb Sep 3, 2022
cdcf260
fix: CMS check management command fixed [#7386]
mbi Sep 12, 2022
b8750eb
ci: sync isort line length (#7353)
marksweb Sep 12, 2022
1ec5698
docs: fixing a link (#7393)
shivan-s Sep 16, 2022
a7f8cd4
refactor: Move js API functions to CMS.Helpers to make them available…
fsbraun Sep 27, 2022
162ff8d
fix: Allow partially overriding CMS_CACHE_DURATIONS (#7339)
eagleoflqj Oct 8, 2022
49bd066
Adjust paste label in pt-br locale (#7376)
wesleysima Oct 8, 2022
0fd058e
feat: Add support for tel: and mailto: URIs in Advanced Page Settings…
marksweb Oct 8, 2022
6d83a9f
docs: Correction of headings around CMSPlugin & CMSPluginBase (#7406)
cagejsn Oct 9, 2022
9e3c579
fix: Unlocalize page and node ids when rendering the page tree in the…
mbi Oct 9, 2022
e59c179
fix: Clear page permission cache on page create (#6866)
g3rb3n Oct 12, 2022
fcfe77f
fix: Changing color scheme resets session settings to defaults (#7407)
fsbraun Oct 14, 2022
64ae4ad
ci: Added pre-commit ci config (#7409)
marksweb Oct 16, 2022
7ca1b61
perf: Don't count users when CMS_RAW_ID_USERS=True (#7414)
fsbraun Oct 20, 2022
dcf394b
fix: CMS check management command fixed [#7412] (#7413)
ton77v Oct 20, 2022
27515cc
ci: Some tests misusing assertTrue for comparisons fix (#7241)
code-review-doctor Oct 20, 2022
777864a
feat: Support for Django 4.1 (#7404)
fsbraun Oct 21, 2022
7cc6e78
build: bump django from 3.2.15 to 3.2.16 in /docs (#7417)
dependabot[bot] Oct 26, 2022
068e115
build: bump minimatch and gulp-if (#7416)
dependabot[bot] Oct 26, 2022
2788f75
fix: Added deprecation warning to `get_current_language()` (#7410)
marksweb Oct 29, 2022
3fe1449
feat: add Python 3.11 support for Django CMS (#7422)
Oct 30, 2022
d38f4a1
fix: Adds a deprecation warning for SEND_BROKEN_LINK_EMAILS (#7420)
fsbraun Nov 3, 2022
06c9a85
fix: Prefer titles matching request language (#7144)
macro1 Nov 4, 2022
3e4bad2
build: bump pillow from 8.3.2 to 9.3.0 in /test_requirements (#7443)
dependabot[bot] Nov 22, 2022
c68eed1
build: bump loader-utils from 1.4.0 to 1.4.2 (#7435)
dependabot[bot] Nov 24, 2022
892baa8
build: bump certifi from 2022.6.15 to 2022.12.7 in /docs (#7452)
dependabot[bot] Dec 9, 2022
c25ecc2
ci: Add GitHub action to make a release (#7454)
fsbraun Dec 12, 2022
cbb855a
Update setup.py (#7462)
fsbraun Dec 21, 2022
0c75223
build: bump minimatch from 3.0.4 to 3.1.2 (#7453)
dependabot[bot] Dec 24, 2022
1cd5b1a
build: bump wheel from 0.37.1 to 0.38.1 in /docs (#7463)
dependabot[bot] Dec 27, 2022
2aa2f89
build: bump decode-uri-component from 0.2.0 to 0.2.2 (#7451)
dependabot[bot] Dec 27, 2022
7132ee3
fix: cms-messages background color (#7465)
fsbraun Dec 29, 2022
6443da8
ci: Update develop with 3.11.1 release (#7469)
fsbraun Jan 5, 2023
fdda2a2
ci: Add deprecations for functions not available in cms v4 (#7458)
fsbraun Jan 6, 2023
8c91e33
fix: Build docs always from the current local version (#7472)
fsbraun Jan 10, 2023
6860a13
ci: Add CodeQL workflow for GitHub code scanning (#7432)
lgtm-com[bot] Jan 10, 2023
99e9ab0
feat: add download statistics to readme (#7474)
fsbraun Jan 11, 2023
2cd93e9
docs: Added note to publish_pages API docs about it being a generator…
jasperbok Jan 22, 2023
5135ca3
fix: Link both user and group from global page permissions to change …
fsbraun Jan 24, 2023
6a96b7c
Make messages readable in dark mode, remove iOS9 compatibility tr 8000 ick …
fsbraun Jan 24, 2023
99c8843
fix: replace ' by ′ in fr translation − no more "page d\u0027accueil"…
corentinbettiol Jan 25, 2023
ff94c5d
fix/merge_errors (#7487)
fsbraun Jan 27, 2023
86a9a14
docs: Update formatting in how-to/install.rst to avoid misunderstandi…
fsbraun Feb 5, 2023
4d7ed46
feat: add setting so redirect preserve params (#7489)
igobranco Feb 7, 2023
c7fc2f2
improved code readability (#7503)
deepbluesquirrel Feb 13, 2023
7e852ec
feat: add setting to redirect slugs to lowercase (#7509)
pajowu Mar 8, 2023
31ea031
docs: Update incomplete color scheme docs (#7512)
fsbraun Mar 23, 2023
9e33167
fix typos (#7514)
wasertech Mar 28, 2023
89a42dd
feat: add django 4.2 support (#7481)
Apr 10, 2023
4c0b3a8
ci: more deprecations in light of upcoming v4 (#7480)
fsbraun Apr 10, 2023
ceadcaa
ci: introduce ruff in place of flake8 for improved speed (#7504)
vinitkumar Apr 10, 2023
25b2303
feat: add download statistics to readme (#7474)
fsbraun Jan 11, 2023
ca8f75b
docs: Added note to publish_pages API docs about it being a generator…
jasperbok Jan 22, 2023
6cb4762
fix: Link both user and group from global page permissions to change …
fsbraun Jan 24, 2023
bdd10ae
Make messages readable in dark mode, remove iOS9 compatibility trick …
fsbraun Jan 24, 2023
b4acc9a
fix: replace ' by ′ in fr translation − no more "page d\u0027accueil"…
corentinbettiol Jan 25, 2023
45e78dd
docs: Update formatting in how-to/install.rst to avoid misunderstandi…
fsbraun Feb 5, 2023
dcb9c4b
feat: add setting so redirect preserve params (#7489)
igobranco Feb 7, 2023
327a86f
improved code readability (#7503)
deepbluesquirrel Feb 13, 2023
01aedee
feat: add setting to redirect slugs to lowercase (#7509)
pajowu Mar 8, 2023
9a3d647
docs: Update incomplete color scheme docs (#7512)
fsbraun Mar 23, 2023
04a85d3
fix typos (#7514)
wasertech Mar 28, 2023
5478faa
feat: add django 4.2 support (#7481)
Apr 10, 2023
187ea98
ci: more deprecations in light of upcoming v4 (#7480)
fsbraun Apr 10, 2023
6833976
ci: introduce ruff in place of flake8 for improved speed (#7504)
vinitkumar Apr 10, 2023
f57d516
Merge branch 'develop' of github.com:fsbraun/django-cms into fsbraun-…
fsbraun Apr 16, 2023
41da65d
Merge branch 'fsbraun-develop' into develop
fsbraun Apr 16, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
docs: Update incomplete color scheme docs (#7512)
* fix/merge_errors

* Update incomplete color scheme docs

* fix typos
  • Loading branch information
fsbraun committed Apr 16, 2023
commit 9a3d6479ee04a4a90f6538e80fc16b87e5e9692d
6 changes: 4 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ Highlights:
* Support for django 4
* Dark mode support

* Added dark mode support to css, dark mode settings and toggle button
Bug fixes:
----------

* Fix publishing of static placeholders outside of CMS pages
* Allow to override the template rendered after a plugin has been saved.
* Revert change to the toolbar sites menu to use ``http`` protocol.
Expand Down Expand Up @@ -1250,7 +1252,7 @@ Thanks to all contributors for their efforts!
- Fix issue on django >= 1.6 with page form fields.
- Resolve jQuery namespace issues in admin page tree and changeform
- Fix issues for PageField in Firefox/Safari
- Fix some Python 3.4 compatibility issue when using proxy modles
- Fix some Python 3.4 compatibility issue when using proxy models
- Fix corner case in plugin copy
- Documentation fixes
- Minor code cleanups
Expand Down
2 changes: 1 addition & 1 deletion cms/static/cms/js/select2/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ http://www.apache.org/licenses/LICENSE-2.0
http://www.gnu.org/licenses/gpl-2.0.html

Unless required by applicable law or agreed to in writing, software distributed under the Apache License
or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
either express or implied. See the Apache License and the GPL License for the specific language governing
permissions and limitations under the Apache License and the GPL License.
55 changes: 49 additions & 6 deletions docs/topics/colorscheme.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Color schemes (light/dark) with django CMS
responsibility of the site developer.

The admin interfaces will only reflect the described behavior if the package
``djangocms-admin-style`` is installed (version XXX or later). If it is not installed the admin
``djangocms-admin-style`` is installed (version 3.2 or later). If it is not installed the admin
interface is managed by your underlying Django installation which usually
uses the browser's color scheme.

Expand Down Expand Up @@ -49,15 +49,58 @@ setting in your project's ``setting.py``:
.. important::

Not all plugin admin interfaces might support a dark color scheme, especially
if plugin forms contain custom widgets. See XXXX on how to make your widgets
compatible with django CMS' color scheme support.
if plugin forms contain custom widgets.

**********************************
Toggle button for the color scheme
**********************************

Adding the setting ``CMS_COLOR_SCHEME_TOGGLE = True`` to the project's ``settings.py``
will add a toggle icon (sun/moon) to the toolbar allowing a user to switch their
color scheme for their session.
Adding the setting ``CMS_COLOR_SCHEME_TOGGLE = True`` to the project's ``settings.py`` will add a toggle icon (sun/moon) to the toolbar allowing a user to switch their color scheme for their session.


******************************************
Make your own admin css color scheme aware
******************************************

Plugin forms or any admin forms use Django's admin app which itself supports light and dark color schemes. djangocms-admin-style introduces django CMS' color scheme to the admin app. Just as Django does, djangocms-admin-style defines css variables for frequent colors.

We recommend to write at least your reusable apps in a way which allows them to respect the color scheme with djangocms-admin-style and with Django's admin style.

Here's some recommendations for making your app work as seamlessly as possible:

* Try avoiding using ``color``, ``background-color``, or other color styles where possible and meaningful.
* If necessary use as few as possible standard django CMS colors (preferably from the list below with plain Django fallback colors)
* Use the following pattern: ``var(--dca-color-var, var(--fallback-color-var, #xxxxxx))`` where ``#xxxxxx`` represents the light version of the color. This tries django CMS color scheme first and falls back to Django color scheme if djangocms-admin-style is not available.
* Avoid media queries like ``@media (prefers-color-scheme: dark)`` since they would ignore forced settings to light or dark.


The admin frontend pulls the style from django admin styles and - if present - from djangocms-admin-style. Django itself also uses css variables to implement admin mode, these can be used as dark mode-aware fall-back colors.

Here's a table of django CMS' css color variables and their Django fallbacks:

=============================== =========== ======================= ===========
Variable name Color Fallback Color
=============================== =========== ======================= ===========
``--dca-white`` ``#ffffff`` ``--body-bg`` ``#ffffff``
``--dca-gray`` ``#666`` ``--body-quiet-color`` ``#666``
``--dca-gray-lightest`` ``#f2f2f2`` ``--darkened-bg`` ``#f8f8f8``
``--dca-gray-lighter`` ``#ddd`` ``--border-color`` ``#ccc``
``--dca-gray-light`` ``#999`` ``--close-button-bg`` ``#888``
``--dca-gray-darker`` ``#454545``
``--dca-gray-darkest`` ``#333``
``--dca-gray-super-lightest`` ``#f7f7f7``
``--dca-primary`` ``#00bbff`` ``--primary`` ``#79aec8``
``--dca-black`` ``#000`` ``--body-fg`` ``#303030``
=============================== =========== ======================= ===========

This leaves these recommendation for color scheme dependent colors:

.. code-block::

white: var(--dca-white, var(--body-bg, #fff))
gray: var(--dca-gray, var(--body-quiet-color, #666))
gray-lightest: var(--dca-gray-lightest, var(--darkened-bg, #f2f2f2))
gray-lighter var(--dca-gray-lighter, var(--border-color, #ddd))
gray-light: var(--dca-gray-lightest, var(--darkened-bg, #f2f2f2))
gray-primary: var(--dca-primary, var(--primary, #0bf))
black: var(--dca-black, var(--body-fg), #000))
0