Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion scancodeio/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@
"django.contrib.auth.context_processors.auth",
"django.contrib.messages.context_processors.messages",
"django.template.context_processors.request",
"scancodeio.context_processors.versions",
],
},
},
Expand Down
3 changes: 0 additions & 3 deletions scanpipe/templates/account/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

{% block content %}
<div class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}
<div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>

<section class="section pt-0">
<div class="is-flex is-justify-content-space-between mb-2">
<nav class="breadcrumb is-medium mb-1" aria-label="breadcrumbs">
Expand Down
3 changes: 0 additions & 3 deletions scanpipe/templates/registration/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

{% block content %}
<div class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}
<div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>

{% if form.errors %}
<article class="message is-danger">
<div class="message-body">
Expand Down
23 changes: 0 additions & 23 deletions scanpipe/templates/scanpipe/app_monitoring.html

This file was deleted.

6 changes: 6 additions & 0 deletions scanpipe/templates/scanpipe/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
{% block extrahead %}{% endblock %}
</head>
<body class="pb-5" hx-headers='{"x-csrftoken": "{{ csrf_token }}"}'>
{% block header %}
<div id="header" class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}
<div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
</div>
{% endblock %}
{% block content %}{% endblock %}
{% block modals %}{% endblock %}
{% block scripts %}{% endblock %}
Expand Down
2 changes: 0 additions & 2 deletions scanpipe/templates/scanpipe/dependency_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

{% block content %}
<div class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}
<div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
{% include 'scanpipe/includes/breadcrumb_detail_view.html' with object_title=object.package_url url_name="project_dependencies" %}
<div class="mx-5">{% include 'scanpipe/tabset/tabset.html' %}</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion scanpipe/templates/scanpipe/dependency_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

{% block content %}
<div id="content-header" class="container is-max-widescreen mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
<div class="is-flex is-justify-content-space-between">
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Dependencies" %}
Expand Down
1 change: 0 additions & 1 deletion scanpipe/templates/scanpipe/dependency_tree.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

{% block content %}
<div id="content-header" class="container is-max-widescreen mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
<div class="is-flex is-justify-content-space-between">
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Dependency tree" %}
Expand Down
3 changes: 3 additions & 0 deletions scanpipe/templates/scanpipe/includes/navbar_header.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{% load scanpipe_tags %}
{% scancodeio_version_tag as SCANCODEIO_VERSION %}
{% scancode_toolkit_version_tag as SCANCODE_TOOLKIT_VERSION %}
<nav class="navbar is-dark mb-4 border-bottom-radius" aria-label="main navigation">
<div class="navbar-brand ml-3">
<a class="navbar-item is-block is-size-4 has-text-weight-bold" href="/">
Expand Down
2 changes: 0 additions & 2 deletions scanpipe/templates/scanpipe/license_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

{% block content %}
<div class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}
<div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
<section class="mx-5 mb-3">
<nav class="breadcrumb is-medium has-succeeds-separator mb-1" aria-label="breadcrumbs">
<ul>
Expand Down
2 changes: 0 additions & 2 deletions scanpipe/templates/scanpipe/license_detection_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

{% block content %}
<div class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}
<div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
{% include 'scanpipe/includes/breadcrumb_detail_view.html' with object_title=object.identifier url_name="project_licenses" %}
<div class="mx-5">{% include 'scanpipe/tabset/tabset.html' %}</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion scanpipe/templates/scanpipe/license_detection_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

{% block content %}
<div id="content-header" class="container is-max-widescreen mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
<div class="is-flex is-justify-content-space-between">
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="License Detections" %}
Expand Down
1 change: 0 additions & 1 deletion scanpipe/templates/scanpipe/license_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

{% block content %}
<div id="content-header" class="container is-max-widescreen mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
<nav class="breadcrumb is-medium has-succeeds-separator mb-1" aria-label="breadcrumbs">
<ul>
Expand Down
1 change: 0 additions & 1 deletion scanpipe/templates/scanpipe/message_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

{% block content %}
<div id="content-header" class="container is-max-widescreen mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
<div class="is-flex is-justify-content-space-between">
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Messages" %}
Expand Down
4 changes: 1 addition & 3 deletions scanpipe/templates/scanpipe/package_detail.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
{% extends "scanpipe/base.html" %}
{% load static humanize %}
{% load static %}

{% block title %}ScanCode.io: {{ project.name }} - {{ object.name }}{% endblock %}

