Skip to content

Commit 32ae99a

Browse files
pierrelevypierrelevy
committed
LUTECE-2221 : Multi CSS framework support
1 parent 23c254f commit 32ae99a

22 files changed

+142
-140
lines changed

‎webapp/WEB-INF/templates/admin/features/manage_features.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<@boxBody>
66
<@tabs>
77
<@listTabs>
8-
<li class="active">
8+
<li class="active">
99
<a href="jsp/admin/features/ManageGroups.jsp">#i18n{portal.features.manage_features.groupManagement.label}</a>
1010
</li>
1111
<li>

‎webapp/WEB-INF/templates/admin/portlet/create_portlet.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<@tform method='post' name='form' id='form-portlet' action='jsp/admin/${portletType.doCreateUrl}' params='target="_top"'>
44
<input type="hidden" name="page_id" value="${portlet_page_id}">
55
<input type="hidden" name="portlet_type_id" value="${portletType.id}">
6-
<fieldset>
7-
<legend>#i18n{portal.site.portletType.labelCreate} &nbsp;${portletType.name}</legend>
6+
<@fieldSet legend='#i18n{portal.site.portletType.labelCreate} &nbsp;${portletType.name}'>
87
<@row>
98
<@columns sm=3 md=3 lg=3>
109
<@box color='default box-solid'>
@@ -26,8 +25,7 @@
2625
</@formGroup>
2726

2827
<div id="params" style="clear:both;">
29-
<fieldset>
30-
<legend>#i18n{portal.site.admin_page.labelAdvancedParameters}</legend>
28+
<@fieldSet legend='#i18n{portal.site.admin_page.labelAdvancedParameters}'>
3129
<@formGroup labelFor='role' labelKey='#i18n{portal.site.create_portlet.labelRole}' rows=2>
3230
<@select name='role' default_value='none' items=portlet_role_combo />
3331
</@formGroup>
@@ -41,7 +39,7 @@
4139
<@checkBox labelFor='display_on_large_device' name='display_on_large_device' value='1' checked=true labelKey='#i18n{portal.site.create_portlet.checkboxLargeDevice}' />
4240
<@checkBox labelFor='display_on_xlarge_device' name='display_on_xlarge_device' value='1' checked=true labelKey='#i18n{portal.site.create_portlet.checkboxXLargeDevice}' />
4341
</@formGroup>
44-
</fieldset>
42+
</@fieldSet>
4543
</div>
4644
</@boxBody>
4745
</@box>
@@ -67,7 +65,7 @@
6765
</@formGroup>
6866
</@columns>
6967
</@row>
70-
</fieldset>
68+
</@fieldSet>
7169
</@tform>
7270

7371
<script type="text/javascript">

‎webapp/WEB-INF/templates/admin/portlet/modify_portlet.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
<@tform method='post' id='form-portlet' name='form' action='jsp/admin/${portletType.doModifyUrl}' params='target="_top"'>
33
<input type="hidden" name="portlet_id" value="${portlet.id}" />
44
<input type="hidden" name="portlet_type_id" value="${portletType.id}" />
5-
<fieldset>
6-
<legend>${portletType.name} #i18n{portal.site.portletType.labelModify}</legend>
5+
<@fieldSet legend='${portletType.name} #i18n{portal.site.portletType.labelModify}'>
76
<@row>
87
<@columns sm=3 md=3 lg=3 id='panel'>
98
<@box color='default box-solid'>
@@ -28,8 +27,7 @@
2827
</@formGroup>
2928

3029
<div id="params" style="clear:both;">
31-
<fieldset>
32-
<legend>#i18n{portal.site.admin_page.labelAdvancedParameters}</legend>
30+
<@fieldSet legend='#i18n{portal.site.admin_page.labelAdvancedParameters}'>
3331
<@formGroup labelFor='role' labelKey='#i18n{portal.site.create_portlet.labelRole}' rows=2>
3432
<@select name='role' default_value='${portlet.role}' items=portlet_role_combo />
3533
</@formGroup>
@@ -78,7 +76,7 @@
7876
</#if>
7977
<@checkBox name='display_on_xlarge_device' value='1' checked=checked labelKey='#i18n{portal.site.create_portlet.checkboxXLargeDevice}' />
8078
</@formGroup>
81-
</fieldset>
79+
</@fieldSet>
8280
</div>
8381
</@boxBody>
8482
</@box>
@@ -116,7 +114,7 @@
116114
</@formGroup>
117115
</@columns>
118116
</@row>
119-
</fieldset>
117+
</@fieldSet>
120118
</@tform>
121119

