From 6ee545023d653f56900e44e628d0bd43d03f5e18 Mon Sep 17 00:00:00 2001 From: fonfon Date: Wed, 21 Oct 2015 13:53:01 +0000 Subject: [PATCH 1/4] first-boot: use a common navbar - Also hide the applications icon in the second step while keeping the logo. --- .../templates/firstboot_navbar.html | 26 +++++++++++++++++++ .../templates/firstboot_state0.html | 8 +----- .../templates/firstboot_state1.html | 16 +++++++----- 3 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 plinth/modules/first_boot/templates/firstboot_navbar.html diff --git a/plinth/modules/first_boot/templates/firstboot_navbar.html b/plinth/modules/first_boot/templates/firstboot_navbar.html new file mode 100644 index 000000000..dfb3f58ed --- /dev/null +++ b/plinth/modules/first_boot/templates/firstboot_navbar.html @@ -0,0 +1,26 @@ +{% comment %} +# +# This file is part of Plinth. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +{% endcomment %} + + diff --git a/plinth/modules/first_boot/templates/firstboot_state0.html b/plinth/modules/first_boot/templates/firstboot_state0.html index f011c5211..5e9d52696 100644 --- a/plinth/modules/first_boot/templates/firstboot_state0.html +++ b/plinth/modules/first_boot/templates/firstboot_state0.html @@ -31,13 +31,7 @@ {% endblock %} {% block add_nav_and_login %} - + {% include "firstboot_navbar.html" %} {% endblock %} {% block content_row %} diff --git a/plinth/modules/first_boot/templates/firstboot_state1.html b/plinth/modules/first_boot/templates/firstboot_state1.html index 8fe94b965..993634158 100644 --- a/plinth/modules/first_boot/templates/firstboot_state1.html +++ b/plinth/modules/first_boot/templates/firstboot_state1.html @@ -22,14 +22,16 @@ {% load i18n %} {% load static %} +{% block page_head %} + +{% endblock %} + {% block add_nav_and_login %} - + {% include "firstboot_navbar.html" %} {% endblock %} {% block content_row %} From 23aee97ea90b49bec23550fda1a76574467de166 Mon Sep 17 00:00:00 2001 From: fonfon Date: Wed, 21 Oct 2015 13:54:09 +0000 Subject: [PATCH 2/4] first-boot: state0: update text and button --- .../templates/firstboot_state0.html | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/plinth/modules/first_boot/templates/firstboot_state0.html b/plinth/modules/first_boot/templates/firstboot_state0.html index 5e9d52696..bccb14a4c 100644 --- a/plinth/modules/first_boot/templates/firstboot_state0.html +++ b/plinth/modules/first_boot/templates/firstboot_state0.html @@ -40,19 +40,15 @@ alt="FreedomBox" width="640"/>

-

- {% trans "Congratulations! Your FreedomBox is up and running!" %} -

- -

- {% blocktrans trimmed %} - Please provide the following basic information to complete the - setup process. - {% endblocktrans %} -

-

{% trans "Next" %} + class="btn btn-primary btn-lg">{% trans "Start Setup" %} +

+ +

+ {% blocktrans trimmed with box_name=cfg.box_name %} + To complete the setup of your {{ box_name }}, please provide + some basic information. + {% endblocktrans %}

{% endblock %} From 77e74746f0497a2312950e0a3b912b429f854430 Mon Sep 17 00:00:00 2001 From: fonfon Date: Wed, 21 Oct 2015 13:54:41 +0000 Subject: [PATCH 3/4] first-boot: state1: fix focusing on form element --- plinth/modules/first_boot/templates/firstboot_state1.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plinth/modules/first_boot/templates/firstboot_state1.html b/plinth/modules/first_boot/templates/firstboot_state1.html index 993634158..1c2ecaebf 100644 --- a/plinth/modules/first_boot/templates/firstboot_state1.html +++ b/plinth/modules/first_boot/templates/firstboot_state1.html @@ -62,6 +62,6 @@ {% block page_js %} {% endblock %} From 74f64123b3981f595b78120d59d2e28f1a144a68 Mon Sep 17 00:00:00 2001 From: fonfon Date: Wed, 21 Oct 2015 14:23:51 +0000 Subject: [PATCH 4/4] first-boot: state10: change text and layout Instead of the buttons there is now only one link in the text for the network setup. --- .../templates/firstboot_state10.html | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/plinth/modules/first_boot/templates/firstboot_state10.html b/plinth/modules/first_boot/templates/firstboot_state10.html index a1f7cb553..b03096d83 100644 --- a/plinth/modules/first_boot/templates/firstboot_state10.html +++ b/plinth/modules/first_boot/templates/firstboot_state10.html @@ -29,35 +29,32 @@

{% trans "Setup Complete!" %}

- {% blocktrans trimmed %} - FreedomBox setup is now complete. However, you should check - the network setup and modify it if necessary. Do not forget - to change the default Wi-Fi passwords. + {% blocktrans trimmed with box_name=cfg.box_name %} + {{ box_name }} setup is now complete. To make your FreedomBox + functional, you need some applications. Applications will be + installed the first time you access them. {% endblocktrans %}

+
+ + {% trans "Go to Apps" %} +
+ +

{% trans "Current Network Configuration" %}

+

{% blocktrans trimmed %} - To make your FreedomBox functional, you need some - applications. Applications will be installed the first time - you access them. + You should check the network setup and modify it if necessary. + Do not forget to change the default Wi-Fi passwords! {% endblocktrans %}

-

{% trans "Network Configuration" %}

- {% include "connections_diagram.html" %} -
-
- - {% trans "Go to Networks" %} -
- -
- - {% trans "Go to Apps" %} -
+
+ + {% trans "Go to Networks" %}