From 06bced877f0019cc32e5dbb967b3bf84ff6a8955 Mon Sep 17 00:00:00 2001 From: John Hess Date: Tue, 30 Nov 2021 16:15:27 -0600 Subject: [PATCH 1/4] ignore Gemfile.lock --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4479f58..a30e3ad 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ _site .bundle vendor/bundle .DS_Store +Gemfile.lock \ No newline at end of file From c9fe5cdc5821f3197167bf757db4acb3012672ab Mon Sep 17 00:00:00 2001 From: John Hess Date: Tue, 30 Nov 2021 16:16:17 -0600 Subject: [PATCH 2/4] render a simple captive portal in each language reusing butter styles --- _data/en/home.yml | 5 +++++ _data/es/home.yml | 4 ++++ _data/home.yml | 9 ++++++-- _layouts/basic.html | 43 ++++++++++++++++++++++++++++++++++++++ _layouts/default.html | 48 ++++++------------------------------------- captive.html | 20 ++++++++++++++++++ 6 files changed, 85 insertions(+), 44 deletions(-) create mode 100644 _layouts/basic.html create mode 100644 captive.html diff --git a/_data/en/home.yml b/_data/en/home.yml index a4278eb..3447904 100644 --- a/_data/en/home.yml +++ b/_data/en/home.yml @@ -29,3 +29,8 @@ modal_data: - '/assets/images/slide-img-5.png' warning: | You will need to enable downloads from unknown sources to install this app on your Android phone. + +captive_data: + welcome_message: | + Welcome to the butterbox. Press continue to connect. + continue_button: 'Continue' \ No newline at end of file diff --git a/_data/es/home.yml b/_data/es/home.yml index e13a093..5905ef9 100644 --- a/_data/es/home.yml +++ b/_data/es/home.yml @@ -27,3 +27,7 @@ modal_data: warning: | Debes 'habilitar descargas de fuentes desconocidas' para descargar esta aplicación en tu teléfono Android. +captive_data: + welcome_message: | + Bienvenido. Esto es "como la mantequilla." Oprima continuar para conectar. + continue_button: 'Continuar' \ No newline at end of file diff --git a/_data/home.yml b/_data/home.yml index 60d54f1..3447904 100644 --- a/_data/home.yml +++ b/_data/home.yml @@ -2,8 +2,8 @@ site_name: 'Butter' page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] title: 'Life without internet made smoother.
Get access to tools that help.' text: | - The Butter app features a collection of apps to make life without
the internet a little smoother. - Use it to discover and download
free, ad-free apps or to spread the love and share apps offline. + Butter features a collection of apps to make life without
the internet a little smoother. + Use it to discover and download
free, ad-free apps or to spread the love and share offline. button_text: 'Download Android App' image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] @@ -29,3 +29,8 @@ modal_data: - '/assets/images/slide-img-5.png' warning: | You will need to enable downloads from unknown sources to install this app on your Android phone. + +captive_data: + welcome_message: | + Welcome to the butterbox. Press continue to connect. + continue_button: 'Continue' \ No newline at end of file diff --git a/_layouts/basic.html b/_layouts/basic.html new file mode 100644 index 0000000..ca50cfc --- /dev/null +++ b/_layouts/basic.html @@ -0,0 +1,43 @@ + + + + + + + {% include seo.html %} + {{ site.title }} + + + + + +
+ + {{ content }} + +
+ + + + + + + + + + + + + diff --git a/_layouts/default.html b/_layouts/default.html index 3c2ee05..55d8afc 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,45 +1,9 @@ - - - - - - - {% include seo.html %} - {{ site.title }} - - - - - -
- {% include header.html %} +--- +layout: basic +--- - {{ content }} +{% include header.html %} - {% include footer.html %} -
- - - - +{{ content }} - - - - - - - - +{% include footer.html %} diff --git a/captive.html b/captive.html new file mode 100644 index 0000000..57fb8a7 --- /dev/null +++ b/captive.html @@ -0,0 +1,20 @@ +--- +layout: basic +--- + +{% assign page_data = site.data.home %} + +
+
+
+ {{ page_data.page_logo[1] }} +

{{ page_data.captive_data.welcome_message }}

+ +
+ + + +
+
+
+
\ No newline at end of file From da03bd27afb937e6ece87d8f208c211cacd8b780 Mon Sep 17 00:00:00 2001 From: John Hess Date: Tue, 30 Nov 2021 16:24:19 -0600 Subject: [PATCH 3/4] build each language plus a default; update header to explicitly specify language when clicking english --- .gitlab-ci.yml | 1 + _includes/header.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 684bbce..6381994 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ pages: script: - cp _data/en/home.yml _data/home.yml - bundle exec jekyll build -d public + - bundle exec jekyll build -d public/en - cp _data/es/home.yml _data/home.yml - bundle exec jekyll build -d public/es artifacts: diff --git a/_includes/header.html b/_includes/header.html index 83fbdc7..f364c2e 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -11,7 +11,7 @@
From e6df62d2bb8983bb4aa765364adc48a228817b60 Mon Sep 17 00:00:00 2001 From: John Hess Date: Tue, 30 Nov 2021 16:28:31 -0600 Subject: [PATCH 4/4] whitespace --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6381994..fe769b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,5 +29,4 @@ pages: paths: - public only: - - master - + - master \ No newline at end of file