122120
<script type="text/javascript">

‎webapp/WEB-INF/templates/admin/search/modify_taglist.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
<@boxBody>
66
<@tform action='jsp/admin/search/DoModifyTagList.jsp' params='enctype="multipart/form-data"' name='modify_taglist'>
77
<input type="hidden" name="token" value="${token}">
8-
<fieldset>
9-
<legend>#i18n{portal.system.modify_properties.boxTitle}</legend>
8+
<@fieldSet legend='#i18n{portal.system.modify_properties.boxTitle}'>
109
<@formGroup labelKey='#i18n{portal.search.modify_taglist.labelName}' labelFor='taglist'>
1110
<@input type='text' name='taglist' id='taglist' value='${(taglist!)?html}' maxlength=255 />
1211
</@formGroup>
@@ -25,7 +24,7 @@
2524
<@button type='submit' name='submit' buttonIcon='check' title='#i18n{portal.search.modify_taglist.buttonValidate}' />
2625
</@formGroup>
2726
</#if>
28-
</fieldset>
27+
</@fieldSet>
2928
</@tform>
3029
</@boxBody>
3130
</@box>

‎webapp/WEB-INF/templates/admin/site/admin_page_block_childpage.html

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
<@box color='default box-solid'>
1616
<@boxHeader title='#i18n{portal.site.admin_page.titleAddChildPage}' />
1717
<@boxBody>
18-
<fieldset>
19-
<legend class="sr-only">#i18n{portal.site.admin_page.titleAddChildPage}</legend>
18+
<@fieldSet legend='#i18n{portal.site.admin_page.titleAddChildPage}'>
2019
<@formGroup labelFor='child_page_name' labelKey='#i18n{portal.site.admin_page.labelChildPageName}' rows=2 mandatory=true>
2120
<@input type='text' name='page_name' value='${page.name!}' />
2221
</@formGroup>
2322
<@formGroup labelFor='child_page_description' labelKey='#i18n{portal.site.admin_page.labelDescription}' rows=2>
2423
<@input type='textarea' name='page_description'>${page.description!}</@input>
2524
</@formGroup>
26-
</fieldset>
25+
</@fieldSet>
2726
</@boxBody>
2827
</@box>
2928
</@columns>
@@ -32,8 +31,7 @@
3231
<@box color='default box-solid'>
3332
<@boxHeader title='#i18n{portal.site.admin_page.labelPageTemplateList}' />
3433
<@boxBody>
35-
<fieldset>
36-
<legend class="sr-only">#i18n{portal.site.admin_page.labelPageTemplateList}</legend>
34+
<@fieldSet legend='#i18n{portal.site.admin_page.labelPageTemplateList}'>
3735
<@formGroup labelFor='page_order_list' labelKey='#i18n{portal.site.admin_page.labelPageTemplateList}' rows=2>
3836
${page_templates_list}
3937
</@formGroup>
@@ -61,7 +59,7 @@
6159
</div>
6260
<@getDatePickerBootstrap idField="manual_update_date" language='fr' />
6361
</@formGroup>
64-
</fieldset>
62+
</@fieldSet>
6563
</@boxBody>
6664
</@box>
6765
</@columns>
@@ -70,8 +68,7 @@
7068
<@box color='default box-solid'>
7169
<@boxHeader title='#i18n{portal.site.admin_page.titlePictureProperties}' />
7270
<@boxBody>
73-
<fieldset>
74-
<legend class="sr-only">#i18n{portal.site.admin_page.titlePictureProperties}</legend>
71+
<@fieldSet legend='#i18n{portal.site.admin_page.titlePictureProperties}'>
7572
<@formGroup labelKey='#i18n{portal.site.admin_page.labelNewPicture}' rows=2>
7673
<@input type='file' id='image_content' name='image_content' />
7774
</@formGroup>
@@ -85,7 +82,7 @@
8582
</@columns>
8683
</@row>
8784
</@formGroup>
88-
</fieldset>
85+
</@fieldSet>
8986
</@boxBody>
9087
</@box>
9188
</@columns>
@@ -94,29 +91,28 @@
9491
<@box color='default box-solid'>
9592
<@boxHeader title='#i18n{portal.site.admin_page.labelMetadata}' />
9693
<@boxBody>
97-
<fieldset>
98-
<legend class="sr-only">#i18n{portal.site.admin_page.labelMetadata}</legend>
94+
<@fieldSet legend='#i18n{portal.site.admin_page.labelMetadata}'>
9995
<@formGroup labelFor='meta_keywords' labelKey='#i18n{portal.site.admin_page.labelMetaKeywords}' helpKey='#i18n{portal.site.admin_page.labelMetaKeywordsInfo}' rows=2>
10096
<@input type='text' name='meta_keywords' maxlength=250 value=page.metaKeywords! />
10197
</@formGroup>
10298
<@formGroup labelFor='meta_description' labelKey='#i18n{portal.site.admin_page.labelMetaDescription}' rows=2>
10399
<@input type='text' name='meta_description' maxlength=250 value=page.metaDescription! />
104100
</@formGroup>
105-
</fieldset>
101+
</@fieldSet>
106102
</@boxBody>
107103
</@box>
108104
<@box color='default box-solid'>
109105
<@boxHeader title='' />
110106
<@boxBody>
111-
<fieldset>
107+
<@fieldSet>
112108
<@formGroup labelFor='theme' labelKey='#i18n{portal.site.admin_page.labelTheme}' rows=2>
113109
<@select name='theme' default_value='${page.codeTheme}' items=page_themes_list />
114110
</@formGroup>
115111

