Commit 2f3e6f9c09e05b4461a8c5a3e0b276a2ba351a85
1 parent
50b4dc1e
Exists in
master
and in
39 other branches
Created noosfero links dynamically
Showing
4 changed files
with
16 additions
and
33 deletions
Show diff stats
colab/proxy/noosfero/apps.py
| 1 | 1 | ||
| 2 | +from django.utils.translation import ugettext_lazy as _ | ||
| 3 | + | ||
| 2 | from ..utils.apps import ColabProxiedAppConfig | 4 | from ..utils.apps import ColabProxiedAppConfig |
| 3 | 5 | ||
| 4 | 6 | ||
| 5 | class ProxyNoosferoAppConfig(ColabProxiedAppConfig): | 7 | class ProxyNoosferoAppConfig(ColabProxiedAppConfig): |
| 6 | name = 'colab.proxy.noosfero' | 8 | name = 'colab.proxy.noosfero' |
| 7 | verbose_name = 'Noosfero Proxy' | 9 | verbose_name = 'Noosfero Proxy' |
| 10 | + | ||
| 11 | + menu = { | ||
| 12 | + 'title': _('Social'), | ||
| 13 | + 'links': ( | ||
| 14 | + (_('Users'), 'search/people'), | ||
| 15 | + (_('Communities'), 'search/communities'), | ||
| 16 | + ), | ||
| 17 | + 'auth_links': ( | ||
| 18 | + (_('Profile'), 'profile'), | ||
| 19 | + (_('Control panel'), 'myprofile'), | ||
| 20 | + ), | ||
| 21 | + } |
colab/proxy/noosfero/urls.py
| @@ -6,5 +6,5 @@ from .views import NoosferoProxyView | @@ -6,5 +6,5 @@ from .views import NoosferoProxyView | ||
| 6 | 6 | ||
| 7 | urlpatterns = patterns('', | 7 | urlpatterns = patterns('', |
| 8 | # Noosfero URLs | 8 | # Noosfero URLs |
| 9 | - url(r'^(?P<path>.*)$', NoosferoProxyView.as_view()), | 9 | + url(r'^(?P<path>.*)$', NoosferoProxyView.as_view(), name='noosfero'), |
| 10 | ) | 10 | ) |
colab/proxy/templatetags/proxy.py
| @@ -14,7 +14,7 @@ PROXY_MENU_TEMPLATE = """ | @@ -14,7 +14,7 @@ PROXY_MENU_TEMPLATE = """ | ||
| 14 | </li>""" | 14 | </li>""" |
| 15 | 15 | ||
| 16 | PROXY_MENU_ITEM_TEMPLATE = """ | 16 | PROXY_MENU_ITEM_TEMPLATE = """ |
| 17 | - <li><a href="{link}">{link_title}</a></li> | 17 | + <li><a href="{link}">{link_title}</a></li> |
| 18 | """ | 18 | """ |
| 19 | 19 | ||
| 20 | 20 |
colab/templates/base.html
| @@ -102,37 +102,6 @@ | @@ -102,37 +102,6 @@ | ||
| 102 | 102 | ||
| 103 | {% proxy_menu %} | 103 | {% proxy_menu %} |
| 104 | 104 | ||
| 105 | - {% if proxy.noosfero %} | ||
| 106 | - <li class="dropdown"> | ||
| 107 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> | ||
| 108 | - {% trans "Social" %} <b class="caret"></b> | ||
| 109 | - </a> | ||
| 110 | - <ul class="dropdown-menu"> | ||
| 111 | - <li> | ||
| 112 | - <a href="/social/search/people"> | ||
| 113 | - {% trans "Users" %} | ||
| 114 | - </a> | ||
| 115 | - </li> | ||
| 116 | - <li> | ||
| 117 | - <a href="/social/search/communities"> | ||
| 118 | - {% trans "Communities" %} | ||
| 119 | - </a> | ||
| 120 | - </li> | ||
| 121 | - {% if user.is_active %} | ||
| 122 | - <li> | ||
| 123 | - <a href="/social/profile/{{ user.username }}"> | ||
| 124 | - {% trans "Profile" %} | ||
| 125 | - </a> | ||
| 126 | - </li> | ||
| 127 | - <li> | ||
| 128 | - <a href="/social/myprofile/{{ user.username }}"> | ||
| 129 | - {% trans "Control panel" %} | ||
| 130 | - </a> | ||
| 131 | - </li> | ||
| 132 | - {% endif %} | ||
| 133 | - </ul> | ||
| 134 | - </li> | ||
| 135 | - {% endif %} | ||
| 136 | {% if proxy.trac %} | 105 | {% if proxy.trac %} |
| 137 | <li class="dropdown"> | 106 | <li class="dropdown"> |
| 138 | <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Contribute" %} <b class="caret"></b></a> | 107 | <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Contribute" %} <b class="caret"></b></a> |