Skip to content

Commit 97007a0

Browse files
TimotheeHrlTimotheeHrl
committed
LUT-25131 : fix @selectIconFont implementation with ti ti- icons
1 parent 0a7d883 commit 97007a0

File tree

9 files changed

+78
-64
lines changed

9 files changed

+78
-64
lines changed

‎src/java/fr/paris/lutece/plugins/wiki/service/parser/WikiCreoleToMarkdown.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ public static String renderCustomContent( String str )
5858
str = str.replaceAll( "\\[simpleQuote;", "'" );
5959
str = str.replaceAll( "badge badge-", "badge badge-badge bg-" );
6060
str = str.replaceAll( "label label-", "badge badge-badge bg-" );
61-
str = str.replaceAll( "glyphicon glyphicon-warning-sign", "fa fa-exclamation-triangle" );
62-
str = str.replaceAll( "glyphicon glyphicon-info-sign", "fa fa-info-circle" );
63-
str = str.replaceAll( "glyphicon glyphicon-question-sign", "fa fa-question-circle" );
64-
str = str.replaceAll( "glyphicon glyphicon-ok-sign", "fa fa-check-circle" );
65-
str = str.replaceAll( "glyphicon glyphicon-remove-sign", "fa fa-times-circle" );
66-
str = str.replaceAll( "glyphicon glyphicon-chevron-right", "fa fa-chevron-right" );
67-
str = str.replaceAll( "glyphicon glyphicon-chevron-left", "fa fa-chevron-left" );
68-
str = str.replaceAll( "glyphicon glyphicon-chevron-up", "fa fa-chevron-up" );
61+
str = str.replaceAll( "glyphicon glyphicon-warning-sign", "ti ti-exclamation-triangle" );
62+
str = str.replaceAll( "glyphicon glyphicon-info-sign", "ti ti-info-circle" );
63+
str = str.replaceAll( "glyphicon glyphicon-question-sign", "ti ti-question-circle" );
64+
str = str.replaceAll( "glyphicon glyphicon-ok-sign", "ti ti-check-circle" );
65+
str = str.replaceAll( "glyphicon glyphicon-remove-sign", "ti ti-times-circle" );
66+
str = str.replaceAll( "glyphicon glyphicon-chevron-right", "ti ti-chevron-right" );
67+
str = str.replaceAll( "glyphicon glyphicon-chevron-left", "ti ti-chevron-left" );
68+
str = str.replaceAll( "glyphicon glyphicon-chevron-up", "ti ti-chevron-up" );
6969
return str;
7070
}
7171

‎webapp/WEB-INF/conf/plugins/wiki_context.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<value>icon</value>
8080
</property>
8181
<property name="before">
82-
<value>&lt;span class="fa fa-</value>
82+
<value>&lt;span class="ti ti-</value>
8383
</property>
8484
<property name="after">
8585
<value>" &gt;&lt;/span&gt;</value>

