2.0

.gitignore

@@ -1,3 +1,4 @@
+.python-version
 *.egg-info
 *.pyc
 *.pyo

CHANGES.rst

@@ -1,6 +1,17 @@
 Changes
 =======
 
+2.0.0 (unreleased)
+------------------
+
+- Users and Groups entry nodes are no longer displayed in main menu.
+  [rnix]
+
+- Remove no longer used ``content_grid_width`` and ``sidebar_left_grid_width``
+  properties from ``UGMLayoutConfig``.
+  [rnix]
+
+
 1.1.0 (unreleased)
 ------------------
 

Makefile

@@ -12,6 +12,7 @@
 #: i18n.lingua
 #: js.nodejs
 #: js.rollup
+#: js.scss
 #: js.wtr
 #: qa.coverage
 #: qa.test
@@ -27,11 +28,11 @@ DEPLOY_TARGETS?=
 
 # target to be executed when calling `make run`
 # No default value.
-RUN_TARGET?=
+RUN_TARGET?=run-ugm
 
 # Additional files and folders to remove when running clean target
 # No default value.
-CLEAN_FS?=
+CLEAN_FS?=pnpm-lock.yaml
 
 # Optional makefile to include before default targets. This can
 # be used to provide custom targets or hook up to existing targets.
@@ -93,6 +94,24 @@ WTR_CONFIG?=js/wtr.config.mjs
 # Default: --coverage
 WTR_OPTIONS?=--coverage
 
+## js.scss
+
+# The SCSS root source file.
+# Default: scss/styles.scss
+SCSS_SOURCE?=scss/ugm.scss
+
+# The target file for the compiles Stylesheet.
+# Default: scss/styles.css
+SCSS_TARGET?=src/cone/ugm/browser/static/cone.ugm.css
+
+# The target file for the compressed Stylesheet.
+# Default: scss/styles.min.css
+SCSS_MIN_TARGET?=src/cone/ugm/browser/static/cone.ugm.min.css
+
+# Additional options to be passed to SCSS compiler.
+# Default: --no-source-map=none
+SCSS_OPTIONS?=--no-source-map=none
+
 ## js.rollup
 
 # Rollup config file.
@@ -336,6 +355,17 @@ NODEJS_DEV_PACKAGES+=\
 wtr: $(NODEJS_TARGET)
 	@web-test-runner $(WTR_OPTIONS) --config $(WTR_CONFIG)
 
+##############################################################################
+# scss
+##############################################################################
+
+NODEJS_DEV_PACKAGES+=sass
+
+.PHONY: scss
+scss: $(NODEJS_TARGET)
+	@sass $(SCSS_OPTIONS) $(SCSS_SOURCE) $(SCSS_TARGET)
+	@sass $(SCSS_OPTIONS) --style compressed $(SCSS_SOURCE) $(SCSS_MIN_TARGET)
+
 ##############################################################################
 # rollup
 ##############################################################################

cfg/ugm.ini

@@ -34,10 +34,10 @@ ugm.backend = file
 ugm.config = %(here)s/ugm.xml
 ugm.localmanager_config = %(here)s/localmanager.xml
 
-ugm.users_file = %(here)s/../parts/ugm/users
-ugm.groups_file = %(here)s/../parts/ugm/groups
-ugm.roles_file = %(here)s/../parts/ugm/roles
-ugm.datadir = %(here)s/../parts/ugm/data
+ugm.users_file = %(here)s/../var/ugm/users
+ugm.groups_file = %(here)s/../var/ugm/groups
+ugm.roles_file = %(here)s/../var/ugm/roles
+ugm.datadir = %(here)s/../var/ugm/data
 
 [pipeline:main]
 pipeline = 

cfg/ugm.xml

@@ -1,9 +1,9 @@
 <properties>
-  <users_exposed_attributes></users_exposed_attributes>
+  <users_exposed_attributes/>
   <users_account_expiration>False</users_account_expiration>
-  <user_id_autoincrement>False</user_id_autoincrement>
+  <user_id_autoincrement>True</user_id_autoincrement>
   <user_id_autoincrement_prefix></user_id_autoincrement_prefix>
-  <user_id_autoincrement_start></user_id_autoincrement_start>
+  <user_id_autoincrement_start>0</user_id_autoincrement_start>
   <users_portrait>True</users_portrait>
   <users_portrait_attr>portrait</users_portrait_attr>
   <users_portrait_accept>image/jpeg</users_portrait_accept>

