Skip to content

Commit 219e365

Browse files
committed
LUTECE-2221 : Multi CSS framework support
1 parent 8222feb commit 219e365

File tree

5 files changed

+23
-21
lines changed

5 files changed

+23
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</@tform>
1414
</@boxHeader>
1515
<@boxBody>
16-
<@alert class='warning' title='#i18n{portal.system.manage_caches.cautionTitle}' iconTitle='exclamation-triangle' dismissible=true>#i18n{portal.system.manage_caches.cautionMessage}</@alert>
16+
<@alert color='warning' title='#i18n{portal.system.manage_caches.cautionTitle}' iconTitle='exclamation-triangle' dismissible=true>#i18n{portal.system.manage_caches.cautionMessage}</@alert>
1717
<@table>
1818
<tr>
1919
<th>#i18n{portal.system.manage_caches.columnTitleName}</th>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</#list>
102102
</@row>
103103
<#else>
104-
<@alert class='alert-danger'>#i18n{portal.system.manage_plugins.filterNoResult}</@alert>
104+
<@alert color='danger'>#i18n{portal.system.manage_plugins.filterNoResult}</@alert>
105105
</#if>
106106
</@boxBody>
107107
</@box>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
</@boxBody>
112112
</@box>
113113
<#else>
114-
<@alert class="danger">#i18n{portal.users.create_user.error.accessCodeNotFound}</@alert>
114+
<@alert color="danger">#i18n{portal.users.create_user.error.accessCodeNotFound}</@alert>
115115
</#if>
116116
</@columns>
117117
</@rows>

webapp/WEB-INF/templates/commons.html

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -642,8 +642,8 @@
642642
<#macro messages errors=[] infos=[] warnings=[] errors_class="alert alert-danger" infos_class="alert alert-info" warnings_class="alert alert-warning">
643643
<#if errors??>
644644
<#if errors?size &gt; 0 >
645-
<div class="notification is-danger" id="messages_errors_div">
646-
<button class="delete"></button>
645+
<div class="alert alert-danger" id="messages_errors_div">
646+
<button class="close"></button>
647647
<#list errors as error >
648648
<span class="icon"><i class="fa fa-exclamation-circle"></i></span> ${error.message} <br>
649649
</#list>
@@ -652,10 +652,10 @@
652652
</#if>
653653
<#if infos??>
654654
<#if infos?size &gt; 0 >
655-
<div class="notification is-info" id="messages_infos_div" >
656-
<button class="delete"></button>
655+
<div class="alert alert-info" id="messages_infos_div" >
656+
<button class="close"></button>
657657
<#list infos as info >
658-
<span class="icon"><i class="fa fa-info-circle"></i> ${info.message} <br>
658+
<span class="icon"><i class="fa fa-info-circle"></i></span> ${info.message} <br>
659659
</#list>
660660
</div>
661661
</#if>
@@ -665,7 +665,7 @@
665665
<div class="${warnings_class}" id="messages_warnings_div" >
666666
<a class="close" data-dismiss="alert" href="#">x</a>
667667
<#list warnings as warning >
668-
<span class="icon"><i class="fa fa-info-circle"></i> ${warning.message} <br>
668+
<span class="icon"><i class="fa fa-info-circle"></i></span> ${warning.message} <br>
669669
</#list>
670670
</div>
671671
</#if>
@@ -1160,8 +1160,9 @@ <h2 class="box-title">
11601160

11611161
<#-- ALERT -->
11621162
<#-- classes: alert-success/alert-info/alert-warning/alert-danger + alert-dismissible -->
1163+
<#-- color: primary/success/info/warning/dange r-->
11631164
<#macro alert class='' titleLevel='h3' title='' iconTitle='' dismissible=false id='' params=''>
1164-
<div class="alert alert-${class}"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>>
1165+
<div class="alert ${class} <#if color!=''> alert-${color}</#if>"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>>
11651166
<#if dismissible>
11661167
<@button color='' size='' style='close' params='data-dismiss="alert" aria-hidden="true"'>
11671168
&times;