‎webapp/WEB-INF/templates/skin/plugins/wiki/custom_input_editor.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
<div id="selectIconModal" class="toastui-editor-popup" style="display: none;" >
44
<div style="position: absolute; top: 50%; left: 50%; z-index: -1;"></div>
55
<button class="btn btn-default" type="button" style="position: absolute; right: 0;" onclick="closeToastUiModal()">
6-
<span class="fa fa-times"></span>
6+
<span class="ti ti-times"></span>
77
</button>
88
<div class="toastui-editor-popup-header">
99
<div class="toastui-editor-popup-header-title">Select FA Icons</div>
1010
</div>
1111
<div class="toastui-editor-popup-body">
1212
<div class="toastui-editor-popup-content-body">
13-
<@selectIconFont id='selectIcon' class='' name='resource-icon' showListLabel=true showListIcon=true searchShow=true searchFocus=false searchHighlight=true type='yaml' prefix='fa-' iconsUrl='css/admin/font-awesome-icons.yml' resources=true defaultValue='' />
13+
<@selectIconFont id='selectIcon' class='' name='resource-icon' showListLabel=true showListIcon=true searchShow=true searchFocus=false searchHighlight=true type='json' prefix='ti' iconsUrl='themes/admin/shared/css/vendor/tabler/tabler-icons.json' resources=true defaultValue='' />
1414
</div>
1515
<p>Select an icon type Solid or Regular</p>
1616
</div>
1717
<div id="iconIsSelected" style="display: none">
1818
<div class="toastui-editor-popup-content-body" style="margin: 25px;">
1919
<label for="iconSize">Icon Size :</label>
2020
<select id="iconSize" class="form-control" onchange="changeIconSize()">
21-
<option value="fa-1x">fa-1x</option>
22-
<option value="fa-2x">fa-2x</option>
23-
<option value="fa-3x">fa-3x</option>
24-
<option value="fa-4x">fa-4x</option>
25-
<option value="fa-5x">fa-5x</option>
21+
<option value="fa-sm">fa-sm</option>
22+
<option value="">fa</option>
23+
<option value="fa-lg">fa-lg</option>
24+
<option value="fa-xl">fa-xl</option>
25+
<option value="fa-2xl">fa-2xl</option>
2626
</select>
2727
<div class="toastui-editor-popup-content-body">
2828
Seleted Icon : <span id="selectedIcon"> </span>
@@ -38,7 +38,7 @@
3838
<div id="selectAlertType" class="toastui-editor-popup" style="display: none;" >
3939
<div style="position: absolute; top: 50%; left: 50%; z-index: -1;"></div>
4040
<button class="btn btn-default" type="button" style="position: absolute; right: 0;" onclick="closeToastUiModal()">
41-
<span class="fa fa-times"></span>
41+
<span class="ti ti-times"></span>
4242
</button>
4343
<div class="toastui-editor-popup-header">
4444
<div class="toastui-editor-popup-header-title">Select an Alert-Box</div>
@@ -55,7 +55,7 @@
5555
<div id="selectJumbotronModal" class="toastui-editor-popup" style="display: none;" >
5656
<div style="position: absolute; top: 50%; left: 50%; z-index: -1;"></div>
5757
<button class="btn btn-default" type="button" style="position: absolute; right: 0;" onclick="closeToastUiModal()">
58-
<span class="fa fa-times"></span>
58+
<span class="ti ti-times"></span>
5959
</button>
6060
<div class="toastui-editor-popup-header">
6161
<div class="toastui-editor-popup-header-title">Select a Jumbotron</div>
@@ -75,7 +75,7 @@
7575
<!------------ modal select a badge ----------------->
7676
<div id="selectBadge" class="toastui-editor-popup" style="display: none;" >
7777
<button class="btn btn-default" type="button" style="position: absolute; right: 0;" onclick="closeToastUiModal()">
78-
<span class="fa fa-times"></span>
78+
<span class="ti ti-times"></span>
7979
</button>
8080
<div class="toastui-editor-popup-header">
8181
<div class="toastui-editor-popup-header-title">Select a Badge</div>
@@ -118,7 +118,7 @@
118118
<div id="imageModal" class="toastui-editor-popup" style="display: none;" >
119119
<div style="position: absolute; top: 50%; left: 50%; z-index: -1;"></div>
120120
<button class="btn btn-default" type="button" style="position: absolute; right: 0;" onclick="closeToastUiModal()">
121-
<span class="fa fa-times"></span>
121+
<span class="ti ti-times"></span>
122122
</button>
123123
<div class="toastui-editor-popup-header">
124124
<div class="toastui-editor-popup-header-title">Insert image from an url</div>

