Some more initial changes

src/applets/software/software.html

@@ -1,22 +1,15 @@
 {% extends "layout.html" %}
 {% block body %}
 
-<div style="width: 1000px; font-family: Noto Sans;">
-
 <p> <b> Would you like fries with that? </b></p>
 
 <br>
 
 <ul>
+<li>Would you like to participate in popcon?</li>
 <li>Desktop environment</li>
 <li>Server software</li>
 </ul>
-<br><br>
-
-<div class="columns">
-  <div class="column"><button class="button is-light">Back</button></div>
-  <a href="./summary"><div class="column"><button class="button is-link">Next</button></div></a>
-</div>
 
 </div>
 </div>

src/applets/summary/summary.html

@@ -1,19 +1,8 @@
 {% extends "layout.html" %}
 {% block body %}
 
-<div style="width: 1000px; height: 100%;">
-
 <p><b> Ready to install! Please review all changes.</b></p>
 
-<br>
-
-<br><br>
-
-<div class="columns">
-  <div class="column"><button class="button is-light">Back</button></div>
-  <a href="./install"><div class="column"><button class="button is-link">Start Install</button></div></a>
-</div>
-
 </div>
 </div>
 </div>

src/applets/users/users.html

@@ -1,8 +1,6 @@
 {% extends "layout.html" %}
 {% block body %}
 
-<div style="width: 1000px; font-family: Noto Sans;">
-
 <p><b> Let's set up an initial user. </b></p>
 
 <br>
@@ -46,16 +44,7 @@
 
 </div> <!-- style 180 -->
 
-<br><br>
-
-<div class="columns">
-	<div class="column"><button class="button is-light">Back</button> <button class="button is-light">Connect Active Directory</button> <button class="button is-light">Connect LDAP</button></div>
-  <a href="./disks"><div class="column"><button class="button is-link">Next</button></div></a>
 </div>
-
-</div>
-</div>
-
 </div>
 
 {% endblock %}

src/applets/welcome/routes.py

@@ -1,8 +1,12 @@
 from applets.welcome import bp
 from flask import Flask, request, session, redirect, \
      url_for, render_template, flash, Blueprint
+import gettext
 import dmm.lsblk as lsblk
 
+# Set up Gettext
+en_i18n = gettext.translation("welcome", './locales', fallback=True, languages=['af', 'en'])
+en_i18n.install()
 
 @bp.route('/welcome',methods=['GET', 'POST', 'PUT'])
 def welcome_index():
@@ -11,13 +15,19 @@ def welcome_index():
     this app in a browser.
     """
     blkid = lsblk.list_scsi_devices()
-    return render_template('welcome.html', blkid=blkid)
-    #return ("Welcome to System Installer Daemon POC <br />"
-    #        "This is the Welcome Index")
+    string_dict = build_stringlist()
+    return render_template('welcome.html', string_dict=string_dict)
 
 
-@bp.route('/welcome2')
-def welcome2_index():
-    return ("Changins some text in our htmx front-end")
-
+def build_stringlist():
+    """
+    Return all the strings that is used in this applet."
+    """
+    string_dict = {}
+    string_dict['welcome_text'] = _("Welcome! This setup program will install Debian on to your system.")
+    string_dict['confirm_text'] = _("Please confirm the following details:")
+    string_dict['language_text'] = _("Language:")
+    string_dict['keylayout_text'] = _("Keyboard Layout:")
+    string_dict['timezone_text'] = _("Time Zone:")
+    return string_dict
 

src/applets/welcome/welcome.html

@@ -1,16 +1,11 @@
 {% extends "layout.html" %}
 {% block body %}
 
-<div style="width: 1000px; height: 100%; font-family: Noto Sans;">
+<img style="top: 10px; width: 100%;" src="/static/applets/welcome/img/banner.png" alt="Debian Image banner" />
+<p><b> {{ string_dict['welcome_text'] }} </b></p>
+<p>{{ string_dict['confirm_text'] }} </p>
 
-<p><b>Welcome! This setup program will install Debian on to your system.</b></p>
-
-<br>
-
-<div class="columns" style="text-align: center;">
-
-<div class="column">
-<img src="/static/icons/keyboard.svg" style="fill: white;" width="180px" />
+<img src="/static/icons/keyboard.svg" /> {{ string_dict['language_text'] }} 
 <div class="control is-link" width="180px">
   <div class="select">
     <select style="width: 180px">
@@ -19,12 +14,10 @@
     </select>
   </div>
 </div>
-</div
 
 <br>
 
-<div class="column">
-<img src="/static/icons/keyboard.svg" width="180px" />
+<img src="/static/icons/keyboard.svg" /> {{ string_dict['keylayout_text'] }}
 <div class="control is-link">
   <div class="select">
     <select style="width: 180px">
@@ -33,12 +26,10 @@
     </select>
   </div>
 </div>
-</div>
 
-<br>
+<br />
 
-<div class="column">
-<img src="/static/icons/keyboard.svg" width="180px" />
+<img src="/static/icons/keyboard.svg" /> {{ string_dict['timezone_text'] }}
 <div class="control is-link">
   <div class="select">
     <select style="width: 180px">
@@ -47,16 +38,8 @@
     </select>
   </div>
 </div>
-</div>
 
-</div> <!-- end columns -->
 
-<br><br><br><br><br><br<br><br>
-
-<div class="columns">
-  <div class="column"><button class="button is-light">Quit</button></div>
-  <a href="./users"><div class="column"><button class="button is-link">Next</button></div></a>
-</div>
 
 </div>
 </div>