added static bootstrap, further tempalte clean up

This commit is contained in:
Markus Rosenstihl 2025-04-06 18:49:09 +02:00
parent a4f8ed5aff
commit 7fa6f0a015
10 changed files with 37 additions and 126 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ __pycache__
.pyc
venv
.idea
*/.idea

View File

@ -106,7 +106,7 @@ AUTH_PASSWORD_VALIDATORS = [
LANGUAGE_CODE = 'en-us'
TIME_ZONE = 'UTC'
TIME_ZONE = 'Europe/Berlin'
USE_I18N = True
@ -116,6 +116,7 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/5.1/howto/static-files/
import os
STATIC_URL = 'static/'
# Default primary key field type

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

File diff suppressed because one or more lines are too long

View File

@ -1,12 +1,13 @@
{% load static %}
<head>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
<!--<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">-->
<link href=”https://cdn.pydata.org/bokeh/release/bokeh-3.7.1.min.css" rel=”stylesheet” type=”text/css”>
<link href=”https://cdn.pydata.org/bokeh/release/bokeh-widgets-3.7.1.min.css" rel=”stylesheet” type=”text/css”>
</head>
{% load static %}
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="#">
<img src="{% static 'isotopapp/damaris_logo.png' %}" alt="Logo" height="30" class="d-inline-block align-text-top">

View File

@ -1,33 +1,5 @@
<head>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
</head>
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="{% url 'home' %}">Isotopes</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'sfg' %}">Position</a>
</li>
<li class="nav-item">
{% load admin_urls %}
<a class="nav-link" href="{% url 'admin:index' %}">Admin</a>
</li>
</ul>
</div>
</nav>
<style>
.center {
margin: auto;
width: 60%;
border: 3px solid #90befb;
border: 3px solid #a5addb;
padding: 10px;
}
</style>
{% extends 'base.html' %}
{% block content %}
<div class="container text-left">
<h1>NMR Frequency Calculator</h1>
@ -83,3 +55,4 @@
<div>
{{ ans }}
</div>
{% endblock %}

View File

@ -1,11 +1,6 @@
<head>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<link href=”https://cdn.pydata.org/bokeh/release/bokeh-3.7.1.min.css" rel=”stylesheet” type=”text/css”>
<link href=”https://cdn.pydata.org/bokeh/release/bokeh-widgets-3.7.1.min.css" rel=”stylesheet” type=”text/css”>
</head>
{% extends 'base.html' %}
{% block content %}
<body>
<div class="center">
<h1>Isotopes</h1>
<table class="table w-auto table-responsive-sm table-striped table-hover table-bordered">
@ -39,43 +34,13 @@
</table>
{{ div| safe }}
<div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.2.2/es5/latest.js"
integrity="sha512-nUTIGJLS9aRMjQaRwpCiC+0Y2RzgW4sufFhFgyjHgn15DXLSfoVUaEa83CsNe2FSJpLXtfgdVfgL7a0lrbcBWA=="
crossorigin="anonymous"
referrerpolicy="no-referrer">
</script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-3.7.1.min.js"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-3.7.1.min.js"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-3.7.1.min.js"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-api-3.7.1.min.js"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-mathjax-3.7.1.min.js"></script>
<div>s
{{ script| safe }}
</div>
<a href="{% url 'home' %}">Go Back</a>
</div>
</body>
<style>
.center {
margin: auto;
width: 40%;
padding: 10px;
}
caption {
caption-side: bottom;
padding: 8px;
font-weight: normal;
font-size: 0.8rem;
text-align: left;
}
.table-striped {
--bs-table-striped-bg: rgba(213, 217, 255, 0.7);
}
</style>
{% endblock %}

View File

@ -1,11 +1,7 @@
<head>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<link href=”https://cdn.pydata.org/bokeh/release/bokeh-3.7.1.min.css" rel=”stylesheet” type=”text/css”>
<link href=”https://cdn.pydata.org/bokeh/release/bokeh-widgets-3.7.1.min.css" rel=”stylesheet” type=”text/css”>
</head>
{% extends 'base.html' %}
{% block content %}
<body>
<div class="center">
<h1>Isotopes</h1>
<table class="table w-auto table-responsive-sm table-striped table-hover table-bordered">
@ -39,43 +35,14 @@
</table>
{{ div| safe }}
<div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.2.2/es5/latest.js"
integrity="sha512-nUTIGJLS9aRMjQaRwpCiC+0Y2RzgW4sufFhFgyjHgn15DXLSfoVUaEa83CsNe2FSJpLXtfgdVfgL7a0lrbcBWA=="
crossorigin="anonymous"
referrerpolicy="no-referrer">
</script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-3.7.1.min.js"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-3.7.1.min.js"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-3.7.1.min.js"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-api-3.7.1.min.js"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-mathjax-3.7.1.min.js"></script>
{{ script| safe }}
<div>
{{ script| safe }}
</div>
<a href="{% url 'home' %}">Go Back</a>
</div>
</body>
<style>
.center {
margin: auto;
width: 40%;
padding: 10px;
}
caption {
caption-side: bottom;
padding: 8px;
font-weight: normal;
font-size: 0.8rem;
text-align: left;
}
.table-striped {
--bs-table-striped-bg: rgba(213, 217, 255, 0.7);
}
</style>
{% endblock %}

View File

@ -1,16 +1,5 @@
<head>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
</head>
<style>
.center {
margin: auto;
width: 60%;
border: 3px solid #90befb;
border: 3px solid #a5addb;
padding: 10px;
}
</style>
{% extends 'base.html' %}
{% block content %}
<div class="container text-left">
<h1>SFG Position Calculator</h1>
@ -75,3 +64,4 @@
{{ ans }}
</div>
{% endblock %}