Skip to content

Commit

Permalink
Switch to new package web template variable
Browse files Browse the repository at this point in the history
  • Loading branch information
dpilafian committed Oct 11, 2024
1 parent c6bf1c3 commit d047763
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-spec-on-push.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Run Specifications
name: Build and Test

on: [push]

Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"editor.rulers": [100],
"editor.scrollBeyondLastLine": false,
"editor.tabSize": 3,
"files.insertFinalNewline": true,
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,21 @@
"interactive": "browser-sync . --startPath website-target/1-dev --files website-target"
},
"devDependencies": {
"@fortawesome/fontawesome-free": "~6.5",
"@fortawesome/fontawesome-free": "~6.6",
"add-dist-header": "~1.4",
"browser-sync": "~3.0",
"copy-file-util": "~1.2",
"copy-folder-util": "~1.1",
"dna-engine": "~3.1",
"dna-engine": "~3.2",
"hamburger-menu": "~0.6",
"jshint": "~2.13",
"less": "~4.2",
"replacer-util": "~1.2",
"rev-web-assets": "~1.3",
"rimraf": "~5.0",
"run-scripts-util": "~1.2",
"uglify-js": "~3.17",
"w3c-html-validator": "~1.7",
"web-ignition": "~2.1"
"replacer-util": "~1.3",
"rev-web-assets": "~1.4",
"rimraf": "~6.0",
"run-scripts-util": "~1.3",
"uglify-js": "~3.19",
"w3c-html-validator": "~1.8",
"web-ignition": "~2.2"
}
}
2 changes: 1 addition & 1 deletion website/root/download/ReadMe.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ On some systems with Java installed you can just double click the JAR file
and Snap Backup will automatically run. On other systems, you may have to
enter the following command:

java -jar snapbackup-{{pkg.version}}.jar
java -jar snapbackup-{{package.version}}.jar

Consult your Java documentation for the exact steps to launch an executable
JAR on your system.
Expand Down
29 changes: 17 additions & 12 deletions website/root/download/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% render 'website/templates/page-begin.html', pageTitle: 'Download' %}
{% assign releaseUrl = pkg.homepage | append: '/raw/main/releases' %}
{% assign macExtension = '.pkg' %}
{% assign winExtension = '.msi' %}
{% assign releaseUrl = package.homepage | append: '/raw/main/releases' %}
{% assign macExtension = '.pkg' %}
{% assign winExtension = '.msi' %}

<main data-menu=download>

