Merge pull request 'v2.2' (#24) from v2.2 into master

Reviewed-on: cloud/cms#24

cms/engine/basic.py

@@ -235,6 +235,8 @@ class Initializer :
                 uri = f'{_context}/{_text}'
                 # _items.append ({"text":_text,'uri':uri,'type':'open'})
                 _label = _item['menu']
+                if _text in _overwrite :
+                    _text = _overwrite[_text]['text']
                 if _label not in _menu :
                     _menu [_label] = []
                 _menu[_label].append ({"text":_text,'uri':uri,'type':'open'})

cms/engine/project/__init__.py

@@ -147,16 +147,18 @@ def _index (_path,root):
         f.write(_html)
         f.close()
 def _itheme(_path,_root,_name='default'):
-    _data = themes.Get(_name)[_name]
-    _themefolder = os.sep.join([_path,_root,'_assets','themes',_name])
-    if not os.path.exists(_themefolder) :
-        os.makedirs(_themefolder)
-
-    for _name in _data :
-        f = open(os.sep.join([_themefolder,_name+'.css']),'w')
-        f.write(_data[_name])
-        f.close()
-        pass
+    _path = os.sep.join([_path,_root])
+    themes.Get(_name, _path)
+    # _data = themes.Get(_name, _path)[_name]
+    # _themefolder = os.sep.join([_path,_root,'_assets','themes',_name])
+    # if not os.path.exists(_themefolder) :
+    #     os.makedirs(_themefolder)
+
+    # for _name in _data :
+    #     f = open(os.sep.join([_themefolder,_name+'.css']),'w')
+    #     f.write(_data[_name])
+    #     f.close()
+    #     pass
 def make (**_args) :
     """
     This function create a project folder and within the folder are all the elements needed

meta/__init__.py

@@ -1,5 +1,5 @@
 __author__ = "Steve L. Nyemba"
-__version__= "2.2.16"
+__version__= "2.2.18"
 __email__ = "steve@the-phi.com"
 __license__="""
 Copyright 2010 - 2024, Steve L. Nyemba, Vanderbilt University Medical Center