Fix urls

diff --git a/app/organization/projects/urls.py b/app/organization/projects/urls.py
index e9c91a3605d091354b2362d1b51d2c8d9eeaf5b3..d04e4f5d2fd78cc0fcdbf21dabbf406b58d5bd2e 100644 (file)
--- a/app/organization/projects/urls.py
+++ b/app/organization/projects/urls.py
@@ -38,19 +38,19 @@ urlpatterns = [
     url("^projects/blog/(?P<slug>.*)/$", ProjectBlogPageView.as_view(), name='organization-project-blogpage-detail'),
 
     url("^calls/list/$", ProjectCallListView.as_view(), name='organization-call-list'),
-    url("^calls/detail/(?P<slug>.*)/$", ProjectCallDetailView.as_view(), name='organization-call-detail'),
+    url("^calls/(?P<slug>.*)/detail/$", ProjectCallDetailView.as_view(), name='organization-call-detail'),
 
-    url("^calls/detail/(?P<slug>.*)/projects/submission/$", ProjectICTCreateView.as_view(), name='organization-project-create'),
-    url("^calls/detail/(?P<call_slug>.*)/projects/detail/(?P<slug>.*)/$", ProjectICTDetailView.as_view(), name='organization-project-detail'),
-    url("^calls/detail/(?P<call_slug>.*)/projects/lists/$", ProjectICTListView.as_view(), name='organization-project-list'),
+    url("^calls/(?P<slug>.*)/projects/submission/$", ProjectICTCreateView.as_view(), name='organization-project-create'),
+    url("^calls/(?P<call_slug>.*)/projects/detail/(?P<slug>.*)/$", ProjectICTDetailView.as_view(), name='organization-project-detail'),
+    url("^calls/(?P<call_slug>.*)/projects/list/$", ProjectICTListView.as_view(), name='organization-project-list'),
 
-    url("^calls/detail/(?P<slug>.*)/producers/submission/$", ProducerCreateView.as_view(), name='organization-producer-create'),
-    url("^calls/detail/(?P<call_slug>.*)/producers/detail/(?P<slug>.*)/$", ProducerDetailView.as_view(), name='organization-producer-detail'),
-    url("^calls/detail/(?P<call_slug>.*)/producers/lists/$", ProducerListView.as_view(), name='organization-producer-list'),
+    url("^calls/(?P<slug>.*)/producers/submission/$", ProducerCreateView.as_view(), name='organization-producer-create'),
+    url("^calls/(?P<call_slug>.*)/producers/(?P<slug>.*)/detail/$", ProducerDetailView.as_view(), name='organization-producer-detail'),
+    url("^calls/(?P<call_slug>.*)/producers/list/$", ProducerListView.as_view(), name='organization-producer-list'),
 
-    url("^calls/detail/(?P<slug>.*)/residencies/submission/$", ProjectResidencyCreateView.as_view(), name='organization-residency-create'),
-    url("^calls/detail/(?P<call_slug>.*)/residencies/detail/(?P<slug>.*)/$", ProjectResidencyDetailView.as_view(), name='organization-residency-detail'),
-    url("^calls/detail/(?P<call_slug>.*)/residencies/lists/$", ProjectResidencyListView.as_view(), name='organization-residency-list'),
+    url("^calls/(?P<slug>.*)/residencies/submission/$", ProjectResidencyCreateView.as_view(), name='organization-residency-create'),
+    url("^calls/(?P<call_slug>.*)/residencies/(?P<slug>.*)/detail/$", ProjectResidencyDetailView.as_view(), name='organization-residency-detail'),
+    url("^calls/(?P<call_slug>.*)/residencies/list/$", ProjectResidencyListView.as_view(), name='organization-residency-list'),
 
 
 ]

diff --git a/app/organization/projects/views.py b/app/organization/projects/views.py
index 6f7d1d2dea75bd2159d31432cb97f08728e12c2e..6a1e17a7859a73bcba85a8bef56605f63634b52e 100644 (file)
--- a/app/organization/projects/views.py
+++ b/app/organization/projects/views.py
@@ -135,7 +135,8 @@ class ProjectICTCreateView(CreateWithInlinesView):
     inlines = [ProjectICTDataInline, ProjectSimpleImageInline, ProjectContactInline,]
 
     def get_context_data(self, **kwargs):