116112
<@formGroup labelFor='roles_list' labelKey='#i18n{portal.site.admin_page.labelRole}' rows=2>
117113
<@select name='role' default_value='${page.role}' items=page_roles_list sort=true />
118114
</@formGroup>
119-
</fieldset>
115+
</@fieldSet>
120116
</@boxBody>
121117
</@box>
122118
</@columns>

‎webapp/WEB-INF/templates/admin/site/admin_page_block_portlet.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
<@columns>
33
<#if portlet_types_list?has_content>
44
<@tform method='post' action='jsp/admin/DoCreatePortlet.jsp' params='target="preview"'>
5-
<fieldset>
6-
<legend>#i18n{portal.site.admin_page.titlePortletProperties} dsqdsqd</legend>
5+
<@fieldSet legend='#i18n{portal.site.admin_page.titlePortletProperties}'>
76
<input type="hidden" name="page_id" value="${page.id}" />
87
<strong>#i18n{portal.site.admin_page.labelPortletType}</strong>
98
<@formGroup rows=2>
@@ -16,7 +15,7 @@
1615
<@formGroup rows=2>
1716
<@button type='submit' buttonIcon='plus' title='#i18n{portal.site.admin_page.buttonAdd}' size='' />
1817
</@formGroup>
19-
</fieldset>
18+
</@fieldSet>
2019
</@tform>
2120
</#if>
2221
</@columns>

