Skip to content

Commit 01f5ea2

Browse files
TimotheeHrlTimotheeHrl
committed
LUT-26169: change glyphicon to fa icons
1 parent b0b7560 commit 01f5ea2

File tree

6 files changed

+47
-27
lines changed

6 files changed

+47
-27
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1+
<head>
2+
<!-- Icons -->
3+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" />
4+
</head>
15
<div class="row">
26
<div class="col-sm-12">
37
<div class="container panel panel-default">
48
<div class="btn-group btn-group-xs pull-right">
59
<a class="btn btn-default" href="jsp/site/Portal.jsp?page=wiki&view=page&page_name=${topic.pageName}" title="#i18n{wiki.button.backToPage}">
6-
<span class="glyphicon glyphicon-chevron-left"></span> #i18n{wiki.button.backToPage}
10+
<span class="fa fa-chevron-left fa-1x"></span> #i18n{wiki.button.backToPage}
711
</a>
812
<a class="btn btn-default" href="jsp/site/Portal.jsp?page=wiki&page_name=${topic.pageName}&view=history" title="#i18n{wiki.menu.history}">
9-
<span class="glyphicon glyphicon-time"></span> #i18n{wiki.menu.history}
13+
<span class="fa fa-history fa-1x"></span> #i18n{wiki.menu.history}
1014
</a>
1115
</div>
1216
<h1>#i18n{wiki.menu.diff} <small> [${topic.pageName}]</small></h1>
@@ -33,4 +37,4 @@ <h2 class="panel-title">#i18n{wiki.menu.diff.source}</h2>
3337
</#if>
3438
</div>
3539
</div>
36-
</div>
40+
</head>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<head>
2+
<!-- Icons -->
3+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" />
4+
</head>
15
<div class="row">
26
<div class="col-sm-12">
37
<div class="container panel panel-default">
@@ -7,10 +11,10 @@
711
<input type="hidden" name="view" value="diff" />
812
<div class="btn-group btn-group-xs pull-right">
913
<button class="btn btn-default" type="submit" title="#i18n{wiki.menu.diff}">
10-
<span class="glyphicon glyphicon-eye-open"></span> #i18n{wiki.menu.diff}
14+
<span class="fa fa-eye"></span> #i18n{wiki.menu.diff}
1115
</button>
1216
<a class="btn btn-default" href="jsp/site/Portal.jsp?page=wiki&view=page&page_name=${topic.pageName}" title="#i18n{wiki.button.backToPage}">
13-
<span class="glyphicon glyphicon-chevron-left"></span> #i18n{wiki.button.backToPage}
17+
<span class="fa fa-chevron-left"></span> #i18n{wiki.button.backToPage}
1418
</a>
1519
<#list languages_list as language>
1620
<#if language = current_language >
@@ -33,9 +37,9 @@ <h1>#i18n{wiki.menu.history} <small> [${topic.pageName}]</small></h1>
3337
<tr>
3438
<th>#i18n{wiki.history_page.tableHeader.mostRecent}</th>
3539
<th>#i18n{wiki.history_page.tableHeader.lessRecent}</th>
36-
<th><span class="glyphicon glyphicon-calendar"></span> #i18n{wiki.history_page.tableHeader.date}</th>
37-
<th><span class="glyphicon glyphicon-user"></span> #i18n{wiki.history_page.tableHeader.author}</th>
38-
<th><span class="glyphicon glyphicon-comment"></span> #i18n{wiki.history_page.tableHeader.comment}</th>
40+
<th><span class="fa fa-calendar"></span> #i18n{wiki.history_page.tableHeader.date}</th>
41+
<th><span class="fa fa-user"></span> #i18n{wiki.history_page.tableHeader.author}</th>
42+
<th><span class="fa fa-comments"></span> #i18n{wiki.history_page.tableHeader.comment}</th>
3943
<#if has_edit_role >
4044
<th>#i18n{portal.util.labelActions}</th>
4145
</#if>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1+
<head>
2+
<!-- Icons -->
3+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" />
4+
</head>
15
<div class="row">
26
<div class="col-sm-12">
37
<div class="container panel panel-default">
48
<div class="btn-group btn-group-xs pull-right">
59
<a class="btn btn-default" href="jsp/site/Portal.jsp?page=wiki&view=map" title="#i18n{wiki.menu.map}">
6-
<span class="glyphicon glyphicon-list"></span> #i18n{wiki.menu.map}
10+
<span class="fa fa-list"></span> #i18n{wiki.menu.map}
711
</a>
812
<button class="btn btn-default" id="btn-new-page" type="button" title="#i18n{wiki.menu.create}">
9-
<span class="glyphicon glyphicon-plus-sign"></span> #i18n{wiki.menu.create}
13+
<span class="fa fa-plus-circle"></span> #i18n{wiki.menu.create}
1014
</button>
1115
<button class="btn btn-default" id="btn-search" type="button" title="#i18n{wiki.menu.search}" >
12-
<span class="glyphicon glyphicon-search"></span> #i18n{wiki.menu.search}
16+
<span class="fa fa-search"></span> #i18n{wiki.menu.search}
1317
</button>
1418
<#list languages_list as language>
1519
<#if language = current_language >
@@ -30,7 +34,7 @@
3034
<div class="input-append">
3135
<input class="search-query col-sm-4" id="input-new-page" type="text" name="page_name" /> &nbsp;
3236
<button class="btn btn-primary btn-xs" type="submit" >
33-
<span class="glyphicon glyphicon-plus-sign"></span> #i18n{wiki.list_wiki.create}
37+
<span class="fa fa-plus-circle"></span> #i18n{wiki.list_wiki.create}
3438
</button>
3539
</div>
3640
</form>
@@ -44,7 +48,7 @@
4448
<div class="input-append">
4549
<input class="search-query" id="input-search" type="text" name="query" />
4650
<button class="btn btn-primary btn-xs" type="submit" >
47-
<span class="glyphicon glyphicon-search"></span>
51+
<span class="fa fa-search"></span>
4852
</button>
4953
</div>
5054
</form>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<head>
2+
<!-- Icons -->
3+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" />
4+
</head>
15
<#macro mapLevel list_topic map_topic_children map_topic_title>
26
<ul>
37
<#list list_topic as topic>
@@ -16,13 +20,13 @@
1620
<div class="container panel panel-default">
1721
<div class="btn-group btn-group-xs pull-right">
1822
<a class="btn btn-default" href="jsp/site/Portal.jsp?page=wiki&view=list" title="#i18n{wiki.menu.list}">
19-
<span class="glyphicon glyphicon-list"></span> #i18n{wiki.menu.list}
23+
<span class="fa fa-list"></span> #i18n{wiki.menu.list}
2024
</a>
2125
<button class="btn btn-default" id="btn-new-page" type="button" title="#i18n{wiki.menu.create}">
22-
<span class="glyphicon glyphicon-plus-sign"></span> #i18n{wiki.menu.create}
26+
<span class="fa fa-plus-circle"></span> #i18n{wiki.menu.create}
2327
</button>
2428
<button class="btn btn-default" id="btn-search" type="button" title="#i18n{wiki.menu.search}" >
25-
<span class="glyphicon glyphicon-search"></span> #i18n{wiki.menu.search}
29+
<span class="fa fa-search"></span> #i18n{wiki.menu.search}
2630
</button>
2731
<#list languages_list as language>
2832
<#if language = current_language >
@@ -43,7 +47,7 @@
4347
<div class="input-append">
4448
<input class="search-query col-sm-4" id="input-new-page" type="text" name="page_name" /> &nbsp;
4549
<button class="btn btn-primary btn-xs" type="submit" >
46-
<span class="glyphicon glyphicon-plus-sign"></span> #i18n{wiki.list_wiki.create}
50+
<span class="fa fa-plus-circle"></span> #i18n{wiki.list_wiki.create}
4751
</button>
4852
</div>
4953
</form>
@@ -57,7 +61,7 @@
5761
<div class="input-append">
5862
<input class="search-query" id="input-search" type="text" name="query" />
5963
<button class="btn btn-primary btn-xs" type="submit" >
60-
<span class="glyphicon glyphicon-search"></span>
64+
<span class="fa fa-search"></span>
6165
</button>
6266
</div>
6367
</form>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<head>
2+
<!-- Icons -->
3+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" />
4+
</head>
15
<div class="row">
26
<div class="col-sm-12">
37
<div class="col-sm-4 well">
@@ -11,7 +15,7 @@
1115
<input class="search-query span10" type="text" name="query" value="" />
1216
</#if>
1317
<button class="btn" type="submit" >
14-
<span class="glyphicon glyphicon-search"></span>
18+
<span class="fa fa-search"></span>
1519
</button>
1620
</div>
1721
<@pagination paginator=paginator />

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@
1717
<small>${lastVersion.dateEdition} ${lastVersion.userName!''} ${lastVersion.userPseudo!''}
1818
<img class="avatar-small img-circle" src="${lastVersion.userAvatarUrl!''}" alt="avatar" />
1919
<#if isExtendInstalled?? && isExtendInstalled >
20-
&nbsp;<span class="glyphicon glyphicon-eye-open"></span>
20+
&nbsp;<span class="fa fa-eye"></span>
2121
@Extender[${topic.idTopic},WIKI,hit,{show:true}]@
2222
</#if>
2323
</small>
2424
</#if>
2525
</div>
2626
<div class="btn-group btn-group-xs pull-right">
2727
<a class="btn btn-default" href="jsp/site/Portal.jsp?page=wiki&view=map" title="#i18n{wiki.menu.map}">
28-
<span class="glyphicon glyphicon-list"></span> #i18n{wiki.menu.map}
28+
<span class="fa fa-list"></span> #i18n{wiki.menu.map}
2929
</a>
3030
<button class="btn btn-default" id="btn-search" type="button" title="#i18n{wiki.menu.search}" >
31-
<span class="glyphicon glyphicon-search"></span> #i18n{wiki.menu.search}
31+
<span class="fa fa-search"></span> #i18n{wiki.menu.search}
3232
</button>
3333
<#if has_edit_role >
3434
<a class="btn btn-default" href="jsp/site/Portal.jsp?page=wiki&view=modifyPage&page_name=${topic.pageName}" title="#i18n{wiki.menu.edit}">
35-
<span class="glyphicon glyphicon-edit"></span> #i18n{wiki.menu.edit}
35+
<span class="fa fa-edit"></span> #i18n{wiki.menu.edit}
3636
</a>
3737
<button class="btn btn-default" id="btn-new-page" type="button" title="#i18n{wiki.menu.create}">
38-
<span class="glyphicon glyphicon-plus-sign"></span> #i18n{wiki.menu.create}
38+
<span class="fa fa-plus-circle"></span> #i18n{wiki.menu.create}
3939
</button>
4040
</#if>
4141
<a class="btn btn-default" href="jsp/site/Portal.jsp?page=wiki&view=history&page_name=${topic.pageName}" title="#i18n{wiki.menu.history}">
42-
<span class="glyphicon glyphicon-time"></span> #i18n{wiki.menu.history}
42+
<span class="fa fa-history fa-1x"></span> #i18n{wiki.menu.history}
4343
</a>
4444
<#list languages_list as language>
4545
<#if language = current_language >
@@ -71,7 +71,7 @@
7171
<div class="input-append">
7272
<input class="search-query col-sm-4" id="input-new-page" type="text" name="page_name" /> &nbsp;
7373
<button class="btn btn-primary btn-xs" type="submit" >
74-
<span class="glyphicon glyphicon-plus-sign"></span> #i18n{wiki.list_wiki.create}
74+
<span class="fa fa-plus-circle"></span> #i18n{wiki.list_wiki.create}
7575
</button>
7676
</div>
7777
</form>
@@ -85,7 +85,7 @@
8585
<div class="input-append">
8686
<input class="search-query" id="input-search" type="text" name="query" />
8787
<button class="btn btn-primary btn-xs" type="submit" >
88-
<span class="glyphicon glyphicon-search"></span>
88+
<span class="fa fa-search"></span>
8989
</button>
9090
</div>
9191
</form>

0 commit comments

Comments
 (0)