-        context['call'] = get_object_or_404(ProjectCall, slug=self.kwargs['call_slug'])
+        context = super(ProjectICTCreateView, self).get_context_data(**kwargs)
+        context['call'] = get_object_or_404(ProjectCall, slug=self.kwargs['slug'])
         return context
 
 class ProjectICTListView(ListView):

diff --git a/app/themes/vertigo_starts_eu/templates/projects/project_call_detail.html b/app/themes/vertigo_starts_eu/templates/projects/project_call_detail.html
index b9d35bbd8db4ed645d9ff4bf444213b390cefb19..459baf0843f0571610d675cb503a90c33cc9fd77 100644 (file)
--- a/app/themes/vertigo_starts_eu/templates/projects/project_call_detail.html
+++ b/app/themes/vertigo_starts_eu/templates/projects/project_call_detail.html
@@ -115,233 +115,18 @@
 {% endblock %}
 
 {% block page_sub_content %}
-
-    {% if object.type == 'external' %}
-        <div class="white-bg pb2">
-            <hr class="mt0 invisible" />
-            <div class="page__block page__block--yellow">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-sm-12 col-lg-10 col-lg-push-1">
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="project-details">
-                                        <h3 class="dotted project-details__title">{% trans "Project details" %}</h3>
-
-                                        <div>
-                                            {% if object.program %}
-                                                <div class="project-details__item">
-                                                    <div class="project-details__item-title">
-                                                        {% trans "Program" %}
-                                                    </div>
-                                                    <div class="project-details__item-desc">
-                                                        {{ object.program }}
-                                                    </div>
-                                                </div>
-                                            {% endif %}
-
-                                            {% if object.program_type %}
-                                                <div class="project-details__item">
-                                                    <div class="project-details__item-title">
-                                                        {% trans "Program type" %}
-                                                    </div>
-                                                    <div class="project-details__item-desc">
-                                                        {{ object.program_type }}
-                                                    </div>
-                                                </div>
-                                            {% endif %}
-
-                                            <div class="project-details__item">
-                                                <div class="project-details__item-title">
-                                                    {% trans "Beginning" %}
-                                                </div>
-                                                <div class="project-details__item-desc">
-                                                    {{ object.date_from }}
-                                                </div>
-                                            </div>
-
-                                            <div class="project-details__item">
-                                                <div class="project-details__item-title">
-                                                    {% trans "End" %}
-                                                </div>
-                                                <div class="project-details__item-desc">
-                                                    {{ object.date_to }}
-                                                </div>
-                                            </div>
-
-                                            <div class="project-details__item">
-                                                <div class="project-details__item-title">
-                                                    {% trans "Status" %}
-                                                </div>
-                                                <div class="project-details__item-desc">
-                                                    {{ object.object_status }}
-                                                </div>
-                                            </div>
-
-                                            {% if object.website %}
-                                                <div class="project-details__item">
-                                                    <div class="project-details__item-title">
-                                                        {% trans "Website" %}
-                                                    </div>
-                                                    <div class="project-details__item-desc">
-                                                        <a href="{{ object.website }}" target="_blank" title="{{ object.title }}">{{ object.website }}</a>
-                                                    </div>
-                                                </div>
-                                            {% endif %}
-
-                                            <div class="project-details__logo">
-                                                {% with object.images.all|get_type:'logo' as images %}
-                                                    {% include 'core/inc/logo.html' %}
-                                                {% endwith %}
-                                            </div>
-
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-sm-6">
-                                    <div class="project-details">
-                                        <h3 class="dotted project-details__title">{% trans "Participants" %}</h3>
-
-                                        <div>
-
-                                            {% if object.lead_team or object.lead_organization %}
-                                                <div class="project-details__item">
-                                                  {% if object.lead_team %}
-                                                    <div class="project-details__item-title">
-                                                        {% trans "Project lead team" %}
-                                                    </div>
-                                                    <div class="project-details__item-desc">
-                                                        <a href="{% url "page" object.lead_team.pages.all.0 %}">{{ object.lead_team.short }}</a>
-                                                    </div>
-                                                  {% elif object.lead_organization %}
-                                                    <div class="project-details__item-title">
-                                                        {% trans "Project lead organization" %}
-                                                    </div>
-                                                    <div class="project-details__item-desc">
-                                                        {% if object.lead_organization.url %}
-                                                            <a href="{{ object.lead_organization.url }}" target="_blank" title="{{ object.lead_organization }}">
-                                                        {% endif %}
-                                                            {{ object.lead_organization }}
-                                                        {% if object.lead_organization.url %}
-                                                            </a>
-                                                        {% endif %}
-                                                    </div>
-                                                  {% endif %}
-                                                </div>
-                                            {% endif %}
-
-                                            <div class="project-details__item">
-                                                <div class="project-details__item-title">
-                                                    {% trans "Partners" %}
-                                                </div>
-                                                <div class="project-details__item-desc">
-                                                    {% for organization in object.organizations.all %}
-                                                        {% if organization.url %}
-                                                            <a href="{{ organization.url }}" target="_blank" title="{{ organization }}">
-                                                        {% endif %}
-                                                            {{ organization }}<br>
-                                                        {% if organization.url %}
-                                                            </a>
-                                                        {% endif %}
-                                                    {% endfor %}
-                                                </div>
-
-                                                <div class="project-details__item-title">
-                                                    {% trans "teams" %} ({{ host_organization }})
-                                                </div>
-                                                <div class="project-details__item-desc">
-                                                    {% for team in object.teams.all %}
-                                                        {% if team.pages.all %}
-                                                            <a href="{% url "page" team.pages.all.0.slug %}">{{ team.short }}</a><br>
-                                                        {% endif %}
-                                                    {% endfor %}
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    {% endif %}
-
     {% with object.blocks.all as blocks %}
         {% include "projects/inc/project_block.html" %}
     {% endwith %}
 {% endblock %}
 
 {% block page_demo %}