‎webapp/WEB-INF/templates/skin/plugins/wiki/modify_page.html‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<head lang="en">
22
<meta charset="UTF-8" />
3-
<!--- Icons -->
4-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" />
53
<!-- Dark mode -->
64
<link rel="stylesheet" href="css/plugins/wiki/darkmode.css" />
75
<!-- Editor -->
@@ -18,7 +16,7 @@
1816
<!----------- wiki preview modale --------------->
1917
<div id="previewModal" class="toastui-editor-popup" style="width:1300px; display: none;" >
2018
<button class="btn btn-default" type="button" style="position: absolute; right: 0;" onclick="closeToastUiModal()">
21-
Close <span class="fa fa-times"></span>
19+
Close <span class="ti ti-times"></span>
2220
</button>
2321
<div class="toastui-editor-popup-header">
2422
<div class="toastui-editor-popup-header-title">Preview</div>
@@ -48,10 +46,10 @@
4846
<div class="col-sm-12">
4947
<div class="btn-group btn-group-xs pull-right">
5048
<a class="btn btn-default" href="jsp/site/Portal.jsp?page=wiki&view=page&page_name=${topic.pageName}" title="#i18n{wiki.button.backToPage}">
51-
<span class="fa fa-chevron-left fa-1x"></span> #i18n{wiki.button.backToPage}
49+
<span class="ti ti-chevron-left fa-lg"></span> #i18n{wiki.button.backToPage}
5250
</a>
5351
<button name="view_preview" class="btn btn-default" title="#i18n{wiki.menu.preview}" onclick="preview()">
54-
<span class="fa fa-eye"></span> #i18n{wiki.menu.preview}
52+
<span class="ti ti-eye"></span> #i18n{wiki.menu.preview}
5553
</button>
5654
<#if has_admin_role >
5755
<form id="form-page-delete" action="jsp/site/Portal.jsp" method="post" >
@@ -60,11 +58,11 @@
6058
<input type="hidden" name="action" value="deletePage" />
6159
</form>
6260
<button class="btn btn-danger" class="btn btn-danger" title="#i18n{portal.util.labelDelete}" onclick="confirmDeleteTopic()">
63-
<span class="fa fa-trash fa-1x"></span> #i18n{portal.util.labelDelete}
61+
<span class="ti ti-trash fa-lg"></span> #i18n{portal.util.labelDelete}
6462
</button>
6563
</#if>
6664
<button id="btn-help" class="btn btn-default" type="button" title="#i18n{wiki.menu.help}">
67-
<span class="fa fa-question fa-1x"></span> #i18n{wiki.menu.help}
65+
<span class="ti ti-question fa-lg"></span> #i18n{wiki.menu.help}
6866
</button>
6967
</div>
7068
</div>
@@ -73,7 +71,7 @@
7371
<div id="darkModeSwitch" style="display: none">
7472
<div style="display: flex; justify-content: end; flex-direction: row; margin-top: 15px" >
7573
<div style="margin-right: 10px">
76-
<div id="darkModeLabel"><span class="fa fa-sun fa-2x"></span></div>
74+
<div id="darkModeLabel"><span class="ti ti-sun fa-lg"></span></div>
7775
</div>
7876
<label class="switch">
7977
<input id="darkModeId" type="checkbox" onchange="toggleDarkMode()" >
@@ -160,16 +158,16 @@ <h1>#i18n{wiki.menu.edit} <small> [${topic.pageName}] </small></h1>
160158
<div class="row">
161159
<div class="col-sm-6">
162160
<div class="form-group">
163-
<label for="modification_comment"><span class="fa fa-comment-dots fa-1x"></span> &nbsp; #i18n{wiki.modify_page.labelComment} :</label>
161+
<label for="modification_comment"><span class="ti ti-comment-dots fa-lg"></span> &nbsp; #i18n{wiki.modify_page.labelComment} :</label>
164162
<input class="form-control" type="text" id="modification_comment" name="modification_comment" maxlength="50"/>
165163
</div>
166164
<button name="action_modifyPage" class="btn btn-primary" title="#i18n{wiki.modify_page.buttonModify}" onclick="createVersion()">
167-
<span class="fa fa-save fa-1x"></span> &nbsp;#i18n{wiki.modify_page.buttonModify}
165+
<span class="ti ti-save fa-lg"></span> &nbsp;#i18n{wiki.modify_page.buttonModify}
168166
</button>
169167
</div>
170168
<div class="col-sm-6">
171169
<div class="well">
172-
<legend><span class="fa fa-user fa-1x"></span> &nbsp; #i18n{wiki.modify_page.titleRole}</legend>
170+
<legend><span class="ti ti-user fa-lg"></span> &nbsp; #i18n{wiki.modify_page.titleRole}</legend>
173171
<div class="form-group row">
174172
<label class="col-sm-5 col-form-label" for="view_role">#i18n{wiki.modify_page.labelViewRole} :</label>
175173
<div class="col-sm-7">
@@ -191,7 +189,7 @@ <h1>#i18n{wiki.menu.edit} <small> [${topic.pageName}] </small></h1>
191189
</div>
192190
</div>
193191
<div class="container panel panel-default">
194-
<h3><span class="fa fa-file-image fa-1x"></span> &nbsp; #i18n{wiki.modify_page.titleImages}</h3>
192+
<h3><span class="ti ti-file-image fa-lg"></span> &nbsp; #i18n{wiki.modify_page.titleImages}</h3>
195193
<div class="row">
196194
<div class="col-sm-8">
197195
<div id="table-images" class="image-grid "></div>
@@ -203,7 +201,7 @@ <h3><span class="fa fa-file-image fa-1x"></span> &nbsp; #i18n{wiki.modify_page.t
203201
<input type="hidden" name="action" value="uploadImage" />
204202
<input type="hidden" name="topic_id" value="${topic.idTopic}" />
205203
<div class="well">
206-
<legend><span class="fa fa-plus fa-1x"></span> &nbsp; #i18n{wiki.modify_page.titleAddImage}</legend>
204+
<legend><span class="ti ti-plus fa-lg"></span> &nbsp; #i18n{wiki.modify_page.titleAddImage}</legend>
207205
<!-- loader.gif -->
208206
<div class="form-group row">
209207
<label class="col-sm-4 col-form-label" for="image_file">#i18n{wiki.modify_page.labelFile}&nbsp;: </label>
@@ -220,7 +218,7 @@ <h3><span class="fa fa-file-image fa-1x"></span> &nbsp; #i18n{wiki.modify_page.t
220218
<div class="form-group row">
221219
<div class="col-sm-8">
222220
<button id="btn-image-upload" class="btn btn-primary" name="name" type="submit" >
223-
<span class="fa fa-file-upload fa-1x"></span> &nbsp; #i18n{wiki.modify_page.buttonUpload}
221+
<span class="ti ti-file-upload fa-lg"></span> &nbsp; #i18n{wiki.modify_page.buttonUpload}
224222
</button>
225223
</div>
226224
</div>
@@ -289,5 +287,4 @@ <h3><span class="fa fa-file-image fa-1x"></span> &nbsp; #i18n{wiki.modify_page.t
289287
}
290288
});
291289
});
292-
293290
</script>

