Switch to doing things the Bootstrap 5 way

davorg · Mar 14, 2024 · d368b42 · d368b42
1 parent a8f2363
commit d368b42
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 33 deletions.
diff --git a/in/album.tt b/in/album.tt
@@ -3,7 +3,7 @@
 
     <p><a href="index.html">Return to list</a></p>
 
-    <table class="table table-striped table-condensed table-hover table-bordered">
+    <table class="table table-striped table-sm table-hover table-bordered">
       <tr>
         <th>Code</th>
         <td>[% album.cat %]</td>

diff --git a/in/albums.tt b/in/albums.tt
@@ -2,7 +2,7 @@
     <h1>Cooking Vinyl Compilations</h1>
     <p>A list of compilations released by
       <a href="http://www.cookingvinyl.com/">Cooking Vinyl</a> records.</p>
-    <table id="datatable" class="tablesorter table table-striped table-condensed table-hover table-bordered">
+    <table id="datatable" class="tablesorter table table-striped table-sm table-hover table-bordered">
       <thead>
         <tr>
           <th>Catalogue</th><th>Year</th><th>Title</th>

diff --git a/in/artist.tt b/in/artist.tt
@@ -3,7 +3,7 @@
 
     <p><a href="index.html">Return to list</a></p>
 
-    <table id="datatable" class="tablesorter table table-striped table-condensed table-hover table-bordered">
+    <table id="datatable" class="tablesorter table table-striped table-sm table-hover table-bordered">
       <thead>
         <tr>
           <th>Song</th><th>Album</th><th>Cat</th>

diff --git a/in/artists.tt b/in/artists.tt
@@ -2,7 +2,7 @@
     <h1>Artists</h1>
     <p>A list of artists on compilations released by
       <a href="http://www.cookingvinyl.com/">Cooking Vinyl</a> records.</p>
-    <table id="datatable" class="tablesorter table table-striped table-condensed table-hover table-bordered">
+    <table id="datatable" class="tablesorter table table-striped table-sm table-hover table-bordered">
       <thead>
         <tr>
           <th>Artist</th>

diff --git a/in/song.tt b/in/song.tt
@@ -3,7 +3,7 @@
 
     <p><a href="index.html">Return to list</a></p>
 
-    <table id="datatable" class="tablesorter table table-striped table-condensed table-hover table-bordered">
+    <table id="datatable" class="tablesorter table table-striped table-sm table-hover table-bordered">
       <thead>
         <tr>
           <th>Artist</th><th>Album</th><th>Cat</th>

diff --git a/in/songs.tt b/in/songs.tt
@@ -2,7 +2,7 @@
     <h1>Songs</h1>
     <p>A list of songs on compilations released by
       <a href="http://www.cookingvinyl.com/">Cooking Vinyl</a> records.</p>
-    <table id="datatable" class="tablesorter table table-striped table-condensed table-hover table-bordered">
+    <table id="datatable" class="tablesorter table table-striped table-sm table-hover table-bordered">
       <thead>
         <tr>
           <th>Song</th>

diff --git a/tt_lib/page.tt b/tt_lib/page.tt
@@ -13,39 +13,37 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="stylesheet"
+          href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
+          integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
+          crossorigin="anonymous">
     <title>[% title || 'Cooking Vinyl Compilations' %]</title>
     <!-- link rel="stylesheet" href="style.css" type="text/css" / -->
   </head>
   <body>
     <div class="container">
       <div class="header">
-        <nav class="navbar navbar-default">
-  <div class="container-fluid">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="/">Cooking Vinyl Compilations</a>
-    </div>
+        <nav class="navbar navbar-light bg-light navbar-expand-sm">
+          <div class="container">
+            <!-- Brand and toggle get grouped for better mobile display -->
+            <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+              <span class="navbar-toggler-icon"></span>
+            </button>
+            <a class="navbar-brand" href="/">Cooking Vinyl Compilations</a>
 
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-      <ul class="nav navbar-nav">
-        <li><a href="/albums/">Albums</a></li>
-        <li><a href="/artists/">Artists</a></li>
-        <li><a href="/songs/">Songs</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li><a href="/about.html">About</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
+            <!-- Collect the nav links, forms, and other content for toggling -->
+            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+              <ul class="nav navbar-nav">
+                <li class="nav-item"><a class="nav-link" href="/albums/">Albums</a></li>
+                <li class="nav-item"><a class="nav-link" href="/artists/">Artists</a></li>
+                <li class="nav-item"><a class="nav-link" href="/songs/">Songs</a></li>
+              </ul>
+              <ul class="nav navbar-nav ms-auto">
+                <li class="nav-item"><a class="nav-link" href="/about.html">About</a></li>
+              </ul>
+            </div><!-- /.navbar-collapse -->
+          </div><!-- /.container -->
+        </nav>
       </div>
 
       <div class="jumbotron">
@@ -57,7 +55,9 @@
       Site created by <a href="https://twitter.com/davorg">Dave Cross</a><br>
       Code on <a href="https://github.com/davorg/cookingvinyl/">Github</a>
     </footer>
-    <script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
+            integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+            crossorigin="anonymous"></script>
     <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-56165a02d0fe210e" async="async"></script>
     <script type="text/javascript"
       src="https://code.jquery.com/jquery-3.1.1.slim.min.js"