-{% if object.demos.all %}
-<div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
-  <hr class="mt0">
-    <div class="white-bg mb2">
-        <div class="container">
-            <div class="row" data-summary-content>
-                <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
-                    <ul>
-                        <h2>{% trans "Demos" %}</h2>
-                        {% for demo in object.demos.all %}
-                            <li><a href="{% url 'organization-project-demo-detail' demo.slug %}">{{ demo.title }}</a></li>
-                        {% endfor %}
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{% endif %}
 {% endblock %}
 
 {% block page_blog %}
-{% if object.blog_pages.all %}
-<div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
-  <hr class="mt0">
-    <div class="white-bg mb2">
-        <div class="container">
-            <div class="row" data-summary-content>
-                <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
-                    <ul>
-                        <h2>{% trans "Blog Pages" %}</h2>
-                        {% for blog_page in object.blog_pages.all %}
-                            <li><a href="{% url 'organization-project-blogpage-detail' blog_page.slug %}">{{ blog_page.title }}</a></li>
-                        {% endfor %}
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{% endif %}
 {% endblock %}
 
 {% block logo %}
-    {% if object.organizations.all|length > 0 %}
-        <div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
-            <div class="white-bg pb2">
-                <div class="container">
-                    <div class="row" data-summary-content>
-                        <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
-                            <ul class="partners-list">
-                                {% if object.lead_organization %}
-                                    {% with object.lead_organization.images.all|get_type:'logo' as images %}
-                                        {% include 'core/inc/logo.html' %}
-                                    {% endwith %}
-                                {% endif %}
-                                {% for organization in object.organizations.all %}
-                                    {% with organization.images.all|get_type:'logo' as images %}
-                                        {% include 'core/inc/logo.html' %}
-                                    {% endwith %}
-                                {% endfor %}
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    {% endif %}
 {% endblock %}
 
 {% block page_related_content %}