Upgrade from bootstrap 4.5 to 5.3. (#34)

This upgrades the use of bootstrap css framework to the current 5.3 version. In this change I have updated the default template and cleaned up the files a bit. I also updated the top menu a bit and changed how it reacts with the document. The main menu is also now a small drop down menu instead of being part of the header. I removed the use of jquery and modernized the limited javascript for the fvwmwindow. Now this just does a single lookup and launches and runs listeners on any fvwmwindows found when the page loads. Most of the changes are around just making bootstrap 5 work and ensure things work.
fvwmorg · Apr 9, 2024 · 70c312a · 70c312a
1 parent 5eeaabc
commit 70c312a
Show file tree

Hide file tree

Showing 29 changed files with 193 additions and 288 deletions.
diff --git a/Wiki/Config/Bindings/index.md b/Wiki/Config/Bindings/index.md
@@ -4,15 +4,12 @@ type: config
 weight: 650
 description: |
   This describes how to configure Mouse and Key bindings.
-
 ---
+# Bindings
+
 * TOC
 {:toc}
 
-
-Bindings
-========
-
 Bindings are actions/functions that can be triggered by hitting a key
 (or key combination) or mouse buttons. These bindings can be used to
 launch programs, run buit in functions (like Maximize or Iconify),

diff --git a/Wiki/Config/Colorsets/index.md b/Wiki/Config/Colorsets/index.md
@@ -8,13 +8,12 @@ description: |
   the foreground and background color along with the shade and highlight
   color (for 3D relief on borders). Colorsets can also use pixmaps
   and be transparent.
-
 ---
+# Colorsets
+
 * TOC
 {:toc}
 
-# Colorsets
-
 A Colorset is a collection of colors: foreground (fg), background (bg), hilight (hi),
 and shade (sh). The foreground is the color of the text, background is the color
 behind the text, and the hilight and shade are used to give a 3D beveled effect around

diff --git a/Wiki/Config/Commands/index.md b/Wiki/Config/Commands/index.md
@@ -7,12 +7,11 @@ description: |
   it processes the command to set/change settings, preform actions, and
   so on. This page is an overview of how Fvwm works and processes commands.
 ---
+# Fvwm Commands
 
 * TOC
 {:toc}
 
-# Fvwm Commands
-
 Fvwm is configured and controlled though an extensive list of commands.
 These commands control all aspects of Fvwm.
 

diff --git a/Wiki/Config/Decor/index.md b/Wiki/Config/Decor/index.md
@@ -6,13 +6,12 @@ description: |
   This gives an overview of how to configure window decorations.
   See <a href="{{ "/Decor" | prepend: site.wikiurl }}">/Decor</a>
   for example decors.
-
 ---
+# Window Decor
+
 * TOC
 {:toc}
 
-# Window Decor
-
 A Window Decor defines how a window looks. There are two
 different meanings of Window Decor that could get used.
 

diff --git a/Wiki/Config/Functions/FunctionContext/index.md b/Wiki/Config/Functions/FunctionContext/index.md
@@ -6,14 +6,11 @@ description: |
   Functions are usually run in the context of the window in which
   they were run, but not always. Here are some pointers for ensuring
   commands are run in the correct context.
-
 ---
-* TOC
-{:toc}
-
 # Function Context
 
-## Introduction
+* TOC
+{:toc}
 
 Under most circumstances, functions tend to be invoked within a window context.
 That means the set of commands within the function operate on a window.  More

diff --git a/Wiki/Config/Fvwm2rc/index.md b/Wiki/Config/Fvwm2rc/index.md
@@ -6,13 +6,12 @@ description: |
   Fvwm is configured through a configuration file located at ~/.fvwm/config
   (default), also known as the Fvwm2rc or .fvwm2rc file. This page is
   an overview of the location of that file and how Fvwm starts.
-
 ---
+# The Fvwm2rc file
+
 * TOC
 {:toc}
 
-# The Fvwm2rc file
-
 Fvwm is configured through an extensive config file. At the release of Fvwm 2,
 the config file was located at ~/.fvwm2rc to not conflict with ~/.fvwmrc for Fvwm 1.
 It then moved to ~/.fvwm/.fvwm2rc and finally to ~/.fvwm2rc/config (although some old

diff --git a/Wiki/Config/Menus/index.md b/Wiki/Config/Menus/index.md
@@ -8,14 +8,12 @@ description: |
   with scripts, such as wall paper menus, a menu that allows you to
   see all files in $HOME, etc. This is the basics of configuring
   Menus.
-
 ---
+# Menus
+
 * TOC
 {:toc}
 
-Menus
-=====
-
 Menus are lists you can pop up from a binding or hook it to a start menu
 on a panel. Menus can be used to list programs or even be created dynamically
 so you can list the contents of a directory, a recent applications menu,

diff --git a/Wiki/Config/StyleTips/index.md b/Wiki/Config/StyleTips/index.md
@@ -8,16 +8,14 @@ description: |
   This article</a> by Thomas Adam.
 
 ---
+# FVWM: How Styles are Applied
+
 * TOC
 {:toc}
 
-# FVWM: How Styles are Applied
-
 *This is a copy of the following article by Thomas Adam:
 <https://linuxgazette.net/127/adam.html>*
 
-## Introduction
-
 Configuring FVWM can seem like a chore at times. Indeed, there are
 certain aspects of it that are easy - and some that are less so. I've been
 helping people configure FVWM for some time now, and while I have delved

diff --git a/Wiki/Config/VectorButtons/index.md b/Wiki/Config/VectorButtons/index.md
@@ -5,13 +5,12 @@ weight: 440
 description: |
   Vector Buttons are a built in method for drawing buttons for windows in Fvwm.
   This describes the syntax and provides a collection of examples.
-
 ---
+# Vector Buttons
+
 * TOC
 {:toc}
 
-# Vector Buttons
-
 Vectors are a method to draw window buttons in Fvwm. A Vector definition
 describes the button as a square. Position in the button is the X and Y
 location as a percentage between 0 and 100 from the top left corner of the button.

diff --git a/Wiki/Menus/WindowOps/index.md b/Wiki/Menus/WindowOps/index.md
@@ -5,13 +5,12 @@ weight: 500
 description: |
   This menu is just a collection of actions (Maximize, Iconify,
   Close, etc) that can be used to control windows.
-
 ---
+# WindowOps Menu
+
 * TOC
 {:toc}
 
-# WindowOps Menu
-
 These are a collection of Menus that can be used to control windows.
 The menus can be accessed from a root menu in which you have to select
 the window to operate on. They can also be bound to window buttons or

diff --git a/Wiki/NewToFvwm/index.md b/Wiki/NewToFvwm/index.md
@@ -1,12 +1,10 @@
 ---
 title: NewToFvwm
 ---
-* TOC
-{:toc}
-
 # New to FVWM
 
-## Introduction 
+* TOC
+{:toc}
 
 Welcome. So you're new to FVWM and you're wondering what it's all about.
 Perhaps you want some further information about FVWM but don't quite know

diff --git a/Wiki/Panels/FvwmTaskBar/index.md b/Wiki/Panels/FvwmTaskBar/index.md
@@ -5,13 +5,12 @@ weight: 500
 description: |
   This seems to be a common Panel asked about and with the
   removal of FvwmTaskBar here is a replacement.
-
 ---
+# FvwmTaskBar
+
 * TOC
 {:toc}
 
-# FvwmTaskBar
-
 FvwmTaskBar is similar to the classic windows taskbar along the
 bottom of the screen. In older versions of fvwm there was a module
 FvwmTaskBar, but this was removed in 2.6.7 in favor of using

diff --git a/Wiki/Panels/RightPanel/index.md b/Wiki/Panels/RightPanel/index.md
@@ -5,13 +5,12 @@ weight: 600
 description: |
   This is a description of the RightPanel found in the
   default configuration.
-
 ---
+# RightPanel
+
 * TOC
 {:toc}
 
-# RightPanel
-
 The RightPanel is a taskbar like panel along the right edge of the screen
 for a now more common widescreen setup. This panel contains [FvwmPager](
 {{ "/Moduels/FvwmPager" | prepend: site.wikiurl }}) for moving around

diff --git a/Wiki/Panels/SensorDock/index.md b/Wiki/Panels/SensorDock/index.md
@@ -7,13 +7,12 @@ description: |
   uses xosview to show cpu, mem, disk, etc., uses FvwmScript to
   show the date/time and temperature outputs from lm-sensors
   and a systemtray.
-
 ---
+# SensorDock
+
 * TOC
 {:toc}
 
-# SensorDock
-
 SensorDock is a dock which uses [FvwmButtons](
 {{ "/Modules/FvwmButtons" | prepend: site.wikiurl }}) to Swallow
 different apps such as [FvwmPager](

diff --git a/Wiki/Panels/index.md b/Wiki/Panels/index.md
@@ -8,13 +8,12 @@ description: |
   as a taskbar or pager. Fvwm provides various modules to help build
   panels. This can also be mixed with third party software or even
   use a third party panel.
-
 ---
+# Panels and Docks
+
 * TOC
 {:toc}
 
-# Panels and Docks
-
 Like everything else in Fvwm these need to be configured. Fvwm provides
 lots of choice of how to configure the panels you want to use.
 

diff --git a/Wiki/Tips/CapsLockAsModifier/index.md b/Wiki/Tips/CapsLockAsModifier/index.md
@@ -4,14 +4,11 @@ type: tip
 description: |
   This describes how to configure CapsLock as a Modifier for Key and
   Mouse bindings.
-
 ---
-* TOC
-{:toc}
-
 # Caps Lock as FVWM Key
 
-## Introduction
+* TOC
+{:toc}
 
 Many people think of Caps Lock as a very annoying key at an annoying
 position. Lots of us also know Windows, Amiga, or Macintosh keys, which are

diff --git a/Wiki/Tips/FocusStealing/index.md b/Wiki/Tips/FocusStealing/index.md
@@ -5,14 +5,11 @@ description: |
   Some applications want to steal focus when an event
   is trigered. This describes how to disable apps from
   stealing focus in Fvwm.
-
 ---
-* TOC
-{:toc}
-
 # Stopping Applications Stealing Focus
 
-## Introduction
+* TOC
+{:toc}
 
 Many people are confused by some applications appearing to steal focus.
 Usually, the following isn't enough:

diff --git a/Wiki/Tips/GradientBackgrounds/index.md b/Wiki/Tips/GradientBackgrounds/index.md
@@ -3,14 +3,13 @@ title: Gradient Backgrounds
 type: tip
 description: |
   This descibes how to get nice gradients on different fvwm desktops or pages.
-
 ---
+# Gradient Backgrounds
+
 * TOC
 {:toc}
 
-# Gradient Backgrounds
-
-This descibes how to get nice gradients on different fvwm desktops or pages.
+This describes how to get nice gradients on different fvwm desktops or pages.
 
 ## Create the Gradients
 

diff --git a/Wiki/Tips/RxvtRunDialogue/index.md b/Wiki/Tips/RxvtRunDialogue/index.md
@@ -4,14 +4,11 @@ type: tip
 description: |
   This uses Rxvt to configure pop up a little dialog you can type a command
   to execute.
-
 ---
-* TOC
-{:toc}
-
 # An RXVT based run dialog with tab completion
 
-## Introduction
+* TOC
+{:toc}
 
 What follows is the description of a very simple way to realize a run dialog (a
 little dialog where the user can enter the name of an executable to start) using

diff --git a/Wiki/Tips/SwallowXloadFvwmButtons/index.md b/Wiki/Tips/SwallowXloadFvwmButtons/index.md
@@ -4,13 +4,12 @@ type: tip
 description: |
   This describes how to build a system monintor by Swallowing
   xload inside of FvwmButtons.
-
 ---
+# Using FvwmButtons to Swallow Xload
+
 * TOC
 {:toc}
 
-# Using FvwmButtons to Swallow Xload
-
 ## Simple Example
 
 The simplest example of swallowing xload is to create a definition similar to this one:

diff --git a/Wiki/_layouts/wiki.html b/Wiki/_layouts/wiki.html
diff --git a/Wiki/img/fvwm-logo_sml.png b/Wiki/img/fvwm-logo_sml.png
diff --git a/_includes/fvwmwindow.html b/_includes/fvwmwindow.html
@@ -24,9 +24,7 @@
 {% if include.bgcolor %}{% assign fvwmbgcolor=include.bgcolor %}
 {% else %}{% assign fvwmbgcolor=fvwmcolor %}{% endif %}
 
-<div class="fvwmwindow{% if include.max %} fvwmwindow-max{% endif %}" id="fvwmwindow-{{ id }}"
-     onMouseOver="$( '#fvwmwindow-title-{{ id }}' ).addClass( 'fwin-focus' )"
-     onMouseOut="$( '#fvwmwindow-title-{{ id }}' ).removeClass( 'fwin-focus' )">
+<div id="fvwmwindow-{{ id }}" class="fvwmwindow{% if include.max %} fvwmwindow-max{% endif %}" data-fvwmid="{{ id }}">
   <div class="fvwmwindow-top fwin-top-{{ fvwmcolor }}"></div>
   <div class="fvwmwindow-bottom fwin-bottom-{{ fvwmcolor }}"></div>
   <div class="fvwmwindow-left fwin-left-{{ fvwmcolor }}"></div>
@@ -37,17 +35,12 @@
   <div class="fvwmwindow-bottom-right fwin-bottom-right-{{ fvwmcolor }}"></div>
 
   <div class="fvwmwindow-title-bar">
-    <div class="fvwmwindow-button1 fwin-button1-{{ fvwmcolor }}"
-         onClick="$( '#fvwmwindow-{{ id }}' ).toggleClass( 'fvwmwindow-max' )"></div>
-    <div id="fvwmwindow-title-{{ id }}"
-         class="fvwmwindow-title fwin-title-{{ fvwmcolor }} fwin-{{ fvwmcolor }}"
-         ondblclick="$( '#fvwmwindow-main-{{ id }}' ).toggleClass( 'fvwmwindow-min' )">
+    <div class="fvwmwindow-button1 fwin-button1-{{ fvwmcolor }}" data-fvwmid="{{ id }}"></div>
+    <div id="fvwmwindow-title-{{ id }}" class="fvwmwindow-title fwin-title-{{ fvwmcolor }} fwin-{{ fvwmcolor }}" data-fvwmid="{{ id }}">
       {{ include.title }}
     </div>
-    <div class="fvwmwindow-button2 fwin-button2-{{ fvwmcolor }}"
-     onClick="$( '#fvwmwindow-main-{{ id }}' ).removeClass( 'fvwmwindow-min' )"></div>
-    <div class="fvwmwindow-button4 fwin-button4-{{ fvwmcolor }}"
-     onClick="$( '#fvwmwindow-main-{{ id }}' ).addClass( 'fvwmwindow-min' )"></div> 
+    <div class="fvwmwindow-button2 fwin-button2-{{ fvwmcolor }}" data-fvwmid="{{ id }}"></div>
+    <div class="fvwmwindow-button4 fwin-button4-{{ fvwmcolor }}" data-fvwmid="{{ id }}"></div>
   </div>
 
   <div id="fvwmwindow-main-{{ id }}" class="fvwmwindow-main fwin-{{ fvwmbgcolor }}{% if include.shade %} fvwmwindow-min{% endif %}">