From 315d5705ccb37ab71b418357587b2a14b9f7c3b4 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Thu, 11 Jul 2013 09:38:34 +0430
Subject: [PATCH] Using unicode-bidi instead of lrm

* It is less hackish than lrm but please refactor bidi-embed if needed
* lrm was making an extra space for all, so this is fixup for it
---
 src/main/webapp/sass/generic/_misc.scss   | 4 ++++
 src/main/webapp/templates/_category.html  | 8 +++-----
 src/main/webapp/templates/feeds.view.html | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/sass/generic/_misc.scss b/src/main/webapp/sass/generic/_misc.scss
index bd5530d3..8d15d9a3 100644
--- a/src/main/webapp/sass/generic/_misc.scss
+++ b/src/main/webapp/sass/generic/_misc.scss
@@ -6,6 +6,10 @@
 	display: block;
 }
 
+.bidi-embed {
+	unicode-bidi: embed;
+}
+
 .bs-fb ul {
 	margin-bottom: 0px;
 }
diff --git a/src/main/webapp/templates/_category.html b/src/main/webapp/templates/_category.html
index 5806b1d3..c7901af0 100644
--- a/src/main/webapp/templates/_category.html
+++ b/src/main/webapp/templates/_category.html
@@ -11,10 +11,9 @@
 				<i ng-class="{'icon-star' : node.id == 'starred', 'icon-inbox': node.id == 'all'}" ng-show="!showChildren"></i>
 			</span>
 			<span ng-class="{selected: (node.id == selectedId && selectedType == 'category')}">
-				<span ng-class="{unread: unreadCount({category:node})}">
+				<span ng-class="{unread: unreadCount({category:node})}" class="bidi-embed">
 					{{categoryLabel(node)}}
 				</span>
-				&lrm;
 				<span class="unread-counter">
 					{{categoryCountLabel(node)}}
 				</span>
@@ -38,10 +37,9 @@
 				href="{{feed.feedLink}}" target="_blank"
 				ng-class="{error: feed.message && feed.errorCount > 10, selected: (feed.id == selectedId && selectedType == 'feed') }">
 				<favicon url="feed.iconUrl" />
-				<span ng-class="{unread: feed.unread}">
+				<span ng-class="{unread: feed.unread}" class="bidi-embed">
 					{{feed.name}}
-				</span> 
-				&lrm;
+				</span>
 				<span class="unread-counter">
 					{{feedCountLabel(feed)}}
 				</span>
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index 39791a3c..ffdceef1 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -46,7 +46,7 @@
 						<div class="entry-subtitle">
 							<span class="entry-source" ui-if="selectedType == 'category'">
 								<span class="entry-source-prefix">${view.entry_source}</span>
-								<a ng-click="goToFeed(entry.feedId)" class="pointer"><span>{{entry.feedName}}</span></a>
+								<a ng-click="goToFeed(entry.feedId)" class="pointer bidi-embed"><span>{{entry.feedName}}</span></a>
 							</span>
 							<span class="entry-author" ui-if="entry.author">
 								<span class="entry-author-prefix">${view.entry_author}</span>