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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 684bbce..fe769b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,11 +22,11 @@ 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: paths: - public only: - - master - + - master \ No newline at end of file diff --git a/_data/en/home.yml b/_data/en/home.yml index a4278eb..f67511c 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. Once you've connected, open http://butterbox.lan in your browser. + continue_button: 'Continue' \ No newline at end of file diff --git a/_data/es/home.yml b/_data/es/home.yml index e13a093..2244fb0 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 y luego abre http://comolamantequilla.lan en su navegador. + continue_button: 'Continuar' \ No newline at end of file diff --git a/_data/home.yml b/_data/home.yml index 60d54f1..f67511c 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. Once you've connected, open http://butterbox.lan in your browser. + continue_button: 'Continue' \ No newline at end of file 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 @@
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