LUTECE-2221 : Multi CSS framework support

Author: pierrelevy

src/java/fr/paris/lutece/portal/resources/templates_messages.properties

@@ -1,6 +1,6 @@
 # Admin features keys
-adminFeature.ManageAutoIncludes.name=Manage Auto Includes
-adminFeature.ManageAutoIncludes.description=Manage Freemarker Auto Includes
+adminFeature.ManageAutoIncludes.name=Manage Template engine configuration
+adminFeature.ManageAutoIncludes.description=Manage Freemarker Auto Includes macro libraries
 
 # keys for business classes keys : AutoInclude
 manage_autoincludes.pageTitle=AutoInclude
@@ -11,22 +11,8 @@ manage_autoincludes.commonsFile=File
 manage_autoincludes.commonsDescription=Description
 manage_autoincludes.buttonAdd=Add a AutoInclude
 manage_autoincludes.columnFilePath=File path
-create_autoinclude.pageTitle=AutoInclude
-create_autoinclude.title=Create a AutoInclude
-create_autoinclude.labelFilePath=File path
-create_autoinclude.labelFilePath.help=File path (help text)
-
-message.confirmRemoveAutoInclude=Are you sure that you want to delete this AutoInclude?
-
-# JSR 303 constraint validator messages
-validation.autoinclude.FilePath.notEmpty=The field File path cannot be empty. Please fill it.
-validation.autoinclude.FilePath.size=The field File path cannot accept more than 255 characters.
-
-# model attributes for validation messages
-model.entity.autoinclude.attribute.filePath=File path
-
-# Infos keys
-
-info.autoinclude.created=AutoInclude created
-info.autoinclude.removed=AutoInclude removed
 
+info.commons.activated=New library activated successfully  
+manage_autoincludes.buttonSwitch=Replace
+manage_autoincludes.commonsChange=Change macro library
+manage_autoincludes.commonsAvailable=Available libraries

src/java/fr/paris/lutece/portal/resources/templates_messages_fr.properties

@@ -18,4 +18,4 @@ manage_autoincludes.commonsChange=Changer de biblioth\u00e8que de macros commune
 manage_autoincludes.commonsAvailable=Biblioth\u00e8ques disponibles
 manage_autoincludes.buttonSwitch=Remplacer
 
-info.commons.activated=Nouveau commons activ\u00e9 avec succ\u00e8s !
+info.commons.activated=Nouvelle biblioth\u00e8que de macros activ\u00e9e avec succ\u00e8s !

src/java/fr/paris/lutece/portal/resources/users_messages.properties

@@ -487,3 +487,4 @@ export_users.labelHelpExportRights=Check it if you want to export rights of user
 export_users.labelHelpExportWorkgroups=Check it if you want to export workgroups of users in the output file.
 
 
+dashboard.users=Users

src/java/fr/paris/lutece/portal/resources/users_messages_fr.properties

@@ -484,3 +484,5 @@ export_users.labelHelpExportRights=Cocher cette case pour inclure les droits des
 export_users.labelHelpExportWorkgroups=Cocher cette case pour inclure les groupes de travail des utilisateurs dans le fichier d'export.
 
 
+dashboard.users=Utilisateurs
+export_users.labelExportWorkgroups=Exporter les groupes de travail des utilisateurs

webapp/WEB-INF/templates/admin/system/system_dashboard.html

@@ -1,7 +1 @@
-<#--
-<@infoBox color='bg-red' boxText='#i18n{portal.system.dashboard.pluginsCount}' boxNumber=plugins_count boxIcon='puzzle-piece' />
--->
-<#assign txt>
-#i18n{portal.system.dashboard.pluginsCount} ${plugins_count}
-</#assign>
-<@smallBox color='has-text-danger' boxIcon='puzzle-piece' title='' text=txt url=url urlText='' />
+<@smallBox color='warning' boxIcon='puzzle-piece' title=plugins_count text='#i18n{portal.system.dashboard.pluginsCount}' url='jsp/admin/system/ManagePlugins.jsp' urlText='Gestion des plugins' unit='plugins' />

webapp/WEB-INF/templates/admin/user/users_dashboard.html

