garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

change button for Alphabetic sort to have different "icon".

Browse Source 
also ABC and ZYX sorting were switched.
This commit is contained in:
tyler
2016-09-04 23:57:12 -04:00
parent 8d2b6bdc12
commit d709d119ac
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/app/templates/_toolbar.html
View File

@@ -67,14 +67,14 @@
</div>
<div class="btn-group" id="toolbar-read-order">
<a type="button" class="btn btn-default" ng-click="toggleOrder()" title="{{ 'toolbar.sort_by_asc_desc' | translate }}">
<a type="button" class="btn btn-default" ng-click="toggleOrder()" title="{{ 'toolbar.sort_by_asc_desc' | translate }}"
ng-class="{'active' : settingsService.settings.readingOrder == 'asc' || settingsService.settings.readingOrder == 'desc'}">
<i
ng-class="{'icon-arrow-up' : settingsService.settings.readingOrder == 'asc', 'icon-arrow-down': settingsService.settings.readingOrder != 'asc', 'active' : settingsService.settings.readingOrder == 'asc' || settingsService.settings.readingOrder == 'desc'}"></i>
</a>
<a type="button" class="btn btn-default" ng-click="toggleAbcOrder()" title="{{ 'toolbar.sort_by_abc_zyx' | translate }}">
<i
ng-class="{'icon-arrow-up' : settingsService.settings.readingOrder == 'abc', 'icon-arrow-down': settingsService.settings.readingOrder != 'abc', 'active' : settingsService.settings.readingOrder == 'abc' || settingsService.settings.readingOrder == 'zyx'}"></i>
ng-class="{'icon-arrow-up' : settingsService.settings.readingOrder == 'asc', 'icon-arrow-down': settingsService.settings.readingOrder != 'asc'}"></i>
</a>
<button type="button" class="btn btn-default" ng-click="toggleAbcOrder()" title="{{ 'toolbar.sort_by_abc_zyx' | translate }}"
ng-class="{'active' : settingsService.settings.readingOrder == 'abc' || settingsService.settings.readingOrder == 'zyx'}">{{ ((settingsService.settings.readingOrder == 'abc' || settingsService.settings.readingOrder == 'zyx') ? settingsService.settings.readingOrder.toUpperCase() : "ABC") }}
</button>
</div>
<div class="btn-group" id="toolbar-read-view-settings">

2
src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
View File

@@ -72,7 +72,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
@Override
public int compare(FeedEntryStatus o1, FeedEntryStatus o2) {
CompareToBuilder builder = new CompareToBuilder();
builder.append(o2.getEntry().getContent().getTitle(), o1.getEntry().getContent().getTitle());
builder.append(o1.getEntry().getContent().getTitle(), o2.getEntry().getContent().getTitle());
builder.append(o2.getId(), o1.getId());
return builder.toComparison();
}