‎webapp/WEB-INF/templates/admin/site/admin_page_block_property.html

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
<@box color='default box-solid'>
1616
<@boxHeader title='#i18n{portal.site.admin_page.titlePageProperties}' />
1717
<@boxBody>
18-
<fieldset>
19-
<legend class="sr-only">#i18n{portal.site.admin_page.titlePageProperties}</legend>
18+
<@fieldSet legend='#i18n{portal.site.admin_page.titlePageProperties}'>
2019
<@formGroup labelFor='child_page_name' labelKey='#i18n{portal.site.admin_page.labelChildPageName}' rows=2 mandatory=true>
2120
<@input type='text' name='page_name' value='${page.name!}' />
2221
</@formGroup>
@@ -31,7 +30,7 @@
3130
<@input type='text' name='parent_id' value='${page.parentPageId}' />
3231
</#if>
3332
</@formGroup>
34-
</fieldset>
33+
</@fieldSet>
3534
</@boxBody>
3635
</@box>
3736
</@columns>
@@ -40,8 +39,7 @@
4039
<@box color='default box-solid'>
4140
<@boxHeader title='#i18n{portal.site.admin_page.labelPageTemplateList}' />
4241
<@boxBody>
43-
<fieldset>
44-
<legend class="sr-only">#i18n{portal.site.admin_page.labelPageTemplateList}</legend>
42+
<@fieldSet legend='#i18n{portal.site.admin_page.labelPageTemplateList}'>
4543
<@formGroup labelFor='page_order_list' labelKey='#i18n{portal.site.admin_page.labelPageTemplateList}' rows=2>
4644
${page_templates_list}
4745
</@formGroup>
@@ -69,7 +67,7 @@
6967
</div>
7068
<@getDatePickerBootstrap idField="manual_update_date" language='fr' />
7169
</@formGroup>
72-
</fieldset>
70+
</@fieldSet>
7371
</@boxBody>
7472
</@box>
7573
</@columns>
@@ -80,8 +78,7 @@
8078
<@box color='default box-solid'>
8179
<@boxHeader title='#i18n{portal.site.admin_page.titlePictureProperties}' />
8280
<@boxBody>
83-
<fieldset>
84-
<legend class="sr-only">#i18n{portal.site.admin_page.titlePictureProperties}</legend>
81+
<@fieldSet legend='#i18n{portal.site.admin_page.titlePictureProperties}'>
8582
<@formGroup labelKey='#i18n{portal.site.admin_page.labelNewPicture}' rows=2>
8683
<@input type='file' id='image_content' name='image_content' />
8784
</@formGroup>
@@ -95,7 +92,7 @@
9592
</@columns>
9693
</@row>
9794
</@formGroup>
98-
</fieldset>
95+
</@fieldSet>
9996
</@boxBody>
10097
</@box>
10198
</@columns>
@@ -105,21 +102,20 @@
105102
<@box color='default box-solid'>
106103
<@boxHeader title='#i18n{portal.site.admin_page.labelMetadata}' />
107104
<@boxBody>
108-
<fieldset>
109-
<legend class="sr-only">#i18n{portal.site.admin_page.labelMetadata}</legend>
105+
<@fieldSet legend='#i18n{portal.site.admin_page.labelMetadata}'>
110106
<@formGroup labelFor='meta_keywords' labelKey='#i18n{portal.site.admin_page.labelMetaKeywords}' helpKey='#i18n{portal.site.admin_page.labelMetaKeywordsInfo}' rows=2>
111107
<@input type='text' name='meta_keywords' maxlength=250 value=page.metaKeywords! />
112108
</@formGroup>
113109
<@formGroup labelFor='meta_description' labelKey='#i18n{portal.site.admin_page.labelMetaDescription}' rows=2>
114110
<@input type='text' name='meta_description' maxlength=250 value=page.metaDescription! />
115111
</@formGroup>
116-
</fieldset>
112+
</@fieldSet>
117113
</@boxBody>
118114
</@box>
119115
<@box color='default box-solid'>
120116
<@boxHeader title='' />
121117
<@boxBody>
122-
<fieldset>
118+
<@fieldSet>
123119
<@formGroup labelFor='theme' labelKey='#i18n{portal.site.admin_page.labelTheme}' rows=2>
124120
<@select name='theme' default_value='${page.codeTheme}' items=page_themes_list />
125121
</@formGroup>
@@ -141,7 +137,7 @@
141137
</@select>
142138
</#if>
143139
</@formGroup>
144-
</fieldset>
140+
</@fieldSet>
145141
</@boxBody>
146142
</@box>
147143
</@columns>

