From 08bc5fa9271e710c7094bb19e2d9c7aa81aa8e2a Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 27 Feb 2011 03:06:09 -0500
Subject: added span element around anchor text in the secondary navigation
 tabs

---
 askbot/skins/default/media/js/live_search.js       |  2 +-
 .../skins/default/templates/main_page/tab_bar.html | 10 ++++-----
 askbot/skins/default/templates/question.html       | 11 ++++++----
 askbot/skins/default/templates/tags.html           |  4 ++--
 .../default/templates/user_profile/user_tabs.html  | 24 ++++++++++++++--------
 askbot/skins/default/templates/users.html          |  8 ++++----
 6 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/askbot/skins/default/media/js/live_search.js b/askbot/skins/default/media/js/live_search.js
index 23f81acd..19c5f8a4 100644
--- a/askbot/skins/default/media/js/live_search.js
+++ b/askbot/skins/default/media/js/live_search.js
@@ -326,7 +326,7 @@ $(document).ready(function(){
         relevance_tab = $('<a></a>');
         relevance_tab.attr('href', '?sort=relevance-desc');
         relevance_tab.attr('id', 'by_relevance');
-        relevance_tab.html(sortButtonData['relevance']['label']);
+        relevance_tab.html('<span>' + sortButtonData['relevance']['label'] + '</span>');
         return relevance_tab;
     }
 
diff --git a/askbot/skins/default/templates/main_page/tab_bar.html b/askbot/skins/default/templates/main_page/tab_bar.html
index 2921da88..9189db13 100644
--- a/askbot/skins/default/templates/main_page/tab_bar.html
+++ b/askbot/skins/default/templates/main_page/tab_bar.html
@@ -7,18 +7,18 @@
             class="{% if scope == 'all' %}on{% else %}off{% endif %}"
             href="?scope=all" 
             title="{% trans %}see all questions{% endtrans %}"
-        >{% trans %}all{% endtrans %}</a>
+        ><span>{% trans %}all{% endtrans %}</span></a>
         <a id="unanswered" 
             class="{% if scope == 'unanswered' %}on{% else %}off{% endif %}"
             href="?scope=unanswered&amp;sort=answers-asc" 
             title="{% trans %}see unanswered questions{% endtrans %}"
-        >{% trans %}unanswered{% endtrans %}</a>
+        ><span>{% trans %}unanswered{% endtrans %}</span></a>
         {% if request.user.is_authenticated() %} 
         <a id="favorite" 
             class="{% if scope == 'favorite' %}on{% else %}off{% endif %}"
             href="?scope=favorite" 
             title="{% trans %}see your favorite questions{% endtrans %}"
-        >{% trans %}favorite{% endtrans %}</a>
+        ><span>{% trans %}favorite{% endtrans %}</span></a>
         {% endif %}
     </div>
     <div id="sort_tabs" class="tabsA">
@@ -32,11 +32,11 @@
                 {% if sort == "relevance-desc" %}
                     href="?sort=relevance-desc"
                     class="on"
-                    title="{{asc_relevance_tooltip}}">{{relevance_label}} &#9660;
+                    title="{{asc_relevance_tooltip}}"><span>{{relevance_label}} &#9660;</span>
                 {% else %}
                     href="?sort=relevance-desc"
                     class="off"
-                    title="{{desc_relevance_tooltip}}">{{relevance_label}}
+                    title="{{desc_relevance_tooltip}}"><span>{{relevance_label}}</span>
                 {% endif %}
             </a>
             {% endif %}
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index 0c48d1f4..c1d338c6 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -169,12 +169,15 @@
             {% endtrans %}
             </h2>
             <div class="tabsA">
-                 <a id="oldest" href="{{ question.get_absolute_url() }}?sort=oldest#sort-top" 
-                    title="{% trans %}oldest answers will be shown first{% endtrans %}">{% trans %}oldest answers{% endtrans %}</a>
+                <a id="oldest" href="{{ question.get_absolute_url() }}?sort=oldest#sort-top" 
+                    title="{% trans %}oldest answers will be shown first{% endtrans %}"
+                ><span>{% trans %}oldest answers{% endtrans %}</span></a>
                 <a id="latest" href="{{ question.get_absolute_url() }}?sort=latest#sort-top" 
-                    title="{% trans %}newest answers will be shown first{% endtrans %}">{% trans %}newest answers{% endtrans %}</a>
+                    title="{% trans %}newest answers will be shown first{% endtrans %}"
+                ><span>{% trans %}newest answers{% endtrans %}</span></a>
                 <a id="votes" href="{{ question.get_absolute_url() }}?sort=votes#sort-top" 
-                    title="{% trans %}most voted answers will be shown first{% endtrans %}">{% trans %}popular answers{% endtrans %}</a>   
+                    title="{% trans %}most voted answers will be shown first{% endtrans %}"
+                ><span>{% trans %}popular answers{% endtrans %}</span></a>   
             </div>
         </div>
         {{ macros.paginator(paginator_context) }}
diff --git a/askbot/skins/default/templates/tags.html b/askbot/skins/default/templates/tags.html
index 7db9a8c8..619c35bf 100644
--- a/askbot/skins/default/templates/tags.html
+++ b/askbot/skins/default/templates/tags.html
@@ -12,13 +12,13 @@
             href="{% url tags %}?sort=name"
             {% if tab_id == 'name' %}class="on"{% endif %}
             title="{% trans %}sorted alphabetically{% endtrans %}"
-        >{% trans %}by name{% endtrans %}</a>
+        ><span>{% trans %}by name{% endtrans %}</span></a>
         <a
             id="sort_used"
             href="{% url tags %}?sort=used"
             {% if tab_id == 'used' %}class="on"{% endif %}
             title="{% trans %}sorted by frequency of tag use{% endtrans %}"
-        >{% trans %}by popularity{% endtrans %}</a>
+        ><span>{% trans %}by popularity{% endtrans %}</span></a>
     </div>
 </div>
 <p>
diff --git a/askbot/skins/default/templates/user_profile/user_tabs.html b/askbot/skins/default/templates/user_profile/user_tabs.html
index bf63ae77..276590c9 100644
--- a/askbot/skins/default/templates/user_profile/user_tabs.html
+++ b/askbot/skins/default/templates/user_profile/user_tabs.html
@@ -3,35 +3,43 @@
     <div class="tabsC">
         <a id="stats" {% if tab_name=="stats" %}class="on"{% endif %} 
             title="{% trans %}User profile{% endtrans %}" 
-            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=stats">{% trans %}overview{% endtrans %}</a>
+            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=stats"
+        ><span>{% trans %}overview{% endtrans %}</span></a>
         {% if request.user == view_user or request.user|can_moderate_user(view_user) %}
         <a id="inbox" {% if tab_name=="inbox" %}class="on"{% endif %} 
             title="{% trans %}comments and answers to others questions{% endtrans %}" 
-            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=inbox">{% trans %}inbox{% endtrans %}</a>
+            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=inbox"
+        ><span>{% trans %}inbox{% endtrans %}</span></a>
         {% endif %}
         <a id="reputation" {% if tab_name=="reputation" %}class="on"{% endif %} 
             title="{% trans %}graph of user reputation{% endtrans %}" 
-            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=reputation">{% trans %}reputation history{% endtrans %}</a>
+            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=reputation"
+        ><span>{% trans %}reputation history{% endtrans %}</span></a>
         <a id="favorites" {% if tab_name=="favorites" %}class="on"{% endif %} 
             title="{% trans %}questions that user selected as his/her favorite{% endtrans %}"
-            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=favorites">{% trans %}favorites{% endtrans %}</a>
+            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=favorites"
+        ><span>{% trans %}favorites{% endtrans %}</span></a>
         <a id="recent" {% if tab_name=="recent" %}class="on"{% endif %} 
             title="{% trans %}recent activity{% endtrans %}" 
-            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=recent">{% trans %}activity{% endtrans %}</a>
+            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=recent"
+        ><span>{% trans %}activity{% endtrans %}</span></a>
         {% if request.user == view_user or request.user|can_moderate_user(view_user) %}
         <a id="votes" {% if tab_name=="votes" %}class="on"{% endif %} 
             title="{% trans %}user vote record{% endtrans %}"
-            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=votes">{% trans %}casted votes{% endtrans %}</a>
+            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=votes"
+        ><span>{% trans %}casted votes{% endtrans %}</span></a>
         {% endif %}
         {% if request.user == view_user or request.user|can_moderate_user(view_user) %}
         <a id="email_subscriptions" {% if tab_name=="email_subscriptions" %}class="on"{% endif %} 
             title="{% trans %}email subscription settings{% endtrans %}" 
-            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=email_subscriptions">{% trans %}subscriptions{% endtrans %}</a>
+            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=email_subscriptions"
+        ><span>{% trans %}subscriptions{% endtrans %}</span></a>
         {% endif %}  
         {% if request.user|can_moderate_user(view_user) %}
         <a id="moderation" {% if tab_name=="moderation" %}class="on"{% endif %} 
             title="{% trans %}moderate this user{% endtrans %}" 
-            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=moderation">{% trans %}moderation{% endtrans %}</a>
+            href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=moderation"
+        ><span>{% trans %}moderation{% endtrans %}</span></a>
         {% endif %}
     </div>
 </div>
diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html
index dab2e661..74c171c8 100644
--- a/askbot/skins/default/templates/users.html
+++ b/askbot/skins/default/templates/users.html
@@ -11,25 +11,25 @@
             href="{% url users %}?sort=reputation"
             {% if tab_id == 'reputation' %}class="on"{% endif %}
             title="{% trans %}reputation{% endtrans %}"
-        >{% trans %}reputation{% endtrans %}</a>
+        ><span>{% trans %}reputation{% endtrans %}</span></a>
         <a 
             id="sort_newest"
             href="{% url users %}?sort=newest"
             {% if tab_id == 'newest' %}class="on"{% endif %}
             class="off" title="{% trans %}recent{% endtrans %}"
-        >{% trans %}recent{% endtrans %}</a>
+        ><span>{% trans %}recent{% endtrans %}</span></a>
         <a 
             id="sort_last"
             href="{% url users %}?sort=last"
             {% if tab_id == 'last' %}class="on"{% endif %}
             class="off" title="{% trans %}oldest{% endtrans %}"
-        >{% trans %}oldest{% endtrans %}</a>
+        ><span>{% trans %}oldest{% endtrans %}<span></a>
         <a 
             id="sort_user"
             href="{% url users %}?sort=user"
             {% if tab_id == 'user' %}class="on"{% endif %}
             title="{% trans %}by username{% endtrans %}"
-        >{% trans %}by username{% endtrans %}</a>
+        ><span>{% trans %}by username{% endtrans %}</span></a>
     </div>
 </div>
 <p>
-- 
cgit v1.2.3-1-g7c22