Skip to content

Commit

Permalink
Bump djangorestframework from 3.14.0 to 3.15.2 (#513)
Browse files Browse the repository at this point in the history
* Bump djangorestframework from 3.14.0 to 3.15.2

Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.14.0 to 3.15.2.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](encode/django-rest-framework@3.14.0...3.15.2)

---
updated-dependencies:
- dependency-name: djangorestframework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix template

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: J-E Castagnede <[email protected]>
  • Loading branch information
dependabot[bot] and submarcos authored Oct 7, 2024
1 parent 65d371b commit ee01d24
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 37 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ django==4.2.16
# via
# djangorestframework
# screamshotter (setup.py)
djangorestframework==3.14.0
djangorestframework==3.15.2
# via screamshotter (setup.py)
gevent==24.2.1
# via gunicorn
Expand Down
43 changes: 7 additions & 36 deletions src/screamshotter/templates/rest_framework/base.html
Original file line number Diff line number Diff line change
@@ -1,41 +1,12 @@
{% extends "rest_framework/base.html" %}
{% load i18n %}
{% load static %}
{% load rest_framework %}

{% block bootstrap_theme %}
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"
crossorigin="anonymous">

<!-- Optional theme -->
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css"
crossorigin="anonymous">
{% endblock %}

{% block navbar %}
<div class="navbar navbar-static-top {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}"
role="navigation" aria-label="{% trans "navbar" %}">
<div class="container">
<span>
{% block branding %}
<a class="navbar-brand" rel="nofollow" href="#">
<img src="{% static 'img/logo.svg' %}" style="height: 20px;"/>
</a>
<a class="navbar-brand" rel="nofollow" href="#">
Screenshotter &#x1f4f7;&#x1f5bc;
</a>
{% endblock %}
</span>
<ul class="nav navbar-nav pull-right">
{% block userlinks %}
{% if user.is_authenticated %}
{% optional_logout request user %}
{% else %}
{% optional_login request %}
{% endif %}
{% endblock %}
</ul>
</div>
</div>
{% block branding %}
<a class="navbar-brand" rel="nofollow" href="#">
<img src="{% static 'img/logo.svg' %}" style="height: 20px;"/>
</a>
<a class="navbar-brand" rel="nofollow" href="#">
Screenshotter &#x1f4f7;&#x1f5bc;
</a>
{% endblock %}

0 comments on commit ee01d24

Please sign in to comment.