@@ -1,5 +1,2 @@
-<@smallBox color='has-background-primary' boxIcon='user' title=users_count text='#i18n{portal.users.dashboard.usersCount}' url=url urlText='#i18n{portal.users.adminFeature.users_management.name}' />
+<@smallBox color='primary' boxIcon='user' title=users_count text='#i18n{portal.users.dashboard.usersCount}' url=url urlText='#i18n{portal.users.adminFeature.users_management.name}' unit='#i18n{portal.users.dashboard.users}' />
 
-<!--- 
-<@infoBox color='bg-aqua' boxIcon='users' boxNumber=users_count boxText='#i18n{portal.users.dashboard.usersCount}' />
----->

webapp/WEB-INF/templates/commons.html

@@ -1221,11 +1221,11 @@ <h2 class="box-title">
 <#-- AdminLTE Small Box -->
 <#-- color:Bootstrap + AdminLTE colors -->
 <#-- unit: %,... -->
-<#macro smallBox color='' title='' text='' boxIcon='' titleLevel='h3' unit='' url='' urlText='' id='' params=''>
-<div class="small-box<#if color!=''> ${color}</#if>"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>>
+<#macro smallBox color='' title='' text='' boxIcon='' titleLevel='h3' unit='' url='' urlText='' id='' params='' fontSize='40px'>
+<div class="small-box<#if color!=''> bg-${color}</#if>"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>>
 	<div class="inner">
-		<${titleLevel}>${title}<#if unit!=''><sup style="font-size:20px;">${unit}</sup></#if></${titleLevel}>
 		<p>${text}</p>
+        <${titleLevel} style="font-size:${fontSize};">${title}<#if unit!=''> &nbsp; ${unit}</#if></${titleLevel}>
 	</div>
 	<div class="icon">
 		<@icon style=boxIcon />

webapp/WEB-INF/templates/commons_bulma.html

@@ -1009,7 +1009,7 @@ <h2 class="title">
 <#if dropdownMenu>
 <div class="dropdown">
 </#if>
-	<button class="<#if style!='close'>button</#if><#if size!='' && style!='btn-box-tool'> btn-${size}</#if><#if buttonColor!='' && style!='btn-box-tool'> is-${buttonColor}</#if><#if style!=''> ${style}</#if><#if dropdownMenu> dropdown-toggle</#if><#if class!=''> ${class}</#if>" type="${type}"<#if title!=''> title="${title}"</#if><#if name!=''> name="${name}"</#if><#if id!=''> id="${id}"</#if><#if value!=''> value="${value}"</#if><#if params!=''> ${params}</#if><#if disabled> disabled</#if><#if dropdownMenu> data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"</#if><#if cancel> formnovalidate</#if>>
+	<button class="<#if style!='close'>button</#if><#if size!='' && style!='btn-box-tool'> btn-${size}</#if><#if buttonColor!='' && style!='btn-box-tool'> is-${buttonColor}</#if> is-grouped <#if style!=''> ${style}</#if><#if dropdownMenu> dropdown-toggle</#if><#if class!=''> ${class}</#if>" type="${type}"<#if title!=''> title="${title}"</#if><#if name!=''> name="${name}"</#if><#if id!=''> id="${id}"</#if><#if value!=''> value="${value}"</#if><#if params!=''> ${params}</#if><#if disabled> disabled</#if><#if dropdownMenu> data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"</#if><#if cancel> formnovalidate</#if>>
             <#if buttonIcon!='' && iconPosition='left'><@icon style=buttonIcon /> &nbsp;</#if>
 		<#if showTitleClass!='' && style!='btn-box-tool'><span class="${showTitleClass}"></#if>${title}<#if showTitleClass!='' && style!='btn-box-tool'></span></#if>
 		<#if buttonIcon!='' && iconPosition='right'><@icon style=buttonIcon /></#if>
@@ -1046,7 +1046,7 @@ <h2 class="title">
 <#if showTitleMd = false><#assign showTitleClass = showTitleClass + ' ' + 'hidden-md' /></#if>
 <#if showTitleLg = false><#assign showTitleClass = showTitleClass + ' ' + 'hidden-lg' /></#if>
 
