Skip to content

Commit

Permalink
Merge branch 'bug_24031/replace_glyphicon_icons_with_font_awesome_pr'…
Browse files Browse the repository at this point in the history
… into branches/rudder/8.1
  • Loading branch information
Jenkins CI committed Jan 17, 2024
2 parents 67292ff + cb1238a commit 171aec8
Show file tree
Hide file tree
Showing 39 changed files with 80 additions and 95 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ showCategory category allDeprecated =
, attribute "data-bs-placement" "bottom", attribute "data-title" category
, attribute "data-bs-content" "<div>All generic methods in this category are <b>deprecated</b>.</div>"
, attribute "data-bs-html" "true"
] [ i [ class "glyphicon glyphicon-info-sign deprecated-icon" ] []]
] [ i [ class "fa fa-info-circle deprecated-icon" ] []]
]
else []
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ draftsItem model draft =
span [ class "cursor-help popover-bs", attribute "data-bs-toggle" "popover", attribute "data-trigger" "hover"
, attribute "data-bs-container" "body", attribute "data-bs-placement" "right", attribute "data-title" draft.technique.name
, attribute "data-bs-content" "<div>This technique uses <b>deprecated</b> generic methods.</div>"
, attribute "data-bs-html" "true" ] [ i [ class "glyphicon glyphicon-info-sign deprecated-icon" ] [] ]
, attribute "data-bs-html" "true" ] [ i [ class "fa fa-info-circle deprecated-icon" ] [] ]
else
text ""
]
Expand Down Expand Up @@ -219,7 +219,7 @@ techniqueItem model technique =
span [ class "cursor-help popover-bs", attribute "data-bs-toggle" "popover", attribute "data-trigger" "hover"
, attribute "data-bs-container" "body", attribute "data-bs-placement" "right", attribute "data-title" technique.name
, attribute "data-bs-content" "<div>This technique uses <b>deprecated</b> generic methods.</div>"
, attribute "data-bs-html" "true" ] [ i [ class "glyphicon glyphicon-info-sign deprecated-icon" ] [] ]
, attribute "data-bs-html" "true" ] [ i [ class "fa fa-info-circle deprecated-icon" ] [] ]
else
text ""
, if hasUnknownMethod then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ techniqueTab model technique creation ui =
) errors)
_ -> if String.length technique.id.value > 100 then
span [ class "rudder-text-warning col-sm-8 col-sm-offset-3" ] [
b [] [ span [ class "glyphicon glyphicon-exclamation-sign" ] [] ]
b [] [ span [ class "fa fa-exclamation-triangle" ] [] ]
, text "Technique IDs longer than 100 characters may not work on some filesystems (Windows, in particular)."
]
else text ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ bar model =
, div [class "fm-bar-actions"]
[ div [class "btn-group"]
[ button [attribute "data-bs-toggle" "dropdown", id "dropDownMenuSearch", type_ "button", class "btn btn-flat btn-sm dropdown-toggle"]
[ i [class "glyphicon glyphicon-search mr2"][]
[ i [class "fa fa-search mr2"][]
]
, ul [class "dropdown-menu search-dropdown pull-right"]
[ li[]
Expand All @@ -80,16 +80,16 @@ bar model =
]
, ( if model.viewMode == GridView then
button [class "btn btn-flat btn-sm", onClick (ChangeViewMode ListView)]
[ i [class "glyphicon glyphicon-th-list"][]
[ i [class "fa fa-list"][]
]
else
button [class "btn btn-flat btn-sm", onClick (ChangeViewMode GridView)]
[ i [class "glyphicon glyphicon-th-large" ][]
[ i [class "fa fa-th-large" ][]
]
)
, div [class "btn-group"]
[ button [attribute "data-bs-toggle" "dropdown", id "more", type_ "button", class "btn btn-flat btn-sm dropdown-toggle"]
[ i [class "glyphicon glyphicon-option-vertical"][]
[ i [class "fa fa-ellipsis-v"][]
]
, mainContextMenu
]
Expand Down Expand Up @@ -346,13 +346,13 @@ mainContextMenu =
ul[class "dropdown-menu pull-right"]
[ li[]
[ a [ onClick (OpenNameDialog (NewDir "")) ]
[ i [class "glyphicon glyphicon-plus"][]
[ i [class "fa fa-plus"][]
, text "New folder"
]
]
, li[]
[ a [ onClick ChooseFiles ]
[ i [class "glyphicon glyphicon-cloud-upload"][]
[ i [class "fa fa-cloud-upload-alt"][]
, text "Upload files"
]
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ displayNodePropertyRow model =
]
, td [class "text-center edit-actions is-edited" ]
[ div []
[ span [ class "action-icon glyphicon glyphicon-share-alt cancel-icon", title "Cancel", onClick (ToggleEditProperty p.name eP False)][]
[ span [ class "action-icon fa fa-share-square cancel-icon", title "Cancel", onClick (ToggleEditProperty p.name eP False)][]
, span [ class "action-icon fa fa-check text-success", title "Save", onClick (ToggleEditProperty p.name eP True)][]
]
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ informationTab model details =
rightCol =
if isNewRule then
div [class "callout-fade callout-info"]
[ div [class "marker"][span [class "glyphicon glyphicon-info-sign"][]]
[ div [class "marker"][span [class "fa fa-info-circle"][]]
, div []
[ p[][text "You are creating a new rule. You may already want to apply directives and groups to it."]
, p[][text "To do so, please go to their corresponding tab, or use the shortcuts below:"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ displayTechniqueRow model =
[ text technique.version
, ( if technique.isDeprecated then
span
[ class "glyphicon glyphicon-info-sign text-danger deprecatedTechniqueIcon"
[ class "fa fa-info-circle text-danger deprecatedTechniqueIcon"
, attribute "data-bs-toggle" "tooltip"
, attribute "data-bs-placement" "top"
, attribute "data-bs-html" "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -452,9 +452,9 @@ function updatePasswordFormView(formId){
formContainer.find(".reveal-password").each(function(){
var data = $(this).attr("data-reveal");
var reveal = data === "current" ? passwordForm.current.show : passwordForm.newPassword.show
var iconClass = reveal ? "glyphicon glyphicon-eye-close" : "glyphicon glyphicon-eye-open"
var iconClass = reveal ? "fa fa-eye-slash" : "fa fa-eye"
var inputType = reveal ? "text" : "password";
$(this).find(".glyphicon").attr("class", iconClass);
$(this).find(".fa").attr("class", iconClass);
if(data === "current"){
formContainer.find("input.input-current-passwd").attr("type", inputType);
}else{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ function createTextAgentPolicyMode(isNode, currentPolicyMode, explanation){
var policyMode = currentPolicyMode.toLowerCase();
var nodeOrDirective = isNode ? "node" : "directive";
var labelType = "label-"+policyMode;
var span = "<span class='label-text " + labelType + " glyphicon glyphicon-question-sign' data-bs-toggle='tooltip' data-bs-placement='top' title=''></span>"
var span = "<span class='label-text " + labelType + " fa fa-question-circle' data-bs-toggle='tooltip' data-bs-placement='top' title=''></span>"
var badge = $(span).get(0);
var tooltip = policyModeTooltip(nodeOrDirective, policyMode, explanation);
badge.setAttribute("title", tooltip);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class AsyncDeployment extends CometActor with CometListener with Loggable {
<div class="panel-heading" role="tab" id="collapseListGroupHeading1">
<h4 class="panel-title">
Show technical details
<span id="showhidetechnicalerrors" class="glyphicon glyphicon-chevron-up up"></span>
<span id="showhidetechnicalerrors" class="fa fa-chevron-up up"></span>
</h4>
</div>
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ class AutoCompleteAutoSubmit {
{Script(onLoad)}
</head>
<label class="input-group-addon" for={id}>
<span class="glyphicon glyphicon-search"></span>
<span class="fa fa-search"></span>
</label>
{
attrs.foldLeft(<input type="text" id={id} value={start} />)(_ % _)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ class DirectiveEditForm(
if (isADirectiveCreation) {
<div class="callout-fade callout-info">
<div class="marker">
<span class="glyphicon glyphicon-info-sign"></span>
<span class="fa fa-info-circle"></span>
</div>
<div class="">
<p>You are creating a new Directive. You must set its parameters before saving.</p>
Expand Down Expand Up @@ -528,7 +528,7 @@ class DirectiveEditForm(
<div>
<b>Priority</b>
<span>
<span class="ruddericon glyphicon glyphicon-question-sign" data-bs-toggle="tooltip" title={tooltipContent}></span>
<span class="ruddericon fa fa-question-circle" data-bs-toggle="tooltip" title={tooltipContent}></span>
</span>
</div>
}
Expand Down Expand Up @@ -594,7 +594,7 @@ class DirectiveEditForm(
<label class="wbBaseFieldLabel">
<b>Policy mode</b>
<span>
<span class="ruddericon glyphicon glyphicon-question-sign" data-bs-toggle="tooltip" title={tooltipContent}></span>
<span class="ruddericon fa fa-question-circle" data-bs-toggle="tooltip" title={tooltipContent}></span>
</span>
</label>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class CreateOrUpdateGlobalParameterPopup(
<h4 class="col-lg-12 col-sm-12 col-xs-12 audit-title">Change Request</h4>
<hr class="css-fix"/>
<div class="text-center alert alert-info">
<span class="glyphicon glyphicon-info-sign"></span>
<span class="fa fa-info-circle"></span>
Workflows are enabled, your change has to be validated in a Change request
</div>
case false => NodeSeq.Empty
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class CreateOrCloneRulePopup(
if (clonedRule.isDefined) {
<hr class="css-fix"/>
<div class="alert alert-info text-center">
<span class="glyphicon glyphicon-info-sign"></span>
<span class="fa fa-info-circle"></span>
The new rule will be disabled.
</div>
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ class ModificationValidationPopup(
<h4 class="col-lg-12 col-sm-12 col-xs-12 audit-title">Change Request</h4>
<hr class="css-fix"/>
<div class="col-lg-12 col-sm-12 col-xs-12 alert alert-info text-center">
<span class="glyphicon glyphicon-info-sign"></span>
<span class="fa fa-info-circle"></span>
Workflows are enabled in Rudder, your change has to be validated in a Change request
{
if (directiveCreation)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class RuleModificationValidationPopup(
<h4 class="col-lg-12 col-sm-12 col-xs-12 audit-title">Change Request</h4>
<hr class="css-fix"/>
<div class="text-center alert alert-info">
<span class="glyphicon glyphicon-info-sign"></span>
<span class="fa fa-info-circle"></span>
Workflows are enabled, your change has to be validated in a Change request
</div>
case false => explanationMessages(changeRequest.action)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class DatabaseManagement extends DispatchSnippet with Loggable {

val dialog = {
<div class="callout-fade callout-info">
<div class="marker"><span class="glyphicon glyphicon-exclamation-sign"></span></div>
<div class="marker"><span class="fa fa-exclamation-triangle"></span></div>
Are you sure you want to
<b>{action.name}</b>
reports older than
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class EditPolicyServerAllowedNetwork extends DispatchSnippet with Loggable {
val id = "network_" + i

(
".deleteNetwork" #> SHtml.ajaxButton(<span class="glyphicon glyphicon-minus"></span>, () => delete(i)) &
".deleteNetwork" #> SHtml.ajaxButton(<span class="fa fa-minus"></span>, () => delete(i)) &
"#errorNetworkField" #> <div><span class={
"lift:Msg?errorClass=bs-text-danger;id=errornetwork_" + i
}>[error]</span></div> &
Expand All @@ -236,7 +236,7 @@ class EditPolicyServerAllowedNetwork extends DispatchSnippet with Loggable {
}
} &
"#addNetworkButton" #> SHtml.ajaxButton(
<span class="glyphicon glyphicon-plus"></span>,
<span class="fa fa-plus"></span>,
add _,
("id", s"addNetworkButton${policyServerId.value}")
) &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,15 @@ class PropertiesManagement extends DispatchSnippet with Loggable {
"#mandatoryTooltip *" #> {
initMandatory.map { b: Boolean =>
<span data-bs-toggle="tooltip" title="If this option is enabled, users will be forced to enter a change audit log. Empty messages will not be accepted.">
<span class="glyphicon glyphicon-info-sign info"></span>
<span class="fa fa-info-circle info"></span>
</span>
}.getOrElse(NodeSeq.Empty)
} &

"#explanationTooltip *" #> {
initExplanation.map { s: String =>
<span data-bs-toggle="tooltip" title="Content of the text displayed to prompt the user to enter a change audit log.">
<span class="glyphicon glyphicon-info-sign info"></span>
<span class="fa fa-info-circle info"></span>
</span>
}.getOrElse(NodeSeq.Empty)
} &
Expand Down Expand Up @@ -315,7 +315,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable {
initDenyBadClocks match {
case Full(_) =>
<span data-bs-toggle="tooltip" title="By default, copying configuration policy to nodes requires system clocks to be synchronized to within an hour. Disabling this will bypass this check, but may open a window for replay attacks.">
<span class="glyphicon glyphicon-info-sign info"></span>
<span class="fa fa-info-circle info"></span>
</span>

case _ => NodeSeq.Empty
Expand Down Expand Up @@ -437,7 +437,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable {
case Full(_) =>
<span data-bs-toggle="tooltip" title="If this is checked, when rsync synchronization method is used, folder /var/rudder/share will be synchronized using rsync.
If this is not checked, you'll have to synchronize yourself this folder">
<span><span class="glyphicon glyphicon-info-sign info"></span></span>
<span><span class="fa fa-info-circle info"></span></span>
</span>

case _ => NodeSeq.Empty
Expand All @@ -462,7 +462,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable {
case Full(_) =>
<span data-bs-toggle="tooltip" title="If this is checked, when rsync synchronization method is used, folder /var/rudder/configuration-repository/shared-files will be synchronized using rsync.
If this is not checked, you'll have to synchronize yourself this folder">
<span><span class="glyphicon glyphicon-info-sign info"></span></span>
<span><span class="fa fa-info-circle info"></span></span>
</span>
case _ => NodeSeq.Empty
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ class AcceptNode extends Loggable {
Text("Directive"),
{ e =>
SHtml.ajaxButton(
<span><i class="glyphicon glyphicon-search"></i></span>,
<span><i class="fa fa-search"></i></span>,
() => showExpectedPolicyPopup(e),
("class", "smallButton")
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ td.listclose:after {
#nodePropertiesTab .is-edited .action-icon{
top: 6px;
}
#nodePropertiesTab .action-icon.glyphicon{
#nodePropertiesTab .action-icon{
font-size: 17px;
padding-bottom: 2px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,15 +346,15 @@ pre.json-beautify code.elmsh {
min-height:6em;
}
/* ICON INFO */
.glyphicon.info{
.fa.info{
top: -2px;
margin-left: 10px;
font-size: 16px;
color: #7f8c9e;
cursor: help;
transition-duration:.2s;
}
.glyphicon.info:hover{
.fa.info:hover{
color:#738195;
}
.no-hpadding{
Expand Down Expand Up @@ -396,7 +396,7 @@ pre.json-beautify code.elmsh {
.navbar-nav > li > a {
padding: 15px;
}
.navbar-nav a .glyphicon,.navbar-nav a:hover .glyphicon,.navbar-nav a:focus .glyphicon {
.navbar-nav a .fa, .navbar-nav a:focus .fa {
color: #36474E;
}
.navbar-nav a .fa-sign-out{
Expand Down Expand Up @@ -428,7 +428,7 @@ pre.json-beautify code.elmsh {
.sidebar-collapse .sidebar-menu>li>.treeview-menu {
margin-top: -2px;
}
.sidebar-menu>li>a>span>span>.fa, .sidebar-menu>li>a>span>span>.glyphicon, .sidebar-menu>li>a>span>span>.ion {
.sidebar-menu>li>a>span>span>.fa, .sidebar-menu>li>a>span>span>.ion {
width: 20px;
}
.rudder_col>.portlet,.rudder_col>.content-wrapper >.ui-widget-content {
Expand Down Expand Up @@ -525,10 +525,6 @@ pre.json-beautify code.elmsh {
display: inline-block;
}
/* --- ACCEPT NEW NODES --- */
.tabInform .glyphicon{
margin: 0 6px 0 4px;
transform: scale(1.2);
}
.action-btns{
float: left;
width: 100%;
Expand Down Expand Up @@ -1139,7 +1135,7 @@ form .tooltip-content p {
line-height: 96px;
transform: rotate(45deg);
}
.callout-fade div.marker span.glyphicon,.callout-fade div.marker span.fa{
.callout-fade div.marker span.fa{
transform:rotate(-45deg);
transition-duration:.2s;
}
Expand Down Expand Up @@ -1572,7 +1568,7 @@ form.rudder-form .policymode-group .btn-group .btn.enforce.active{
.rudder-form .button-group-success{
margin-top: 15px;
}
.close-message.glyphicon {
.close-message {
color: rgba(0, 0, 0, .3);
top: 2px;
left: 2px;
Expand Down Expand Up @@ -2101,9 +2097,6 @@ ul > li.rudder-form.form-sm > .input-group label.form-control{
ul.list-sm > li.rudder-form > .input-group .input-group-addon{
padding: 0 11px;
}
ul > li.rudder-form > .input-group label.form-control .glyphicon.info{
top:3px;
}
ul > li.rudder-form:last-child > .input-group label.form-control{
border-bottom-right-radius:4px;
}
Expand Down Expand Up @@ -2284,7 +2277,7 @@ h3.box-title {
margin-top:6px;
margin-bottom:6px;
}
.box-header>.fa, .box-header>.glyphicon, .box-header>.ion, .box-header .box-title{
.box-header>.fa, .box-header>.ion, .box-header .box-title{
color:#041922;
}
.box .box-title .fa{
Expand Down Expand Up @@ -2361,7 +2354,7 @@ h3.box-title {
padding: 5px 10px !important;
background-color: #fff !important;
}
.box-tools > .btn > .fa,.box-tools > .btn > .glyphicon,.box-tools > .btn > .ion{
.box-tools > .btn > .fa,.box-tools > .btn > .ion{
margin-left: 6px;
}
.btn.new-icon:after{
Expand Down
Loading

0 comments on commit 171aec8

Please sign in to comment.