Release week 51 (#307)

MichaIng · Dec 18, 2023 · dbf5096 · dbf5096
2 parents 8d077b2 + 54b0395
commit dbf5096
Show file tree

Hide file tree

Showing 24 changed files with 228 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
       run: bash -c "$(curl -sSf "https://raw.githubusercontent.com/${HEAD_OWNER:-$GITHUB_REPOSITORY_OWNER}/DietPi-Website/${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}/deploy.bash")" bash .
     - name: Setup JRE for Nu Html Checker
       # https://github.com/actions/setup-java/tags
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         # https://github.com/adoptium
@@ -46,7 +46,7 @@ jobs:
       id: python
       if: always() && steps.deploy.outcome == 'success'
       # https://github.com/actions/setup-python/tags
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
         check-latest: true

diff --git a/.wordlist.txt b/.wordlist.txt
@@ -165,11 +165,13 @@ IoT
 IPFS
 IPS
 Jackett
+JDK
 Jellyfin
 JH
 Joulinar
 journalctl
 journald
+JRE
 jRiver
 js
 JSON
@@ -209,6 +211,7 @@ maarten
 macOS
 mangas
 marcobrianza
+Mastercard
 Mbit
 MediaWiki
 Metalink
@@ -286,6 +289,7 @@ OTG
 ownCloud
 PaperMC
 passwd
+Patreon
 PCIe
 petitboot
 pHAT

diff --git a/contribute.html b/contribute.html
@@ -52,7 +52,7 @@
 					<a class="nav-link" href="/#download">DOWNLOAD</a>
 					<a class="nav-link" href="/#gettingstarted">GETTING STARTED</a>
 					<a class="nav-link" href="stats.html">STATS</a>
-					<a class="nav-link" href="#contribute">CONTRIBUTE</a>
+					<a class="nav-link" href="#contribute">DONATE</a>
 					<a class="nav-link" href="/#testimonials">TESTIMONIALS</a>
 				</div>
 			</div>
@@ -74,10 +74,30 @@ <h2>Grow in 2022</h2>
 						<br><br>In 2022 we made 13 releases and brought 113 improvements and changes, and fixed 89 bugs. We provided new software titles, support new SBCs and brought many optimisations. There are over <a href="https://dietpi.com/survey/" target="_blank" rel="noopener">120000</a> systems running DietPi.
 						<br><b>Enable us to grow in 2023!</b>
 					</p>
-					<p class="medium-text">
-						<a href="https://www.paypal.com/donate?hosted_button_id=6DVBECXRW3TAA" class="button" target="_blank" rel="noopener">Donate via PayPal</a>
-						<a href="https://www.patreon.com/DietPi" class="button" target="_blank" rel="noopener">Become a Patron</a>
-					</p>
+					<div class="medium-text">
+						<a href="https://www.paypal.com/donate?hosted_button_id=6DVBECXRW3TAA" class="button" target="_blank" rel="noopener">
+							<div style="display: flex;flex-direction: column;justify-content: center;">
+								<div style="display: flex;flex-wrap: wrap;justify-content: center;">
+									<img src="images/contribute/paypal.svg" alt="PayPal Logo" width="32" height="32" loading="lazy">
+									Donate via PayPal
+								</div>
+								<div style="display: flex; gap: 0.5rem; margin-top: 0.5rem; margin-right: auto; margin-left: auto;flex-wrap: wrap;justify-content: center;">
+									<img src="images/contribute/mastercard.svg" alt="Mastercard Logo" width="26" height="16" loading="lazy">
+									<img src="images/contribute/visa.svg" alt="VISA Logo" width="50" height="16" loading="lazy">
+									<img src="images/contribute/american-express.svg" alt="American Express Logo" width="16" height="16" loading="lazy">
+									<img src="images/contribute/discover.svg" alt="Discover Logo" width="42" height="16" loading="lazy">
+								</div>
+							</div>
+						</a>
+						<a href="https://www.patreon.com/DietPi" class="button" target="_blank" rel="noopener" style="min-width: 152px;">
+							<div style="display: flex;flex-direction: column;justify-content: center; height: 100%; margin-left: 0.5rem; margin-right: 0.5rem;">
+								<div style="display: flex;flex-wrap: wrap;justify-content: center;">
+							<img src="images/contribute/patreon.svg" alt="Patreon Logo" width="32" height="32" loading="lazy">
+							Become a Patron
+								</div>
+							</div>
+						</a>
+					</div>
 				</div>
 				<div class="title">
 					<h2>Why contribute to DietPi as an open-source project?</h2>

diff --git a/css/style.css b/css/style.css
@@ -147,6 +147,14 @@ a:active {
 	color: #181a1c;
 	padding: 20px;
 	margin-bottom: 20px;
+	display: flex;
+  margin-left: auto;
+  width: auto;
+  margin-right: auto;
+  justify-content: center;
+  gap: 1rem;
+  flex-wrap: wrap;
+  /*align-items: center;*/
 }
 .large-text {
 	line-height: 1.2em;

diff --git a/dietpi-software.html b/dietpi-software.html
@@ -52,7 +52,7 @@
 					<a class="nav-link" href="/#download">DOWNLOAD</a>
 					<a class="nav-link" href="/#gettingstarted">GETTING STARTED</a>
 					<a class="nav-link" href="stats.html">STATS</a>
-					<a class="nav-link" href="contribute.html">CONTRIBUTE</a>
+					<a class="nav-link" href="contribute.html">DONATE</a>
 					<a class="nav-link" href="/#testimonials">TESTIMONIALS</a>
 				</div>
 			</div>
@@ -2374,6 +2374,64 @@ <h3>Python 3</h3>
 						</div>
 					</div>
 				</div>
+				<!-- Start details for portfolio project java-->
+				<div id="java" class="row single-project">
+					<div class="col-md-4"><a href="images/dietpi-software/java-logo.svg" target="_blank" rel="noopener"><img src="images/dietpi-software/java-logo.svg" alt="Java logo" loading="lazy"></a></div>
+					<div class="col-md-8">
+						<div class="project-description">
+							<div class="project-title clearfix">
+								<h3>Java</h3>
+								<span class="close"></span>
+							</div>
+							<div class="project-info">
+								<div><a href="https://dietpi.com/docs/software/programming/#java" target="_blank" rel="noopener"><span>How to Setup / Details:</span><i class="fa fa-book"></i><u>View</u></a></div>
+							</div>
+							<p>
+								The Java options of DietPi contain these basic options:
+								<br>
+								- Java Runtime Environment JRE
+								<br>
+								- Java Development Kit JDK
+							</p>
+						</div>
+					</div>
+				</div>
+				<!-- Start details for portfolio project 150 mono-->
+				<div id="mono" class="row single-project">
+					<div class="col-md-4"><a href="images/dietpi-software/mono-logo.svg" target="_blank" rel="noopener"><img src="images/dietpi-software/mono-logo.svg" alt="Mono logo" loading="lazy"></a></div>
+					<div class="col-md-8">
+						<div class="project-description">
+							<div class="project-title clearfix">
+								<h3>Mono</h3>
+								<span class="close"></span>
+							</div>
+							<div class="project-info">
+								<div><a href="https://dietpi.com/docs/software/programming/#mono" target="_blank" rel="noopener"><span>How to Setup / Details:</span><i class="fa fa-book"></i><u>View</u></a></div>
+							</div>
+							<p>
+								Mono is a cross platform, open source .NET framework. Is an alternative implementation of the Microsoft .NET framework. 
+							</p>
+						</div>
+					</div>
+				</div>
+				<!-- Start details for portfolio project 17 git-->
+				<div id="git" class="row single-project">
+					<div class="col-md-4"><a href="images/dietpi-software/git-logo.svg" target="_blank" rel="noopener"><img src="images/dietpi-software/git-logo.svg" alt="Git logo" loading="lazy"></a></div>
+					<div class="col-md-8">
+						<div class="project-description">
+							<div class="project-title clearfix">
+								<h3>Git</h3>
+								<span class="close"></span>
+							</div>
+							<div class="project-info">
+								<div><a href="https://dietpi.com/docs/software/programming/#git" target="_blank" rel="noopener"><span>How to Setup / Details:</span><i class="fa fa-book"></i><u>View</u></a></div>
+							</div>
+							<p>
+								Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
+							</p>
+						</div>
+					</div>
+				</div>
 				<div id="go" class="row single-project">
 					<div class="col-md-4"><a href="images/dietpi-software/Go-Logo.png" target="_blank" rel="noopener"><img src="images/dietpi-software/Go-Logo.png" alt="Go logo" loading="lazy"></a></div>
 					<div class="col-md-8">
@@ -3068,6 +3126,27 @@ <h3>VSCodium</h3>
 							<p>Feature rich FLOSS code editor</p>
 						</a>
 					</div>
+					<div class="col-xl-2 col-lg-3 col-md-4 col-6 mix Development">
+						<a href="#softwareinfo" class="thumbnail" rel="#java">
+							<img src="images/dietpi-software/java-logo.svg" alt="Java logo" width="8" height="5" loading="lazy">
+							<h3>Java</h3>
+							<p>Java Runtime Environment JRE and Java Development Kit JDK</p>
+						</a>
+					</div>
+					<div class="col-xl-2 col-lg-3 col-md-4 col-6 mix Development">
+						<a href="#softwareinfo" class="thumbnail" rel="#git">
+							<img src="images/dietpi-software/git-logo.svg" alt="Git logo" width="8" height="5" loading="lazy">
+							<h3>Git</h3>
+							<p>Version control system</p>
+						</a>
+					</div>
+					<div class="col-xl-2 col-lg-3 col-md-4 col-6 mix Development">
+						<a href="#softwareinfo" class="thumbnail" rel="#mono">
+							<img src="images/dietpi-software/mono-logo.svg" alt="Mono logo" width="8" height="5" loading="lazy">
+							<h3>Mono</h3>
+							<p>Open source implementation of Microsoft's .NET Framework</p>
+						</a>
+					</div>
 					<!-- Desktops -->
 					<div class="col-xl-2 col-lg-3 col-md-4 col-6 mix Desktops">
 						<a href="#softwareinfo" class="thumbnail" rel="#lxde">

diff --git a/images/contribute/american-express.svg b/images/contribute/american-express.svg