From d709d119ac2b01bf9238f03d56f440989b60986e Mon Sep 17 00:00:00 2001
From: tyler <tyler@debian>
Date: Sun, 4 Sep 2016 23:57:12 -0400
Subject: [PATCH] change button for Alphabetic sort to have different "icon".

also ABC and ZYX sorting were switched.
---
 src/main/app/templates/_toolbar.html                 | 12 ++++++------
 .../commafeed/backend/dao/FeedEntryStatusDAO.java    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/app/templates/_toolbar.html b/src/main/app/templates/_toolbar.html
index 5cf5246d..e316c269 100644
--- a/src/main/app/templates/_toolbar.html
+++ b/src/main/app/templates/_toolbar.html
@@ -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">
diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
index 78660686..528aae58 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
@@ -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();
 		}