Merge pull request #18 from quillcraftsman/pretty_urls

add pretty urls to skeleton template
quillcraftsman · Sep 22, 2023 · c8a5c87 · c8a5c87
2 parents fc37d1e + 4d7f8b3
commit c8a5c87
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/cactus/skeleton/config.json b/cactus/skeleton/config.json
@@ -1 +1,3 @@
-{}
+{
+  "prettify": true
+}
diff --git a/cactus/skeleton/pages/contact.html b/cactus/skeleton/pages/contact.html
@@ -6,7 +6,7 @@
 {% block body %}
 
 <div class="text-center bg-body-tertiary rounded-3">
-    <img src="static/images/logo.png" class="bi mt-4 mb-3" width="100" height="100">
+    <img src="{% static 'images/logo.png' %}" class="bi mt-4 mb-3" width="100" height="100">
    <h1 class="text-body-emphasis">Contact</h1>
     <p class="col-lg-8 mx-auto fs-5 text-muted">
        <ul class="list-group">

diff --git a/cactus/skeleton/pages/index.html b/cactus/skeleton/pages/index.html
@@ -6,14 +6,14 @@
 {% block body %}
 
 <div class="text-center bg-body-tertiary rounded-3">
-    <img src="static/images/logo.png" class="bi mt-4 mb-3" width="100" height="100">
+    <img src="{% static 'images/logo.png' %}" class="bi mt-4 mb-3" width="100" height="100">
     <h1 class="text-body-emphasis">Welcome to LavaCactus!</h1>
     <p class="col-lg-8 mx-auto fs-5 text-muted">
       Get started with this template based on Bootstrap 5. Go ahead, explore!
     </p>
     <div class="d-inline-flex gap-2 mb-5">
         <a class="d-inline-flex align-items-center btn btn-primary btn-lg px-4 rounded-pill" href="https://github.com/quillcraftsman/lavacactus/" target="_blank">Project on GitHub</a>
-      <a class="btn btn-outline-secondary btn-lg px-4 rounded-pill" href="contact.html">Contact</a>
+      <a class="btn btn-outline-secondary btn-lg px-4 rounded-pill" href="{% url '/contact.html' %}">Contact</a>
     </div>
   </div>
 

diff --git a/cactus/skeleton/templates/base.html b/cactus/skeleton/templates/base.html
@@ -11,29 +11,29 @@
   </title>
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width">
-  <link rel="icon" type="image/x-icon" href="static/images/favicon.ico" />
+  <link rel="icon" type="image/x-icon" href="{% static 'images/favicon.ico' %}" />
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">
-  <link rel="stylesheet" href="static/css/bootstrap.css">
+  <link rel="stylesheet" href="{% static 'css/bootstrap.css' %}">
 </head>
 
 <body class="d-flex flex-column h-100">
   <nav class="navbar navbar-expand-md navbar-dark bg-dark mb-4">
     <div class="container-fluid">
-      <a class="navbar-brand" href="index.html">LavaCactus</a>
+      <a class="navbar-brand" href="{% url '/index.html' %}">LavaCactus</a>
       <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse"
         aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarCollapse">
         <ul class="navbar-nav me-auto mb-2 mb-md-0">
           <li class="nav-item">
-            <a class="nav-link {% if_current_page '/index.html' 'active' '' %}" href="index.html">Home</a>
+            <a class="nav-link {% if_current_page '/index.html' 'active' '' %}" href="{% url '/index.html' %}">Home</a>
           </li>
           <li class="nav-item">
-            <a class="nav-link {% if_current_page '/about.html' 'active' '' %}" href="about.html">About</a>
+            <a class="nav-link {% if_current_page '/about.html' 'active' '' %}" href="{% url '/about.html' %}">About</a>
           </li>
           <li class="nav-item">
-            <a class="nav-link {% if_current_page '/contact.html' 'active' '' %}" href="contact.html">Contact</a>
+            <a class="nav-link {% if_current_page '/contact.html' 'active' '' %}" href="{% url '/contact.html' %}">Contact</a>
           </li>
         </ul>
       </div>
@@ -46,8 +46,8 @@
   <footer
     class="footer mt-auto py-3 bg-dark d-flex flex-wrap justify-content-between align-items-center py-3 px-3 border-top">
     <div class="col-md-4 d-flex align-items-center">
-      <a href="index.html" class="mb-3 me-2 mb-md-0 text-muted text-decoration-none lh-1">
-        <img src="static/images/logo.png" class="bi" width="30" height="24">
+      <a href="{% url '/index.html' %}" class="mb-3 me-2 mb-md-0 text-muted text-decoration-none lh-1">
+        <img src="{% static 'images/logo.png' %}" class="bi" width="30" height="24">
       </a>
       <span class="mb-3 mb-md-0 text-muted">Copyleft &#127279; LavaCactus 2023</span>
     </div>
@@ -61,8 +61,8 @@
 
   </footer>
 
-  <script src="{% static 'static/js/vendor/jquery-3.7.0.js' %}"></script>
-  <script src="{% static 'static/js/vendor/bootstrap.js' %}"></script>
+  <script src="{% static 'js/vendor/jquery-3.7.0.js' %}"></script>
+  <script src="{% static 'js/vendor/bootstrap.js' %}"></script>
 </body>
 
 {% block scripts %}

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 from setuptools import setup
 
 PACKAGE_NAME = 'lava-cactus'
-VERSION = "1.2.1"
+VERSION = "1.3.0"
 SKELETON_FOLDERS = [
     'pages',
     'plugins',