Commit c9b39e42661e4b7ca14f1a907769c30dcf108fbf
1 parent
bac3a2d0
Exists in
master
and in
39 other branches
Moved template out of python file
Showing
2 changed files
with
13 additions
and
21 deletions
Show diff stats
... | ... | @@ -0,0 +1,10 @@ |
1 | +{% for title, links in menu_links.items %} | |
2 | +<li class="dropdown"> | |
3 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ title }} <b class="caret"></b></a> | |
4 | + <ul class="dropdown-menu"> | |
5 | + {% for text, link in links %} | |
6 | + <li><a href="{{ link }}">{{ text }}</a></li> | |
7 | + {% endfor %} | |
8 | + </ul> | |
9 | +</li> | |
10 | +{% endfor %} | ... | ... |
colab/proxy/templatetags/proxy.py
... | ... | @@ -2,22 +2,10 @@ |
2 | 2 | from django.core.urlresolvers import reverse |
3 | 3 | from django import template |
4 | 4 | from django.core.cache import cache |
5 | +from django.template.loader import render_to_string | |
5 | 6 | |
6 | 7 | register = template.Library() |
7 | 8 | |
8 | -PROXY_MENU_TEMPLATE = """ | |
9 | -<li class="dropdown"> | |
10 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{title} | |
11 | - <b class="caret"></b></a> | |
12 | - <ul class="dropdown-menu"> | |
13 | - {items} | |
14 | - </ul> | |
15 | -</li>""" | |
16 | - | |
17 | -PROXY_MENU_ITEM_TEMPLATE = """ | |
18 | - <li><a href="{link}">{link_title}</a></li> | |
19 | -""" | |
20 | - | |
21 | 9 | |
22 | 10 | @register.simple_tag(takes_context=True) |
23 | 11 | def proxy_menu(context): |
... | ... | @@ -53,14 +41,8 @@ def proxy_menu(context): |
53 | 41 | url = reverse(app.label, args=(link,)) |
54 | 42 | menu_links[title].append((text, url)) |
55 | 43 | |
56 | - menu = '' | |
57 | - | |
58 | - for title, links in menu_links.items(): | |
59 | - items = '' | |
60 | - for text, link in links: | |
61 | - items += PROXY_MENU_ITEM_TEMPLATE.format(link=link, | |
62 | - link_title=unicode(text)) | |
63 | - menu += PROXY_MENU_TEMPLATE.format(title=unicode(title), items=items) | |
44 | + menu = render_to_string('proxy/menu_template.html', | |
45 | + {'menu_links': menu_links}) | |
64 | 46 | |
65 | 47 | cache.set(cache_key, menu) |
66 | 48 | return menu | ... | ... |