Updated Bootstrap

Bernardo-MG · May 21, 2021 · c8f658d · c8f658d
1 parent 641a127
commit c8f658d
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 39 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -1,6 +1,5 @@
 {
   "latedef"       : true,
   "nonew"         : true,
-  "maxdepth"      : 3,
-  "jquery"        : true
+  "maxdepth"      : 3
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,11 +5,10 @@
    },
    "dependencies": {
       "@fortawesome/fontawesome-free": "~5.15.3",
-      "bootstrap": "~4.5.3",
-      "bootswatch": "~4.5.3",
+      "bootstrap": "~5.0.1",
+      "bootswatch": "~5.0.1",
       "clean-css-cli": "~4.3.0",
       "csslint": "~1.0.5",
-      "html5shiv": "~3.7.3",
-      "jquery": "~3.5.1"
+      "html5shiv": "~3.7.3"
    }
 }
diff --git a/pom.xml b/pom.xml
@@ -344,7 +344,6 @@
                               <include>bootstrap/dist/js/bootstrap.min.js</include>
                               <include>bootswatch/dist/*/bootstrap.min.css</include>
                               <include>html5shiv/dist/html5shiv.min.js</include>
-                              <include>jquery/dist/jquery.min.js</include>
                            </includes>
                         </resource>
                         <resource>

diff --git a/src/main/resources/META-INF/maven/macros/menu-macros.vm b/src/main/resources/META-INF/maven/macros/menu-macros.vm
@@ -35,11 +35,11 @@
 #**##foreach( $element in $elements )
                     <li class="nav-item dropdown">
                         <a href="#" class="nav-link dropdown-toggle" id="$element.name.replace(" ", "_")_menu" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">$element.name</a>
-                        <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="$element.name.replace(" ", "_")_menu">
+                        <ul class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="$element.name.replace(" ", "_")_menu">
 #*    *##foreach( $item in $element.items )
-                            <a class="dropdown-item" href="$item.href" title="$item.name">$item.name</a>
+                            <li><a class="dropdown-item" href="$item.href" title="$item.name">$item.name</a></li>
 #*    *##end
-                        </div>
+                        </ul>
                     </li>
 #**##end
 #end
@@ -80,11 +80,11 @@
 #**##if( $elements.size() > 0 )
                     <li class="dropdown">
                         <a href="#" class="nav-link dropdown-toggle" id="links_menu" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Links</a>
-                        <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="links_menu">
+                        <ul class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="links_menu">
 #*    *##foreach( $item in $elements )
-                            <a class="dropdown-item" href="$item.href" title="$item.name">$item.name</a>
+                            <li><a class="dropdown-item" href="$item.href" title="$item.name">$item.name</a></li>
 #*    *##end
-                        </div>
+                        </ul>
                     </li>
 #**##end
 #end

diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
@@ -117,19 +117,20 @@
 <body class="d-flex flex-column">
 <header>
     <nav id="navbar-main" class="navbar navbar-expand-md navbar-light bg-light">
-        <a class="navbar-brand" href="./index.html">$project.name</a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-main-menu" aria-controls="navbar-main" aria-expanded="false" aria-label="Toggle navigation">
-           <span class="navbar-toggler-icon"></span>
-        </button>
+        <div class="container-fluid">
+            <a class="navbar-brand" href="./index.html">$project.name</a>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-main-menu" aria-controls="navbar-main" aria-expanded="false" aria-label="Toggle navigation">
+               <span class="navbar-toggler-icon"></span>
+            </button>
 
 #**##if( $decoration.publishDate.position != "none" )
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">${project.version}</span> (<time id="navbar-date">#publishDate()</time>)</small>
+            <small class="navbar-text d-none d-md-block"><span id="navbar-version">${project.version}</span> (<time id="navbar-date">#publishDate()</time>)</small>
 #**##else
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">${project.version}</span></small>
+            <small class="navbar-text d-none d-md-block"><span id="navbar-version">${project.version}</span></small>
 #**##end
 #**##if( $decoration.edit && $docRenderingContext.editable )
 #**##* Doxia edition button. *#
-        <div class="navbar-text"><a href="$docRenderingContext.getDoxiaSourcePath( $decoration.edit )"><span class="fas fa-edit" aria-hidden="true"></span></a></div>
+            <div class="navbar-text"><a href="$docRenderingContext.getDoxiaSourcePath( $decoration.edit )"><span class="fas fa-edit" aria-hidden="true"></span></a></div>
 #**##end
 #set( $iconMenuElements = [] )
 #loadIconNavMenuList( $iconMenuElements )
@@ -141,18 +142,19 @@
 #**##set( $linkMenuElements = [] )
 #end
 #if( $iconMenuElements.size() > 0 )
-        <div class="col-sm d-none d-md-block">
+            <div class="col-sm d-none d-md-block">
 #**##iconsMenu( $iconMenuElements )
-        </div>
+            </div>
 #end
 #if( $dropDownMenuElements.size() > 0 || $linkMenuElements.size() > 0 )
-        <div class="collapse navbar-collapse" id="navbar-main-menu">
-            <ul class="nav navbar-nav ml-auto">
+            <div class="collapse navbar-collapse" id="navbar-main-menu">
+                <ul class="nav navbar-nav ml-auto">
 #**##linksMenu( $linkMenuElements )
 #**##dropdownMenu( $dropDownMenuElements )
-            </ul>
-        </div>
+                </ul>
+            </div>
 #end
+        </div>
     </nav>
 </header>
 <section id="main-section" class="container flex-grow-1">
@@ -176,7 +178,6 @@ $bodyContent
         <div>Rendered using <a href="@project.url@">@project.name@</a> @project.version@</div>
     </div>
 </footer>
-<script src="./lib/jquery/dist/jquery.min.js"></script>
 <script src="./lib/bootstrap/dist/js/bootstrap.min.js"></script>
 <script src="./lib/highlight/highlight.pack.js"></script>
 <script src="./js/initializeHighlight.js"></script>

diff --git a/src/test/resources/it/resources/verify.groovy b/src/test/resources/it/resources/verify.groovy
@@ -6,7 +6,6 @@
     'target/site/lib/bootswatch/dist/litera/bootstrap.min.css',
     'target/site/lib/font-awesome/css/all.min.css',
     'target/site/lib/html5shiv/dist/html5shiv.min.js',
-    'target/site/lib/jquery/dist/jquery.min.js',
     'target/site/lib/highlight/highlight.pack.js'
 ].each {
     def file = new File(basedir, it)