{% block content %}
<div class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}
<div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
{% include 'scanpipe/includes/breadcrumb_detail_view.html' with object_title=object.package_url url_name="project_packages" %}
<div class="mx-5">{% include 'scanpipe/tabset/tabset.html' %}</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion scanpipe/templates/scanpipe/package_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

{% block content %}
<div id="content-header" class="container is-max-widescreen mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
<div class="is-flex is-justify-content-space-between">
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Packages" %}
Expand Down
3 changes: 0 additions & 3 deletions scanpipe/templates/scanpipe/project_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@

{% block content %}
<div class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}
<div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>

<section class="is-flex is-justify-content-space-between mx-5 mb-2">
<div>
<nav class="breadcrumb has-succeeds-separator is-medium mb-1" aria-label="breadcrumbs">
Expand Down
2 changes: 0 additions & 2 deletions scanpipe/templates/scanpipe/project_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

{% block content %}
<div class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}

<section class="mx-5 pt-0 pb-1">
<h2 class="subtitle mb-0 mb-4">
Create a <strong>Project</strong>
Expand Down
3 changes: 0 additions & 3 deletions scanpipe/templates/scanpipe/project_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@

{% block content %}
<div class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}
<div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>

<section class="mx-5 mb-5">
<div class="is-flex is-justify-content-space-between mb-2">
<div id="project-list-header">
Expand Down
2 changes: 0 additions & 2 deletions scanpipe/templates/scanpipe/project_settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

{% block content %}
<div class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}
<div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
{% include 'scanpipe/includes/breadcrumb_detail_view.html' with object_title="Settings" %}
<hr class="mx-5 mt-0">

Expand Down
1 change: 0 additions & 1 deletion scanpipe/templates/scanpipe/relation_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

{% block content %}
<div id="content-header" class="container is-max-widescreen mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
<div class="is-flex is-justify-content-space-between">
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Relations" %}
Expand Down
2 changes: 0 additions & 2 deletions scanpipe/templates/scanpipe/resource_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

{% block content %}
<div class="container is-max-widescreen">
{% include 'scanpipe/includes/navbar_header.html' %}
<div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
{% include 'scanpipe/includes/breadcrumb_detail_view.html' with template_title="scanpipe/includes/resource_path_links.html" url_name="project_resources" %}
<div class="mx-5">
{% block partial-content %}
Expand Down
1 change: 0 additions & 1 deletion scanpipe/templates/scanpipe/resource_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

{% block content %}
<div id="content-header" class="container is-max-widescreen mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
<div class="is-flex is-justify-content-space-between">
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Resources" %}
Expand Down
1 change: 0 additions & 1 deletion scanpipe/templates/scanpipe/resource_tree.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

{% block content %}
<div id="content-header" class="container is-max-widescreen mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
<div class="is-flex is-justify-content-space-between">
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Resources tree" %}
Expand Down
1 change: 0 additions & 1 deletion scanpipe/templates/scanpipe/vulnerability_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

{% block content %}
<div id="content-header" class="container is-max-widescreen mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Vulnerabilities" %}
<div>{{ object_list|length|intcomma }} results</div>
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,22 @@
# ScanCode.io is a free software code scanning tool from nexB Inc. and others.
# Visit https://github.com/aboutcode-org/scancode.io for support and download.

from django import template

from scancode_config import __version__ as scancode_toolkit_version

from scancodeio import __version__ as scancodeio_version

register = template.Library()

def versions(request):
return {
"SCANCODEIO_VERSION": scancodeio_version.lstrip("v"),
"SCANCODE_TOOLKIT_VERSION": scancode_toolkit_version,
}

@register.simple_tag
def scancodeio_version_tag():
"""Return the ScanCode.io version string."""
return scancodeio_version.lstrip("v")


@register.simple_tag
def scancode_toolkit_version_tag():
"""Return the ScanCode toolkit version string."""
return scancode_toolkit_version
2 changes: 0 additions & 2 deletions scanpipe/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
# ScanCode.io is a free software code scanning tool from nexB Inc. and others.
# Visit https://github.com/aboutcode-org/scancode.io for support and download.

from django.urls import include
from django.urls import path

from scanpipe import views
Expand Down Expand Up @@ -276,5 +275,4 @@
views.LicenseListView.as_view(),
name="license_list",
),
path("monitor/", include("django_rq.urls")),
]
Loading