‎webapp/WEB-INF/templates/skin/plugins/wiki/view_page.html‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<head lang="en">
22

33
<meta charset="UTF-8" />
4-
<!--- Icons -->
5-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" />
6-
74
<link rel="stylesheet" href="css/plugins/wiki/toastui/data/tuidoc-example-style.css" />
85
<!-- DARK MODE -->
96
<link rel="stylesheet" href="css/plugins/wiki/darkmode.css" />
@@ -55,7 +52,7 @@
5552
<div id="darkModeSwitch" style="display: none">
5653
<div style="display: flex; justify-content: end; flex-direction: row; margin-top: 15px" >
5754
<div style="margin-right: 10px">
58-
<div id="darkModeLabel"><span class="fa fa-sun fa-2x"></span></div>
55+
<div id="darkModeLabel"><span class="ti ti-sun fa-lg"></span></div>
5956
</div>
6057
<label class="switch">
6158
<input id="darkModeId" type="checkbox" onchange="toggleDarkMode()" >

‎webapp/css/plugins/wiki/wiki.css‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,27 @@ span.diff-html-conflict {
3939
/* background: url(../images/diffunderline.gif) bottom repeat-x; */
4040
background-color: #f781be; /* light rose */
4141
}
42-
42+
[class^="ti ti-"] {
43+
font-size: 18px;
44+
}
45+
.fa-2xs {
46+
font-size: 10px;
47+
}
48+
.fa-xs{
49+
font-size: 12px;
50+
}
51+
.fa-sm{
52+
font-size: 14px;
53+
}
54+
.fa-lg{
55+
font-size: 20px;
56+
}
57+
.fa-xl{
58+
font-size: 24px;
59+
}
60+
.fa-2xl{
61+
font-size: 32px;
62+
}
4363
.markItUp {
4464
width: 100%;
4565
}

‎webapp/js/plugins/wiki/wiki_pages/defaultEditorContent.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ let defaultEditorContent = {
5454
"```\n" +
5555
"\n" +
5656
"$$span\n" +
57-
"<div class='alert alert-info'> <span class='fa fa-info-circle'></span> This is an info alert </div>\n" +
57+
"<div class='alert alert-info'> <span class='ti ti-info-circle'></span> This is an info alert </div>\n" +
5858
"$$"+
5959
"\n" +
6060
"\n" +
6161
"$$span\n" +
6262

63-
"<div class='alert alert-danger'> <span class='fa fa-exclamation-triangle'></span> This is an warning alert </div>\n" +
63+
"<div class='alert alert-danger'> <span class='ti ti-exclamation-triangle'></span> This is an warning alert </div>\n" +
6464
"$$\n" +
6565
"\n" +
6666
"## Une table des matières :\n" +
@@ -145,11 +145,11 @@ let defaultEditorContent = {
145145
"```\n" +
146146
"\n" +
147147
"$$span\n" +
148-
"<div class='alert alert-info'> <span class='fa fa-info-circle'></span> This is an info alert </div>\n" +
148+
"<div class='alert alert-info'> <span class='ti ti-info-circle'></span> This is an info alert </div>\n" +
149149
"$$"+
150150
"\n" +
151151
"$$span\n" +
152-
"<div class='alert alert-danger'> <span class='fa fa-exclamation-triangle'></span> This is an warning alert </div>\n" +
152+
"<div class='alert alert-danger'> <span class='ti ti-exclamation-triangle'></span> This is an warning alert </div>\n" +
153153
"$$ \n" +
154154
"\n" +
155155
"## A table of contents :\n" +

0 commit comments

Comments
 (0)