Merge branch 'master' into lan-repo-configured-apk

_data/en/home.yml

@@ -32,5 +32,8 @@ modal_data:
 
 captive_data:
   welcome_message: |
-    Welcome to the butterbox.  Press continue to connect.  Once you've connected, open http://butterbox.lan in your browser.
+    Welcome to Butterbox.
+  welcome_details: |
+    This network doesn't provide internet access, just the next best thing, the Butter app.  Butter features a collection of apps to make life without the internet a little smoother.
+    <br/><br/>Once you've connected, simply open http://butterbox.lan in your browser. 
   continue_button: 'Continue'

_data/es/home.yml

@@ -29,5 +29,8 @@ modal_data:
 
 captive_data:
   welcome_message: |
-    Bienvenido.  Esto es "como la mantequilla."  Oprima continuar para conectar y luego abre http://comolamantequilla.lan en su navegador.
+    Bienvenido.  Esto es "como la mantequilla."
+  welcome_details: |
+    Esta red no proporciona acceso a Internet, solo lo mejor de la siguiente, la aplicación Mantequilla. Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet.  
+    <br/><br/>Una vez que se haya conectado, simplemente abra http://comolamantequilla.lan en su navegador.
   continue_button: 'Continuar'

_data/home.yml

@@ -32,5 +32,8 @@ modal_data:
 
 captive_data:
   welcome_message: |
-    Welcome to the butterbox.  Press continue to connect.  Once you've connected, open http://butterbox.lan in your browser.
+    Welcome to Butterbox.
+  welcome_details: |
+    This network doesn't provide internet access, just the next best thing, the Butter app.  Butter features a collection of apps to make life without the internet a little smoother.
+    <br/><br/>Once you've connected, simply open http://butterbox.lan in your browser. 
   continue_button: 'Continue'

captive.html

@@ -9,6 +9,7 @@ layout: basic
     <div class="content-area-wrapper text-center">
       <img src="{{site.baseurl}}{{ page_data.page_logo[0] }}" alt="{{ page_data.page_logo[1] }}" />
       <h1 class="content-title mb-2">{{ page_data.captive_data.welcome_message }}</h1>
+      <p class="content-text text-black ls-40 mb-2">{{ page_data.captive_data.welcome_details }}</p>
       <!-- Use NoDogSplash-provided variables to render a "continue" button -->
       <form method="get" action="$authaction">
         <input type="hidden" name="tok" value="$tok">