diff --git a/Jenkinsfile b/Jenkinsfile index db5c9578..83732257 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { } agent { docker { - image 'silverpeas/silverbuild' + image 'silverpeas/silverbuild:6.4-JR' args ''' -v $HOME/.m2:/home/silverbuild/.m2 -v $HOME/.gitconfig:/home/silverbuild/.gitconfig @@ -72,16 +72,19 @@ pipeline { } steps { script { + String jdkHome = sh(script: 'echo ${SONAR_JDK_HOME}', returnStdout: true).trim() withSonarQubeEnv { sh """ - mvn ${SONAR_MAVEN_GOAL} -Dsonar.projectKey=Silverpeas_Silverpeas-Looks \\ + JAVA_HOME=$jdkHome mvn ${SONAR_MAVEN_GOAL} \\ + -Dsonar.projectKey=Silverpeas_Silverpeas-Looks \\ -Dsonar.organization=silverpeas \\ -Dsonar.pullrequest.branch=${env.BRANCH_NAME} \\ -Dsonar.pullrequest.key=${env.CHANGE_ID} \\ -Dsonar.pullrequest.base=master \\ -Dsonar.pullrequest.provider=github \\ -Dsonar.host.url=${SONAR_HOST_URL} \\ - -Dsonar.login=${SONAR_AUTH_TOKEN} + -Dsonar.login=${SONAR_AUTH_TOKEN} \\ + -Dsonar.scanner.force-deprecated-java-version=true """ } timeout(time: 30, unit: 'MINUTES') { diff --git a/aurora/aurora-configuration/pom.xml b/aurora/aurora-configuration/pom.xml index 87b67093..6468ebb5 100644 --- a/aurora/aurora-configuration/pom.xml +++ b/aurora/aurora-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.looks</groupId> <artifactId>aurora</artifactId> - <version>6.4-SNAPSHOT</version> + <version>6.4-JR-SNAPSHOT</version> </parent> <groupId>org.silverpeas.looks.aurora</groupId> diff --git a/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/data.xml b/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/data.xml index b4587226..9df48d3d 100644 --- a/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/data.xml +++ b/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/data.xml @@ -92,7 +92,123 @@ <isDisabled>false</isDisabled> <isHidden>false</isHidden> <label> - <labelName>Actualités</labelName> + <labelName>Afficher</labelName> + <language>fr</language> + </label> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsZone</fieldName> + <displayerName>radio</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Emplacement</labelName> + <language>fr</language> + </label> + <parameter> + <name>keys</name> + <value lang="fr">main##right</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Zone principale##Colonne de droite</value> + </parameter> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">right</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsRenderingType</fieldName> + <displayerName>radio</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Présentation</labelName> + <language>fr</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">list##carousel</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Liste##Carrousel</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">carousel</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsLimit</fieldName> + <displayerName>text</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Nombre d'actualité</labelName> + <language>fr</language> + </label> + <parameter> + <name>maxLength</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">5</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsOfSubSpaces</fieldName> + <displayerName>radio</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Prendre en compte les sous-espaces</labelName> <language>fr</language> </label> <parameter> @@ -107,6 +223,42 @@ <name>values</name> <value lang="fr">Oui##Non</value> </parameter> + <parameter> + <name>default</name> + <value lang="fr">1</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsImportantOnly</fieldName> + <displayerName>radio</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Importantes seulement</labelName> + <language>fr</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">0</value> + </parameter> <isSearchable>false</isSearchable> <isFacet>false</isFacet> <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> @@ -901,55 +1053,135 @@ <typeName>file</typeName> </fieldTemplate> <fieldTemplate> - <fieldName>secondPictureLink</fieldName> - <displayerName>url</displayerName> - <isMandatory>false</isMandatory> - <isReadOnly>false</isReadOnly> - <isDisabled>false</isDisabled> - <isHidden>false</isHidden> - <label> - <labelName>Image secondaire - Lien</labelName> - <language>fr</language> - </label> - <label> - <labelName>Second picture - Lien</labelName> - <language>en</language> - </label> - <isSearchable>false</isSearchable> - <isFacet>false</isFacet> - <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> - <typeName>text</typeName> - </fieldTemplate> - <fieldTemplate> - <fieldName>newUsers</fieldName> - <displayerName>radio</displayerName> - <isMandatory>false</isMandatory> - <isReadOnly>false</isReadOnly> - <isDisabled>false</isDisabled> - <isHidden>false</isHidden> - <label> - <labelName>Nouveaux utilisateurs</labelName> - <language>fr</language> - </label> - <label> - <labelName>New users</labelName> - <language>en</language> - </label> - <parameter> - <name>cols</name> - <value lang="fr">2</value> - </parameter> - <parameter> - <name>keys</name> - <value lang="fr">1##0</value> - </parameter> - <parameter> - <name>values</name> - <value lang="fr">Oui##Non</value> - </parameter> - <isSearchable>false</isSearchable> - <isFacet>false</isFacet> - <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> - <typeName>text</typeName> + <fieldName>secondPictureLink</fieldName> + <displayerName>url</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Image secondaire - Lien</labelName> + <language>fr</language> + </label> + <label> + <labelName>Second picture - Lien</labelName> + <language>en</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newUsers</fieldName> + <displayerName>radio</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Nouveaux utilisateurs</labelName> + <language>fr</language> + </label> + <label> + <labelName>New users</labelName> + <language>en</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>mainFreeContentTitle</fieldName> + <displayerName>text</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Titre</labelName> + <language>fr</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>mainFreeContentValue</fieldName> + <displayerName>wysiwyg</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Contenu</labelName> + <language>fr</language> + </label> + <parameter> + <name>galleries</name> + <value lang="fr">true</value> + </parameter> + <parameter> + <name>fileStorages</name> + <value lang="fr">true</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>rightFreeContentTitle</fieldName> + <displayerName>text</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Titre</labelName> + <language>fr</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>rightFreeContentValue</fieldName> + <displayerName>wysiwyg</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Contenu</labelName> + <language>fr</language> + </label> + <parameter> + <name>galleries</name> + <value lang="fr">true</value> + </parameter> + <parameter> + <name>fileStorages</name> + <value lang="fr">true</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> </fieldTemplate> </recordTemplate> diff --git a/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/searchresult.xml b/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/searchresult.xml index 15caa9f6..aff043e0 100644 --- a/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/searchresult.xml +++ b/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/searchresult.xml @@ -92,7 +92,123 @@ <isDisabled>false</isDisabled> <isHidden>false</isHidden> <label> - <labelName>Actualités</labelName> + <labelName>Afficher</labelName> + <language>fr</language> + </label> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsZone</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Emplacement</labelName> + <language>fr</language> + </label> + <parameter> + <name>keys</name> + <value lang="fr">main##right</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Zone principale##Colonne de droite</value> + </parameter> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">right</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsRenderingType</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Présentation</labelName> + <language>fr</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">list##carousel</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Liste##Carrousel</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">carousel</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsLimit</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Nombre d'actualité</labelName> + <language>fr</language> + </label> + <parameter> + <name>maxLength</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">5</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsOfSubSpaces</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Prendre en compte les sous-espaces</labelName> <language>fr</language> </label> <parameter> @@ -107,6 +223,42 @@ <name>values</name> <value lang="fr">Oui##Non</value> </parameter> + <parameter> + <name>default</name> + <value lang="fr">1</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsImportantOnly</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Importantes seulement</labelName> + <language>fr</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">0</value> + </parameter> <isSearchable>false</isSearchable> <isFacet>false</isFacet> <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> @@ -191,17 +343,13 @@ <labelName>Taxonomy</labelName> <language>en</language> </label> - <parameter> - <name>cols</name> - <value lang="fr">2</value> - </parameter> <parameter> <name>keys</name> - <value lang="fr">1##0</value> + <value lang="fr">2##1##0</value> </parameter> <parameter> <name>values</name> - <value lang="fr">Oui##Non</value> + <value lang="fr">Oui, sur la plateforme entière##Oui, sur l'espace courant##Non</value> </parameter> <isSearchable>false</isSearchable> <isFacet>false</isFacet> @@ -904,4 +1052,136 @@ <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> <typeName>file</typeName> </fieldTemplate> + <fieldTemplate> + <fieldName>secondPictureLink</fieldName> + <displayerName>url</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>true</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Image secondaire - Lien</labelName> + <language>fr</language> + </label> + <label> + <labelName>Second picture - Lien</labelName> + <language>en</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newUsers</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Nouveaux utilisateurs</labelName> + <language>fr</language> + </label> + <label> + <labelName>New users</labelName> + <language>en</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>mainFreeContentTitle</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Titre</labelName> + <language>fr</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>mainFreeContentValue</fieldName> + <displayerName>wysiwyg</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>true</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Contenu</labelName> + <language>fr</language> + </label> + <parameter> + <name>galleries</name> + <value lang="fr">true</value> + </parameter> + <parameter> + <name>fileStorages</name> + <value lang="fr">true</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>rightFreeContentTitle</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Titre</labelName> + <language>fr</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>rightFreeContentValue</fieldName> + <displayerName>wysiwyg</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>true</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Contenu</labelName> + <language>fr</language> + </label> + <parameter> + <name>galleries</name> + <value lang="fr">true</value> + </parameter> + <parameter> + <name>fileStorages</name> + <value lang="fr">true</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> </recordTemplate> diff --git a/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/update.html b/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/update.html index ab56e876..9611e42b 100644 --- a/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/update.html +++ b/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/update.html @@ -1,276 +1,436 @@ -<link href='/silverpeas/util/styleSheets/fieldset.css?v=61SNAPSHOT' type='text/css' rel='stylesheet'/> - <fieldset class="skinFieldset"> - <legend class="without-img">Introduction</legend> - <div class="fields"> - <div class="field field_picture entireWidth " id="form-row-picture"> - <label for="picture" class="txtlibform"><%=picture.label%></label> - <div class="fieldInput"> - <%=picture%> - </div> - </div> - <div class="field field_intro entireWidth" id="form-row-intro"> - <label for="intro" class="txtlibform"><%=intro.label%></label> - <div class="fieldInput champs"> - <%=intro%> - </div> - </div> - </div> - </fieldset> - <fieldset class="skinFieldset"> - <legend class="without-img">Navigation</legend> - <div class="fields"> - <div class="field field_displaySubspaces" id="form-row-displaySubspaces"> - <label for="displaySubspaces" class="txtlibform"><%=displaySubspaces.label%></label> - <div class="fieldInput champs"> - <%=displaySubspaces%> - </div> - </div> - <div class="field field_displayApps" id="form-row-displayApps"> - <label for="displayApps" class="txtlibform"><%=displayApps.label%></label> - <div class="fieldInput champs"> - <%=displayApps%> - </div> - </div> - </div> - </fieldset> - <fieldset class="skinFieldset"> - <legend class="without-img">Blocs principaux (gauche)</legend> - <div class="fields"> - <div class="field field_latestPublications" id="form-row-latestPublications"> - <label for="latestPublications" class="txtlibform"><%=latestPublications.label%></label> - <div class="fieldInput champs"> - <%=latestPublications%> - </div> - </div> - <br class="clear" /> - <div class="field field_newUsers" id="form-row-newUsers"> - <label for="newUsers" class="txtlibform"><%=newUsers.label%></label> - <div class="fieldInput champs"> - <%=newUsers%> - </div> - </div> - </div> - </fieldset> - <fieldset class="skinFieldset"> - <legend class="without-img">Blocs de droite</legend> - <div class="fields"> - <div class="field field_secondPicture entireWidth " id="form-row-secondPicture"> - <label for="secondPicture" class="txtlibform"><%=secondPicture.label%></label> - <div class="fieldInput "> - <%=secondPicture%> - </div> - </div> - <div class="field field_secondPictureLink entireWidth " id="form-row-secondPictureLink"> - <label for="secondPictureLink" class="txtlibform"><%=secondPictureLink.label%></label> - <div class="fieldInput "> - <%=secondPictureLink%> - </div> - </div> - <hr class="clear" /> - <div class="field field_displayAdmins" id="form-row-displayAdmins"> - <label for="displayAdmins" class="txtlibform"><%=displayAdmins.label%></label> - <div class="fieldInput champs"> - <%=displayAdmins%> - </div> - </div> - <div class="field field_displayNews" id="form-row-displayNews"> - <label for="displayNews" class="txtlibform"><%=displayNews.label%></label> - <div class="fieldInput champs"> - <%=displayNews%> - </div> - </div> - <div class="field field_displayEvents" id="form-row-displayEvents"> - <label for="displayEvents" class="txtlibform"><%=displayEvents.label%></label> - <div class="fieldInput champs"> - <%=displayEvents%> - </div> - </div> - <div class="field field_displayMedias" id="form-row-displayMedias"> - <label for="displayMedias" class="txtlibform"><%=displayMedias.label%></label> - <div class="fieldInput champs"> - <%=displayMedias%> - </div> - </div> - <div class="field field_displayTasks" id="form-row-displayTasks"> - <label for="displayTasks" class="txtlibform"><%=displayTasks.label%></label> - <div class="fieldInput champs"> - <%=displayTasks%> - </div> - </div> - <div class="field field_displayTaxonomy" id="form-row-displayTaxonomy"> - <label for="displayTaxonomy" class="txtlibform"><%=displayTaxonomy.label%></label> - <div class="fieldInput champs"> - <%=displayTaxonomy%> - </div> - </div> - <hr class="clear" /> - <div class="field"><label class="fields-block-title">Bloc utilisateurs</label></div> - <br class="clear" /> - <div class="field field_usersLabel" id="form-row-usersLabel"> - <label for="usersLabel" class="txtlibform"><%=usersLabel.label%></label> - <div class="fieldInput champs"> - <%=usersLabel%> - </div> - </div> - <div class="field field_users" id="form-row-users"> - <label for="users" class="txtlibform"><%=users.label%></label> - <div class="fieldInput champs"> - <%=users%> - </div> - </div> - </div> - </fieldset> - <fieldset id="pubInfo" class="skinFieldset"> - <legend class="without-img">Les raccourcis</legend> - <div class="fields"> - <div class="field field_shortcutURL1" id="form-row-shortcutURL1"> - <label for="shortcutURL1" class="txtlibform"><%=shortcutURL1.label%></label> - <div class="fieldInput champs"> - <%=shortcutURL1%> - </div> - </div> - <div class="field field_shortcutLabel1" id="form-row-shortcutLabel1"> - <label for="shortcutLabel1" class="txtlibform"><%=shortcutLabel1.label%></label> - <div class="fieldInput champs"> - <%=shortcutLabel1%> - </div> - </div> - <div class="field field_shortcutIcon1" id="form-row-shortcutIcon1"> - <label for="shortcutIcon1" class="txtlibform"><%=shortcutIcon1.label%></label> - <div class="fieldInput"> - <%=shortcutIcon1%> - </div> - </div> - <div class="field field_shortcutTarget1" id="form-row-shortcutTarget1"> - <label for="shortcutTarget1" class="txtlibform"><%=shortcutTarget1.label%></label> - <div class="fieldInput champs"> - <%=shortcutTarget1%> - </div> - </div> - <hr class="clear" /> - <div class="field field_shortcutURL2" id="form-row-shortcutURL2"> - <label for="shortcutURL2" class="txtlibform"><%=shortcutURL2.label%></label> - <div class="fieldInput champs"> - <%=shortcutURL2%> - </div> - </div> - <div class="field field_shortcutLabel2" id="form-row-shortcutLabel2"> - <label for="shortcutLabel2" class="txtlibform"><%=shortcutLabel2.label%></label> - <div class="fieldInput champs"> - <%=shortcutLabel2%> - </div> - </div> - <div class="field field_shortcutIcon2" id="form-row-shortcutIcon2"> - <label for="shortcutIcon2" class="txtlibform"><%=shortcutIcon2.label%></label> - <div class="fieldInput"> - <%=shortcutIcon2%> - </div> - </div> - <div class="field field_shortcutTarget2" id="form-row-shortcutTarget2"> - <label for="shortcutTarget2" class="txtlibform"><%=shortcutTarget2.label%></label> - <div class="fieldInput champs"> - <%=shortcutTarget2%> - </div> - </div> - <hr class="clear" /> - <div class="field field_shortcutURL3" id="form-row-shortcutURL3"> - <label for="shortcutURL3" class="txtlibform"><%=shortcutURL3.label%></label> - <div class="fieldInput champs"> - <%=shortcutURL3%> - </div> - </div> - <div class="field field_shortcutLabel3" id="form-row-shortcutLabel3"> - <label for="shortcutLabel3" class="txtlibform"><%=shortcutLabel3.label%></label> - <div class="fieldInput champs"> - <%=shortcutLabel3%> - </div> - </div> - <div class="field field_shortcutIcon3" id="form-row-shortcutIcon3"> - <label for="shortcutIcon3" class="txtlibform"><%=shortcutIcon3.label%></label> - <div class="fieldInput"> - <%=shortcutIcon3%> - </div> - </div> - <div class="field field_shortcutTarget3" id="form-row-shortcutTarget3"> - <label for="shortcutTarget3" class="txtlibform"><%=shortcutTarget3.label%></label> - <div class="fieldInput champs"> - <%=shortcutTarget3%> - </div> - </div> - <hr class="clear" /> - <div class="field field_shortcutURL4" id="form-row-shortcutURL4"> - <label for="shortcutURL4" class="txtlibform"><%=shortcutURL4.label%></label> - <div class="fieldInput champs"> - <%=shortcutURL4%> - </div> - </div> - <div class="field field_shortcutLabel4" id="form-row-shortcutLabel4"> - <label for="shortcutLabel4" class="txtlibform"><%=shortcutLabel4.label%></label> - <div class="fieldInput champs"> - <%=shortcutLabel4%> - </div> - </div> - <div class="field field_shortcutIcon4" id="form-row-shortcutIcon4"> - <label for="shortcutIcon4" class="txtlibform"><%=shortcutIcon4.label%></label> - <div class="fieldInput"> - <%=shortcutIcon4%> - </div> - </div> - <div class="field field_shortcutTarget4" id="form-row-shortcutTarget4"> - <label for="shortcutTarget4" class="txtlibform"><%=shortcutTarget4.label%></label> - <div class="fieldInput champs"> - <%=shortcutTarget4%> - </div> - </div> - <hr class="clear" /> - <div class="field field_shortcutURL5" id="form-row-shortcutURL5"> - <label for="shortcutURL5" class="txtlibform"><%=shortcutURL5.label%></label> - <div class="fieldInput champs"> - <%=shortcutURL5%> - </div> - </div> - <div class="field field_shortcutLabel5" id="form-row-shortcutLabel5"> - <label for="shortcutLabel5" class="txtlibform"><%=shortcutLabel5.label%></label> - <div class="fieldInput champs"> - <%=shortcutLabel5%> - </div> - </div> - <div class="field field_shortcutIcon5" id="form-row-shortcutIcon5"> - <label for="shortcutIcon5" class="txtlibform"><%=shortcutIcon5.label%></label> - <div class="fieldInput"> - <%=shortcutIcon5%> - </div> - </div> - <div class="field field_shortcutTarget5" id="form-row-shortcutTarget5"> - <label for="shortcutTarget5" class="txtlibform"><%=shortcutTarget5.label%></label> - <div class="fieldInput champs"> - <%=shortcutTarget5%> - </div> - </div> - <hr class="clear" /> - <div class="field field_shortcutURL6" id="form-row-shortcutURL6"> - <label for="shortcutURL6" class="txtlibform"><%=shortcutURL6.label%></label> - <div class="fieldInput champs"> - <%=shortcutURL6%> - </div> - </div> - <div class="field field_shortcutLabel6" id="form-row-shortcutLabel6"> - <label for="shortcutLabel6" class="txtlibform"><%=shortcutLabel6.label%></label> - <div class="fieldInput champs"> - <%=shortcutLabel6%> - </div> - </div> - <div class="field field_shortcutIcon6" id="form-row-shortcutIcon6"> - <label for="shortcutIcon6" class="txtlibform"><%=shortcutIcon6.label%></label> - <div class="fieldInput"> - <%=shortcutIcon6%> - </div> - </div> - <div class="field field_shortcutTarget6" id="form-row-shortcutTarget6"> - <label for="shortcutTarget6" class="txtlibform"><%=shortcutTarget6.label%></label> - <div class="fieldInput champs"> - <%=shortcutTarget6%> - </div> - </div> - </div> - </fieldset> +<link href='/silverpeas/util/styleSheets/fieldset.css?v=64SNAPSHOT' type='text/css' rel='stylesheet'/> +<fieldset class="skinFieldset"> + <legend class="without-img">Introduction</legend> + <div class="fields"> + <div class="field field_picture entireWidth " id="form-row-picture"> + <label for="picture" class="txtlibform"> + <%=picture.label%> + </label> + <div class="fieldInput"> + <%=picture%> + </div> + </div> + <div class="field field_intro entireWidth" id="form-row-intro"> + <label for="intro" class="txtlibform"> + <%=intro.label%> + </label> + <div class="fieldInput champs"> + <%=intro%> + </div> + </div> + </div> +</fieldset> +<fieldset class="skinFieldset"> + <legend class="without-img">Navigation</legend> + <div class="fields"> + <div class="field field_displaySubspaces" id="form-row-displaySubspaces"> + <label for="displaySubspaces" class="txtlibform"> + <%=displaySubspaces.label%> + </label> + <div class="fieldInput champs"> + <%=displaySubspaces%> + </div> + </div> + <div class="field field_displayApps" id="form-row-displayApps"> + <label for="displayApps" class="txtlibform"> + <%=displayApps.label%> + </label> + <div class="fieldInput champs"> + <%=displayApps%> + </div> + </div> + </div> +</fieldset> +<fieldset class="skinFieldset"> + <legend class="without-img">Actualités</legend> + <div class="fields"> + <div class="field field_displayNews" id="form-row-displayNews"> + <label for="displayNews" class="txtlibform"> + <%=displayNews.label%> + </label> + <div class="fieldInput champs"> + <%=displayNews%> + </div> + </div> + <div class="field field_newsZone" id="form-row-newsZone"> + <label for="newsZone" class="txtlibform"> + <%=newsZone.label%> + </label> + <div class="fieldInput champs"> + <%=newsZone%> + </div> + </div> + <div class="field field_newsRenderingType" id="form-row-newsRenderingType"> + <label for="newsRenderingType" class="txtlibform"> + <%=newsRenderingType.label%> + </label> + <div class="fieldInput champs"> + <%=newsRenderingType%> + </div> + </div> + <div class="field field_newsLimit" id="form-row-newsLimit"> + <label for="newsLimit" class="txtlibform"> + <%=newsLimit.label%> + </label> + <div class="fieldInput champs"> + <%=newsLimit%> + </div> + </div> + <div class="field field_newsOfSubSpaces" id="form-row-newsOfSubSpaces"> + <label for="newsOfSubSpaces" class="txtlibform"> + <%=newsOfSubSpaces.label%> + </label> + <div class="fieldInput champs"> + <%=newsOfSubSpaces%> + </div> + </div> + <div class="field field_newsImportantOnly" id="form-row-newsImportantOnly"> + <label for="newsImportantOnly" class="txtlibform"> + <%=newsImportantOnly.label%> + </label> + <div class="fieldInput champs"> + <%=newsImportantOnly%> + </div> + </div> + </div> +</fieldset> +<fieldset class="skinFieldset"> + <legend class="without-img">Blocs principaux (gauche)</legend> + <div class="fields"> + <div class="field field_latestPublications entireWidth " id="form-row-latestPublications"> + <label for="latestPublications" class="txtlibform"> + <%=latestPublications.label%> + </label> + <div class="fieldInput champs"> + <%=latestPublications%> + </div> + </div> + <div class="field field_newUsers entireWidth " id="form-row-newUsers"> + <label for="newUsers" class="txtlibform"> + <%=newUsers.label%> + </label> + <div class="fieldInput champs"> + <%=newUsers%> + </div> + </div> + <hr class="clear"/> + <div class="field"><label class="fields-block-title entireWidth ">Contenu libre</label></div> + <div class="field field_mainFreeContentTitle entireWidth " id="form-row-mainFreeContentTitle"> + <label for="mainFreeContentTitle" class="txtlibform"> + <%=mainFreeContentTitle.label%> + </label> + <div class="fieldInput"> + <%=mainFreeContentTitle%> + </div> + </div> + <div class="field field_mainFreeContentValue entireWidth" id="form-row-mainFreeContentValue"> + <label for="mainFreeContentValue" class="txtlibform"> + <%=mainFreeContentValue.label%> + </label> + <div class="fieldInput champs"> + <%=mainFreeContentValue%> + </div> + </div> + </div> +</fieldset> +<fieldset class="skinFieldset"> + <legend class="without-img">Blocs de droite</legend> + <div class="fields"> + <div class="field field_secondPicture entireWidth " id="form-row-secondPicture"> + <label for="secondPicture" class="txtlibform"> + <%=secondPicture.label%> + </label> + <div class="fieldInput "> + <%=secondPicture%> + </div> + </div> + <div class="field field_secondPictureLink entireWidth " id="form-row-secondPictureLink"> + <label for="secondPictureLink" class="txtlibform"> + <%=secondPictureLink.label%> + </label> + <div class="fieldInput "> + <%=secondPictureLink%> + </div> + </div> + <hr class="clear"/> + <div class="field field_displayAdmins" id="form-row-displayAdmins"> + <label for="displayAdmins" class="txtlibform"> + <%=displayAdmins.label%> + </label> + <div class="fieldInput champs"> + <%=displayAdmins%> + </div> + </div> + <div class="field field_displayEvents" id="form-row-displayEvents"> + <label for="displayEvents" class="txtlibform"> + <%=displayEvents.label%> + </label> + <div class="fieldInput champs"> + <%=displayEvents%> + </div> + </div> + <div class="field field_displayMedias" id="form-row-displayMedias"> + <label for="displayMedias" class="txtlibform"> + <%=displayMedias.label%> + </label> + <div class="fieldInput champs"> + <%=displayMedias%> + </div> + </div> + <div class="field field_displayTasks" id="form-row-displayTasks"> + <label for="displayTasks" class="txtlibform"> + <%=displayTasks.label%> + </label> + <div class="fieldInput champs"> + <%=displayTasks%> + </div> + </div> + <div class="field field_displayTaxonomy" id="form-row-displayTaxonomy"> + <label for="displayTaxonomy" class="txtlibform"> + <%=displayTaxonomy.label%> + </label> + <div class="fieldInput champs"> + <%=displayTaxonomy%> + </div> + </div> + <hr class="clear"/> + <div class="field"><label class="fields-block-title">Bloc utilisateurs</label></div> + <br class="clear"/> + <div class="field field_usersLabel" id="form-row-usersLabel"> + <label for="usersLabel" class="txtlibform"> + <%=usersLabel.label%> + </label> + <div class="fieldInput champs"> + <%=usersLabel%> + </div> + </div> + <div class="field field_users" id="form-row-users"> + <label for="users" class="txtlibform"> + <%=users.label%> + </label> + <div class="fieldInput champs"> + <%=users%> + </div> + </div> + <hr class="clear"/> + <div class="field"><label class="fields-block-title entireWidth ">Contenu libre</label></div> + <div class="field field_rightFreeContentTitle entireWidth " id="form-row-rightFreeContentTitle"> + <label for="rightFreeContentTitle" class="txtlibform"> + <%=rightFreeContentTitle.label%> + </label> + <div class="fieldInput"> + <%=rightFreeContentTitle%> + </div> + </div> + <div class="field field_rightFreeContentValue entireWidth" id="form-row-rightFreeContentValue"> + <label for="rightFreeContentValue" class="txtlibform"> + <%=rightFreeContentValue.label%> + </label> + <div class="fieldInput champs"> + <%=rightFreeContentValue%> + </div> + </div> + </div> +</fieldset> +<fieldset id="pubInfo" class="skinFieldset"> + <legend class="without-img">Les raccourcis</legend> + <div class="fields"> + <div class="field field_shortcutURL1" id="form-row-shortcutURL1"> + <label for="shortcutURL1" class="txtlibform"> + <%=shortcutURL1.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutURL1%> + </div> + </div> + <div class="field field_shortcutLabel1" id="form-row-shortcutLabel1"> + <label for="shortcutLabel1" class="txtlibform"> + <%=shortcutLabel1.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutLabel1%> + </div> + </div> + <div class="field field_shortcutIcon1" id="form-row-shortcutIcon1"> + <label for="shortcutIcon1" class="txtlibform"> + <%=shortcutIcon1.label%> + </label> + <div class="fieldInput"> + <%=shortcutIcon1%> + </div> + </div> + <div class="field field_shortcutTarget1" id="form-row-shortcutTarget1"> + <label for="shortcutTarget1" class="txtlibform"> + <%=shortcutTarget1.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutTarget1%> + </div> + </div> + <hr class="clear"/> + <div class="field field_shortcutURL2" id="form-row-shortcutURL2"> + <label for="shortcutURL2" class="txtlibform"> + <%=shortcutURL2.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutURL2%> + </div> + </div> + <div class="field field_shortcutLabel2" id="form-row-shortcutLabel2"> + <label for="shortcutLabel2" class="txtlibform"> + <%=shortcutLabel2.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutLabel2%> + </div> + </div> + <div class="field field_shortcutIcon2" id="form-row-shortcutIcon2"> + <label for="shortcutIcon2" class="txtlibform"> + <%=shortcutIcon2.label%> + </label> + <div class="fieldInput"> + <%=shortcutIcon2%> + </div> + </div> + <div class="field field_shortcutTarget2" id="form-row-shortcutTarget2"> + <label for="shortcutTarget2" class="txtlibform"> + <%=shortcutTarget2.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutTarget2%> + </div> + </div> + <hr class="clear"/> + <div class="field field_shortcutURL3" id="form-row-shortcutURL3"> + <label for="shortcutURL3" class="txtlibform"> + <%=shortcutURL3.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutURL3%> + </div> + </div> + <div class="field field_shortcutLabel3" id="form-row-shortcutLabel3"> + <label for="shortcutLabel3" class="txtlibform"> + <%=shortcutLabel3.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutLabel3%> + </div> + </div> + <div class="field field_shortcutIcon3" id="form-row-shortcutIcon3"> + <label for="shortcutIcon3" class="txtlibform"> + <%=shortcutIcon3.label%> + </label> + <div class="fieldInput"> + <%=shortcutIcon3%> + </div> + </div> + <div class="field field_shortcutTarget3" id="form-row-shortcutTarget3"> + <label for="shortcutTarget3" class="txtlibform"> + <%=shortcutTarget3.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutTarget3%> + </div> + </div> + <hr class="clear"/> + <div class="field field_shortcutURL4" id="form-row-shortcutURL4"> + <label for="shortcutURL4" class="txtlibform"> + <%=shortcutURL4.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutURL4%> + </div> + </div> + <div class="field field_shortcutLabel4" id="form-row-shortcutLabel4"> + <label for="shortcutLabel4" class="txtlibform"> + <%=shortcutLabel4.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutLabel4%> + </div> + </div> + <div class="field field_shortcutIcon4" id="form-row-shortcutIcon4"> + <label for="shortcutIcon4" class="txtlibform"> + <%=shortcutIcon4.label%> + </label> + <div class="fieldInput"> + <%=shortcutIcon4%> + </div> + </div> + <div class="field field_shortcutTarget4" id="form-row-shortcutTarget4"> + <label for="shortcutTarget4" class="txtlibform"> + <%=shortcutTarget4.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutTarget4%> + </div> + </div> + <hr class="clear"/> + <div class="field field_shortcutURL5" id="form-row-shortcutURL5"> + <label for="shortcutURL5" class="txtlibform"> + <%=shortcutURL5.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutURL5%> + </div> + </div> + <div class="field field_shortcutLabel5" id="form-row-shortcutLabel5"> + <label for="shortcutLabel5" class="txtlibform"> + <%=shortcutLabel5.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutLabel5%> + </div> + </div> + <div class="field field_shortcutIcon5" id="form-row-shortcutIcon5"> + <label for="shortcutIcon5" class="txtlibform"> + <%=shortcutIcon5.label%> + </label> + <div class="fieldInput"> + <%=shortcutIcon5%> + </div> + </div> + <div class="field field_shortcutTarget5" id="form-row-shortcutTarget5"> + <label for="shortcutTarget5" class="txtlibform"> + <%=shortcutTarget5.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutTarget5%> + </div> + </div> + <hr class="clear"/> + <div class="field field_shortcutURL6" id="form-row-shortcutURL6"> + <label for="shortcutURL6" class="txtlibform"> + <%=shortcutURL6.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutURL6%> + </div> + </div> + <div class="field field_shortcutLabel6" id="form-row-shortcutLabel6"> + <label for="shortcutLabel6" class="txtlibform"> + <%=shortcutLabel6.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutLabel6%> + </div> + </div> + <div class="field field_shortcutIcon6" id="form-row-shortcutIcon6"> + <label for="shortcutIcon6" class="txtlibform"> + <%=shortcutIcon6.label%> + </label> + <div class="fieldInput"> + <%=shortcutIcon6%> + </div> + </div> + <div class="field field_shortcutTarget6" id="form-row-shortcutTarget6"> + <label for="shortcutTarget6" class="txtlibform"> + <%=shortcutTarget6.label%> + </label> + <div class="fieldInput champs"> + <%=shortcutTarget6%> + </div> + </div> + </div> +</fieldset> \ No newline at end of file diff --git a/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/update.xml b/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/update.xml index d494b4de..9df48d3d 100644 --- a/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/update.xml +++ b/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/update.xml @@ -92,7 +92,123 @@ <isDisabled>false</isDisabled> <isHidden>false</isHidden> <label> - <labelName>Actualités</labelName> + <labelName>Afficher</labelName> + <language>fr</language> + </label> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsZone</fieldName> + <displayerName>radio</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Emplacement</labelName> + <language>fr</language> + </label> + <parameter> + <name>keys</name> + <value lang="fr">main##right</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Zone principale##Colonne de droite</value> + </parameter> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">right</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsRenderingType</fieldName> + <displayerName>radio</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Présentation</labelName> + <language>fr</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">list##carousel</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Liste##Carrousel</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">carousel</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsLimit</fieldName> + <displayerName>text</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Nombre d'actualité</labelName> + <language>fr</language> + </label> + <parameter> + <name>maxLength</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">5</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsOfSubSpaces</fieldName> + <displayerName>radio</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Prendre en compte les sous-espaces</labelName> <language>fr</language> </label> <parameter> @@ -107,6 +223,42 @@ <name>values</name> <value lang="fr">Oui##Non</value> </parameter> + <parameter> + <name>default</name> + <value lang="fr">1</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsImportantOnly</fieldName> + <displayerName>radio</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Importantes seulement</labelName> + <language>fr</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">0</value> + </parameter> <isSearchable>false</isSearchable> <isFacet>false</isFacet> <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> @@ -195,10 +347,6 @@ <name>keys</name> <value lang="fr">2##1##0</value> </parameter> - <parameter> - <name>default</name> - <value lang="fr">0</value> - </parameter> <parameter> <name>values</name> <value lang="fr">Oui, sur la plateforme entière##Oui, sur l'espace courant##Non</value> @@ -905,55 +1053,135 @@ <typeName>file</typeName> </fieldTemplate> <fieldTemplate> - <fieldName>secondPictureLink</fieldName> - <displayerName>url</displayerName> - <isMandatory>false</isMandatory> - <isReadOnly>false</isReadOnly> - <isDisabled>false</isDisabled> - <isHidden>false</isHidden> - <label> - <labelName>Image secondaire - Lien</labelName> - <language>fr</language> - </label> - <label> - <labelName>Second picture - Lien</labelName> - <language>en</language> - </label> - <isSearchable>false</isSearchable> - <isFacet>false</isFacet> - <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> - <typeName>text</typeName> - </fieldTemplate> - <fieldTemplate> - <fieldName>newUsers</fieldName> - <displayerName>radio</displayerName> - <isMandatory>false</isMandatory> - <isReadOnly>false</isReadOnly> - <isDisabled>false</isDisabled> - <isHidden>false</isHidden> - <label> - <labelName>Nouveaux utilisateurs</labelName> - <language>fr</language> - </label> - <label> - <labelName>New users</labelName> - <language>en</language> - </label> - <parameter> - <name>cols</name> - <value lang="fr">2</value> - </parameter> - <parameter> - <name>keys</name> - <value lang="fr">1##0</value> - </parameter> - <parameter> - <name>values</name> - <value lang="fr">Oui##Non</value> - </parameter> - <isSearchable>false</isSearchable> - <isFacet>false</isFacet> - <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> - <typeName>text</typeName> + <fieldName>secondPictureLink</fieldName> + <displayerName>url</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Image secondaire - Lien</labelName> + <language>fr</language> + </label> + <label> + <labelName>Second picture - Lien</labelName> + <language>en</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newUsers</fieldName> + <displayerName>radio</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Nouveaux utilisateurs</labelName> + <language>fr</language> + </label> + <label> + <labelName>New users</labelName> + <language>en</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>mainFreeContentTitle</fieldName> + <displayerName>text</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Titre</labelName> + <language>fr</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>mainFreeContentValue</fieldName> + <displayerName>wysiwyg</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Contenu</labelName> + <language>fr</language> + </label> + <parameter> + <name>galleries</name> + <value lang="fr">true</value> + </parameter> + <parameter> + <name>fileStorages</name> + <value lang="fr">true</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>rightFreeContentTitle</fieldName> + <displayerName>text</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Titre</labelName> + <language>fr</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>rightFreeContentValue</fieldName> + <displayerName>wysiwyg</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Contenu</labelName> + <language>fr</language> + </label> + <parameter> + <name>galleries</name> + <value lang="fr">true</value> + </parameter> + <parameter> + <name>fileStorages</name> + <value lang="fr">true</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> </fieldTemplate> </recordTemplate> diff --git a/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/view.xml b/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/view.xml index 97c6bd49..aff043e0 100644 --- a/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/view.xml +++ b/aurora/aurora-configuration/src/main/config/data/templateRepository/auroraspacehomepage/view.xml @@ -92,7 +92,123 @@ <isDisabled>false</isDisabled> <isHidden>false</isHidden> <label> - <labelName>Actualités</labelName> + <labelName>Afficher</labelName> + <language>fr</language> + </label> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsZone</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Emplacement</labelName> + <language>fr</language> + </label> + <parameter> + <name>keys</name> + <value lang="fr">main##right</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Zone principale##Colonne de droite</value> + </parameter> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">right</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsRenderingType</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Présentation</labelName> + <language>fr</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">list##carousel</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Liste##Carrousel</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">carousel</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsLimit</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Nombre d'actualité</labelName> + <language>fr</language> + </label> + <parameter> + <name>maxLength</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">5</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsOfSubSpaces</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Prendre en compte les sous-espaces</labelName> <language>fr</language> </label> <parameter> @@ -107,6 +223,42 @@ <name>values</name> <value lang="fr">Oui##Non</value> </parameter> + <parameter> + <name>default</name> + <value lang="fr">1</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newsImportantOnly</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Importantes seulement</labelName> + <language>fr</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <parameter> + <name>default</name> + <value lang="fr">0</value> + </parameter> <isSearchable>false</isSearchable> <isFacet>false</isFacet> <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> @@ -901,55 +1053,135 @@ <typeName>file</typeName> </fieldTemplate> <fieldTemplate> - <fieldName>secondPictureLink</fieldName> - <displayerName>simpletext</displayerName> - <isMandatory>false</isMandatory> - <isReadOnly>false</isReadOnly> - <isDisabled>false</isDisabled> - <isHidden>false</isHidden> - <label> - <labelName>Image secondaire - Lien</labelName> - <language>fr</language> - </label> - <label> - <labelName>Second picture - Lien</labelName> - <language>en</language> - </label> - <isSearchable>false</isSearchable> - <isFacet>false</isFacet> - <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> - <typeName>text</typeName> - </fieldTemplate> - <fieldTemplate> - <fieldName>newUsers</fieldName> - <displayerName>simpletext</displayerName> - <isMandatory>false</isMandatory> - <isReadOnly>false</isReadOnly> - <isDisabled>false</isDisabled> - <isHidden>false</isHidden> - <label> - <labelName>Nouveaux utilisateurs</labelName> - <language>fr</language> - </label> - <label> - <labelName>New users</labelName> - <language>en</language> - </label> - <parameter> - <name>cols</name> - <value lang="fr">2</value> - </parameter> - <parameter> - <name>keys</name> - <value lang="fr">1##0</value> - </parameter> - <parameter> - <name>values</name> - <value lang="fr">Oui##Non</value> - </parameter> - <isSearchable>false</isSearchable> - <isFacet>false</isFacet> - <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> - <typeName>text</typeName> + <fieldName>secondPictureLink</fieldName> + <displayerName>url</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>true</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Image secondaire - Lien</labelName> + <language>fr</language> + </label> + <label> + <labelName>Second picture - Lien</labelName> + <language>en</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>newUsers</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Nouveaux utilisateurs</labelName> + <language>fr</language> + </label> + <label> + <labelName>New users</labelName> + <language>en</language> + </label> + <parameter> + <name>cols</name> + <value lang="fr">2</value> + </parameter> + <parameter> + <name>keys</name> + <value lang="fr">1##0</value> + </parameter> + <parameter> + <name>values</name> + <value lang="fr">Oui##Non</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>mainFreeContentTitle</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Titre</labelName> + <language>fr</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>mainFreeContentValue</fieldName> + <displayerName>wysiwyg</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>true</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Contenu</labelName> + <language>fr</language> + </label> + <parameter> + <name>galleries</name> + <value lang="fr">true</value> + </parameter> + <parameter> + <name>fileStorages</name> + <value lang="fr">true</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>rightFreeContentTitle</fieldName> + <displayerName>simpletext</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>false</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Titre</labelName> + <language>fr</language> + </label> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> + </fieldTemplate> + <fieldTemplate> + <fieldName>rightFreeContentValue</fieldName> + <displayerName>wysiwyg</displayerName> + <isMandatory>false</isMandatory> + <isReadOnly>true</isReadOnly> + <isDisabled>false</isDisabled> + <isHidden>false</isHidden> + <label> + <labelName>Contenu</labelName> + <language>fr</language> + </label> + <parameter> + <name>galleries</name> + <value lang="fr">true</value> + </parameter> + <parameter> + <name>fileStorages</name> + <value lang="fr">true</value> + </parameter> + <isSearchable>false</isSearchable> + <isFacet>false</isFacet> + <maximumNumberOfOccurrences>1</maximumNumberOfOccurrences> + <typeName>text</typeName> </fieldTemplate> </recordTemplate> diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/Aurora/css/main.css b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/Aurora/css/main.css index ce669477..afbc81f1 100644 --- a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/Aurora/css/main.css +++ b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/Aurora/css/main.css @@ -1,5 +1,6 @@ @import url("normalize.min.css"); @import url("stylesheet.css"); + /* ========================================================================== ========================================================================== */ @@ -13,6 +14,7 @@ background: #b3d4fc; text-shadow: none; } + hr { display: block; height: 1px; @@ -21,9 +23,11 @@ hr { margin: 1em 0; padding: 0; } + img { vertical-align: middle; } + textarea { resize: vertical; } @@ -35,7 +39,7 @@ textarea { body#top { background-repeat: no-repeat; - background-position:30px 0px; + background-position: 30px 0px; } .header-container { @@ -51,295 +55,315 @@ body#top { } #topar-header { - background:#e0e0e0 url(../imgDesign/bg-topar-header.gif) top left repeat-x; - height:57px; + background: #e0e0e0 url(../imgDesign/bg-topar-header.gif) top left repeat-x; + height: 57px; } .btn-header, #search-form-header a { - background-color:#1C94D4; - border-radius:11px; - -webkit-border-radius:11px; - -moz-border-radius:11px; - display:block; - float:left; - border:1px solid #0b7fbd; - padding:0 0.5em 0 0.5em; - color:#FFF; - position:relative; - height:21px; - line-height:21px; - margin-right:0.5em; + background-color: #1C94D4; + border-radius: 11px; + -webkit-border-radius: 11px; + -moz-border-radius: 11px; + display: block; + float: left; + border: 1px solid #0b7fbd; + padding: 0 0.5em 0 0.5em; + color: #FFF; + position: relative; + height: 21px; + line-height: 21px; + margin-right: 0.5em; } #search-form-header a { - display:inline-block; - float:none; + display: inline-block; + float: none; } + .btn-header a { - color:#FFF; + color: #FFF; } #notification-count.btn-header { - background-color:#f48250; + background-color: #f48250; border: 1px solid #e66e3a; - padding-right:0.5em; + padding-right: 0.5em; } + .btn-header a span { - padding-right:0.5em; + padding-right: 0.5em; } .select-header select { - font-family:"Century Gothic","Trebuchet MS",Arial, sans serif; - padding:0 3px 0 0; + font-family: "Century Gothic", "Trebuchet MS", Arial, sans serif; + padding: 0 3px 0 0; margin: 0; - border-radius:4px; + border-radius: 4px; background: #1C94D4; - color:#fff; - border:none; - outline:none; + color: #fff; + border: none; + outline: none; display: inline-block; - -webkit-appearance:none; - -moz-appearance:none; - appearance:none; - cursor:pointer; - min-height:19px; - width:120px; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + cursor: pointer; + min-height: 19px; + width: 120px; } label.select-header { - position:relative; + position: relative; padding: 2px 0 0; } + label.select-header:after { } + label.select-header:before { - content:' >'; - right:0; - top:0px; - width:20px; - height:20px; - background:#1C94D4; - position:absolute; - pointer-events:none; - display:block; - color:#fff; + content: ' >'; + right: 0; + top: 0px; + width: 20px; + height: 20px; + background: #1C94D4; + position: absolute; + pointer-events: none; + display: block; + color: #fff; white-space: pre-wrap; - transform:rotate(90deg); - -webkit-transform:rotate(90deg); - -moz-transform:rotate(90deg); - -ms-transform:rotate(90deg); + transform: rotate(90deg); + -webkit-transform: rotate(90deg); + -moz-transform: rotate(90deg); + -ms-transform: rotate(90deg); } .header-container #infoConnection { - position:absolute; + position: absolute; left: 1em; top: 0.5em; - color:#999; + color: #999; } .button.logOn { padding-left: 1.5em; - background:#7eb73b url(../imgDesign/logOn.png) no-repeat 0.25em; + background: #7eb73b url(../imgDesign/logOn.png) no-repeat 0.25em; } .sp_button.logOn, .header-container #infoConnection .sp_button.logOn { - white-space:nowrap; + white-space: nowrap; width: auto; height: inherit; overflow: inherit; display: inline-block; - margin-right:0.7em; - text-transform:initial; - color:#FFF; - border-radius:20px; - background:#7eb73b url(../imgDesign/logOn.png) no-repeat 1em 0.25em; - float:left; + margin-right: 0.7em; + text-transform: initial; + color: #FFF; + border-radius: 20px; + background: #7eb73b url(../imgDesign/logOn.png) no-repeat 1em 0.25em; + float: left; padding: 0.2em 1em 0.2em 2.5em; border: 1px solid #6ca22c; } .sp_button.logOn span { - font-size:12px + font-size: 12px } -.header-container #infoConnection .avatarName { - position:relative; - float:left; +.header-container #infoConnection .avatarName { + position: relative; + float: left; } + .header-container #avatar-img { - height:42px; - float:left; - border:1px solid #c8c8c8; - margin-right:1em; - max-width:42px + height: 42px; + float: left; + border: 1px solid #c8c8c8; + margin-right: 1em; + max-width: 42px } .header-container #infoConnection #show-menu-spacePerso { - background:transparent url("../imgDesign/packImages.png") 0 -5px no-repeat ; - opacity:0.5; - display:inline-block; - width:25px; - height:20px; - text-indent:-3000px; + background: transparent url("../imgDesign/packImages.png") 0 -5px no-repeat; + opacity: 0.5; + display: inline-block; + width: 25px; + height: 20px; + text-indent: -3000px; } .header-container #infoConnection #show-menu-spacePerso:hover { - opacity:1; + opacity: 1; } .spacePerso { - display:none; + display: none; } #infoConnection ul { - background-color:#1C94D4; - border-radius:4px; - -webkit-border-radius:4px; - -moz-border-radius:4px; - border:1px solid #0b7fbd; + background-color: #1C94D4; + border-radius: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border: 1px solid #0b7fbd; list-style-type: none; margin: 0; - padding:0; + padding: 0; position: absolute; left: 0px; top: 1.5em; text-align: left; - z-index:100; + z-index: 100; white-space: nowrap; } + #infoConnection ul li { - padding:0; - margin:0 + padding: 0; + margin: 0 } + #infoConnection ul li a { - color:#FFF; - font-size:10pt; - display:block; - padding:5px; - margin:0 + color: #FFF; + font-size: 10pt; + display: block; + padding: 5px; + margin: 0 } + #infoConnection ul li a:hover, #infoConnection .directoryLink:hover, #infoConnection .logOut:hover { - background-color:#0078d7 + background-color: #0078d7 } .header-container #outils { bottom: auto; - top:25px; + top: 25px; color: #bbbbbb; position: absolute; right: auto; - left:60px; + left: 60px; text-align: left; width: auto; - padding:0; + padding: 0; } .header-container.anonymousMode #outils { - left:0.75em + left: 0.75em } .header-container #outils li { - display:inline; + display: inline; margin: 0; padding: 0; } .header-container #outils li a { - color:#222; + color: #222; } .header-container #outils li a, #search-zone-header a { - opacity:0.7; + opacity: 0.7; } + .header-container #outils li a:hover, #search-zone-header a:hover { - opacity:1; + opacity: 1; } .header-container #outils li a#connectedUsers { } -.header-container #map-link-header a{ - background:transparent url(../imgDesign/packImages.png) -2px -255px no-repeat; - padding-left:25px; + +.header-container #map-link-header a { + background: transparent url(../imgDesign/packImages.png) -2px -255px no-repeat; + padding-left: 25px; } + .header-container #help-link-header a { - background:transparent url(../imgDesign/packImages.png) -2px -49px no-repeat; - padding-left:25px; + background: transparent url(../imgDesign/packImages.png) -2px -49px no-repeat; + padding-left: 25px; } + .header-container #directory-link-header a { - background:transparent url(../imgDesign/packImages.png) 0 -289px no-repeat; - padding-left:25px; + background: transparent url(../imgDesign/packImages.png) 0 -289px no-repeat; + padding-left: 25px; } -.header-container #adminstration-link-header a { - background:transparent url(../imgDesign/packImages.png) 0 -90px no-repeat; - padding-left:25px; + +.header-container #adminstration-link-header a { + background: transparent url(../imgDesign/packImages.png) 0 -90px no-repeat; + padding-left: 25px; } .header-container h1 { - display:none; + display: none; } #search-zone-header { position: absolute; right: 0; - top:0; - background-color:#eaeaea; - border-left:1px solid #C3C3C3; - border-bottom:1px solid #C3C3C3; - height:49px; - padding:7px 1em 0; + top: 0; + background-color: #eaeaea; + border-left: 1px solid #C3C3C3; + border-bottom: 1px solid #C3C3C3; + height: 49px; + padding: 7px 1em 0; } #search-form-header a { - opacity:1 !important; - padding:0 0.5em; + opacity: 1 !important; + padding: 0 0.5em; } #search-zone-header a, #search-zone-header label { } -#search-zone-header a{ + +#search-zone-header a { } + #search-zone-header > a span { } + #search-zone-header > a { - padding:4px 0 0 5px; - float:right; + padding: 4px 0 0 5px; + float: right; } + #search-zone-header > * { display: inline-block; - color:#222; + color: #222; } + #search-form-header { - display:block; + display: block; } #search-form-header #select-user-group-queryDirectory .selectize-input { - background-color:transparent; + background-color: transparent; } -#search-form-header .selectize-control{ - border:0; + +#search-form-header .selectize-control { + border: 0; } + #search-form-header input#query, -#search-form-header #select-user-group-queryDirectory .search-input-container input{ - border:0 !important; - background-color:#FFF !important; - border-radius:8px !important; - padding:0 8px !important; - margin:0; - width:182px !important; - height:21px; - color:#999; - font-size:13px; - vertical-align:middle; +#search-form-header #select-user-group-queryDirectory .search-input-container input { + border: 0 !important; + background-color: #FFF !important; + border-radius: 8px !important; + padding: 0 8px !important; + margin: 0; + width: 182px !important; + height: 21px; + color: #999; + font-size: 13px; + vertical-align: middle; } #search-zone-header #inputSearchSwitchable .switchSearchMode.directory.off, @@ -356,85 +380,94 @@ label.select-header:before { #lastResult-link-header span { background: transparent url(../imgDesign/packImages.png) 0 -219px no-repeat; - padding-left:25px; + padding-left: 25px; } + #advancedSearch-link-header span { background: transparent url(../imgDesign/packImages.png) 0 -176px no-repeat; - padding-left:30px; + padding-left: 30px; } +#search-help-header span { + background: transparent url(../imgDesign/packImages.png) 0 -50px no-repeat; + padding-left:24px; +} /* ============== Menu ============== */ #nav { position: relative; - padding-top:102px; + padding-top: 102px; width: 100%; - height:48px; - background:transparent url(../imgDesign/bg-menu-nav1.png) top left no-repeat; + height: 48px; + background: transparent url(../imgDesign/bg-menu-nav1.png) top left no-repeat; } #nav.sousMenu { } + #nav > ul { margin: 0; - padding:0; + padding: 0; } -#nav > ul > li > a { +#nav > ul > li > a { display: block; - text-align:center + text-align: center } -#nav > ul > li:first-child { - padding-left:94px; + +#nav > ul > li:first-child { + padding-left: 94px; } -#nav ul div.hover > a span:before, -#nav ul div.simple-hover > a span:before, -#nav > ul > li > div.selected > a span:before -{ - content:'• '; - color:#9BD94A; +#nav ul div.hover > a span:before, +#nav ul div.simple-hover > a span:before, +#nav > ul > li > div.selected > a span:before { + content: '• '; + color: #9BD94A; } -#nav ul div.hover > a{ - background:transparent url(../imgDesign/menu-hover.png) top center no-repeat; - position:relative; - z-index:100; + +#nav ul div.hover > a { + background: transparent url(../imgDesign/menu-hover.png) top center no-repeat; + position: relative; + z-index: 100; } -#nav > ul > li > a { - color:#333; +#nav > ul > li > a { + color: #333; text-align: center; text-decoration: none; - display:block; - padding:0 2em; + display: block; + padding: 0 2em; height: 46px; line-height: 38px; - text-transform:uppercase; + text-transform: uppercase; } -#nav ul ul a span { - line-height:110%; + +#nav ul ul a span { + line-height: 110%; } + #nav > ul > li { - display:block; - float:left; - width:auto; + display: block; + float: left; + width: auto; margin: 0; - padding:0; - text-align:right; + padding: 0; + text-align: right; } -#nav > ul > li > div { +#nav > ul > li > div { display: block; } -#nav > ul > li > div > a{ - padding-top:8px; +#nav > ul > li > div > a { + padding-top: 8px; } -#nav .nav-niveau-2{ +#nav .nav-niveau-2 { display: none; background-color: #333; bottom: 44px; @@ -451,12 +484,11 @@ label.select-header:before { } - -#nav .nav-niveau-2 li{ - display:block; - float:left; - width:33%; - max-width:200px; +#nav .nav-niveau-2 li { + display: block; + float: left; + width: 33%; + max-width: 200px; } #nav ul.nav-niveau-2 li a { @@ -465,30 +497,30 @@ label.select-header:before { padding: 4px 10px; line-height: 100%; text-decoration: none; - text-align:left; - color:#FFF; + text-align: left; + color: #FFF; } #nav ul.nav-niveau-2 li.space a { - background:transparent url("../imgDesign/packFleche.png") 0px -6px no-repeat ; + background: transparent url("../imgDesign/packFleche.png") 0px -6px no-repeat; font-weight: 100; padding: 4px 10px 4px 20px; position: relative; } -#nav ul.nav-niveau-2 li.space a { +#nav ul.nav-niveau-2 li.space a { } -#nav ul.nav-niveau-2 li a span{ - color:#FFF; - text-align:left; - text-transform:none; - padding:0; +#nav ul.nav-niveau-2 li a span { + color: #FFF; + text-align: left; + text-transform: none; + padding: 0; } -#nav ul.nav-niveau-2 li a:hover span{ - color:#7EB73B +#nav ul.nav-niveau-2 li a:hover span { + color: #7EB73B } /* la fleche du menu vers le bas */ @@ -501,6 +533,7 @@ label.select-header:before { background: transparent; border-radius: 0; } + /* la fleche du sous menu vers la droite */ #nav .sm-silverpeas ul a span.sub-arrow { margin-top: -5px; @@ -516,7 +549,7 @@ label.select-header:before { .main { padding: 0 0 40px; - overflow:hidden; + overflow: hidden; } .footer-container footer { @@ -525,70 +558,72 @@ label.select-header:before { } - #pp { - background-color:#f3f2f2; - border-top:1px solid #d8d8d8; - height:30px; - padding:10px + background-color: #f3f2f2; + border-top: 1px solid #d8d8d8; + height: 30px; + padding: 10px } #pp a { - color:#006198; - text-decoration:underline; + color: #006198; + text-decoration: underline; } .right-main-container { - float:right; - width:25%; + float: right; + width: 25%; } -.right-main-container .link-more{ - float:right; - width:40px; - height:33px; - text-indent:2000px; - white-space:nowrap; - background:#FFF url(../imgDesign/packImages.png) 4px -382px no-repeat; +.right-main-container .link-more { + float: right; + width: 40px; + height: 33px; + text-indent: 2000px; + white-space: nowrap; + background: #FFF url(../imgDesign/packImages.png) 4px -382px no-repeat; margin-top: -46px; - opacity:0.7; + opacity: 0.7; } -.right-main-container .link-more:hover{ - opacity:0.85; +.right-main-container .link-more:hover { + opacity: 0.85; } -#user-favorit-home .link-more{ - float:left; - text-indent:-2000px; - background:#FFF url(../imgDesign/packImages.png) -4px -340px no-repeat; +#user-favorit-home .link-more { + float: left; + text-indent: -2000px; + background: #FFF url(../imgDesign/packImages.png) -4px -340px no-repeat; margin-top: -10px; - padding-bottom:4px; + padding-bottom: 4px; } + #user-favorit-home .link-add.manage { - display:inline-block; - clear:both; - margin-top:1em; + display: inline-block; + clear: both; + margin-top: 1em; float: left; - background:-moz-linear-gradient(top,#fff,#f0eeee); - background:linear-gradient(top,#fff,#f0eeee); - border:1px solid #d8d8d8; - border-radius:6px; + background: -moz-linear-gradient(top, #fff, #f0eeee); + background: linear-gradient(top, #fff, #f0eeee); + border: 1px solid #d8d8d8; + border-radius: 6px; } -#user-favorit-home .link-add.manage span{ - background:none; +#user-favorit-home .link-add.manage span { + background: none; padding-right: 12px; } -#user-favorit-home .link-more.less{ - background:#FFF url(../imgDesign/packImages.png) -4px -422px no-repeat; + +#user-favorit-home .link-more.less { + background: #FFF url(../imgDesign/packImages.png) -4px -422px no-repeat; margin-top: -10px; - padding-bottom:4px; + padding-bottom: 4px; } -#user-favorit-home .link-more.less:hover{ +#user-favorit-home .link-more.less:hover { background-position: -4px -426px; } + #home-event h2, .secteur-container h4, .spaceHome .spaceName, @@ -596,17 +631,16 @@ label.select-header:before { .spaceHome #spaceEvent h2.portlet-title, .spaceHome #spaceQuiskInfo h2.portlet-title, .titre-formulaire-projet, #principal-formulaire .eventInfo, -#portletPages dl.sort dt{ - color:#6a6a6a; - border-bottom:1px solid #ededed; - font-weight:100; - padding-bottom:7px; - font-size:18pt; - margin:18px 0 7px; +#portletPages dl.sort dt { + color: #6a6a6a; + border-bottom: 1px solid #ededed; + font-weight: 100; + padding-bottom: 7px; + font-size: 18pt; + margin: 18px 0 7px; } - #home-event h2::first-letter, .secteur-container h4::first-letter, .spaceHome .spaceName::first-letter, @@ -615,68 +649,71 @@ label.select-header:before { .titre-formulaire-projet::first-letter, #principal-formulaire .eventInfo::first-letter, #portletPages h2.portlet-title::first-letter { - color:#7eb73b; + color: #7eb73b; } -.main-home-page #cg-favorit-home h4{ - margin-top:0; +.main-home-page #cg-favorit-home h4 { + margin-top: 0; } #user-favorit-home h4::first-letter { - color:#1C94D4 + color: #1C94D4 } #portletPages dl.sort dt { - margin:15px 0 0; + margin: 15px 0 0; } -#portletPages h2.portlet-title{ - color:#6a6a6a; - font-weight:100; - font-size:16pt; - text-transform:normal; + +#portletPages h2.portlet-title { + color: #6a6a6a; + font-weight: 100; + font-size: 16pt; + text-transform: normal; font-variant: normal; } #portletPages div.portlet-content { - padding-left:10px; + padding-left: 10px; } - - .right-main-container -.secteur-container h4{ - clear:both; +.secteur-container h4 { + clear: both; } #home-event h2, -.right-main-container .secteur-container h4{ - clear:both; +.right-main-container .secteur-container h4 { + clear: both; } -#home-event { - position:relative; - margin-bottom:3em; + +#home-event { + position: relative; + margin-bottom: 3em; } -.main-home-page #home-event .link-more { - position:absolute; - bottom:0; - right:0; - margin:0; + +.main-home-page #home-event .link-more { + position: absolute; + bottom: 0; + right: 0; + margin: 0; } #home-event ul.eventList { - margin:0; padding:0; + margin: 0; + padding: 0; } -#eventList .eventInfo { - border:0; - padding:0; - margin:0 0 0 -16px; +#eventList .eventInfo { + border: 0; + padding: 0; + margin: 0 0 0 -16px; } + .portlet li.events { - background:#FFF url(); + background: #FFF url(); } .portlet div.eventShortDate { @@ -690,58 +727,61 @@ label.select-header:before { .portlet div.eventShortDate .number { color: #7eb73b; } + .portlet div.eventShortDate { color: #717171; } - /*** FORMULAIRE **/ #principal-formulaire { - float:left; - width:70%; + float: left; + width: 70%; } + #droite-formulaire { - float:right; - width:25%; - padding:2em 2%; + float: right; + width: 25%; + padding: 2em 2%; } #principal-formulaire .eventInfo { - margin:-15px 0 1em; + margin: -15px 0 1em; } -#principal-formulaire .a-propos-formulaire-projet-main-container { - margin:0 0 1em; +#principal-formulaire .a-propos-formulaire-projet-main-container { + margin: 0 0 1em; } -#principal-formulaire .eventPlace img{ - max-width:200px; - max-height:150px; +#principal-formulaire .eventPlace img { + max-width: 200px; + max-height: 150px; } /*** FAQ ***/ #faq-home { - margin-bottom:2em; + margin-bottom: 2em; } + .FAQ-entry-main-container, .a-propos-formulaire-projet-main-container { - background: url("../imgDesign/packImages.png") left -624px no-repeat; + background: url("../imgDesign/packImages.png") left -624px no-repeat; clear: left; margin: 0; padding-top: 0px; text-indent: 37px; } -.FAQ-entry , -.a-propos-formulaire-projet{ - background:transparent url("../imgDesign/packImages.png") bottom right no-repeat; +.FAQ-entry, +.a-propos-formulaire-projet { + background: transparent url("../imgDesign/packImages.png") bottom right no-repeat; padding-bottom: 10px; max-height: 232px; overflow: auto; } + .FAQ-entry-main-container div, .FAQ-entry-main-container a { } @@ -754,9 +794,9 @@ label.select-header:before { color: #7eb73b; } -.link-add , -.spaceHome .link-more , -#submit-AdvancedSearch{ +.link-add, +.spaceHome .link-more, +#submit-AdvancedSearch { background: url("../imgDesign/packBtn.png") no-repeat scroll 0 0 rgba(0, 0, 0, 0); display: inline-block; float: right; @@ -771,16 +811,17 @@ label.select-header:before { } .link-add span, -.spaceHome .link-more span, +.spaceHome .link-more span, #submit-AdvancedSearch span { - background:transparent url(../imgDesign/packBtn.png) right 0 no-repeat; + background: transparent url(../imgDesign/packBtn.png) right 0 no-repeat; color: #333; display: block; line-height: 32px; padding-right: 50px; } + #submit-AdvancedSearch span { - background:transparent url(../imgDesign/packBtn.png) right -700px no-repeat; + background: transparent url(../imgDesign/packBtn.png) right -700px no-repeat; color: #333; } @@ -794,57 +835,68 @@ label.select-header:before { /*** END FAQ ***/ /*** WEATHER ***/ -#weather-home #ephemeride { - font-style:italic; - margin:1em 0; - color:#ec8601; +#weather-home #ephemeride { + font-style: italic; + margin: 1em 0; + color: #ec8601; } -#weather-home #ephemeride:before { - content:'Nous fêtons les '; - color:#000; + +#weather-home #ephemeride:before { + content: 'Nous fêtons les '; + color: #000; } + #weather-home { } -#weather-home.secteur-container h4::first-letter { - color:#ec8601; +#weather-home.secteur-container h4::first-letter { + color: #ec8601; } -#localisation-weather{ - margin-bottom:1em; + +#localisation-weather { + margin-bottom: 1em; } -#localisation-weather a{ - color:#b8b8b8; + +#localisation-weather a { + color: #b8b8b8; } + #localisation-weather a:hover, #localisation-weather .select, -#localisation-weather .label{ - color:#ec8601; +#localisation-weather .label { + color: #ec8601; } -#weather-home .day{ - width:50%; - float:left; + +#weather-home .day { + width: 50%; + float: left; } -#weather-home .day img{ - height:45px; - float:left; + +#weather-home .day img { + height: 45px; + float: left; } -#weather-home .min{ - color:#1C94D4; + +#weather-home .min { + color: #1C94D4; } -#weather-home .max{ - color:#f60b3c; + +#weather-home .max { + color: #f60b3c; } -#weather-home .day .label{ - clear:left; - color:#b8b8b8; - font-size:11px; - text-align:center; - width:61px; + +#weather-home .day .label { + clear: left; + color: #b8b8b8; + font-size: 11px; + text-align: center; + width: 61px; } + #today-event { - clear:both; - padding-top:1em; + clear: both; + padding-top: 1em; } /*** END WEATHER ***/ @@ -852,24 +904,25 @@ label.select-header:before { /*** PDC ***/ #bloc-advancedSeach { - clear:both; - padding-top:0; - margin-bottom:1.5em; + clear: both; + padding-top: 0; + margin-bottom: 1.5em; } -#bloc-advancedSeach #query{ - border-radius:12px; - -webkit-border-radius:12px; - -moz-border-radius:12px; - border:1px solid #d1d1d1; - width:90%; - height:20px; - box-shadow: -2px -3px 4px rgba(0, 0, 0, 0.1) inset; - padding:2px 2%; - margin:0.5em 0 1em; +#bloc-advancedSeach #query { + border-radius: 12px; + -webkit-border-radius: 12px; + -moz-border-radius: 12px; + border: 1px solid #d1d1d1; + width: 90%; + height: 20px; + box-shadow: -2px -3px 4px rgba(0, 0, 0, 0.1) inset; + padding: 2px 2%; + margin: 0.5em 0 1em; } -#bloc-advancedSeach #used_pdc .field .champs.pdcAxis img{ - display:none; + +#bloc-advancedSeach #used_pdc .field .champs.pdcAxis img { + display: none; } #bloc-advancedSeach #used_pdc .field label { @@ -879,7 +932,7 @@ label.select-header:before { width: 122px; } -#bloc-advancedSeach #used_pdc .field .champs select { +#bloc-advancedSeach #used_pdc .field .champs select { width: 160px; } @@ -888,89 +941,94 @@ label.select-header:before { } -#submit-AdvancedSearch:hover span{ - opacity:1; +#submit-AdvancedSearch:hover span { + opacity: 1; } /*** END PDC ***/ -#user-favorit-home ul { - list-style-image:url(../imgDesign/puce-favorit.png); - padding:0 0 0 30px +#user-favorit-home ul { + list-style-image: url(../imgDesign/puce-favorit.png); + padding: 0 0 0 30px } -#user-favorit-home ul a{ - line-height:10pt; - display:block; + +#user-favorit-home ul a { + line-height: 10pt; + display: block; } -#user-favorit-home ul li{ - padding-bottom:1em; + +#user-favorit-home ul li { + padding-bottom: 1em; } -#user-favorit-home ul a:hover{ - color:#1c94d4; + +#user-favorit-home ul a:hover { + color: #1c94d4; } .principal-main-container { - margin-right:27%; - padding-top:18px; + margin-right: 27%; + padding-top: 18px; } + .principal-main-container .secteur-container h4, -#user-favorit-home h4{ - padding-left:0.5em; +#user-favorit-home h4 { + padding-left: 0.5em; } .main-home-page #cg-favorit-home { - width:240px; - position:absolute; + width: 240px; + position: absolute; } + #user-favorit-home { - width:240px; - position:absolute; - left:0; - top:344px; + width: 240px; + position: absolute; + left: 0; + top: 344px; } - .principal-main-container .cg-favorit-list { - margin:0; - padding:0; - list-style-type:none; + margin: 0; + padding: 0; + list-style-type: none; } -.principal-main-container .cg-favorit-list li{ - margin-bottom:0.5em; +.principal-main-container .cg-favorit-list li { + margin-bottom: 0.5em; } -.principal-main-container .cg-favorit-list li:nth-child(2n+1) a{ - padding-left:30px; +.principal-main-container .cg-favorit-list li:nth-child(2n+1) a { + padding-left: 30px; } .principal-main-container .cg-favorit-list a { - color:#8c8c8c; - font-size:12pt; - float:left; - padding-bottom:10px; + color: #8c8c8c; + font-size: 12pt; + float: left; + padding-bottom: 10px; } .principal-main-container .cg-favorit-list a span { - display:none + display: none } .principal-main-container .cg-favorit-list a img { - width:80%; - opacity:0.8; + width: 80%; + opacity: 0.8; } -.principal-main-container .cg-favorit-list a:hover img{ - opacity:1; +.principal-main-container .cg-favorit-list a:hover img { + opacity: 1; } -#carrousel-actualite { - margin-left:260px; - float:left; - height:314px; - position:relative; - overflow:hidden; +#carrousel-actualite { + margin-left: 260px; + float: left; + height: 314px; + position: relative; + overflow: hidden; } + .main-home-page #last-publication-home, .main-home-page #rssNews, .main-home-page #freeZone { @@ -979,30 +1037,47 @@ label.select-header:before { } - -#carrousel-actualite li>a { +#carrousel-actualite li > a { font-weight: bold; } #actualite-magique-home { - clear:left; + clear: left; } .actualite-magique-main-container { - background-color:#f9f8f8; - margin-top:-12px; + background-color: #f9f8f8; + margin-top: -12px; } #la-magie { - float:left; - margin-right:46px; + float: left; + margin-right: 46px; +} + + +.actualite-magique-main-container span { + color: #1C94D4; + font-size: 120%; + padding-top: 1em; + display: block +} + +.actualite-magique-main-container ul { + margin: 0; + padding: 0 0 0 12px; + list-style-image: url(../imgDesign/puce.png); } +.actualite-magique-main-container ul li { + margin: 1em 0 0 12px; + padding: 0; +} -.actualite-magique-main-container span {color:#1C94D4;font-size:120%; padding-top:1em ; display:block} -.actualite-magique-main-container ul {margin:0 ; padding:0 0 0 12px; list-style-image:url(../imgDesign/puce.png);} -.actualite-magique-main-container ul li{margin:1em 0 0 12px ; padding:0;} -.actualite-magique-main-container strong {display:block; text-transform:uppercase} +.actualite-magique-main-container strong { + display: block; + text-transform: uppercase +} /* =============== ALL: IE Fixes @@ -1013,30 +1088,32 @@ label.select-header:before { ========================================================================== */ - -@media only screen and (max-width: 980px), only screen and (max-device-width: 980px){ +@media only screen and (max-width: 980px), only screen and (max-device-width: 980px) { #nav > ul > li > a { padding: 0 2.1em 0 0; - font-size:10pt; + font-size: 10pt; } - #nav > ul > li > a span { - font-size:10pt; + + #nav > ul > li > a span { + font-size: 10pt; } + #nav ul ul > li > a, #nav ul ul > li > a span { font-size: 8.5pt; } + #search-zone-header { - top:80px; - border-radius:15px 0 0 15px; + top: 80px; + border-radius: 15px 0 0 15px; z-index: 1001; } #nav > ul > li:first-child a span { - text-indent:-3000px; - display:inline-block; + text-indent: -3000px; + display: inline-block; } - #nav > ul > li:first-child a { + #nav > ul > li:first-child a { background: transparent url(../imgDesign/packImages.png) no-repeat 9px -124px; padding-left: 18px; height: 35px; @@ -1048,9 +1125,8 @@ label.select-header:before { @media only screen and (min-width: 480px) { - - } + @media only screen and (min-width: 768px) { /* =============== @@ -1059,6 +1135,7 @@ label.select-header:before { } + @media only screen and (min-width: 980px) { /* =============== @@ -1067,13 +1144,16 @@ label.select-header:before { } + @media only screen and (min-width: 1200px) { } + @media only screen and (min-width: 1800px) { } + /* ========================================================================== Helper classes ========================================================================== */ @@ -1084,16 +1164,19 @@ label.select-header:before { overflow: hidden; *text-indent: -9999px; } + .ir:before { content: ""; display: block; width: 0; height: 150%; } + .hidden { display: none !important; visibility: hidden; } + .visuallyhidden { border: 0; clip: rect(0 0 0 0); @@ -1104,6 +1187,7 @@ label.select-header:before { position: absolute; width: 1px; } + .visuallyhidden.focusable:active, .visuallyhidden.focusable:focus { clip: auto; @@ -1113,17 +1197,21 @@ label.select-header:before { position: static; width: auto; } + .invisible { visibility: hidden; } + .clearfix:before, .clearfix:after { content: " "; display: table; } + .clearfix:after { clear: both; } + .clearfix { *zoom: 1; } @@ -1134,62 +1222,64 @@ label.select-header:before { @media print { * { - background: transparent !important; - color: #000 !important; /* Black prints faster: h5bp.com/s */ box-shadow: none !important; text-shadow: none !important; } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - - /* - * Don't show links for images, -or javascript/internal links - */ - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; + .tableBoard { + background: transparent; } - thead { - display: table-header-group; /* h5bp.com/t */ - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 0.5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - page-break-after: avoid; - } -} + /* a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + + + * Don't show links for images, + or javascript/internal links + + + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 0.5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + }*/ +} /****** Ticker ******/ @@ -1199,13 +1289,13 @@ or javascript/internal links padding-left: 20px; position: absolute; right: 0; - top:1px; - padding-right:1em; - font-weight:bold; + top: 1px; + padding-right: 1em; + font-weight: bold; } #sp-layout-header-part #ticker { - display:none; + display: none; background-color: #FFF; height: 22px; left: 0; @@ -1213,8 +1303,8 @@ or javascript/internal links right: 0; top: 57px; z-index: 10; - border-top:2px dashed #7eb73b; - border-bottom:2px dashed #7eb73b + border-top: 2px dashed #7eb73b; + border-bottom: 2px dashed #7eb73b } #sp-ticker .ticker-wrapper.has-js { @@ -1223,12 +1313,13 @@ or javascript/internal links display: block; font-size: 0.75em; height: 22px; - margin:0; + margin: 0; padding: 0; width: 100%; } + #sp-ticker { - display:block; + display: block; } #sp-ticker .ticker { @@ -1242,12 +1333,13 @@ or javascript/internal links #sp-ticker .ticker-title { padding-top: 2px; - padding-left:1em; + padding-left: 1em; color: #333; font-weight: bold; background-color: transparent; text-transform: uppercase; } + #sp-ticker .ticker-content { margin: 0px; padding-top: 3px; @@ -1258,7 +1350,7 @@ or javascript/internal links overflow: hidden; white-space: nowrap; line-height: 1.2em; - padding-left:1em; + padding-left: 1em; } #sp-ticker .ticker-content .ticker-item-date { @@ -1269,21 +1361,21 @@ or javascript/internal links #carrousel-actualite .centered-btns_nav { top: 36%; - margin-top:0; + margin-top: 0; } /*********** News as list *******************/ #carrousel-actualite .list-news { - padding:0; - height:auto + padding: 0; + height: auto } #carrousel-actualite .list-news li { - width:100%; - height:100px; + width: 100%; + height: 100px; } -#carrousel-actualite .list-news li img{ +#carrousel-actualite .list-news li img { width: 200px; float: left; } @@ -1294,15 +1386,17 @@ or javascript/internal links } #carrousel-actualite .list-news .caption h2 a, -#carrousel-actualite .list-news .caption p{ - color:#444; - font-size:13px; - font-weight:100; +#carrousel-actualite .list-news .caption p { + color: #444; + font-size: 13px; + font-weight: 100; } + #carrousel-actualite .list-news .caption h2 a { - font-size:16px; - font-weight:bold; + font-size: 16px; + font-weight: bold; } + #carrousel-actualite .list-news .caption h2 { margin: 0px; } diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/Aurora/css/stylesheet.css b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/Aurora/css/stylesheet.css index 0546fb00..7a8226e7 100644 --- a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/Aurora/css/stylesheet.css +++ b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/Aurora/css/stylesheet.css @@ -218,7 +218,6 @@ html,button,body, td, div, a , input, select, textarea, #myProfileFiche .statut, #sp-layout-body-part-layout-toggle-part { margin-bottom: -8px; - position: relative; } /********************************** ELMTS FOOTER *******************************/ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/noFavorites.html b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/noFavorites.html new file mode 100644 index 00000000..8cb11078 --- /dev/null +++ b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/noFavorites.html @@ -0,0 +1,4 @@ +<p class="empty-bloc-explain">Vous n'avez pas encore de favoris.</p> +<p class="empty-bloc-explain"> +A tout moment vous pouvez ajouter une page en favoris grâce au menu <b>Que voulez-vous faire ?</b> +</p> \ No newline at end of file diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/Sobre/css/main.css b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/Sobre/css/main.css index f229ee2d..378b3874 100644 --- a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/Sobre/css/main.css +++ b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/Sobre/css/main.css @@ -1,5 +1,6 @@ @import url("normalize.min.css"); @import url("stylesheet.css"); + /* ========================================================================== ========================================================================== */ @@ -13,6 +14,7 @@ background: #b3d4fc; text-shadow: none; } + hr { display: block; height: 1px; @@ -21,9 +23,11 @@ hr { margin: 1em 0; padding: 0; } + img { vertical-align: middle; } + textarea { resize: vertical; } @@ -35,7 +39,7 @@ textarea { body#top { background-repeat: no-repeat; - background-position:0 0px; + background-position: 0 0px; } #sp-layout-body-part { @@ -46,8 +50,8 @@ body#top { position: relative; height: 192px; /*background:#FFF url("../imgDesign/deco-bandeau.png") bottom right no-repeat;*/ - border-bottom:0; - text-align:center; + border-bottom: 0; + text-align: center; } #logo-header { @@ -61,106 +65,114 @@ body#top { } #logo-header img { - display:none; + display: none; } #topar-header { - background:#e2e2e2 url() top left repeat-x; + background: #e2e2e2 url() top left repeat-x; border-bottom: 1px solid #ccc; - height:42px; -} - -.btn-header{ - background-color:#fff; - border:1px solid #ccc; - display:block; - padding:0 0.5em 0 0.5em; - color:#2f3135; - position:relative; - height:23px; - line-height:23px; - float:left; - margin-right:8px; - overflow:hidden; - width:150px; + height: 42px; } + +.btn-header { + background-color: #fff; + border: 1px solid #ccc; + display: block; + padding: 0 0.5em 0 0.5em; + color: #2f3135; + position: relative; + height: 23px; + line-height: 23px; + float: left; + margin-right: 8px; + overflow: hidden; + width: 150px; +} + .btn-header a { - color:#2f3135; + color: #2f3135; } .btn-header > a { - color:#2f3135; + color: #2f3135; } #notification-count.btn-header { - background-color:#61a0b8; - padding-right:0.5em; + background-color: #61a0b8; + padding-right: 0.5em; } -#notification-count.btn-header a{ + +#notification-count.btn-header a { color: #FFF !important; font-weight: bold; } .btn-header a span { - border-right:1px solid #61a0b8; - padding-right:0.5em; + border-right: 1px solid #61a0b8; + padding-right: 0.5em; } + /* The CSS */ .select-header select { - font-family:"Century Gothic","Trebuchet MS",Arial, sans serif; - padding:0 3px 0 0; + font-family: "Century Gothic", "Trebuchet MS", Arial, sans serif; + padding: 0 3px 0 0; margin: 0; background: #fff; - color:#2f3135; - border:none; - outline:none; + color: #2f3135; + border: none; + outline: none; display: inline-block; - -webkit-appearance:none; - -moz-appearance:none; - appearance:none; - cursor:pointer; - min-height:22px; - width:190px; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + cursor: pointer; + min-height: 22px; + width: 190px; } /* Targetting Webkit browsers only. FF will show the dropdown arrow with so much padding. */ -@media screen and (-webkit-min-device-pixel-ratio:0) { - .select-header select {padding-right:27px} +@media screen and (-webkit-min-device-pixel-ratio: 0) { + .select-header select { + padding-right: 27px + } } label.select-header { - position:relative; + position: relative; padding: 0; - display:block; + display: block; } + label.select-header:after { } + label.select-header:before { - content:''; - display:inline-block; - background:#fff url(../imgDesign/arrow_down.png) no-repeat 8px 7px; - vertical-align:middle; - font-size:0; - left:130px; - top:1px; - line-height:20px; - width:20px; - height:18px; - position:absolute; - pointer-events:none; - display:block; - color:#2f3135; + content: ''; + display: inline-block; + background: #fff url(../imgDesign/arrow_down.png) no-repeat 8px 7px; + vertical-align: middle; + font-size: 0; + left: 130px; + top: 1px; + line-height: 20px; + width: 20px; + height: 18px; + position: absolute; + pointer-events: none; + display: block; + color: #2f3135; white-space: pre-wrap; } .sp_button.logOn, .header-container #infoConnection .sp_button.logOn { - padding:0.25em 1em; - text-transform:inherit; + padding: 0.25em 1em; + text-transform: inherit; } + .header-container #infoConnection .sp_button.logOn span { - font-size:12px + font-size: 12px } .header-container #infoConnection { @@ -168,53 +180,55 @@ label.select-header:before { left: 0; position: absolute; top: 0; - padding:8px 174px 0 40px; + padding: 8px 174px 0 40px; /*background:transparent url(../imgDesign/outlook.png) top right no-repeat;*/ } -.header-container #infoConnection .avatarName { - position:relative; +.header-container #infoConnection .avatarName { + position: relative; display: inline-block; - float:left; + float: left; } -.header-container #infoConnection .avatarName .btn-header { - width:auto; + +.header-container #infoConnection .avatarName .btn-header { + width: auto; } + .header-container #avatar-img { - position:absolute; - top:5px; - left:5px; - border:1px solid #c8c8c8; - width:20px; - margin-right:1em; + position: absolute; + top: 5px; + left: 5px; + border: 1px solid #c8c8c8; + width: 20px; + margin-right: 1em; } .header-container #outils li#connectedUsers a { - text-indent:0; - display:inline-block; - width:auto; - padding-right:25px; + text-indent: 0; + display: inline-block; + width: auto; + padding-right: 25px; } .header-container #infoConnection #show-menu-spacePerso { - background:transparent url("../imgDesign/packImages.png") 0 -4px no-repeat ; - opacity:0.5; - display:inline-block; - width:25px; - height:20px; - text-indent:-3000px; + background: transparent url("../imgDesign/packImages.png") 0 -4px no-repeat; + opacity: 0.5; + display: inline-block; + width: 25px; + height: 20px; + text-indent: -3000px; } .header-container #infoConnection #show-menu-spacePerso:hover { - opacity:1; + opacity: 1; } -.spacePerso{ - display:none; +.spacePerso { + display: none; } #infoConnection { - color:#262626; + color: #262626; } #infoConnection ul { @@ -223,269 +237,294 @@ label.select-header:before { font-size: 9pt; left: 0; right: 0; - min-width:150px; + min-width: 150px; list-style-type: none; margin: 0; padding: 0; position: absolute; text-align: left; - top:23px; + top: 23px; white-space: nowrap; - z-index:104; + z-index: 104; } + #infoConnection ul li { - padding:0; - margin:0; + padding: 0; + margin: 0; } + #infoConnection ul li a { - color:#2f3135; - font-size:9pt; - display:block; - padding:5px; + color: #2f3135; + font-size: 9pt; + display: block; + padding: 5px; } + #infoConnection ul li a:hover, #infoConnection .directoryLink:hover, #infoConnection .logOut:hover { - background-color:#0078d7; - color:#FFF + background-color: #0078d7; + color: #FFF } .header-container #outils { bottom: auto; - top:0x; + top: 0x; color: #fff; position: absolute; right: 10px; - left:auto; + left: auto; text-align: left; width: auto; - padding:0; - margin:0; + padding: 0; + margin: 0; } + .header-container #outils li { - display:inline-block; + display: inline-block; margin: 0; padding: 0; - padding-top:8px; - padding-right:10px + padding-top: 8px; + padding-right: 10px } .header-container #outils li a { - color:#222; - text-indent:-3000px; - display:inline-block; - width:1px; - height:30px + color: #222; + text-indent: -3000px; + display: inline-block; + width: 1px; + height: 30px } .header-container #outils li a, #search-zone-header a { - opacity:0.8; + opacity: 0.8; } + .header-container #outils li a:hover, #search-zone-header a:hover { - opacity:1; + opacity: 1; } .header-container #outils li a#connectedUsers { } + .header-container #map-link-header { } -.header-container #map-link-header a{ - background:transparent url(../imgDesign/packImages.png) -3px -250px no-repeat; - padding-left:25px; + +.header-container #map-link-header a { + background: transparent url(../imgDesign/packImages.png) -3px -250px no-repeat; + padding-left: 25px; } -.header-container #help-link-header { +.header-container #help-link-header { } + .header-container #help-link-header a { - background:transparent url(../imgDesign/packImages.png) -2px -44px no-repeat; - padding-left:25px; + background: transparent url(../imgDesign/packImages.png) -2px -44px no-repeat; + padding-left: 25px; } -.header-container #directory-link-header { +.header-container #directory-link-header { } + .header-container #directory-link-header a { - background:transparent url(../imgDesign/packImages.png) 0 -283px no-repeat; - padding-left:25px; + background: transparent url(../imgDesign/packImages.png) 0 -283px no-repeat; + padding-left: 25px; } -.header-container #adminstration-link-header { +.header-container #adminstration-link-header { } -.header-container #adminstration-link-header a { - background:transparent url(../imgDesign/packImages.png) 0 -84px no-repeat; - padding-left:25px; + +.header-container #adminstration-link-header a { + background: transparent url(../imgDesign/packImages.png) 0 -84px no-repeat; + padding-left: 25px; } .header-container h1 { - display:none; + display: none; } #search-zone-header { position: relative; - margin:78px auto 0 auto; - display:inline-block; - background-color:transparent; - border-bottom:0; - height:49px; - padding:7px 1em 0; + margin: 78px auto 0 auto; + display: inline-block; + background-color: transparent; + border-bottom: 0; + height: 49px; + padding: 7px 1em 0; } #search-form-header a { - opacity:1 !important; - padding:0 0.5em; + opacity: 1 !important; + padding: 0 0.5em; } #search-zone-header a, #search-zone-header label { color: #2a2a2a; - margin:0; + margin: 0; } + #search-zone-header > a { - padding:4px 0 0 5px; - float:right; + padding: 4px 0 0 5px; + float: right; line-height: 24px; } + #search-zone-header > * { display: inline-block; - color:#222; + color: #222; } + #search-form-header { - display:inline-block; + display: inline-block; } /* pour les 2 type d'input platforme et directory */ -#search-form-header .selectize-control{ - border:0; +#search-form-header .selectize-control { + border: 0; } -#search-form-header > input , + +#search-form-header > input, #search-form-header input#query, -#search-form-header .selectize-control input{ - width:200px !important; - color:#999; - vertical-align:middle; - padding:0 0.25em !important; - font-size:13px !important; - line-height:27px !important; - height:27px !important; -} -#search-form-header .selectize-control input{ - line-height:25px !important; - height:25px !important; - width:198px !important; +#search-form-header .selectize-control input { + width: 200px !important; + color: #999; + vertical-align: middle; + padding: 0 0.25em !important; + font-size: 13px !important; + line-height: 27px !important; + height: 27px !important; } + +#search-form-header .selectize-control input { + line-height: 25px !important; + height: 25px !important; + width: 198px !important; +} + #search-form-header a { - color:#FFF; - display:inline-block; - font-weight:bold; - height:29px; - line-height:29px; - min-width:54px; - padding:0 8px; - text-align:center; - -moz-border-radius:2px; - border-radius:2px; - -moz-user-select:-moz-none - border:1px solid transparent; - border-bottom-left-radius:0; - border-top-left-radius:0; - height:30px; - margin:0; - outline:none; - padding:0 0; - width:60px; - -moz-box-shadow:none; - box-shadow:none; - -moz-box-sizing:border-box; - box-sizing:border-box; - background:#61a0b8; - background:-moz-linear-gradient(top,#4387fd,#4683ea); - background:linear-gradient(top,#4387fd,#4683ea); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4387fd,endColorstr=#4683ea,GradientType=1) -} - -#search-form-header a:hover{ - -moz-box-shadow:0 1px 0 rgba(0,0,0,.15); - box-shadow:0 1px 0 rgba(0,0,0,.15) -} - -#search-form-header a:focus{ - -moz-box-shadow:inset 0 0 0 1px #fff; - box-shadow:inset 0 0 0 1px #fff -} - -#search-form-header a:hover:focus{ - -moz-box-shadow:0 1px 0 rgba(0,0,0,.15),inset 0 0 0 1px #fff; - box-shadow:0 1px 0 rgba(0,0,0,.15),inset 0 0 0 1px #fff -} - -#search-form-header a:active:active{ - border:1px solid transparent; - -moz-box-shadow:inset 0 2px 0 rgba(0,0,0,.15); - box-shadow:inset 0 2px 0 rgba(0,0,0,.15); - background:#3c78dc; - background:-moz-linear-gradient(top,#3c7ae4,#3f76d3); - background:linear-gradient(top,#3c7ae4,#3f76d3); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3c7ae4,endColorstr=#3f76d3,GradientType=1) + color: #FFF; + display: inline-block; + font-weight: bold; + height: 29px; + line-height: 29px; + min-width: 54px; + padding: 0 8px; + text-align: center; + -moz-border-radius: 2px; + border-radius: 2px; + -moz-user-select: -moz-none + border: 1px solid transparent; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + height: 30px; + margin: 0; + outline: none; + padding: 0 0; + width: 60px; + -moz-box-shadow: none; + box-shadow: none; + -moz-box-sizing: border-box; + box-sizing: border-box; + background: #61a0b8; + background: -moz-linear-gradient(top, #4387fd, #4683ea); + background: linear-gradient(top, #4387fd, #4683ea); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4387fd, endColorstr=#4683ea, GradientType=1) +} + +#search-form-header a:hover { + -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, .15); + box-shadow: 0 1px 0 rgba(0, 0, 0, .15) +} + +#search-form-header a:focus { + -moz-box-shadow: inset 0 0 0 1px #fff; + box-shadow: inset 0 0 0 1px #fff +} + +#search-form-header a:hover:focus { + -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, .15), inset 0 0 0 1px #fff; + box-shadow: 0 1px 0 rgba(0, 0, 0, .15), inset 0 0 0 1px #fff +} + +#search-form-header a:active:active { + border: 1px solid transparent; + -moz-box-shadow: inset 0 2px 0 rgba(0, 0, 0, .15); + box-shadow: inset 0 2px 0 rgba(0, 0, 0, .15); + background: #3c78dc; + background: -moz-linear-gradient(top, #3c7ae4, #3f76d3); + background: linear-gradient(top, #3c7ae4, #3f76d3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#3c7ae4, endColorstr=#3f76d3, GradientType=1) } #lastResult-link-header span { - background: transparent url(../imgDesign/packImages.png) 0 -219px no-repeat; - padding-left:25px; + background: transparent url(../imgDesign/packImages.png) 0 -216px no-repeat; + padding-left: 25px; line-height: 22px; + display: inline-block; } + #advancedSearch-link-header span { - background: transparent url(../imgDesign/packImages.png) 0 -176px no-repeat; - padding-left:30px; + background: transparent url(../imgDesign/packImages.png) 0 -173px no-repeat; + padding-left: 30px; line-height: 22px; + display: inline-block; } +#search-help-header span { + background: transparent url(../imgDesign/packImages.png) 0 -47px no-repeat; + padding-left:27px; line-height: 22px; + display: inline-block; +} /* ============== Menu ============== */ #nav { position: relative; - margin-top:109px; - margin-left:25px; - display:inline-block; - height:45px; - background:transparent url() bottom left repeat-x; - z-index:102; + margin-top: 109px; + margin-left: 25px; + display: inline-block; + height: 45px; + background: transparent url() bottom left repeat-x; + z-index: 102; } + #nav a:hover { - color:#000; + color: #000; } #nav .sm-silverpeas > li > a { padding: 0 2em; position: relative; - font-size:1.3em; - line-height:35px; - height:35px; + font-size: 1.3em; + line-height: 35px; + height: 35px; } #nav > ul { margin: 0; - padding:0 0 6px 0; - background:#E2E2E2 url() top left repeat; - height:35px; + padding: 0 0 6px 0; + background: #E2E2E2 url() top left repeat; + height: 35px; border-radius: 4px !important; } -#nav > ul > li:first-child { +#nav > ul > li:first-child { } #nav > ul > li:first-child a span { - text-indent:-3000px; - display:inline-block; + text-indent: -3000px; + display: inline-block; } -#nav > ul > li:first-child a { +#nav > ul > li:first-child a { background: #E2E2E2 url(../imgDesign/packImages.png) no-repeat 9px -124px; padding-left: 18px; border-radius: 4px !important; @@ -512,17 +551,19 @@ label.select-header:before { border-style: dashed dashed dashed solid; border-color: transparent transparent transparent #555555; } + #nav .sm-silverpeas ul > li > a { - font-size:1.1em; + font-size: 1.1em; } #nav .sm-silverpeas ul a:hover, #nav .sm-silverpeas ul a:focus, #nav .sm-silverpeas ul a:active, #nav .sm-silverpeas ul a.highlighted { background: #b5ddec; color: #000000; } + .main { padding: 0 0 40px; - overflow:hidden; + overflow: hidden; } .footer-container footer { @@ -531,85 +572,86 @@ label.select-header:before { } - #pp { - background-color:#f3f2f2; - border-top:1px solid #d8d8d8; - height:30px; - padding:10px + background-color: #f3f2f2; + border-top: 1px solid #d8d8d8; + height: 30px; + padding: 10px } #pp a { - color:#006198; - text-decoration:underline; + color: #006198; + text-decoration: underline; } .right-main-container { - float:right; - width:25%; + float: right; + width: 25%; } -.right-main-container .link-more{ - float:right; - width:40px; - height:33px; - text-indent:2000px; - white-space:nowrap; - background:#FFF url(../imgDesign/packImages.png) 4px -382px no-repeat; +.right-main-container .link-more { + float: right; + width: 40px; + height: 33px; + text-indent: 2000px; + white-space: nowrap; + background: #FFF url(../imgDesign/packImages.png) 4px -382px no-repeat; margin-top: -46px; - opacity:0.7; + opacity: 0.7; } -.right-main-container .link-more:hover{ - opacity:0.85; +.right-main-container .link-more:hover { + opacity: 0.85; } -#user-favorit-home .link-more{ - float:left; - text-indent:-2000px; - background:#FFF url(../imgDesign/packImages.png) -4px -340px no-repeat; +#user-favorit-home .link-more { + float: left; + text-indent: -2000px; + background: #FFF url(../imgDesign/packImages.png) -4px -340px no-repeat; margin-top: -10px; - padding-bottom:4px; + padding-bottom: 4px; } #user-favorit-home .link-add.manage { - display:inline-block; - clear:both; - margin-top:1em; + display: inline-block; + clear: both; + margin-top: 1em; float: left; - background:-moz-linear-gradient(top,#fff,#f0eeee); - background:linear-gradient(top,#fff,#f0eeee); - border:1px solid #d8d8d8; - border-radius:6px; + background: -moz-linear-gradient(top, #fff, #f0eeee); + background: linear-gradient(top, #fff, #f0eeee); + border: 1px solid #d8d8d8; + border-radius: 6px; } -#user-favorit-home .link-add.manage span{ - background:none; +#user-favorit-home .link-add.manage span { + background: none; padding-right: 12px; } -#user-favorit-home .link-more.less{ - background:#FFF url(../imgDesign/packImages.png) -4px -422px no-repeat; + +#user-favorit-home .link-more.less { + background: #FFF url(../imgDesign/packImages.png) -4px -422px no-repeat; margin-top: -10px; - padding-bottom:4px; + padding-bottom: 4px; } -#user-favorit-home .link-more.less:hover{ +#user-favorit-home .link-more.less:hover { background-position: -4px -426px; } + .spaceHome .spaceName, -#preview .publiName, #preview-clone .publiName{ - background:#FFF url("../imgDesign/packImages.png") -10px -509px no-repeat ; - color:#25252c; - font-weight:100; +#preview .publiName, #preview-clone .publiName { + background: #FFF url("../imgDesign/packImages.png") -10px -509px no-repeat; + color: #25252c; + font-weight: 100; border-bottom: 0 none; margin-top: 0; - padding-left:28px; + padding-left: 28px; padding-bottom: 10px; - font-size:22px; - margin:18px 0 7px; - font-size:24px; - font-family:Arial; + font-size: 22px; + margin: 18px 0 7px; + font-size: 24px; + font-family: Arial; } @@ -619,23 +661,23 @@ label.select-header:before { .spaceHome #spaceEvent h2.portlet-title, .spaceHome #spaceQuiskInfo h2.portlet-title, .titre-formulaire-projet, #principal-formulaire .eventInfo, -#portletPages dl.sort dt{ - color:#61a0b8; - background:transparent url() no-repeat scroll left bottom ; +#portletPages dl.sort dt { + color: #61a0b8; + background: transparent url() no-repeat scroll left bottom; border-bottom: 0 none; margin-top: 0; - padding:12px 0 8px 0; - font-size:20px; - font-weight:100; - margin:18px 0 7px; - float:none; - font-family:Myriad Pro, Arial, sans serif; - border-bottom:1px solid #ccc + padding: 12px 0 8px 0; + font-size: 20px; + font-weight: 100; + margin: 18px 0 7px; + float: none; + font-family: Myriad Pro, Arial, sans serif; + border-bottom: 1px solid #ccc } .spaceHome #spaceManager h2.portlet-title, .spaceHome #spaceEvent h2.portlet-title, .spaceHome #spaceQuiskInfo h2.portlet-title { - padding-left:6px; + padding-left: 6px; } #home-event h2::first-letter, @@ -649,8 +691,8 @@ label.select-header:before { } -.main-home-page #cg-favorit-home h4{ - margin-top:0; +.main-home-page #cg-favorit-home h4 { + margin-top: 0; } #user-favorit-home h4::first-letter { @@ -658,73 +700,75 @@ label.select-header:before { } #portletPages dl.sort dt { - margin:15px 0 0; - height:29px; + margin: 15px 0 0; + height: 29px; } #directory #indexAndSearch .sp_button { - padding:1px 5px 2px; + padding: 1px 5px 2px; } -#portletPages h2.portlet-title{ - color:#6a6a6a; - font-weight:100; - font-size:14pt; - text-transform:normal; +#portletPages h2.portlet-title { + color: #6a6a6a; + font-weight: 100; + font-size: 14pt; + text-transform: normal; font-variant: normal; } #portletPages div.portlet-content { - padding-left:10px; + padding-left: 10px; } - -.spaceHome #spaceQuiskInfo h2.portlet-title , +.spaceHome #spaceQuiskInfo h2.portlet-title, .spaceHome #spaceManager h2.portlet-title { - margin-top:0; + margin-top: 0; } .spaceHome #spaceEvent h2.portlet-title { - border-bottom:0; + border-bottom: 0; } .right-main-container -.secteur-container h4{ - clear:both; - padding-left:6px; +.secteur-container h4 { + clear: both; + padding-left: 6px; } #home-event h2, -.right-main-container .secteur-container h4{ - clear:both; +.right-main-container .secteur-container h4 { + clear: both; } -#home-event { - position:relative; - margin-bottom:0em; + +#home-event { + position: relative; + margin-bottom: 0em; } .main-home-page #home-event .link-more { - position:absolute; - bottom:0; - right:0; - margin:0; + position: absolute; + bottom: 0; + right: 0; + margin: 0; } #home-event ul.eventList { - margin:0; padding:0; + margin: 0; + padding: 0; } -#eventList .eventInfo { - border:0; - padding:0; - margin:0 0 0 -16px; +#eventList .eventInfo { + border: 0; + padding: 0; + margin: 0 0 0 -16px; } + .portlet li.events { - background:#FFF url(); + background: #FFF url(); } .portlet div.eventShortDate { @@ -738,58 +782,61 @@ label.select-header:before { .portlet div.eventShortDate .number { color: #0BA6CE; } + .portlet div.eventShortDate { color: #717171; } - /*** FORMULAIRE **/ #principal-formulaire { - float:left; - width:70%; + float: left; + width: 70%; } + #droite-formulaire { - float:right; - width:25%; - padding:2em 2%; + float: right; + width: 25%; + padding: 2em 2%; } #principal-formulaire .eventInfo { - margin:-15px 0 1em; + margin: -15px 0 1em; } -#principal-formulaire .a-propos-formulaire-projet-main-container { - margin:0 0 1em; +#principal-formulaire .a-propos-formulaire-projet-main-container { + margin: 0 0 1em; } -#principal-formulaire .eventPlace img{ - max-width:200px; - max-height:150px; +#principal-formulaire .eventPlace img { + max-width: 200px; + max-height: 150px; } /*** FAQ ***/ #faq-home { - margin-bottom:-1em; + margin-bottom: -1em; } + .FAQ-entry-main-container, .a-propos-formulaire-projet-main-container { - background: url("../imgDesign/packImages.png") left -624px no-repeat; + background: url("../imgDesign/packImages.png") left -624px no-repeat; clear: left; margin: 0; padding-top: 0px; text-indent: 37px; } -.FAQ-entry , -.a-propos-formulaire-projet{ - background:transparent url("../imgDesign/packImages.png") bottom right no-repeat; +.FAQ-entry, +.a-propos-formulaire-projet { + background: transparent url("../imgDesign/packImages.png") bottom right no-repeat; padding-bottom: 10px; max-height: 232px; overflow: auto; } + .FAQ-entry-main-container div, .FAQ-entry-main-container a { } @@ -802,9 +849,9 @@ label.select-header:before { color: #0BA6CE; } -.link-add , -.spaceHome .link-more , -#submit-AdvancedSearch{ +.link-add, +.spaceHome .link-more, +#submit-AdvancedSearch { background: url("../imgDesign/packBtn.png") no-repeat scroll 0 0 rgba(0, 0, 0, 0); display: inline-block; float: right; @@ -819,16 +866,17 @@ label.select-header:before { } .link-add span, -.spaceHome .link-more span, +.spaceHome .link-more span, #submit-AdvancedSearch span { - background:transparent url(../imgDesign/packBtn.png) right 0 no-repeat; + background: transparent url(../imgDesign/packBtn.png) right 0 no-repeat; color: #333; display: block; line-height: 32px; padding-right: 50px; } + #submit-AdvancedSearch span { - background:transparent url(../imgDesign/packBtn.png) right -700px no-repeat; + background: transparent url(../imgDesign/packBtn.png) right -700px no-repeat; color: #333; } @@ -842,58 +890,69 @@ label.select-header:before { /*** END FAQ ***/ /*** WEATHER ***/ -#weather-home #ephemeride { - font-style:italic; - margin:1em 0; - color:#ec8601; +#weather-home #ephemeride { + font-style: italic; + margin: 1em 0; + color: #ec8601; } -#weather-home #ephemeride:before { - content:'Nous fêtons les '; - color:#000; + +#weather-home #ephemeride:before { + content: 'Nous fêtons les '; + color: #000; } + #weather-home { - height:160px + height: 160px } -#weather-home.secteur-container h4::first-letter { +#weather-home.secteur-container h4::first-letter { } -#localisation-weather{ - margin-bottom:1em; + +#localisation-weather { + margin-bottom: 1em; } -#localisation-weather a{ - color:#b8b8b8; + +#localisation-weather a { + color: #b8b8b8; } + #localisation-weather a:hover, #localisation-weather .select, -#localisation-weather .label{ - color:#ec8601; +#localisation-weather .label { + color: #ec8601; } -#weather-home .day{ - width:50%; - float:left; + +#weather-home .day { + width: 50%; + float: left; } -#weather-home .day img{ - height:45px; - float:left; + +#weather-home .day img { + height: 45px; + float: left; } -#weather-home .min{ - color:#f8931d; + +#weather-home .min { + color: #f8931d; } -#weather-home .max{ - color:#f60b3c; + +#weather-home .max { + color: #f60b3c; } -#weather-home .day .label{ - clear:left; - color:#b8b8b8; - font-size:11px; - text-align:center; - width:61px; + +#weather-home .day .label { + clear: left; + color: #b8b8b8; + font-size: 11px; + text-align: center; + width: 61px; } + #today-event { - clear:both; - padding-top:1em; + clear: both; + padding-top: 1em; } /*** END WEATHER ***/ @@ -901,24 +960,25 @@ label.select-header:before { /*** PDC ***/ #bloc-advancedSeach { - clear:both; - padding-top:0; - margin-bottom:1.5em; + clear: both; + padding-top: 0; + margin-bottom: 1.5em; } -#bloc-advancedSeach #query{ - border-radius:12px; - -webkit-border-radius:12px; - -moz-border-radius:12px; - border:1px solid #d1d1d1; - width:90%; - height:20px; - box-shadow: -2px -3px 4px rgba(0, 0, 0, 0.1) inset; - padding:2px 2%; - margin:0.5em 0 1em; +#bloc-advancedSeach #query { + border-radius: 12px; + -webkit-border-radius: 12px; + -moz-border-radius: 12px; + border: 1px solid #d1d1d1; + width: 90%; + height: 20px; + box-shadow: -2px -3px 4px rgba(0, 0, 0, 0.1) inset; + padding: 2px 2%; + margin: 0.5em 0 1em; } -#bloc-advancedSeach #used_pdc .field .champs.pdcAxis img{ - display:none; + +#bloc-advancedSeach #used_pdc .field .champs.pdcAxis img { + display: none; } #bloc-advancedSeach #used_pdc .field label { @@ -928,7 +988,7 @@ label.select-header:before { width: 122px; } -#bloc-advancedSeach #used_pdc .field .champs select { +#bloc-advancedSeach #used_pdc .field .champs select { width: 160px; } @@ -937,98 +997,102 @@ label.select-header:before { } -#submit-AdvancedSearch:hover span{ - opacity:1; +#submit-AdvancedSearch:hover span { + opacity: 1; } /*** END PDC ***/ -#user-favorit-home ul { - list-style-image:url(../imgDesign/puce-favorit.png); - padding:0 0 0 30px +#user-favorit-home ul { + list-style-image: url(../imgDesign/puce-favorit.png); + padding: 0 0 0 30px } -#user-favorit-home ul a{ - line-height:10pt; - display:block; + +#user-favorit-home ul a { + line-height: 10pt; + display: block; } -#user-favorit-home ul li{ - padding-bottom:1em; + +#user-favorit-home ul li { + padding-bottom: 1em; } -#user-favorit-home ul a:hover{ - color:#f8931d; + +#user-favorit-home ul a:hover { + color: #f8931d; } .principal-main-container { - margin-right:27%; - padding-top:18px; + margin-right: 27%; + padding-top: 18px; } + .principal-main-container .secteur-container h4, -#user-favorit-home h4{ - padding-left:0.5em; +#user-favorit-home h4 { + padding-left: 0.5em; } .main-home-page #cg-favorit-home { - width:240px; - position:absolute; + width: 240px; + position: absolute; } + #user-favorit-home { - width:240px; - position:absolute; - left:0; - top:357px; + width: 240px; + position: absolute; + left: 0; + top: 357px; } - .principal-main-container .cg-favorit-list { - margin:0; - padding:0; - list-style-type:none; + margin: 0; + padding: 0; + list-style-type: none; } -.principal-main-container .cg-favorit-list li{ - margin-bottom:0.5em; +.principal-main-container .cg-favorit-list li { + margin-bottom: 0.5em; } -.principal-main-container .cg-favorit-list li:nth-child(2n+1) a{ - margin-left:30px; - margin-right:15px; +.principal-main-container .cg-favorit-list li:nth-child(2n+1) a { + margin-left: 30px; + margin-right: 15px; } .principal-main-container .cg-favorit-list a { - margin-left:30px; - background-color:#a9aaab; - font-size:12pt; - float:left; - margin-bottom:15px; - width:70px; - display:block; + margin-left: 30px; + background-color: #a9aaab; + font-size: 12pt; + float: left; + margin-bottom: 15px; + width: 70px; + display: block; } .principal-main-container .cg-favorit-list a:hover { - background-color:#61a0b8; + background-color: #61a0b8; } .principal-main-container .cg-favorit-list a span { - display:none + display: none } .principal-main-container .cg-favorit-list a img { - width:70px; + width: 70px; } -.rslides { - padding:0; - height:auto +.rslides { + padding: 0; + height: auto } .rslides li { - width:100%; - height:auto + width: 100%; + height: auto } -.rslides li img{ - width:100%; +.rslides li img { + width: 100%; } .rslides .caption { @@ -1047,25 +1111,26 @@ label.select-header:before { max-width: 90%; max-height: auto; overflow: auto; - border-radius:8px 0 0 8px; - opacity:0.85; + border-radius: 8px 0 0 8px; + opacity: 0.85; } .rslides .caption h2 a, -.rslides .caption p{ - color:#444; - font-size:13px; - font-weight:100; +.rslides .caption p { + color: #444; + font-size: 13px; + font-weight: 100; } + .rslides .caption h2 a { - font-size:16px; - font-weight:bold; - color:#444 + font-size: 16px; + font-weight: bold; + color: #444 } .centered-btns_nav { - top:9em; - opacity:0.95; + top: 9em; + opacity: 0.95; } .rslides li { @@ -1074,16 +1139,16 @@ label.select-header:before { /*********** News as list *******************/ #carrousel-actualite .list-news { - padding:0; - height:auto + padding: 0; + height: auto } #carrousel-actualite .list-news li { - width:100%; - height:100px; + width: 100%; + height: 100px; } -#carrousel-actualite .list-news li img{ +#carrousel-actualite .list-news li img { width: 200px; float: left; } @@ -1094,15 +1159,17 @@ label.select-header:before { } #carrousel-actualite .list-news .caption h2 a, -#carrousel-actualite .list-news .caption p{ - color:#444; - font-size:13px; - font-weight:100; +#carrousel-actualite .list-news .caption p { + color: #444; + font-size: 13px; + font-weight: 100; } + #carrousel-actualite .list-news .caption h2 a { - font-size:16px; - font-weight:bold; + font-size: 16px; + font-weight: bold; } + #carrousel-actualite .list-news .caption h2 { margin: 0px; } @@ -1111,11 +1178,12 @@ label.select-header:before { content: " - "; } -#carrousel-actualite { - margin-left:260px; - position:relative; - overflow:hidden; +#carrousel-actualite { + margin-left: 260px; + position: relative; + overflow: hidden; } + .main-home-page #last-publication-home, .main-home-page #rssNews, .main-home-page #freeZone { @@ -1123,29 +1191,47 @@ label.select-header:before { margin-top: 1em; } -#carrousel-actualite li>a { +#carrousel-actualite li > a { font-weight: bold; } #actualite-magique-home { - clear:left; + clear: left; } .actualite-magique-main-container { - background-color:#f9f8f8; - margin-top:-12px; + background-color: #f9f8f8; + margin-top: -12px; } #la-magie { - float:left; - margin-right:46px; + float: left; + margin-right: 46px; +} + + +.actualite-magique-main-container span { + color: #f8931d; + font-size: 120%; + padding-top: 1em; + display: block +} + +.actualite-magique-main-container ul { + margin: 0; + padding: 0 0 0 12px; + list-style-image: url(../imgDesign/puce.png); } +.actualite-magique-main-container ul li { + margin: 1em 0 0 12px; + padding: 0; +} -.actualite-magique-main-container span {color:#f8931d;font-size:120%; padding-top:1em ; display:block} -.actualite-magique-main-container ul {margin:0 ; padding:0 0 0 12px; list-style-image:url(../imgDesign/puce.png);} -.actualite-magique-main-container ul li{margin:1em 0 0 12px ; padding:0;} -.actualite-magique-main-container strong {display:block; text-transform:uppercase} +.actualite-magique-main-container strong { + display: block; + text-transform: uppercase +} /* =============== ALL: IE Fixes @@ -1158,9 +1244,8 @@ label.select-header:before { @media only screen and (min-width: 480px) { - - } + @media only screen and (min-width: 768px) { /* =============== @@ -1169,6 +1254,7 @@ label.select-header:before { } + @media only screen and (min-width: 980px) { /* =============== @@ -1177,13 +1263,16 @@ label.select-header:before { } + @media only screen and (min-width: 1200px) { } + @media only screen and (min-width: 1800px) { } + /* ========================================================================== Helper classes ========================================================================== */ @@ -1194,16 +1283,19 @@ label.select-header:before { overflow: hidden; *text-indent: -9999px; } + .ir:before { content: ""; display: block; width: 0; height: 150%; } + .hidden { display: none !important; visibility: hidden; } + .visuallyhidden { border: 0; clip: rect(0 0 0 0); @@ -1214,6 +1306,7 @@ label.select-header:before { position: absolute; width: 1px; } + .visuallyhidden.focusable:active, .visuallyhidden.focusable:focus { clip: auto; @@ -1223,17 +1316,21 @@ label.select-header:before { position: static; width: auto; } + .invisible { visibility: hidden; } + .clearfix:before, .clearfix:after { content: " "; display: table; } + .clearfix:after { clear: both; } + .clearfix { *zoom: 1; } @@ -1244,64 +1341,16 @@ label.select-header:before { @media print { * { - background: transparent !important; - color: #000 !important; /* Black prints faster: h5bp.com/s */ box-shadow: none !important; text-shadow: none !important; } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - /* - * Don't show links for images, -or javascript/internal links - */ - - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - thead { - display: table-header-group; /* h5bp.com/t */ - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 0.5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - page-break-after: avoid; + .tableBoard { + background: transparent; } } - /****** Ticker ******/ #sp-layout-header-part #desktop-notifications-permission { background: url('/silverpeas/util/icons/cog.png') no-repeat scroll 0 0 transparent; @@ -1309,10 +1358,10 @@ or javascript/internal links padding-left: 20px; position: absolute; right: 0; - top:1px; - padding-right:1em; - font-weight:bold; - color:#000 + top: 1px; + padding-right: 1em; + font-weight: bold; + color: #000 } #sp-layout-header-part #ticker { @@ -1334,12 +1383,13 @@ or javascript/internal links display: block; font-size: 0.75em; height: 22px; - margin:0; + margin: 0; padding: 0; width: 100%; } + #sp-ticker { - display:block; + display: block; } #sp-ticker .ticker { @@ -1353,12 +1403,13 @@ or javascript/internal links #sp-ticker .ticker-title { padding-top: 2px; - padding-left:1em; + padding-left: 1em; color: #000; font-weight: bold; background-color: transparent; text-transform: uppercase; } + #sp-ticker .ticker-content { margin: 0px; padding-top: 3px; @@ -1369,14 +1420,14 @@ or javascript/internal links overflow: hidden; white-space: nowrap; line-height: 1.2em; - padding-left:1em; + padding-left: 1em; } #sp-ticker .ticker-content .ticker-item-date { color: #000; } -#sp-ticker a span{ +#sp-ticker a span { color: #000; } diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/css/main.css b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/css/main.css new file mode 100644 index 00000000..78062f1e --- /dev/null +++ b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/css/main.css @@ -0,0 +1,2124 @@ +@import url("normalize.min.css"); +@import url("stylesheet.css"); + +/* ========================================================================== + + ========================================================================== */ +/* PARAMETRAGE ORDER DES BLOCS PAGE D'ACCUEIL ET LOGO */ +/**************************************************/ + +/* ordre des blocs redefini avec order */ +#next-event-part { + order: 1; + background-color: var(--couleur-de-fond-clair); + padding: 1em; + flex-basis: calc(50% - 5em); +} + +.main-home-page #bloc-advancedSeach { + order: 2; +} + +#user-favorit-home { + order: 3; +} + +#faq-home { + order: 4; + padding: 1em 0; + text-align: center; +} + +#thinFreeZone { + order: 5; + overflow: hidden; +} + +#weather-home { + order: 0; + flex-basis: 100%; +} + +.main-home-page #bloc-advancedSeach { + background-color: var(--couleur-foncee); + padding: 1em; + flex-basis: calc(50% - 5em); +} + +/* ordre des blocs redefini avec order */ + +.principal-main-container #carrousel-actualite { + order: 0; +} + +.principal-main-container #secondaryNews { + order: 1; +} + +.principal-main-container #last-publication-home { + order: 3; +} + +.principal-main-container #new-users-home { + order: 2; +} + +.principal-main-container #rss-part { + order: 6; +} + +.principal-main-container #freeZone { + order: 5; +} + +.principal-main-container #thirdNews { + order: 4; +} + +/* la width a adapter */ +#logo-header { + background: transparent url(../imgDesign/logo.png) no-repeat left center; + background-size: auto; + display: block; + width: 200px; + height: 64px; + position: absolute; + top: 0; + left: 0; + z-index: 10; + background-size: auto 100%; +} + +/* et du coup en fonction le left */ + +#topar-header { + height: 40px; + background-color: #FFF; + position: absolute; + top: 0.75em; + left: 210px; + right: 0; +} + +/*****************************************************/ +/*****************************************************/ +/*****************************************************/ + +.main-home-page { + background-color: #fff; +} + +#sp-layout-body-part { + position: relative; +} + +#sp-layout-body-part-layout-navigation-part { + padding-top: 1em; + background-color: var(--couleur-de-fond-clair); +} + +#sp-layout-header-part { + height: 140px !important; +} + +#sp-admin-layout-body-part { + padding-top: 1em; +} + +#sp-layout-body-part-layout-content-part { + padding-top: 1em; +} + +#sp-layout-footer-part { + height: 40px !important; + background-color: #f0f0f0; +} + +.header-container { + position: relative; + height: 120px; +} + + +#topar-header * { + font-size: 13px !important; +} + +.btn-header, +#search-form-header a { + display: block; + float: left; + position: relative; + margin-right: 0; +} + +#search-form-header a { + display: inline-block; + float: none; +} + +.btn-header a { + color: #FFF; +} + +.header-container #infoConnection > a:first-child { + position: absolute; + top: 4px; + left: 4px; + width: 30px; + height: 30px; + border-radius: 15px; + overflow: hidden; + z-index: 100; + text-align: center; +} + +.header-container #avatar-img { + height: auto; + width: 30px; +} + +.select-header select, +.header-container #infoConnection .avatarName, +#notification-count.btn-header { + position: relative; + display: inline-block; + width: auto; + height: 40px; + padding: 11px 2rem 11px 32px; + font-weight: 500; + color: #333; + text-decoration: none; + cursor: pointer; + background: var(--couleur-de-fond-clair); + border: 1px solid #DDD; + border-radius: 5px; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + background-image: url(../imgDesign/arrow_down-black.png); + background-repeat: no-repeat; + background-position: calc(100% - 10px) 50%; + padding-right: 20px; + margin-top: 0; + font-weight: 500; + margin-right: 1em; +} + +.select-header select { + width: 12em; +} + +.header-container #infoConnection .avatarName, +#notification-count.btn-header { + position: relative; + float: left; + display: inline-block; + padding: 7px .875rem 8px .875rem; + height: auto; + line-height: 24px; + background-image: url(); +} + +.header-container #infoConnection .avatarName { + padding-left: 40px; +} + +.select-header::before { + content: ' '; + display: block; + position: absolute; + top: 14px; + left: 14px; + background-color: var(--couleur-flashy); + height: 12px; + width: 12px; + border-radius: 6px; + z-index: 10; +} + +.select-header select option { + padding: 0.5em; +} + +.header-container #infoConnection { + height: 32px; + display: inline; +} + +.sp_button.logOn, +.header-container #infoConnection .sp_button.logOn { + white-space: nowrap; + width: auto; + height: inherit; + overflow: inherit; + display: inline-block; + margin-right: 0.7em; + text-transform: initial; + color: #FFF; + border-radius: 20px; + background: #7eb73b url(../imgDesign/logOn.png) no-repeat 1em 0.25em; + float: left; + padding: 0.2em 1em 0.2em 2.5em; + border: 1px solid #6ca22c; +} + + +.sp_button.logOn span { + font-size: 12px +} + +.header-container #infoConnection .avatarName .btn-header { + position: unset; + padding-right: 1em; +} + +.all-read-user-notification #notification-count.btn-header { + background: var(--couleur-de-fond-clair); + border: 1px solid #DDD; +} + +.all-read-user-notification #notification-count.btn-header { + background: #f9f9f9; +} + +.header-container #infoConnection .avatarName:hover a, +#notification-count.btn-header:hover a { + color: #333; +} + +.header-container #infoConnection .avatarName a, +#notification-count.btn-header a { + color: #333; +} + +.silverpeas-user-notifications.unread-user-notification #notification-count.btn-header { + background-color: var(--couleur-de-fond-clair); +} + +.silverpeas-user-notifications.unread-user-notification #notification-count.btn-header a { + font-weight: 600; +} + +.silverpeas-user-notifications.unread-user-notification #notification-count.btn-header a:before { + content: ''; + border-radius: 5px; + width: 10px; + height: 10px; + background: var(--couleur-flashy); + display: inline-block; + margin-right: 8px; + animation-duration: .7s; + animation-name: clignoter; + animation-iteration-count: infinite; + transition: none; +} + +@keyframes clignoter { + 0% { + opacity: 1; + } + 40% { + opacity: 0; + } + 100% { + opacity: 1; + } +} + +.silverpeas-user-notifications { + float: left; +} + + +.select-header select:hover, +.header-container #infoConnection .avatarName:hover, +#notification-count.btn-header:hover, +.silverpeas-user-notifications.unread-user-notification #notification-count.btn-header:hover { + background-color: rgb(var(--couleur-de-fond-clair), 0.8); +} + +.header-container #infoConnection #show-menu-spacePerso { + background: transparent url("../imgDesign/arrow_down-black.png") 0 0 no-repeat; + display: inline-block; + width: 16px; + height: 16px; + text-indent: -3000px; + position: absolute; + top: calc(50% - 4px); + right: 0.25em; +} + +.header-container #infoConnection #show-menu-spacePerso:hover { + opacity: 1; +} + +.spacePerso { + display: none; +} + +#infoConnection .spacePerso ul { + background-color: #FFF; + border-radius: .25rem; + border: 1px solid #cad2d2; + list-style-type: none; + margin: 0; + padding: 0; + position: absolute; + left: 0px; + top: 3em; + min-width: 100%; + text-align: left; + z-index: 100; + white-space: nowrap; +} + +#infoConnection .spacePerso ul li { + padding: 0em; + background: #FFF; + border-bottom: 1px solid #cad2d2; + margin: 0 +} + +#infoConnection .spacePerso ul li:last-child { + border: 0 +} + +#infoConnection .spacePerso ul li a { + color: #141414 !important; + font-size: 10pt; + display: block; + font-weight: 500; + padding: 5px; + margin: 0 +} + +#infoConnection .spacePerso ul li:hover, +#infoConnection .spacePerso ul li a:hover { + background-color: var(--couleur-de-fond-clair); +} + +.header-container #outils { + bottom: auto; + top: auto; + color: #bbbbbb; + position: relative; + right: auto; + left: auto; + text-align: left; + width: auto; + padding: 0; + height: 32px; + margin: 0; + display: inline-block; + float: left; +} + +.header-container #outils li { + display: block; + margin: 0; + padding: 0; + float: left; +} + +.header-container #outils li a { + color: #333; + font-weight: 500; + line-height: 32px; + display: inline-block; + height: 32px; + padding: 4px 1em 4px 3em; +} + +.header-container #outils li a:hover { + background-color: #f9f9f9; +} + +.header-container #outils li a, +#search-zone-header a { +} + +.header-container #outils li a:hover, +#search-zone-header a:hover { + color: #333; +} + + +.header-container #outils li#map-link-header a { + background-image: url(../imgDesign/packImages.png); + background-position: 5px -244px; + background-repeat: no-repeat; + padding-left: 36px; +} + +.header-container #outils li#help-link-header { + display: none; +} + +.header-container #outils li#directory-link-header a { + background-image: url(../imgDesign/packImages.png); + background-position: 5px -277px; + background-repeat: no-repeat; + padding-left: 36px; +} + +.header-container #adminstration-link-header a { + background-image: url(../imgDesign/packImages.png); + background-position: 5px -78px; + background-repeat: no-repeat; + padding-left: 30px; +} + + +.header-container h1 { + display: none; +} + +#search-zone-header { + display: inline-block; + height: 60px; + padding: 0; + position: absolute; + top: 25px; + right: 0; + z-index: 12; + padding-top: 25px; +} + +#search-zone-header > * { + padding-top: 0; +} + +#search-form-header .selectize-control .selectize-input, +#search-form-header #select-user-group-queryDirectory .selectize-input, +#search-form-header input#query { + width: 18em !important; + padding:1em !important; + margin: 0 !important; + font-size: 12px; + height: 51px; + border-color: #FFF; +} + +#search-form-header input#query { + padding:2em !important; +} + +.selectize-control.single .selectize-input, .selectize-control.single .selectize-input input { + line-height: 28px !important;; +} + +#search-form-header #select-user-group-queryDirectory .search-input-container input { + min-height: 27px !important; + font-size: 12px; +} + +#search-form-header a { + opacity: 1 !important; + padding: 0 0 0 0.5em; +} + +#search-zone-header label { + display: none; +} + +#search-zone-header a { + width: 40px; + height: 60px; + line-height: 60px; + text-align: center; + font-size: 20px; +} + +#search-form-header a { + background-color: var(--couleur-flashy); + border-radius: 0; + color: var(--couleur-text-sur-flashy); + font-weight: 600; +} + +#search-zone-header > a span { +} + +#search-zone-header > a { + padding: 4px 0 0 5px; + position: absolute; + top: 0; + left: 0; +} + +#search-zone-header > * { + display: inline-block; + color: #222; +} + +#search-form-header { + display: block; + float: left; +} + +#search-form-header #select-user-group-queryDirectory .selectize-input { + +} + +#search-form-header .selectize-control { + border: 0; +} + +#search-form-header input#query, +#search-form-header #select-user-group-queryDirectory .search-input-container input { + +} + +#search-zone-header #inputSearchSwitchable .switchSearchMode.directory.off, +#search-zone-header #inputSearchSwitchable .switchSearchMode.directory.on { + right: 2em; +} + +#search-zone-header #inputSearchSwitchable .switchSearchMode { + right: 0.3em; + top: calc(50% - 8px); + border: 0; + border-radius: 0; +} + +a#lastResult-link-header { + background: transparent url(../imgDesign/packImages.png) 0 -214px no-repeat; + clear: left; + width: auto; + height: auto; + line-height: 16px; + padding-left: 26px; + margin-right: 1em; +} + +a#advancedSearch-link-header { + background: transparent url(../imgDesign/packImages.png) 0 -171px no-repeat; + width: auto; + height: auto; + line-height: 16px; + padding-left: 30px; + left: 150px; +} + +a#search-help-header { + background: transparent url(../imgDesign/packImages.png) 0 -47px no-repeat; + width:25px; + height:17px; + text-indent: 4000px; + padding-left: 0; + left:0; + top:32px; +} + +/* ============== + Menu + ============== */ +#nav { + background: var(--couleur-foncee); + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 60px; + z-index: 1; + font-family: "Courier New", Courier, monospace; +} + +#nav > ul { + margin: 0 283px 0 0; + width: calc(100% - 283px); + padding: 0; + overflow-wrap: anywhere; + align-items: center; + display: flex; + justify-content: center; +} + +#nav .sm-silverpeas.displayMenuAppIcons-true .app img { + z-index: 1; +} + +#nav > ul > li { + display: block; + float: left; + width: auto; + margin: 0; + text-align: right; +} + +#nav > ul > li:hover > ul { + display: block; + min-width: 300px; +} + +#nav > ul > li > ul li.space:hover > ul { + display: block; + width: 300px; + left: 300px; + top: -10px; + z-index: 10; +} + +#nav > ul > li > ul li.space li.space:hover > ul { + display: block; + width: 300px; + left: -300px; + top: -10px; + z-index: 11; +} + +#nav > ul > li > ul li.space li.space li.space:hover > ul { + display: block; + width: 300px; + left: 300px; + top: -10px; + z-index: 12; +} + +#nav > ul > li > ul li.space li.space li.space li.space:hover > ul { + display: block; + width: 300px; + left: -300px; + top: -10px; + z-index: 13; +} + +#nav > ul > li > a { + display: block; + text-align: center +} + +#nav > ul > li > a { + color: #FFF; + text-decoration: none; + display: block; + padding: 6px 2em 6px 1em; + height: 60px; + margin: 0em; + line-height: 1.25em; + text-align: center; + line-height: 18px; + /*font-family: "Courier New", Courier, monospace;*/ + text-transform: uppercase; + font-weight: 600; + display: flex; + align-items: center; +} + +#nav > ul > li.selected > a { + background-color: var(--couleur-flashy); +} + +#nav > ul > li > a:hover { + background-color: var(--couleur-flashy); + color: var(--couleur-text-sur-flashy) !important; +} + +#nav .sm-silverpeas ul a.has-submenu { + text-transform: uppercase; +} + +#nav ul ul a span { + line-height: 110%; +} + +#nav > ul > li > div { + display: block; +} + +#nav > ul > li > div > a { + padding-top: 8px; + +} + +/* la fleche du menu vers le bas */ +#nav .sm-silverpeas > li > a span.sub-arrow { + margin-top: -4px; + display: block; + width: 16px; + height: 16px; + right: 2px; + background: transparent url(../imgDesign/arrow_down-white.png) 0 0 no-repeat; + border-radius: 0; + text-indent: -300em; +} + +/* la fleche du sous menu vers la droite */ +#nav .sm-silverpeas ul a span.sub-arrow { + margin-top: -5px; + border-width: 4px; + border-style: dashed dashed dashed solid; + border-color: transparent transparent transparent #666; +} + +#nav .sm-silverpeas ul a:hover, #nav .sm-silverpeas ul a:focus, #nav .sm-silverpeas ul a:active, #nav .sm-silverpeas ul a.highlighted { + background: #FFF; + color: var(--couleur-flashy); +} + +#nav .megaMenu-spaceDescription { + font-style: italic; + color: #666; +} + +#nav .mega-menu { + padding: 1em; +} + +#nav .mega-menu > li > ul > li.space > a { + font-family: "Courier New", Courier, monospace; + text-transform: initial; +} + +.sm-silverpeas > li > .mega-menu > li.space { + padding: 1em 1em 0 1em; + width: 33%; +} + +.sm-silverpeas > li > .mega-menu > li.app { + padding: 0.25em; +} + +#nav .sm-silverpeas > li > .mega-menu > li { + margin-bottom: 0; +} + +#nav .sm-silverpeas .app a { + color: #000; +} + +#nav .sm-silverpeas > li.has-mega-menu:hover > a:after { + content: " "; + position: absolute; + bottom: -1px; + left: calc(50% - 5px); + width: 0; + height: 0; + overflow: hidden; + border-width: 9px; + border-style: dashed dashed solid dashed; + border-color: transparent transparent #FFF transparent; +} + +/* +.sm-silverpeas > li > .mega-menu > li:nth-child(3n+1){ + clear:left; +}*/ + + +/* LES BOUTONS */ +.sp_button:hover, button.button:hover { + background: var(--couleur-boutonHover); + color: var(--couleur-text-sur-boutonHover); +} + +#advanced-search form .sp_button, #globalResult form .sp_button, #directory form .sp_button, #navBlog .sp_button { + padding: 1px 10px; + font-size: 10pt !important; + height: 30px; + line-height: 30px; + margin-top: 0; +} + +/* ONGLET */ + +.sousOnglets, .sp_tabOn a, .sp_tabOff a:hover, .sp_tabOn span { + background-color: var(--couleur-flashy); + color: var(--couleur-text-sur-flashy); +} + +.sp_tabOff a, .sp_tabOff span { + background-color: var(--couleur-foncee); + color: var(--couleur-text-sur-foncee); +} + +/* ORGANISATION BLOCS HOME PAGE */ + + +.main-home-page .right-main-container { + float: right; + width: calc(100% - 1000px - 1em - 200px); + padding-top: 2em; + display: flex; + flex-wrap: wrap; +} + +.main-home-page .principal-main-container { + padding-left: calc(150px + 3em); + float: left; + width: 1000px; + padding-top: 2em; + display: flex; + flex-wrap: wrap; +} + +.main-home-page .principal-main-container > div { + margin: 0 3em 2em 0; + flex-basis: calc(50% - 3em); + position: relative; +} + +.main-home-page .right-main-container > div { + flex-basis: calc(50% - 3em); + margin: 0 3em 2em 0; +} + + +.main-home-page #freeZone #freeZone-content { + background-color: var(--couleur-de-fond-clair); + padding: 1em; +} + +/* LES NEWS */ + +#carrousel-actualite .link-more { + display: inline-block; +} + +.main-home-page .principal-main-container div > h4, +.main-home-page #carrousel-actualite h4, +.main-home-page #secondaryNews h4 { + display: flex; + justify-content: left; + +} + +.main-home-page #secondaryNews h4:after { + content: ' du réseau'; + height: auto; + background-color: transparent; + margin-left: 0.25em; +} + +.main-home-page #thirdNews h4:after { + content: ' 3'; + height: auto; + background-color: transparent; + margin-left: 0.25em; +} + +.main-home-page #secondaryNews h4:before, +.main-home-page #carrousel-actualite h4:before, +.main-home-page #carrousel-actualite h4:after { + display: none; +} + +.main-home-page .principal-main-container .list-news { + margin: 1em 0 0 0; + padding: 0; + list-style-type: none; +} + +.main-home-page .principal-main-container .list-news li { + margin: 0 0 1em 0; + display: flex; + border: 1px solid #dadada; + padding: 1em; +} + +.main-home-page .principal-main-container .list-news li > a { + background: #f0f0f0; + border-bottom: 1px solid #cad2d2; +} + +.main-home-page .principal-main-container .list-news li img { + width: 160px; +} + +.main-home-page .principal-main-container .list-news .caption { + width: calc(100% - 160px - 1em); + border-left: 0; + position: relative; + top: auto; + bottom: auto; + left: auto; + right: auto; + padding: 0 1em; + text-align: left; + background: #FFF; + color: #333; + margin: 0; + max-height: inherit; + overflow: auto; +} + +.main-home-page .principal-main-container .list-news .caption .sp-link { + position: absolute; + bottom: 0; + right: 0; + height: 24px; + line-height: 24px; + padding: 0 12px; +} + +.main-home-page .principal-main-container .list-news .caption .sp-link span:before { + content: '# '; +} + +.main-home-page .principal-main-container .list-news .caption .news-date { + position: absolute; + bottom: 0; + left: 1em; +} + +.main-home-page .principal-main-container .list-news .caption h2 { + margin: 0; + padding: 0; +} + +.main-home-page .principal-main-container .list-news .caption h2 a { + padding-top: 0; + padding-right: 0; + font-size: 12pt; + color: var(--couleur-principale); +} + +.main-home-page .principal-main-container .list-news .caption h2 a:hover { + color: var(--couleur-flashy); +} + +.main-home-page .principal-main-container .list-news .caption p { + padding-bottom: 1em; +} + +.main-home-page .principal-main-container #carrousel-actualite .centered-btns_nav { + display: none; +} + +.main-home-page .principal-main-container .centered-btns_tabs { + display: block; + position: absolute; + top: 19px; + right: -4px; +} + +.centered-btns_here a, .transparent-btns_here a, .large-btns_here a { + background: var(--couleur-flashy); +} + +.main-home-page .principal-main-container .rslides { + border-radius: 20px; +} + +.main-home-page .principal-main-container .rslides li img { + border-radius: 20px; +} + +.main-home-page .principal-main-container .rslides .caption { + top: auto; + bottom: 0; + left: 0; + right: 0; + width: 100%; + overflow: auto; + max-height: inherit; + background-color: var(--couleur-de-fond-clair); + padding: 0; + text-align: left; +} + +.main-home-page .principal-main-container .rslides .caption .news-date { + display: block; + color: var(--couleur-date-home); + font-size: 1.25em; + padding-bottom: 0.25em; +} + +.main-home-page .principal-main-container .rslides .caption h2 a { + color: var(--couleur-flashy); + font-size: 18px; + font-weight: 600; +} + +.rslides li { + height: 356px; + padding-bottom: 44px; +} + +.main-home-page .principal-main-container .rslides .caption h2 { + padding: 0.85em 0.5em 0em; + margin: 0; +} + +.main-home-page .principal-main-container .rslides .caption p { + margin-top: 0; + padding: 0.85em 1em 3em 1em; +} + +.main-home-page .principal-main-container .rslides .caption .sp-link { + position: absolute; + bottom: 1em; + left: 1em; + right: auto; + padding: 0.35em; + background-color: var(--couleur-flashy); + color: var(--couleur-text-sur-flashy); + line-height: 100%; + width: auto; +} + +.main-home-page .principal-main-container .rslides .caption .sp-link:hover { + color: #FFF; +} + +.main-home-page .principal-main-container .rslides .caption .sp-link span:before { + content: '# '; + display: inline; +} + +/* masquage des boutons vers les différentes application actulaité */ +.main-home-page .principal-main-container #news-link-apps { + display: none; +} + +/* LES NOUVEAUX UTILISATEURS */ +.main-home-page #new-users-home .new-users-list { + margin: 0; + padding: 0; +} + +.principal-main-container #new-users-home::before { + background: transparent url(../imgDesign/welcome.png) 0 0 no-repeat; + content: ' '; + display: block; + position: absolute; + top: 0; + left: -1em; + z-index: 10; + width: 100px; + height: 150px; +} + +.main-home-page #new-users-home .new-users-main-container { + background-color: var(--couleur-de-fond-clair); + border-radius: 15px; + padding: 15px; +} + +#new-users-home .new-users-list li { + margin-bottom: 2em; +} + +#new-users-home .new-users-list .field.userToZoom { + font-size: 18px; + font-weight: 500; + padding-top: 0.25em; +} + +#new-users-home div.user-card, +#spaceUsers div.user-card { + border: 0; + background-color: var(--couleur-de-fond-clair); + margin-bottom: 0; +} + +#new-users-home div.user-card, +#new-users-home div.user-card .field { + width: auto; +} + +/* LES DERNIERES PUBLI */ + +.principal-main-container #last-publication-home { + position: relative; +} + +.principal-main-container #last-publication-home:before { + background: transparent url(../imgDesign/deco-publications.png) 0 0 no-repeat; + content: ' '; + display: block; + position: absolute; + top: -2em; + right: -2em; + z-index: 10; + width: 150px; + height: 150px; +} + +.last-publication-list { + list-style-type: none; + padding: 0; +} + +.last-publication-list li { + list-style-image: none; +} + + +/* les raccroucis */ +.main-home-page .principal-main-container #cg-favorit-home h4 { + display: none; +} + +.main-home-page .principal-main-container #cg-favorit-home { + position: absolute; + top: 2em; + left: 0; + width: 150px; +} + +.cg-favorit-list { + list-style-type: none; + margin: 0; + padding: 0; +} + +.cg-favorit-list li { + margin: 0 0 1em 0; + padding: 1em 1em 0em 1em; + position: relative; + text-align: center; + background-color: var(--couleur-de-fond-clair); + height: 107px; +} + +.cg-favorit-list li:first-child { + height: 120px; +} + +.cg-favorit-list li a { + display: block; +} + +.cg-favorit-list li:hover { + background-color: #dedede; +} + +.cg-favorit-list span { + padding-top: 1em; + color: #2a2a2a; + font-weight: 500; + font-size: 12px; + font-style: italic; + display: block; +} + +.cg-favorit-list a img { + max-width: 72px; +} + +.cg-favorit-list a:hover span { + margin-top: 0px; +} + +#last-publication-home .last-publication-list li, +#faq-home p { + padding-bottom: 1em; + margin-bottom: 0; +} + +#last-publication-home .last-publication-list li { + background-color: var(--couleur-de-fond-clair); + padding: 1em; + margin-bottom: 1em; +} + +#last-publication-home .last-publication-list a, +.eventName a, +.main-bookmark a { + display: block; + color: #2f2f2f; + font-size: 16px; + font-weight: 600; + line-height: 1.5em; + margin-bottom: 0; +} + +#last-publication-home .last-publication-list a:hover, +.eventName a:hover, +.main-bookmark a:hover { + color: var(--couleur-flashy); +} + +#last-publication-home .last-publication-list span { + color: #777; + font-size: 14px; +} + +#last-publication-home .last-publication-list .description-publication { +} + +.main-home-page .header h4, +.main-home-page .secteur-container > h4, +#portletPages h2.portlet-title, +#portletPages h4.portlet-title, +.spaceHome #last-publication-home h4, +.spaceHome #cg-favorit-home h4, +.main-home-page #bloc-advancedSeach h4, +.spaceHome #portletPages .header h2, +.spaceHome #portletPages .header h2.portlet-title, +.spaceHome #portletPages .header h4, +.spaceHome #portletPages .header h4.portlet-title, +.spaceHome #bloc-advancedSeach h4 { + font-size: 28px; + color: #2a2a2a; + font-weight: 800; + text-align: center; + line-height: 25px; + position: relative; + padding: 0.25em 0.25em 0.25em 0; + margin: 0; + font-family: "Courier New", Courier, monospace; + display: flex; + justify-content: center; + width: 100%; + max-width: 750px; + margin-left: auto; + margin-right: auto; + margin-bottom: 10px; + min-height: 56px; + align-items: center; + -webkit-box-align: center; +} + +.main-home-page #user-favorit-home h4, +.main-home-page #new-users-home h4 { + font-size: 28px; + color: var(--couleur-flashy); + font-weight: 800; + text-align: center; + line-height: 25px; + position: relative; + padding: 0.25em 0.25em 0.25em 0; + margin: 0; + font-family: "Courier New", Courier, monospace; + display: flex; + justify-content: center; + width: 100%; + max-width: 750px; + margin-left: auto; + margin-right: auto; + margin-bottom: 10px; + min-height: 56px; + align-items: center; + -webkit-box-align: center; +} + +.main-home-page #weather-home h4 .date-today { + color: var(--couleur-flashy); +} + +#user-favorit-home h4::after, +.main-home-page #new-users-home h4::after { + content: ' '; + height: 1px; + background-color: var(--couleur-flashy); + flex-basis: 20%; + margin-left: 1em; +} + + +.spaceHome h4 span, +.main-home-page h4 span { + margin-left: 0.25em; +} + +#user-favorit-home h4::before, +.main-home-page #new-users-home h4::before { + content: ' '; + height: 1px; + background-color: var(--couleur-flashy); + flex-basis: 20%; + margin-right: 1em; +} + + +.main-home-page #bloc-advancedSeach h4, +.main-home-page #faq-home h4 { + display: block; + justify-content: center; + width: auto; + max-width: inherit; + margin-left: auto; + margin-right: auto; +} + +.main-home-page #faq-home h4::before, +.main-home-page #faq-home h4::after, +.main-home-page #bloc-advancedSeach h4::before, +.main-home-page #bloc-advancedSeach h4::after { + display: none; +} + + +#portletPages h2.portlet-title { + line-height: 25px; + padding: 1em 0.25em 0em 0; +} + +.bgDegradeGris, .userzoom-tooltip, .userzoom-tooltip-interaction-accessProfil, .userzoom-tooltip-interaction-accessChat, .userzoom-tooltip-interaction-accessNotification, .userzoom-tooltip-interaction-action-invitation, .userzoom-tooltip-interaction-accessChat.disabled:hover { + background: #ebedee url(); +} + +.attachment-container h3.title { + text-align: center; + font-size: 12px; + color: #666; + font-weight: 500; + padding: 1em 0 0; + margin: 1em 0 0.25em; +} + + +/*** WEATHER ***/ +#weather-home > div { + padding: 0; +} + +#weather-home #ephemeride { + font-style: italic; + margin: 0 0 1em 0; + color: var(--couleur-principale); +} + +#faq-home h4 span, +.spaceHome #bloc-advancedSeach h4 span, +.spaceHome #portletPages .header h4 span, +.spaceHome #portletPages .header h2 span, +.spaceHome #portletPages .header h2.portlet-title span { + display: block; + text-transform: uppercase; + color: #555; +} + +#weather-home #ephemeride:before { + content: 'Nous fêtons les '; + color: #000; +} + +.portlet-content, +.spaceHome #spaceQuiskInfo .slideshow { + margin-bottom: 0.5em +} + +#localisation-weather { + margin-bottom: 1em; +} + +#localisation-weather a { + color: #b8b8b8; +} + +#localisation-weather a:hover, +#localisation-weather .select, +#localisation-weather .label { + color: var(--couleur-principale); +} + +#weather-home .day { + width: 40%; + float: left; +} + +#weather-home .day img { + height: 45px; + float: left; +} + +#weather-home .min { + color: #f8931d; +} + +#weather-home .max { + color: #f60b3c; +} + +#weather-home .day .label { + clear: left; + color: #b8b8b8; + font-size: 12px; + text-align: center; + width: 61px; +} + +#today-event { + clear: both; + padding-top: 1em; +} + +/*** END WEATHER ***/ + +.spaceHome #portletPages h2.portlet-title, +.spaceHome #portletPages h4.portlet-title { + margin: 1.33em 0 0.5em; + float: none; +} + + +.main-home-page #user-favorit-home ul { + list-style-type: none; + margin: 0; + padding: 0; +} + +.main-home-page #user-favorit-home ul li { + margin: 0 0 1em 0; + background: var(--couleur-de-fond-clair); + padding: 0; + position: relative; +} + +.main-home-page #user-favorit-home ul li a { + padding: 1em; +} + +.main-home-page #user-favorit-home ul li a::after { + content: ' '; + width: 24px; + height: 24px; + background: var(--couleur-flashy) url(../imgDesign/puce-favorit.png) 0 0 no-repeat; + position: absolute; + top: 12px; + right: 1em; + border-radius: 12px; +} + +.main-home-page #user-favorit-home ul li:hover a::after { + background-color: var(--couleur-foncee); +} + +/*** FAQ bloc ***/ + +#faq-home p a { + display: block; + font-size: 18px; + font-style: italic; + color: var(--couleur-flashy); + font-weight: 500; + background-color: var(--couleur-de-fond-clair); + border-radius: 20px; + padding: 20px 15px; + text-align: center; + position: relative; +} + +#faq-home .FAQ-entry { + padding-bottom: 105px; + position: relative; +} + +#faq-home .FAQ-entry:after { + background: #FFFFFF url(../imgDesign/deco-faq.png) bottom left no-repeat; + content: ' '; + position: absolute; + bottom: 0; + left: 0; + width: 250px; + height: 105px; +} + +#faq-home p a:after { + content: ' '; + position: absolute; + bottom: -16px; + left: 49%; + display: inline-block; + height: 0; + width: 0; + border-top: 16px solid var(--couleur-de-fond-clair); + border-right: 13px solid transparent; + border-left: 7px solid transparent; +} + + +/* Les boutons */ + +.main-home-page .link-more, +.main-home-page #submit-AdvancedSearch, +.spaceHome #submit-AdvancedSearch, +.spaceHome .link-more, +#directory form .sp_button, +#directory #indexAndSearch .sp_button, +.sp_button, button.button, +#faq-home .link-add.sp-link { + border-radius: 5px; + background: #323237; + color: #FFF; + padding: 0.75rem; + font-size: 12px; + font-weight: 600; + display: inline-block; + margin: 1em 1em 0 0; + text-transform: uppercase; +} + +.main-home-page .link-more:hover, +.main-home-page #submit-AdvancedSearch:hover, +.spaceHome #submit-AdvancedSearch:hover, +.spaceHome .link-more:hover, +#directory form .sp_button:hover, +#directory #indexAndSearch .sp_button:hover, +.sp_button, button.button:hover, +.spaceHome #submit-AdvancedSearch:hover, +#faq-home .link-add.sp-link:hover { + background: var(--couleur-boutonHover); + color: var(--couleur-text-sur-boutonHover); +} + +.main-home-page #submit-AdvancedSearch, +.spaceHome #submit-AdvancedSearch, +#directory form .sp_button, #directory #indexAndSearch .sp_button, +.sp_button, button.button { + + background: var(--couleur-bouton); + color: var(--couleur-text-sur-bouton); +} + +#directory form .sp_button, +#directory #indexAndSearch .sp_button { + border: 0; + text-transform: initial; + height: 15px; + line-height: 15px; +} + + +.main-home-page .link-more:hover, +.main-home-page #submit-AdvancedSearch:hover, +.spaceHome #submit-AdvancedSearch:hover, +.spaceHome .link-more:hover { + background: var(--couleur-flashy); +} + +.spaceHome .spaceIntro { + max-height: inherit; + overflow: auto; +} + +.spaceHome h1.spaceName, +#preview .publiName, #preview-clone .publiName { + margin-bottom: 0; + font-size: 2em; + font-weight: 700; + text-transform: Initial; + font-family: "Courier New", Courier, monospace; + background: #FFF; + color: var(--couleur-flashy); + font-size: 34px; + padding: 18px 0; + line-height: 1em; + text-transform: uppercase; +} + +.spaceHome #last-publication-home { + float: left; + width: 48%; +} + +.spaceHome #cg-favorit-home { + float: left; + width: 40%; + margin-right: 5%; +} + +#spaceQuiskInfo .title-quickInfo a { + font-size: 16px; +} + +.spaceHome .spaceNavigation li.bgDegradeGris:hover { + background: #ddd url(); +} + + +/* PDC Bloc */ + +.spaceHome #bloc-advancedSeach h4 { +} + +.spaceHome #bloc-advancedSeach #used_pdc .field { + padding-left: 0; +} + +.spaceHome #bloc-advancedSeach #used_pdc .field .champs { + padding-left: 0; + padding-right: 0; +} + +.main-home-page #bloc-advancedSeach form, +.spaceHome #bloc-advancedSeach form { + height: 239px; +} + +.spaceHome #bloc-advancedSeach form { + height: auto; +} + +.main-home-page #bloc-advancedSeach h4 { + padding: 0.25em 25% 0.25em 25%; + margin-bottom: 1.5em; + font-family: "Courier New", Courier, monospace; + text-transform: initial; + color: #FFF; + font-weight: 700; + font-size: 27px; +} + +.main-home-page #bloc-advancedSeach h4:after, +.spaceHome #bloc-advancedSeach h4:after { + border: 0; + height: 0; +} + +.main-home-page #bloc-advancedSeach input, +.spaceHome #bloc-advancedSeach input { + width: 100%; + margin-bottom: 5px; +} + +.main-home-page #bloc-advancedSeach #used_pdc { + +} + +.main-home-page #bloc-advancedSeach #used_pdc .field { + padding-left: 0; +} + +.main-home-page #bloc-advancedSeach #used_pdc .field select, +.spaceHome #bloc-advancedSeach #used_pdc .field select { + width: 100%; + +} + +.main-home-page #bloc-advancedSeach #submit-AdvancedSearch { + background-color: var(--couleur-flashy); + color: var(--couleur-text-sur-flashy); +} + +.main-home-page #bloc-advancedSeach #submit-AdvancedSearch:hover { + background-color: var(--couleur-bouton); + color: var(--couleur-text-sur-bouton); +} + +.main-home-page #bloc-advancedSeach #used_pdc .field .champs { + padding: 5px 0; +} + +.main-home-page #used_pdc .field .champs, +.spaceHome #used_pdc .field .champs { + float: none; +} + +/* =============== + ALL: IE Fixes + =============== */ + +/* ========================================================================== + Media Queries + ========================================================================== */ + + +@media only screen and (min-width: 480px) { + + +} + +@media only screen and (min-width: 768px) { + + /* =============== + présentation a partir de 768 + =============== */ + + +} + +@media only screen and (max-width: 980px) { + +} + +@media only screen and (max-width: 1780px) { + .main-home-page .right-main-container > div { + flex-basis: calc(100% - 3em) !important; + } + + #nav > ul > li > a, #nav > ul > li > a span { + font-size: 14px; + } + + #weather-home .title { + display: none; + } + +} + + +@media only screen and (max-width: 1580px) { + .main-home-page .right-main-container { + width: 360px; + } + + .main-home-page .principal-main-container { + width: calc(100% - 360px - 150px - 3em); + } + + #nav > ul > li > a, #nav > ul > li > a span { + font-size: 12px; + } + + .principal-main-container #last-publication-home::before { + background-position: right 0; + background-size: auto 71%; + } + + .header-container #outils li a { + text-indent: -300em; + } +} + +@media only screen and (max-width: 1280px) { + .main-home-page .principal-main-container > div { + margin: 0; + flex-basis: calc(100% - 3em); + } + + #nav > ul > li > a, #nav > ul > li > a span { + font-size: 10px; + } + + .header-container #outils li a { + text-indent: -300em; + } + + a#lastResult-link-header, + a#advancedSearch-link-header { + text-indent: -300em; + text-align: left; + } + + a#lastResult-link-header { + left: 185px; + } + + a#advancedSearch-link-header { + left: 206px; + } +} + +@media only screen and (max-width: 800px) { + #sp-layout-body-part-layout-content-part { + padding: 2em 0 0 1em; + } + + #sp-layout-body-part-layout-toggle-part > div { + border-radius: 30px; + padding: 10px !important; + border: 1px solid #f9e98e !important; + background-color: #fbf7aa; + } + + .header-container #infoConnection .avatarName, #notification-count.btn-header { + width: 30px; + overflow: hidden; + height: 22px; + } + + .select-header select { + width: 8em; + } + + .main-home-page .principal-main-container, + .main-home-page .right-main-container { + float: none; + width: 100%; + padding: 0; + } + + .main-home-page .main.wrapper.clearfix { + display: flex; + flex-wrap: wrap; + } + + .main-home-page .main.wrapper.clearfix .principal-main-container { + order: 0; + } + + .main-home-page .main.wrapper.clearfix .right-main-container { + order: 1; + } + + .main-home-page .principal-main-container #cg-favorit-home { + position: relative; + } + + #nav { + position: relative; + bottom: auto; + left: auto; + right: auto; + height: auto; + margin-top: 61px; + } + + .sm-silverpeas ul { + z-index: 10; + } + + #nav > ul { + margin: 0; + width: 100%; + padding: 0; + overflow-wrap: inherit; + align-items: inherit; + display: block; + justify-content: inherit; + } + + #nav > ul > li { + height: auto; + float: none; + } + + #nav > ul > li > a.has-submenu { + line-height: 18px; + height: auto; + display: block; + width: 100%; + padding: 1em 0 1em 1em; + text-align: left; + } + + #sp-layout-header-part, .header-container { + height: auto !important; + } + + #nav #home { + display: none; + } +} + + +@media only screen and (max-width: 620px) { + #topar-header, + #search-zone-header { + height: auto; + background-color: #FFF; + position: relative; + top: auto; + left: auto; + right: auto; + border-bottom: 1px solid #EEE; + border-top: 1px solid #EEE; + } + + #logo-header { + position: relative; + } + + #nav { + margin-top: 0; + } + + a#lastResult-link-header, a#advancedSearch-link-header { + display: none; + } + + #search-zone-header { + padding-top: 0; + } + + .silverpeas-user-notifications .silverpeas-attached-popin { + left: 0 !important; + right: 0 !important; + } + + .silverpeas-user-notifications .silverpeas-attached-popin .silverpeas-attached-popin-content { + width: auto;; + } +} + +/* ========================================================================== + Helper classes + ========================================================================== */ + +.ir { + background-color: transparent; + border: 0; + overflow: hidden; + *text-indent: -9999px; +} + +.ir:before { + content: ""; + display: block; + width: 0; + height: 150%; +} + +.hidden { + display: none !important; + visibility: hidden; +} + +.visuallyhidden { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} + +.visuallyhidden.focusable:active, +.visuallyhidden.focusable:focus { + clip: auto; + height: auto; + margin: 0; + overflow: visible; + position: static; + width: auto; +} + +.invisible { + visibility: hidden; +} + +.clearfix:before, +.clearfix:after { + content: " "; + display: table; +} + +.clearfix:after { + clear: both; +} + +.clearfix { + *zoom: 1; +} + +/* ========================================================================== + Print styles + ========================================================================== */ + +@media print { + * { + box-shadow: none !important; + text-shadow: none !important; + } + + .tableBoard { + background: transparent; + } +} + + +/****** Ticker ******/ +#sp-layout-header-part #desktop-notifications-permission { + background: url('/silverpeas/util/icons/cog.png') no-repeat scroll 0 0 transparent; + line-height: 17px; + padding-left: 20px; + position: absolute; + right: 0; + top: 1px; + padding-right: 1em; + font-weight: bold; +} + +#sp-layout-header-part #ticker { + display: none; + background-color: var(--couleur-flashInfo); + height: 20px; + position: relative; + z-index: 100; +} + +#sp-ticker .ticker-wrapper.has-js { + background-color: transparent; + border-radius: 0; + display: block; + font-size: 0.75em; + height: 20px; + margin: 0; + padding: 0; + width: 100%; +} + +#sp-ticker { + display: block; +} + +#sp-ticker .ticker { + background-color: transparent; + display: block; + height: 20px; + overflow: hidden; + position: relative; + width: 100%; +} + +#sp-ticker .ticker-title { + padding-top: 2px; + padding-left: 1em; + color: var(--couleur-text-sur-flashInfo); + font-weight: bold; + background-color: transparent; + text-transform: uppercase; +} + +#sp-ticker .ticker-content { + margin: 0px; + padding-top: 3px; + position: absolute; + color: var(--couleur-text-sur-flashInfo); + font-weight: 500; + background-color: transparent; + overflow: hidden; + white-space: nowrap; + line-height: 1.2em; + padding-left: 1em; +} + +#sp-ticker .ticker-content * { + color: var(--couleur-text-sur-flashInfo); +} + +#sp-ticker .ticker-content .ticker-item-date { + + color: var(--couleur-text-sur-flashInfo); +} + +/********************** WYSIWYG *************************************/ + +h2.wysiwyg-title1 { + border-left: 0; + color: #000; + font-weight: 500; + font-family: "Courier New", Courier, monospace; + font-size: 20px; + line-height: 45px; + position: relative; + border-bottom: 2px solid var(--couleur-flashy); + padding-bottom: 10px; + margin: 1em 0; +} + +h3.wysiwyg-title2 { + border-left: 0; + border-bottom: 2px solid #CCC; + color: #000; + font-size: 18px; + padding: 0.75em 6px 0.75em 6px; +} + +strong.wysiwyg-focus { + background-color: #001f44; + color: #FFF; +} + +p.wysiwyg-important { + background-color: var(--couleur-de-fond-clair); + border-radius: 0 10px 0 10px; + padding: 9.5px; + border: 1px solid #ebebeb; + font-size: 1.1em; +} + +blockquote { + border-left: 1px solid #E4E4E4; + margin: 0; + padding-left: 1.5em; + font-style: italic; + color: #666; +} \ No newline at end of file diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/css/normalize.min.css b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/css/normalize.min.css new file mode 100644 index 00000000..e8a43382 --- /dev/null +++ b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/css/normalize.min.css @@ -0,0 +1,2 @@ +/*! normalize.css v1.1.0 | MIT License | git.io/normalize */ +article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html,button,input,select,textarea{font-family:sans-serif}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}h2{font-size:1.5em;margin:.83em 0}h3{font-size:1.17em;margin:1em 0}h4{font-size:1em;margin:1.33em 0}h5{font-size:.83em;margin:1.67em 0}h6{font-size:.67em;margin:2.33em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:1em 40px}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}p,pre{margin:1em 0}code,kbd,pre,samp{font-family:monospace,serif;_font-family:'courier new',monospace;font-size:1em}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}q{quotes:none}q:before,q:after{content:'';content:none}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}dl,menu,ol,ul{margin:1em 0}dd{margin:0 0 0 40px}menu,ol,ul{padding:0 0 0 40px}nav ul,nav ol{list-style:none;list-style-image:none}img{border:0;-ms-interpolation-mode:bicubic}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0;white-space:normal;*margin-left:-7px}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;*overflow:visible}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*height:13px;*width:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-spacing:0} \ No newline at end of file diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/css/stylesheet.css b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/css/stylesheet.css new file mode 100644 index 00000000..943a567f --- /dev/null +++ b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/css/stylesheet.css @@ -0,0 +1,1386 @@ +/** +* Copyright (C) 2000 - 2019 Silverpeas +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* +* As a special exception to the terms and conditions of version 3.0 of +* the GPL, you may redistribute this Program in connection with Free/Libre +* Open Source Software ("FLOSS") applications as described in Silverpeas's +* FLOSS exception. You should have received a copy of the text describing +* the FLOSS exception, and it is also available here: +* "http://repository.silverpeas.com/legal/licensing" +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +/* PARAMETRAGE DES COULEURS */ +body { + --couleur-principale:#7eb73b; /*utilisée en couleur de texte donc doit être lisible */ + --couleur-text-sur-principale: #FFFFFF; + --couleur-foncee:#231f20; /* notamment utilisée pour le menu du header */ + --couleur-text-sur-foncee:#FFFFFF; + --couleur-texte: #2a2a2a; + --couleur-texte-clair: #777777; + --couleur-flashy: #009fe3; /*utilisée en couleur de texte donc doit être lisible */ + --couleur-text-sur-flashy: #FFFFFF; + --couleur-bouton: #009fe3; + --couleur-text-sur-bouton: #FFFFFF; + --couleur-boutonHover: #231f20; + --couleur-text-sur-boutonHover: #FFFFFF; + --couleur-de-fond-clair:#F5F5F5; + --couleur-date-home:#999999; + --couleur-flashInfo: #f2f842; + --couleur-text-sur-flashInfo: #000000; + + + background:#FFFFFF fixed no-repeat; + font-family:Helvetica, Arial, sans serif; + color: var(--couleur-texte); +} + +html,button,body, td, div, a , input, select, textarea, #myProfileFiche .statut, .textePetitBold{ + font-family: Helvetica, Arial, sans serif; + font-size:14px; + font-weight:500; +} +a { + color: var(--couleur-texte); +} + +hr { + display: block; + height: 1px; + border: 0; + border-top: 1px solid #ccc; + margin: 1em 0; + padding: 0; +} +img { + vertical-align: middle; +} +textarea { + resize: vertical; +} + + +.rightContent { + width:33%; +} +.principalContent { + margin-right:calc( 33% + 24px ) +} +/************* personnalisation des formulaires ********************/ + +input,.selectize-control .selectize-input, select, button { + vertical-align: middle; + margin-top: 1px; + margin-bottom: 1px; + min-height: 32px; + padding: 0 7px; +} + +input,.selectize-control .selectize-input, select, textarea, button { color: #333; background-color: #fff; border:1px solid #aeb6b6; border-radius:3px; box-sizing: border-box;} +select { + -webkit-appearance: none; + -moz-appearance: none; + -ms-appearance: none; + -o-appearance: none; + appearance: none; + background-color: #fff; + background-image: url(../imgDesign/arrow_down-grey.png); + background-repeat: no-repeat; + background-position: calc(100% - 7px) 50%; + padding-right: 20px; + height:32px; +} +input[type="file"] {border: 0; padding-left: 0; padding-right: 0; background-color: initial; } +input[type="submit"], button[type="submit"] { + -webkit-appearance: button; + cursor: pointer; + background-color: #fff; + min-height: 32px; + -webkit-transition: background-color 100ms linear; + -moz-transition: background-color 100ms linear; + -o-transition: background-color 100ms linear; + transition: background-color 100ms linear; +} +input[type="submit"]:hover, button[type="submit"]:hover { + background-color: #ddd; +} + +input[type="text"] { + min-width:90px; +} + +/* pour contre carrer les attributs size défini en dure dans les input) */ +.ui-dialog input[type="text"] { + width:calc( 100% - 2em ) !important; +} +input[type="text"]:focus, input[type="text"]:active, +input[type="password"]:focus, input[type="password"]:active, +input[type="date"]:focus, input[type="date"]:active, +input[type="number"]:focus, input[type="number"]:active, +select:focus, select:active, +textarea:focus, textarea:active { + border: 1px solid #5ad; + outline: none; +} +input::placeholder { + color:#555; +} +input.search:focus{ + border: 0 ; +} + +input.search{ + min-height:2em; + line-height:2em; +} +.champs { + padding: 0 15px 10px 0; +} +.champs input, .champs select, .champs textarea { + font-size: 13px; +} +.parameters .parameterInfo { + top:9px !important; +} + +.ui-dialog .ui-dialog-titlebar-close { + min-height: 20px; +} + +select[multiple=multiple], select[size]{background: #fff; padding-right: initial; padding-left: initial; height: auto;} +select[size='1']{ + -webkit-appearance: none; + -moz-appearance: none; + -ms-appearance: none; + -o-appearance: none; + appearance: none; + background-color: #fff; + background-image: url(../imgDesign/arrow_down-grey.png); + background-repeat: no-repeat; + background-position: calc(100% - 7px) 50%; + padding-right: 20px; + padding-left: 0.5em; + height: 32px; +} +fieldset {border: 1px solid #e4e4e4; margin:0; min-width: inherit;} + + +input[type=checkbox] { + -webkit-appearance: none; + -moz-appearance: none; + -ms-appearance: none; + appearance: none; + border-radius: 4px; + height: 15px; + min-height: 15px; + width: 15px !important; + background: #fff !important; + border: 1px solid #ccc; +} +input[type="checkbox"]:hover, +input[type="checkbox"]:checked :hover { + border: 1px solid #55aadd; +} +input[type="checkbox"]:checked { + border: 1px solid #AAA; + margin:0px; + position: relative; +} +input[type="checkbox"]:checked:before { + font-family: Comic Sans MS; + width: 12px; + height: 11px; + border-radius: 4px; + top: 0px; + left: 0px; + border:1px solid transparent; + content: 'x'; + display: block; + color:#001f44; + font-size: 11px; + position: absolute; + line-height: 9px; + text-align: center; + border-top: 1px solid #DDD; + border-left: 1px solid #DDD; + } +input[type="checkbox"]:checked:hover:before { + border-top: 1px solid #bbe3f8; + border-left: 1px solid #bbe3f8; + } + +input.dateToPick, .ui-dialog .champ-ui-dialog input.dateToPick { + width: 104px !important; +} +input.inputHour { + min-width: 55px !important; +} +silverpeas-time-picker .txtlibform { + vertical-align:middle; +} +#search-form-header .selectize-control, +.selectize-control.search-input{ + border:0; +} + +#searchZone #searchLabel, +.sp_button.copy-to-clipboard , silverpeas-permalink .copy-to-clipboard .sp_button { + line-height:32px +} +#directory #indexAndSearch #search input { + height: 28px; +} +#advanced-search form .sp_button, #globalResult form .sp_button, #directory form .sp_button, #directory #indexAndSearch .sp_button, #searchLine .sp_button, .container-filter #search .sp_button, #thumbnailInputs .sp_button { + height: 30px; + line-height: 27px; + margin: 0; +} +.skinFieldset .field label, .skinFieldset .field .label { + display: table-cell; + padding-top:10px; +} + +#TreeDiv1 { + background-color: #FFFFFF; +} + +.navigationListTitle { + background-color:#E1E1E1; + background-image:none; + border-radius:8px 8px 0 0; +} + +.tableNavigationList { + background-color:#D6D7D9; + border:none; +} + +.titreFenetre { + color:#262827; + text-transform:uppercase; +} + +.question { + border-radius: 5px; + border-color:#FFFFFF; + margin:2px; +} + +.listinUsers .message_list li.intfdcolor, +#pagination, +#navBlog , #viewPostDraft, #viewPost, #blog #blogContainer #postsList div.post, +#classified-view #commentaires, +#agenda #navigation, #agenda #agendaView, #agenda #footer{ + border-radius:0; + border:0; + background-image:url(); +} + +.listinUsers .message_list li.intfdcolor { + border:1px solid #ccc; +} + +#classified-view #commentaires {margin:0 auto;} + +#blog #blogContainer{ + padding-left:10px; +} + +.btn-deploy-all-item.bgDegradeGris, .sousNavBulle p, #agenda #navigation, #agenda #agendaView, #agenda #footer, #blog #blogContainer, #navBlog, #viewPostDraft, #blog #blogContainer #postsList div.post, #viewPost, #whitePagesSheet .sheet .sousNavBulle p, #publicProfileContenu .sousNavBulle p{ + padding:8px; +} + +.newsFeed , #identity table, #ReceiveInvitation{ + margin:0; + border-radius:0 0 12px 12px; +} + +#identity table{ + width:100%; +} + +.principalContent{ + min-height:150px; + padding:0 12px; +} + +#pagination{ + padding:3px; +} + +#preview .tableBoard { + background-color:#ECECEC; +} + +.arrayPane { + box-shadow:none; +} + +#portletPages h2.portlet-title { + border-bottom: 0px solid rgba(0,0,0,0.2); + font-variant: normal; + font-weight:500; + margin-bottom:1em; + padding: 2px 0 0 ; +} + +#portletPages div.portlet-content, +.spaceHome #calendar.portlet-content { + border:0; + padding:3em 0 0; +} +.spaceHome #calendar.portlet-content { + padding-top:1em; +} + +.portlet-content ul{ + padding:0 10px; + margin:0 10px; + list-style-image:url(../imgDesign/puce.png); +} + +#portletPages dl.sort dt { + line-height:20px; + background:#FFF url(); + border:0; +} + +#portletPages dl.sort dd{ + background-color:#FFF; + margin-bottom:10px; +} + +.intfdcolor { + background-image: none; + background-color:#FFFFFF; +} + +.ArrayNavigation { + background-image: none; +} + +#facetSearchDivId { + border:none; + background:transparent; +} +#facetSearchDivId > div { + margin-bottom:1em; + background-color:#FFF; + border:1px solid rgba(0,0,0,0.2); + border-radius: 10px 10px 0 0; +} + +#searchGroupTitle, +.searchGroupTitle { + background-color: var( --couleur-principale ); + line-height: 2em; + height: 2em; + border-radius: 10px 10px 0 0; + padding-left:0; +} + +#searchGroupTitle span, .searchGroupTitle span { + color: var( --couleur-text-sur-principale ); + line-height: 24px !important; + font-weight: 500 !important; + font-size: 13px !important; + background:none !important; + +} +#searchGroupValues ul li.selected { + background-color:var( --couleur-foncee ); + color:var( --couleur-text-sur-foncee ); +} + +/*DOMAINS BAR */ +#spaceMenuDivId .spaceLevel1{ + display:none; +} +#spaceMenuDivId .spaceLevel1On{ + display:block; +} + +.spaceLevel1On .contentSpace { + overflow:auto; + margin:0; +} + +.spaceLevel1On .contentSpace, #contentSpacespacePerso { + background-color: transparent; +} + +.spaceLevel1On > .contentSpace, #contentSpacespacePerso { + margin:0; +} + + #spaces a:hover, #spaceTransverse a:hover { + color:var(--couleur-flashy); +} + + .spaceLevel1 a.spaceURL, .spaceLevel1On a.spaceURL, + #spaceMenuDivId #spacePerso .spaceURL { + background: url("../imgDesign/bg_menu_level1.png") no-repeat scroll 0px bottom transparent; + color:var(--couleur-flashy); + display: block; + font-weight: 500; + line-height: 19px; + min-height: 18px; + padding: 13px 10px 17px 45px; + font-size:10pt; +} + + #spaces .spaceLevel1 > a.spaceURL, #spaces .spaceLevel1On > a.spaceURL { + font-size: 12pt; + padding-left: 15px; + text-transform: uppercase; + font-weight:600; + border-radius: 15px 15px 0 0; +} + #spaces .spaceLevel1On > a.spaceURL { + color: var(--couleur-flashy); + position:relative; + } + #spaces .spaceLevel1On > a.spaceURL:after, + #spaceMenuDivId #spacePerso > .spaceURL:after{ + background-color: var(--couleur-flashy); + width:2em; + height:2px; + position:absolute; + content:' '; + bottom:0.25em; + left:1em; + } + + + .spaceLevel1 a.spaceURL:hover { + background: url() no-repeat scroll 0px bottom transparent; + color: var(--couleur-flashy); +} + + .spaceLevel1On a.spaceURL:hover, .spaceLevel1On a.spaceURL, + #spaceMenuDivId #spacePerso .spaceURL { + background: url(); + color: var(--couleur-flashy); + line-height: 19px; + min-height: 18px; + padding: 13px 10px 17px 15px; + text-transform: uppercase; + font-weight: 500; + position:relative; +} + + #spaces .spaceLevel1On .browseComponent, + #spaces .spaceLevel1On .browseComponentActiv { + position:relative; + } + + #spaces .spaceLevel1On .browseSpace > a , + #spaces .spaceLevel1On .browseComponent > a, + #spaces .spaceLevel1On .browseComponentActiv > a, +#spacePerso .browseComponent > a:nth-child(2) , +#spacePerso .browseComponentActiv > a:nth-child(2) { + display:block; + font-weight: 500; + padding:10px; + position: relative; + font-size:13px; + line-height: auto; + border-top: 1px solid rgba(0,0,0,0.1); +} +#spacePerso a img { + border: 0px; + position: absolute; + top: calc( 50% - 8px ); + right: 1em; +} + #spaces .spaceLevel1On .browseComponent > a, + #spaces .spaceLevel1On .browseComponentActiv > a { + padding-left:32px; + } + #spaces .spaceLevel1On .browseComponent > img, + #spaces .spaceLevel1On .browseComponentActiv > img { + position:absolute; + top:7px; + left:10px; + z-index:10; + } +#spaces .spaceLevel1On .browseComponentActiv a, +#spacePerso .contentSpace .browseComponentActiv a { + background-color:#FFF; + font-weight: bold; +} + + + #spaces .spaceLevel1On .browseSpace > img:first-child { + display:none; + } + #spaces .spaceLevel1On .browseSpace > a::before { + content: '>'; + font-family: comic sans ms; + font-weight: 600; + font-size: 15px; + width: 20px; + height: 20px; + border-radius: 10px; + display: inline-block; + background-color: var(--couleur-flashy); + color: var(--couleur-text-sur-flashy); + text-align: center; + line-height: 15px; + margin-right: 0.25em; +} + + #spaces .spaceLevel1On .contentSpace .spaceOn > a::before { + content: '>'; + font-family: comic sans ms; + font-weight: 600; + font-size: 15px; + width: 20px; + height: 20px; + border-radius: 10px; + display: inline-block; + background-color: var(--couleur-flashy); + color: var(--couleur-text-sur-flashy); + text-align: center; + line-height: 15px; + margin-right: 0.25em; + transform: rotate(90deg); +} + #spaces .spaceLevel1On .contentSpace .spaceOn > a { + background-color:#FFF; + color: var(--couleur-flashy); +} + + #spaces .spaceLevel1On .browseSpace .browseComponent a, + #spaces .spaceLevel1On .browseSpace .browseComponentActiv a { + padding-left:52px; +} + #spaces .spaceLevel1On .browseSpace .browseComponent > img , + #spaces .spaceLevel1On .browseSpace .browseComponentActiv > img{ + left:28px; +} + + + #spaces .spaceLevel1On .browseSpace .browseComponent a, #spaces .spaceLevel1On .browseSpace .browseComponentActiv a { +} + + #spaces .spaceLevel1On .browseSpace .browseSpace > a { + padding-left:32px; +} + + + #spaces .spaceLevel1On .browseSpace .browseSpace .browseComponent a, + #spaces .spaceLevel1On .browseSpace .browseSpace .browseComponentActiv a { + padding-left:72px; +} + + #spaces .spaceLevel1On .browseSpace .browseSpace .browseComponent > img:first-child , + #spaces .spaceLevel1On .browseSpace .browseSpace .browseComponentActiv > img:first-child { + left:48px; +} + + #spaces .spaceLevel1On .browseSpace .browseSpace .browseComponentActiv > img:last-child { + display:none; +} + + + #spaces .spaceLevel1On .browseSpace .browseSpace .browseSpace > a { + padding-left:52px; +} + + #spaces .spaceLevel1On .browseSpace .browseSpace .browseSpace .browseComponent a, + #spaces .spaceLevel1On .browseSpace .browseSpace .browseSpace .browseComponentActiv a { + padding-left: 98px; +} + #spaces .spaceLevel1On .browseSpace .browseSpace .browseSpace .browseComponent > img , + #spaces .spaceLevel1On .browseSpace .browseSpace .browseSpace .browseComponentActiv > img{ + left: 72px; +} + +.spaceLevel1On .browseSpace .browseComponent a, .spaceLevel1On .browseSpace .browseComponentActiv a { + background: url("") repeat scroll 0% 0% transparent; + border: 0px none; + padding: 5px 10px 5px 52px; + text-transform: inherit; +} + +.spaceLevel1On .browseSpace .browseComponent img.browseIconComponent, .spaceLevel1On .browseSpace .browseComponentActiv img.browseIconComponent { + left: 29px; + top: 4px; +} + +.spaceLevel1On .browseSpace .browseSpace .browseComponent a, .spaceLevel1On .browseSpace .browseSpace .browseComponentActiv a { + background: url("") repeat scroll 0% 0% transparent; + border: 0px none; + padding: 5px 10px 5px 72px; + text-transform: inherit; +} + +.spaceLevel1On .browseSpace .browseSpace .browseComponent img.browseIconComponent, .spaceLevel1On .browseSpace .browseSpace .browseComponentActiv img.browseIconComponent { + left: 50px; + top: 4px; +} + +.spaceLevel1On .browseSpace .browseSpace .browseSpace .browseComponent a, .spaceLevel1On .browseSpace .browseSpace .browseSpace .browseComponentActiv a { + background: url("") repeat scroll 0% 0% transparent; + border: 0px none; + padding: 5px 10px 5px 92px; + text-transform: inherit; +} + +.spaceLevel1On .browseSpace .browseSpace .browseSpace .browseComponent img.browseIconComponent, .spaceLevel1On .browseSpace .browseSpace .browseSpace .browseComponentActiv img.browseIconComponent { + left: 70px; + top: 4px; +} + + +/* SPACE PERSO */ + +#spacePerso { + background:transparent url(); + border:0; + border-radius:20px; + overflow:auto; +} + + #spaceMenuDivId #spacePerso .spaceURL { + display:none; +} + +#contentSpacespacePerso{ + padding-bottom:15px; +} + + #spacePerso .contentSpace { + background-color: transparent; + clear: both; + margin: 0; + padding: 0; + border-radius:0 0 20px 20px; +} + + #spacePerso .contentSpace .browseComponent, + #spacePerso .contentSpace .browseComponentActiv, +.browseSpace, +#spaces .browseComponent { + text-align: left; + padding:0; + position:relative; +} + +#spacePerso .contentSpace .browseComponent > img, +#spacePerso .contentSpace .browseComponentActiv > img { + display:none; +} +/* Boutons et onglets*/ +.ui-widget-header { + background-color:#353535 ; + border-color:#353535 ; + font-weight:500; +} + +/* MenuToogle Yuimenu et fil d'ariane */ + +.cellOperation { + width: auto; + right: 0; +} +.cellBrowseBar { + border-bottom:0; + padding-right: 230px; + padding-bottom: 0.5em; + min-height: 53px; +} +#browseBar #breadCrumb { + background-color:var(--couleur-de-fond-clair); + border-radius:5px; + padding:0.5em; +} +#browseBar { + padding-top:3px; +} + +#browseBar #breadCrumb { + margin-left:3px; + width:calc( 100% - 7em ); + display: inline-block; +} +#menutoggle { + display: block; + padding: 3px 0.5em 3px 30px; + border-radius: 4px; + background: var( --couleur-foncee ) url("../imgDesign/qvf.png") 3px 3px no-repeat; + color: var( --couleur-text-sur-foncee ); + border: 0px none; + margin-top: 0; + height: 24px; + text-align: left; + text-transform: uppercase; + line-height: 26px; + font-size: 14px; + letter-spacing: 1px; +} + +#menutoggle img{ + display:none; +} + +#topPage .yuimenu, #kmelia .yuimenu, #attachmentList .yuimenu{ + padding:6px 0; + border-radius: 8px 0 8px 8px; + margin-top:-3px; +} + +.yuimenu a , #portletPages .yuimenu a { + font-weight:500; +} + +.yuimenu .yuimenuitem{ +} + +.ArrayColumn, .ArrayCell, +#classifieds .tableFrame #categories .categoryTitle{ + background-image:none; + padding-left:8px; + padding-right:8px; + padding-top:0.5em; + padding-bottom:0.5em; +} + +.ArrayColumn .ArrayColumn, +.ArrayCell .ArrayCell { + padding-left:0; + padding-right:0; +} + +.bgDegradeGris { + border-radius:12px; + padding:0 0 8px 0; +} +.btn-deploy-all-item.bgDegradeGris, #displaying.bgDegradeGris { + font-size:100%; +} + +.bgDegradeGris .bgDegradeGris { + border-radius:12px 12px 0 0; +} + +.sousNavBulle { + border-radius:12px 12px 0 0; + margin-top:12px; +} + +#backToSearch .button { + font-size:90%; +} + +#agenda #currentScope, #agenda #jump, #agenda #today ,#agenda #categories, #agenda #invitations, #agenda #alert, #agenda #caption, #agenda #rss { + border:1px solid #CCC; + margin-top: 0; +} + +#subTopics ul li a { + position:relative; +} + +.eventBeginDate .number { + top:19px; +} + + +#pdcFrame td{ + font-size:11px; + padding:0; +} + +#pdcFrame table{ + border-spacing:0; + border-collapse:collapse; + padding:0; +} + +#redExp { + margin-bottom: -8px; + position: relative; +} + +.ongletAdminOn .txtPetitBlanc { + font-weight:bold; + color:#000; +} + +.ongletAdminOn strong { + font-weight:500; + color:#666; +} + +.ongletAdminOn strong a:hover{ + border-bottom: 2px solid #000000; +} + +#browseBar #i18n .ArrayNavigationOn { + background-color: var(--couleur-flashy); +} + +@media only screen and (max-width: 650px){ + .rightContent { + clear: both; + float: none; + margin-top: 40px; + width: auto; + } + .rightContent .attachments { + min-width:auto; + } + .principalContent { + margin-right: 0; + margin-top: 10px; + } + .header h4 { + min-width: auto; + } +} + +#topPage .yuimenu, #kmelia .yuimenu, #attachmentList .yuimenu { + background-color: var( --couleur-de-fond-clair ); + border: 1px solid rgba(0,0,0,0.2) ; +} + +#topPage .yuimenu ul, #kmelia .yuimenu ul, #attachmentList .yuimenu ul { + border-color: 1px solid rgba(0,0,0,0.2) ; +} + +.yuimenu a, #portletPages .yuimenu a { + background-color:var( --couleur-de-fond-clair ); +} + +.yuimenuitemlabel, .yuimenuitemlabel:visited, .yuimenubaritemlabel, .yuimenubaritemlabel:visited { + color:var(--couleur-flashy); +} + +.yuimenu a:hover, #portletPages .yuimenu a:hover { + background-color: var(--couleur-flashy); + border-color: var(--couleur-flashy); + color: var( --couleur-text-sur-flashy ); +} + +#portletPages .list-responsible-user .action a:hover, .list-responsible-user .action a:hover {border-bottom:0} + +#blog #titresTopics a, #blog #titresArchives a, #blog #titresLiens a, .titreCouleur, +.txtlibform, .textePetitBold { + color: #444; +} + +#myProfileFiche .action .link, #publicProfileFiche #contactCommun .link, #publicProfileFiche #allContact .link, .txtnav, .txtbigdate, .txttitrecol, #directory .link { + border-color:var(--couleur-flashy); + color: var(--couleur-flashy); + line-height: 12px; + font-family: "Courier New"; +} + +.jsxc_bar, #silverchat_roster_header { + background-color: var(--couleur-flashy) !important; +} +#silverchat_roster_header #silverchat_notice span { + background-color: #000 !important; +} +/************ TAILLE DES POLICES CENTRALISEE ***************/ + + +#browseBar #breadCrumb a:visited, #browseBar #breadCrumb a:active, #browseBar #breadCrumb a:link, #browseBar #breadCrumb a:hover, #browseBar #breadCrumb, #browseBar .information { + font-size: 10px; +} + +#browseBar #breadCrumb a:visited, #browseBar #breadCrumb a:active, #browseBar #breadCrumb a:link, #browseBar #breadCrumb a:hover, #browseBar #breadCrumb, #browseBar .information{ + font-weight: normal; +} + +.sp_menuAdmin li.select .textePetitBold { + font-size: 1em; +} +#sp-admin-layout-header-part .sp_back_front{ + font-size:9pt; + font-family:Arial; +} +.ArrayColumn, +#classifieds .tableFrame #categories .categoryTitle{ + font-size:10pt; + font-weight:700; +} + + a { + font-size: 10pt; + font-weight: 500; +} +#portletPages div.portlet-content { + padding-top:1em; +} + +#portletPages #portal-page div.portlet-content { + padding:20px; + background-color:var( --couleur-de-fond-clair ); + border-radius:20px; +} + +#portal-content silverpeas-calendar-event-occurrence-list .display-grouped-by-day .day-events { + background-color:transparent; +} +.commentaires #edition-box .title, .commentaires .oneComment p.author, +#portletPages div.portlet-content , + a, +.sousNavBulle, .container-filter, .sousNavBulle a, +.txtnav, .txtlibform, +.txtnote, +.txtBaseline, +caption, +Label, legend{ + font-size: 13px; + font-weight: 500; +} +.txtnav{ + font-weight: 500; +} + +#myProfileFiche .action .link, #contactCommun .link, #allContact .link, #publicProfileFiche .action .link, #publicProfileFiche #contactCommun .link, #publicProfileFiche #allContact .link { + color:var(--couleur-flashy); +} +#myProfileFiche .info, #publicProfileFiche .info { + position:relative; +} +.ongletAdminOn span.textePetitBold, .ongletAdminOff span.txtPetitBlanc, +.componentNav, +#spaces-welcome-message p, +#spaces-welcome-message ul, +#spaces-welcome-message a , +.titreForum, +.ArrayNavigation, +.skinFieldset legend, +#globalResultForm, +#globalResultQueryLabel, +#globalResultParamDisplayLabel, +.titreFenetre , +#portletPages dl.sort , +#portletPages dl.sort dd, +button.ui-button.ui-widget, +button, +.sp_button, +.ongletAdminOn .txtPetitBlanc, +.ongletAdminOn strong, +.yuimenu a , #portletPages .yuimenu a, +.spaceHome #publication li , +#menubar-creation-actions .menubar-creation-actions-item, #attachment-creation-actions .menubar-creation-actions-item, +#nav ul.nav-niveau-2 li a, +.last-publication-list li{ + font-size:14px !important; +} + +.spaceHome .spaceNavigation li a { + color: #000; + font-size: 14px; + text-transform: uppercase; +} +.spaceHome .spaceNavigation li p{ + font-family:Arial; + font-size:9pt; +} +.ui-dialog .ui-dialog-buttonpane button { + height: auto; +} + +.sousTitreFenetre, +#administration a, +.spaceHome .list-responsible-user .userName, +#browseBar #breadCrumb a:visited, #browseBar #breadCrumb a:active, #browseBar #breadCrumb a:link, #browseBar #breadCrumb a:hover, #browseBar #breadCrumb, #browseBar .information { + font-size: 12px; +} + +#nav ul ul > li > a, +#nav ul ul > li > a span{ + font-size: 10pt; +} +.spaceHome #spaceQuiskInfo li.slide > h4 , +.spaceHome #publication li a b, +.spaceHome #publication .header h4, +.last-publication-list li a{ + font-size: 11.5pt; + font-weight: 500; +} + +#facetSearchDivId #searchGroupTitle span , + #spaceMenuDivId #spacePerso .spaceURL, +#topBar #outils div.avatarName a +{ + font-size: 12pt; +} + +#portletPages h2.portlet-title, +#shortcuts a , #shortcuts a:hover, #shortcuts a:focus, #shortcuts td.activeShortcut a, +#nav > ul > li > a, +#nav > ul > li > a span { + font-size:16px; +} + +.spaceHome .spaceName , + .spaceLevel1 a.spaceURL, .spaceLevel1On a.spaceURL{ + font-size:14pt; +} + +.portlet-content silverpeas-calendar-event-occurrence-list .display-grouped-by-day .section-day-date .day-in-month { + font-size: 1em; +} + +.bgDegradeGris p b, .bgDegradeGris .paragraphe b, +.yuimenu a, #portletPages .yuimenu a, +#my-quickInfo .header h3 strong, +.my-suggestionBox-inProgress .header h3 strong, .my-suggestionBox-draft .header h3 strong, +#my-quickInfo .header h3, .sm-map li.app , +#domainContent #description-domainContent, .descriptionType, +.buzzSuggestion .header h3, .lastSuggestion .header h3, .lastCommentSuggestion .header h3, .my-suggestionBox-inProgress .header h3, .my-suggestionBox-draft .header h3, +.sousTitreFenetre, .ongletAdminOn span.textePetitBold, .ongletAdminOff span.txtPetitBlanc { + font-weight:500; +} + +#preview #lastReaderList li span.consultationDate, #preview #lastReaderList li span.userToZoom { + font-size: 11px; +} + + +/************ END TAILLE DES POLICES CENTRALISEE ***************/ + +.ArrayColumn, #classifieds .tableFrame #categories .categoryTitle, .tableArrayPane thead { + background-color: #D6D7D9; + color: #000000; +} + +.ArrayColumn a { + color: #000000; +} + +.ArrayColumn a:hover { + color: #444444; +} +/********************* ALMANACH PORTLET **************************/ + +.portlet li.events, +.portlet-content silverpeas-calendar-event-occurrence-list .display-grouped-by-day .day-events { + display:flex; + position: relative; + margin:0; + min-height: 80px; + border-bottom:0 ; + justify-content: left; +} + + +.portlet li.events div.event { + margin-bottom:2px; +} + +.portlet li.events div.event:last-child{ + margin-bottom:0; + width: calc( 100% - 70px ); +} + +.portlet div.eventShortDate, +.portlet-content silverpeas-calendar-event-occurrence-list .display-grouped-by-day .section-day-date { + background: #FFF url() center 0 no-repeat; + width: 64px; + height: 64px; + margin-right:1em; + line-height:72px; + color: #FFF; + font-size: 16px; + text-align: center; + font-weight: 500; + display: block; + position:relative; + box-shadow: 0.5px 0.5px 2px 0px rgba(0, 0, 0, 0.6); + width: 70px; +} + +.portlet div.eventShortDate .month, +silverpeas-calendar-event-occurrence-list .display-grouped-by-day .section-day-date .month-number, +.portlet-content silverpeas-calendar-event-occurrence-list .display-grouped-by-day .section-day-date .day-in-month{ + color:var(--couleur-flashy); + position: absolute; + top:30px; + left: 0; + right: 0; + line-height: 1em; +} +.portlet div.eventShortDate .number, +.portlet-content silverpeas-calendar-event-occurrence-list .display-grouped-by-day .section-day-date .day-in-month{ + color: var(--couleur-flashy); + position: absolute; + top: 7px; + line-height: 1.5em; + left: 0; + right: 0; +} + +.portlet .priority div.eventShortDate, +silverpeas-calendar-event-occurrence-list .display-grouped-by-day .high-priority .section-day-date { + background-image:none !important; + border:2px solid var( --couleur-flashy ); +} + +.portlet div.eventLongDate { + font-size:12px; + font-weight:500; + display:none; +} + +.portlet div.eventName, +.portlet-content silverpeas-calendar-event-occurrence-list .display-grouped-by-day .full-date , +.portlet-content .display-grouped-by-day silverpeas-calendar-event-occurrence-list-item .occurrence-name a { + font-size:12px; + font-weight:500; + margin-bottom:2px; + padding-top:0; +} +#portal-content silverpeas-calendar-event-view-main .occurrence-extra, +#portal-content silverpeas-calendar-event-occurrence-list-item .occurrence-extra, +#portal-content .fc-list-item .occurrence-extra { + width:auto; +} + +.portlet div.eventShortDate .number { + font-size: 20px; + font-weight:700; + color: var(--couleur-principale); +} + +.portlet div.eventShortDate .month { + font-size:22px; + font-weight: 800; +} + +.portlet li.event .eventDesc, .portlet li.event .eventURL{ + display:none; + +} +.portlet .eventInfo div { + width: 90%; + display: inline; +} +.portlet .eventInfo div div.bloc { + padding: 2px 8px 0 17px; + font-size:100%; + +} + +.portlet .eventList { + list-style-type:none; + list-style-image:none; + padding:1em 0; + margin:0; + background-color:transparent +} +.portlet .eventList .eventInfo { + padding:1px 0; +} + +.portlet .eventPlace .bloc { + background-position:6px center; +} + + +.portlet .eventPlace .bloc{ + background:transparent url('../imgDesign/packImages.png') 0 -527px no-repeat; +} + + +/************* PAGE d'ACCUEIL D'ESPACE ****************/ +.spaceHome h1.spaceName, +.spaceHome #portletPages #spaceEvent h2.portlet-title { + padding-top:0; + margin-top:0; +} + + +.spaceHome .spaceNavigation{ + margin:3em 0; +} + +.spaceHome .spaceNavigation li{ + border-radius:4px; + padding: 0.5em 2em; + background-color:var(--couleur-de-fond-clair); + } +.spaceHome .spaceNavigation li img { + left: 19px; +} +.spaceHome .spaceNavigation li.browse-component { + padding-left: 54px; +} +.spaceHome .spaceDescription, +#preview .publiDesc, #preview-clone .publiDesc { + font-family: "Courier New", Courier, monospace; + font-size:16px; + line-height: 1.688em; + border:0; + margin: 0 0px 1em; + padding: 0px; + font-weight:500; + padding: 0 0 20px 0; + color:var(--couleur-texte-clair); +} +.description-publication, +.publication-description, +.occurrence-description, +.main-home-page .principal-main-container .rslides .caption p , +.main-home-page .principal-main-container .list-news .caption p { + font-family: "Courier New", Courier, monospace; + color:var(--couleur-texte-clair); +} + +.spaceHome .spaceDescription { + display:block; + position:relative; +} + +.spaceHome .spaceNavigation li.browse-component p { + padding-left: 0; +} + +.spaceHome #spaceManager ul { + list-style: none outside none; + padding: 0px; +} + +.spaceHome #spaceManager .intfdcolor { + background-color: transparent; +} + +.spaceHome .rightContent > div{ + background: var(--couleur-de-fond-clair); + border-radius: 0; + padding: 20px; + position: relative; + margin: 20px; + overflow:hidden; +} + +.spaceHome #portletPages div:first-child .header h2 { + margin-top:0; +} +/* +.spaceHome #publication li:before, +.last-publication-list li:before { + width:10px; + height:10px; + border-radius:5px; + content:' '; + display:inline-block; + background-color:var( --couleur-flashy ); +}*/ +.spaceHome #publication li a:hover, +.last-publication-list li a:hover{ + background-color:var( --couleur-de-fond-clair ); +} + +.spaceHome #publication li a b, +.last-publication-list li a b { + color: #333333; + font-weight: 500; +} + +.spaceHome #publication li a:hover b, +.last-publication-list li a:hover b { + color:var( --couleur-flashy ); +} + +.last-publication-list .description-publication { + margin:0.75em 0 0 0; +} + +.spaceHome #publication li .userToZoom , +.last-publication-list li .userToZoom { + color: var( --couleur-flashy ); +} + +.spaceHome #spaceQuiskInfo li.slide { + min-height: 115px; +} + +.spaceHome #spaceQuiskInfo li.slide > h4 { + color:var(--couleur-flashy); + font-weight: 500; + line-height: 120%; +} + +.spaceHome #spaceQuiskInfo li.slide p { + line-height: 110%; +} + +.spaceHome #spaceQuiskInfo .slides-pagination a:hover, .spaceHome #spaceQuiskInfo .slides-pagination .selected a { + background-color:var(--couleur-flashy); +} + +.spaceHome .list-responsible-user li { + width: auto; +} + +.spaceHome .spaceNavigation::after, +.spaceHome .cg-favorit-list::after { + content:' '; + clear:left; + display:block; +} +.spaceHome .cg-favorit-list li { + display:inline-block; + float:left; + margin-right:1em; +} +.spaceHome .cg-favorit-list li a span { + display: block; + text-align: center; +} +.action .link { + width: 154px; +} + + +/* a repertoirier sur le produit */ +#directory #indexAndSearch #search { + height:auto; +} + + +/* pour kmelia */ + +#preview #pagination { + margin:5px; + width:auto; +} +#preview #backToSearch { + height: 30px; + width: auto; + float: right; +} +#preview #backToSearch a.button { + background-color: #F4F4F4; + background-image: url("../../../util/icons/gradientSVG.jsp?from=fff&to=e5e5e5&vertical=0&horizontal=100"); + -moz-background-size: 100%; + border-radius: 5px; + border: 1px solid #CCCCCC; + color: #4C4C4C; + font-size: 100%; + padding: 7px 10px; + position: relative; + display: inline-block; + right: auto; + width: auto; +} \ No newline at end of file diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/arrow_down-black.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/arrow_down-black.png new file mode 100644 index 00000000..3882848f Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/arrow_down-black.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/arrow_down-grey.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/arrow_down-grey.png new file mode 100644 index 00000000..fbd0e05d Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/arrow_down-grey.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/arrow_down-white.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/arrow_down-white.png new file mode 100644 index 00000000..9a189703 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/arrow_down-white.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/deco-faq.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/deco-faq.png new file mode 100644 index 00000000..1716854f Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/deco-faq.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/deco-publications.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/deco-publications.png new file mode 100644 index 00000000..2e3f0512 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/deco-publications.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/logo.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/logo.png new file mode 100644 index 00000000..d8651a73 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/logo.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/packImages.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/packImages.png new file mode 100644 index 00000000..6d515708 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/packImages.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/annuaire.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/annuaire.png new file mode 100644 index 00000000..4ad2671f Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/annuaire.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/demarche.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/demarche.png new file mode 100644 index 00000000..7ba12807 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/demarche.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/fiche.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/fiche.png new file mode 100644 index 00000000..119a8ee5 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/fiche.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/fiches.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/fiches.png new file mode 100644 index 00000000..c00cfd0d Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/fiches.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/folders.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/folders.png new file mode 100644 index 00000000..72bb6f55 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/folders.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/laptop-2_102322.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/laptop-2_102322.png new file mode 100644 index 00000000..3a38e526 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/laptop-2_102322.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/orga.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/orga.png new file mode 100644 index 00000000..3713de4b Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/orga.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/rating_102349.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/rating_102349.png new file mode 100644 index 00000000..db399716 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/rating_102349.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/system_102355.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/system_102355.png new file mode 100644 index 00000000..d54710fe Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/system_102355.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/tutos.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/tutos.png new file mode 100644 index 00000000..4d253eac Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/pictos/tutos.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/puce-favorit.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/puce-favorit.png new file mode 100644 index 00000000..dbb2538a Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/puce-favorit.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/puce.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/puce.png new file mode 100644 index 00000000..324790a6 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/puce.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/qvf.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/qvf.png new file mode 100644 index 00000000..ebae03c1 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/qvf.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/themes.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/themes.png new file mode 100644 index 00000000..56fd8852 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/themes.png differ diff --git a/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/welcome.png b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/welcome.png new file mode 100644 index 00000000..69bfd775 Binary files /dev/null and b/aurora/aurora-configuration/src/main/config/data/web/weblib.war/skins/prima/imgDesign/welcome.png differ diff --git a/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/Aurora.properties b/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/Aurora.properties index 5ef23fec..16b398d7 100644 --- a/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/Aurora.properties +++ b/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/Aurora.properties @@ -132,7 +132,7 @@ footer.height = home.news = * home.news.width = 1095 home.news.height = -# displayer = 'carrousel' (default) or 'list' +# displayer = 'carousel' (default) or 'list' # in case of list, adjust home.news.width parameter home.news.displayer = home.news.size = @@ -272,7 +272,10 @@ Shortcut.home.6.IconUrl = /weblib/Aurora/imgDesign/pictos/idea.png space.homepage.latestpublications = true space.homepage.latestpublications.nb = 5 space.homepage.news = true -space.homepage.news.nb = 10 +space.homepage.news.nb.default = 5 +space.homepage.news.nb.max = 10 +space.homepage.news.image.width = 800 +space.homepage.news.image.height = 0 space.homepage.subspaces = true space.homepage.apps = true space.homepage.events = true diff --git a/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/Sobre.properties b/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/Sobre.properties index ed8ce012..438d8e48 100644 --- a/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/Sobre.properties +++ b/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/Sobre.properties @@ -128,7 +128,7 @@ footer.height = home.news = * home.news.width = 1095 home.news.height = -# displayer = 'carrousel' (default) or 'list' +# displayer = 'carousel' (default) or 'list' # in case of list, adjust home.news.width parameter home.news.displayer = home.news.size = @@ -268,7 +268,10 @@ Shortcut.home.6.IconUrl = /weblib/skins/Sobre/imgDesign/pictos/idea.png space.homepage.latestpublications = true space.homepage.latestpublications.nb = 5 space.homepage.news = true -space.homepage.news.nb = 10 +space.homepage.news.nb.default = 5 +space.homepage.news.nb.max = 10 +space.homepage.news.image.width = 800 +space.homepage.news.image.height = 0 space.homepage.subspaces = true space.homepage.apps = true space.homepage.events = true diff --git a/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/lookSettings.properties b/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/lookSettings.properties index a6d69f3b..9d3f1fa0 100644 --- a/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/lookSettings.properties +++ b/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/lookSettings.properties @@ -1,2 +1,3 @@ Initial = org.silverpeas.util.viewGenerator.settings.Aurora -Sobre = org.silverpeas.util.viewGenerator.settings.Sobre \ No newline at end of file +Sobre = org.silverpeas.util.viewGenerator.settings.Sobre +Prima = org.silverpeas.util.viewGenerator.settings.prima \ No newline at end of file diff --git a/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/prima.properties b/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/prima.properties new file mode 100644 index 00000000..d3e9e7d7 --- /dev/null +++ b/aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/prima.properties @@ -0,0 +1,319 @@ +################################################################################## +## Main properties of this skin +################################################################################## +StyleSheet = /weblib/skins/prima/css/main.css + +################################################################################## +## Banner properties +################################################################################## + +# Banner wallpaper +banner.wallPaper = + +# Id of spaces displayed in the banner (must be separated by spaces) +banner.spaces = * + +# Display second level of banner spaces +banner.subElements = true + +# Defines if apps must be displayed before subspaces +banner.menu.apps.first = false + +# Defines if icons of apps must be displayed +banner.menu.apps.icons = true + +# Defines if mega menu is used +banner.menu.mega = false + +# Id of space which contains collaborative projects ex : WA184 +projects.spaceId = + +# Id of space which contains web applications ex : WA263 +applications.spaceId = + +# Banner height +banner.height = 140 + +# Help URL +helpURL = + +# Display hidden components on site map : true to show - false or empty otherwise. +display.all.components=true + +# Display connected users +displayConnectedUsers = true + +# Enable directory from banner +directory.enabled = true +# Directory scope. Domain ids separated by comma. +directory.domains = +# Directory scope. Group ids separated by comma. +directory.groups = +# Directory sort {NEWEST | ALPHA} +directory.sort = NEWEST + +# The label displayed before news - 'none', 'default' +ticker.label = default +# Whether or not to use link on item +ticker.linkOnItem = true +# Whether or not to display item description +ticker.items.description = false +# The pause on a news item before being replaced +ticker.plugin.pauseOnItems = 5000 +# Animation type - current options are 'reveal' or 'fade' +ticker.plugin.displayType = fade +# The speed of the reveal +ticker.plugin.speed = 0.10 +# Speed of fade in animation +ticker.plugin.fadeInSpeed = 600 +# Speed of fade out animation +ticker.plugin.fadeOutSpeed = 300 +# Whether or not to show the jQuery News Ticker controls +ticker.plugin.controls = false + +Shortcut.tool.1.Url = +Shortcut.tool.1.Target = _blank +Shortcut.tool.1.AltText = Site web +Shortcut.tool.1.IconUrl = + +################################################################################## +## Personal space properties +################################################################################## + +# Enabled tools of personal space +agendaVisible = false +todoVisible = true +notificationVisible = true +interestVisible = true +favRequestVisible = true +fileSharingVisible = true +webconnectionsVisible = true +scheduleEventVisible = true +linksVisible = true +customVisible = true +mailVisible = true + +################################################################################## +## Menu properties (left pane) +################################################################################## + +# Display app icons (true | false) +displayComponentIcons = true + +# Left pane width +domainsBarFramesetWidth = 260 + +################################################################################## +## Footer properties (left pane) +################################################################################## + +# Display footer dedicated to taxonomy +displayPDCFrame = false + +# footer height +footer.height = + +################################################################################## +## Homepage properties +################################################################################## + +# For QuickInfo: set the property with the id of the apps to render their news on the homepage. For +# all the QuickInfo apps in Silverpeas, just set the property with '*'. +# For DelegatedNews: just set the property with 'delegated'. Require to have a DelegatedNews app +# in Silverpeas. +# Examples of setting: +# home.news = * +# home.news = quickInfo32 quickInfo12 +# home.news = delegated | taxonomy +home.news = * +home.news.width = 800 +home.news.height = +# displayer = 'carousel' (default) or 'list' +# in case of list, adjust home.news.width parameter +home.news.displayer = carousel +home.news.size = 5 +home.news.importantOnly = false +# only one position on a unique axis is supported at the moment +# example : 14:/0/1/5/ +home.news.taxonomy.position = +# display buttons according to news positions even if previous parameter is not defined +home.news.taxonomy.display = + +# Id(s) of app which manages secondary news on homepage +# home.news.secondary = quickinfo915 +home.news.secondary = +home.news.secondary.width = 500 +home.news.secondary.height = +home.news.secondary.displayer = list +home.news.secondary.size = 2 +home.news.secondary.importantOnly = false +home.news.secondary.taxonomy.position = +home.news.secondary.taxonomy.display = + +# home.news.third = quickinfo914 +home.news.third = +home.news.third.width = 500 +home.news.third.height = +home.news.third.displayer = list +home.news.third.size = 2 +home.news.third.importantOnly = false +home.news.third.taxonomy.position = +home.news.third.taxonomy.display = + +# Id(s) of app which manages next events on homepage +# Several apps can be identified (separated by a space) +home.events.appId = * +home.events.maxDays = 3 +home.events.importantOnly = false +home.events.today.include = false +home.events.personal.include = false + +# Display date of day and Saint +home.ephemeris = true +home.ephemeris.date.format = dd MMMMM yyyy + +# Displayed only if home.ephemeris = true +# The settings to specify the weather service to use and the cities for which the weather forecast +# should be displayed are defined in the properties file whole the name is indicated by the +# home.weather.settings property (without the file extension). +# The properties file must be located in the properties/org/silverpeas/weathet/settings +# directory. +home.weather = true +home.weather.settings = + +# Id of app 'FAQ' displayed on homepage +# home.faq.appId = questionReply880 +home.faq.appId = +home.faq.nb = 1 +# Display 'random' question or 'latest' one (default = random) +home.faq.display = + +# Id of app 'RSS' displayed on homepage +# home.rss.appId = rssAgregator972 +home.rss.appId = +# displayer = 'aggregate', 'tabs' or 'carrousel' +home.rss.displayer = tabs + +# Id of app 'WebPage' displayed on homepage +# home.freezone.appId = webPages980 +home.freezone.appId = +home.freezone.app.useLabel = true + +# Id of app 'WebPage' displayed on thin part of homepage +home.freezone.thin.appId = +home.freezone.thin.app.useLabel = true + +# Bookmarks area +home.bookmarks.empty.show = false +home.bookmarks.empty.fragment = /weblib/noFavorites.html + +# Display (or not) taxonomy search block on homepage +home.search = true +home.search.taxonomy.labelsInside = true + +# Display search block based on a given template (activated if the template filename is defined) +home.search.template = +home.search.extrafield.period = false +home.search.extrafield.space = false + +# Number of publications displayed on homepage +home.publications.nb = 5 +home.publications.spaceid = +home.publications.components.excluded = +#home.publications.spaces.excluded = ? + +# Turn this to false to display first main space as homepage only if regular user has access to no news +home.displayedWhenNoNews = true + +# Zoom - Not implemented yet +zoom.topicId = 0 +zoom.componentId = kmelia136 + +# Displaying list of new users +home.users.nb = 3 +# Displaying users of group (identified by its id) +home.users.group = +# For each user, displaying fields listed below (separated by a space) +home.users.fields = title phone fonction +# For each user, displaying its avatar (or not) +home.users.avatar = true + + +Shortcut.home.1.Url = # +Shortcut.home.1.Target = _top +Shortcut.home.1.AltText = Documents de r\u00e9f\u00e9rences +Shortcut.home.1.IconUrl = /weblib/skins/prima/imgDesign/pictos/folders.png + +Shortcut.home.2.Url = # +Shortcut.home.2.Target = _top +Shortcut.home.2.AltText = D\u00e0marches en ligne +Shortcut.home.2.IconUrl = /weblib/skins/prima/imgDesign/pictos/fiche.png + + +Shortcut.home.3.Url = # +Shortcut.home.3.Target = _top +Shortcut.home.3.AltText = Tutos +Shortcut.home.3.IconUrl = /weblib/skins/prima/imgDesign/pictos/tutos.png + + +Shortcut.home.4.Url = # +Shortcut.home.4.Target = _top +Shortcut.home.4.AltText = Organigramme +Shortcut.home.4.IconUrl = /weblib/skins/prima/imgDesign/pictos/orga.png + + + +################################################################################## +# Space homepage properties +################################################################################## +space.homepage.latestpublications = true +space.homepage.latestpublications.nb = 5 +space.homepage.news = true +space.homepage.news.nb.default = 5 +space.homepage.news.nb.max = 10 +space.homepage.news.image.width = 800 +space.homepage.news.image.height = 0 +space.homepage.subspaces = true +space.homepage.apps = true +space.homepage.events = true +space.homepage.admins = true +space.homepage.management.active = true +# Following parameters permit to defined a custom template for the given space and all his descendants +# Several lines for several templates can be added +space.homepage.management.customtemplate.WAXX = customTemplate.xml + +################################################################################## +# The following properties are for experts only +################################################################################## +Window = org.silverpeas.core.web.util.viewgenerator.html.window.WindowWithContextualDiv +BrowseBar = org.silverpeas.core.web.util.viewgenerator.html.browsebars.BrowseBarComplete +OperationPane = org.silverpeas.core.web.util.viewgenerator.html.operationpanes.OperationPaneSilverpeasV5Web20 +Button = org.silverpeas.core.web.util.viewgenerator.html.buttons.ButtonSilverpeasV5 +ButtonPane = org.silverpeas.core.web.util.viewgenerator.html.buttonpanes.ButtonPaneWA2 +Icon = org.silverpeas.core.web.util.viewgenerator.html.icons.IconWA +IconPane = org.silverpeas.core.web.util.viewgenerator.html.iconpanes.IconPaneWA +TabbedPane = org.silverpeas.core.web.util.viewgenerator.html.tabs.TabbedPaneSilverpeasV5 +ArrayPane = org.silverpeas.core.web.util.viewgenerator.html.arraypanes.ArrayPaneSilverpeasV5 +FormPane = org.silverpeas.core.web.util.viewgenerator.html.formpanes.FormPaneWA +Frame = org.silverpeas.core.web.util.viewgenerator.html.frame.FrameSilverpeasV5 +NavigationList = org.silverpeas.core.web.util.viewgenerator.html.navigationlist.NavigationListSilverpeasV5 +Board = org.silverpeas.core.web.util.viewgenerator.html.board.BoardSilverpeasV5 + +MessageBundle = org.silverpeas.looks.aurora.multilang.lookBundle +publicationHelper = org.silverpeas.components.kmelia.KmeliaTransversal +JavaScript.kmelia = +FrameJSP = /look/jsp/MainFrame.jsp +displayUserFavoriteSpace = DISABLE + +# Default homepages (Ex: http://<host>/page.htm) +defaultHomepage = +persoHomepage = +loginHomepage = /silverpeas/look/jsp/Main.jsp +spaceHomepage = /look/jsp/spaceHomePage.jsp + +# Backoffice wallpaper +FondManager = /silverpeas/jobManagerPeas/jsp/icons/fondmanager.gif + +javascript.homepage = +javascript.banner = +javascript.space.homepage = diff --git a/aurora/aurora-war/pom.xml b/aurora/aurora-war/pom.xml index 511145a7..dc6e4264 100644 --- a/aurora/aurora-war/pom.xml +++ b/aurora/aurora-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.looks</groupId> <artifactId>aurora</artifactId> - <version>6.4-SNAPSHOT</version> + <version>6.4-JR-SNAPSHOT</version> </parent> <groupId>org.silverpeas.looks.aurora</groupId> diff --git a/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/AuroraSpaceHomePage.java b/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/AuroraSpaceHomePage.java index 28cb666a..ef7ecede 100644 --- a/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/AuroraSpaceHomePage.java +++ b/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/AuroraSpaceHomePage.java @@ -44,6 +44,7 @@ import org.silverpeas.core.contribution.template.publication.PublicationTemplate; import org.silverpeas.core.contribution.template.publication.PublicationTemplateManager; import org.silverpeas.core.util.CollectionUtil; +import org.silverpeas.core.util.Pair; import org.silverpeas.core.util.StringUtil; import org.silverpeas.core.util.URLUtil; import org.silverpeas.core.util.logging.SilverLogger; @@ -51,11 +52,18 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.EnumSet; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.function.Predicate; import static java.util.Collections.emptyList; +import static java.util.Optional.ofNullable; +import static java.util.stream.Collectors.toMap; +import static org.silverpeas.core.util.StringUtil.EMPTY; +import static org.silverpeas.looks.aurora.AuroraSpaceHomePageZone.MAIN; +import static org.silverpeas.looks.aurora.AuroraSpaceHomePageZone.RIGHT; public class AuroraSpaceHomePage { @@ -97,11 +105,50 @@ public List<PublicationDetail> getPublications() { } public NewsList getNews() { - boolean displayNews = isEnabled("space.homepage.news", "displayNews"); + final int nbNews = ofNullable(getFieldValue("newsLimit")) + .filter(StringUtil::isInteger) + .map(Integer::parseInt) + .map(l -> Math.min(l, look.getSettings("space.homepage.news.nb.max", 10))) + .orElse(look.getSettings("space.homepage.news.nb.default", 5)); + final boolean displayNews = nbNews > 0 && isEnabled("space.homepage.news", "displayNews"); + final NewsList newsList; if (displayNews) { - return look.getNewsOfSpace(getSpace().getId()); + final boolean includeSubSpaces = getFieldBooleanValue("newsOfSubSpaces"); + final boolean importantOnly = getFieldBooleanValue("newsImportantOnly"); + newsList = look.getNewsOfSpace(getSpace().getId(), includeSubSpaces, importantOnly, nbNews); + ofNullable(getFieldValue("newsZone")) + .filter(StringUtil::isDefined) + .map(String::toUpperCase) + .map(AuroraSpaceHomePageZone::valueOf) + .ifPresent(newsList::setZone); + ofNullable(getFieldValue("newsRenderingType")) + .filter(StringUtil::isDefined) + .map(String::toUpperCase) + .map(NewsList.RenderingType::valueOf) + .ifPresent(newsList::setRenderingType); + newsList.setImageSize(look.getSettings("space.homepage.news.image.width", "800") + "x" + + look.getSettings("space.homepage.news.image.height", EMPTY)); + } else { + newsList = new NewsList(Collections.emptyList(), null); } - return new NewsList(Collections.emptyList(), null); + return newsList; + } + + public Map<AuroraSpaceHomePageZone, FreeZone> getFreeZones() { + return EnumSet.of(MAIN, RIGHT) + .stream() + .flatMap(p -> { + final String prefix = p.name().toLowerCase(); + return ofNullable(getFieldWysiwygValue(prefix + "FreeContentValue")) + .filter(StringUtil::isDefined) + .map(FreeZone::new) + .map(z -> { + z.setTitle(getFieldValue(prefix + "FreeContentTitle")); + return Pair.of(p, z); + }) + .stream(); + }) + .collect(toMap(Pair::getFirst, Pair::getSecond)); } public boolean isTaxonomyEnabled() { diff --git a/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/AuroraSpaceHomePageZone.java b/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/AuroraSpaceHomePageZone.java new file mode 100644 index 00000000..e6d2309b --- /dev/null +++ b/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/AuroraSpaceHomePageZone.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2000 - 2024 Silverpeas + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * As a special exception to the terms and conditions of version 3.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * Open Source Software ("FLOSS") applications as described in Silverpeas's + * FLOSS exception. You should have received a copy of the text describing + * the FLOSS exception, and it is also available here: + * "https://www.silverpeas.org/legal/floss_exception.html" + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +package org.silverpeas.looks.aurora; + +/** + * Definitions of different zone of a space homepage. + */ +public enum AuroraSpaceHomePageZone { + MAIN, RIGHT, THIRD; + + public boolean isMain() { + return this == MAIN; + } + + public boolean isRight() { + return this == RIGHT; + } + + public boolean isThird() { + return this == THIRD; + } +} diff --git a/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookAuroraHelper.java b/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookAuroraHelper.java index f5215457..f7932620 100644 --- a/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookAuroraHelper.java +++ b/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookAuroraHelper.java @@ -16,6 +16,7 @@ import org.silverpeas.components.rssaggregator.model.SPChannel; import org.silverpeas.components.rssaggregator.service.RSSService; import org.silverpeas.components.rssaggregator.service.RSSServiceProvider; +import org.silverpeas.core.SilverpeasRuntimeException; import org.silverpeas.core.admin.component.model.ComponentInst; import org.silverpeas.core.admin.component.model.ComponentInstLight; import org.silverpeas.core.admin.component.model.PersonalComponent; @@ -25,6 +26,7 @@ import org.silverpeas.core.admin.service.AdminException; import org.silverpeas.core.admin.service.Administration; import org.silverpeas.core.admin.service.OrganizationController; +import org.silverpeas.core.admin.service.SpaceWithSubSpacesAndComponents; import org.silverpeas.core.admin.space.SpaceInstLight; import org.silverpeas.core.admin.user.model.Group; import org.silverpeas.core.admin.user.model.SilverpeasRole; @@ -72,13 +74,17 @@ import java.util.Objects; import java.util.Optional; import java.util.Random; +import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; import static java.util.Collections.emptySet; +import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.toList; import static java.util.stream.Stream.of; +import static org.silverpeas.core.admin.space.SpaceInst.SPACE_KEY_PREFIX; import static org.silverpeas.core.admin.user.constant.UserState.*; +import static org.silverpeas.core.util.StringUtil.EMPTY; import static org.silverpeas.core.util.StringUtil.split; import static org.silverpeas.looks.aurora.AuroraSpaceHomePage.TEMPLATE_NAME; @@ -389,7 +395,9 @@ private List<News> getNewsByComponentId(String allowedComponentId, boolean impor public NewsList getAllNewsByTaxonomyPosition(String taxonomyPosition) { List<News> allNews = getNewsByTaxonomyPosition(getAllowedComponents(QUICKINFO, "*"), false, taxonomyPosition); - return new NewsList(allNews, null); + final NewsList newsList = new NewsList(allNews, null); + newsList.setRenderingType(NewsList.RenderingType.LIST); + return newsList; } private List<News> getNewsByTaxonomyPosition(List<String> allowedComponentIds, @@ -893,7 +901,7 @@ private NewsList getNewsList(int index) { List<News> news = new ArrayList<>(); String newsType = getSettings(key, ""); if (!StringUtil.isDefined(newsType)) { - return new NewsList(news, uniqueAppId); + return setupMainHomePageNewsListDisplay(key, new NewsList(news, uniqueAppId)); } boolean importantOnly = getSettings(key + ".importantOnly", false); @@ -920,7 +928,28 @@ private NewsList getNewsList(int index) { if (getSettings(key + ".taxonomy.display", false)) { result.withTaxonomyButtons(); } - return result; + return setupMainHomePageNewsListDisplay(key, result); + } + + private NewsList setupMainHomePageNewsListDisplay(final String key, final NewsList newsList) { + switch (key) { + case PROPERTY_NEWS_MAIN: + newsList.setZone(AuroraSpaceHomePageZone.MAIN); + break; + case PROPERTY_NEWS_THIRD: + newsList.setZone(AuroraSpaceHomePageZone.THIRD); + break; + default: + newsList.setZone(AuroraSpaceHomePageZone.RIGHT); + } + newsList.setRenderingType(ofNullable(getSettings(key + ".displayer", null)) + .filter(StringUtil::isDefined) + .map(String::toUpperCase) + .map(NewsList.RenderingType::valueOf) + .orElse(NewsList.RenderingType.CAROUSEL)); + newsList.setImageSize( + getSettings(key + ".width", "800") + "x" + getSettings(key + ".height", "")); + return newsList; } private List<String> getComponentIdsForNews(int index) { @@ -963,19 +992,27 @@ public String getSpaceHomePageCustomTemplate(String spaceId) { return null; } - public NewsList getNewsOfSpace(String spaceId) { - List<String> appIds = new ArrayList<>(); - String[] cIds = getOrganisationController().getAvailCompoIds(spaceId, getUserId()); - for (String id : cIds) { - if (StringUtil.startsWithIgnoreCase(id, QUICKINFO)) { - appIds.add(id); - } + NewsList getNewsOfSpace(final String spaceId, final boolean includeSubSpaces, + final boolean importantOnly, final int limit) { + final String localSpaceId = spaceId.replace(SPACE_KEY_PREFIX, EMPTY); + final List<String> appIds; + try { + final SpaceWithSubSpacesAndComponents.ComponentInstanceSelector componentInstanceSelector = + getOrganisationController() + .getFullTreeviewOnComponentName(getUserId(), QUICKINFO) + .componentInstanceSelector(); + appIds = componentInstanceSelector.fromSpaces(Set.of(localSpaceId)) + .select() + .stream() + .filter(i -> includeSubSpaces || i.getSpaceId().equals(localSpaceId)) + .map(SilverpeasComponentInstance::getId) + .collect(toList()); + } catch (AdminException e) { + throw new SilverpeasRuntimeException(e); } - - List<News> someNews = getNewsByComponentIds(appIds, false); - int nbNews = getSettings("space.homepage.news.nb", 10); - if (someNews.size() > nbNews) { - return new NewsList(someNews.subList(0, nbNews), null); + final List<News> someNews = getNewsByComponentIds(appIds, importantOnly); + if (someNews.size() > limit) { + return new NewsList(someNews.subList(0, limit), null); } return new NewsList(someNews, null); } diff --git a/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookSettings.java b/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookSettings.java index ad7e7b94..32d92f72 100644 --- a/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookSettings.java +++ b/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookSettings.java @@ -12,7 +12,6 @@ */ public class LookSettings { - private static final String CARROUSEL_TYPE = "carrousel"; SettingBundle settings; public LookSettings(SettingBundle settings) { @@ -62,15 +61,6 @@ public boolean isDisplaySearchOnHome() { return settings.getBoolean("home.search", true); } - public String getNewsImageSize() { - return settings.getString("home.news.width", "1095") + "x" + - settings.getString("home.news.height", ""); - } - - public boolean isDisplayNewsWithCarrousel() { - return CARROUSEL_TYPE.equalsIgnoreCase(settings.getString("home.news.displayer", CARROUSEL_TYPE)); - } - public String getEventsAppURL() { return URLUtil.getSimpleURL(URLUtil.URL_COMPONENT, settings.getString("home.events.appId", "")); } @@ -119,26 +109,6 @@ public boolean isExtraSearchFieldSpaceUsed() { return settings.getBoolean("home.search.extrafield.space", false); } - public String getSecondaryNewsImageSize() { - return settings.getString("home.news.secondary.width", "1095") + "x" + - settings.getString("home.news.secondary.height", ""); - } - - public boolean isDisplaySecondaryNewsWithCarrousel() { - return CARROUSEL_TYPE.equalsIgnoreCase(settings.getString("home.news.secondary.displayer", - CARROUSEL_TYPE)); - } - - public String getThirdNewsImageSize() { - return settings.getString("home.news.third.width", "1095") + "x" + - settings.getString("home.news.third.height", ""); - } - - public boolean isDisplayThirdNewsWithCarrousel() { - return CARROUSEL_TYPE.equalsIgnoreCase(settings.getString("home.news.third.displayer", - CARROUSEL_TYPE)); - } - public String getExtraJavascriptForHome() { return settings.getString("javascript.homepage", ""); } diff --git a/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/NewsList.java b/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/NewsList.java index 18a02a12..f159f3e5 100644 --- a/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/NewsList.java +++ b/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/NewsList.java @@ -4,7 +4,6 @@ import org.silverpeas.core.pdc.pdc.model.ClassifyPosition; import org.silverpeas.core.pdc.pdc.model.ClassifyValue; import org.silverpeas.core.pdc.pdc.model.Value; -import org.silverpeas.core.pdc.pdc.service.PdcManager; import org.silverpeas.core.util.logging.SilverLogger; import org.silverpeas.core.web.look.Shortcut; @@ -19,7 +18,10 @@ public class NewsList extends ListOfContributions { private List<AuroraNews> news; - private List<NewsListButton> buttons = new ArrayList<>(); + private final List<NewsListButton> buttons = new ArrayList<>(); + private String imageSize = "800x"; + private AuroraSpaceHomePageZone zone = AuroraSpaceHomePageZone.RIGHT; + private RenderingType type = RenderingType.CAROUSEL; public NewsList(List<News> someNews, String uniqueAppId) { setUniqueAppId(uniqueAppId); @@ -43,7 +45,7 @@ public boolean isEmpty() { } private void processShortcuts() { - Map<String, Shortcut> shortcuts = new HashMap(); + Map<String, Shortcut> shortcuts = new HashMap<>(); for (AuroraNews aNews : news) { String componentId = aNews.getNews().getComponentInstanceId(); Shortcut appShortcut = shortcuts.computeIfAbsent(componentId, this::getAppShortcut); @@ -76,4 +78,66 @@ public void withTaxonomyButtons() { public List<NewsListButton> getButtons() { return buttons; } + + /** + * Gets the zone location the news list MUST be managed. + * @return a {@link AuroraSpaceHomePageZone} instance. + */ + public AuroraSpaceHomePageZone getZone() { + return zone; + } + + /** + * Gets the image size the image of news MUST be displayed. + * <p> + * Format MUST be "WxH" (W = width and H = height in pixels) + * </p> + * @return the image size (width x height) as string. + */ + public String getImageSize() { + return imageSize; + } + + /** + * Sets the image size the image of news MUST be displayed. + * <p> + * Format MUST be "WxH" (W = width and H = height in pixels) + * </p> + * @param imageSize the image size (width x height) as string. + */ + public void setImageSize(final String imageSize) { + this.imageSize = imageSize; + } + + /** + * Sets the zone location the news list MUST be managed. + * @param zone {@link AuroraSpaceHomePageZone} instance. + */ + public void setZone(final AuroraSpaceHomePageZone zone) { + this.zone = zone; + } + + /** + * Gets the type the news list MUST be rendered in. + * @return a {@link RenderingType} instance. + */ + public RenderingType getRenderingType() { + return type; + } + + /** + * Sets the type the news list MUST be rendered in. + * @param type a {@link RenderingType} instance. + */ + public void setRenderingType(final RenderingType type) { + this.type = type; + } + + public enum RenderingType { + LIST, CAROUSEL; + + public boolean isCarousel() { + return this == CAROUSEL; + } + } } diff --git a/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/displayNews.tag b/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/displayNews.tag index 3ec6c89d..7fffd391 100644 --- a/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/displayNews.tag +++ b/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/displayNews.tag @@ -34,18 +34,13 @@ required="true" type="org.silverpeas.looks.aurora.NewsList" %> -<%@ attribute name="carrousel" - required="true" - type="java.lang.Boolean" %> - -<%@ attribute name="imageSize" - required="true" - type="java.lang.String" %> - <%@ attribute name="id" required="false" type="java.lang.String" %> +<c:set var="imageSize" value="${listOfNews.imageSize}"/> +<c:set var="carousel" value="${listOfNews.renderingType.carousel}"/> + <c:if test="${empty id}"> <c:set var="id" value="carrousel-actualite"/> </c:if> @@ -54,8 +49,7 @@ <fmt:message var="labelNewsMore" key="look.home.news.more"/> <c:set var="newsClass" value="list-news"/> -<c:set var="newsWithCarrousel" value="${carrousel}"/> -<c:if test="${newsWithCarrousel}"> +<c:if test="${carousel}"> <c:set var="newsClass" value="rslides"/> </c:if> @@ -110,21 +104,19 @@ </c:otherwise> </c:choose> </div> -</c:if> - - -<script type="text/javascript"> - whenSilverpeasReady(function() { - <c:if test="${carrousel}"> - $("#${id} .rslides#slider").responsiveSlides({ - auto: true, - pager: true, - nav: true, - speed: 500, - pause: true, - timeout: 6000, - namespace: "centered-btns" + <script type="text/javascript"> + whenSilverpeasReady(function() { + <c:if test="${carousel}"> + $("#${id} .rslides#slider").responsiveSlides({ + auto: true, + pager: true, + nav: true, + speed: 500, + pause: true, + timeout: 6000, + namespace: "centered-btns" + }); + </c:if> }); - </c:if> - }); -</script> + </script> +</c:if> \ No newline at end of file diff --git a/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/spaceNavigationCSS.tag b/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/spaceNavigationCSS.tag index 484b2ac8..74c08797 100644 --- a/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/spaceNavigationCSS.tag +++ b/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/spaceNavigationCSS.tag @@ -23,62 +23,65 @@ --%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<style type="text/css"> +<style> .spaceHome .spaceDescription { display: block; - margin: 1em 0px; - padding: 0px; + margin: 1em 0; + padding: 0; text-align: justify; } .spaceHome .spaceNavigation .browseSpace { - font-weight: 100; + font-weight: 500; } .spaceHome .spaceNavigation ul { list-style-type: none; - margin: 0px; - padding: 0px; + display: flex; + flex-direction: row; + flex-flow: wrap; + margin: 0; + padding: 0; } .spaceHome .spaceNavigation li { border-radius: 12px; - float: left; - line-height: 32px; - margin-right: 6px; - min-height: 32px; - padding: 8px 12px 8px 8px; + line-height: 3em; + margin-right: 1em; + min-height: 3em; + padding: 1em; + display: flex; } .spaceHome .spaceNavigation li:hover { - background-image: url("<c:url value="/util/icons/gradientSVG.jsp?from=e5e5e5&to=fff&vertical=0&horizontal=100"/>"); + background: linear-gradient(90deg, rgb(0 0 0 / 0.3) 0%, rgb(255 255 255 / 1) 100%); cursor: pointer; } .spaceHome .spaceNavigation li div { - display: inline-block; - vertical-align: middle; + align-self: center; } .spaceHome .spaceNavigation li a { - font-size: 14px; + font-size: 110%; } .spaceHome .spaceNavigation li p { font-size: 90%; - margin: -13px 0 0 0; - padding: 0px; + margin: 0; + padding: 0; } .spaceHome .spaceNavigation li.browse-component { padding-left: 36px; - position: relative; + position: relative } .spaceHome .spaceNavigation li img { left: 5px; position: absolute; - top: 25%; + top: calc(50% - 13px); width: 26px; + height: auto; } </style> \ No newline at end of file diff --git a/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/spaceNews.tag b/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/spaceNews.tag index 3e6dda2e..69fe892e 100644 --- a/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/spaceNews.tag +++ b/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/spaceNews.tag @@ -30,41 +30,58 @@ <c:set var="lookHelper" value="${sessionScope['Silverpeas_LookHelper']}"/> <view:setBundle bundle="${lookHelper.localizedBundle}"/> -<%@ attribute name="news" +<%@ attribute name="listOfNews" required="true" - type="java.util.List" %> + type="org.silverpeas.looks.aurora.NewsList" %> <fmt:message var="labelNews" key="look.space.home.news"/> <script type="text/javascript"> - <!-- + <c:if test="${listOfNews.renderingType.carousel}"> whenSilverpeasReady(function() { - var $s = $('.slideshow').slides(); + $("#spaceQuiskInfo ul.carousel").responsiveSlides({ + auto: true, + pager: true, + nav: true, + speed: 500, + pause: true, + timeout: 6000, + namespace: "centered-btns" + }); }); - --> + </c:if> </script> -<c:if test="${not empty news}"> +<c:set var="listOrcarouselCss" value="list"/> +<c:if test="${listOfNews.renderingType.carousel}"> + <c:set var="listOrcarouselCss" value="carousel rslides"/> +</c:if> + +<c:if test="${not empty listOfNews.news}"> <!-- QuickInfo --> <div class="secteur-container" id="spaceQuiskInfo"> <div class="header"> <h2 class="portlet-title">${labelNews}</h2> </div> <div class="portlet-content slideshow" data-transition="crossfade" data-loop="true" data-skip="false"> - <ul class="carousel"> - <c:forEach var="aNews" items="${news}"> + <ul class="${listOrcarouselCss}"> + <c:forEach var="aNews" items="${listOfNews.news}"> <c:set var="tpCSS" value="${aNews.taxonomyPositionAsString}"/> - <li class="slide ${tpCSS}" onclick="location.href='${aNews.permalink}'"> - <h3 class="title-quickInfo"> - <a class="sp-permalink" href="${aNews.permalink}"> - ${silfn:escapeHtml(aNews.title)} - </a> - </h3> + <li class="slide ${tpCSS}" onclick="spWindow.loadPermalink('${aNews.permalink}')"> <c:if test="${not empty aNews.thumbnailURL}"> - <img src="${aNews.thumbnailURL}" alt=""/> + <div class="thumbnail"><img src="${aNews.thumbnailURL}" alt=""/></div> </c:if> - <div class="content-quickInfo"> - <p>${aNews.description}</p> + <div class="content-quickInfo caption"> + <h3 class="title-quickInfo"> + <a class="sp-permalink" href="${aNews.permalink}"> + ${silfn:escapeHtml(aNews.title)} + </a> + </h3> + <p class="news-date"><view:formatDate value="${aNews.date}"/></p> + <view:componentPath componentId="${aNews.news.componentInstanceId}" includeComponent="false"/> + <c:if test="${not empty aNews.description}"> + <p>${aNews.description}</p> + </c:if> </div> </li> </c:forEach> diff --git a/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/spaceNewsCSS.tag b/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/spaceNewsCSS.tag deleted file mode 100644 index 2d4c3d78..00000000 --- a/aurora/aurora-war/src/main/webapp/WEB-INF/tags/silverpeas/look/spaceNewsCSS.tag +++ /dev/null @@ -1,80 +0,0 @@ -<%-- - ~ Copyright (C) 2000 - 2022 Silverpeas - ~ - ~ This program is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU Affero General Public License as - ~ published by the Free Software Foundation, either version 3 of the - ~ License, or (at your option) any later version. - ~ - ~ As a special exception to the terms and conditions of version 3.0 of - ~ the GPL, you may redistribute this Program in connection with Free/Libre - ~ Open Source Software ("FLOSS") applications as described in Silverpeas's - ~ FLOSS exception. You should have received a copy of the text describing - ~ the FLOSS exception, and it is also available here: - ~ "https://www.silverpeas.org/legal/floss_exception.html" - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU Affero General Public License for more details. - ~ - ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <https://www.gnu.org/licenses/>. - --%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - -<style type="text/css"> - .spaceHome #spaceQuiskInfo ul.carousel { - list-style: none outside none; - margin: 0px; - padding: 0px; - } - - .spaceHome #spaceQuiskInfo li.slide { - list-style: none outside none; - padding: 0px; - min-height: 180px; - margin: 0px 0px 5px; - } - - .spaceHome #spaceQuiskInfo li.slide > h4 { - margin: 0 0 8px 0; - padding: 0px; - } - - .spaceHome #spaceQuiskInfo li.slide img { - float: left; - margin: 0.25em 0.5em 0 0; - width: 100px; - } - - .spaceHome #spaceQuiskInfo li p { - color: #666666; - text-align: justify; - padding: 0; - margin: 0; - } - - .spaceHome #spaceQuiskInfo .slides-pagination { - bottom: auto; - left: auto; - position: relative; - margin: 0px; - padding: 0px; - z-index: 90; - } - - .spaceHome #spaceQuiskInfo .slides-pagination li { - display: inline-block; - } - - .spaceHome #spaceQuiskInfo .slides-pagination a { - color: #FFFFFF; - text-align: center; - margin-bottom: 5px; - } - - .spaceHome #spaceQuiskInfo .slideshow { - margin: 0px; - } -</style> \ No newline at end of file diff --git a/aurora/aurora-war/src/main/webapp/look/jsp/Main.jsp b/aurora/aurora-war/src/main/webapp/look/jsp/Main.jsp index 99270b5d..74ec226c 100644 --- a/aurora/aurora-war/src/main/webapp/look/jsp/Main.jsp +++ b/aurora/aurora-war/src/main/webapp/look/jsp/Main.jsp @@ -3,16 +3,20 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> <%@ taglib uri="http://www.silverpeas.com/tld/silverFunctions" prefix="silfn" %> <%@ taglib tagdir="/WEB-INF/tags/silverpeas/look" prefix="viewTags" %> +<%@ page import="java.util.stream.Stream" %> +<%@ page import="org.silverpeas.looks.aurora.NewsList" %> +<%@ page import="java.util.function.Predicate" %> <c:set var="lookHelper" value="${sessionScope['Silverpeas_LookHelper']}"/> +<c:if test="${lookHelper != null}"> + <jsp:useBean id="lookHelper" type="org.silverpeas.looks.aurora.LookAuroraHelper"/> +</c:if> <c:set var="settings" value="${lookHelper.lookSettings}"/> <c:set var="weatherCities" value="${lookHelper.weatherCities}"/> <c:set var="showWeather" value="${not empty weatherCities}"/> <c:set var="showEphemeris" value="${settings.displayEphemeris}"/> -<c:set var="listOfNews" value="${lookHelper.news}"/> -<c:set var="newsImageSize" value="${settings.newsImageSize}"/> <c:set var="shortcuts" value="${lookHelper.mainShortcuts}"/> <c:set var="questions" value="${lookHelper.questions}"/> <c:set var="publications" value="${lookHelper.latestPublications}"/> @@ -21,15 +25,12 @@ <c:set var="noBookmarksFragment" value="${settings.noBookmarksFragmentURL}"/> <c:set var="labelInsideSelectOnTaxonomy" value="${settings.labelsInsideSelectOnTaxonomy}"/> -<c:set var="newsWithCarrousel" value="${settings.displayNewsWithCarrousel}"/> - +<c:set var="listOfNews" value="${lookHelper.news}"/> +<jsp:useBean id="listOfNews" type="org.silverpeas.looks.aurora.NewsList"/> <c:set var="secondaryListOfNews" value="${lookHelper.secondaryNews}"/> -<c:set var="secondaryNewsImageSize" value="${settings.secondaryNewsImageSize}"/> -<c:set var="secondaryNewsWithCarrousel" value="${settings.displaySecondaryNewsWithCarrousel}"/> - +<jsp:useBean id="secondaryListOfNews" type="org.silverpeas.looks.aurora.NewsList"/> <c:set var="thirdListOfNews" value="${lookHelper.thirdNews}"/> -<c:set var="thirdNewsImageSize" value="${settings.thirdNewsImageSize}"/> -<c:set var="thirdNewsWithCarrousel" value="${settings.displayThirdNewsWithCarrousel}"/> +<jsp:useBean id="thirdListOfNews" type="org.silverpeas.looks.aurora.NewsList"/> <c:set var="newUsers" value="${lookHelper.newUsersList}"/> @@ -38,12 +39,17 @@ <c:set var="searchForm" value="${lookHelper.mainSearchForm}"/> <view:setBundle bundle="${lookHelper.localizedBundle}"/> +<c:set var="isAtLeastOneCarousel" value="<%=Stream.of(listOfNews, secondaryListOfNews, thirdListOfNews) + .filter(Predicate.not(NewsList::isEmpty)) + .map(NewsList::getRenderingType) + .anyMatch(NewsList.RenderingType::isCarousel)%>"/> + <view:sp-page> <view:sp-head-part> <jsp:attribute name="atTop"> - <c:if test="${newsWithCarrousel}"> - <link rel="stylesheet" href="css/responsiveslides.css" type="text/css" media="screen" /> - <link rel="stylesheet" href="css/themes.css" type="text/css" media="screen" /> + <c:if test="${isAtLeastOneCarousel}"> + <view:link href="/look/jsp/css/responsiveslides.css"/> + <view:link href="/look/jsp/css/themes.css"/> </c:if> <view:link href="/look/jsp/css/aurora.css"/> </jsp:attribute> @@ -101,11 +107,11 @@ <viewTags:displayShortcuts shortcuts="${shortcuts}"/> - <viewTags:displayNews listOfNews="${listOfNews}" carrousel="${newsWithCarrousel}" imageSize="${newsImageSize}"/> + <viewTags:displayNews listOfNews="${listOfNews}"/> - <viewTags:displayNews listOfNews="${secondaryListOfNews}" carrousel="${secondaryNewsWithCarrousel}" imageSize="${secondaryNewsImageSize}" id="secondaryNews"/> + <viewTags:displayNews listOfNews="${secondaryListOfNews}" id="secondaryNews"/> - <viewTags:displayNews listOfNews="${thirdListOfNews}" carrousel="${thirdNewsWithCarrousel}" imageSize="${thirdNewsImageSize}" id="thirdNews"/> + <viewTags:displayNews listOfNews="${thirdListOfNews}" id="thirdNews"/> <viewTags:displayPublications lookHelper="${lookHelper}" publications="${publications}"/> diff --git a/aurora/aurora-war/src/main/webapp/look/jsp/TopBar.jsp b/aurora/aurora-war/src/main/webapp/look/jsp/TopBar.jsp index 6d1e4b09..a5f09420 100644 --- a/aurora/aurora-war/src/main/webapp/look/jsp/TopBar.jsp +++ b/aurora/aurora-war/src/main/webapp/look/jsp/TopBar.jsp @@ -61,6 +61,7 @@ <fmt:message var="labelSearchButton" key="look.banner.search.button"/> <fmt:message var="labelSearchPlaceholder" key="look.banner.search.input.placeholder"/> <fmt:message var="labelSearchAdvanced" key="look.banner.search.advanced"/> + <fmt:message var="labelSearchHelp" key="look.banner.help"/> <fmt:message var="labelSearchResults" key="look.banner.search.lastresults"/> <fmt:message var="labelSearchPlatform" key="look.banner.search.scope.platform"/> <fmt:message var="labelSearchPlatformShort" key="look.banner.search.scope.platform.short"/> @@ -94,6 +95,12 @@ }); } + function loadMap(spaceId) { + changeBody(sp.url.format('/admin/jsp/Map.jsp', { + SpaceId : spaceId + })); + } + function getTopBarPage() { return "TopBar.jsp"; } @@ -330,7 +337,7 @@ <c:if test="${not isAccessGuest}"> <li><a id="link-settings" href="javascript:changeBody('/RMyProfil/jsp/MyInfos')">${labelProfileSettings}</a> </li> <li><a id="link-myspace" href="javascript:goToPersonalSpace()">${labelProfileMySpace}</a></li> - <li><a id="link-feed" href="javascript:changeBody('/RMyProfil/jsp/Main')">${labelProfileMyFeed}</a></li> + <li><a id="link-feed" href="javascript:changeBody('/RMyProfil/jsp/MyFeed')">${labelProfileMyFeed}</a></li> </c:if> <li><a id="link-logout" id="logOut-link" href="javascript:onClick=spUserSession.logout();">${labelLogout}</a> </li> </ul> @@ -396,7 +403,7 @@ <c:if test="${displayConnectedUsers}"> <li id="connectedUsers"><a onclick="javascript:onClick=spUserSession.viewConnectedUsers();" href="#"></a></li> </c:if> - <li id="map-link-header"><a href="javascript:changeBody('/admin/jsp/Map.jsp')" title="${labelMap}">${labelMap}</a></li> + <li id="map-link-header"><a href="javascript:loadMap()" title="${labelMap}">${labelMap}</a></li> <c:if test="${silfn:isDefined(settings.helpURL)}"> <li id="help-link-header"><a target="_blank" href="${settings.helpURL}" title="${labelHelp}">${labelHelp}</a></li> </c:if> @@ -442,6 +449,7 @@ </form> <a id="lastResult-link-header" href="javascript:lastResultsSearchEngine()" title="${labelSearchResults}"><span>${labelSearchResults}</span></a> <a id="advancedSearch-link-header" href="javascript:advancedSearchEngine()" title="${labelSearchAdvanced}"><span>${labelSearchAdvanced}</span></a> + <a id="search-help-header" href="javascript:void(0)" onclick="sp.search.helpOn(this, '#query')" title="${labelSearchHelp}"><span>${labelSearchHelp}</span></a> </div> </div> <div id="nav" style="display: none;"> diff --git a/aurora/aurora-war/src/main/webapp/look/jsp/bodyPartAurora.jsp b/aurora/aurora-war/src/main/webapp/look/jsp/bodyPartAurora.jsp index c73c124a..8ab707d7 100644 --- a/aurora/aurora-war/src/main/webapp/look/jsp/bodyPartAurora.jsp +++ b/aurora/aurora-war/src/main/webapp/look/jsp/bodyPartAurora.jsp @@ -36,7 +36,6 @@ <c:if test="${lookHelper != null}"> <jsp:useBean id="lookHelper" type="org.silverpeas.looks.aurora.LookAuroraHelper"/> <c:set var="navigationWidth" value="${lookHelper.getSettings('domainsBarFramesetWidth','260')}px"/> - <c:set var="redExtLabel" value="${lookHelper.getString('look.layout.reduce')}"/> <c:set var="bodyPartSettings" value="${lookHelper.getBodyPartSettings(pageContext.request)}"/> <jsp:useBean id="bodyPartSettings" type="org.silverpeas.looks.aurora.BodyPartSettings"/> <c:set var="paramsForDomainsBar" value="${bodyPartSettings.domainsBarParams}"/> @@ -79,10 +78,7 @@ border: 0; } </style> - <div id="sp-layout-body-part-layout-toggle-part" style="display: none"> - <div id="navigation-toggle" style="display: none"><img src="icons/silverpeasV5/reduct.gif" alt="${redExtLabel}" title="${redExtLabel}"/></div> - <div id="header-toggle"><img src="icons/silverpeasV5/reductTopBar.gif" alt="${redExtLabel}" title="${redExtLabel}"/></div> - </div> + <div id="sp-layout-body-part-layout-toggle-part" style="display: none"></div> <div id="sp-layout-body-part-layout"> <div id="sp-layout-body-part-layout-navigation-part"></div> <div id="sp-layout-body-part-layout-content-part"> diff --git a/aurora/aurora-war/src/main/webapp/look/jsp/css/aurora.css b/aurora/aurora-war/src/main/webapp/look/jsp/css/aurora.css index 270369dd..36d2d3ff 100644 --- a/aurora/aurora-war/src/main/webapp/look/jsp/css/aurora.css +++ b/aurora/aurora-war/src/main/webapp/look/jsp/css/aurora.css @@ -16,7 +16,7 @@ #search-form-header #select-user-group-queryDirectory { - vertical-align:middle; + vertical-align: middle; text-align: left; z-index: 1002; } @@ -27,11 +27,11 @@ min-width: auto; } -#search-form-header input#query , -#search-form-header #select-user-group-queryDirectory .search-input-container input{ - width:18em; - padding:0 1em; - margin:0 !important; +#search-form-header input#query, +#search-form-header #select-user-group-queryDirectory .search-input-container input { + width: 18em; + padding: 0 1em; + margin: 0 !important; } #search-zone-header a, #search-zone-header label { @@ -43,67 +43,68 @@ } #search-zone-header #inputSearchSwitchable { - display:inline-block; - position:relative; -} - -#search-zone-header #inputSearchSwitchable .switchSearchMode{ - position:absolute; - right:0.5em; - top:0.6em; - background:transparent url(../icons/switchSearchMode.png) 0 0 ; - width:15px; - min-width:15px; - padding:0; - height:16px; - display:block; - cursor:pointer; + display: inline-block; + position: relative; +} + +#search-zone-header #inputSearchSwitchable .switchSearchMode { + position: absolute; + right: 0.5em; + top: 0.6em; + background: transparent url(../icons/switchSearchMode.png) 0 0; + width: 15px; + min-width: 15px; + padding: 0; + height: 16px; + display: block; + cursor: pointer; z-index: 1003; } #search-zone-header #inputSearchSwitchable .switchSearchMode:hover, -#search-zone-header #inputSearchSwitchable .switchSearchMode:focus{ - box-shadow:inherit; +#search-zone-header #inputSearchSwitchable .switchSearchMode:focus { + box-shadow: inherit; } -#search-zone-header #inputSearchSwitchable .switchSearchMode span{ - display:none; +#search-zone-header #inputSearchSwitchable .switchSearchMode span { + display: none; } -#search-zone-header #inputSearchSwitchable .switchSearchMode.platform.on{ - background:transparent url(../icons/switchSearchMode.png) 0 0 ; +#search-zone-header #inputSearchSwitchable .switchSearchMode.platform.on { + background: transparent url(../icons/switchSearchMode.png) 0 0; } -#search-zone-header #inputSearchSwitchable .switchSearchMode.directory.off{ - background:transparent url(../icons/switchSearchMode.png) right 0 ; - right:2.5em +#search-zone-header #inputSearchSwitchable .switchSearchMode.directory.off { + background: transparent url(../icons/switchSearchMode.png) right 0; + right: 2.5em } -#search-zone-header #inputSearchSwitchable .switchSearchMode.platform.off{ - background:transparent url(../icons/switchSearchMode.png) 0 bottom ; +#search-zone-header #inputSearchSwitchable .switchSearchMode.platform.off { + background: transparent url(../icons/switchSearchMode.png) 0 bottom; } -#search-zone-header #inputSearchSwitchable .switchSearchMode.directory.on{ - background:transparent url(../icons/switchSearchMode.png) right bottom ; - right:2.5em +#search-zone-header #inputSearchSwitchable .switchSearchMode.directory.on { + background: transparent url(../icons/switchSearchMode.png) right bottom; + right: 2.5em } #user-favorit-home .link-add.manage { - display:none; - float:none; - margin-top:0; + display: none; + float: none; + margin-top: 0; } #localisation-weather a span::after { - content:" /"; + content: " /"; } + #localisation-weather a:last-child span::after { - content:""; + content: ""; } /* pour le flux rss presentation .aggregate ou .rss_tab */ #rssNews .rss_type { - margin-bottom:0.5em + margin-bottom: 0.5em } #rssNews.onceChannel-true .rss_type { @@ -117,154 +118,159 @@ padding: .35em .5em; line-height: 1em; font-size: .9em; - display:inline-block; + display: inline-block; border: 1px solid #5c5c5c; border-radius: 3px; position: relative; } -#rssNews .rss_type a:hover{ - background-color:#acacac; - border:1px solid #acacac; - cursor:pointer; +#rssNews .rss_type a:hover { + background-color: #acacac; + border: 1px solid #acacac; + cursor: pointer; } -#rssNews.aggregate .rss_type a:hover::after{ - content:'x'; - padding-left:1em; +#rssNews.aggregate .rss_type a:hover::after { + content: 'x'; + padding-left: 1em; } + #rssNews .rss_type a.off { background-color: #acacac; border: 1px solid #acacac; } -#rssNews.aggregate .rss_type a.off::after{ - content:'x'; - padding-left:1em; + +#rssNews.aggregate .rss_type a.off::after { + content: 'x'; + padding-left: 1em; } -#rssNews .rss_type a.off:hover{ - background-color:#5c5c5c; - border:1px solid #5c5c5c; + +#rssNews .rss_type a.off:hover { + background-color: #5c5c5c; + border: 1px solid #5c5c5c; } #rssNews ul { - list-style-type:none; - padding:0 0 20px 0; - margin:0; - border-top:1px solid #CCC; + list-style-type: none; + padding: 0 0 20px 0; + margin: 0; + border-top: 1px solid #CCC; } #rssNews ul#rss-slider { - border-top:0; + border-top: 0; } -#rssNews ul li.item-channel{ - min-height:22px; - margin:0; - position:relative; - border-bottom:1px solid #CCC; - padding:8px; +#rssNews ul li.item-channel { + min-height: 22px; + margin: 0; + position: relative; + border-bottom: 1px solid #CCC; + padding: 8px; background-color: #fdfdfd; } -#rssNews ul#rss-slider li.item-channel{ - border-bottom:0; +#rssNews ul#rss-slider li.item-channel { + border-bottom: 0; } -#rssNews ul li.deploy-item:hover{ - cursor:pointer; - background-color:#e6e6e6; - background-position:5px 15px; - background-repeat:no-repeat; - background-image:url(../../../util/icons/arrow/arrowBottom.gif); +#rssNews ul li.deploy-item:hover { + cursor: pointer; + background-color: #e6e6e6; + background-position: 5px 15px; + background-repeat: no-repeat; + background-image: url(../../../util/icons/arrow/arrowBottom.gif); } -#rssNews ul li.open:hover{ - background-image:url(../../../util/icons/arrow/arrowTop.gif); +#rssNews ul li.open:hover { + background-image: url(../../../util/icons/arrow/arrowTop.gif); } -#rssNews.rss_tab .rss_type{ - margin-bottom:0; - padding-bottom:0; +#rssNews.rss_tab .rss_type { + margin-bottom: 0; + padding-bottom: 0; } -#rssNews.rss_tab .rss_type a{ - font-size:1em; - border-radius:10px 10px 0 0; - background-color:#EEE; - display:inline-block; - line-height:1em; - padding:1em; - color:#333; - border:0; - margin:0 1em 0 0; + +#rssNews.rss_tab .rss_type a { + font-size: 1em; + border-radius: 10px 10px 0 0; + background-color: #EEE; + display: inline-block; + line-height: 1em; + padding: 1em; + color: #333; + border: 0; + margin: 0 1em 0 0; } #rssNews.rss_tab .rss_type a.selected { - background-color:#5c5c5c; - color:#FFF + background-color: #5c5c5c; + color: #FFF } #rssNews.rss_tab .channelName-rssNews { display: none; } -#rssNews.rss_tab ul { - padding:0; - margin:0; - border-right:1px solid #ccc; - border-left:1px solid #ccc; +#rssNews.rss_tab ul { + padding: 0; + margin: 0; + border-right: 1px solid #ccc; + border-left: 1px solid #ccc; } .title-item-rssNews { - margin:0; - padding:3px 0 0 13px; + margin: 0; + padding: 3px 0 0 13px; } .title-item-rssNews a { - color:#333; - text-decoration:none; - font-size:13px; - font-weight:500; + color: #333; + text-decoration: none; + font-size: 13px; + font-weight: 500; } .title-item-rssNews a:hover { - color:#1c94d4; + color: #1c94d4; } .title-item-rssNews a:hover::after { - opacity:1; - content:' '; - background:transparent url(../../../util/icons/arrow/link-blank.png) no-repeat; - width:15px; - height:15px; - display:inline-block; - vertical-align:top; + opacity: 1; + content: ' '; + background: transparent url(../../../util/icons/arrow/link-blank.png) no-repeat; + width: 15px; + height: 15px; + display: inline-block; + vertical-align: top; } .channelName-rssNews { - position:absolute; - right:9px; - top:3px; - text-align:right; - font-size:13px; - color:#333; - max-width:20%; - overflow:hidden; - white-space:nowrap; - text-overflow:ellipsis; + position: absolute; + right: 9px; + top: 3px; + text-align: right; + font-size: 13px; + color: #333; + max-width: 20%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .lastUpdate-item-rssNews { - position:absolute; - right:9px; - top:19px; - text-align:right; - font-size:11px; - color:#333; + position: absolute; + right: 9px; + top: 19px; + text-align: right; + font-size: 11px; + color: #333; } .description-item-rssNews { - padding:1.5% 0 0 1.5% ; + padding: 1.5% 0 0 1.5%; } + /* FIN flux rss */ .spaceHome .spaceIntro { @@ -273,11 +279,12 @@ } .spaceHome #mainPicture img, -.spaceHome #secondPicture img{ - max-width:100%; +.spaceHome #secondPicture img { + max-width: 100%; } + .spaceHome .cg-favorit-list { - list-style-type:none; + list-style-type: none; } .spaceHome #medias-slider .media-title, @@ -286,19 +293,22 @@ } #spaceUsers ul { - list-style-type:none; - list-style-image:none; - padding:0; - margin:0; + list-style-type: none; + list-style-image: none; + padding: 0; + margin: 0; } -#spaceUsers div.user-card .avatar { - float:left; + +#spaceUsers div.user-card .avatar { + float: left; } -#spaceUsers div.user-card .field { - width:200px + +#spaceUsers div.user-card .field { + width: 200px } -#spaceUsers div.user-card { - width:276px + +#spaceUsers div.user-card { + width: 276px } #topar-header #btn-logout { @@ -319,27 +329,69 @@ display: none; } +.main-home-page #new-users-home, +.principalContent #spaceQuiskInfo { + display: block; +} + +/*#spaceQuiskInfo .slideshow ul li , +#spaceQuiskInfo .slideshow ul { + height:250px; + position:relative; +} + +#spaceQuiskInfo .slideshow ul li::before { + content:' '; + display:block; + position:absolute; + top:0; + left:0; + width:250px; + height:250px; + background-color:#000; + z-index:0; +} +#spaceQuiskInfo .slideshow ul li img{ + height:250px; +} +#spaceQuiskInfo .slideshow .content-quickInfo { + position: absolute; + display: block; + top: 22px; + bottom: 22px; + left: auto; + right: 55px; + padding: 15px; + text-align: center; + background: #FFF; + color: #333; + margin: 0; + width: 230px; + max-height: 240px; + overflow: auto; +}*/ /*********** Aurore News tag as list *******************/ -.aurora-list-news .list-news li{ - clear:left; - margin-bottom:2em; +.aurora-list-news .list-news li { + clear: left; + margin-bottom: 2em; } + .aurora-list-news .list-news .news-date { - opacity:0.8; + opacity: 0.8; } .aurora-list-news .list-news { - padding:0; - height:auto + padding: 0; + height: auto } .aurora-list-news .list-news li { - width:100%; - height:100px; + width: 100%; + height: 100px; } -.aurora-list-news .list-news li img{ +.aurora-list-news .list-news li img { width: 200px; float: left; } @@ -350,15 +402,17 @@ } .aurora-list-news .list-news .caption h2 a, -.aurora-list-news .list-news .caption p{ - color:#444; - font-size:13px; - font-weight:100; +.aurora-list-news .list-news .caption p { + color: #444; + font-size: 13px; + font-weight: 100; } + .aurora-list-news .list-news .caption h2 a { - font-size:16px; - font-weight:bold; + font-size: 16px; + font-weight: bold; } + .aurora-list-news .list-news .caption h2 { margin: 0; } @@ -370,4 +424,4 @@ /************* New users list *****************/ .main-home-page #new-users-home .new-users-list { list-style: none; -} +} \ No newline at end of file diff --git a/aurora/aurora-war/src/main/webapp/look/jsp/css/themes.css b/aurora/aurora-war/src/main/webapp/look/jsp/css/themes.css index 8575f09d..9aa14605 100644 --- a/aurora/aurora-war/src/main/webapp/look/jsp/css/themes.css +++ b/aurora/aurora-war/src/main/webapp/look/jsp/css/themes.css @@ -1,190 +1,98 @@ -/** { - margin: 0; - padding: 0; - } - -html { - background: #fff; - } - -body { - color: #333; - font: 14px/24px sans-serif; - margin: 0 auto; - max-width: 700px; - _width: 700px; - padding: 0 30px; - text-align: center; - -webkit-font-smoothing: antialiased; - } - -#wrapper { - float: left; - width: 100%; - margin-bottom: 50px; - } - -h1 { - font: 600 28px/36px sans-serif; - margin: 50px 0; - } - -h3 { - font: 600 18px/24px sans-serif; - color: #999; - margin: 0 0 20px; - } - -a { - color: #222; - }*/ .rslides { - margin: 0 auto; + margin: 0 auto; } .rslides_container { - margin-bottom: 50px; - position: relative; - float: left; - width: 100%; + margin-bottom: 50px; + position: relative; + float: left; + width: 100%; } .centered-btns_nav { - z-index: 3; - position: absolute; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); - top: 30%; - left: 0; - opacity: 0.7; - text-indent: -9999px; - overflow: hidden; - text-decoration: none; - height: 61px; - width: 38px; - background: transparent url("themes.gif") no-repeat left top; - margin-top: -45px; -} - -.centered-btns_nav:active { - opacity: 1.0; -} - -.centered-btns_nav.next { - left: auto; - background-position: right top; - right: 0; -} - -/*.transparent-btns_nav { z-index: 3; position: absolute; - -webkit-tap-highlight-color: rgba(0,0,0,0); - top: 0; + top: 50%; left: 0; - display: block; - background: #fff; - opacity: 0; - filter: alpha(opacity=1); - width: 48%; + opacity: 0.7; text-indent: -9999px; overflow: hidden; - height: 91%; - } - -.transparent-btns_nav.next { - left: auto; - right: 0; - } - -.large-btns_nav { - z-index: 3; - position: absolute; - -webkit-tap-highlight-color: rgba(0,0,0,0); - opacity: 0.6; - text-indent: -9999px; - overflow: hidden; - top: 0; - bottom: 0; - left: 0; - background: #000 url("themes.gif") no-repeat left 50%; + text-decoration: none; + height: 61px; width: 38px; - } + background: transparent url("themes.gif") no-repeat left top; + margin-top: -45px; +} -.large-btns_nav:active { +.centered-btns_nav:active { opacity: 1.0; - } +} -.large-btns_nav.next { +.centered-btns_nav.next { left: auto; - background-position: right 50%; + background-position: right top; right: 0; - }*/ -.centered-btns_nav:focus,.transparent-btns_nav:focus,.large-btns_nav:focus - { - outline: none; } -.centered-btns_tabs,.transparent-btns_tabs,.large-btns_tabs { - margin-top: 10px; - text-align: center; +.centered-btns_nav:focus, .transparent-btns_nav:focus, .large-btns_nav:focus { + outline: none; +} + +.centered-btns_tabs, .transparent-btns_tabs, .large-btns_tabs { + margin-top: 10px; + text-align: center; } -.centered-btns_tabs li,.transparent-btns_tabs li,.large-btns_tabs li { - display: inline; - float: none; - _float: left; - *float: left; - margin-right: 5px; +.centered-btns_tabs li, .transparent-btns_tabs li, .large-btns_tabs li { + display: inline; + float: none; + margin-right: 5px; } -.centered-btns_tabs a,.transparent-btns_tabs a,.large-btns_tabs a { - text-indent: -9999px; - overflow: hidden; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; - background: #ccc; - background: rgba(0, 0, 0, .2); - display: inline-block; - _display: block; - *display: block; - -webkit-box-shadow: inset 0 0 2px 0 rgba(0, 0, 0, .3); - -moz-box-shadow: inset 0 0 2px 0 rgba(0, 0, 0, .3); - box-shadow: inset 0 0 2px 0 rgba(0, 0, 0, .3); - width: 9px; - height: 9px; +.centered-btns_tabs a, .transparent-btns_tabs a, .large-btns_tabs a { + text-indent: -9999px; + overflow: hidden; + border-radius: 15px; + background: #ccc; + background: rgba(0, 0, 0, .2); + display: inline-block; + box-shadow: inset 0 0 2px 0 rgba(0, 0, 0, .3); + width: 9px; + height: 9px; } .rslides li { - height:314px; - overflow:hidden; + height: 314px; + overflow: hidden; } -.centered-btns_here a,.transparent-btns_here a,.large-btns_here a { - background: #222; - background: rgba(0, 0, 0, .8); +.centered-btns_here a, .transparent-btns_here a, .large-btns_here a { + background: #222; + background: rgba(0, 0, 0, .8); } .caption { - position: absolute; - display: block; - top: 22px; - bottom: 22px; - left: auto; - right: 55px; - padding: 15px; - text-align: center; - background: #FFF; - color: #333; - margin: 0; - width:230px; - max-height: 240px; - overflow: auto; + position: absolute; + display: block; + top: 22px; + bottom: 22px; + left: auto; + right: 55px; + padding: 15px; + text-align: center; + background: #FFF; + color: #333; + margin: 0; + width: 230px; + max-height: 240px; + overflow: auto; } + .caption h2 { - color:#ababab; + color: #ababab; } + .caption p { - color:#666666; - text-align:justify; + color: #666666; + text-align: justify; } \ No newline at end of file diff --git a/aurora/aurora-war/src/main/webapp/look/jsp/listOfNews.jsp b/aurora/aurora-war/src/main/webapp/look/jsp/listOfNews.jsp index 4e6b71b8..3f5a9cd5 100644 --- a/aurora/aurora-war/src/main/webapp/look/jsp/listOfNews.jsp +++ b/aurora/aurora-war/src/main/webapp/look/jsp/listOfNews.jsp @@ -72,7 +72,7 @@ <view:browseBar /> <view:window> <h1><%=title%></h1> -<viewTags:displayNews listOfNews="<%=newsList%>" carrousel="false" imageSize="800x"/> +<viewTags:displayNews listOfNews="<%=newsList%>" /> </view:window> </view:sp-body-part> </view:sp-page> diff --git a/aurora/aurora-war/src/main/webapp/look/jsp/spaceHomePage.jsp b/aurora/aurora-war/src/main/webapp/look/jsp/spaceHomePage.jsp index eb048eb9..d53cdeb4 100644 --- a/aurora/aurora-war/src/main/webapp/look/jsp/spaceHomePage.jsp +++ b/aurora/aurora-war/src/main/webapp/look/jsp/spaceHomePage.jsp @@ -36,6 +36,9 @@ <%@ page import="org.silverpeas.looks.aurora.NewsList" %> <%@ page import="org.silverpeas.core.web.look.proxy.SpaceHomepageProxyManager" %> <%@ page import="org.silverpeas.looks.aurora.NewUsersList" %> +<%@ page import="org.silverpeas.looks.aurora.AuroraSpaceHomePageZone" %> +<%@ page import="java.util.Map" %> +<%@ page import="org.silverpeas.looks.aurora.FreeZone" %> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> @@ -57,6 +60,7 @@ AuroraSpaceHomePage homepage = helper.getHomePage(request.getParameter("SpaceId")); List<PublicationDetail> publications = homepage.getPublications(); NewsList news = homepage.getNews(); + Map<AuroraSpaceHomePageZone, FreeZone> freeZones = homepage.getFreeZones(); Space space = homepage.getSpace(); List<Space> subspaces = homepage.getSubSpaces(); List<App> apps = homepage.getApps(); @@ -90,9 +94,8 @@ margin-bottom: 0.5em; } </style> - <link rel="stylesheet" href="css/responsiveslides.css" type="text/css" media="screen" /> - <link rel="stylesheet" href="css/themes.css" type="text/css" media="screen" /> - <viewTags:spaceNewsCSS/> + <view:link href="/look/jsp/css/responsiveslides.css"/> + <view:link href="/look/jsp/css/themes.css"/> <viewTags:spaceNavigationCSS/> <viewTags:spacePublicationsCSS/> <view:link href="/look/jsp/css/aurora.css"/> @@ -101,12 +104,11 @@ <view:includePlugin name="pdc" /> <view:includePlugin name="lightslideshow"/> <view:includePlugin name="toggle"/> - <script type="text/javascript" src="js/responsiveslides.min.js"></script> + <view:script src="/look/jsp/js/responsiveslides.min.js"/> <c:if test="${not empty extraJavascript}"> <script type="text/javascript" src="${extraJavascript}"></script> </c:if> <script type="text/javascript"> - <!-- function goToSpaceItem(spaceId) { spWindow.loadSpace(spaceId); } @@ -121,7 +123,6 @@ $(".principalContent").css("margin-right", "0"); } }); - --> </script> </jsp:body> </view:sp-head-part> @@ -137,13 +138,17 @@ <viewTags:displayWidget widget="${spaceHomepageProxy.thinWidget}" widgetId="topWidget"/> + <viewTags:displayFreeZone freeZone="<%=freeZones.get(AuroraSpaceHomePageZone.RIGHT)%>" freeZoneId="rightFreeZone"/> + <viewTags:spacePicture pictureURL="<%=homepage.getSecondPicture()%>" pictureLink="<%=homepage.getSecondPictureLink()%>"/> <viewTags:spaceAdmins admins="<%=admins%>"/> <viewTags:spaceUsers users="<%=homepage.getUsers()%>" label="<%=homepage.getUsersLabel()%>"/> - <viewTags:spaceNews news="<%=news.getNews()%>"/> + <c:if test="<%=news.getZone().isRight()%>"> + <viewTags:spaceNews listOfNews="<%=news%>"/> + </c:if> <viewTags:displayNextEvents nextEvents="<%=homepage.getNextEvents()%>"/> @@ -156,6 +161,12 @@ <viewTags:spaceIntro space="<%=space%>"/> + <viewTags:displayFreeZone freeZone="<%=freeZones.get(AuroraSpaceHomePageZone.MAIN)%>" freeZoneId="mainFreeZone"/> + + <c:if test="<%=news.getZone().isMain()%>"> + <viewTags:spaceNews listOfNews="<%=news%>"/> + </c:if> + <viewTags:spaceNavigation apps="<%=apps%>" subspaces="<%=subspaces%>"/> <viewTags:displayNewUsers newUsers="<%=newUsersList%>" /> diff --git a/aurora/pom.xml b/aurora/pom.xml index 0407c50f..2c90e583 100644 --- a/aurora/pom.xml +++ b/aurora/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>looks</artifactId> - <version>6.4-SNAPSHOT</version> + <version>6.4-JR-SNAPSHOT</version> </parent> <groupId>org.silverpeas.looks</groupId> diff --git a/pom.xml b/pom.xml index baec0d81..b7e34232 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>silverpeas-project</artifactId> - <version>1.5</version> + <version>1.6-JR-SNAPSHOT</version> </parent> <artifactId>looks</artifactId> - <version>6.4-SNAPSHOT</version> + <version>6.4-JR-SNAPSHOT</version> <packaging>pom</packaging> <name>Silverpeas Looks</name> @@ -24,7 +26,7 @@ <id>Silverpeas</id> <layout>default</layout> <name>Silverpeas Repository</name> - <url>https://www.silverpeas.org/nexus/content/groups/silverpeas</url> + <url>https://nexus3.silverpeas.org/repository/silverpeas</url> <releases> <enabled>true</enabled> </releases> @@ -38,13 +40,13 @@ <pluginRepository> <id>Silverpeas</id> <name>Silverpeas Maven 3.x Repository</name> - <url>https://www.silverpeas.org/nexus/content/groups/silverpeas</url> + <url>https://nexus3.silverpeas.org/repository/silverpeas</url> </pluginRepository> </pluginRepositories> <properties> <!-- property used by the CI to both deploy a build version and release the next stable version --> - <next.release>6.4</next.release> + <next.release>6.4-JR</next.release> <!-- Version of Silverpeas on which it depends --> <silverpeas.version>${project.version}</silverpeas.version> <core.version>${silverpeas.version}</core.version>