Skip to content

Commit

Permalink
Add UTM VM image to download page (#197)
Browse files Browse the repository at this point in the history 
- Indicate that our image supports Odroid N2+ as well
- Update and fix ROCK Pi S image, which had the wrong size
- Increase size of thumbnails (SBC/software/contribute/stats tales), respectively reduce their padding a bit, mostly to allow longer SBC texts to fit inside on max width, and also since it doesn't look worse at all.
  • Loading branch information
@MichaIng
MichaIng authored Feb 15, 2022
1 parent 5136f62 commit d5c256b
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 26 deletions.
2 changes: 2 additions & 0 deletions .wordlist.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ HAProxy
HATs
harddisk
Hardkernel
Hardkernel's
HC
hexa
HiFi
Expand Down Expand Up @@ -361,6 +362,7 @@ upvote
UrBackup
Usenet
userdata
UTM
UUID
VirtualBox
VirtualHere
Expand Down
1 change: 1 addition & 0 deletions 404.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<!DOCTYPE html>
<!-- https://github.com/MichaIng/DietPi-Website -->
<html lang="en">
<head>
<meta charset="utf-8">
Expand Down
2 changes: 1 addition & 1 deletion contribute.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<meta name="theme-color" content="#000000">
<!-- Load CSS styles -->
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css?v=1">
<link rel="stylesheet" type="text/css" href="css/style.min.css?v=5">
<link rel="stylesheet" type="text/css" href="css/style.min.css?v=6">
<!-- Include JavaScript -->
<script defer src="js/jquery.min.js"></script>
<script defer src="js/bootstrap.min.js?v=1"></script>
Expand Down
5 changes: 4 additions & 1 deletion css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,15 @@ a:active {
/*
2.2 Thumbnails
**********************************************************************/
.row {
--bs-gutter-x: 0.75rem;
}
.thumbnail {
display: block;
overflow: hidden;
position: relative;
padding: 4px;
margin-bottom: 20px;
margin-bottom: 12px;
text-align: center;
background-color: #164046;
border-radius: 4px;
Expand Down
20 changes: 10 additions & 10 deletions deploy.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,30 @@ if [[ -f '/boot/dietpi/func/dietpi-globals' ]]
then
. /boot/dietpi/func/dietpi-globals
else
curl -sSfL 'https://raw.githubusercontent.com/MichaIng/DietPi/master/dietpi/func/dietpi-globals' -o /tmp/dietpi-globals || exit 1
curl -sSf 'https://raw.githubusercontent.com/MichaIng/DietPi/master/dietpi/func/dietpi-globals' -o /tmp/dietpi-globals || exit 1
. /tmp/dietpi-globals
G_EXEC_NOHALT=1 G_EXEC rm /tmp/dietpi-globals
fi

# Main
G_EXEC cd /tmp
G_EXEC curl -sSfLO "https://github.com/MichaIng/DietPi-Website/archive/$BRANCH.tar.gz"
G_EXEC tar xf $BRANCH.tar.gz
G_EXEC_NOHALT=1 G_EXEC rm $BRANCH.tar.gz
G_EXEC cd DietPi-Website-$BRANCH
G_EXEC tar xf "$BRANCH.tar.gz"
G_EXEC_NOHALT=1 G_EXEC rm "$BRANCH.tar.gz"
G_EXEC cd "DietPi-Website-$BRANCH"
# Cleanup
[[ $GITHUB_ACTIONS ]] || G_EXEC_NOHALT=1 G_EXEC rm -R README.md LICENSE deploy.bash .??*
# Update sitemap timestamps
G_EXEC sed -i "s|<lastmod>.*</lastmod>|<lastmod>$(date '+%Y-%m-%dT%T%:z')</lastmod>|" sitemap.xml

# 3rd party
G_EXEC curl -sSfL 'https://raw.githubusercontent.com/jquery/codeorigin.jquery.com/main/cdn/jquery-3.6.0.min.js' -o js/jquery.js
G_EXEC curl -sSfL 'https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css' -o css/bootstrap.css
G_EXEC curl -sSfL 'https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js' -o js/bootstrap.js
G_EXEC curl -sSf 'https://raw.githubusercontent.com/jquery/codeorigin.jquery.com/main/cdn/jquery-3.6.0.min.js' -o js/jquery.js
G_EXEC curl -sSf 'https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css' -o css/bootstrap.css
G_EXEC curl -sSf 'https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js' -o js/bootstrap.js

# Minify
# - Download
G_EXEC curl -sSfL "$(curl -sSfL 'https://api.github.com/repos/tdewolff/minify/releases/latest' | mawk -F\" '/\"browser_download_url\".*linux_amd64\.tar\.gz\"$/{print $4}')" -o minify.tar.gz
G_EXEC curl -sSfL "$(curl -sSf 'https://api.github.com/repos/tdewolff/minify/releases/latest' | mawk -F\" '/\"browser_download_url\".*linux_amd64\.tar\.gz\"$/{print $4}')" -o minify.tar.gz
G_EXEC tar xf minify.tar.gz minify
G_EXEC_NOHALT=1 G_EXEC rm minify.tar.gz
# - Minify JavaScript
Expand Down Expand Up @@ -86,10 +86,10 @@ then
then
G_EXEC cp -R . "$TARGET_DIR/"
G_EXEC cd /tmp
G_EXEC rm -R DietPi-Website-$BRANCH
G_EXEC rm -R "DietPi-Website-$BRANCH"
else
G_EXEC cd /tmp
G_EXEC mv DietPi-Website-$BRANCH "$TARGET_DIR"
G_EXEC mv "DietPi-Website-$BRANCH" "$TARGET_DIR"
fi
fi
}
2 changes: 1 addition & 1 deletion dietpi-software.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<meta name="theme-color" content="#000000">
<!-- Load CSS styles -->
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css?v=1">
<link rel="stylesheet" type="text/css" href="css/style.min.css?v=5">
<link rel="stylesheet" type="text/css" href="css/style.min.css?v=6">
<!-- Include JavaScript -->
<script defer src="js/jquery.min.js"></script>
<script defer src="js/bootstrap.min.js?v=1"></script>
Expand Down
Binary file modified images/sbc_images/rockpis.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sbc_images/utm.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 29 additions & 7 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<!-- Load CSS styles -->
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css?v=1">
<link rel="stylesheet" type="text/css" href="css/jquery.cslider.min.css?v=3">
<link rel="stylesheet" type="text/css" href="css/style.min.css?v=5">
<link rel="stylesheet" type="text/css" href="css/style.min.css?v=6">
<!-- Include JavaScript -->
<script defer src="js/jquery.min.js"></script>
<script defer src="js/bootstrap.min.js?v=1"></script>
Expand Down Expand Up @@ -70,7 +70,7 @@
<div class="da-slide da-slide-current">
<h2>DietPi v8.1 is here</h2>
<h4>Check out the changes of our new release</h4>
<p>The February 5th 2022 release of DietPi v8.1 comes together with a new image for Odroid N2, some improvements to our drive manager and a number of enhancements and bug fixes for several software install options.</p>
<p>The February 5th 2022 release of DietPi v8.1 comes together with a new image for Odroid N2(+), some improvements to our drive manager and a number of enhancements and bug fixes for several software install options.</p>
<a class="da-link" href="https://dietpi.com/docs/releases/v8_1/" target="_blank" rel="noopener">Release notes</a>
<div class="da-img"><img class="img-fluid" src="images/dietpi-logo_360x360.png" alt="DietPi logo" width="300" height="300" loading="lazy"></div>
</div>
Expand Down Expand Up @@ -473,20 +473,35 @@ <h1>Download</h1>
<div class="col-md-6"><img src="images/sbc_images/parallels.svg" alt="Parallels logo" width="8" height="5" loading="lazy"></div>
</div>
</div>
<div id="utm" class="toggleDiv single-project">
<div class="row"><div class="col-md-12 project-title"><h3>UTM</h3><span class="show_hide close"></span></div></div>
<div class="row">
<div class="col-md-6 project-description">
<div class="project-info">
<div><span>RAM:</span>1 GiB | Can be changed</div>
<br>
<div><a href="https://dietpi.com/downloads/images/DietPi_UTM-x86_64-Bullseye.7z"><span>Download Image:</span><i class="fa fa-download"></i><u>Download</u></a></div>
<div><a href="https://dietpi.com/docs/install/" target="_blank" rel="noopener"><span>How to install / Details:</span><i class="fa fa-book"></i><u>View</u></a></div>
</div>
<p>The UTM virtual machine is great for those occasions where SBC performance just isn't enough. Run one of these on any x86_64 PC/server and still get the same great DietPi features and experience.</p>
</div>
<div class="col-md-6"><img src="images/sbc_images/utm.png" alt="UTM logo" width="8" height="5" loading="lazy"></div>
</div>
</div>
<div id="slidingdiv14" class="toggleDiv single-project">
<div class="row"><div class="col-md-12 project-title"><h3>Odroid N2</h3><span class="show_hide close"></span></div></div>
<div class="row"><div class="col-md-12 project-title"><h3>Odroid N2(+)</h3><span class="show_hide close"></span></div></div>
<div class="row">
<div class="col-md-6 project-description">
<div class="project-info">
<div><span>CPU:</span>Amlogic S922X 1.8 GHz | 6 cores | ARMv8</div>
<div><span>CPU:</span>Amlogic S922X 2.0(2.4) GHz | 6 cores | ARMv8</div>
<div><span>RAM:</span>4 GiB DDR4 1320 MHz</div>
<div><span>NET:</span>Gbit Ethernet</div>
<div><span>Storage:</span>eMMC socket</div>
<br>
<div><a href="https://dietpi.com/downloads/images/DietPi_OdroidN2-ARMv8-Bullseye.7z"><span>Download Image:</span><i class="fa fa-download"></i><u>Download</u></a></div>
<div><a href="https://dietpi.com/docs/install/" target="_blank" rel="noopener"><span>How to install / Details:</span><i class="fa fa-book"></i><u>View</u></a></div>
</div>
<p>Odroid's next generation "high-end" SBC is finally here! The fastest ARM SBC we have ever tested. Excellent performance and thermals at a reasonable price range.</p>
<p>Hardkernel's next generation "high-end" SBC is finally here! The fastest ARM SBC we have ever tested. Excellent performance and thermals at a reasonable price range.</p>
</div>
<div class="col-md-6"><img src="images/sbc_images/odroidn2.jpg" alt="Odroid N2 photo" width="8" height="5" loading="lazy"></div>
</div>
Expand Down Expand Up @@ -1088,8 +1103,8 @@ <h3>Odroid C4/HC4</h3>
<div class="col-xl-2 col-lg-3 col-md-4 col-6 mix odroid">
<a href="#downloadinfo" class="thumbnail show_hide" rel="#slidingdiv14">
<img src="images/sbc_images/odroidn2.jpg" alt="Odroid N2 photo" width="8" height="5" loading="lazy">
<h3>Odroid N2</h3>
<p>S922X 1.8 GHz | 6 cores | ARMv8</p>
<h3>Odroid N2(+)</h3>
<p>S922X 2.0(2.4) GHz | 6 cores | ARMv8</p>
</a>
</div>
<div class="col-xl-2 col-lg-3 col-md-4 col-6 mix odroid">
Expand Down Expand Up @@ -1365,6 +1380,13 @@ <h3>Parallels</h3>
<p>Virtual Machine x86_64</p>
</a>
</div>
<div class="col-xl-2 col-lg-3 col-md-4 col-6 mix x86_64">
<a href="#downloadinfo" class="thumbnail show_hide" rel="#utm">
<img src="images/sbc_images/utm.png" alt="UTM logo" width="8" height="5" loading="lazy">
<h3>UTM</h3>
<p>Virtual Machine x86_64</p>
</a>
</div>
<div class="col-xl-2 col-lg-3 col-md-4 col-6 mix other">
<a href="#downloadinfo" class="thumbnail show_hide" rel="#slidingdiv33">
<img src="images/sbc_images/otherdevice.jpg" alt="Question mark" width="8" height="5" loading="lazy">
Expand Down
10 changes: 5 additions & 5 deletions sitemap.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://dietpi.com/</loc>
<lastmod>2022-01-13T00:00:00+00:00</lastmod>
<lastmod>2022-02-15T00:00:00+00:00</lastmod>
<changefreq>daily</changefreq>
<priority>1</priority>
</url>
<url>
<loc>https://dietpi.com/dietpi-software.html</loc>
<lastmod>2022-01-13T00:00:00+00:00</lastmod>
<lastmod>2022-02-15T00:00:00+00:00</lastmod>
<changefreq>weekly</changefreq>
<priority>0.9</priority>
</url>
<url>
<loc>https://dietpi.com/contribute.html</loc>
<lastmod>2022-01-13T00:00:00+00:00</lastmod>
<lastmod>2022-02-15T00:00:00+00:00</lastmod>
<changefreq>weekly</changefreq>
<priority>0.9</priority>
</url>
<url>
<loc>https://dietpi.com/stats.html</loc>
<lastmod>2022-01-13T00:00:00+00:00</lastmod>
<lastmod>2022-02-15T00:00:00+00:00</lastmod>
<changefreq>weekly</changefreq>
<priority>0.9</priority>
</url>
<url>
<loc>https://dietpi.com/survey/</loc>
<lastmod>2022-01-13T00:00:00+00:00</lastmod>
<lastmod>2022-02-15T00:00:00+00:00</lastmod>
<changefreq>daily</changefreq>
<priority>0.8</priority>
</url>
Expand Down
2 changes: 1 addition & 1 deletion stats.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<meta name="theme-color" content="#000000">
<!-- Load CSS styles -->
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css?v=1">
<link rel="stylesheet" type="text/css" href="css/style.min.css?v=5">
<link rel="stylesheet" type="text/css" href="css/style.min.css?v=6">
<!-- Include JavaScript -->
<script defer src="js/jquery.min.js"></script>
<script defer src="js/bootstrap.min.js?v=1"></script>
Expand Down

0 comments on commit d5c256b

Please sign in to comment.