include.mk

@@ -0,0 +1,3 @@
+.PHONY: run-ugm
+run-ugm: $(INSTALL_TARGETS)
+	@$(VENV_FOLDER)/bin/pserve cfg/ugm.ini

mx.ini

@@ -8,11 +8,8 @@ cs_push = git@github.com:conestack
 # checkout source packages
 checkout_packages = true
 
-# feature branch to checkout
-feature_branch = master
-
 # main package
-main-package = -e .[test]
+main-package = -e .[dev,test]
 
 # fixed dependency package versions
 version-overrides =
@@ -42,15 +39,15 @@ environment = env
 use = ${settings:checkout_packages}
 url = ${settings:cs}/odict.git
 pushurl = ${settings:cs_push}/odict.git
-branch = ${settings:feature_branch}
+branch = master
 mxmake-test-path = tests
 mxmake-source-path = src/odict
 
 [plumber]
 use = ${settings:checkout_packages}
 url = ${settings:cs}/plumber.git
 pushurl = ${settings:cs_push}/plumber.git
-branch = ${settings:feature_branch}
+branch = master
 extras = test
 mxmake-test-path = tests
 mxmake-source-path = src/plumber
@@ -63,15 +60,15 @@ mxmake-source-path = src/plumber
 use = ${settings:checkout_packages}
 url = ${settings:cs}/node.git
 pushurl = ${settings:cs_push}/node.git
-branch = ${settings:feature_branch}
+branch = master
 mxmake-test-path = src
 mxmake-source-path = src/node
 
 [node.ext.ugm]
 use = ${settings:checkout_packages}
 url = ${settings:cs}/node.ext.ugm.git
 pushurl = ${settings:cs_push}/node.ext.ugm.git
-branch = ${settings:feature_branch}
+branch = master
 extras = test
 mxmake-test-path = src
 mxmake-source-path = src/node/ext/ugm
@@ -84,7 +81,7 @@ mxmake-source-path = src/node/ext/ugm
 use = ${settings:checkout_packages}
 url = ${settings:cs}/yafowil.git
 pushurl = ${settings:cs_push}/yafowil.git
-branch = ${settings:feature_branch}
+branch = master
 extras = test
 mxmake-test-path = src
 mxmake-source-path = src/yafowil
@@ -93,39 +90,39 @@ mxmake-source-path = src/yafowil
 use = ${settings:checkout_packages}
 url = ${settings:cs}/yafowil.yaml.git
 pushurl = ${settings:cs_push}/yafowil.yaml.git
-branch = ${settings:feature_branch}
+branch = master
 mxmake-test-path = src
 mxmake-source-path = src/yafowil/yaml
 
 [yafowil.lingua]
 use = ${settings:checkout_packages}
 url = ${settings:cs}/yafowil.lingua.git
 pushurl = ${settings:cs_push}/yafowil.lingua.git
-branch = ${settings:feature_branch}
+branch = master
 mxmake-test-path = src
 mxmake-source-path = src/yafowil/lingua
 
 [yafowil.webob]
 use = ${settings:checkout_packages}
 url = ${settings:cs}/yafowil.webob.git
 pushurl = ${settings:cs_push}/yafowil.webob.git
-branch = ${settings:feature_branch}
+branch = master
 mxmake-test-path = src
 mxmake-source-path = src/yafowil/webob
 
 [yafowil.bootstrap]
 use = ${settings:checkout_packages}
 url = ${settings:cs}/yafowil.bootstrap.git
 pushurl = ${settings:cs_push}/yafowil.bootstrap.git
-branch = ${settings:feature_branch}
+branch = master
 mxmake-test-path = src
 mxmake-source-path = src/yafowil/bootstrap
 
 [yafowil.widget.array]
 use = ${settings:checkout_packages}
 url = ${settings:cs}/yafowil.widget.array.git
 pushurl = ${settings:cs_push}/yafowil.widget.array.git
-branch = ${settings:feature_branch}
+branch = master
 extras = test
 mxmake-test-path = src
 mxmake-source-path = src/yafowil/widget/array
@@ -135,7 +132,7 @@ mxmake-omit-path = src/yafowil/widget/array/example.py
 use = ${settings:checkout_packages}
 url = ${settings:cs}/yafowil.widget.autocomplete.git
 pushurl = ${settings:cs_push}/yafowil.widget.autocomplete.git
