artin/API-Manager
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Manager.git synced 2026-02-06 09:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #384 from tawoe/develop

Browse Source 
update bootstrap -> 4
This commit is contained in:
tesobe-daniel 2025-05-14 10:32:12 +02:00 committed by GitHub
commit 9a900c2206
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apimanager/apimanager/settings.py
View File

@ -44,7 +44,7 @@ INSTALLED_APPS = [
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'bootstrap',
'bootstrap4',
'bootstrap_datepicker_plus',
'mathfilters',
'base',
@ -301,7 +301,6 @@ ALLOW_DIRECT_LOGIN = True
GATEWAYLOGIN_HAS_CBS = False
ALLOW_GATEWAY_LOGIN = True
# Use BOOTSTRAP3 if you are using Bootstrap 3
BOOTSTRAP4 = {
'include_jquery': True,
}

2
apimanager/customers/templates/customers/create.html
View File

@ -5,7 +5,7 @@
{% block page_title %}{{ block.super }} / {% trans "Customers" %}{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="customers">
{% bootstrap_javascript jquery='full' %} {# Embed Bootstrap JS+jQuery #}

10
apimanager/metrics/forms.py
View File

@ -24,14 +24,14 @@ PLACEHOLDER2 = "00:00:00"
class MetricsForm(forms.Form):
from_date = forms.DateTimeField(
label=_(FROM_DATE),
widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
#widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
required=True,
initial=(datetime.now() - timedelta(1)).strftime(API_DATE_FORMAT_WITH_DAY_DATE_TIME),
)
to_date = forms.DateTimeField(
label=_(TO_DATE),
widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
#widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
required=True,
initial=(datetime.now() - timedelta()).strftime(API_DATE_FORMAT_WITH_DAY_DATE_TIME),
)
@ -157,7 +157,7 @@ class ConnectorMetricsForm(MetricsForm):
# override from_date until API returns values without given date
from_date = forms.DateTimeField(
label=_(FROM_DATE),
widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
#widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
required=True,
initial=(datetime.now() - timedelta(6)).strftime(API_DATE_FORMAT_WITH_DAY_DATE_TIME),
)
@ -193,13 +193,13 @@ class ConnectorMetricsForm(MetricsForm):
class CustomSummaryForm(forms.Form):
to_date = forms.DateTimeField(
label=_(TO_DATE),
widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
#widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
required=True,
initial=(datetime.now()).strftime(API_DATE_FORMAT_WITH_DAY_DATE_TIME),
)
from_date_custom = forms.DateTimeField(
label=_(FROM_DATE),
widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
#widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
required=True,
initial=(datetime.now() - timedelta(6)).strftime(API_DATE_FORMAT_WITH_DAY_DATE_TIME),
)

2
apimanager/metrics/templates/metrics/api.html
View File

@ -6,7 +6,7 @@
{% block extrajs %}
<script type="text/javascript" src="{% static 'metrics/js/lastEndpointMetric.js' %}"></script>
{% endblock extrajs %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">
{% bootstrap_javascript jquery='full' %} {# Embed Bootstrap JS+jQuery #}

2
apimanager/metrics/templates/metrics/connector.html
View File

@ -3,7 +3,7 @@
{% load i18n %}
{% block page_title %}{{ block.super }} / Connector Metrics{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">
{% bootstrap_javascript jquery='full' %} {# Embed Bootstrap JS+jQuery #}

2
apimanager/metrics/templates/metrics/custom_summary.html
View File

@ -2,7 +2,7 @@
{% load static %}
{% load i18n %}
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">
<h1>{% trans "API Usage Report" %}</h1>

2
apimanager/metrics/templates/metrics/daily_summary.html
View File

@ -5,7 +5,7 @@
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">

2
apimanager/metrics/templates/metrics/hourly_summary.html
View File

@ -3,7 +3,7 @@
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">

2
apimanager/metrics/templates/metrics/monthly_summary.html
View File

@ -2,7 +2,7 @@
{% load static %}
{% load i18n %}
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">
<h1>{% trans "API Usage Report" %}</h1>

2
apimanager/metrics/templates/metrics/quarterly_summary.html
View File

@ -4,7 +4,7 @@
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">

2
apimanager/metrics/templates/metrics/weekly_summary.html
View File

@ -4,7 +4,7 @@
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">

2
apimanager/metrics/templates/metrics/yearly_summary.html
View File

@ -4,7 +4,7 @@
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">

2
requirements.txt
View File

@ -9,5 +9,5 @@ gunicorn==22.0.0
matplotlib
django-bootstrap-datepicker-plus
django-mathfilters
django-bootstrap
django-bootstrap4
django-csp