-<a class="button <#if size!=''>is-${size}</#if><#if color_temp!=''> is-${color_temp}</#if><#if style!=''> ${style}</#if><#if class!=''> ${class}</#if>"<#if name!=''> name="${name}"</#if><#if id!=''> id="${id}"</#if> href="${href}" title="${title}"<#if params!=''> ${params}</#if><#if disabled> disabled</#if><#if dropdownMenu> data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"</#if>>
+<a class="button is-grouped <#if size!=''>is-${size}</#if><#if color_temp!=''> is-${color_temp}</#if><#if style!=''> ${style}</#if><#if class!=''> ${class}</#if>"<#if name!=''> name="${name}"</#if><#if id!=''> id="${id}"</#if> href="${href}" title="${title}"<#if params!=''> ${params}</#if><#if disabled> disabled</#if><#if dropdownMenu> data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"</#if>>
 	<#if buttonIcon!='' && iconPosition='left'><@icon style=buttonIcon /></#if>
 	<span class="${showTitleClass}">${title}</span><#if buttonIcon!='' && iconPosition='right'><@icon style=buttonIcon /></#if><#if dropdownMenu>&#160;<@icon style='caret-down' /></#if>
 	<#nested>
@@ -1071,7 +1071,7 @@ <h2 class="title">
 <#-- Radio button/Checkbox as buttons (to use with btnGroup)  -->
 <#-- type: radio/checkbox -->
 <#macro btnGroupRadioCheckbox type='checkbox' color='primary' size='' name='' id='' params='' ariaLabel='' labelFor='' labelKey='' labelParams='' tabIndex='' value='' checked=false>
-<label class="button btn-${color}<#if size!=''> btn-${size}</#if>" for="${labelFor}"<#if labelParams!=''> ${labelParams}</#if>>
+<label class="button is-${color}<#if size!=''> btn-${size}</#if>" for="${labelFor}"<#if labelParams!=''> ${labelParams}</#if>>
 	<input type="${type}" name="${name}" id="${id}" autocomplete="off"<#if value!=''> value="${value}"</#if><#if params!=''> ${params}</#if><#if tabIndex!=''> tabindex="${tabIndex}"</#if><#if checked> checked</#if> /><#if labelKey!=''>${labelKey}</#if>
 </label>
 </#macro>
@@ -1206,8 +1206,8 @@ <h2 class="title">
 <#-- AdminLTE Small Box -->
 <#-- color:Bootstrap + AdminLTE colors -->
 <#-- unit: %,... -->
-<#macro smallBox color='' title='' text='' boxIcon='' titleLevel='h3' unit='' url='' urlText='' id='' params=''>
-<div class="box<#if color!=''> ${color}</#if>"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>>
+<#macro smallBox color='' title='' text='' boxIcon='' titleLevel='h3' unit='' url='' urlText='' id='' params='' fontSize='30px'>
+<div class="box<#if color!=''> has-background-${color}</#if>"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>>
 	<article class="media">
 		<div class="media-left">
 			<figure class="image is-64x64">
@@ -1216,8 +1216,8 @@ <h2 class="title">
 		</div>
 		<div class="media-content">
 		<div class="content">	
-			<${titleLevel}>${title}<#if unit!=''><sup style="font-size:20px;">${unit}</sup></#if></${titleLevel}>
-			<p>${text}</p>
+            <p>${text}</p>
+            <${titleLevel} style="font-size:${fontSize};">${title}<#if unit!=''> &nbsp; ${unit}</#if></${titleLevel}>
 		</div>
 		<#if url!=''>
 		<a class="small-box-footer" href="${url}">${urlText} <@icon style='arrow-circle-right' /></a>
@@ -1250,7 +1250,7 @@ <h3>
 			<#else>...
 			</#if>
 		</p>
-		<@aButton href='' size='' color='bg-${color}' style='btn-flat'>
+		<@aButton href='' size='' color='bg-${color}' style=''>
 			<@icon style='home' />
 			#i18n{portal.util.labelBackHome}
 		</@aButton>