update changes. update docs WIP. Add defaults for sidebar_left_min_width and sidebar_right_min_width properties in DefaultLayoutConfig

Author: lenadax

CHANGES.rst

@@ -4,8 +4,17 @@ Changes
 2.0a1 (unreleased)
 ------------------
 
-- Remove no longer used ``mainmenu_fluid`` and ``columns_fluid`` properties
-  from ``ILayoutConfig``. Replace with ``limit_content_width`` property.
+- Add ``sidebar_left_min_width`` and ``sidebar_right_min_width`` properties
+  to ``ILayoutConfig`` (Integer / px value).
+  [lenadax]
+
+- Remove no longer used ``mainmenu_fluid``, ``columns_fluid``, ``content_grid_width``
+  and ``sidebar_left_grid_width`` properties from ``ILayoutConfig``.
+  Replace with ``limit_content_width`` property (Boolean).
+  [lenadax]
+
+- Add ``sidebar_left_mode`` and ``sidebar_right_mode`` properties
+  to ``ILayoutConfig`` ('toggle'/'stacked').
   [lenadax]
 
 - Cleanup js widgets to prevent DOM memory leaks.

docs/source/layout.rst

@@ -2,6 +2,14 @@
 Layout
 ======
 
+.. version-added:: 2.0
+
+    Version 2.0 introduces a new, more flexible layout system and the ``sidebar_right``
+    and ``personaltools`` elements.
+
+    There are new layout configuration settings available. See
+    :ref:`layout_configuration` for details.
+
 .. _layout_main_template:
 
 Main Template
@@ -36,6 +44,12 @@ is structured as follows.
 .. figure:: ../../artwork/layout.svg
     :width: 100%
 
+
+.. _layout_configuration:
+
+Layout Configuration
+--------------------
+
 The layout can be configured for each application node. Layout configuration
 is described in ``cone.app.interfaces.ILayoutConfig`` and is registered for
 one or more model classes with ``cone.app.layout_config`` decorator.
@@ -67,35 +81,65 @@ one or more model classes with ``cone.app.layout_config`` decorator.
             self.sidebar_left_min_width = 250
             self.sidebar_right_min_width = 250
 
-Provided layout settings:
-
-- **mainmenu**: Flag whether to display mainmenu.
-
-- **livesearch**: Flag whether to display livesearch.
-
-- **personaltools**: Flag whether to display personaltools.
-
-- **limit_content_width**: Flag whether content width should be limited on large screens.
-
-- **pathbar**: Flag whether to display pathbar.
-
-- **sidebar_left**: List of tiles by name which should be rendered in left sidebar.
-
-- **sidebar_left_min_width**: Minimum left sidebar width as integer (in px).
-
-- **sidebar_right**: List of tiles by name which should be rendered in right sidebar.
-
-- **sidebar_right_min_width**: Minimum right sidebar width as integer (in px).
-
-.. note::
-
-    As of version 2.0, ``limit_content_width`` defaults to ``False``.
-
-.. deprecated:: 2.0
 
-    ``mainmenu_fluid`` and ``columns_fluid`` have been removed in ``cone.app 2.0``.
-    The ``columns_fluid`` setting has been replaced with
-    ``limit_content_width``.
+.. list-table:: Layout Configuration Settings
+  :widths: 20 60 20
+  :header-rows: 1
+
+  * - Setting
+    - Description
+    - Default
+  * - ``mainmenu``
+    - Flag whether to display mainmenu.
+    - True
+  * - ``livesearch``
+    - Flag whether to display livesearch.
+    - True
+  * - ``personaltools``
+    - Flag whether to display personaltools.
+    - True
+  * - ``limit_content_width``
+    - Flag whether content width should be limited on large screens.
+    - True
+  * - ``pathbar``
+    - Flag whether to display pathbar.
+    - True
+  * - ``sidebar_left``
+    - List of tiles by name which should be rendered in left sidebar.
+    - ['navtree']
+  * - ``sidebar_left_mode``
+    - The mode of the left sidebar (``'stacked'`` or ``'toggle'``).
+    - 'stacked'
+  * - ``sidebar_left_min_width``
+    - Minimum left sidebar width as integer (in px).
+    - 150
+  * - ``sidebar_right``
+    - List of tiles by name which should be rendered in right sidebar.
+    - []
+  * - ``sidebar_right_mode``
+    - The mode of the right sidebar (``'stacked'`` or ``'toggle'``).
+    - 'stacked'
+  * - ``sidebar_right_min_width``
+    - Minimum right sidebar width as integer (in px).
+    - 150
+
+.. version-added:: 2.0
+
+    - The ``sidebar_left_min_width`` and ``sidebar_right_min_width`` settings have been
+      added to specify minimum sidebar widths in px.
+    - The ``sidebar_left_mode`` and ``sidebar_right_mode`` settings have been
+      added to specify sidebar modes (either ``'stacked'`` or ``'toggle'``).
+    - The ``limit_content_width`` setting has been added to replace the former
+      ``columns_fluid`` setting.
+    - As of version 2.0, ``limit_content_width`` defaults to ``False``.
+
+.. version-removed:: 2.0
+
+    ``mainmenu_fluid``, ``columns_fluid``, ``sidebar_left_grid_width`` and 
+    ``content_grid_width`` have been removed in ``cone.app 2.0`` in favor of a
+    more flexible layout.
+    Use the ``columns_fluid`` setting instead to limit content width on
+    large screens.
 
 .. deprecated:: 1.1
 

package.json

@@ -12,7 +12,7 @@
     "rollup": "^2.79.2",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-postcss": "^4.0.2",
-    "sass": "^1.97.2",
+    "sass": "^1.97.3",
     "web-test-runner-qunit": "^2.0.0"
   },
   "packageManager": "pnpm@9.3.0+sha512.ee7b93e0c2bd11409c6424f92b866f31d3ea1bef5fbe47d3c7500cdc3c9668833d2e55681ad66df5b640c61fa9dc25d546efa54d76d7f8bf54b13614ac293631"

src/cone/app/__init__.py

@@ -73,9 +73,11 @@ def __init__(self, model=None, request=None):
         self.limit_content_width = True
         self.pathbar = True
         self.sidebar_left_mode = 'stacked' # 'toggle' or 'stacked'
+        self.sidebar_left_min_width = 150
         self.sidebar_left = ['navtree']
         self.sidebar_right = []
         self.sidebar_right_mode = 'stacked' # 'toggle' or 'stacked'
+        self.sidebar_right_min_width = 150
 
 
 def import_from_string(path):