Expand All @@ -17,13 +17,16 @@ <h2>Download</h2>
<figure class=cake-layers>
<figcaption>Apple macOS (M1, M2, and M3)</figcaption>
<div>
<a href={{releaseUrl}}/snap-backup-installer-v{{pkg.version}}{{macExtension}}>snap-backup-installer-v{{pkg.version}}{{macExtension}}</a>
<a href={{releaseUrl}}/snap-backup-installer-v{{pkg.version}}{{macExtension}}><img src=../graphics/os-icons/mac.svg alt=mac></a>
<p><small>Updated: {{pkg.extra.updated}}</small></p>
<a href={{releaseUrl}}/snap-backup-installer-v{{package.version}}{{macExtension}}>
snap-backup-installer-v{{package.version}}{{macExtension}}</a>
<a href={{releaseUrl}}/snap-backup-installer-v{{package.version}}{{macExtension}}>
<img src=../graphics/os-icons/mac.svg alt=mac></a>
<p><small>Updated: {{package.extra.updated}}</small></p>
</div>
<div>
Once downloading is complete, go into your <code>Downloads</code> folder and locate
the <code>snap-backup-installer-v{{pkg.version}}{{macExtension}}</code> file.&nbsp;
the <code>snap-backup-installer-v{{package.version}}{{macExtension}}</code>
file.&nbsp;
Then <b><i>&lt;control-click&gt;</i></b> on the file and select "<b>Open</b>" to
start the install.<br><br>
For Macs with Intel processors, download<br>
Expand All @@ -39,9 +42,11 @@ <h2>Download</h2>
<figure class=cake-layers>
<figcaption>Microsoft Windows</figcaption>
<div>
<a href={{releaseUrl}}/snap-backup-installer-v{{pkg.version}}{{winExtension}}>snap-backup-installer-v{{pkg.version}}{{winExtension}}</a>
<a href={{releaseUrl}}/snap-backup-installer-v{{pkg.version}}{{winExtension}}><img src=../graphics/os-icons/windows.svg alt=windows></a>
<p><small>Updated: {{pkg.extra.updated}}</small></p>
<a href={{releaseUrl}}/snap-backup-installer-v{{package.version}}{{winExtension}}>
snap-backup-installer-v{{package.version}}{{winExtension}}</a>
<a href={{releaseUrl}}/snap-backup-installer-v{{package.version}}{{winExtension}}>
<img src=../graphics/os-icons/windows.svg alt=windows></a>
<p><small>Updated: {{package.extra.updated}}</small></p>
</div>
<div>
Save the install file to a location such as your <i>Desktop</i> and
Expand All @@ -54,11 +59,11 @@ <h2>Download</h2>
<a href={{releaseUrl}}/snapbackup.jar>snapbackup.jar</a>
<a href={{releaseUrl}}/snapbackup.jar>
<img src=../graphics/os-icons/java.svg alt=java></a>
({{pkg.extra.jarSize}})<br>
({{package.extra.jarSize}})<br>
<a href=ReadMe.txt>ReadMe.txt</a>
&nbsp; &nbsp;
<a href=../graphics/snap-backup-icon.png>Optional Icon File</a>
<p><small>Updated: {{pkg.extra.updated}}</small></p>
<p><small>Updated: {{package.extra.updated}}</small></p>
</div>
<div>
<p>
Expand Down
2 changes: 1 addition & 1 deletion website/root/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% render 'website/templates/page-begin.html', pageTitle: pkg.description %}
{% render 'website/templates/page-begin.html', pageTitle: package.description %}

<main data-menu=gateway>

Expand Down
2 changes: 1 addition & 1 deletion website/root/version/index.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
header("Content-type: text/plain; charset=UTF-8");
echo "{{pkg.version}}" . PHP_EOL;
echo "{{package.version}}" . PHP_EOL;
echo "Snap Backup" . PHP_EOL;
?>
8 changes: 3 additions & 5 deletions website/snap-backup.less
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ a:hover { background-color: teal; outline-color: teal; }

/* Flat button color */
button { background-color: teal; }
button:hover:not(:disabled) { background-color: lightseagreen; }
button:hover:not(:disabled), button:focus { background-color: lightseagreen; }

