From 2120cd00bc6fae2230bcecfa0c3609ead398fb7f Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Sun, 10 May 2015 11:19:29 +0200 Subject: [PATCH] MT#7247 panel: add navigation bar Change-Id: I4efcd3d74b9f280f074c99daa63cbb9822177aa9 --- panel/templates/panel/base.html | 23 +++++++++++++++++++++++ panel/templates/panel/index.html | 27 +++++++++++++++++++++------ panel/templates/panel/project.html | 9 ++++----- panel/templates/panel/release.html | 6 +++--- repoapi/urls.py | 2 +- 5 files changed, 52 insertions(+), 15 deletions(-) diff --git a/panel/templates/panel/base.html b/panel/templates/panel/base.html index b37aaea..92d8ada 100644 --- a/panel/templates/panel/base.html +++ b/panel/templates/panel/base.html @@ -13,6 +13,29 @@ {% block extrahead %}{% endblock %} + {% block content %}{% endblock %} diff --git a/panel/templates/panel/index.html b/panel/templates/panel/index.html index 1db42b0..0940a78 100644 --- a/panel/templates/panel/index.html +++ b/panel/templates/panel/index.html @@ -1,6 +1,21 @@ -

Releases

- \ No newline at end of file +{% extends "panel/base.html" %} +{% block title %}{{ project }}{% endblock %} +{% block navlist%}{% endblock %} +{% block content %} +
+
+
+

Releases

+
+
+
    + {% for r in releases %} +
  • + {{ r }} +
    • + {% endfor %} +
+
+
+
+{% endblock %} diff --git a/panel/templates/panel/project.html b/panel/templates/panel/project.html index b21d4be..d23c62f 100644 --- a/panel/templates/panel/project.html +++ b/panel/templates/panel/project.html @@ -1,12 +1,11 @@ {% extends "panel/base.html" %} {% block title %}{{ project }}{% endblock %} +{% block navlist%} +
  • {{ release }}
    • +
  • {{ project }}
    • +{% endblock %} {% block content %}
    -

    - - Release {{ release }} - -

    {{ project }}

    diff --git a/panel/templates/panel/release.html b/panel/templates/panel/release.html index 3840b43..34a2195 100644 --- a/panel/templates/panel/release.html +++ b/panel/templates/panel/release.html @@ -1,9 +1,10 @@ {% extends "panel/base.html" %} {% block title %}{{ release }}{% endblock %} +{% block navlist%} +
  • {{ release }}
    • +{% endblock %} {% block content %} - {% endblock %} {% block extrajs %} diff --git a/repoapi/urls.py b/repoapi/urls.py index 744f0a3..7567267 100644 --- a/repoapi/urls.py +++ b/repoapi/urls.py @@ -19,7 +19,7 @@ from rest_framework.urlpatterns import format_suffix_patterns from repoapi import views api_patterns = [ - url(r'^$', views.api_root), + url(r'^$', views.api_root, name='index'), url(r'^jenkinsbuildinfo/$', views.JenkinsBuildInfoList.as_view(), name='jenkinsbuildinfo-list'),