Permalink
Browse files

Merge branch 'master' of github.com:Psycojoker/memopol2

  • Loading branch information...
2 parents 6442a38 + a727345 commit 8fd417adb6b17064f1fe5718fc32d3484c2617c2 @Psycojoker committed Jul 23, 2012
Showing with 3 additions and 1 deletion.
  1. +1 −1 mps/urls.py
  2. +2 −0 templates/base.html
View
@@ -25,7 +25,7 @@
url(r'^vote/', include("mps_votes.urls", namespace="votes", app_name="mps_urls")),
- url(r'^votes/$', lambda request: redirect(reverse("mps:index_votes"))),
+ url(r'^votes/$', lambda request: redirect(reverse("mps:votes:index_votes"))),
url(r'^nosdeputes/(?P<pk>.+)/$', 'get_nosdeputes_widget')
)
View
@@ -74,6 +74,7 @@ <h2>{% trans "Eurodeputies " %}<img src="{{ MEDIA_URL }}/img/countries/small/EU.
</ul>
+ {% comment %}
<h2><a href="{% url campaign:list %}">{% trans "Campaigns" %}</a></h2>
{% if campaigns %}
<ul>
@@ -82,6 +83,7 @@ <h2><a href="{% url campaign:list %}">{% trans "Campaigns" %}</a></h2>
{% endfor %}
</ul>
{% endif %}
+ {% endcomment %}
<h2>{% trans "French deputies" %} <img src="{{ MEDIA_URL }}/img/countries/small/FR.png" alt="FR flag"/></h2>
<ul>

0 comments on commit 8fd417a

Please sign in to comment.