diff --git a/react/common/src/App.css b/react/common/src/App.css index c8faa14..cf13910 100644 --- a/react/common/src/App.css +++ b/react/common/src/App.css @@ -1,23 +1,27 @@ -/* -@import url('https://fonts.googleapis.com/css2?family=Titillium+Web:wght@300;400;600;700&display=swap'); -@import url("https://console-unipr.elixforms.it/elixFormsCustom/css/elixForms.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/bootstrap_adaptation.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/bootstrap_overrides.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/console_user.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/designitalia_adaptation.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/fonts.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/isipcss_overrides.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/iulib.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/print.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/responsive.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/style-bs.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/style.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/design-bs/util.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/plugins/modaldisplay.css"); -@import url("https://console-unipr.elixforms.it/rwe2/css/themes/blu-italia.css"); -@import url("https://console-unipr.elixforms.it/rwe2/isipcss/css/grid_fluid.css"); -*/ -@import url("https://cdn.jsdelivr.net/npm/bootstrap-italia@2.0.0/dist/css/bootstrap-italia.min.css"); +@import url("https://fonts.googleapis.com/css2?family=Titillium+Web:wght@300;400;600;700&display=swap"); +@import url("https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css"); +@import url("https://cdn.jsdelivr.net/npm/bootstrap-italia@2.18.2/dist/css/bootstrap-italia.min.css"); +@import url("https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.min.js"); +@import url("https://cdn.jsdelivr.net/npm/bootstrap-italia@2.18.2/dist/js/bootstrap-italia.bundle.min.js"); + +:root { + --font-family-sans-serif: "Titillium Web", "Segoe UI", Arial, sans-serif; +} + +body { + font-family: "Titillium Web", "Segoe UI", Arial, sans-serif; +} + +.it-brand-wrapper .icon { + width: 120px; + height: auto; +} + +.page-shell-card { + border: 1px solid #e6e6e6; + border-radius: 0.75rem; + box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.06); +} /* Submit button styling (elixForms main submit) */ .mainview .container .submit { diff --git a/react/common/src/ElixFormsComponentAbstract.tsx b/react/common/src/ElixFormsComponentAbstract.tsx index cd3330a..8ab9355 100644 --- a/react/common/src/ElixFormsComponentAbstract.tsx +++ b/react/common/src/ElixFormsComponentAbstract.tsx @@ -93,14 +93,18 @@ export default abstract class ElixFormsComponentAbstract extends Component { const { - description, - environmentMessage, - additionalFieldsJson, + isDarkTheme, + userDisplayName, + moduleName, headerTitle, - pageTitle, - pageDescription, - submitDescription, - heroImageSrc + headerHeroImageSrc: headerTitleImageSrc, + cardTitle, + cardDescription, + alertInfoTitle, + alertInfoMessage, + instructionsTitle, + instructionsMessage, + submitText, } = this.props; const queryParams = new URLSearchParams(window.location.search); @@ -108,121 +112,161 @@ export default abstract class ElixFormsComponentAbstract extends Component 0; return ( -
+
+
+
+
+
+
+ {/* Ente appartenenza */} + +
+ {/* */} +
+ {userDisplayName} +
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-

elixForms

-
- - Logo Università di Parma - + +
+
+ +
+ + {headerTitleImageSrc && Hero Image} + {headerTitle && (

{headerTitle}

)} + +
+
+
+ {cardTitle &&

{cardTitle}

} + {cardDescription &&

{cardDescription}

} + + {(alertInfoTitle || alertInfoMessage) && +
+ {alertInfoTitle &&

{alertInfoTitle}

} + {alertInfoMessage &&

{alertInfoMessage}

} +
} + + {hasAuthenticationError ? ( +
Accesso non autorizzato!
+ ) : ( + <> + {this.renderExtraContentPre()} + + {(instructionsTitle || instructionsMessage) && +
+ {instructionsTitle &&

{instructionsTitle}

} + {instructionsMessage &&

{instructionsMessage}

}
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- {headerTitle && ( -
-
-

{headerTitle}

-
-
- )} -
-
- {pageTitle &&

{pageTitle}

} - {heroImageSrc && Hero Image} - {pageDescription &&

{pageDescription}

} - - {environmentMessage &&
{environmentMessage}
} - {description &&
{description}
} - - {hasAuthenticationError ? ( -
- Accesso non autorizzato. Parametri obbligatori mancanti ({missingMandatoryParams.join(', ')}). -
- ) : ( - <> - {this.renderExtraContentPre()} - -
- {this.createMandatoryFormFields(queryParams)} - {this.createAdditionalFormFields()} - {this.renderCustomFormFields()} -
- -
-
- - {this.renderExtraContentPost()} - - )} -
-
+ } +
+ {this.createMandatoryFormFields(queryParams)} + {this.createAdditionalFormFields()} + {this.renderCustomFormFields()} +
+ +
+
+ {this.renderExtraContentPost()} + + )}
+
+
-
- -
-
-
-
-
-
-
powered by elixForms
-
versione 1.24.0
-
+
+
+
+
+
+
+
+
powered by elixForms
+ {/*
versione 1.24.0
*/}
-
-
+ +
-
-
+
); } diff --git a/react/common/src/IElixFormsComponentProperties.ts b/react/common/src/IElixFormsComponentProperties.ts index a3df6b1..f73919d 100644 --- a/react/common/src/IElixFormsComponentProperties.ts +++ b/react/common/src/IElixFormsComponentProperties.ts @@ -1,17 +1,19 @@ export interface IElixFormsComponentProperties { - description: string; isDarkTheme: boolean; - environmentMessage: string; - hasTeamsContext: boolean; userDisplayName: string; additionalFieldsJson?: string; - + // Layout Properties + moduleName: string; headerTitle?: string; - pageTitle?: string; - pageDescription?: string; - submitDescription?: string; - heroImageSrc?: string; + headerHeroImageSrc?: string; + cardTitle: string; + cardDescription?: string; + alertInfoTitle?: string; + alertInfoMessage?: string; + instructionsTitle?: string; + instructionsMessage?: string; + submitText?: string; } // Additional Fields JSON Schema diff --git a/react/recupero-proposta-cct-da-contratti/src/App.jsx b/react/recupero-proposta-cct-da-contratti/src/App.jsx index eb02a25..3a31df1 100644 --- a/react/recupero-proposta-cct-da-contratti/src/App.jsx +++ b/react/recupero-proposta-cct-da-contratti/src/App.jsx @@ -4,15 +4,19 @@ import RecuperoPropostaCctDaContrattiComponent from './RecuperoPropostaCctDaCont function App() { return ( ); } diff --git a/react/scelta-carriera/src/App.css b/react/scelta-carriera/src/App.css index 6cd1116..6c3531a 100644 --- a/react/scelta-carriera/src/App.css +++ b/react/scelta-carriera/src/App.css @@ -1,4 +1,13 @@ +@import url('https://fonts.googleapis.com/css2?family=Titillium+Web:wght@300;400;600;700&display=swap'); @import url('https://cdn.jsdelivr.net/npm/bootstrap-italia@2.0.0/dist/css/bootstrap-italia.min.css'); + +:root { + --font-family-sans-serif: "Titillium Web", "Segoe UI", Arial, sans-serif; +} + +body { + font-family: "Titillium Web", "Segoe UI", Arial, sans-serif; +} /* @import url('https://console-unipr.elixforms.it/elixFormsCustom/css/elixForms.css'); @import url('https://console-unipr.elixforms.it/rwe2/css/design-bs/bootstrap_adaptation.css'); diff --git a/react/scelta-carriera/src/App.jsx b/react/scelta-carriera/src/App.jsx index d23382e..b893892 100644 --- a/react/scelta-carriera/src/App.jsx +++ b/react/scelta-carriera/src/App.jsx @@ -5,15 +5,14 @@ import SceltaCarrieraComponent from './SceltaCarrieraComponent'; function App() { return ( ) }