/* Reveal action color */
.reveal-button { color: teal; }
Expand Down Expand Up @@ -202,8 +202,6 @@ nav.hamburger-menu aside ul li >a:hover {
margin-left: 20px;
}
});
.MobileMode(@lessRules) {
@media (max-width: 667px) { //selects iPhone 6/6s/7/8/SE2/SE3 landscape and anything narrower
@lessRules();
}
.MobileMode(@lessRules) { //selects iPhone 6/6s/7/8/SE2/SE3 landscape and anything narrower
@media (max-width: 667px) { @lessRules(); }
}
28 changes: 14 additions & 14 deletions website/templates/languages-properties.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_sq.properties>Albanian (Shqip) <img src={{webRoot}}/graphics/flags/language-sq.png alt=sq></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_nl.properties>Dutch (Nederlands) <img src={{webRoot}}/graphics/flags/language-nl.png alt=nl></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup.properties >English <img src={{webRoot}}/graphics/flags/language-en.png alt=en></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_eo.properties>Esperanto <img src={{webRoot}}/graphics/flags/language-eo.png alt=eo></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_fr.properties>French (Français) <img src={{webRoot}}/graphics/flags/language-fr.png alt=fr></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_de.properties>German (Deutsch) <img src={{webRoot}}/graphics/flags/language-de.png alt=de></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_id.properties>Indonesian (Bahasa) <img src={{webRoot}}/graphics/flags/language-id.png alt=id></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_it.properties>Italian (Italiano) <img src={{webRoot}}/graphics/flags/language-it.png alt=it></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_ko.properties>Korean (한국어) <img src={{webRoot}}/graphics/flags/language-ko.png alt=ko></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_pt.properties>Portuguese (Português) <img src={{webRoot}}/graphics/flags/language-pt.png alt=pt></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_ro.properties>Romanian (Română) <img src={{webRoot}}/graphics/flags/language-ro.png alt=ro></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_ru.properties>Russian (Русский) <img src={{webRoot}}/graphics/flags/language-ru.png alt=ro></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_es.properties>Spanish (Español) <img src={{webRoot}}/graphics/flags/language-es.png alt=es></a><br>
<a href={{pkg.homepage}}/blob/main/src/resources/properties/SnapBackup_sl.properties>Slovene (Slovenščina) <img src={{webRoot}}/graphics/flags/language-sl.png alt=sl></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_sq.properties>Albanian (Shqip) <img src={{webRoot}}/graphics/flags/language-sq.png alt=sq></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_nl.properties>Dutch (Nederlands) <img src={{webRoot}}/graphics/flags/language-nl.png alt=nl></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup.properties >English <img src={{webRoot}}/graphics/flags/language-en.png alt=en></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_eo.properties>Esperanto <img src={{webRoot}}/graphics/flags/language-eo.png alt=eo></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_fr.properties>French (Français) <img src={{webRoot}}/graphics/flags/language-fr.png alt=fr></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_de.properties>German (Deutsch) <img src={{webRoot}}/graphics/flags/language-de.png alt=de></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_id.properties>Indonesian (Bahasa) <img src={{webRoot}}/graphics/flags/language-id.png alt=id></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_it.properties>Italian (Italiano) <img src={{webRoot}}/graphics/flags/language-it.png alt=it></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_ko.properties>Korean (한국어) <img src={{webRoot}}/graphics/flags/language-ko.png alt=ko></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_pt.properties>Portuguese (Português) <img src={{webRoot}}/graphics/flags/language-pt.png alt=pt></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_ro.properties>Romanian (Română) <img src={{webRoot}}/graphics/flags/language-ro.png alt=ro></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_ru.properties>Russian (Русский) <img src={{webRoot}}/graphics/flags/language-ru.png alt=ro></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_es.properties>Spanish (Español) <img src={{webRoot}}/graphics/flags/language-es.png alt=es></a><br>
<a href={{package.homepage}}/blob/main/src/resources/properties/SnapBackup_sl.properties>Slovene (Slovenščina) <img src={{webRoot}}/graphics/flags/language-sl.png alt=sl></a><br>
14 changes: 7 additions & 7 deletions website/templates/page-begin.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
<link rel=apple-touch-icon href={{webRoot}}/graphics/mobile-home-screen.png>
<link rel=preconnect href=https://fonts.googleapis.com>
<link rel=preconnect href=https://fonts.gstatic.com crossorigin>
<link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{pkg.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
<link rel=stylesheet href=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.css>
<link rel=stylesheet href=https://cdn.jsdelivr.net/npm/hamburger-menu@{{pkg.devDependencies.hamburger-menu|version}}/dist/hamburger-menu.min.css>
<link rel=stylesheet href=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/reset.min.css>
<link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{package.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
<link rel=stylesheet href=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.css>
<link rel=stylesheet href=https://cdn.jsdelivr.net/npm/hamburger-menu@{{package.devDependencies.hamburger-menu|version}}/dist/hamburger-menu.min.css>
<link rel=stylesheet href=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/reset.min.css>
<link rel=stylesheet href={{webRoot}}/style.css>
<script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
<script defer src=https://cdn.jsdelivr.net/npm/hamburger-menu@{{pkg.devDependencies.hamburger-menu|version}}/dist/hamburger-menu.min.js></script>
<script defer src=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/lib-x.min.js></script>
<script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
<script defer src=https://cdn.jsdelivr.net/npm/hamburger-menu@{{package.devDependencies.hamburger-menu|version}}/dist/hamburger-menu.min.js></script>
<script defer src=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/lib-x.min.js></script>
<script defer src={{webRoot}}/app.min.js></script>
</head>
<body>
Expand Down

0 comments on commit d047763

Please sign in to comment.