diff --git a/paramecio2/app.py b/paramecio2/app.py index 6221ee5..65cdd7d 100644 --- a/paramecio2/app.py +++ b/paramecio2/app.py @@ -71,7 +71,10 @@ def start_app(): workdir=os.getcwd() arr_module_path={} - # Load blueprints + # Load blueprints from json file (for installed modules using paramecio2 utilities) + + if os.path.isfile('config/modules.json'): + pass for key_app, added_app in config.apps.items(): diff --git a/paramecio2/libraries/formsutils.py b/paramecio2/libraries/formsutils.py index 70214b8..b6ee5c7 100644 --- a/paramecio2/libraries/formsutils.py +++ b/paramecio2/libraries/formsutils.py @@ -22,10 +22,27 @@ along with this program. If not, see . from paramecio2.libraries.db import corefields from paramecio2.libraries.db.coreforms import PasswordForm from paramecio2.libraries.i18n import I18n -from flask import session, request, abort from paramecio2.libraries.keyutils import create_key_encrypt from paramecio2.libraries.i18n import I18n, PGetText +# For tests outing the web framework + +try: + from settings import config +except: + class config: + pass + +framework='flask' + +if hasattr(config, 'framework'): + framework=config.framework + +if framework=='flask': + from flask import session, request, abort +elif framework=='fastapi': + from parameciofast.libraries.sessions import get_session + pass # Need unittest """Functions and classes for process forms""" diff --git a/paramecio2/modules/admin/media/css/admin.css b/paramecio2/modules/admin/media/css/admin.css index e18ddee..8cfd9b3 100644 --- a/paramecio2/modules/admin/media/css/admin.css +++ b/paramecio2/modules/admin/media/css/admin.css @@ -11,7 +11,7 @@ body margin:0px; background-color:#f4f6f9; - font-family: "Roboto", sans, sans-serif, serif; + font-family: sans, sans-serif, serif; font-size: 16px; /*-webkit-transition: all 0.5s ease-in-out; transition: all 0.5s ease-in-out; diff --git a/paramecio2/modules/admin/media/css/login.css b/paramecio2/modules/admin/media/css/login.css index 1d0ed3f..4b0b5ed 100644 --- a/paramecio2/modules/admin/media/css/login.css +++ b/paramecio2/modules/admin/media/css/login.css @@ -2,7 +2,7 @@ body { margin:0px; background: #fbfbfb; - font-family: 'Open Sans', sans-serif; + font-family: sans , sans-serif; } diff --git a/paramecio2/modules/admin/templates/dashboard.phtml b/paramecio2/modules/admin/templates/dashboard.phtml index 1f02e0e..d6b5eef 100644 --- a/paramecio2/modules/admin/templates/dashboard.phtml +++ b/paramecio2/modules/admin/templates/dashboard.phtml @@ -21,7 +21,7 @@ if session.get('theme', '0')=='1': - + <%block name="extra_css"> diff --git a/paramecio2/modules/admin/templates/login.phtml b/paramecio2/modules/admin/templates/login.phtml index 2ff47e8..ca5c0cc 100644 --- a/paramecio2/modules/admin/templates/login.phtml +++ b/paramecio2/modules/admin/templates/login.phtml @@ -3,7 +3,7 @@ <%block name="title">${_('Paramecio Login')}</%block> - + <%block name="extra_css">