From a5cf31a5fdc2d725ddbde3b1fdd32eadec04a133 Mon Sep 17 00:00:00 2001 From: OctoSpacc Date: Tue, 22 Oct 2024 20:01:09 +0200 Subject: [PATCH] Update admin page --- Scripts/Dependencies.Build.sh | 11 ++++--- Scripts/Lib/Globals.sh | 2 +- assets/SiteProps.toml | 5 ++++ content/it/admin.md | 29 +++++++++++++++---- .../partials/func/style/GetMainCSS.html | 2 +- .../ananke/layouts/partials/site-scripts.html | 11 ++++++- .../ananke/layouts/partials/social-share.html | 2 +- 7 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 assets/SiteProps.toml diff --git a/Scripts/Dependencies.Build.sh b/Scripts/Dependencies.Build.sh index 74996f6..73234b4 100755 --- a/Scripts/Dependencies.Build.sh +++ b/Scripts/Dependencies.Build.sh @@ -11,17 +11,20 @@ hugoexternal=true if [ -n "$(which apt)" ] then asroot apt update - asroot apt install -y python3 nodejs findutils git wget tar gzip p7zip-full #zip + asroot apt install -y python3 python-pip nodejs findutils git wget tar gzip if [ "$(uname -o)" != Android ] - then asroot apt install -y npm + then + # Debian(s) + asroot apt install -y npm p7zip-full else - asroot apt install -y hugo + # Termux + asroot apt install -y hugo p7zip hugoexternal=false fi elif [ -n "$(which apk)" ] then asroot apk update - asroot apk add hugo python3 py3-pip nodejs npm findutils git wget tar gzip 7zip #zip + asroot apk add hugo python3 py3-pip nodejs npm findutils git wget tar gzip 7zip hugoexternal=false fi diff --git a/Scripts/Lib/Globals.sh b/Scripts/Lib/Globals.sh index 5d8533a..50f1bef 100644 --- a/Scripts/Lib/Globals.sh +++ b/Scripts/Lib/Globals.sh @@ -13,6 +13,6 @@ swd="$(dirname "$(realpath "$0")")" if [ ! -e "${swd}/Lib/Globals.sh" ] then swd="${swd}/.." fi -#eval "$(sed -e 's| = |=|g' "${swd}/../config.toml")" +eval "$(sed -e 's| = |=|g' "${swd}/../assets/SiteProps.toml")" Python3="$([ -n "$(which python3)" ] && echo python3 || echo python)" diff --git a/assets/SiteProps.toml b/assets/SiteProps.toml new file mode 100644 index 0000000..779f962 --- /dev/null +++ b/assets/SiteProps.toml @@ -0,0 +1,5 @@ +GitInstanceUrl="https://gitlab.com" +GitRepoThis="octtspacc/sitoctt" +GitBranchThis="sitoctt-next" +GitRepoAssets="octtspacc/sitoctt-assets" +GitBranchAssets="main" \ No newline at end of file diff --git a/content/it/admin.md b/content/it/admin.md index 947d569..1c13c06 100644 --- a/content/it/admin.md +++ b/content/it/admin.md @@ -1,10 +1,27 @@ +++ Hidden = true +++ -
-

-

-

-

+ +
+ Git Configuration +

+

+

+

+
- + + \ No newline at end of file diff --git a/themes/ananke/layouts/partials/func/style/GetMainCSS.html b/themes/ananke/layouts/partials/func/style/GetMainCSS.html index 16ecd29..8220092 100644 --- a/themes/ananke/layouts/partials/func/style/GetMainCSS.html +++ b/themes/ananke/layouts/partials/func/style/GetMainCSS.html @@ -75,4 +75,4 @@ css asset directory we (unless condition below) add to aforementioned slice */}} {{ $main_style = $style }} {{ end }} -{{ return $main_style }} \ No newline at end of file +{{ return $main_style }} diff --git a/themes/ananke/layouts/partials/site-scripts.html b/themes/ananke/layouts/partials/site-scripts.html index 58b9bd5..bb6ca42 100644 --- a/themes/ananke/layouts/partials/site-scripts.html +++ b/themes/ananke/layouts/partials/site-scripts.html @@ -1,4 +1,13 @@ - + diff --git a/themes/ananke/layouts/partials/social-share.html b/themes/ananke/layouts/partials/social-share.html index 14ae033..d8cf7dc 100644 --- a/themes/ananke/layouts/partials/social-share.html +++ b/themes/ananke/layouts/partials/social-share.html @@ -3,7 +3,7 @@ {{ $facebook_href := printf "https://www.facebook.com/sharer.php?u=%s" $url }} {{ $twitter_href := printf "https://twitter.com/intent/tweet?url=%s&text=%s" $url $title }} -{{ with site.Social.twitter }} +{{ with site.Params.Social.twitter }} {{ $twitter_href = printf "%s&via=%s" $twitter_href . }} {{ end }} {{ $linkedin_href := printf "https://www.linkedin.com/shareArticle?mini=true&url=%s&title=%s" $url $title }}