Skip to content

Commit

Permalink
BUGFIX: Add correct fontawesome classes for Neos 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Bastian Heist committed Aug 13, 2018
1 parent 9e61fcf commit cd042a0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Resources/Private/Partials/ContentResultTable.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="neos-pull-right">
<button class="neos-button neos-button-danger" title="Remove this result" data-toggle="modal"
href="#remove-{index}" data-neos-toggle="tooltip">
<i class="icon-trash icon-white"></i>
<i class="icon-trash icon-white fas fa-trash-alt"></i>
</button>
<div class="neos-hide" id="remove-{index}">
<div class="neos-modal-centered">
Expand Down
6 changes: 3 additions & 3 deletions Resources/Private/Partials/ContentTable.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,19 @@
action="display"
arguments="{content:content}"
additionalAttributes="{data-neos-toggle: 'tooltip', class: 'neos-button neos-button-primary'}">
<i class="icon-info-sign icon-white"></i>
<i class="icon-info-sign icon-white fas fa-info-circle"></i>
</neos:link.module>
<neos:link.module
title="Edit Content"
path="h5p/content"
action="edit"
arguments="{content:content}"
additionalAttributes="{data-neos-toggle: 'tooltip', class: 'neos-button neos-button-primary'}">
<i class="icon-pencil icon-white"></i>
<i class="icon-pencil icon-white fas fa-pencil-alt"></i>
</neos:link.module>
<button class="neos-button neos-button-danger" title="Remove this content"
data-toggle="modal" href="#remove-{index}" data-neos-toggle="tooltip">
<i class="icon-trash icon-white"></i>
<i class="icon-trash icon-white fas fa-trash-alt"></i>
</button>
<div class="neos-hide" id="remove-{index}">
<div class="neos-modal-centered">
Expand Down
4 changes: 2 additions & 2 deletions Resources/Private/Templates/Backend/ContentResults/Index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
action="display"
arguments="{account:groupedContentResult.0.account}"
additionalAttributes="{data-neos-toggle: 'tooltip', class: 'neos-button neos-button-primary'}">
<i class="icon-info-sign icon-white"></i>
<i class="icon-info-sign icon-white fas fa-info-circle"></i>
</neos:link.module>
<button class="neos-button neos-button-danger" title="Remove all results for this user"
data-toggle="modal" href="#remove-{index}" data-neos-toggle="tooltip">
<i class="icon-trash icon-white"></i>
<i class="icon-trash icon-white fas fa-trash-alt"></i>
</button>
<div class="neos-hide" id="remove-{index}">
<div class="neos-modal-centered">
Expand Down
8 changes: 4 additions & 4 deletions Resources/Private/Templates/Backend/Library/Index.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
action="upgrade"
arguments="{library:library}"
additionalAttributes="{data-neos-toggle: 'tooltip', class: 'neos-button neos-button-primary'}">
<i class="icon-arrow-up icon-white"></i>
<i class="icon-arrow-up icon-white fas fa-arrow-up"></i>
</neos:link.module>
</f:if>
<neos:link.module
Expand All @@ -59,21 +59,21 @@
action="display"
arguments="{library:library}"
additionalAttributes="{data-neos-toggle: 'tooltip', class: 'neos-button neos-button-primary'}">
<i class="icon-info-sign icon-white"></i>
<i class="icon-info-sign icon-white fas fa-info-circle"></i>
</neos:link.module>

<f:if condition="{library.contents -> f:count()} > 0 || {library.contentDependencies -> f:count()} > 0 || {library.dependentLibraries -> f:count()} > 0">
<f:then>
<button class="neos-button neos-button-danger neos-disabled"
title="Contents or other libraries are using this library"
href="#">
<i class="icon-trash icon-white"></i>
<i class="icon-trash icon-white fas fa-trash-alt"></i>
</button>
</f:then>
<f:else>
<button class="neos-button neos-button-danger" title="Remove this content"
data-toggle="modal" href="#remove-{index}" data-neos-toggle="tooltip">
<i class="icon-trash icon-white"></i>
<i class="icon-trash icon-white fas fa-trash-alt"></i>
</button>
</f:else>
</f:if>
Expand Down

0 comments on commit cd042a0

Please sign in to comment.