‎webapp/WEB-INF/templates/admin/style/create_mode.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
<@formGroup labelFor='mode_path' labelKey='#i18n{portal.style.create_mode.labelXslDirectory}' helpKey='#i18n{portal.style.create_mode.xslDirectorySampleMessage}' mandatory=true>
1212
<@input type='text' id='mode_path' name='mode_path' maxlength=50 />
1313
</@formGroup>
14-
<fieldset>
15-
<legend>#i18n{portal.style.modify_mode.xslParameterValues}</legend>
14+
<@fieldSet legend='#i18n{portal.style.modify_mode.xslParameterValues}'>
1615
<@formGroup labelFor='mode_output_xsl_method' labelKey='#i18n{portal.style.create_mode.labelMethod}'>
1716
<@input type='text' id='mode_output_xsl_method' name='mode_output_xsl_method' maxlength=50 />
1817
</@formGroup>
@@ -34,7 +33,7 @@
3433
<@formGroup labelFor='mode_output_xsl_standalone' labelKey='#i18n{portal.style.create_mode.labelStandalone}'>
3534
<@input type='text' id='mode_output_xsl_standalone' name='mode_output_xsl_standalone' maxlength=50 />
3635
</@formGroup>
37-
</fieldset>
36+
</@fieldSet>
3837

3938
<@formGroup>
4039
<@button type='submit' buttonIcon='check' title='#i18n{portal.style.create_mode.buttonLabelCreate}' size='' />

‎webapp/WEB-INF/templates/admin/style/modify_mode.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
<@formGroup labelKey='#i18n{portal.style.modify_mode.labelXslPath}' labelFor='xsl_path'>
1616
<@input type='text' name='xsl_path' id='xsl_path' value='${mode.path}' disabled=true />
1717
</@formGroup>
18-
<fieldset>
19-
<legend>#i18n{portal.style.modify_mode.xslParameterValues}</legend>
18+
<@fieldSet legend='#i18n{portal.style.modify_mode.xslParameterValues}'>
2019
<@formGroup labelKey='#i18n{portal.style.modify_mode.labelMethod}' labelFor='mode_output_xsl_method'>
2120
<@input type='text' name='mode_output_xsl_method' id='mode_output_xsl_method' value='${mode.outputXslPropertyMethod?html}' maxlength=50 />
2221
</@formGroup>
@@ -38,7 +37,7 @@
3837
<@formGroup labelKey='#i18n{portal.style.modify_mode.labelStandalone}' labelFor='mode_output_xsl_standalone'>
3938
<@input type='text' name='mode_output_xsl_standalone' id='mode_output_xsl_standalone' value='${mode.outputXslPropertyStandalone?html}' maxlength=50 />
4039
</@formGroup>
41-
</fieldset>
40+
</@fieldSet>
4241

4342
<@formGroup>
4443
<@button type='submit' buttonIcon='check' title='#i18n{portal.style.modify_mode.buttonLabelValidate}' size='' />

‎webapp/WEB-INF/templates/admin/system/manage_daemons.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,10 @@
8888
<input type="hidden" name="daemon" value="${daemon.id}">
8989
<input type="hidden" name="token" value="${token}">
9090
<#if daemon.running>
91-
<@button type='submit' title='#i18n{portal.system.manage_daemons.buttonStop} ${daemon.id}' name='action' value='STOP' buttonIcon='stop' color='danger' showTitle=false />
92-
<@button type='submit' title='#i18n{portal.system.manage_daemons.buttonRun} ${daemon.id}' name='action' value='RUN' buttonIcon='refresh' color='info' showTitle=false />
91+
<@inputGroup>
92+
<@button type='submit' title='#i18n{portal.system.manage_daemons.buttonStop} ${daemon.id}' name='action' value='STOP' buttonIcon='stop' color='danger' showTitle=false />
93+
<@button type='submit' title='#i18n{portal.system.manage_daemons.buttonRun} ${daemon.id}' name='action' value='RUN' buttonIcon='refresh' color='info' showTitle=false />
94+
</@inputGroup>
9395
<#else>
9496
<@button type='submit' title='#i18n{portal.system.manage_daemons.buttonStart} ${daemon.id}' name='action' value='START' buttonIcon='play' color='success' showTitle=false />
9597
</#if>

0 commit comments

Comments
 (0)