Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:dementrock/mitx into discussion2

Browse Source
This commit is contained in:
Brittany Cheng
2012-08-02 17:46:40 -04:00
parent cf4ac2ef89 833b89502c
commit 3b312a2c92
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/templates/discussion/_sort.html
View File

@@ -3,16 +3,16 @@
<%def name="link_to_sort(key, title)">
% if key == sort_key:
% if sort_order.lower() == 'desc':
${_link_to_sort(key, 'asc', title + ' [v]')}
${_link_to_sort(key, 'asc', title + ' [v]', 'sorted')}
% else:
${_link_to_sort(key, 'desc', title + ' [^]')}
${_link_to_sort(key, 'desc', title + ' [^]', 'sorted')}
% endif
% else:
${_link_to_sort(key, 'desc', title)}
% endif
</%def>
<%def name="_link_to_sort(key, order, title)">
<%def name="_link_to_sort(key, order, title, cls='')">
<%
def merge(dic1, dic2):
return dict(dic1.items() + dic2.items())
@@ -21,9 +21,9 @@
return base_url + '?' + urlencode(merge(query_params, {'page': 1, 'sort_key': key, 'sort_order': order}))
%>
% if discussion_type == 'inline':
<a class="discussion-sort-link discussion-inline-sort-link" href="javascript:void(0)" sort-url="${url_for_sort(key, order)}">${title}</a>
<a class="discussion-sort-link discussion-inline-sort-link ${cls}" href="javascript:void(0)" sort-url="${url_for_sort(key, order)}">${title}</a>
% else:
<a class="discussion-sort-link" href="${url_for_sort(key, order)}">${title}</a>
<a class="discussion-sort-link ${cls}" href="${url_for_sort(key, order)}">${title}</a>
% endif
</%def>