-branch = ${settings:feature_branch}
+branch = master
 extras = test
 mxmake-test-path = src
 mxmake-source-path = src/yafowil/widget/autocomplete
@@ -145,7 +142,7 @@ mxmake-omit-path = src/yafowil/widget/autocomplete/example.py
 use = ${settings:checkout_packages}
 url = ${settings:cs}/yafowil.widget.datetime.git
 pushurl = ${settings:cs_push}/yafowil.widget.datetime.git
-branch = ${settings:feature_branch}
+branch = master
 extras = test
 mxmake-test-path = src
 mxmake-source-path = src/yafowil/widget/datetime
@@ -155,7 +152,7 @@ mxmake-omit-path = src/yafowil/widget/datetime/example.py
 use = ${settings:checkout_packages}
 url = ${settings:cs}/yafowil.widget.dict.git
 pushurl = ${settings:cs_push}/yafowil.widget.dict.git
-branch = ${settings:feature_branch}
+branch = master
 extras = test
 mxmake-test-path = src
 mxmake-source-path = src/yafowil/widget/dict
@@ -165,7 +162,7 @@ mxmake-omit-path = src/yafowil/widget/dict/example.py
 use = ${settings:checkout_packages}
 url = ${settings:cs}/yafowil.widget.image.git
 pushurl = ${settings:cs_push}/yafowil.widget.image.git
-branch = ${settings:feature_branch}
+branch = master
 extras = test
 mxmake-test-path = src
 mxmake-source-path = src/yafowil/widget/image
@@ -179,7 +176,7 @@ mxmake-omit-path = src/yafowil/widget/image/example.py
 use = ${settings:checkout_packages}
 url = ${settings:cs}/treibstoff.git
 pushurl = ${settings:cs_push}/treibstoff.git
-branch = ${settings:feature_branch}
+branch = 2.0
 
 [webresource]
 use = ${settings:checkout_packages}
@@ -194,7 +191,7 @@ mxmake-source-path = webresource
 use = ${settings:checkout_packages}
 url = ${settings:cs}/cone.tile.git
 pushurl = ${settings:cs_push}/cone.tile.git
-branch = ${settings:feature_branch}
+branch = master
 extras = test
 mxmake-test-path = src
 mxmake-source-path = src/cone/tile
@@ -203,7 +200,6 @@ mxmake-source-path = src/cone/tile
 use = ${settings:checkout_packages}
 url = ${settings:cs}/cone.app.git
 pushurl = ${settings:cs_push}/cone.app.git
-branch = ${settings:feature_branch}
-extras = test
+branch = 2.0
 mxmake-test-path = src
 mxmake-source-path = src/cone/app

package.json

@@ -1,17 +1,17 @@
 {
 	"name": "cone.ugm",
-	"version": "1.1.0-dev",
+	"version": "2.0.0-dev",
 	"devDependencies": {
 		"@rollup/plugin-terser": "^0.4.4",
 		"@web/dev-server-import-maps": "^0.2.1",
-		"@web/test-runner-core": "^0.13.4",
 		"@web/test-runner": "^0.18.3",
+		"@web/test-runner-core": "^0.13.4",
 		"install": "^0.13.0",
 		"jquery": "^4.0.0-rc.1",
 		"qunit": "^2.20.1",
-		"rollup-plugin-cleanup": "^3.2.1",
 		"rollup": "^2.79.2",
-		"sass": "^1.80.6",
+		"rollup-plugin-cleanup": "^3.2.1",
+		"sass": "^1.96.0",
 		"web-test-runner-qunit": "^2.0.0"
 	},
 	"packageManager": "pnpm@9.3.0+sha512.ee7b93e0c2bd11409c6424f92b866f31d3ea1bef5fbe47d3c7500cdc3c9668833d2e55681ad66df5b640c61fa9dc25d546efa54d76d7f8bf54b13614ac293631"

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cone.ugm"
-version = "1.1.0.dev0"
+version = "2.0.0.dev0"
 description = "User and group management"
 dynamic = ["readme"]
 requires-python = ">=3.10"
@@ -22,7 +22,7 @@ classifiers = [
     "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
 ]
 dependencies = [
-    "cone.app[lxml]>1.0.99,<2.0.0",
+    "cone.app[lxml]>1.99",
     "natsort",
     "pillow>=10.0.0",
     "yafowil.widget.array>1.99",