Commit 9a5a1cf5 authored by felix.herrmann's avatar felix.herrmann
Browse files

fix(urls): set urls for landingpage and dashboard

parent 91f7db14
......@@ -40,7 +40,7 @@ urlpatterns = [
path("dhrep/", include("discuss_data.dhrep.urls", namespace="dhrep")),
path("shib/", include("shibboleth.urls", namespace="shibboleth")),
path("", landing_page, name="core.landing_page"),
path("platform/", following_act_feed, name="discuss_data.ddusers.dashboard_page"),
path("dashboard/", following_act_feed, name="ddusers.dashboard_page"),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
# wagtail URL def
......
......@@ -4,7 +4,7 @@
<div class="col-xs-7">
<ul class="nav nav-pills navbar-right nav-datasets" ic-target="#ds-content" ic-push-url="true">
<li class="{% if feed_type == "following-act-feed" %}nav-active{% endif %}">
<button class="btn btn-link" ic-get-from="{% url 'discuss_data.ddusers.dashboard_page' %}">{% trans "All Activities" %}</button>
<button class="btn btn-link" ic-get-from="{% url 'ddusers.dashboard_page' %}">{% trans "All Activities" %}</button>
</li>
<li class="{% if feed_type == "user-act-feed" %}nav-active{% endif %}">
<button class="btn btn-link" ic-get-from="{% url 'ddusers:user_feed' %}">{% trans "Your Activities" %}</button>
......
......@@ -18,7 +18,7 @@
<ul class="nav flex-column">
<li class="nav-item">
<a class="nav-link i i-home" href="/">
<a class="nav-link i i-home" href="{% url 'ddusers.dashboard_page' %}">
{% trans "Dashboard" %} <span class="sr-only">(current)</span>
</a>
</li>
......
......@@ -14,7 +14,7 @@
{% endcomment %}
<nav class="navbar navbar-light fixed-top flex-md-nowrap p-0 border-bottom navbar-expand-sm" id="navbar-top">
<a class="navbar-brand px-3" href="#"><img src="{% static 'images/logo-primary.svg' %}" height="40" /></a>
<a class="navbar-brand px-3" href="{% url 'core.landing_page' %}"><img src="{% static 'images/logo-primary.svg' %}" height="40" /></a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment