From 68b18ec9ddf65512661f90a16c8eda12e7d3f484 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Tue, 3 Dec 2024 15:12:09 +0100 Subject: [PATCH] ref: use pe version --- .github/workflows/ci-docker.yml | 32 +- Dockerfile | 47 +- README.md | 13 +- assembly.xml | 19 +- conf/license.xml | 1 + conf/log4j2.xml | 16 + conf/properties-local-prod.xml | 16 + config/properties/config/log4j.xml | 62 - .../config/properties-local-dev.xml | 24 - .../default => content}/META-INF/context.xml | 0 .../orbeon-insee/config/properties-local.xml | 51 +- .../WEB-INF/orbeon-insee/css/acemo/acemo.css | 82 + .../orbeon-insee/css/acemo/acemoEnglish.css | 82 + .../css/acemo/acemodse/acemodse.css | 0 .../css/acemo/acemodse/acemodseEnglish.css | 0 .../css/acemo/acemopipa/acemopipa.css | 14 + .../css/acemo/acemopipa/acemopipaEnglish.css | 14 + .../css/acemo/acemotpe/acemotpe.css | 18 + .../css/acemo/acemotpe/acemotpeEnglish.css | 18 + .../css/acemo/acemotrim/acemotrim.css | 57 + .../css/acemo/acemotrim/acemotrimEnglish.css | 57 + .../orbeon-insee/css/antipol/antipol.css | 14 + .../css/antipol/antipolEnglish.css | 9 + content/WEB-INF/orbeon-insee/css/cis/cis.css | 15 + .../orbeon-insee/css/cis/cisEnglish.css | 15 + .../WEB-INF/orbeon-insee/css/comg/comg.css | 3 + .../orbeon-insee/css/comg/comgEnglish.css | 3 + content/WEB-INF/orbeon-insee/css/common.css | 1005 ++++++++++++ .../orbeon-insee/css/commonEnglish.css | 145 +- content/WEB-INF/orbeon-insee/css/eap/eap.css | 122 ++ .../orbeon-insee/css/eap/eapEnglish.css | 137 ++ .../orbeon-insee/css/ecmoss/ecmoss.css | 8 + content/WEB-INF/orbeon-insee/css/emb/emb.css | 142 ++ .../orbeon-insee/css/emb/embEnglish.css | 142 ++ .../orbeon-insee/css/enterpriseEnglish.css | 239 +++ .../WEB-INF/orbeon-insee/css/entreprise.css | 223 +++ content/WEB-INF/orbeon-insee/css/esa/esa.css | 29 + .../orbeon-insee/css/fasgso/fasgso.css | 10 + .../orbeon-insee/css/fasgso/fasgsoEnglish.css | 10 + .../WEB-INF/orbeon-insee/css/invt/invt.css | 10 + .../orbeon-insee/css/invt/invtEnglish.css | 10 + .../WEB-INF/orbeon-insee/css/ofats/ofats.css | 132 ++ .../orbeon-insee/css/ofats/ofatsEnglish.css | 131 ++ .../css/opiseindus/opiseindus.css | 17 + .../css/opiseindus/opiseindusEnglish.css | 17 + .../orbeon-insee/css/opiseserv/opiseserv.css | 17 + .../css/opiseserv/opiseservEnglish.css | 17 + .../WEB-INF/orbeon-insee/css/prom/prom.css | 10 + .../orbeon-insee/css/prom/promEnglish.css | 10 + .../WEB-INF/orbeon-insee/css/serv/serv.css | 3 + .../orbeon-insee/css/serv/servEnglish.css | 3 + content/WEB-INF/orbeon-insee/css/tic/tic.css | 15 + .../orbeon-insee/css/tic/ticEnglish.css | 18 + .../orbeon-insee/img/Help-browser.svg.png | Bin ...see_formulaire-recensement-bleunuance2.png | Bin .../WEB-INF/orbeon-insee/img/Logo_COLL.png | Bin .../WEB-INF/orbeon-insee/img/Logo_COLLold.png | Bin .../WEB-INF/orbeon-insee/img/Logo_Mesri.jpg | Bin .../WEB-INF/orbeon-insee/img/calendar.png | Bin .../WEB-INF/orbeon-insee/img/dares.png | Bin .../WEB-INF/orbeon-insee/img/dares2.png | Bin .../WEB-INF/orbeon-insee/img/dares3.png | Bin .../WEB-INF/orbeon-insee/img/en-baisse.jpg | Bin .../WEB-INF/orbeon-insee/img/en-hausse.jpg | Bin .../WEB-INF/orbeon-insee/img/enregistrer.png | Bin .../orbeon-insee/img/icone_statpub.png | Bin .../WEB-INF/orbeon-insee/img/insee.png | Bin .../WEB-INF/orbeon-insee/img/logo4.png | Bin .../orbeon-insee/img/logo_INSEECDC.png | Bin .../WEB-INF/orbeon-insee/img/logo_sies.png | Bin .../WEB-INF/orbeon-insee/img/logo_statpub.png | Bin .../WEB-INF/orbeon-insee/img/marianne.png | Bin .../WEB-INF/orbeon-insee/img/modifier.png | Bin .../WEB-INF/orbeon-insee/img/pdf.png | Bin .../img/plutot_insatisfaisant-pluie.png | Bin .../img/plutot_satisfaisant-nuage.png | Bin .../WEB-INF/orbeon-insee/img/retour.png | Bin .../WEB-INF/orbeon-insee/img/stable.jpg | Bin .../img/tres_insatisfaisant-orage.png | Bin .../img/tres_satisfaisant-soleil.png | Bin .../WEB-INF/orbeon-insee/js/responsive.js | 0 .../WEB-INF/orbeon-insee/page-flow.xml | 24 +- .../orbeon-insee/services/assistance.xpl | 0 .../WEB-INF/orbeon-insee/services/error.xpl | 0 .../orbeon-insee/services/get-parameters.xpl | 0 .../orbeon-insee/services/healthcheck.xpl | 6 +- .../orbeon-insee/services/logout-close.xpl | 0 .../orbeon-insee/services/logout-redirect.xpl | 0 .../orbeon-insee/services/pdf/export.xpl | 0 .../services/pdf/make-pdf-send.xpl | 0 .../orbeon-insee/services/pdf/make-pdf.xpl | 0 .../services/pdf/pretraitement.xsl | 0 .../orbeon-insee/services/pdf/send.xpl | 49 + .../services/personalization/README.md | 0 .../personalization/caractereDanois.xsl | 0 .../personalization/initialisation.xsl | 91 ++ .../personalization/personalization.xpl | 0 .../personalization/personalization.xsl | 0 .../services/preprocessing/README.md | 0 .../services/preprocessing/readonly.xsl | 0 .../preprocessing/xforms-preprocessing.xpl | 0 .../orbeon-insee/services/redirect.xpl | 0 .../WEB-INF/orbeon-insee/xhtml/erreur.xhtml | 0 .../orbeon-insee/xhtml/healthcheck.xhtml | 0 content/WEB-INF/orbeon-insee/xslfo/common.xsl | 1014 ++++++++++++ content/WEB-INF/orbeon-insee/xslfo/eap.xsl | 1367 +++++++++++++++++ content/WEB-INF/orbeon-insee/xslfo/emb.xsl | 403 +++++ content/WEB-INF/orbeon-insee/xslfo/esa.xsl | 146 ++ content/WEB-INF/orbeon-insee/xslfo/esem.xsl | 80 + .../WEB-INF/orbeon-insee/xslfo/parametres.xsl | 8 +- content/WEB-INF/orbeon-insee/xslfo/prod.xsl | 146 ++ .../WEB-INF/orbeon-overload/apps/fr/theme.xsl | 0 .../WEB-INF/resources/apps/context/README.txt | 1 + .../apps/context/context-destroyed.xpl | 35 + .../apps/context/context-initialized.xpl | 57 + .../apps/context/portlet-destroyed.xpl | 24 + .../apps/context/portlet-initialized.xpl | 24 + .../resources/apps/context/scheduled-task.xpl | 47 + .../apps/context/servlet-destroyed.xpl | 24 + .../apps/context/servlet-initialized.xpl | 24 + .../apps/context/session-created.xpl | 37 + .../apps/context/session-destroyed.xpl | 23 + content/WEB-INF/resources/config/README.txt | 2 + .../config/form-builder-permissions.xml | 44 + content/WEB-INF/resources/config/log4j2.xml | 40 + .../WEB-INF/resources/config/not-found.xhtml | 25 + .../config/properties-local.xml.template | 9 + .../WEB-INF/resources/config/theme-error.xsl | 17 + .../resources/config/theme-examples.xsl | 64 + .../WEB-INF/resources/config/theme-plain.xsl | 76 + .../resources/config/unauthorized.xhtml | 25 + content/WEB-INF/web.xml | 493 ++++++ insee-overload/README.md | 34 - .../orbeon-insee/services/pdf/send.xpl | 81 - .../personalization/initialisation.xsl | 24 - .../WEB-INF/orbeon-insee/xslfo/common.xsl | 440 ------ insee-overload/default/WEB-INF/web.xml | 272 ---- pom.xml | 27 +- script/env.sh | 3 - scripts/entrypoint.sh | 8 + .../get-cleaned-orbeon.sh | 19 +- 141 files changed, 7570 insertions(+), 1067 deletions(-) create mode 100644 conf/license.xml create mode 100644 conf/log4j2.xml create mode 100644 conf/properties-local-prod.xml delete mode 100644 config/properties/config/log4j.xml delete mode 100644 config/properties/config/properties-local-dev.xml rename {insee-overload/default => content}/META-INF/context.xml (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/config/properties-local.xml (92%) create mode 100644 content/WEB-INF/orbeon-insee/css/acemo/acemo.css create mode 100644 content/WEB-INF/orbeon-insee/css/acemo/acemoEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/acemo/acemodse/acemodse.css create mode 100644 content/WEB-INF/orbeon-insee/css/acemo/acemodse/acemodseEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/acemo/acemopipa/acemopipa.css create mode 100644 content/WEB-INF/orbeon-insee/css/acemo/acemopipa/acemopipaEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/acemo/acemotpe/acemotpe.css create mode 100644 content/WEB-INF/orbeon-insee/css/acemo/acemotpe/acemotpeEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/acemo/acemotrim/acemotrim.css create mode 100644 content/WEB-INF/orbeon-insee/css/acemo/acemotrim/acemotrimEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/antipol/antipol.css create mode 100644 content/WEB-INF/orbeon-insee/css/antipol/antipolEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/cis/cis.css create mode 100644 content/WEB-INF/orbeon-insee/css/cis/cisEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/comg/comg.css create mode 100644 content/WEB-INF/orbeon-insee/css/comg/comgEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/common.css rename {insee-overload/common => content}/WEB-INF/orbeon-insee/css/commonEnglish.css (85%) create mode 100644 content/WEB-INF/orbeon-insee/css/eap/eap.css create mode 100644 content/WEB-INF/orbeon-insee/css/eap/eapEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/ecmoss/ecmoss.css create mode 100644 content/WEB-INF/orbeon-insee/css/emb/emb.css create mode 100644 content/WEB-INF/orbeon-insee/css/emb/embEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/enterpriseEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/entreprise.css create mode 100644 content/WEB-INF/orbeon-insee/css/esa/esa.css create mode 100644 content/WEB-INF/orbeon-insee/css/fasgso/fasgso.css create mode 100644 content/WEB-INF/orbeon-insee/css/fasgso/fasgsoEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/invt/invt.css create mode 100644 content/WEB-INF/orbeon-insee/css/invt/invtEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/ofats/ofats.css create mode 100644 content/WEB-INF/orbeon-insee/css/ofats/ofatsEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/opiseindus/opiseindus.css create mode 100644 content/WEB-INF/orbeon-insee/css/opiseindus/opiseindusEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/opiseserv/opiseserv.css create mode 100644 content/WEB-INF/orbeon-insee/css/opiseserv/opiseservEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/prom/prom.css create mode 100644 content/WEB-INF/orbeon-insee/css/prom/promEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/serv/serv.css create mode 100644 content/WEB-INF/orbeon-insee/css/serv/servEnglish.css create mode 100644 content/WEB-INF/orbeon-insee/css/tic/tic.css create mode 100644 content/WEB-INF/orbeon-insee/css/tic/ticEnglish.css rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/Help-browser.svg.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/Insee_formulaire-recensement-bleunuance2.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/Logo_COLL.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/Logo_COLLold.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/Logo_Mesri.jpg (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/calendar.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/dares.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/dares2.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/dares3.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/en-baisse.jpg (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/en-hausse.jpg (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/enregistrer.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/icone_statpub.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/insee.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/logo4.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/logo_INSEECDC.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/logo_sies.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/logo_statpub.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/marianne.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/modifier.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/pdf.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/plutot_insatisfaisant-pluie.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/plutot_satisfaisant-nuage.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/retour.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/stable.jpg (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/tres_insatisfaisant-orage.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/img/tres_satisfaisant-soleil.png (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/js/responsive.js (100%) rename {insee-overload/default => content}/WEB-INF/orbeon-insee/page-flow.xml (77%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/assistance.xpl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/error.xpl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/get-parameters.xpl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/healthcheck.xpl (99%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/logout-close.xpl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/logout-redirect.xpl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/pdf/export.xpl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/pdf/make-pdf-send.xpl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/pdf/make-pdf.xpl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/pdf/pretraitement.xsl (100%) create mode 100644 content/WEB-INF/orbeon-insee/services/pdf/send.xpl rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/personalization/README.md (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/personalization/caractereDanois.xsl (100%) create mode 100644 content/WEB-INF/orbeon-insee/services/personalization/initialisation.xsl rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/personalization/personalization.xpl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/personalization/personalization.xsl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/preprocessing/README.md (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/preprocessing/readonly.xsl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/preprocessing/xforms-preprocessing.xpl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/services/redirect.xpl (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/xhtml/erreur.xhtml (100%) rename {insee-overload/common => content}/WEB-INF/orbeon-insee/xhtml/healthcheck.xhtml (100%) create mode 100644 content/WEB-INF/orbeon-insee/xslfo/common.xsl create mode 100644 content/WEB-INF/orbeon-insee/xslfo/eap.xsl create mode 100644 content/WEB-INF/orbeon-insee/xslfo/emb.xsl create mode 100644 content/WEB-INF/orbeon-insee/xslfo/esa.xsl create mode 100644 content/WEB-INF/orbeon-insee/xslfo/esem.xsl rename {insee-overload/default => content}/WEB-INF/orbeon-insee/xslfo/parametres.xsl (80%) create mode 100644 content/WEB-INF/orbeon-insee/xslfo/prod.xsl rename {insee-overload/common => content}/WEB-INF/orbeon-overload/apps/fr/theme.xsl (100%) create mode 100644 content/WEB-INF/resources/apps/context/README.txt create mode 100644 content/WEB-INF/resources/apps/context/context-destroyed.xpl create mode 100644 content/WEB-INF/resources/apps/context/context-initialized.xpl create mode 100644 content/WEB-INF/resources/apps/context/portlet-destroyed.xpl create mode 100644 content/WEB-INF/resources/apps/context/portlet-initialized.xpl create mode 100644 content/WEB-INF/resources/apps/context/scheduled-task.xpl create mode 100644 content/WEB-INF/resources/apps/context/servlet-destroyed.xpl create mode 100644 content/WEB-INF/resources/apps/context/servlet-initialized.xpl create mode 100644 content/WEB-INF/resources/apps/context/session-created.xpl create mode 100644 content/WEB-INF/resources/apps/context/session-destroyed.xpl create mode 100644 content/WEB-INF/resources/config/README.txt create mode 100644 content/WEB-INF/resources/config/form-builder-permissions.xml create mode 100644 content/WEB-INF/resources/config/log4j2.xml create mode 100644 content/WEB-INF/resources/config/not-found.xhtml create mode 100644 content/WEB-INF/resources/config/properties-local.xml.template create mode 100644 content/WEB-INF/resources/config/theme-error.xsl create mode 100644 content/WEB-INF/resources/config/theme-examples.xsl create mode 100644 content/WEB-INF/resources/config/theme-plain.xsl create mode 100644 content/WEB-INF/resources/config/unauthorized.xhtml create mode 100644 content/WEB-INF/web.xml delete mode 100644 insee-overload/README.md delete mode 100644 insee-overload/common/WEB-INF/orbeon-insee/services/pdf/send.xpl delete mode 100644 insee-overload/common/WEB-INF/orbeon-insee/services/personalization/initialisation.xsl delete mode 100644 insee-overload/default/WEB-INF/orbeon-insee/xslfo/common.xsl delete mode 100644 insee-overload/default/WEB-INF/web.xml delete mode 100644 script/env.sh create mode 100644 scripts/entrypoint.sh rename script/getCleanedOrbeon.sh => scripts/get-cleaned-orbeon.sh (79%) diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index b78f619e..a643698f 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -3,30 +3,28 @@ name: Stromae V1 - build docker on: push: branches: - - 'v1-orbeon-2022' + - "v1-orbeon-2022" + - "v1/*" jobs: - build: runs-on: ubuntu-latest outputs: stromae-version: ${{ steps.version-step.outputs.version }} steps: - - uses: actions/checkout@v2 - - + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 17 - + distribution: "temurin" + java-version: "17" - name: script download and clean Orbeon run: | - chmod +x ./script/getCleanedOrbeon.sh - ./script/getCleanedOrbeon.sh $ORBEON_URL_CE + chmod +x ./scripts/get-cleaned-orbeon.sh + ./scripts/get-cleaned-orbeon.sh $ORBEON_URL shell: bash env: - ORBEON_URL_CE: https://github.com/orbeon/orbeon-forms/releases/download/tag-release-2022.1-ce/orbeon-2022.1.202212310353-CE.zip + ORBEON_URL: https://github.com/orbeon/orbeon-forms/releases/download/tag-release-2022.1.6-pe-pseudo/orbeon-2022.1.6.202401300738-PE.zip - name: Get Version id: version-step @@ -36,10 +34,10 @@ jobs: run: echo ${{ steps.version-step.outputs.version }} - name: Build with Maven - run: mvn clean install - + run: mvn clean package + - name: Upload war - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: war path: target/*.war @@ -49,10 +47,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download build id: download - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: war path: target/ @@ -65,5 +63,3 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} default_branch: ${{ github.ref }} tags: ${{ needs.build.outputs.stromae-version }} - - diff --git a/Dockerfile b/Dockerfile index 132358ac..c5d0a177 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,29 +1,48 @@ -FROM tomcat:9-jre17 - -RUN rm -rf $CATALINA_HOME/webapps/* -ADD config/ $CATALINA_HOME/webapps/ -ADD ./target/*.war $CATALINA_HOME/webapps/rmesstromae.war - -COPY ./script/env.sh $CATALINA_HOME -RUN chmod 755 $CATALINA_HOME/env.sh +ARG TOMCAT_VERSION=9.0.91-jre17-temurin-jammy +FROM tomcat:${TOMCAT_VERSION} # Ajout securité tomcat +RUN sed -i 's/<\/Host>/<\/Host>/' /usr/local/tomcat/conf/server.xml RUN sed -i 's///' /usr/local/tomcat/conf/server.xml +# Add WAR (application) +COPY ./target/*.war /usr/local/tomcat/webapps/rmesstromae.war + +# Add configuration files (log4j, props & empty license.xml) +COPY ./conf/log4j2.xml /usr/local/tomcat/webapps/properties/config/log4j2.xml +COPY ./conf/properties-local-prod.xml /usr/local/tomcat/webapps/properties/config/properties-local-prod.xml +COPY ./conf/license.xml /home/tomcat/.orbeon/license.xml +# Add entrypoint.sh +COPY ./scripts/entrypoint.sh /usr/local/tomcat/entrypoint.sh + # Ajout user tomcat pour non root -RUN groupadd -g 10001 tomcat -RUN useradd tomcat -u 10001 -g 10001 -ms /bin/bash +ENV TOMCAT_USER_ID=10001 +ENV TOMCAT_USER=tomcat -RUN chown tomcat: /usr/local/tomcat -R +ENV JAVA_TOOL_OPTIONS_DEFAULT \ + -XX:MaxRAMPercentage=75 \ + -XX:+UseZGC + +RUN groupadd -g $TOMCAT_USER_ID $TOMCAT_USER +RUN useradd $TOMCAT_USER -u $TOMCAT_USER_ID -g $TOMCAT_USER_ID -ms /bin/bash + +RUN chown $TOMCAT_USER: /usr/local/tomcat -R RUN chmod 750 /usr/local/tomcat -R +RUN chown $TOMCAT_USER: /home/tomcat/.orbeon -R -USER tomcat +# give write permission to write in properties folder +RUN chmod 755 /usr/local/tomcat/entrypoint.sh +RUN chmod 755 /usr/local/tomcat/webapps/properties -R +RUN chmod 755 /home/tomcat/.orbeon -R + +USER $TOMCAT_USER_ID EXPOSE 8080 EXPOSE 8443 -CMD ["/bin/bash", "-c", "$CATALINA_HOME/env.sh && catalina.sh run"] - +CMD ["/bin/bash", "-c", \ + "export JAVA_TOOL_OPTIONS=\"$JAVA_TOOL_OPTIONS_DEFAULT $JAVA_TOOL_OPTIONS\"; \ + $CATALINA_HOME/entrypoint.sh && catalina.sh run" ] diff --git a/README.md b/README.md index b42144f2..9ee8f648 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,14 @@ # Stromae -Data collection services for XForms questionnaires powered by Orbeon. +Data collection services for XForms questionnaires powered by Orbeon. + +This project takes the PE version (under license) of orbeon from GitHub and adds the developments made by the Insee team to make the xforms questionnaires produced by Eno functional. + +This project uses orbeon version 2022.1.6. + +Unfortunately, there isn't (yet?) a version of orbeon that works properly with our xforms questionnaires. +A license is therefore required. + +The license is in the [~/.orbeon/license.xml] folder. It is set at deployment by the `ORBEON_LICENSE` environment variable. + +So yo need a license to run this app. diff --git a/assembly.xml b/assembly.xml index 914ddafb..78909eb4 100644 --- a/assembly.xml +++ b/assembly.xml @@ -5,13 +5,6 @@ war false - - - ${project.basedir}/insee-overload/common/WEB-INF/orbeon-insee/config/properties-local.xml - WEB-INF/orbeon-insee/config - true - - ${project.basedir}/orbeon-source @@ -21,17 +14,7 @@ - ${project.basedir}/insee-overload/common - - **/** - - - **/**/properties-local.xml - - - - - ${project.basedir}/insee-overload/default + ${project.build.directory}/content **/** diff --git a/conf/license.xml b/conf/license.xml new file mode 100644 index 00000000..fb8ed74d --- /dev/null +++ b/conf/license.xml @@ -0,0 +1 @@ +empty diff --git a/conf/log4j2.xml b/conf/log4j2.xml new file mode 100644 index 00000000..e93e6619 --- /dev/null +++ b/conf/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + [%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n + + + + + + + + + + diff --git a/conf/properties-local-prod.xml b/conf/properties-local-prod.xml new file mode 100644 index 00000000..c0659000 --- /dev/null +++ b/conf/properties-local-prod.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/config/properties/config/log4j.xml b/config/properties/config/log4j.xml deleted file mode 100644 index 71a245d3..00000000 --- a/config/properties/config/log4j.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/config/properties/config/properties-local-dev.xml b/config/properties/config/properties-local-dev.xml deleted file mode 100644 index 8a796a20..00000000 --- a/config/properties/config/properties-local-dev.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/insee-overload/default/META-INF/context.xml b/content/META-INF/context.xml similarity index 100% rename from insee-overload/default/META-INF/context.xml rename to content/META-INF/context.xml diff --git a/insee-overload/common/WEB-INF/orbeon-insee/config/properties-local.xml b/content/WEB-INF/orbeon-insee/config/properties-local.xml similarity index 92% rename from insee-overload/common/WEB-INF/orbeon-insee/config/properties-local.xml rename to content/WEB-INF/orbeon-insee/config/properties-local.xml index c062779d..c85ab3ef 100644 --- a/insee-overload/common/WEB-INF/orbeon-insee/config/properties-local.xml +++ b/content/WEB-INF/orbeon-insee/config/properties-local.xml @@ -1,43 +1,42 @@ - + - + - - + - + - + - + - - + + - + - + - + - - + + - + - + - + @@ -47,29 +46,27 @@ - + + - - - - - - + + + - + control event action - - + + diff --git a/content/WEB-INF/orbeon-insee/css/acemo/acemo.css b/content/WEB-INF/orbeon-insee/css/acemo/acemo.css new file mode 100644 index 00000000..20f0a575 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/acemo/acemo.css @@ -0,0 +1,82 @@ +/*Couleur du bandeau*/ +.orbeon .navbar-inverse .navbar-inner +{ + background-color: #FFD1CF; +} +/* Les titres de section sont en rouge */ +.xforms-switch .xbl-fr-section .xforms-group h2.fr-section-title { + background-color: #FF625C; + color: black; +} + + +/*Couleur sous titre en rose*/ +div.fr-section-content .paragraphe h3 .xforms-label { + background-color:#FFD1CF; + color: black; + font-weight: bold; + } + + /*couleur du texte*/ +.fr-section-content .xforms-label { + color: black; +} +.fr-section-content .paragraphe .xforms-label { + color: black; +} + +/*------------------ Encadrement de sous-module ------------------*/ +div.paragraphe{ + border: thin black solid; + padding-left: 1em; /* Pour décaler le texte dans les sous-modules*/ + padding-right: 1em; + padding-bottom: 1em; + padding-top: 2px; + margin-bottom: 3em; /* séparer les modules entre-eux*/ +} +div.paragraphe:last-of-type{ + margin-bottom: 1em; /* marge plus petite pour le dernier*/ +} +div.paragraphe:first-of-type{ + margin-top: 2em; /* Pour le premier sous-module afin de laisser de l'espace en haut */ +} + + + /*----------- Couleur de tous les boutons, regrouper pour une seule modif -----*/ +.orbeon .btn, +#menuButton, +.menuBandeau nav > a{ + background-color: #ff9894; +} +#menuButton:hover, +#menuButton:focus, +.menuBandeau nav > a:hover, +.menuBandeau nav > a:focus, +.orbeon .btn:hover, +.orbeon .btn:focus{ + background-color: #fdb2af; +} +button.btn[id ^= "previous"], +button.btn[id ^= "next"], +button.btn[id ^= "start"], +.btn.txt{ + background-color: #ff9894; +} +button.btn[id ^= "previous"]:hover, +button.btn[id ^= "previous"]:focus, +button.btn[id ^= "next"]:hover, +button.btn[id ^= "next"]:focus, +button.btn[id ^= "start"]:hover, +button.btn[id ^= "start"]:focus, +.btn.txt:hover, +.btn.txt:focus{ + background-color: #fdb2af; +} + +progress::-moz-progress-bar { background: #8ab4f8; } +progress::-webkit-progress-value { background: #8ab4f8; } +progress { color: #8ab4f8; } + +label div.frameAvertissement p b img { + background-color: #ff9894; +} diff --git a/content/WEB-INF/orbeon-insee/css/acemo/acemoEnglish.css b/content/WEB-INF/orbeon-insee/css/acemo/acemoEnglish.css new file mode 100644 index 00000000..19bce22d --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/acemo/acemoEnglish.css @@ -0,0 +1,82 @@ +/*Couleur du bandeau*/ +.orbeon .navbar-inverse .navbar-inner +{ + background-color: #FFD1CF; +} +/* Les titres de section sont en rouge */ +.xforms-switch .xbl-fr-section .xforms-group h2.fr-section-title { + background-color: #FF625C; + color: black; +} + + +/*Couleur sous titre en rose*/ +div.fr-section-content .submodule h3 .xforms-label { + background-color:#FFD1CF; + color: black; + font-weight: bold; + } + + /*couleur du texte*/ +.fr-section-content .xforms-label { + color: black; +} +.fr-section-content .submodule .xforms-label { + color: black; +} + +/*------------------ Encadrement de sous-module ------------------*/ +div.submodule{ + border: thin black solid; + padding-left: 1em; /* Pour décaler le texte dans les sous-modules*/ + padding-right: 1em; + padding-bottom: 1em; + padding-top: 2px; + margin-bottom: 3em; /* séparer les modules entre-eux*/ +} +div.submodule:last-of-type{ + margin-bottom: 1em; /* marge plus petite pour le dernier*/ +} +div.submodule:first-of-type{ + margin-top: 2em; /* Pour le premier sous-module afin de laisser de l'espace en haut */ +} + + + /*----------- Couleur de tous les boutons, regrouper pour une seule modif -----*/ +.orbeon .btn, +#menuButton, +.menuBandeau nav > a{ + background-color: #ff9894; +} +#menuButton:hover, +#menuButton:focus, +.menuBandeau nav > a:hover, +.menuBandeau nav > a:focus, +.orbeon .btn:hover, +.orbeon .btn:focus{ + background-color: #fdb2af; +} +button.btn[id ^= "previous"], +button.btn[id ^= "next"], +button.btn[id ^= "start"], +.btn.txt{ + background-color: #ff9894; +} +button.btn[id ^= "previous"]:hover, +button.btn[id ^= "previous"]:focus, +button.btn[id ^= "next"]:hover, +button.btn[id ^= "next"]:focus, +button.btn[id ^= "start"]:hover, +button.btn[id ^= "start"]:focus, +.btn.txt:hover, +.btn.txt:focus{ + background-color: #fdb2af; +} + +progress::-moz-progress-bar { background: #8ab4f8; } +progress::-webkit-progress-value { background: #8ab4f8; } +progress { color: #8ab4f8; } + +label div.frameAvertissement p b img { + background-color: #ff9894; +} diff --git a/content/WEB-INF/orbeon-insee/css/acemo/acemodse/acemodse.css b/content/WEB-INF/orbeon-insee/css/acemo/acemodse/acemodse.css new file mode 100644 index 00000000..e69de29b diff --git a/content/WEB-INF/orbeon-insee/css/acemo/acemodse/acemodseEnglish.css b/content/WEB-INF/orbeon-insee/css/acemo/acemodse/acemodseEnglish.css new file mode 100644 index 00000000..e69de29b diff --git a/content/WEB-INF/orbeon-insee/css/acemo/acemopipa/acemopipa.css b/content/WEB-INF/orbeon-insee/css/acemo/acemopipa/acemopipa.css new file mode 100644 index 00000000..b6d4474a --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/acemo/acemopipa/acemopipa.css @@ -0,0 +1,14 @@ +/* II - PARTICIPATION DES SALARIÉS AU TITRE DE L'EXERCICE 2018 */ + +/*unite en noir*/ +div .xforms-readonly > span{ + color:black; +} + +span.suffixe { + padding-left: 0.5em; +} + +span.suffixe span.suffixe { + padding-left: 0em; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/acemo/acemopipa/acemopipaEnglish.css b/content/WEB-INF/orbeon-insee/css/acemo/acemopipa/acemopipaEnglish.css new file mode 100644 index 00000000..1d7543da --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/acemo/acemopipa/acemopipaEnglish.css @@ -0,0 +1,14 @@ +/* II - PARTICIPATION DES SALARIÉS AU TITRE DE L'EXERCICE 2018 */ + +/*unite en noir*/ +div .xforms-readonly > span{ + color:black; +} + +span.suffix { + padding-left: 0.5em; +} + +span.suffix span.suffix { + padding-left: 0em; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/acemo/acemotpe/acemotpe.css b/content/WEB-INF/orbeon-insee/css/acemo/acemotpe/acemotpe.css new file mode 100644 index 00000000..9473f5f7 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/acemo/acemotpe/acemotpe.css @@ -0,0 +1,18 @@ +/*largeur */ +@media (min-width: 1200px) { + .orbeon .container {width: 1200px;} + .orbeon [class*="span"] {width: 1200px;} + } + +/*@media (min-width: 1400px) { + .orbeon .container {width: 1300px;} + .orbeon [class*="span"] {width: 1300px;} + }*/ + +div#jqmb13di-control .checkbox > span { + white-space:nowrap; +} + +div[id=jqmb13di-control] .nombre .xforms-input-input { + width:100px; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/acemo/acemotpe/acemotpeEnglish.css b/content/WEB-INF/orbeon-insee/css/acemo/acemotpe/acemotpeEnglish.css new file mode 100644 index 00000000..9473f5f7 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/acemo/acemotpe/acemotpeEnglish.css @@ -0,0 +1,18 @@ +/*largeur */ +@media (min-width: 1200px) { + .orbeon .container {width: 1200px;} + .orbeon [class*="span"] {width: 1200px;} + } + +/*@media (min-width: 1400px) { + .orbeon .container {width: 1300px;} + .orbeon [class*="span"] {width: 1300px;} + }*/ + +div#jqmb13di-control .checkbox > span { + white-space:nowrap; +} + +div[id=jqmb13di-control] .nombre .xforms-input-input { + width:100px; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/acemo/acemotrim/acemotrim.css b/content/WEB-INF/orbeon-insee/css/acemo/acemotrim/acemotrim.css new file mode 100644 index 00000000..454bdb8a --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/acemo/acemotrim/acemotrim.css @@ -0,0 +1,57 @@ +/* I - INFORMATIONS CONCERNANT VOTRE ETABLISSEMENT */ + +span.question > label[for*=HEURSUP-control], +span.question > label[for*=HEURCOMP-control] { + margin-top:1em; +} + +span.consigne > label[for*=DARES-ACEMO-QC-13-3-DARES-ACEMO-II-13-3-control] { + margin-top:2em; +} + +/* II - TEMPS DE TRAVAIL DES SALARIÉS ET DURÉE DU TRAVAIL */ + +.orbeon table[name=DARES-ACEMO-QG-22-1] { + display:flex; + flex-direction: column; +} + +.orbeon table[name=DARES-ACEMO-QG-22-1] tbody { + display:flex; + flex-direction: column; +} +.orbeon table[name=DARES-ACEMO-QG-22-1] tbody tr{ + display:flex; +} + +.orbeon table[name=DARES-ACEMO-QG-22-1] tbody tr td { + flex-grow: 1; +} +.orbeon table[name=DARES-ACEMO-QG-22-1] thead tr { + flex-grow: 1; + display:flex; +} +.orbeon table[name=DARES-ACEMO-QG-22-1] thead tr th{ + flex-grow: 1; +} +.orbeon table[name=DARES-ACEMO-QG-22-1] tbody tr td p > span{ + text-align:center; +} + +/* III - SUIVI DES RÉMUNÉRATIONS DES POSTES DE TRAVAIL LES PLUS REPRÉSENTATIFS DE VOS SALARIÉS */ + +.xforms-readonly input[id*=DARES-ACEMO-SEQ-3-control] { + color:black; +} + +/* IV - EMPLOIS POUR LESQUELS VOUS FAITES DES DÉMARCHES DE RECHERCHE D'UN CANDIDAT */ + +div[id*=DARES-ACEMO-SEQ-4-control] table.question.fauxTableau, +div[id*=DARES-ACEMO-SEQ-4-control] table.question.fauxTableau td, +div[id*=DARES-ACEMO-SEQ-4-control] table.question.fauxTableau th{ + border: none; +} +.question span[id*=DARES-ACEMO-QG-42-1-DARES-ACEMO-CL-4-2-control] .xforms-label .bloc { + font-style: normal; + padding-left: 0em; + } diff --git a/content/WEB-INF/orbeon-insee/css/acemo/acemotrim/acemotrimEnglish.css b/content/WEB-INF/orbeon-insee/css/acemo/acemotrim/acemotrimEnglish.css new file mode 100644 index 00000000..6583b993 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/acemo/acemotrim/acemotrimEnglish.css @@ -0,0 +1,57 @@ +/* I - INFORMATIONS CONCERNANT VOTRE ETABLISSEMENT */ + +span.question > label[for*=HEURSUP-control], +span.question > label[for*=HEURCOMP-control] { + margin-top:1em; +} + +span.hint > label[for*=DARES-ACEMO-QC-13-3-DARES-ACEMO-II-13-3-control] { + margin-top:2em; +} + +/* II - TEMPS DE TRAVAIL DES SALARIÉS ET DURÉE DU TRAVAIL */ + +.orbeon table[name=DARES-ACEMO-QG-22-1] { + display:flex; + flex-direction: column; +} + +.orbeon table[name=DARES-ACEMO-QG-22-1] tbody { + display:flex; + flex-direction: column; +} +.orbeon table[name=DARES-ACEMO-QG-22-1] tbody tr{ + display:flex; +} + +.orbeon table[name=DARES-ACEMO-QG-22-1] tbody tr td { + flex-grow: 1; +} +.orbeon table[name=DARES-ACEMO-QG-22-1] thead tr { + flex-grow: 1; + display:flex; +} +.orbeon table[name=DARES-ACEMO-QG-22-1] thead tr th{ + flex-grow: 1; +} +.orbeon table[name=DARES-ACEMO-QG-22-1] tbody tr td p > span{ + text-align:center; +} + +/* III - SUIVI DES RÉMUNÉRATIONS DES POSTES DE TRAVAIL LES PLUS REPRÉSENTATIFS DE VOS SALARIÉS */ + +.xforms-readonly input[id*=DARES-ACEMO-SEQ-3-control] { + color:black; +} + +/* IV - EMPLOIS POUR LESQUELS VOUS FAITES DES DÉMARCHES DE RECHERCHE D'UN CANDIDAT */ + +div[id*=DARES-ACEMO-SEQ-4-control] table.question.multiple-choice-question, +div[id*=DARES-ACEMO-SEQ-4-control] table.question.multiple-choice-question td, +div[id*=DARES-ACEMO-SEQ-4-control] table.question.multiple-choice-question th{ + border: none; +} +.question span[id*=DARES-ACEMO-QG-42-1-DARES-ACEMO-CL-4-2-control] .xforms-label .bloc { + font-style: normal; + padding-left: 0em; + } diff --git a/content/WEB-INF/orbeon-insee/css/antipol/antipol.css b/content/WEB-INF/orbeon-insee/css/antipol/antipol.css new file mode 100644 index 00000000..62a78ce7 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/antipol/antipol.css @@ -0,0 +1,14 @@ +@media (min-width: 1250px) { + .orbeon .container {width: 1250px;} + .orbeon [class*="span"] {width: 1250px;} + } + +#jfwd6v6a-control span.suffixe { + padding-left: 0em; + display: block; + text-align:center; +} + +#jfwd6v6a-control .xforms-input-input { + width: 120px; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/antipol/antipolEnglish.css b/content/WEB-INF/orbeon-insee/css/antipol/antipolEnglish.css new file mode 100644 index 00000000..10707732 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/antipol/antipolEnglish.css @@ -0,0 +1,9 @@ +@media (min-width: 1250px) { + .orbeon .container {width: 1250px;} + .orbeon [class*="span"] {width: 1250px;} + } + + +#jfwd6v6a-control .number .xforms-input-input { + width: 95px; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/cis/cis.css b/content/WEB-INF/orbeon-insee/css/cis/cis.css new file mode 100644 index 00000000..388c1227 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/cis/cis.css @@ -0,0 +1,15 @@ +@media (min-width: 1200px) { + .orbeon .container {width: 1200px;} + .orbeon [class*="span"] {width: 1200px;} + span[id*=d1e2957-THEN-control] table.question.fauxTableau tbody th {width: 38em;} + + + } + +div[id*=jk9nii14-control] table.question.fauxTableau tbody th { + width: auto; +} + +@media (max-width: 1199px) { + span[id*=d1e2957-THEN-control] table.question.fauxTableau tbody th {width: auto;} + } diff --git a/content/WEB-INF/orbeon-insee/css/cis/cisEnglish.css b/content/WEB-INF/orbeon-insee/css/cis/cisEnglish.css new file mode 100644 index 00000000..b3fc1e15 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/cis/cisEnglish.css @@ -0,0 +1,15 @@ +@media (min-width: 1200px) { + .orbeon .container {width: 1200px;} + .orbeon [class*="span"] {width: 1200px;} + span[id*=d1e2957-THEN-control] table.question.multiple-choice-question tbody th {width: 38em;} + + + } + +div[id*=jk9nii14-control] table.question.multiple-choice-question tbody th { + width: auto; +} + +@media (max-width: 1199px) { + span[id*=d1e2957-THEN-control] table.question.multiple-choice-question tbody th {width: auto;} + } diff --git a/content/WEB-INF/orbeon-insee/css/comg/comg.css b/content/WEB-INF/orbeon-insee/css/comg/comg.css new file mode 100644 index 00000000..e27ab830 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/comg/comg.css @@ -0,0 +1,3 @@ +span[id*=js1r5up5-SEQI-1-control] table.question.fauxTableau tbody th { + width: auto; +} diff --git a/content/WEB-INF/orbeon-insee/css/comg/comgEnglish.css b/content/WEB-INF/orbeon-insee/css/comg/comgEnglish.css new file mode 100644 index 00000000..6c8b407d --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/comg/comgEnglish.css @@ -0,0 +1,3 @@ +span[id*=js1r5up5-SEQI-1-control] table.question.multiple-choice-question tbody th { + width: auto; +} diff --git a/content/WEB-INF/orbeon-insee/css/common.css b/content/WEB-INF/orbeon-insee/css/common.css new file mode 100644 index 00000000..46d38da4 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/common.css @@ -0,0 +1,1005 @@ +/************************************* CSS Coleman ********************************************/ +/* Version compatible avec l'étape de francisation + + +Toutes les sucharges des css sont effectués à partir des classes définies par XForms (Eno) +Seuls quelques composants ont du être surchargés sur orbeon +Liste de ces composants : + - Police de caractère de la page + - Bandeau (entête) du haut avec le titre du questionnaire + - barre de progression + - les boutons, pour appliquer la charte graphique de l'Insee + - les exemples (à côté des inputs) + +Le reste des composants est ciblé grâce aux classes XForms. +*/ + +/*----------- Couleur de tous les boutons, regrouper pour une seule modif -----*/ +.orbeon .btn, +#menuButton, +.menuBandeau nav > a { + background-color: #ffe58e; +} +#menuButton:hover, +#menuButton:focus, +.menuBandeau nav > a:hover, +.menuBandeau nav > a:focus, +.orbeon .btn:hover, +.orbeon .btn:focus { + background-color: #ffeba8; +} + +button.btn[id^="previous"], +button.btn[id^="next"], +button.btn[id^="start"], +.btn.txt { + background-color: #ffc300; +} + +button.btn[id^="previous"]:hover, +button.btn[id^="previous"]:focus, +button.btn[id^="next"]:hover, +button.btn[id^="next"]:focus, +button.btn[id^="start"]:hover, +button.btn[id^="start"]:focus, +.btn.txt:hover, +.btn.txt:focus { + background-color: #fbd616; +} + +/* ----------------------------- Police du texte -----------------------------*/ +.orbeon * { + font-family: "Open Sans"; +} + +/* ---------------------- Gestion du bandeau (en-tête) ---------------------- */ +.orbeon .navbar-inverse .navbar-inner { + background-color: #f3fafe; + background-image: none; + padding: 5px; +} + +/* pour gérer la hauteur du bandeau */ +.orbeon .navbar-inverse .navbar-inner .container { + line-height: normal; + flex-direction: row; + flex-wrap: nowrap; +} + +/* gestion des liens du bandeau ie le menu */ +/* changer le nom -> internationaliser */ +/* Menu burger */ +.menuBandeau { + background: inherit; + color: black; + position: relative; + padding-bottom: 1em; +} +/* style du bouton "Menu" */ +#menuButton { + border: 1px transparent solid; + border-radius: 5px; + color: inherit; + cursor: pointer; + font-size: 1.2em; + height: 1.5em; + text-align: center; + display: none; /* ne pas afficher par défault (actif sur petits écrans)*/ +} + +/* style du contenant des lien */ +.menuBandeau nav { + padding-top: 0.5em; + background: inherit; + font-size: 1em; + font-weight: bold; + text-align: center; + overflow: hidden; + display: block; /* afficher par défault (désactivé sur petits écrans)*/ + /*transition: height 0.2s;*/ +} +.menuBandeau nav > * { + display: block; + background: white; + letter-spacing: 1px; + line-height: 1.5; + padding-left: 15px; +} +/* syle des liens */ +.menuBandeau nav > a { + border: 1.5px solid; + border-color: transparent; + text-decoration: none; + color: black; +} +/* Changement du style au passage de la souris */ +.menuBandeau nav > a:hover { + height: 1.5em; + color: black; + font-weight: bold; +} +.menuBandeau nav > a:first-child { + border-top-left-radius: 5px; + border-top-right-radius: 5px; +} +.menuBandeau nav > a:last-child { + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; +} + +/** titre du questionnaire **/ +h1 span.titre_enquete { + font-size: auto; + color: black; + line-height: normal; +} +/*----------------------------------------------------------------------------*/ + +/*------------------------ barre de progression ------------------------------*/ +.barreFixe span.droite { + color: transparent; /* enlever le pourcentage (et aussi "Avancement", à remettre)*/ + text-align: right; + display: block; + padding: 1em; +} + +span#progress-control .xforms-label p { + margin-right: 1em; + color: black; /* afficher "Avancement" de nouveau */ + text-align: right; +} + +progress { + background-color: white; + width: 10em; + height: 0.8em; + border: #0d3970 solid 1px; +} +/* enlever la valeur du pourcentage */ +span#pourcentageAvancement { + display: none; +} + +/* Retirer le premier input tout en haut (qui sert d'ancre pour remonter en haut de la page après click sur suivant)*/ +/* Remonter en haut pour la page suivante */ +/* A REVOIR */ +#page-top-control { + position: absolute; + top: -1000px; +} + +/*------------------ Reprise du questionnaire ------------------*/ + +.xforms-dialog div.hd.xxforms-dialog-head { + background: none; + background-color: #0d3970; + color: white; + font-weight: bold; +} + +/*------------------ Gestion de l'avertissement de début ------------------*/ +.frameAvertissement { + background-color: #e0e2de; + padding: 1em; + border: 2px solid red; + border-radius: 10px; +} + +/*------------------ Libellé de module ------------------*/ +.xbl-fr-section .xforms-group h2.fr-section-title { + color: white; + text-transform: uppercase; + font-weight: bold; + background-color: #0d3970; + padding: 0.5em; + background-image: none; +} +/*------------------ Déclaration de module ------------------*/ +/* consigne, control, aide, alert, warning */ +.fr-section-content .xforms-label .consigne { + color: #0f417a; + font-style: italic; + padding-right: 2em; + padding-left: 2em; +} +.fr-section-content .xforms-label .control { + color: #0f417a; + font-style: italic; + padding-right: 2em; + padding-left: 2em; +} +.fr-section-content .xforms-label .aide { + color: #0f417a; + font-style: italic; + padding-right: 2em; + padding-left: 2em; +} +.fr-section-content .xforms-label .alert { + color: #0f417a; + font-style: italic; + padding-right: 2em; + padding-left: 2em; +} +.fr-section-content .xforms-label .warning { + color: #0f417a; + font-style: italic; + padding-right: 2em; + padding-left: 2em; +} +.fr-section-content .xforms-label { + color: #0f417a; + font-style: italic; + padding-right: 2em; + padding-left: 2em; +} +/*------------------ Libellé de sous-module ------------------*/ +.fr-section-content .paragraphe h3 .xforms-label { + width: inherit; + font-weight: bold; + font-style: normal; + color: white; + background-color: #3467ae; + padding: 0.5em; + /*Pour que le libellé de sous-module prenne toutes la largeur de l'Encadrement de sous-module*/ + margin-top: -0.9em; + margin-left: -1em; + margin-right: -1em; +} +/*------------------ Déclaration de sous-module ------------------*/ +/* consigne, control, aide, alert, warning */ +.fr-section-content .paragraphe .xforms-label .consigne { + color: #0f417a; + font-style: italic; +} +.fr-section-content .paragraphe .xforms-label .control { + color: #0f417a; + font-style: italic; +} +.fr-section-content .paragraphe .xforms-label .aide { + color: #0f417a; + font-style: italic; +} +.fr-section-content .paragraphe .xforms-label .alert { + color: #0f417a; + font-style: italic; +} +.fr-section-content .paragraphe .xforms-label .warning { + color: #0f417a; + font-style: italic; +} +.fr-section-content .paragraphe .xforms-label { + color: #0f417a; + font-style: italic; +} + +/*------------------ Encadrement de module ------------------*/ +/* Personalisation possible */ +div.fr-section-content { +} + +/*------------------ Encadrement de sous-module ------------------*/ +div.paragraphe { + border: thin #3467ae solid; + padding-left: 1em; /* Pour décaler le texte dans les sous-modules*/ + padding-right: 1em; + padding-bottom: 1em; + margin-bottom: 3em; /* séparer les modules entre-eux*/ +} + +div.paragraphe:last-of-type { + margin-bottom: 1em; /* marge plus petite pour le dernier*/ +} +div.paragraphe:first-of-type { + margin-top: 2em; /* Pour le premier sous-module afin de laisser de l'espace en haut */ +} + +/*------------------ Pour l'affichage des questions avec les libellés ------------------*/ +/* lors d'une classe block définie dans le xforms, mettre l'affichage en "block" */ +.bloc { + display: block; +} + +/* libellé de la question(qui peut-être sur plusieurs lignes) */ +/* et dans le cas où il y a des déclarations */ +/* le dernier cas est lorqu'il n'y a pas de déclaration */ +span.bloc.question:first-of-type, +span.bloc.question > span.bloc:first-of-type, +span.question > .xforms-label:first-of-type { + font-weight: bold; + font-style: normal; + color: black; + display: block; + padding: 0em; + text-indent: 0em; + margin-top: 2em; /*separer les questions entre-elles*/ + cursor: default; /* mettre un curseur normal au lieu d'une main */ + white-space: normal; +} +/* Pour gérer les déclarations avant les questions, pour les rapprocher */ +span.statement.xforms-control label { + color: black; + display: block; + padding: 0em; + font-style: italic; + margin-bottom: -2em; + margin-top: 2em; /* c'est la déclaration qui porte l'espacement entre elle et la question précédente */ + white-space: normal; +} + +/* définir un style différent selon le type de déclaration : control, hint(consigne), help(aide), alert, warning */ +.question .xforms-label .bloc.control { + font-weight: normal; + color: black; + font-style: italic; + text-indent: 0em; + padding-left: 1em; + white-space: normal; +} +.question .xforms-label .bloc.consigne { + font-weight: normal; + color: black; + font-style: italic; + text-indent: 0em; + padding-left: 1em; + white-space: normal; +} +.question .xforms-label .bloc.aide { + font-weight: normal; + color: black; + font-style: italic; + text-indent: 0em; + padding-left: 1em; + white-space: normal; +} +.question .xforms-label .bloc.alert { + font-weight: normal; + color: black; + font-style: italic; + text-indent: 0em; + padding-left: 1em; + white-space: normal; +} +.question .xforms-label .bloc.warning { + font-weight: normal; + color: black; + font-style: italic; + text-indent: 0em; + padding-left: 1em; + white-space: normal; +} +.question .xforms-label .bloc { + font-weight: normal; + color: black; + font-style: italic; + text-indent: 0em; + padding-left: 1em; + white-space: normal; +} + +/*-------------------------- Gestion des tableaux ----------------------------*/ + +/* indentation des entêtes de ligne dans les tableaux */ +table.fauxTableau tbody th.depth2, +table.tableauComplexe tbody th.depth2 { + text-indent: 2em; +} +table.fauxTableau tbody th.depth3, +table.tableauComplexe tbody th.depth3 { + text-indent: 4em; +} + +/* label dans les tabeaux */ +.fr-section-content table .xforms-label, +.fr-section-content .paragraphe table .xforms-label { + font-weight: normal; + padding: 0em; + font-style: normal; + color: black; +} + +/* question tableauComplexe */ +table.question.tableauComplexe { + border: 1px #b0aeae solid; /*choix des bordures */ + margin-bottom: 0.5em; +} +/* Entête de colonne */ +table.question.tableauComplexe thead th { + border: 1px #b0aeae solid; + padding: 0.5em; + /* PROVISOIRE : Pour les tableaux qui dépassent sur les petits écrans */ + background-color: white; +} +/* Pour le style du label dans l'entête de colonne*/ +table.question.tableauComplexe thead th label.xforms-label { + font-weight: bold; +} +/* Entête de ligne */ +table.question.tableauComplexe tbody th { + border: 1px #b0aeae solid; + padding: 0.5em; + text-align: left; + /* PROVISOIRE : Pour les tableaux qui dépassent sur les petits écrans */ + background-color: white; +} +/* cellule*/ +table.question.tableauComplexe td { + border: 1px #b0aeae solid; + padding-left: 0.5em; + padding-right: 0.5em; + text-align: left; + /* PROVISOIRE : Pour les tableaux qui dépassent sur les petits écrans */ + background-color: white; +} +/*-----------------------*/ + +/* question fauxTableau */ +table.question.fauxTableau { + border: 1px solid #b0aeae; +} +/* Entête de colonne */ +table.question.fauxTableau thead th { + border: none; /* pas de bordure */ + border-right: 0; /* pas de bordure au milieu*/ + padding: 0.5em; + /* PROVISOIRE : Pour les tableaux qui dépassent sur les petits écrans */ + background-color: white; +} +/* Pour le style du label dans l'entête de colonne*/ +table.question.fauxTableau thead th label.xforms-label { + font-weight: bold; +} +/* Entête de ligne */ +table.question.fauxTableau tbody th { + border: 1px solid #b0aeae; + border-right: none; /* pas de bordure au milieu*/ + padding: 0.5em; + text-align: left; + width: 40em; /* eviter les libéllés trop long et permettre un retour à la ligne */ +} +/* Changement de couleur 1 ligne sur deux */ +table.question.fauxTableau.long-table tbody tr:nth-child(2n + 1) { + background-color: white; +} +table.question.fauxTableau.long-table tbody tr:nth-child(2n) { + background-color: Gainsboro; +} + +/* cellule*/ +table.question.fauxTableau td { + border: 1px solid #b0aeae; + border-left: none; /* pas de bordure */ + padding-left: 0.5em; + padding-right: 0.5em; + text-align: left; +} + +/* Affichage en ligne des modalités de réponse */ +table.question.fauxTableau td span.xforms-deselected, +table.question.fauxTableau td span.xforms-selected { + display: inline; +} + +/* Aligner les modalités et cases à cocher horizontalement pour les questions images */ +span.image span.xforms-items span.xforms-selected, +span.image span.xforms-items span.xforms-deselected { + display: inline; +} +/*----------------------------------------------------------------------------*/ + +/*---------------------------- Gestion des inputs ----------------------------*/ +/* largeur par défaut */ +.xforms-input-input[maxlength] { + width: 14em; +} +/* largeur pour les input de maxlength<=8 */ +.xforms-input-input[maxlength="8"], +.xforms-input-input[maxlength="7"], +.xforms-input-input[maxlength="6"], +.xforms-input-input[maxlength="5"], +.xforms-input-input[maxlength="4"], +.xforms-input-input[maxlength="3"], +.xforms-input-input[maxlength="2"], +.xforms-input-input[maxlength="1"] { + width: 7em; +} +.xforms-input-input[maxlength], +.xforms-input-input.xforms-type-date { + margin-left: 1em; /* indenter */ +} +table .xforms-input-input[maxlength] { + margin-left: 0; /*pas d'indentation dans les tableaux */ +} + +/* taille des inputs de type nombre */ +.nombre .xforms-input-input { + width: 150px; + text-align:right; +} + +/* prendre toute la largeur quelque soit l'input de type textarea */ +span.question.texte > textarea { + width: 98%; + border: 2px solid lightgrey; /* bordure des textarea */ + margin-left: 1em; /* indenter */ +} +/* permet d'avoir un espace entre l'unité (suffixe) et le champ de saisie*/ +span.suffixe, +span.suffixe-double-duree { + padding-left: 1em; +} +/* permet d'éviter le retour à la ligne de l'unité de champ*/ +td span.xforms-input { + white-space: nowrap; +} + +/* mettre l'alerte a côte de l'input */ +.orbeon .xforms-visited > .xforms-alert.xforms-active:not(:empty), +.orbeon .xforms-visited.xforms-alert.xforms-active:not(:empty) { + display: block; + margin-left: 1em; +} +/* changer la couleur du warning */ +.orbeon .xforms-warning > .xforms-alert.xforms-active, +.orbeon .xforms-alert.xforms-active.xforms-warning { + color: red; /* A DEFINIR */ +} + +/* Permet d'avoir l'exemple a coté -> PLUS D'EXEMPLE DESORMAIS +.orbeon .xforms-hint-appearance-full .xforms-hint, +.orbeon .xforms-hint-appearance-inline .xforms-hint { + margin-left: 1em; + display: inline; + font-size: 0.9em; +}*/ + +/* Gestion des inputs dates */ +span.question.duration.xforms-control.xforms-input { +} + +/*---------------------------- Gestion des Checkbox --------------------------*/ +label.checkbox { + margin-left: 1em; /*indenter*/ +} + +/*---------------------------- Gestion des Radio --------------------------*/ +label.radio { + margin-left: 1em; /*indenter*/ +} + +/*----------------- Gestion des liste déroulante (select) --------------------*/ +.orbeon select { + margin-left: 1em; /*indenter*/ +} + +/*----------------- Gestion des liste déroulante pour les durée --------------------*/ +span.question.date > select { + width: 6em; /*largeur*/ + display: inline; +} +/*largeur plus importante pour les mois*/ +span.question.date > select[id*="DATEDEP-layout-M"] { + width: 8em; /*largeur*/ + display: inline; +} + +/*------------------- Espacement libellé ----------------------*/ +.xforms-deselected span p, +.xforms-selected span p { + margin: 0px; +} + +/*------------------- Supprimer tous les icones en haut ----------------------*/ +.orbeon .navbar .navbar-inner .container .fr-status-icons { + display: none; +} + +/*--------------------------- Gestion des boutons ----------------------------*/ +/* correspond au boutons : + - Commencer + - Retour + - Enregistrer et Continue + - Envoyer + - Revenir à la dernière page accédée + - Aller à la première page +*/ + +/* contenu des boutons */ +.orbeon .fr-buttons .xforms-trigger button, +.orbeon .xforms-trigger button, +.orbeon .btn { + margin-left: 4px; /* espacement des boutons*/ + margin-bottom: 4px; /* espacement des boutons */ + display: inline-block; + text-shadow: none; /* enlever le l'ombre du texte par default */ + color: black; /* couleur du texte */ + font-weight: bold; + width: auto; /* Affichage correct des bouton "Retour" et "Enregistrer et continuer" */ +} +/* Mettre en surgras souligné lors d'un passage de la souris */ +.orbeon .fr-buttons .xforms-trigger button:hover, +.orbeon .xforms-trigger button:hover { + margin-left: 4px; + margin-bottom: 4px; + display: inline-block; + text-shadow: none; + color: black; + font-weight: bolder; + text-decoration: underline; +} +/* contenant des boutons*/ +.orbeon .btn { + background-image: none; /* enlever l'image de fond par défault */ + box-shadow: none; + border: 2px transparent; +} +/* Changement de la couleur (plus clair) lors d'un passage de la souris*/ +.orbeon .btn:hover, +.orbeon .btn:focus { + background-image: none; + box-shadow: none; + border: 2px transparent; +} + +.orbeon .btn[id^="previous"]:hover, +.orbeon .btn[id^="previous"]:focus { + float: left; +} + +/*-------------------------- Affichage du readonly ----------------------------*/ +.xforms-readonly *, +/* Les libellés des questions */ +.xforms-readonly span.bloc.question:first-of-type, +.xforms-readonly span.bloc.question > span.bloc:first-of-type, +.xforms-readonly span.question > .xforms-label:first-of-type, +/* les déclarations des questions */ +.xforms-readonly span.statement.xforms-control label, +.xforms-readonly .question .xforms-label .bloc.control, +.xforms-readonly .question .xforms-label .bloc.consigne, +.xforms-readonly .question .xforms-label .bloc.aide, +.xforms-readonly .question .xforms-label .bloc.alert, +.xforms-readonly .question .xforms-label .bloc.warning, +.xforms-readonly .question .xforms-label .bloc, +/* les entêtes de tableaux */ +.fr-section-content table .xforms-readonly .xforms-label, +.fr-section-content .paragraphe table .xforms-readonly .xforms-label, +/* champ input et textarea */ +.xforms-readonly span.question > textarea, +.xforms-readonly input.xforms-input-input { + font-style: italic; + color: #cbcbcb; + cursor: not-allowed; +} + +/*------------------ Spécificité selon la taille de l'écran ------------------*/ + +/* Augmenter la largeur du questionnaire sur grand écran */ +/* Par défault, orbeon fixe à 940px */ +@media (min-width: 1000px) { + .orbeon .container { + width: 1000px; + } + .orbeon [class*="span"] { + width: 1000px; + } +} + +/****** Pour les écrans de plus de 750px ********/ +@media all and (min-width: 750px) { + /* gestion de la taille de l'image */ + .orbeon .navbar-inverse .navbar-inner .container img { + vertical-align: middle; + max-height: none; + height: 100px; + padding: 1em; + display: inline-block; + } + + /* titre du questionnaire */ + .orbeon .navbar-inverse .navbar-inner .container h1 { + display: inline-block; + font-size: 1.5em; + width: 500px; + } + + /* à regler l'affichage sur la droite*/ + span.droite { + float: right; + } + /* hauteur de la barre de progression */ + .barreFixe { + height: 5em; + } + + .navbar-inner div.menuBandeau { + text-align: right; + float: right; + } + + /* boutons */ + .orbeon .fr-buttons { + display: inline; + float: right; + } + + #menuButton { + display: none; /*ne pas afficher le menu burger*/ + } + .menuBandeau nav { + display: block; /* afficher le menu */ + } + + .menuBandeau nav > a { + padding: 3px; + letter-spacing: 0px; + border-radius: 5px; + vertical-align: center; + margin: 4px; + } +} + +@media all and (max-width: 1000px) { + .navbar-inner div.menuBandeau { + float: none; + } +} + +/* pour les petits écran (smartphone, tablettes, etc) */ +@media all and (max-width: 750px) { + /* gestion de l'image de l'entête (centrer l'image)*/ + .orbeon .navbar-inverse .navbar-inner .container img { + vertical-align: middle; + max-height: none; + height: 75px; + padding-right: 1em; + margin: 0; + float: left; + } + + /* titre du questionnaire contenant */ + .orbeon .navbar-inverse .navbar-inner .container h1 { + display: inline; + text-align: right; + font-size: 1em; + } + /** titre du questionnaire **/ + h1 span.titre_enquete { + font-size: 1.2em; + color: black; + line-height: normal; + } + + body { + width: auto; + } + + /* gestion des liens du bandeau ie le menu */ + /* avoir un beau rendu */ + div.menuBandeau { + display: inline; + } + #menuButton { + display: block; + float: right; /* afficher le menu burger*/ + } + .menuBandeau nav { + display: none; + float: right; + width: 100%; + text-align: center; + } + + /* bouton "Mon Compte" : à faire disparaître pour les enquêtes en panels*/ + /*.navbar-inner div.menuBandeau > div.contact:first-of-type { + display: none; + } + .navbar-inner div.menuBandeau > div.contact:first-of-type:hover { + display: none; + }*/ + + /* boutons */ + .orbeon .fr-buttons { + display: inline; + float: right; + } + + div.xxforms-dialog-body { + text-align: center; + } + p { + text-align: left; + } + + /* permet d'avoir un espace entre l'unité (suffixe) et le champ de saisie*/ + span.suffixe, + span.suffixe-double-duree { + padding-left: 0.5em; + } +} + +@media all and (max-width: 500px) { + .orbeon .xforms-error-panel { + width: 97%; + } + + .orbeon footer[id=footer] { + width: 97%; + } +} + +/* mise en place du lien d'évitement */ +a.avoidance { + display: inline-block; + color: #555; + background: #fff; + padding: 0.5em; + position: absolute; + left: -99999rem; + z-index: 100; +} +a.avoidance:focus { + left: 0; +} + +/* pied-de-page */ +.orbeon footer[id=footer] { + display: flex; + align-items: flex-start; + justify-content: space-between; + font-size: 11px; + background-color: #E6E6E6; +} + +.orbeon footer[id=footer] div[id=urls] { + flex: auto; + text-align: center; + padding-top: 15px; + width: 350px; +} + +.orbeon footer[id=footer] div[id=urls] ul { + margin: 0; +} + +.orbeon footer[id=footer] div[id=urls] ul li{ + display:inline; +} + +.orbeon footer[id=footer] div[id=urls] ul li::after { + content: " | "; +} + +.orbeon footer[id=footer] div[id=urls] ul li.a3::after { + content: none; +} + +.orbeon footer[id=footer] div[id=urls] ul li.a6::after { + content: none; +} + +.orbeon footer a { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #0F417A; + font-size: 12px; + text-decoration: none; +} + +.orbeon footer[id=footer] div[id=insee], .orbeon footer[id=footer] div[id=version] { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 11px; +} + +/***** ajout 2022 *****/ + +/*largeur bandeau*/ +.orbeon .navbar-fixed-top { + position:unset; +} + +/*lien zarb*/ +span.fr-navbar-home-link.xforms-group { + display:none; +} + +/*barre avancement*/ +#progress-control≡≡c { + display:none; +} + +/*bouton de navigation*/ +.orbeon .fr-buttons { + position:inherit; +} + +span[role=navigation].fr-buttons { + width:auto; +} + +/*#previous{ + float:right; +} +#start, +#next { + float:right; +}*/ + + +/*hide output*/ +.orbeon .xforms-output.xforms-output-appearance-minimal output.xforms-output-output { + display:none !important; +} + +#remontePage-control { + position: absolute; + left: -99999rem; +} + +h1 span.titre_enquete { + white-space: normal; + font-weight: initial; +} + + + + +html#xf-1 body.orbeon form#xforms-form div#warningNext_c div#warningNext { + position:fixed !important; + top: 40%; + left: 50%; + transform: translate(-50%, -50%); +} + +html#xf-1 body.orbeon form#xforms-form div#warningPrevious_c div#warningPrevious { + position:fixed !important; + top: 40%; + left: 50%; + transform: translate(-50%, -50%); +} + + +/*.orbeon .xforms-select-appearance-full .xforms-items { + flex-direction: row; +}*/ + + + +body.orbeon div.date.xforms-type-date div.date span.add-on { +background-image: url(https://coltrane.developpement2.insee.fr/enquete2/3.1415/img/calendar.png); +background-repeat: no-repeat; +background-position: center; +} + +body.orbeon span.add-on i.fa.fa-fw.fa-calendar::before{ + content: none; +} + + +/* contraste case a cocher */ +html#xf-1 body.orbeon form#xforms-form input[type="checkbox"] { + border: 1px solid rgba(0, 0, 0, 0.80); +} + + +/* changer la couleur du warning */ +.orbeon .xforms-warning > .xforms-alert.xforms-active, +.orbeon .xforms-alert.xforms-active.xforms-warning { +font-weight: bold; +background: #ffc271; +} + +/* cacher bouton output */ +html#xf-1 body.orbeon form#xforms-form button[class="xforms-help"] { + display:none; +} + +/* replacer fleche sur minute */ +.orbeon span[id*=MIN_REMP-control] .xforms-alert.xforms-active::before { + left: 165px; +} + + +/* efhct only */ + +.orbeon table[name=jckpei4f] input[id*=jckphwrw] { + max-width: 135px; +} + diff --git a/insee-overload/common/WEB-INF/orbeon-insee/css/commonEnglish.css b/content/WEB-INF/orbeon-insee/css/commonEnglish.css similarity index 85% rename from insee-overload/common/WEB-INF/orbeon-insee/css/commonEnglish.css rename to content/WEB-INF/orbeon-insee/css/commonEnglish.css index f4f90582..cc2f369d 100644 --- a/insee-overload/common/WEB-INF/orbeon-insee/css/commonEnglish.css +++ b/content/WEB-INF/orbeon-insee/css/commonEnglish.css @@ -946,7 +946,6 @@ label.radio { font-size: 11px; } - /***** ajout 2022 *****/ /*largeur bandeau*/ @@ -987,6 +986,18 @@ span[role=navigation].fr-buttons { display:none !important; } +/* display pilotage info */ +.orbeon .xforms-output.xforms-output-appearance-minimal output.xforms-output-output[id*=Nom-control] { + display: unset !important; +} +.orbeon .xforms-output.xforms-output-appearance-minimal output.xforms-output-output[id*=Mel-control] { + display: unset !important; +} +.orbeon .xforms-output.xforms-output-appearance-minimal output.xforms-output-output[id*=Telephone-control] { + display: unset !important; +} + + #remontePage-control { position: absolute; left: -99999rem; @@ -994,6 +1005,7 @@ span[role=navigation].fr-buttons { h1 span.titre_enquete { white-space: normal; + font-weight: initial; } @@ -1014,17 +1026,128 @@ html#xf-1 body.orbeon form#xforms-form div#warningPrevious_c div#warningPrevious } -.orbeon .xforms-select-appearance-full .xforms-items { +/*.orbeon .xforms-select-appearance-full .xforms-items { flex-direction: row; -} +}*/ + + body.orbeon div.date.xforms-type-date div.date span.add-on { - background-image: url(/rmestromae/3.1415/img/calendar.png); - background-repeat: no-repeat; - background-position: center; - } - - body.orbeon span.add-on i.fa.fa-fw.fa-calendar::before{ - content: none; - } +background-image: url(https://entreprises.stat-publique.fr/questionnaire1/3.1415/img/calendar.png); +background-repeat: no-repeat; +background-position: center; +} + +body.orbeon span.add-on i.fa.fa-fw.fa-calendar::before{ + content: none; +} + + +/* contraste case a cocher */ +html#xf-1 body.orbeon form#xforms-form input[type="checkbox"] { + border: 1px solid rgba(0, 0, 0, 0.80); +} + + +/* changer la couleur du warning */ +.orbeon .xforms-warning > .xforms-alert.xforms-active, +.orbeon .xforms-alert.xforms-active.xforms-warning { +font-weight: bold; +background: #ffc271; +} + +/* cacher bouton output */ +html#xf-1 body.orbeon form#xforms-form button[class="xforms-help"] { + display:none; +} + +/* replacer fleche sur minute */ +.orbeon span[id*=MIN_REMP-control] .xforms-alert.xforms-active::before { + left: 165px; +} + + +/* efhct only */ + +.orbeon table[name=jckpei4f] input[id*=jckphwrw] { + max-width: 135px; +} + +.orbeon form[action*=comd] .xforms-select-appearance-full .xforms-items:has(img) { + flex-direction: row; +} +.orbeon form[action*=comd] td > .xforms-select-appearance-full > span.xforms-items { + flex-direction: row; +} +.orbeon form[action*=comd] table.question.multiple-choice-question tbody th { + width : 100%; +} +.orbeon form[action*=comd] table.question.multiple-choice-question tbody td .xforms-select-appearance-full label.checkbox { + width: max-content; +} + +.orbeon form[action*=comg] .xforms-select-appearance-full .xforms-items:has(img) { + flex-direction: row; +} +.orbeon form[action*=comg] td > .xforms-select-appearance-full > span.xforms-items { + flex-direction: row; +} +.orbeon form[action*=comg] table.question.multiple-choice-question tbody th { + width : 100%; +} +.orbeon form[action*=comg] table.question.multiple-choice-question tbody td .xforms-select-appearance-full label.checkbox { + width: max-content; +} + +.orbeon form[action*=acti] .xforms-select-appearance-full .xforms-items:has(img) { + flex-direction: row; +} +.orbeon form[action*=acti] td > .xforms-select-appearance-full > span.xforms-items { + flex-direction: row; +} +.orbeon form[action*=acti] table.question.multiple-choice-question tbody th { + width : 100%; +} +.orbeon form[action*=acti] table.question.multiple-choice-question tbody td .xforms-select-appearance-full label.checkbox { + width: max-content; +} + +.orbeon form[action*=bati] .xforms-select-appearance-full .xforms-items:has(img) { + flex-direction: row; +} +.orbeon form[action*=bati] td > .xforms-select-appearance-full > span.xforms-items { + flex-direction: row; +} +.orbeon form[action*=bati] table.question.multiple-choice-question tbody th { + width : 100%; +} +.orbeon form[action*=bati] table.question.multiple-choice-question tbody td .xforms-select-appearance-full label.checkbox { + width: max-content; +} + +.orbeon form[action*=prom] .xforms-select-appearance-full .xforms-items:has(img) { + flex-direction: row; +} +.orbeon form[action*=prom] td > .xforms-select-appearance-full > span.xforms-items { + flex-direction: row; +} +.orbeon form[action*=prom] table.question.multiple-choice-question tbody th { + width : 50%; +} +.orbeon form[action*=prom] table.question.multiple-choice-question tbody td .xforms-select-appearance-full label.checkbox { + width: max-content; +} + +.orbeon form[action*=serv] .xforms-select-appearance-full .xforms-items:has(img) { + flex-direction: row; +} +.orbeon form[action*=serv] td > .xforms-select-appearance-full > span.xforms-items { + flex-direction: row; +} +.orbeon form[action*=serv] table.question.multiple-choice-question tbody th { + width : 100%; +} +.orbeon form[action*=serv] table.question.multiple-choice-question tbody td .xforms-select-appearance-full label.checkbox { + width: max-content; +} diff --git a/content/WEB-INF/orbeon-insee/css/eap/eap.css b/content/WEB-INF/orbeon-insee/css/eap/eap.css new file mode 100644 index 00000000..c27e43c4 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/eap/eap.css @@ -0,0 +1,122 @@ +/* largeur globale */ + +@media (min-width: 1200px) { + .orbeon .container {width: 1200px;} + .orbeon [class*="span"] {width: 1200px;} + } + +@media (min-width: 1400px) { + .orbeon .container {width: 1300px;} + .orbeon [class*="span"] {width: 1300px;} + } + +/* correction tableau */ +div div table tbody tr th.dizparu{ + display:none; +} +/* couleur zone saisie */ +.orbeon .xforms-input input { + background-color: #F3FAFE; +} +/* couleur zone lecture seule */ +.orbeon .xforms-input input[disabled] { + background-color: #eeeeee; + color:#848484; +} + +/* couleur rouge pour les dif */ +table[name*=INSEE-EAP-QG-4-2] tbody tr td span[id*=INSEE-EAP-QG-4-2-INSEE-EAP-CL-CL-EAP-10-6b-control] label.xforms-label{ + font-weight:bold; + color:red; +} +.fr-section-content table.fauxTableau td[id*=plop]{ + display:none; + } + +#fr-view .nombre .xforms-input-input { + width: 9em; +} + +/* Couleur du texte */ +div#INSEE-EAP-SEQ-5-control .xforms-readonly *, +div#INSEE-EAP-SEQ-8-control .xforms-readonly *, +div#INSEE-EAP-SEQ-9-control .xforms-readonly *, +div#INSEE-EAP-SEQ-10-control .xforms-readonly *, +div#INSEE-EAP-SEQ-11-control .xforms-readonly * { + color:black; +} + + +/* modif A00 indentation - no border */ + +.fr-section-content table .xforms-label[for*=EAP-17-3-control], +.fr-section-content table .xforms-label[for*=EAP-17-4-control], +.fr-section-content table .xforms-label[for*=EAP-17-5-control], +.fr-section-content table .xforms-label[for*=EAP-17-7-control], +.fr-section-content table .xforms-label[for*=EAP-17-8-control], +.fr-section-content table .xforms-label[for*=EAP-17-9-control], +.fr-section-content table .xforms-label[for*=EAP-17-11-control], +.fr-section-content table .xforms-label[for*=EAP-17-12-control], +.fr-section-content table .xforms-label[for*=EAP-17-13-control], +.fr-section-content table .xforms-label[for*=EAP-17-15-control], +.fr-section-content table .xforms-label[for*=EAP-17-16-control], +.fr-section-content table .xforms-label[for*=EAP-17-17-control] +{ + padding-left:2em; +} + +div[id*=INSEE-EAP-SEQ-1] table.question.fauxTableau, +div[id*=INSEE-EAP-SEQ-1] table.question.fauxTableau td, +div[id*=INSEE-EAP-SEQ-1] table.question.fauxTableau th { + border:none; +} + +/* B01 trop de gras */ +.xforms-switch .fr-section-content .question span[id*=CE9-control] > i, +.xforms-switch .fr-section-content .question label[for*=CE7-control] > i { + font-weight:normal; +} + +/* B00 */ +.orbeon span[id*=CE0-control] > .xforms-hint { + font-size:inherit; +} +div[id*=INSEE-EAP-SEQ-4] table.question.fauxTableau, +div[id*=INSEE-EAP-SEQ-4] table.question.fauxTableau td, +div[id*=INSEE-EAP-SEQ-4] table.question.fauxTableau th { + border:none; +} +div[id*=INSEE-EAP-SEQ-4] table.question.fauxTableau tbody tr { + line-height:0px; +} +div[id*=INSEE-EAP-SEQ-4] table.question.fauxTableau tbody tr td .xforms-alert { + line-height:20px; +} + +/*F00*/ + +.fr-section-content table span.precisez .xforms-label { + white-space: nowrap; +} +table.question.tableauComplexe span[id*=VH1b-control] { + display:flex; +} +table.question.tableauComplexe span[id*=VH1b-control] span.suffixe { + align-self: center; + font-weight: normal; +} + + +/*heure min fin*/ + +.orbeon .xforms-hint-appearance-full span[id*=HEURE_REMP] > *, .orbeon .xforms-hint-appearance-full span[id*=MIN_REMP] > *{ + display:inline; +} +.orbeon .xforms-hint-appearance-full span[id*=HEURE_REMP] > .suffixe, .orbeon .xforms-hint-appearance-full span[id*=MIN_REMP] > .suffixe{ + padding-left: 1em; +} +div[id*=INSEE-EAP-SEQ-14-control] .fr-section-content .xforms-label { + padding-left:0px; + padding-right:0px; +} + diff --git a/content/WEB-INF/orbeon-insee/css/eap/eapEnglish.css b/content/WEB-INF/orbeon-insee/css/eap/eapEnglish.css new file mode 100644 index 00000000..0b94b4d9 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/eap/eapEnglish.css @@ -0,0 +1,137 @@ +/* largeur globale */ + +@media (min-width: 1200px) { + .orbeon .container {width: 1200px;} + .orbeon [class*="span"] {width: 1200px;} + } + +@media (min-width: 1400px) { + .orbeon .container {width: 1300px;} + .orbeon [class*="span"] {width: 1300px;} + } + +/* correction tableau */ +div div table tbody tr th.dizparu{ + display:none; +} +/* couleur zone saisie */ +.orbeon .xforms-input input { + background-color: #F3FAFE; +} +/* couleur zone lecture seule */ +.orbeon .xforms-input input[disabled] { + background-color: #eeeeee; + color:#848484; +} + +/* couleur rouge pour les dif */ +table[name*=INSEE-EAP-QG-4-2] tbody tr td span[id*=INSEE-EAP-QG-4-2-INSEE-EAP-CL-CL-EAP-10-6b-control] label.xforms-label{ + font-weight:bold; + color:red; +} +.fr-section-content table.multiple-choice-question td[id*=plop]{ + display:none; + } + +#fr-view .nombre .xforms-input-input { + width: 9em; +} + +/* Couleur du texte */ +div#INSEE-EAP-SEQ-5-control .xforms-readonly *, +div#INSEE-EAP-SEQ-8-control .xforms-readonly *, +div#INSEE-EAP-SEQ-9-control .xforms-readonly *, +div#INSEE-EAP-SEQ-10-control .xforms-readonly *, +div#INSEE-EAP-SEQ-11-control .xforms-readonly * { + color:black; +} + + +/* modif A00 indentation - no border */ + +.fr-section-content table .xforms-label[for*=EAP-17-3-control], +.fr-section-content table .xforms-label[for*=EAP-17-4-control], +.fr-section-content table .xforms-label[for*=EAP-17-5-control], +.fr-section-content table .xforms-label[for*=EAP-17-7-control], +.fr-section-content table .xforms-label[for*=EAP-17-8-control], +.fr-section-content table .xforms-label[for*=EAP-17-9-control], +.fr-section-content table .xforms-label[for*=EAP-17-11-control], +.fr-section-content table .xforms-label[for*=EAP-17-12-control], +.fr-section-content table .xforms-label[for*=EAP-17-13-control], +.fr-section-content table .xforms-label[for*=EAP-17-15-control], +.fr-section-content table .xforms-label[for*=EAP-17-16-control], +.fr-section-content table .xforms-label[for*=EAP-17-17-control] +{ + padding-left:2em; +} + +div[id*=INSEE-EAP-SEQ-1] table.question.multiple-choice-question, +div[id*=INSEE-EAP-SEQ-1] table.question.multiple-choice-question td, +div[id*=INSEE-EAP-SEQ-1] table.question.multiple-choice-question th { + border:none; +} + +/* B01 trop de gras */ +.xforms-switch .fr-section-content .question span[id*=CE9-control] > i, +.xforms-switch .fr-section-content .question label[for*=CE7-control] > i { + font-weight:normal; +} + +/* B00 */ +.orbeon span[id*=CE0-control] > .xforms-hint { + font-size:inherit; +} +div[id*=INSEE-EAP-SEQ-4] table.question.multiple-choice-question, +div[id*=INSEE-EAP-SEQ-4] table.question.multiple-choice-question td, +div[id*=INSEE-EAP-SEQ-4] table.question.multiple-choice-question th { + border:none; +} +div[id*=INSEE-EAP-SEQ-4] table.question.multiple-choice-question tbody tr { + line-height:0px; +} +div[id*=INSEE-EAP-SEQ-4] table.question.multiple-choice-question tbody tr td .xforms-alert { + line-height:20px; +} + +/*F00*/ + +.fr-section-content table span.precisez .xforms-label { + white-space: nowrap; +} +table.question.complex-grid span[id*=VH1b-control] { + display:flex; +} +table.question.complex-grid span[id*=VH1b-control] span.suffixe { + align-self: center; + font-weight: normal; +} + + +/*heure min fin*/ + +.orbeon .xforms-hint-appearance-full span[id*=HEURE_REMP] > *, .orbeon .xforms-hint-appearance-full span[id*=MIN_REMP] > *{ + display:inline; +} +.orbeon .xforms-hint-appearance-full span[id*=HEURE_REMP] > .suffixe, .orbeon .xforms-hint-appearance-full span[id*=MIN_REMP] > .suffixe{ + padding-left: 1em; +} +div[id*=INSEE-EAP-SEQ-14-control] .fr-section-content .xforms-label { + padding-left:0px; + padding-right:0px; +} + +.suffixe { + margin-left: 3px; +} + +.suffixe:has(> span) { + margin-left: 0px; +} + +html .orbeon .xforms-hint-appearance-full .xforms-hint { + margin-left: 0px; +} + +html .orbeon .xforms-hint-appearance-full span[id*=CE0-control].xforms-hint { + margin-left: 1em; +} diff --git a/content/WEB-INF/orbeon-insee/css/ecmoss/ecmoss.css b/content/WEB-INF/orbeon-insee/css/ecmoss/ecmoss.css new file mode 100644 index 00000000..825a0636 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/ecmoss/ecmoss.css @@ -0,0 +1,8 @@ +.question .xforms-label .block { +font-weight: normal; +color: black; +font-style: normal; +text-indent: 0em; +padding-left: 1em; +white-space: normal; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/emb/emb.css b/content/WEB-INF/orbeon-insee/css/emb/emb.css new file mode 100644 index 00000000..f1dec2ce --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/emb/emb.css @@ -0,0 +1,142 @@ +/*.orbeon span.lienDeblocage a { + display : inline-block; +} + +.orbeon input { + width : 14em; +} + +.orbeon div.GroupeNatureVariable > span.libelle > label { + font-size : 1.5em; + font-weight : bold; + border-style: none; +} + +.orbeon div.GroupeNatureVariable > span.description > label{ + font-style: italic; +} + +.orbeon div.Activite { + display: block; + margin-top: 1em; + margin-bottom: 2em; +} + +*/ +/*.orbeon div.ConteneurNatureVariable { + text-align: right; + text-align: left; +}*/ +.orbeon div.Produit { + display: block; + margin-top: 0em; + padding-bottom: 0.5em; + border-bottom: thin dashed black; +} + +.orbeon div.NatureVariable { + border: thin solid black; + padding-top: 2px; + padding-bottom: 2px; + border-radius: 10px; + background-color: #F3FAFE; + display: inline-block; + margin-bottom: 0.5em; +} + +.orbeon div.NatureVariable span.suffixe{ + display: inline-block; +} + +/* +.orbeon div.Variable { + margin-left : 1em; + width: 21em; + display : inline-block; +} + +.orbeon div.libelle-description { + display: inline-block; +} +*/ +.orbeon div.Activite > span.identifiant, .orbeon div.Activite > span.libelle, +.orbeon div.Produit > span.identifiant, .orbeon div.Produit > span.libelle, +.orbeon div.Variable > span.question > label, .orbeon div.Variable > span.question > input { + display: inline-block; + margin: 0.5em; +} + +/* +.orbeon div.Variable > span.libelle > label{ + margin-right: 0.5em; +} + +.orbeon div.Activite > span.description > label { + margin-left: 3em; +} +.orbeon div.Produit > span.description > label { + margin-left: 4em; +} +*/ +.orbeon div.Activite > span.identifiant > label { + font-weight : bold; + text-decoration: underline; + border: thin solid black; + padding-top: 2px; + padding-bottom: 2px; + text-align: center; + width: 4em; + border-radius: 5px; + background-color: #F3FAFE; +} + +.orbeon div.Produit > span.identifiant > label { + border: thin solid black; + padding-top: 2px; + padding-bottom: 2px; + text-align: center; + width: 5em; + border-radius: 5px; + background-color: #F3FAFE; +} +/* +.orbeon .xbl-fr-section .fr-section-title .fr-section-label +{ + background-color: #3D5B77; + color: #F3FAFE; +} +.orbeon .xbl-fr-section .fr-section-title .fr-section-label a +{ + background-color: #3D5B77; + color: #F3FAFE; +}*/ + + +.fr-section-content label.xforms-label { + padding-right: 6px; + padding-left: 0em; +} + +.fr-section-content span.description label.xforms-label { + padding-right: 6px; + padding-left: 0em; +} + + +span.suffixe, span.suffixe-double-duree { + padding-left: 0em; +} + +.orbeon div.Variable > span.question > label { + display:block; + margin-top: 0.5em; + margin-left: 0.5em; + margin-right: 0.5em; +} + +.orbeon .xforms-hint-appearance-full span[id*=HEURE_REMP] > *, .orbeon .xforms-hint-appearance-full span[id*=MIN_REMP] > *{ + display:inline; +} +.orbeon .xforms-hint-appearance-full span[id*=HEURE_REMP] > .suffixe, .orbeon .xforms-hint-appearance-full span[id*=MIN_REMP] > .suffixe{ + padding-left: 1em; +} diff --git a/content/WEB-INF/orbeon-insee/css/emb/embEnglish.css b/content/WEB-INF/orbeon-insee/css/emb/embEnglish.css new file mode 100644 index 00000000..8aec59dd --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/emb/embEnglish.css @@ -0,0 +1,142 @@ +/*.orbeon span.lienDeblocage a { + display : inline-block; +} + +.orbeon input { + width : 14em; +} + +.orbeon div.GroupeNatureVariable > span.libelle > label { + font-size : 1.5em; + font-weight : bold; + border-style: none; +} + +.orbeon div.GroupeNatureVariable > span.description > label{ + font-style: italic; +} + +.orbeon div.Activite { + display: block; + margin-top: 1em; + margin-bottom: 2em; +} + +*/ +/*.orbeon div.ConteneurNatureVariable { + text-align: right; + text-align: left; +}*/ +.orbeon div.Produit { + display: block; + margin-top: 0em; + padding-bottom: 0.5em; + border-bottom: thin dashed black; +} + +.orbeon div.NatureVariable { + border: thin solid black; + padding-top: 2px; + padding-bottom: 2px; + border-radius: 10px; + background-color: #F3FAFE; + display: inline-block; + margin-bottom: 0.5em; +} + +.orbeon div.NatureVariable span.suffix{ + display: inline-block; +} + +/* +.orbeon div.Variable { + margin-left : 1em; + width: 21em; + display : inline-block; +} + +.orbeon div.libelle-description { + display: inline-block; +} +*/ +.orbeon div.Activite > span.identifiant, .orbeon div.Activite > span.libelle, +.orbeon div.Produit > span.identifiant, .orbeon div.Produit > span.libelle, +.orbeon div.Variable > span.question > label, .orbeon div.Variable > span.question > input { + display: inline-block; + margin: 0.5em; +} + +/* +.orbeon div.Variable > span.libelle > label{ + margin-right: 0.5em; +} + +.orbeon div.Activite > span.description > label { + margin-left: 3em; +} +.orbeon div.Produit > span.description > label { + margin-left: 4em; +} +*/ +.orbeon div.Activite > span.identifiant > label { + font-weight : bold; + text-decoration: underline; + border: thin solid black; + padding-top: 2px; + padding-bottom: 2px; + text-align: center; + width: 4em; + border-radius: 5px; + background-color: #F3FAFE; +} + +.orbeon div.Produit > span.identifiant > label { + border: thin solid black; + padding-top: 2px; + padding-bottom: 2px; + text-align: center; + width: 5em; + border-radius: 5px; + background-color: #F3FAFE; +} +/* +.orbeon .xbl-fr-section .fr-section-title .fr-section-label +{ + background-color: #3D5B77; + color: #F3FAFE; +} +.orbeon .xbl-fr-section .fr-section-title .fr-section-label a +{ + background-color: #3D5B77; + color: #F3FAFE; +}*/ + + +.fr-section-content label.xforms-label { + padding-right: 6px; + padding-left: 0em; +} + +.fr-section-content span.description label.xforms-label { + padding-right: 6px; + padding-left: 0em; +} + + +span.suffix, span.double-duration-suffix { + padding-left: 0em; +} + +.orbeon div.Variable > span.question > label { + display:block; + margin-top: 0.5em; + margin-left: 0.5em; + margin-right: 0.5em; +} + +.orbeon .xforms-hint-appearance-full span[id*=HEURE_REMP] > *, .orbeon .xforms-hint-appearance-full span[id*=MIN_REMP] > *{ + display:inline; +} +.orbeon .xforms-hint-appearance-full span[id*=HEURE_REMP] > .suffixe, .orbeon .xforms-hint-appearance-full span[id*=MIN_REMP] > .suffix{ + padding-left: 1em; +} diff --git a/content/WEB-INF/orbeon-insee/css/enterpriseEnglish.css b/content/WEB-INF/orbeon-insee/css/enterpriseEnglish.css new file mode 100644 index 00000000..8820a48a --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/enterpriseEnglish.css @@ -0,0 +1,239 @@ +/*/\*largeur *\/ +@media (min-width: 1200px) { + .orbeon .container {width: 1200px;} + .orbeon [class*="span"] {width: 1200px;} + } + +@media (min-width: 1400px) { + .orbeon .container {width: 1300px;} + .orbeon [class*="span"] {width: 1300px;} + }*/ + +/*pourcentageAvancement*/ +#BarreFixe-control{ + display:inline-block; +} + +#progress-percent span[id*=progress-percent] { + color:black; + font-weight: bold; + font-style: normal; +} + +/* alignement nom mel... */ +.orbeon div span[id*=Nom-control] , +.orbeon div span[id*=Mel-control] , +.orbeon div span[id*=Telephone-control] { + display: block; +} +.orbeon div span[id*=Nom-control] > label, +.orbeon div span[id*=Mel-control] > label, +.orbeon div span[id*=Telephone-control] > label { + display: inline; +} + +span[id*=ComplementAdresse-control], +span[id*=InformationsVoie-control], +span[id*=MentionSpeciale-control], +span[id*=Ville-control], +span[id*=LibellePays-control] { + display:block; +} + +div[id*=INSEE-COLTRANE-QUEST-DEBUT-control] .fr-section-content .xforms-label { + padding-left: 0; + padding-right: 5px; +} + +div[id*=INSEE-BUSINESS-QUEST-DEBUT-control] .fr-section-content .xforms-label { + padding-left: 0; + padding-right: 5px; +} + +div[id*=SEQ-0-control] .fr-section-content .xforms-label { + padding-left: 0; + padding-right: 5px; +} +div[id*=INSEE-COLTRANE-QUEST-DEBUT-control] .fr-section-content h3 .xforms-label { + padding-left: 10px; + padding-right: 5px; +} + +div[id*=INSEE-BUSINESS-QUEST-DEBUT-control] .fr-section-content h3 .xforms-label { + padding-left: 10px; + padding-right: 5px; +} + +div[id*=SEQ-0-control] .fr-section-content h3 .xforms-label { + padding-left: 10px; + padding-right: 5px; +} + + +span#progress-bar-container-control label[for*=progress-bar-container-control] { + display: inline-block; +} + +span.right span#progress-percent { + display: inline-block; +} + +span#progress-control { + display: inline-block; +} + +@media (min-width: 750px){ + .progress-bar-container { + height: 2em; + } +} + +span#fr-view-component div.progress-bar-container span.right { + color: #333333; + padding-right: 1em; + padding-top: 0em; + padding-bottom: 0em; + padding-left: 0em; +} + +@media (min-width: 550px) { + div.progress-bar-container span.right { + display: inline; + float:right; + } +} + + +@media (max-width: 549px) { + div.progress-bar-container > span.right { + display: inline-block; + float:none; + } +} + + +@media (min-width: 750px) { + .menuBandeau nav#nav > a { + padding: 0px; + margin: 2px; + } +} + +@media (min-width: 750px) { + .orbeon .navbar-inverse .navbar-inner div.container > img { + padding-top: 5px; + padding-bottom: 5px; + } +} + +div.menuBandeau { + padding-bottom: 0px; +} + +@media (min-width: 751px) { + div.menuBandeau { + width: 190px; + } + .menuBandeau nav#nav { + padding-top: 0px; + width: 190px; +} +} + +@media (max-width: 750px) { + div.menuBandeau { + width: 70px; + } + .menuBandeau nav#nav { + width: 210px; + } + .menuBandeau nav#nav > a { + padding-left:0px; + } +} + +.orbeon .navbar-inverse div.navbar-inner > div.container { + display:flex; +} + +.orbeon .navbar-inverse div.navbar-inner > div.container > h1 { + flex-grow: 1; + text-align: left; +} + +/*largeur duree*/ +.orbeon span.duration > input { + width: 4em; +} + +/*page debut*/ +span[id*=ACCUEIL-2-control] label.xforms-label div.frame { + background-color: #e0e2de; + padding: 1em; + border: 2px solid #1B3280; + border-radius: 10px; +} + +div.frameAvertissement p b img { + background-color: #ffc300; +} + +/*page fin*/ +@media (min-width: 750px) { + .orbeon div.center { + margin-left: auto; + margin-right: auto; + width: 650px; + } +} +.orbeon div[id*=VALIDATION-control] div.center div.frame, +.orbeon div[id*=CONFIRMATION-control] div.center div.frame, +.orbeon div[id*=FIN-control] div.center div.frame { + background-color: #e0e2de; + padding: 1em; + border: 2px solid #1B3280; + border-radius: 10px; +} + +.orbeon div[id*=FIN-control] div.center div.frame span span[id*=messageConfirmation]{ + color: #333333; +} + +.orbeon div[id*=VALIDATION-control] div.center div.frame .center-body, +.orbeon div[id*=CONFIRMATION-control] .center-body, +.orbeon div[id*=CONFIRMATION-control] .center-body div.frame p { + text-align:center; +} + +.orbeon div[id*=VALIDATION-control] div.center div.frame p.indentation-with-bullet, +.orbeon div[id*=VALIDATION-control] div.center div.frame p.simple-identation { + margin-left: 3em; +} +.orbeon div[id*=VALIDATION-control] div.center div.frame p.indentation-with-bullet { + display: list-item; +} + +/*grisé trop clair*/ + +.xforms-readonly *, +/* Les libellés des questions */ +.xforms-readonly span.block.question:first-of-type, +.xforms-readonly span.block.question > span.block:first-of-type, +.xforms-readonly span.question > .xforms-label:first-of-type, +/* les déclarations des questions */ +.xforms-readonly span.statement.xforms-control label, +.xforms-readonly .question .xforms-label .block.control, +.xforms-readonly .question .xforms-label .block.hint, +.xforms-readonly .question .xforms-label .block.help, +.xforms-readonly .question .xforms-label .block.alert, +.xforms-readonly .question .xforms-label .block.warning, +.xforms-readonly .question .xforms-label .block, +/* les entêtes de tableaux */ +.fr-section-content table .xforms-readonly .xforms-label, +.fr-section-content .submodule table .xforms-readonly .xforms-label, +/* champ input et textarea */ +.xforms-readonly span.question > textarea, +.xforms-readonly input.xforms-input-input { + color: #848484; +} + diff --git a/content/WEB-INF/orbeon-insee/css/entreprise.css b/content/WEB-INF/orbeon-insee/css/entreprise.css new file mode 100644 index 00000000..b5591817 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/entreprise.css @@ -0,0 +1,223 @@ +/*/\*largeur *\/ +@media (min-width: 1200px) { + .orbeon .container {width: 1200px;} + .orbeon [class*="span"] {width: 1200px;} + } + +@media (min-width: 1400px) { + .orbeon .container {width: 1300px;} + .orbeon [class*="span"] {width: 1300px;} + }*/ + +/*pourcentageAvancement*/ +#pourcentageAvancement span[id*=pourcentageAvancement] { + color:black; + font-weight: bold; + font-style: normal; +} + +/* alignement nom mel... */ +.orbeon div span[id*=Nom-control] , +.orbeon div span[id*=Mel-control] , +.orbeon div span[id*=Telephone-control] { + display: block; +} +.orbeon div span[id*=Nom-control] > label, +.orbeon div span[id*=Mel-control] > label, +.orbeon div span[id*=Telephone-control] > label { + display: inline; +} + +span[id*=ComplementAdresse-control], +span[id*=InformationsVoie-control], +span[id*=MentionSpeciale-control], +span[id*=Ville-control], +span[id*=LibellePays-control] { + display:block; +} + +div[id*=INSEE-COLTRANE-QUEST-DEBUT-control] .fr-section-content .xforms-label { + padding-left: 0; + padding-right: 5px; +} +div[id*=SEQ-0-control] .fr-section-content .xforms-label { + padding-left: 0; + padding-right: 5px; +} +div[id*=INSEE-COLTRANE-QUEST-DEBUT-control] .fr-section-content h3 .xforms-label { + padding-left: 10px; + padding-right: 5px; +} +div[id*=SEQ-0-control] .fr-section-content h3 .xforms-label { + padding-left: 10px; + padding-right: 5px; +} + + +span#BarreFixe-control label[for*=BarreFixe-control] { + display: inline-block; +} + +span.droite span#pourcentageAvancement { + display: inline-block; +} + +span#progress-control { + display: inline-block; +} + +@media (min-width: 750px){ + .barreFixe { + height: 2em; + } +} + +span#fr-view-component div.barreFixe span.droite { + color: #333333; + padding-right: 1em; + padding-top: 0em; + padding-bottom: 0em; + padding-left: 0em; +} + +@media (min-width: 550px) { + div.barreFixe span.droite { + display: inline; + float:right; + } +} + + +@media (max-width: 549px) { + div.barreFixe > span.droite { + display: inline-block; + float:none; + } +} + + +@media (min-width: 750px) { + .menuBandeau nav#nav > a { + padding: 0px; + margin: 2px; + } +} + +@media (min-width: 750px) { + .orbeon .navbar-inverse .navbar-inner div.container > img { + padding-top: 5px; + padding-bottom: 5px; + } +} + +div.menuBandeau { + padding-bottom: 0px; +} + +@media (min-width: 751px) { + div.menuBandeau { + width: 190px; + } + .menuBandeau nav#nav { + padding-top: 0px; + width: 190px; +} +} + +@media (max-width: 750px) { + div.menuBandeau { + width: 70px; + } + .menuBandeau nav#nav { + width: 210px; + } + .menuBandeau nav#nav > a { + padding-left:0px; + } +} + +.orbeon .navbar-inverse div.navbar-inner > div.container { + display:flex; +} + +.orbeon .navbar-inverse div.navbar-inner > div.container > h1 { + flex-grow: 1; + text-align: left; +} + +/*largeur duree*/ +.orbeon span.duree > input { + width: 4em; +} + +/*page debut*/ +span[id*=ACCUEIL-2-control] label.xforms-label div.frame { + background-color: #e0e2de; + padding: 1em; + border: 2px solid #1B3280; + border-radius: 10px; +} + +div.frameAvertissement p b img { + background-color: #ffc300; +} + +/*page fin*/ +@media (min-width: 750px) { + .orbeon div.centre { + margin-left: auto; + margin-right: auto; + width: 650px; + } +} +.orbeon div[id*=VALIDATION-control] div.centre div.frame, +.orbeon div[id*=CONFIRMATION-control] div.centre div.frame, +.orbeon div[id*=FIN-control] div.centre div.frame { + background-color: #e0e2de; + padding: 1em; + border: 2px solid #1B3280; + border-radius: 10px; +} + +.orbeon div[id*=FIN-control] div.centre div.frame span span[id*=messageConfirmation]{ + color: #333333; +} + +.orbeon div[id*=VALIDATION-control] div.centre div.frame .contenuCentre, +.orbeon div[id*=CONFIRMATION-control] .contenuCentre, +.orbeon div[id*=CONFIRMATION-control] .contenuCentre div.frame p { + text-align:center; +} + +.orbeon div[id*=VALIDATION-control] div.centre div.frame p.retraitMarque, +.orbeon div[id*=VALIDATION-control] div.centre div.frame p.retraitNonMarque { + margin-left: 3em; +} +.orbeon div[id*=VALIDATION-control] div.centre div.frame p.retraitMarque { + display: list-item; +} + +/*grisé trop clair*/ + +.xforms-readonly *, +/* Les libellés des questions */ +.xforms-readonly span.bloc.question:first-of-type, +.xforms-readonly span.bloc.question > span.bloc:first-of-type, +.xforms-readonly span.question > .xforms-label:first-of-type, +/* les déclarations des questions */ +.xforms-readonly span.statement.xforms-control label, +.xforms-readonly .question .xforms-label .bloc.control, +.xforms-readonly .question .xforms-label .bloc.consigne, +.xforms-readonly .question .xforms-label .bloc.aide, +.xforms-readonly .question .xforms-label .bloc.alert, +.xforms-readonly .question .xforms-label .bloc.warning, +.xforms-readonly .question .xforms-label .bloc, +/* les entêtes de tableaux */ +.fr-section-content table .xforms-readonly .xforms-label, +.fr-section-content .paragraphe table .xforms-readonly .xforms-label, +/* champ input et textarea */ +.xforms-readonly span.question > textarea, +.xforms-readonly input.xforms-input-input { + color: #848484; +} + diff --git a/content/WEB-INF/orbeon-insee/css/esa/esa.css b/content/WEB-INF/orbeon-insee/css/esa/esa.css new file mode 100644 index 00000000..2090fbd2 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/esa/esa.css @@ -0,0 +1,29 @@ +/* nom de l'enquête sur une ligne dans le bandeau d'en-tête */ +.orbeon h1, .navbar-inner > .container > img { + float: none; +} + +td label .titre0, td label .titre1, td label .titre2, +td label .intertitre0, td label .intertitre1, td label .intertitre2 +{ + font-weight: bold; +} + +td label .intertitre0, td label .intertitre1, td label .intertitre2, +td label .ventilation0, td label .ventilation1, td label .ventilation2 +{ + font-style: italic; +} + +td label .titre1, td label .intertitre1, td label .ventilation1, td label .code1 +{ + margin-left: 2em; +} +td label .titre2, td label .intertitre2, td label .ventilation2, td label .code2 +{ + margin-left: 4em; +} +td label .code3 +{ + margin-left: 6em; +} diff --git a/content/WEB-INF/orbeon-insee/css/fasgso/fasgso.css b/content/WEB-INF/orbeon-insee/css/fasgso/fasgso.css new file mode 100644 index 00000000..f0184100 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/fasgso/fasgso.css @@ -0,0 +1,10 @@ +/* taille des images meteo */ +.orbeon span > img[alt="Très satisfaisant"], +.orbeon span > img[alt="Plutôt satisfaisant"], +.orbeon span > img[alt="Plutôt insatisfaisant"], +.orbeon span > img[alt="Très insatisfaisant"] +{ + max-width: 40px; + height: 40px; + width: 40px; +} diff --git a/content/WEB-INF/orbeon-insee/css/fasgso/fasgsoEnglish.css b/content/WEB-INF/orbeon-insee/css/fasgso/fasgsoEnglish.css new file mode 100644 index 00000000..0ed9fc55 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/fasgso/fasgsoEnglish.css @@ -0,0 +1,10 @@ +/* taille des images meteo */ +.orbeon span > img[title="Très satisfaisant"], +.orbeon span > img[title="Plutôt satisfaisant"], +.orbeon span > img[title="Plutôt insatisfaisant"], +.orbeon span > img[title="Très insatisfaisant"] +{ + max-width: 40px; + height: 40px; + width: 40px; +} diff --git a/content/WEB-INF/orbeon-insee/css/invt/invt.css b/content/WEB-INF/orbeon-insee/css/invt/invt.css new file mode 100644 index 00000000..40318a7e --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/invt/invt.css @@ -0,0 +1,10 @@ +@media (min-width: 800px) { +div[id*=jt096ta6-control] table.question.fauxTableau tbody th { + width: 10em; +} +} +@media (max-width: 799px) { +div[id*=jt096ta6-control] table.question.fauxTableau tbody th { + width: auto; +} +} diff --git a/content/WEB-INF/orbeon-insee/css/invt/invtEnglish.css b/content/WEB-INF/orbeon-insee/css/invt/invtEnglish.css new file mode 100644 index 00000000..abad0015 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/invt/invtEnglish.css @@ -0,0 +1,10 @@ +@media (min-width: 800px) { +div[id*=jt096ta6-control] table.question.multiple-choice-question tbody th { + width: 10em; +} +} +@media (max-width: 799px) { +div[id*=jt096ta6-control] table.question.multiple-choice-question tbody th { + width: auto; +} +} diff --git a/content/WEB-INF/orbeon-insee/css/ofats/ofats.css b/content/WEB-INF/orbeon-insee/css/ofats/ofats.css new file mode 100644 index 00000000..a9c74cb1 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/ofats/ofats.css @@ -0,0 +1,132 @@ +/*largeur */ +@media (min-width: 1200px) { + .orbeon .container {width: 1200px;} + .orbeon [class*="span"] {width: 1200px;} + } + +@media (min-width: 1400px) { + .orbeon .container {width: 1300px;} + .orbeon [class*="span"] {width: 1300px;} + } + + +.orbeon #INSEE-OFATS-SEQ-2b-control span.nombre .xforms-input-input, +.orbeon #INSEE-OFATS-SEQ-3-control span.nombre .xforms-input-input { + width: 6.6em; +} +#INSEE-OFATS-SEQ-3-control select, +#INSEE-OFATS-SEQ-2b-control select { + width: 10em; +} + +#INSEE-OFATS-SEQ-4-control select, +#INSEE-OFATS-SEQ-4-control input { + width: 6.5em; + margin-left:0px; +} + +#INSEE-OFATS-SEQ-4-control span.suffixe { + padding-left: 0em; + display: block; + text-align:center; +} + +.orbeon #INSEE-OFATS-SEQ-4-control input[id*=DNOM_JV-control], +.orbeon #INSEE-OFATS-SEQ-4-control input[id*=DEFF_JV-control], +.orbeon #INSEE-OFATS-SEQ-4-control select{ + margin-bottom: 19px; +} + +/* ofats only */ + +.number span[id*=k3plf6d9] .xforms-input-input { + width: 6em; +} +.number span[id*=k3plk9zj] .xforms-input-input { + width: 6em; +} +.number span[id*=k3plk9zj] input[id*=B2NB_FIL].xforms-input-input { + width: 4em; +} +.number span[id*=k3ply1vx] .xforms-input-input { + width: 6em; +} +.number span[id*=k3ply1vx] input[id*=CNB_FIL].xforms-input-input { + width: 4em; +} + +.number span[id*=k3ptzo1l] .xforms-input-input { + width: 9em; +} + +.number span[id*=k3ptzo1l] input[id*=DTX_C_JV].xforms-input-input, +.number span[id*=k3ptzo1l] input[id*=DQUOTITE].xforms-input-input { + width: 3em; +} + + + +.orbeon table[name=k3ojs908] th, +.orbeon table[name=k3ojs908] td, + +.orbeon table[name=k3okdsy9] th, +.orbeon table[name=k3okdsy9] td, + +.orbeon table[name=k3okdd3t] th, +.orbeon table[name=k3okdd3t] td, + +.orbeon table[name=k3ojv8rq] th, +.orbeon table[name=k3ojv8rq] td { + padding: 0.1em !important; +} + + +.orbeon table[name=k3ojs908] td select, +.orbeon table[name=k3okdsy9] td select, +.orbeon table[name=k3okdd3t] td select, +.orbeon table[name=k3ojv8rq] td select { + margin-left: 0em; +} + +.orbeon table[name=k3ojs908] td label.checkbox, +.orbeon table[name=k3okdsy9] td label.checkbox, +.orbeon table[name=k3okdd3t] td label.checkbox, +.orbeon table[name=k3ojv8rq] td label.checkbox { + margin-left: 0em; + margin-right: 0em; + width: 5.5em; +} + +.orbeon table[name=k3ojs908] td div, +.orbeon table[name=k3okdsy9] td div, +.orbeon table[name=k3okdd3t] td div, +.orbeon table[name=k3ojv8rq] td div { + display: flex; + justify-content: center; +} + +.orbeon table[name=k3ojs908] th, +.orbeon table[name=k3okdsy9] th, +.orbeon table[name=k3okdd3t] th, +.orbeon table[name=k3ojv8rq] th { + width: min-content; +} + +.orbeon table[name=k3okdd3t] td span.add-on{ + padding-left:0em; + padding-right:0em; +} + +.orbeon table[name=k3okdd3t] td span.add-on > span[id*=suffix] > span[id*=suffix]{ + min-width: unset; +} + +.orbeon table[name="k3okdd3t"] td select { + width:7em; +} + +@media (min-width: 1450px) { + .orbeon .container {width: 1450px;} + .orbeon [class*="span"] {width: 1450px;} + } + diff --git a/content/WEB-INF/orbeon-insee/css/ofats/ofatsEnglish.css b/content/WEB-INF/orbeon-insee/css/ofats/ofatsEnglish.css new file mode 100644 index 00000000..b21167d8 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/ofats/ofatsEnglish.css @@ -0,0 +1,131 @@ +/*largeur */ +@media (min-width: 1200px) { + .orbeon .container {width: 1200px;} + .orbeon [class*="span"] {width: 1200px;} + } + +@media (min-width: 1400px) { + .orbeon .container {width: 1300px;} + .orbeon [class*="span"] {width: 1300px;} + } + + +.orbeon #INSEE-OFATS-SEQ-2b-control span.number .xforms-input-input, +.orbeon #INSEE-OFATS-SEQ-3-control span.number .xforms-input-input { + width: 6.6em; +} +#INSEE-OFATS-SEQ-3-control select, +#INSEE-OFATS-SEQ-2b-control select { + width: 10em; +} + +#INSEE-OFATS-SEQ-4-control select, +#INSEE-OFATS-SEQ-4-control input { + width: 6.5em; + margin-left:0px; +} + +#INSEE-OFATS-SEQ-4-control span.suffix { + padding-left: 0em; + display: block; + text-align:center; +} + +.orbeon #INSEE-OFATS-SEQ-4-control input[id*=DNOM_JV-control], +.orbeon #INSEE-OFATS-SEQ-4-control input[id*=DEFF_JV-control], +.orbeon #INSEE-OFATS-SEQ-4-control select{ + margin-bottom: 19px; +} + +/* ofats only */ + +.number span[id*=k3plf6d9] .xforms-input-input { + width: 6em; +} +.number span[id*=k3plk9zj] .xforms-input-input { + width: 6em; +} +.number span[id*=k3plk9zj] input[id*=B2NB_FIL].xforms-input-input { + width: 4em; +} +.number span[id*=k3ply1vx] .xforms-input-input { + width: 6em; +} +.number span[id*=k3ply1vx] input[id*=CNB_FIL].xforms-input-input { + width: 4em; +} + +.number span[id*=k3ptzo1l] .xforms-input-input { + width: 9em; +} + +.number span[id*=k3ptzo1l] input[id*=DTX_C_JV].xforms-input-input, +.number span[id*=k3ptzo1l] input[id*=DQUOTITE].xforms-input-input { + width: 3em; +} + + + +.orbeon table[name=k3ojs908] th, +.orbeon table[name=k3ojs908] td, + +.orbeon table[name=k3okdsy9] th, +.orbeon table[name=k3okdsy9] td, + +.orbeon table[name=k3okdd3t] th, +.orbeon table[name=k3okdd3t] td, + +.orbeon table[name=k3ojv8rq] th, +.orbeon table[name=k3ojv8rq] td { + padding: 0.1em !important; +} + + +.orbeon table[name=k3ojs908] td select, +.orbeon table[name=k3okdsy9] td select, +.orbeon table[name=k3okdd3t] td select, +.orbeon table[name=k3ojv8rq] td select { + margin-left: 0em; +} + +.orbeon table[name=k3ojs908] td label.checkbox, +.orbeon table[name=k3okdsy9] td label.checkbox, +.orbeon table[name=k3okdd3t] td label.checkbox, +.orbeon table[name=k3ojv8rq] td label.checkbox { + margin-left: 0em; + margin-right: 0em; + width: 5.5em; +} + +.orbeon table[name=k3ojs908] td div, +.orbeon table[name=k3okdsy9] td div, +.orbeon table[name=k3okdd3t] td div, +.orbeon table[name=k3ojv8rq] td div { + display: flex; + justify-content: center; +} + +.orbeon table[name=k3ojs908] th, +.orbeon table[name=k3okdsy9] th, +.orbeon table[name=k3okdd3t] th, +.orbeon table[name=k3ojv8rq] th { + width: min-content; +} + +.orbeon table[name=k3okdd3t] td span.add-on{ + padding-left:0em; + padding-right:0em; +} + +.orbeon table[name=k3okdd3t] td span.add-on > span[id*=suffix] > span[id*=suffix]{ + min-width: unset; +} + +.orbeon table[name="k3okdd3t"] td select { + width:7em; +} + +@media (min-width: 1450px) { + .orbeon .container {width: 1450px;} + .orbeon [class*="span"] {width: 1450px;} + } diff --git a/content/WEB-INF/orbeon-insee/css/opiseindus/opiseindus.css b/content/WEB-INF/orbeon-insee/css/opiseindus/opiseindus.css new file mode 100644 index 00000000..639ce211 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/opiseindus/opiseindus.css @@ -0,0 +1,17 @@ +.xforms-readonly *, +.xforms-readonly span.bloc.question:first-of-type, +.xforms-readonly span.bloc.question > span.bloc:first-of-type, +.xforms-readonly span.question > .xforms-label:first-of-type, +.xforms-readonly span.statement.xforms-control label, +.xforms-readonly .question .xforms-label .bloc.control, +.xforms-readonly .question .xforms-label .bloc.consigne, +.xforms-readonly .question .xforms-label .bloc.aide, +.xforms-readonly .question .xforms-label .bloc.alert, +.xforms-readonly .question .xforms-label .bloc.warning, +.xforms-readonly .question .xforms-label .bloc, +.fr-section-content table .xforms-readonly .xforms-label, +.fr-section-content .paragraphe table .xforms-readonly .xforms-label, +.xforms-readonly span.question > textarea, +.xforms-readonly input.xforms-input-input { + color: black; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/opiseindus/opiseindusEnglish.css b/content/WEB-INF/orbeon-insee/css/opiseindus/opiseindusEnglish.css new file mode 100644 index 00000000..447570ca --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/opiseindus/opiseindusEnglish.css @@ -0,0 +1,17 @@ +.xforms-readonly *, +.xforms-readonly span.block.question:first-of-type, +.xforms-readonly span.block.question > span.block:first-of-type, +.xforms-readonly span.question > .xforms-label:first-of-type, +.xforms-readonly span.statement.xforms-control label, +.xforms-readonly .question .xforms-label .block.control, +.xforms-readonly .question .xforms-label .block.hint, +.xforms-readonly .question .xforms-label .block.help, +.xforms-readonly .question .xforms-label .block.alert, +.xforms-readonly .question .xforms-label .block.warning, +.xforms-readonly .question .xforms-label .block, +.fr-section-content table .xforms-readonly .xforms-label, +.fr-section-content .submodule table .xforms-readonly .xforms-label, +.xforms-readonly span.question > textarea, +.xforms-readonly input.xforms-input-input { + color: black; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/opiseserv/opiseserv.css b/content/WEB-INF/orbeon-insee/css/opiseserv/opiseserv.css new file mode 100644 index 00000000..639ce211 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/opiseserv/opiseserv.css @@ -0,0 +1,17 @@ +.xforms-readonly *, +.xforms-readonly span.bloc.question:first-of-type, +.xforms-readonly span.bloc.question > span.bloc:first-of-type, +.xforms-readonly span.question > .xforms-label:first-of-type, +.xforms-readonly span.statement.xforms-control label, +.xforms-readonly .question .xforms-label .bloc.control, +.xforms-readonly .question .xforms-label .bloc.consigne, +.xforms-readonly .question .xforms-label .bloc.aide, +.xforms-readonly .question .xforms-label .bloc.alert, +.xforms-readonly .question .xforms-label .bloc.warning, +.xforms-readonly .question .xforms-label .bloc, +.fr-section-content table .xforms-readonly .xforms-label, +.fr-section-content .paragraphe table .xforms-readonly .xforms-label, +.xforms-readonly span.question > textarea, +.xforms-readonly input.xforms-input-input { + color: black; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/opiseserv/opiseservEnglish.css b/content/WEB-INF/orbeon-insee/css/opiseserv/opiseservEnglish.css new file mode 100644 index 00000000..d9f2b527 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/opiseserv/opiseservEnglish.css @@ -0,0 +1,17 @@ +.xforms-readonly *, +.xforms-readonly span.block.question:first-of-type, +.xforms-readonly span.block.question > span.bloc:first-of-type, +.xforms-readonly span.question > .xforms-label:first-of-type, +.xforms-readonly span.statement.xforms-control label, +.xforms-readonly .question .xforms-label .block.control, +.xforms-readonly .question .xforms-label .block.hint, +.xforms-readonly .question .xforms-label .block.help, +.xforms-readonly .question .xforms-label .block.alert, +.xforms-readonly .question .xforms-label .block.warning, +.xforms-readonly .question .xforms-label .block, +.fr-section-content table .xforms-readonly .xforms-label, +.fr-section-content .submodule table .xforms-readonly .xforms-label, +.xforms-readonly span.question > textarea, +.xforms-readonly input.xforms-input-input { + color: black; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/prom/prom.css b/content/WEB-INF/orbeon-insee/css/prom/prom.css new file mode 100644 index 00000000..a5b43fdd --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/prom/prom.css @@ -0,0 +1,10 @@ +@media (min-width: 750px) { + .question.fauxTableau span[role=group]{ + display:flex; + } + +} + +.question.fauxTableau span[role=group] label.checkbox > span { + white-space: nowrap; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/prom/promEnglish.css b/content/WEB-INF/orbeon-insee/css/prom/promEnglish.css new file mode 100644 index 00000000..6e61c34b --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/prom/promEnglish.css @@ -0,0 +1,10 @@ +@media (min-width: 750px) { + .question.multiple-choice-question span[role=group]{ + display:flex; + } + +} + +.question.multiple-choice-question span[role=group] label.checkbox > span { + white-space: nowrap; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/serv/serv.css b/content/WEB-INF/orbeon-insee/css/serv/serv.css new file mode 100644 index 00000000..5d77b949 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/serv/serv.css @@ -0,0 +1,3 @@ +span[id*=d1e572-THEN-control] table.question.fauxTableau tbody th { + width: auto; +} diff --git a/content/WEB-INF/orbeon-insee/css/serv/servEnglish.css b/content/WEB-INF/orbeon-insee/css/serv/servEnglish.css new file mode 100644 index 00000000..2c084567 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/serv/servEnglish.css @@ -0,0 +1,3 @@ +span[id*=d1e572-THEN-control] table.question.multiple-choice-question tbody th { + width: auto; +} diff --git a/content/WEB-INF/orbeon-insee/css/tic/tic.css b/content/WEB-INF/orbeon-insee/css/tic/tic.css new file mode 100644 index 00000000..b2c93264 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/tic/tic.css @@ -0,0 +1,15 @@ +.fr-section-content .xforms-label{ + font-style: normal; +} +.fr-section-content .paragraphe .xforms-label{ + font-style: normal; +} +.question .xforms-label .bloc { + font-style: normal; +} +.question .xforms-label .bloc.consigne { + font-style: normal; +} +.question .xforms-label .bloc.aide { + font-style: normal; +} \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/css/tic/ticEnglish.css b/content/WEB-INF/orbeon-insee/css/tic/ticEnglish.css new file mode 100644 index 00000000..dee8db47 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/css/tic/ticEnglish.css @@ -0,0 +1,18 @@ +.fr-section-content .xforms-label{ + font-style: normal; +} +.fr-section-content .submodule .xforms-label{ + font-style: normal; +} +.fr-section-content .xforms-label .hint{ + font-style: normal; +} +.question .xforms-label .block { + font-style: normal; +} +.question .xforms-label .block.hint { + font-style: normal; +} +.fr-section-content .xforms-label .help { + font-style: normal; +} diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/Help-browser.svg.png b/content/WEB-INF/orbeon-insee/img/Help-browser.svg.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/Help-browser.svg.png rename to content/WEB-INF/orbeon-insee/img/Help-browser.svg.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/Insee_formulaire-recensement-bleunuance2.png b/content/WEB-INF/orbeon-insee/img/Insee_formulaire-recensement-bleunuance2.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/Insee_formulaire-recensement-bleunuance2.png rename to content/WEB-INF/orbeon-insee/img/Insee_formulaire-recensement-bleunuance2.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/Logo_COLL.png b/content/WEB-INF/orbeon-insee/img/Logo_COLL.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/Logo_COLL.png rename to content/WEB-INF/orbeon-insee/img/Logo_COLL.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/Logo_COLLold.png b/content/WEB-INF/orbeon-insee/img/Logo_COLLold.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/Logo_COLLold.png rename to content/WEB-INF/orbeon-insee/img/Logo_COLLold.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/Logo_Mesri.jpg b/content/WEB-INF/orbeon-insee/img/Logo_Mesri.jpg similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/Logo_Mesri.jpg rename to content/WEB-INF/orbeon-insee/img/Logo_Mesri.jpg diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/calendar.png b/content/WEB-INF/orbeon-insee/img/calendar.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/calendar.png rename to content/WEB-INF/orbeon-insee/img/calendar.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/dares.png b/content/WEB-INF/orbeon-insee/img/dares.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/dares.png rename to content/WEB-INF/orbeon-insee/img/dares.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/dares2.png b/content/WEB-INF/orbeon-insee/img/dares2.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/dares2.png rename to content/WEB-INF/orbeon-insee/img/dares2.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/dares3.png b/content/WEB-INF/orbeon-insee/img/dares3.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/dares3.png rename to content/WEB-INF/orbeon-insee/img/dares3.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/en-baisse.jpg b/content/WEB-INF/orbeon-insee/img/en-baisse.jpg similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/en-baisse.jpg rename to content/WEB-INF/orbeon-insee/img/en-baisse.jpg diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/en-hausse.jpg b/content/WEB-INF/orbeon-insee/img/en-hausse.jpg similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/en-hausse.jpg rename to content/WEB-INF/orbeon-insee/img/en-hausse.jpg diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/enregistrer.png b/content/WEB-INF/orbeon-insee/img/enregistrer.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/enregistrer.png rename to content/WEB-INF/orbeon-insee/img/enregistrer.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/icone_statpub.png b/content/WEB-INF/orbeon-insee/img/icone_statpub.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/icone_statpub.png rename to content/WEB-INF/orbeon-insee/img/icone_statpub.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/insee.png b/content/WEB-INF/orbeon-insee/img/insee.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/insee.png rename to content/WEB-INF/orbeon-insee/img/insee.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/logo4.png b/content/WEB-INF/orbeon-insee/img/logo4.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/logo4.png rename to content/WEB-INF/orbeon-insee/img/logo4.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/logo_INSEECDC.png b/content/WEB-INF/orbeon-insee/img/logo_INSEECDC.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/logo_INSEECDC.png rename to content/WEB-INF/orbeon-insee/img/logo_INSEECDC.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/logo_sies.png b/content/WEB-INF/orbeon-insee/img/logo_sies.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/logo_sies.png rename to content/WEB-INF/orbeon-insee/img/logo_sies.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/logo_statpub.png b/content/WEB-INF/orbeon-insee/img/logo_statpub.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/logo_statpub.png rename to content/WEB-INF/orbeon-insee/img/logo_statpub.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/marianne.png b/content/WEB-INF/orbeon-insee/img/marianne.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/marianne.png rename to content/WEB-INF/orbeon-insee/img/marianne.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/modifier.png b/content/WEB-INF/orbeon-insee/img/modifier.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/modifier.png rename to content/WEB-INF/orbeon-insee/img/modifier.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/pdf.png b/content/WEB-INF/orbeon-insee/img/pdf.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/pdf.png rename to content/WEB-INF/orbeon-insee/img/pdf.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/plutot_insatisfaisant-pluie.png b/content/WEB-INF/orbeon-insee/img/plutot_insatisfaisant-pluie.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/plutot_insatisfaisant-pluie.png rename to content/WEB-INF/orbeon-insee/img/plutot_insatisfaisant-pluie.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/plutot_satisfaisant-nuage.png b/content/WEB-INF/orbeon-insee/img/plutot_satisfaisant-nuage.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/plutot_satisfaisant-nuage.png rename to content/WEB-INF/orbeon-insee/img/plutot_satisfaisant-nuage.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/retour.png b/content/WEB-INF/orbeon-insee/img/retour.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/retour.png rename to content/WEB-INF/orbeon-insee/img/retour.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/stable.jpg b/content/WEB-INF/orbeon-insee/img/stable.jpg similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/stable.jpg rename to content/WEB-INF/orbeon-insee/img/stable.jpg diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/tres_insatisfaisant-orage.png b/content/WEB-INF/orbeon-insee/img/tres_insatisfaisant-orage.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/tres_insatisfaisant-orage.png rename to content/WEB-INF/orbeon-insee/img/tres_insatisfaisant-orage.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/img/tres_satisfaisant-soleil.png b/content/WEB-INF/orbeon-insee/img/tres_satisfaisant-soleil.png similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/img/tres_satisfaisant-soleil.png rename to content/WEB-INF/orbeon-insee/img/tres_satisfaisant-soleil.png diff --git a/insee-overload/common/WEB-INF/orbeon-insee/js/responsive.js b/content/WEB-INF/orbeon-insee/js/responsive.js similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/js/responsive.js rename to content/WEB-INF/orbeon-insee/js/responsive.js diff --git a/insee-overload/default/WEB-INF/orbeon-insee/page-flow.xml b/content/WEB-INF/orbeon-insee/page-flow.xml similarity index 77% rename from insee-overload/default/WEB-INF/orbeon-insee/page-flow.xml rename to content/WEB-INF/orbeon-insee/page-flow.xml index de7c9a6c..8bdceff7 100644 --- a/insee-overload/default/WEB-INF/orbeon-insee/page-flow.xml +++ b/content/WEB-INF/orbeon-insee/page-flow.xml @@ -1,39 +1,39 @@ - + - + - - - + + - + - - - - + + + - + - + + + diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/assistance.xpl b/content/WEB-INF/orbeon-insee/services/assistance.xpl similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/services/assistance.xpl rename to content/WEB-INF/orbeon-insee/services/assistance.xpl diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/error.xpl b/content/WEB-INF/orbeon-insee/services/error.xpl similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/services/error.xpl rename to content/WEB-INF/orbeon-insee/services/error.xpl diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/get-parameters.xpl b/content/WEB-INF/orbeon-insee/services/get-parameters.xpl similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/services/get-parameters.xpl rename to content/WEB-INF/orbeon-insee/services/get-parameters.xpl diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/healthcheck.xpl b/content/WEB-INF/orbeon-insee/services/healthcheck.xpl similarity index 99% rename from insee-overload/common/WEB-INF/orbeon-insee/services/healthcheck.xpl rename to content/WEB-INF/orbeon-insee/services/healthcheck.xpl index 9130bdf5..ff5e3c75 100644 --- a/insee-overload/common/WEB-INF/orbeon-insee/services/healthcheck.xpl +++ b/content/WEB-INF/orbeon-insee/services/healthcheck.xpl @@ -304,9 +304,9 @@ -
Tomcat Orbeon: OK
+
To Or: OK
-

Base eXist Orbeon:

+

Ba eX Or:

  • -

    Base eXist Pilotage:

    +

    Ba eX Pi:

  • + + + + + + + + + + + + + + + + + + + + + + +
    + Content-Disposition + + + + + + + + + + +
    +     +     +     +     + +     + +     diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/personalization/README.md b/content/WEB-INF/orbeon-insee/services/personalization/README.md similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/services/personalization/README.md rename to content/WEB-INF/orbeon-insee/services/personalization/README.md diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/personalization/caractereDanois.xsl b/content/WEB-INF/orbeon-insee/services/personalization/caractereDanois.xsl similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/services/personalization/caractereDanois.xsl rename to content/WEB-INF/orbeon-insee/services/personalization/caractereDanois.xsl diff --git a/content/WEB-INF/orbeon-insee/services/personalization/initialisation.xsl b/content/WEB-INF/orbeon-insee/services/personalization/initialisation.xsl new file mode 100644 index 00000000..cc512115 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/services/personalization/initialisation.xsl @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/personalization/personalization.xpl b/content/WEB-INF/orbeon-insee/services/personalization/personalization.xpl similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/services/personalization/personalization.xpl rename to content/WEB-INF/orbeon-insee/services/personalization/personalization.xpl diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/personalization/personalization.xsl b/content/WEB-INF/orbeon-insee/services/personalization/personalization.xsl similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/services/personalization/personalization.xsl rename to content/WEB-INF/orbeon-insee/services/personalization/personalization.xsl diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/preprocessing/README.md b/content/WEB-INF/orbeon-insee/services/preprocessing/README.md similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/services/preprocessing/README.md rename to content/WEB-INF/orbeon-insee/services/preprocessing/README.md diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/preprocessing/readonly.xsl b/content/WEB-INF/orbeon-insee/services/preprocessing/readonly.xsl similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/services/preprocessing/readonly.xsl rename to content/WEB-INF/orbeon-insee/services/preprocessing/readonly.xsl diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/preprocessing/xforms-preprocessing.xpl b/content/WEB-INF/orbeon-insee/services/preprocessing/xforms-preprocessing.xpl similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/services/preprocessing/xforms-preprocessing.xpl rename to content/WEB-INF/orbeon-insee/services/preprocessing/xforms-preprocessing.xpl diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/redirect.xpl b/content/WEB-INF/orbeon-insee/services/redirect.xpl similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/services/redirect.xpl rename to content/WEB-INF/orbeon-insee/services/redirect.xpl diff --git a/insee-overload/common/WEB-INF/orbeon-insee/xhtml/erreur.xhtml b/content/WEB-INF/orbeon-insee/xhtml/erreur.xhtml similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/xhtml/erreur.xhtml rename to content/WEB-INF/orbeon-insee/xhtml/erreur.xhtml diff --git a/insee-overload/common/WEB-INF/orbeon-insee/xhtml/healthcheck.xhtml b/content/WEB-INF/orbeon-insee/xhtml/healthcheck.xhtml similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-insee/xhtml/healthcheck.xhtml rename to content/WEB-INF/orbeon-insee/xhtml/healthcheck.xhtml diff --git a/content/WEB-INF/orbeon-insee/xslfo/common.xsl b/content/WEB-INF/orbeon-insee/xslfo/common.xsl new file mode 100644 index 00000000..5bd691ad --- /dev/null +++ b/content/WEB-INF/orbeon-insee/xslfo/common.xsl @@ -0,0 +1,1014 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Questionnaire + + + expédié le + + + + non expédié + + + + + + + Identifiant : + + + + + + + + + Ce récapitulatif pdf de votre questionnaire vaut preuve d'envoi. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Coché + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/content/WEB-INF/orbeon-insee/xslfo/eap.xsl b/content/WEB-INF/orbeon-insee/xslfo/eap.xsl new file mode 100644 index 00000000..90f35368 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/xslfo/eap.xsl @@ -0,0 +1,1367 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Coché + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/content/WEB-INF/orbeon-insee/xslfo/emb.xsl b/content/WEB-INF/orbeon-insee/xslfo/emb.xsl new file mode 100644 index 00000000..99f3506b --- /dev/null +++ b/content/WEB-INF/orbeon-insee/xslfo/emb.xsl @@ -0,0 +1,403 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Coché + + + + + + + diff --git a/content/WEB-INF/orbeon-insee/xslfo/esa.xsl b/content/WEB-INF/orbeon-insee/xslfo/esa.xsl new file mode 100644 index 00000000..29fdee35 --- /dev/null +++ b/content/WEB-INF/orbeon-insee/xslfo/esa.xsl @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/content/WEB-INF/orbeon-insee/xslfo/esem.xsl b/content/WEB-INF/orbeon-insee/xslfo/esem.xsl new file mode 100644 index 00000000..8a84e8ea --- /dev/null +++ b/content/WEB-INF/orbeon-insee/xslfo/esem.xsl @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/insee-overload/default/WEB-INF/orbeon-insee/xslfo/parametres.xsl b/content/WEB-INF/orbeon-insee/xslfo/parametres.xsl similarity index 80% rename from insee-overload/default/WEB-INF/orbeon-insee/xslfo/parametres.xsl rename to content/WEB-INF/orbeon-insee/xslfo/parametres.xsl index 5a888a24..1d40478c 100644 --- a/insee-overload/default/WEB-INF/orbeon-insee/xslfo/parametres.xsl +++ b/content/WEB-INF/orbeon-insee/xslfo/parametres.xsl @@ -6,12 +6,14 @@ xmlns:xhtml="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xs" version="2.0"> - + #F3FAFE - #3D5B77 + + #3D5B77 + #FFFFFF + transparent - diff --git a/content/WEB-INF/orbeon-insee/xslfo/prod.xsl b/content/WEB-INF/orbeon-insee/xslfo/prod.xsl new file mode 100644 index 00000000..1e704f4d --- /dev/null +++ b/content/WEB-INF/orbeon-insee/xslfo/prod.xsl @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/insee-overload/common/WEB-INF/orbeon-overload/apps/fr/theme.xsl b/content/WEB-INF/orbeon-overload/apps/fr/theme.xsl similarity index 100% rename from insee-overload/common/WEB-INF/orbeon-overload/apps/fr/theme.xsl rename to content/WEB-INF/orbeon-overload/apps/fr/theme.xsl diff --git a/content/WEB-INF/resources/apps/context/README.txt b/content/WEB-INF/resources/apps/context/README.txt new file mode 100644 index 00000000..3f301472 --- /dev/null +++ b/content/WEB-INF/resources/apps/context/README.txt @@ -0,0 +1 @@ +This is the "context" application, which shows how various application listeners can be implemented. \ No newline at end of file diff --git a/content/WEB-INF/resources/apps/context/context-destroyed.xpl b/content/WEB-INF/resources/apps/context/context-destroyed.xpl new file mode 100644 index 00000000..fbaa1a05 --- /dev/null +++ b/content/WEB-INF/resources/apps/context/context-destroyed.xpl @@ -0,0 +1,35 @@ + + + + + + + Context destroyed. + + + + + + + + + Task Scheduled From Context Initialization Pipeline + + + + + + diff --git a/content/WEB-INF/resources/apps/context/context-initialized.xpl b/content/WEB-INF/resources/apps/context/context-initialized.xpl new file mode 100644 index 00000000..b672063d --- /dev/null +++ b/content/WEB-INF/resources/apps/context/context-initialized.xpl @@ -0,0 +1,57 @@ + + + + + + + Context initialized. + + + + + + + + scheduler-test-data + application + + + + + + This is a document stored into the application context. + + + + + + + + + + + Task Scheduled From Context Initialization Pipeline + now + 3600000 + true + oxf:pipeline + + + + + + + diff --git a/content/WEB-INF/resources/apps/context/portlet-destroyed.xpl b/content/WEB-INF/resources/apps/context/portlet-destroyed.xpl new file mode 100644 index 00000000..5d1605b5 --- /dev/null +++ b/content/WEB-INF/resources/apps/context/portlet-destroyed.xpl @@ -0,0 +1,24 @@ + + + + + + + Portlet initialized. + + + + diff --git a/content/WEB-INF/resources/apps/context/portlet-initialized.xpl b/content/WEB-INF/resources/apps/context/portlet-initialized.xpl new file mode 100644 index 00000000..5d1605b5 --- /dev/null +++ b/content/WEB-INF/resources/apps/context/portlet-initialized.xpl @@ -0,0 +1,24 @@ + + + + + + + Portlet initialized. + + + + diff --git a/content/WEB-INF/resources/apps/context/scheduled-task.xpl b/content/WEB-INF/resources/apps/context/scheduled-task.xpl new file mode 100644 index 00000000..0c62b3fb --- /dev/null +++ b/content/WEB-INF/resources/apps/context/scheduled-task.xpl @@ -0,0 +1,47 @@ + + + + + + + Running task... + + + + + + + + scheduler-test-data + application + + + + + + + + + + + + + + Task done. + + + + diff --git a/content/WEB-INF/resources/apps/context/servlet-destroyed.xpl b/content/WEB-INF/resources/apps/context/servlet-destroyed.xpl new file mode 100644 index 00000000..c91d8466 --- /dev/null +++ b/content/WEB-INF/resources/apps/context/servlet-destroyed.xpl @@ -0,0 +1,24 @@ + + + + + + + Servlet destroyed. + + + + diff --git a/content/WEB-INF/resources/apps/context/servlet-initialized.xpl b/content/WEB-INF/resources/apps/context/servlet-initialized.xpl new file mode 100644 index 00000000..944f84a7 --- /dev/null +++ b/content/WEB-INF/resources/apps/context/servlet-initialized.xpl @@ -0,0 +1,24 @@ + + + + + + + Servlet initialized. + + + + diff --git a/content/WEB-INF/resources/apps/context/session-created.xpl b/content/WEB-INF/resources/apps/context/session-created.xpl new file mode 100644 index 00000000..09cad179 --- /dev/null +++ b/content/WEB-INF/resources/apps/context/session-created.xpl @@ -0,0 +1,37 @@ + + + + + + Session created. + + + + + + + test-session-creation + session + + + + + This is a document stored in the session at creation time. + + + + + diff --git a/content/WEB-INF/resources/apps/context/session-destroyed.xpl b/content/WEB-INF/resources/apps/context/session-destroyed.xpl new file mode 100644 index 00000000..e55675a0 --- /dev/null +++ b/content/WEB-INF/resources/apps/context/session-destroyed.xpl @@ -0,0 +1,23 @@ + + + + + + Session destroyed. + + + + diff --git a/content/WEB-INF/resources/config/README.txt b/content/WEB-INF/resources/config/README.txt new file mode 100644 index 00000000..533bd416 --- /dev/null +++ b/content/WEB-INF/resources/config/README.txt @@ -0,0 +1,2 @@ +This directory contains files necessary to the good working of Orbeon Forms applications but modifiable by developers of +Orbeon Forms applications. diff --git a/content/WEB-INF/resources/config/form-builder-permissions.xml b/content/WEB-INF/resources/config/form-builder-permissions.xml new file mode 100644 index 00000000..fcb83049 --- /dev/null +++ b/content/WEB-INF/resources/config/form-builder-permissions.xml @@ -0,0 +1,44 @@ + + + + diff --git a/content/WEB-INF/resources/config/log4j2.xml b/content/WEB-INF/resources/config/log4j2.xml new file mode 100644 index 00000000..ff0322d6 --- /dev/null +++ b/content/WEB-INF/resources/config/log4j2.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/content/WEB-INF/resources/config/not-found.xhtml b/content/WEB-INF/resources/config/not-found.xhtml new file mode 100644 index 00000000..33f29b02 --- /dev/null +++ b/content/WEB-INF/resources/config/not-found.xhtml @@ -0,0 +1,25 @@ + + + + + Orbeon Forms - Page Not Found + + +

    Orbeon Forms - Page Not Found

    +

    + We are sorry, but the resource you have requested is not available on this server. +

    + + diff --git a/content/WEB-INF/resources/config/properties-local.xml.template b/content/WEB-INF/resources/config/properties-local.xml.template new file mode 100644 index 00000000..82b9031e --- /dev/null +++ b/content/WEB-INF/resources/config/properties-local.xml.template @@ -0,0 +1,9 @@ + + + + diff --git a/content/WEB-INF/resources/config/theme-error.xsl b/content/WEB-INF/resources/config/theme-error.xsl new file mode 100644 index 00000000..93189dd2 --- /dev/null +++ b/content/WEB-INF/resources/config/theme-error.xsl @@ -0,0 +1,17 @@ + + + + + diff --git a/content/WEB-INF/resources/config/theme-examples.xsl b/content/WEB-INF/resources/config/theme-examples.xsl new file mode 100644 index 00000000..31faf50e --- /dev/null +++ b/content/WEB-INF/resources/config/theme-examples.xsl @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/content/WEB-INF/resources/config/theme-plain.xsl b/content/WEB-INF/resources/config/theme-plain.xsl new file mode 100644 index 00000000..a43dd92f --- /dev/null +++ b/content/WEB-INF/resources/config/theme-plain.xsl @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/content/WEB-INF/resources/config/unauthorized.xhtml b/content/WEB-INF/resources/config/unauthorized.xhtml new file mode 100644 index 00000000..e2bb46ec --- /dev/null +++ b/content/WEB-INF/resources/config/unauthorized.xhtml @@ -0,0 +1,25 @@ + + + + + Orbeon Forms - Unauthorized + + +

    Orbeon Forms - Unauthorized

    +

    + You do not have access to this page. +

    + + diff --git a/content/WEB-INF/web.xml b/content/WEB-INF/web.xml new file mode 100644 index 00000000..a188aad8 --- /dev/null +++ b/content/WEB-INF/web.xml @@ -0,0 +1,493 @@ + + + Orbeon Forms + Orbeon Forms is an open source, standard-based web forms solution, which includes + Form Builder, a WYSIWYG browser-based authoring tool, and Form Runner, a runtime environment + which facilitates the deployment and integration of a large number of complex forms. Orbeon + Forms implements different technologies, such as XForms and Ajax, with no need for + client-side software or plug-ins. + + + oxf.resources.factory + org.orbeon.oxf.resources.PriorityResourceManagerFactory + + + + + oxf.resources.priority.0 + org.orbeon.oxf.resources.FilesystemResourceManagerFactory + + + oxf.resources.priority.0.oxf.resources.filesystem.sandbox-directory + /opt/tomcat/webapps + + + + + + + + oxf.resources.priority.2 + org.orbeon.oxf.resources.WebAppResourceManagerFactory + + + oxf.resources.priority.2.oxf.resources.webapp.rootdir + /WEB-INF/orbeon-insee + + + + oxf.resources.priority.3 + org.orbeon.oxf.resources.WebAppResourceManagerFactory + + + oxf.resources.priority.3.oxf.resources.webapp.rootdir + /WEB-INF/resources + + + + oxf.resources.priority.4 + org.orbeon.oxf.resources.WebAppResourceManagerFactory + + + oxf.resources.priority.4.oxf.resources.webapp.rootdir + /WEB-INF/orbeon-overload + + + + oxf.resources.priority.5 + org.orbeon.oxf.resources.ClassLoaderResourceManagerFactory + + + + oxf.run-mode + prod + + + + oxf.properties + oxf:/config/properties-${oxf.run-mode}.xml + + + + oxf.initialize-logging + true + + + + + + + + + + + + + orbeon-exist-filter + org.orbeon.oxf.servlet.TokenSecurityFilter + + + orbeon-exist-filter + /exist/* + REQUEST + FORWARD + + + + + + + orbeon-limiter-filter + org.orbeon.oxf.servlet.LimiterFilter + + + include + (/fr/.*)|(/xforms-server) + + + + exclude + (?!/([^/]+)/service/).+\.(gif|css|pdf|json|js|coffee|map|png|jpg|xsd|htc|ico|swf|html|htm|txt) + + + + + min-threads + 1 + + + num-threads + x1 + + + max-threads + x1 + + + + orbeon-limiter-filter + /* + REQUEST + + + + + + + orbeon-xforms-filter + org.orbeon.oxf.servlet.OrbeonXFormsFilter + + + + + + orbeon-xforms-filter + /xforms-jsp/* + + REQUEST + FORWARD + + + + org.orbeon.oxf.webapp.OrbeonServletContextListener + + + + + org.orbeon.oxf.xforms.ReplicationServletContextListener + + + + org.orbeon.oxf.xforms.XFormsServletContextListener + + + + org.orbeon.oxf.webapp.OrbeonSessionListener + + + + net.sf.ehcache.constructs.web.ShutdownListener + + + + + orbeon-main-servlet + org.orbeon.oxf.servlet.OrbeonServlet + + + oxf.main-processor.name + {http://www.orbeon.com/oxf/processors}pipeline + + + oxf.main-processor.input.config + oxf:/config/prologue-servlet.xpl + + + + oxf.error-processor.name + {http://www.orbeon.com/oxf/processors}page-flow + + + oxf.error-processor.input.controller + oxf:/config/error-page-flow.xml + + + + oxf.http.accept-methods + get,post,head,put,delete + + + + + + + + + orbeon-renderer-servlet + org.orbeon.oxf.servlet.OrbeonServlet + + + oxf.main-processor.name + {http://www.orbeon.com/oxf/processors}page-flow + + + oxf.main-processor.input.controller + oxf:/ops/xforms/xforms-renderer-page-flow.xml + + + + oxf.error-processor.name + {http://www.orbeon.com/oxf/processors}pipeline + + + oxf.error-processor.input.config + oxf:/config/error.xpl + + + + + + + display-chart-servlet + org.jfree.chart.servlet.DisplayChart + + + + + + exist-rest-servlet + org.exist.http.servlets.EXistServlet + + basedir + WEB-INF/ + + + configuration + exist-conf.xml + + + start + true + + + + + + + orbeon-main-servlet + / + + + orbeon-renderer-servlet + /xforms-renderer + + + exist-rest-servlet + /exist/rest/* + + + + + + + + + + + + display-chart-servlet + /chartDisplay + + + + + + + + + + + + All + + All + /* + + + CONFIDENTIAL + + + + + 720 + + + + 403 + /error + + + 404 + /error + + + 500 + /error + + + java.lang.Throwable + /error + + + diff --git a/insee-overload/README.md b/insee-overload/README.md deleted file mode 100644 index df8a78bd..00000000 --- a/insee-overload/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# Orbeon overload - -## common folder - -It is all that is common between the orbeon stromae, "household" and "business" context. - -### Organisation - -- **META-INF** folder - - - context.xml : is used to define where the folder for orbeon proerties is located - -- **WEB-INF** folder - - - **orbeon-insee** folder - - **config** : properties-local.xml : properties orbeon overloaded - - **css** : commonEnglish common css - - **img** : images used in surveys - - **js** : responsive.js : js script to make the burger menu responsive (import by theme.xsl) - - **services** : xpl pipeline used by orbeon - - **xhtml** : error.xhtml : error page - - **xslfo** : xsl sheet applied to surveys - -* **orbeon-overload > apps > fr** folder - - error-dialog.xml : overload of the inactivity window (overloads all error windows it seems to me) - - theme.xsl : overload the orbeon theme (transfo xsl executed just before rendering the xhtml -> html) - -## default folder - -A single folder : WEB-INF - -- Adding the file **web.xml** -- Adding the file **keycloak.json** (for business et household only) -- Adding the file orbeon-insee > **page-flow.xml** : file to describe which pipeline(s) to use according to the uri (the path). diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/pdf/send.xpl b/insee-overload/common/WEB-INF/orbeon-insee/services/pdf/send.xpl deleted file mode 100644 index 5e659a54..00000000 --- a/insee-overload/common/WEB-INF/orbeon-insee/services/pdf/send.xpl +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/insee-overload/common/WEB-INF/orbeon-insee/services/personalization/initialisation.xsl b/insee-overload/common/WEB-INF/orbeon-insee/services/personalization/initialisation.xsl deleted file mode 100644 index f021614f..00000000 --- a/insee-overload/common/WEB-INF/orbeon-insee/services/personalization/initialisation.xsl +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/insee-overload/default/WEB-INF/orbeon-insee/xslfo/common.xsl b/insee-overload/default/WEB-INF/orbeon-insee/xslfo/common.xsl deleted file mode 100644 index ee76b6b2..00000000 --- a/insee-overload/default/WEB-INF/orbeon-insee/xslfo/common.xsl +++ /dev/null @@ -1,440 +0,0 @@ -f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Questionnaire - - - expédié le - - - - non expédié - - - - - - - Identifiant : - - - - - - - - - Ce récapitulatif pdf de votre questionnaire vaut preuve d'envoi. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Coché - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/insee-overload/default/WEB-INF/web.xml b/insee-overload/default/WEB-INF/web.xml deleted file mode 100644 index c30de337..00000000 --- a/insee-overload/default/WEB-INF/web.xml +++ /dev/null @@ -1,272 +0,0 @@ - - - Orbeon Forms - - Orbeon Forms is an open source, standard-based web forms solution, which includes - Form Builder, a WYSIWYG browser-based authoring tool, and Form Runner, a runtime environment - which facilitates the deployment and integration of a large number of complex forms. Orbeon - Forms implements different technologies, such as XForms and Ajax, with no need for - client-side software or plug-ins. - - - oxf.resources.factory - org.orbeon.oxf.resources.PriorityResourceManagerFactory - - - - - - oxf.resources.priority.2 - org.orbeon.oxf.resources.WebAppResourceManagerFactory - - - oxf.resources.priority.2.oxf.resources.webapp.rootdir - /WEB-INF/orbeon-insee - - - - oxf.resources.priority.3 - org.orbeon.oxf.resources.WebAppResourceManagerFactory - - - oxf.resources.priority.3.oxf.resources.webapp.rootdir - /WEB-INF/resources - - - - oxf.resources.priority.4 - org.orbeon.oxf.resources.WebAppResourceManagerFactory - - - oxf.resources.priority.4.oxf.resources.webapp.rootdir - /WEB-INF/orbeon-overload - - - - oxf.resources.priority.5 - org.orbeon.oxf.resources.ClassLoaderResourceManagerFactory - - - - oxf.run-mode - dev - - - - oxf.properties - oxf:/config/properties-${oxf.run-mode}.xml - - - - oxf.initialize-logging - true - - - - - - orbeon-exist-filter - org.orbeon.oxf.servlet.TokenSecurityFilter - - - orbeon-exist-filter - /exist/* - REQUEST - FORWARD - - - - - - orbeon-limiter-filter - org.orbeon.oxf.servlet.LimiterFilter - - - include - (/fr/.*)|(/xforms-server) - - - - exclude - (?!/([^/]+)/service/).+\.(gif|css|pdf|json|js|coffee|map|png|jpg|xsd|htc|ico|swf|html|htm|txt) - - - - - min-threads - 1 - - - num-threads - x1 - - - max-threads - x1 - - - - orbeon-limiter-filter - /* - REQUEST - - - - - orbeon-form-runner-auth-servlet-filter - org.orbeon.oxf.servlet.FormRunnerAuthFilter - - - orbeon-form-runner-auth-servlet-filter - /* - REQUEST - FORWARD - - - - orbeon-xforms-filter - org.orbeon.oxf.servlet.OrbeonXFormsFilter - - - orbeon-xforms-filter - /xforms-jsp/* - - REQUEST - FORWARD - - - - org.orbeon.oxf.webapp.OrbeonServletContextListener - - - - - org.orbeon.oxf.xforms.ReplicationServletContextListener - - - - org.orbeon.oxf.xforms.XFormsServletContextListener - - - - org.orbeon.oxf.webapp.OrbeonSessionListener - - - - net.sf.ehcache.constructs.web.ShutdownListener - - - - - orbeon-main-servlet - org.orbeon.oxf.servlet.OrbeonServlet - - - oxf.main-processor.name - {http://www.orbeon.com/oxf/processors}pipeline - - - oxf.main-processor.input.config - oxf:/config/prologue-servlet.xpl - - - - oxf.error-processor.name - {http://www.orbeon.com/oxf/processors}page-flow - - - oxf.error-processor.input.controller - oxf:/config/error-page-flow.xml - - - - oxf.http.accept-methods - get,post,head,put,delete,lock,unlock - - - - - - orbeon-renderer-servlet - org.orbeon.oxf.servlet.OrbeonServlet - - - oxf.main-processor.name - {http://www.orbeon.com/oxf/processors}page-flow - - - oxf.main-processor.input.controller - oxf:/ops/xforms/xforms-renderer-page-flow.xml - - - - oxf.error-processor.name - {http://www.orbeon.com/oxf/processors}pipeline - - - oxf.error-processor.input.config - oxf:/config/error.xpl - - - - - exist-rest-servlet - org.exist.http.servlets.EXistServlet - - basedir - WEB-INF/ - - - configuration - exist-conf.xml - - - start - true - - - - - orbeon-main-servlet - / - - - - orbeon-renderer-servlet - /xforms-renderer - - - - exist-rest-servlet - /exist/rest/* - - - - 720 - - - - diff --git a/pom.xml b/pom.xml index 23eb88f9..d9517abe 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 fr.insee stromae - 1.3.7 + 5.0.0 pom Stromae @@ -17,6 +17,29 @@ + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + copy-resources + process-resources + + resources + + + ${project.build.directory}/content + + + ${project.basedir}/content + true + + + + + + maven-assembly-plugin @@ -29,7 +52,7 @@ make-assembly - install + package single diff --git a/script/env.sh b/script/env.sh deleted file mode 100644 index cddfdb1c..00000000 --- a/script/env.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -envsubst < "$CATALINA_HOME/webapps/properties/config/properties-local-dev.xml" > "$CATALINA_HOME/webapps/properties/config/props.temp" -mv "$CATALINA_HOME/webapps/properties/config/props.temp" "$CATALINA_HOME/webapps/properties/config/properties-local-dev.xml" diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh new file mode 100644 index 00000000..3a82b886 --- /dev/null +++ b/scripts/entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/bash +PATH_TO_PROPS_FILE=$CATALINA_HOME/webapps/properties/config/properties-local-prod.xml +sed -i "s^\$STROMAE_HOST^$STROMAE_HOST^g" $PATH_TO_PROPS_FILE +sed -i "s^\$STROMAE_DB_URL^$STROMAE_DB_URL^g" $PATH_TO_PROPS_FILE +sed -i "s^\$ORBEON_EXIST_COLLECTION^$ORBEON_EXIST_COLLECTION^g" $PATH_TO_PROPS_FILE +sed -i "s^\$ORBEON_EXIST^$ORBEON_EXIST^g" $PATH_TO_PROPS_FILE +echo $ORBEON_LICENSE > /home/tomcat/.orbeon/license.xml + diff --git a/script/getCleanedOrbeon.sh b/scripts/get-cleaned-orbeon.sh similarity index 79% rename from script/getCleanedOrbeon.sh rename to scripts/get-cleaned-orbeon.sh index 3c47b0d0..bbfbc928 100644 --- a/script/getCleanedOrbeon.sh +++ b/scripts/get-cleaned-orbeon.sh @@ -7,25 +7,9 @@ set -e ORBEON_URL="$1" -USE_INSEE_PROXY="$2" ORBEON_FILE_NAME=$(basename -s .zip $ORBEON_URL) ORBEON_SOURCE_FOLDER=orbeon-source - - -function setUpInseeProxy(){ - echo "Set Insee Proxy" - export http_proxy="$INSEE_HTTP_PROXY" - export https_proxy="$INSEE_HTTPS_PROXY" -} - -function setUp(){ - if [ "$USE_INSEE_PROXY" = true ] - then - setUpInseeProxy - fi -} - function downloadOrbeonAndUnZip(){ echo "Download orbeon source from GitHub" curl -L $ORBEON_URL -o orbeon.zip @@ -52,9 +36,8 @@ function cleanOrbeon(){ } function main(){ - setUp && downloadOrbeonAndUnZip && cleanOrbeon + downloadOrbeonAndUnZip && cleanOrbeon } main -