diff --git a/bin/qcms b/bin/qcms index bd11e81..2cfc100 100755 --- a/bin/qcms +++ b/bin/qcms @@ -311,12 +311,14 @@ def handle_theme ( _df = pd.DataFrame({"available":themes.List()}) if _df.shape[0] > 0 : values = themes.installed(_root) + values.sort() values = values + np.repeat(f"""{FAILED}""", _df.shape[0] - len(values)).tolist() + values.sort() _df['installed'] = values else: _df = f"""{FAILED} No themes were found in registry,\ncurl {themes.URL}/api/themes/List (QCMS_HOST_URL should be set)""" print (_df) - if name : + if name and not show: # we need to install the theme, i.e download it and update the configuration # try: diff --git a/cms/static/js/menu.js b/cms/static/js/menu.js index dfe809c..55c1b46 100644 --- a/cms/static/js/menu.js +++ b/cms/static/js/menu.js @@ -52,7 +52,7 @@ menu.apply = function (uri,id,pid,_context){ } -menu.apply_link =function(_args){ +menu.apply_link =function(_args,_context){ // // type: // redirect open new window @@ -75,7 +75,7 @@ menu.apply_link =function(_args){ http.setHeader('uri',_args.uri) http.setHeader('dom',(_args.title)?_args.title:'dialog') // http.setHeader('dom',_args.text) - http.get('/dialog',function(x){ + http.get(_context+'/dialog',function(x){ jx.modal.show({html:x.responseText,id:'dialog'}) console.log([$('.jxmodal')]) diff --git a/cms/templates/menu.html b/cms/templates/menu.html index 9cf320d..40b5ccc 100644 --- a/cms/templates/menu.html +++ b/cms/templates/menu.html @@ -29,7 +29,7 @@
{% else %} -
+
{% endif %} {{_item.text.replace('-',' ').replace('_',' ')}} diff --git a/meta/__init__.py b/meta/__init__.py index e6d5dc9..97ec72e 100644 --- a/meta/__init__.py +++ b/meta/__init__.py @@ -1,5 +1,5 @@ __author__ = "Steve L. Nyemba" -__version__= "2.1" +__version__= "2.1.2" __email__ = "steve@the-phi.com" __license__=""" Copyright 2010 - 2024, Steve L. Nyemba, Vanderbilt University Medical Center