ddp/books
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgraded to base U22.04 image, realised that by putting bootstrap5 stuff in for login its borked the format of many files, so partially converted to use new bootstrap, still work to go

Browse Source
This commit is contained in:
Damien De Paoli
2022-07-02 12:52:34 +10:00
parent 3c8dc980b1
commit 8834893df3
3 changed files with 75 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
templates/base.html
View File

@@ -10,9 +10,8 @@
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="{{ url_for( 'static', filename='upstream/bootstrap-5.0.2-dist/css/bootstrap.min.css' ) }}">
<link rel="stylesheet" href="{{ url_for( 'static', filename='upstream/DataTables-1.11.3/css/jquery.dataTables.min.css' ) }}">
<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.0/dist/bootstrap-table.min.css">
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.22/css/dataTables.bootstrap4.min.css">
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
<script src="https://kit.fontawesome.com/9b4c7cf470.js" crossorigin="anonymous"></script>
{% import "bootstrap/wtf.html" as wtf %}
@@ -51,7 +50,7 @@
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<div class="navbar-nav col-12">
<div class="nav-item dropdown">
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="BookMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Books</a>
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="BookMenu" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Books</a>
<div class="dropdown-menu" aria-labelledby="BookMenu">
<a class="dropdown-item" href="{{url_for('new_book')}}">Create</a>
<a class="dropdown-item" href="{{url_for('books')}}">Show All</a>
@@ -66,28 +65,28 @@
</div>
</div class="nav-item dropdown">
<div class="nav-item dropdown">
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="AuthorMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Authors</a>
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="AuthorMenu" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Authors</a>
<div class="dropdown-menu" aria-labelledby="AuthorMenu">
<a class="dropdown-item" href="{{url_for('new_author')}}">Create</a>
<a class="dropdown-item" href="{{url_for('authors')}}">Show All</a>
</div>
</div class="nav-item dropdown">
<div class="nav-item dropdown">
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="PublisherMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Publishers</a>
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="PublisherMenu" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Publishers</a>
<div class="dropdown-menu" aria-labelledby="PublisherMenu">
<a class="dropdown-item" href="{{url_for('new_publisher')}}">Create</a>
<a class="dropdown-item" href="{{url_for('publishers')}}">Show All</a>
</div>
</div class="nav-item dropdown">
<div class="nav-item dropdown">
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="SeriesMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Series</a>
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="SeriesMenu" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Series</a>
<div class="dropdown-menu" aria-labelledby="SeriesMenu">
<a class="dropdown-item" href="{{url_for('new_series')}}">Create</a>
<a class="dropdown-item" href="{{url_for('seriess')}}">Show All</a>
</div>
</div class="nav-item dropdown">
<div class="nav-item dropdown">
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="AdminMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Admin</a>
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="AdminMenu" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Admin</a>
<div class="dropdown-menu" aria-labelledby="AdminMenu">
<a class="dropdown-item" href="{{url_for('new_genre')}}">Create new Genre</a>
<a class="dropdown-item" href="{{url_for('genres')}}">Show Genres</a>
@@ -109,7 +108,7 @@
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
</form>
<div class="nav-item dropdown dropdown-menu-right">
<a class="nav-link dropdown-toggle" href="#" id="UserMenu" role="button" data-toggle="dropdown" aria-expanded="false">
<a class="nav-link dropdown-toggle" href="#" id="UserMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
&nbsp;
&nbsp;
&nbsp;
@@ -140,10 +139,9 @@
{% if not InDBox %}
<!-- code to get bootstrap & bootstrap datatable to work -->
<script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
<script src="https://cdn.datatables.net/1.10.22/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.datatables.net/1.10.22/js/dataTables.bootstrap4.min.js"></script>
<script src="{{ url_for( 'static', filename='upstream/jquery-3.6.0.min.js')}}"></script>
<script src="{{ url_for( 'static', filename='upstream/bootstrap-5.0.2-dist/js/bootstrap.bundle.min.js')}}"></script>
<script src="{{ url_for( 'static', filename='upstream/DataTables-1.11.3/js/jquery.dataTables.min.js' )}}"></script>
<script>
$(document).ready(function() {
{% if 'Author(s)' in order_by %}