diff options
-rw-r--r-- | askbot/skins/default/templates/macros.html | 4 | ||||
-rw-r--r-- | askbot/skins/default/templates/main_page/javascript.html | 12 | ||||
-rw-r--r-- | askbot/urls.py | 5 | ||||
-rw-r--r-- | askbot/views/readers.py | 8 |
4 files changed, 27 insertions, 2 deletions
diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html index 282553e4..b868be38 100644 --- a/askbot/skins/default/templates/macros.html +++ b/askbot/skins/default/templates/macros.html @@ -459,12 +459,12 @@ poor design of the data or methods on data objects #} {% if question.is_anonymous %} <span class="anonymous">{{ question.last_activity_by.get_anonymous_name() }}</span> {% else %} - <a href="{% url user_profile question.last_activity_by.id, question.last_activity_by.username|slugify %}">{{question.last_activity_by.username}}</a>{{ user_country_flag(question.last_activity_by) }} + <a href="{% url user_profile question.last_activity_by.id, question.last_activity_by.username|slugify %}" >{{question.last_activity_by.username}}</a>{{ user_country_flag(question.last_activity_by) }} {#{user_score_and_badge_summary(question.last_activity_by)}#} {% endif %} </div> </div> - <h2><a title="{{question.summary|escape}}" href="{{ question.get_absolute_url() }}">{{question.get_question_title()|escape}}</a></h2> + <h2><a href="{{ question.get_absolute_url() }}" onmouseover="load_question_body(this, {{question.id}})">{{question.get_question_title()|escape}}</a></h2> {{ tag_list_widget(question.get_tag_names()) }} </div> {%- endmacro -%} diff --git a/askbot/skins/default/templates/main_page/javascript.html b/askbot/skins/default/templates/main_page/javascript.html index e7479e63..3ae5b55d 100644 --- a/askbot/skins/default/templates/main_page/javascript.html +++ b/askbot/skins/default/templates/main_page/javascript.html @@ -26,6 +26,18 @@ }); } } + + function load_question_body(element, question_id){ + var key = 'question-' + question_id; + if (askbot['data'][key] != null){ + $.getJSON('{% url get_question_body %}?id=' + question_id, function(data){ + element.title = data.text; + askbot['data'][key] = data.text; + }); + } else{ + element.title = askbot['data'][key]; + } + } askbot['urls']['mark_interesting_tag'] = scriptUrl + '{% url mark_interesting_tag %}'; askbot['urls']['mark_ignored_tag'] = scriptUrl + '{% url mark_ignored_tag %}'; askbot['urls']['unmark_tag'] = scriptUrl + '{% url unmark_tag %}'; diff --git a/askbot/urls.py b/askbot/urls.py index c79f4f83..8c1e3c3a 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -140,6 +140,11 @@ urlpatterns = patterns('', views.readers.get_comment, name='get_comment' ), + url(#ajax only + r'^question/get_body/$', + views.readers.get_question_body, + name='get_question_body' + ), url( r'^%s$' % _('tags/'), views.readers.tags, diff --git a/askbot/views/readers.py b/askbot/views/readers.py index ab4ab87b..8e4dff95 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -634,3 +634,11 @@ def get_comment(request): comment = models.Comment.objects.get(id = id) request.user.assert_can_edit_comment(comment) return {'text': comment.comment} + +@ajax_only +@get_only +def get_question_body(request): + from jinja2 import escape + id = int(request.GET['id']) + question = models.Question.objects.get(id = id) + return {'text': escape(question.summary)} |