webapp/WEB-INF/templates/commons_bulma.html

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -663,17 +663,17 @@
663663
<div class="notification is-info" id="messages_infos_div" >
664664
<button class="delete"></button>
665665
<#list infos as info >
666-
<span class="icon"><i class="fa fa-info-circle"></i> ${info.message} <br>
666+
<span class="icon"><i class="fa fa-info-circle"></i></span> ${info.message} <br>
667667
</#list>
668668
</div>
669669
</#if>
670670
</#if>
671671
<#if warnings??>
672672
<#if warnings?size &gt; 0 >
673673
<div class="${warnings_class}" id="messages_warnings_div" >
674-
<a class="close" data-dismiss="alert" href="#">x</a>
674+
<a class="delete" data-dismiss="alert" href="#">x</a>
675675
<#list warnings as warning >
676-
<span class="icon"><i class="fa fa-info-circle"></i> ${warning.message} <br>
676+
<span class="icon"><i class="fa fa-info-circle"></i></span> ${warning.message} <br>
677677
</#list>
678678
</div>
679679
</#if>
@@ -976,7 +976,7 @@ <h2 class="title">
976976
<#-- BUTTON -->
977977
<#-- bootstrap 3 : size: is-small/is-medium/is-large -->
978978
<#-- upcoming bootstrap 4 : size: is-medium for small buttons/empty for medium buttons/is-large for large buttons -->
979-
<#-- color: is-default[bootstrap4 : btn-secondary]/is-primary/is-success/is-warning/is-danger/btn-info/bg-purple/bg-blue/bg-navy/bg-teal/bg-maroon/bg-black/bg-gray/bg-olive/bg-lime/bg-orange/bg-fuchsia -->
979+
<#-- color: default : secondary]/primary/success/warning/danger/info -->
980980
<#-- color (upcoming bootstrap 4): btn-outline-default/btn-outline-primary/btn-outline-success/btn-outline-warning/btn-outline-danger/btn-outline-info/ -->
981981
<#-- style: btn-block/btn-flat/close/navbar-toggle/collapsed... -->
982982
<#-- type: button/submit/reset -->
@@ -1092,7 +1092,7 @@ <h2 class="title">
10921092

10931093
<#macro modalHeader titleLevel='h4' modalTitle='' id='' params=''>
10941094
<div class="modal-header"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>>
1095-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
1095+
<button type="button" class="delete" data-dismiss="modal" aria-label="Close">
10961096
<span aria-hidden="true">&times;</span>
10971097
</button>
10981098
<${titleLevel} class="modal-title">${modalTitle}</${titleLevel}>
@@ -1128,11 +1128,12 @@ <h2 class="title">
11281128
</#macro>
11291129

11301130
<#-- ALERT -->
1131-
<#-- classes: alert-success/alert-info/alert-warning/alert-danger + alert-dismissible -->
1132-
<#macro alert class='' titleLevel='h3' title='' iconTitle='' dismissible=false id='' params=''>
1133-
<div class="alert alert-${class}"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>>
1131+
<#-- class: -->
1132+
<#-- color: success/info/warning/danger -->
1133+
<#macro alert class='' color='' titleLevel='h3' title='' iconTitle='' dismissible=false id='' params=''>
1134+
<div class="notification ${class} <#if color!=''> is-${color}</#if>"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>>
11341135
<#if dismissible>
1135-
<@button color='' size='' style='close' params='data-dismiss="alert" aria-hidden="true"'>&times;</@button>
1136+
<@button color='' size='' style='close' class='delete' params='data-dismiss="alert" aria-hidden="true"'>&times;</@button>
11361137
</#if>
11371138
<#if title!=''>
11381139
<${titleLevel}>
@@ -1371,9 +1372,9 @@ <h3>
13711372
<span id="zone4" class="hidden-sm hidden-md"> ${dashboard_zone_4}<i class="caret"></i></span>
13721373
</a>
13731374
<#if userMenuItems?has_content>
1374-
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabelUserHeader">
1375+
<ul class="navbar-dropdown" role="menu" aria-labelledby="dLabelUserHeader">
13751376
<#list userMenuItems as item>
1376-
<li class="dropdown-item ${item.itemClass?html}">${item.content}</li>
1377+
<a class="navbar-item ${item.itemClass?html}">${item.content}</a>
13771378
</#list>
13781379
</ul>
13791380
</#if>

0 commit comments

Comments
 (0)