Skip to content

Commit

Permalink
Replace FA4 icons with their FA5 equivalents
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrjohnson
jrjohnson committed Feb 22, 2018
1 parent cf4410a commit 801187a
Show file tree
Hide file tree
Showing 59 changed files with 96 additions and 94 deletions.
4 changes: 2 additions & 2 deletions app/components/publication-status.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ export default Component.extend({
const isPublished = this.get('isPublished');
const isScheduled = this.get('isScheduled');
if (isScheduled) {
return 'clock-o';
return 'clock';
}
if (isPublished) {
return 'star';
}

return 'star-half-full';
return 'star-half';
}),
publicationStatus: computed('isPublished', 'isScheduled', function(){
const isPublished = this.get('isPublished');
Expand Down
4 changes: 2 additions & 2 deletions app/components/sortable-th.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ export default Component.extend({

if(sortedBy){
if(sortedAscending){
return sortType === 'numeric'?'sort-numeric-asc':'sort-alpha-asc';
return sortType === 'numeric'?'sort-numeric-up':'sort-alpha-up';
} else {
return sortType === 'numeric'?'sort-numeric-desc':'sort-alpha-desc';
return sortType === 'numeric'?'sort-numeric-down':'sort-alpha-down';
}
} else {
return 'sort';
Expand Down
2 changes: 1 addition & 1 deletion app/mixins/publishable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default Mixin.create({
}),
menuIcon: computed('publishTarget.isPublished', 'publishTarget.publishedAsTbd', function(){
if(this.get('publishTarget.publishedAsTbd')){
return 'clock-o';
return 'clock';
}
if(this.get('publishTarget.isPublished')){
return 'star';
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/course-director-manager.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ul class='removable-list tag-list'>
{{#each (sort-by 'lastName' directors) as |user|}}
<li {{action 'removeDirector' user}}>
{{user.fullName}} {{fa-icon 'remove'}}
{{user.fullName}} {{fa-icon 'times'}}
</li>
{{/each}}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/course-sessions.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{{#if saveSession.lastSuccessful.value}}
<div class='save-result'>
{{#link-to 'session.index' course saveSession.lastSuccessful.value}}
{{fa-icon 'external-link-square'}} {{get saveSession.lastSuccessful.value 'title'}}
{{fa-icon 'external-link-square-alt'}} {{get saveSession.lastSuccessful.value 'title'}}
{{/link-to}}
{{t 'general.savedSuccessfully'}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/curriculum-inventory-report-header.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class='title'>
{{#if isFinalized}}
<h2>{{fa-icon "lock"}} {{report.name}}</h2>
<h2>{{fa-icon 'lock'}} {{report.name}}</h2>
{{else}}
{{#editable-field
tagName='h2'
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/curriculum-inventory-sequence-block-header.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class='title'>
{{#if isFinalized}}
<h2>{{fa-icon "lock"}} {{sequenceBlock.title}}</h2>
<h2>{{fa-icon 'lock'}} {{sequenceBlock.title}}</h2>
{{else}}
{{#editable-field
tagName='h2'
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/curriculum-inventory-sequence-block-list.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{{#if saved}}
<div class='saved-result'>
{{#link-to 'curriculumInventorySequenceBlock' savedBlock}}
{{fa-icon 'external-link-square'}} {{savedBlock.title}}
{{fa-icon 'external-link-square-alt'}} {{savedBlock.title}}
{{/link-to}}
{{t 'general.savedSuccessfully'}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/dashboard-mycourses.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{{#each (await listOfCourses) as |course|}}
{{#if (await canEditCourses)}}
<tr class='clickable'>
<td>{{#link-to 'course' course}}{{fa-icon 'external-link-square'}} {{course.academicYear}}{{/link-to}}</td>
<td>{{#link-to 'course' course}}{{fa-icon 'external-link-square-alt'}} {{course.academicYear}}{{/link-to}}</td>
<td>
{{#link-to 'course' course}}
{{course.title}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/detail-cohort-manager.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<li {{action 'remove' cohort}}>
{{cohort.programYear.program.school.title}} |
{{cohort.programYear.program.title}} |
{{cohort.title}} | {{fa-icon 'remove'}}
{{cohort.title}} | {{fa-icon 'times'}}
</li>
{{/each}}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/detail-learnergroups-list.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</div>
</div>
{{#if isManaging}}
<div class='action'>{{fa-icon 'remove'}}</div>
<div class='action'>{{fa-icon 'times'}}</div>
{{/if}}
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/detail-terms-list-item.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
<span class="inactive">({{t 'general.inactive'}})</span>
{{/if}}
{{#if canEdit}}
{{fa-icon 'remove'}}
{{fa-icon 'times'}}
{{/if}}
2 changes: 1 addition & 1 deletion app/templates/components/error-display.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="error-main">
{{#if isOffline}}
<h2>{{t 'general.connectionLost'}}</h2>
<p class='clear-errors'><button {{action 'refresh'}}>{{fa-icon 'refresh'}} {{t 'general.reconnectNow'}}</button></p>
<p class='clear-errors'><button {{action 'refresh'}}>{{fa-icon 'sync-alt'}} {{t 'general.reconnectNow'}}</button></p>
{{else if is404}}
{{not-found}}
{{else}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/ilios-navigation.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<li id='slidingnavmenu-dashboard'>{{#link-to 'dashboard'}}{{fa-icon 'home'}} {{t 'general.dashboard'}}{{/link-to}}</li>
{{#if (get (await permissions) 'isFaculty')}}
<li id='slidingnavmenu-courses'>{{#link-to 'courses'}}{{fa-icon 'book'}} {{t 'general.coursesAndSessions'}}{{/link-to}}</li>
<li id='slidingnavmenu-learnergroups'>{{#link-to 'learnerGroups'}}{{fa-icon 'mortar-board'}} {{t 'general.learnerGroups'}}{{/link-to}}</li>
<li id='slidingnavmenu-learnergroups'>{{#link-to 'learnerGroups'}}{{fa-icon 'graduation-cap'}} {{t 'general.learnerGroups'}}{{/link-to}}</li>
<li id='slidingnavmenu-instructorgroups'>{{#link-to 'instructorGroups'}}{{fa-icon 'user-md'}} {{t 'general.instructorGroups'}}{{/link-to}}</li>
<li id='slidingnavmenu-schools'>{{#link-to 'schools'}}{{fa-icon 'university'}} {{t 'general.schools'}}{{/link-to}}</li>
<li id='slidingnavmenu-programs'>{{#link-to 'programs'}}{{fa-icon 'list-alt'}} {{t 'general.programs'}}{{/link-to}}</li>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/instructor-selection-manager.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ul class='removable-list tag-list'>
{{#each (sort-by 'title' (await instructorGroups)) as |instructorGroup|}}
<li {{action 'removeInstructorGroup' instructorGroup}}>
{{fa-icon 'group'}} {{instructorGroup.title}} {{fa-icon 'times'}}
{{fa-icon 'users'}} {{instructorGroup.title}} {{fa-icon 'times'}}
</li>
{{/each}}
</ul>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/instructorgroup-details.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<span>
<ul class='removable-list tag-list'>
{{#each (sort-by 'lastName' 'firstName' (await instructorGroup.users)) as |user|}}
<li {{action 'removeUser' user}}>{{user.fullName}}{{fa-icon 'remove' class='removex'}}</li>
<li {{action 'removeUser' user}}>{{user.fullName}}{{fa-icon 'times' class='removex'}}</li>
{{/each}}
</ul>
</span>
Expand All @@ -29,7 +29,7 @@
{{#if (is-fulfilled instructorGroup.courses)}}
<ul>
{{#each (sort-by 'title' (await instructorGroup.courses)) as |course|}}
<li>{{#link-to 'course' course}}{{fa-icon 'external-link-square'}} {{course.title}}{{/link-to}}</li>
<li>{{#link-to 'course' course}}{{fa-icon 'external-link-square-alt'}} {{course.title}}{{/link-to}}</li>
{{else}}
{{t 'general.none'}}
{{/each}}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/leadership-manager.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<td class='text-top'>
<ul>
{{#each (sort-by 'lastName' 'firstName' directors) as |user|}}
<li>{{fa-icon 'remove' class='clickable remove' click=(action removeDirector user)}} {{user.fullName}}</li>
<li>{{fa-icon 'times' class='clickable remove' click=(action removeDirector user)}} {{user.fullName}}</li>
{{else}}
{{t 'general.none'}}
{{/each}}
Expand All @@ -19,7 +19,7 @@
<td class='text-top'>
<ul>
{{#each (sort-by 'lastName' 'firstName' administrators) as |user|}}
<li>{{fa-icon 'remove' class='clickable remove' click=(action removeAdministrator user)}} {{user.fullName}}</li>
<li>{{fa-icon 'times' class='clickable remove' click=(action removeAdministrator user)}} {{user.fullName}}</li>
{{else}}
{{t 'general.none'}}
{{/each}}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/learnergroup-instructor-manager.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<ul class='removable-list tag-list'>
{{#each (sort-by 'lastName' instructors) as |user|}}
<li {{action 'removeInstructor' user}}>
{{user.fullName}} | {{fa-icon 'remove'}}
{{user.fullName}} | {{fa-icon 'times'}}
</li>
{{/each}}
{{#each (sort-by 'title' instructorGroups) as |instructorGroup|}}
<li {{action 'removeInstructorGroup' instructorGroup}}>
{{instructorGroup.title}} | {{fa-icon 'remove'}}
{{instructorGroup.title}} | {{fa-icon 'times'}}
</li>
{{/each}}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/learnergroup-subgroup-list.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{{#if saved}}
<div class='saved-result'>
{{#link-to 'learnerGroup' savedGroup}}
{{fa-icon 'external-link-square'}} {{savedGroup.title}}
{{fa-icon 'external-link-square-alt'}} {{savedGroup.title}}
{{/link-to}}
{{t 'general.savedSuccessfully'}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/learning-material-table-status.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{value}}
{{#if (or row.startDate row.endDate)}}
{{fa-icon 'clock-o' title=(t 'general.timedRelease')}}
{{fa-icon 'clock' title=(t 'general.timedRelease')}}
{{/if}}
4 changes: 2 additions & 2 deletions app/templates/components/learning-materials-sort-manager.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
isSortable=true
sortingScope="sortingGroup"
}}
{{fa-icon 'arrows'}}
{{fa-icon 'arrows-alt'}}
<span class="draggable-object-content">
<span class="title">
{{lm-type-icon type=(get (await item.learningMaterial) 'type') mimetype=(get (await item.learningMaterial) 'mimetype')}}
Expand All @@ -32,4 +32,4 @@
{{/each}}
{{/sortable-objects}}
</div>
{{/unless}}
{{/unless}}
2 changes: 1 addition & 1 deletion app/templates/components/mesh-manager.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

</span>
</div>
{{fa-icon 'remove'}}
{{fa-icon 'times'}}
</li>
{{/each}}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/my-materials.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<td colspan="3">{{lmObject.courseTitle}}</td>
<td colspan="3">
{{#if lmObject.isBlanked}}
<span class="lm-type-icon">{{fa-icon 'clock-o' title=(t 'general.timedRelease')}}</span>
<span class="lm-type-icon">{{fa-icon 'clock' title=(t 'general.timedRelease')}}</span>
{{lmObject.title}}
<span class="timed-release-info">
({{timed-release-schedule startDate=lmObject.startDate endDate=lmObject.endDate}})
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/myreports-list-item.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{{#unless loadTitle.isRunning}}
{{#if reporttitle}}
<span {{action 'selectReport' report}} class='link clickable'>
{{fa-icon 'external-link-square'}}
{{fa-icon 'external-link-square-alt'}}
{{reporttitle}}
</span>
{{else}}
<span>{{t 'general.thisReportIsNoLongerAvailable'}}</span>
{{/if}}
{{/unless}}
{{/unless}}
2 changes: 1 addition & 1 deletion app/templates/components/new-directory-user.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<tr>
<td class='text-right' colspan=1>
{{#if user.user}}
{{fa-icon 'sun-o' class='warning clickable' click=(action attrs.transitionToUser user.user) title=(t 'general.goToUser')}}
{{fa-icon 'sun' class='warning clickable' click=(action attrs.transitionToUser user.user) title=(t 'general.goToUser')}}
{{else}}
{{#if user.addable}}
{{fa-icon 'plus' class='yes clickable' click=(action 'pickUser' user) title=(t 'general.addNew')}}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/new-myreport.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
{{#if (is-equal currentPrepositionalObject 'instructor')}}
{{#if selectedUser}}
<ul class='removable-list tag-list'>
<li {{action 'changePrepositionalObjectId' null}}>{{selectedUser.fullName}} {{fa-icon 'remove'}}</li>
<li {{action 'changePrepositionalObjectId' null}}>{{selectedUser.fullName}} {{fa-icon 'times'}}</li>
</ul>
{{else}}
{{user-search
Expand All @@ -88,7 +88,7 @@
{{/if}}
</span>
</div>
{{fa-icon 'remove'}}
{{fa-icon 'times'}}
</li>
</ul>
{{else}}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/objective-sort-manager.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
isSortable=true
sortingScope="sortingGroup"
}}
{{fa-icon 'arrows'}}
{{fa-icon 'arrows-alt'}}
<span class="draggable-object-content">
<span>{{big-text text=item.title}}</span>
</span>
{{/draggable-object}}
{{/each}}
{{/sortable-objects}}
</div>
{{/unless}}
{{/unless}}
2 changes: 1 addition & 1 deletion app/templates/components/offering-manager.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{{/if}}
</li>
{{else}}
<li>{{fa-icon 'group'}}</li>
<li>{{fa-icon 'users'}}</li>
{{/each}}
</ul>
</span>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/pending-updates-summary.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h2>
{{#if (gt (get (await updates) 'length') 1)}}
{{fa-icon 'warning' class='no'}}
{{fa-icon 'exclamation-triangle' class='no'}}
{{/if}}
{{t 'general.pendingUpdatesSummaryTitle'}}
</h2>
Expand Down
12 changes: 6 additions & 6 deletions app/templates/components/programyear-list.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{{#if saved}}
<div class='saved-result'>
{{#link-to 'programYear.index' program savedProgramYear}}
{{fa-icon 'external-link-square'}} {{savedProgramYear.academicYear}}
{{fa-icon 'external-link-square-alt'}} {{savedProgramYear.academicYear}}
{{/link-to}}
{{t 'general.savedSuccessfully'}}
</div>
Expand All @@ -39,7 +39,7 @@
<tr class="{{if programYearProxy.showRemoveConfirmation 'confirm-removal'}}">
<td class='text-left'>
{{#link-to 'programYear.index' program programYearProxy.content}}
{{fa-icon 'external-link-square'}} {{programYearProxy.academicYear}}
{{fa-icon 'external-link-square-alt'}} {{programYearProxy.academicYear}}
{{/link-to}}
</td>
<td class='text-left'>
Expand All @@ -54,28 +54,28 @@
{{#if programYearProxy.competencies.length}}
{{programYearProxy.competencies.length}}
{{else}}
{{fa-icon 'warning' class='warning'}}
{{fa-icon 'exclamation-triangle' class='warning'}}
{{/if}}
</td>
<td class='text-left'>
{{#if programYearProxy.objectives.length}}
{{programYearProxy.objectives.length}}
{{else}}
{{fa-icon 'warning' class='warning'}}
{{fa-icon 'exclamation-triangle' class='warning'}}
{{/if}}
</td>
<td class='text-left'>
{{#if programYearProxy.directors.length}}
{{programYearProxy.directors.length}}
{{else}}
{{fa-icon 'warning' class='warning'}}
{{fa-icon 'exclamation-triangle' class='warning'}}
{{/if}}
</td>
<td class='text-left'>
{{#if programYearProxy.terms.length}}
{{programYearProxy.terms.length}}
{{else}}
{{fa-icon 'warning' class='warning'}}
{{fa-icon 'exclamation-triangle' class='warning'}}
{{/if}}
</td>

Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/programyear-overview.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{#if editable}}
<ul class='removable-list tag-list'>
{{#each sortedDirectors as |user|}}
<li {{action 'removeDirector' user}}>{{user.fullName}}{{fa-icon 'remove' class='removex'}}</li>
<li {{action 'removeDirector' user}}>{{user.fullName}}{{fa-icon 'times' class='removex'}}</li>
{{/each}}
</ul>
{{else}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/school-list.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
{{#each newSchools as |school|}}
<div class='savedschool'>
{{#link-to 'school' school}}
{{fa-icon 'external-link-square'}} {{school.title}}
{{fa-icon 'external-link-square-alt'}} {{school.title}}
{{/link-to}}
{{t 'general.savedSuccessfully'}}
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/school-vocabularies-list.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{{#if newVocabulary}}
<div class='savedvocabulary saved-result'>
<span class='clickable link' {{action manageVocabulary newVocabulary.id}}>
{{fa-icon 'external-link-square'}} {{newVocabulary.title}}
{{fa-icon 'external-link-square-alt'}} {{newVocabulary.title}}
</span>
{{t 'general.savedSuccessfully'}}
</div>
Expand Down Expand Up @@ -91,4 +91,4 @@
{{fa-icon 'spinner' spin=true}}
{{/if}}
</div>
</section>
</section>
Loading

0 comments on commit 801187a

Please sign in to comment.