diff --git a/static/js/src/static-forms.js b/static/js/src/static-forms.js index 57b1ab428ff..3184aa2e7f0 100644 --- a/static/js/src/static-forms.js +++ b/static/js/src/static-forms.js @@ -159,8 +159,10 @@ function setUpStaticForms(form, formId) { submitButton.appendChild(spinnerIcon); } const submitButton = form.querySelector('button[type="submit"]'); + // Exclude forms that don't need loader const cancelLoader = submitButton.classList.contains("no-loader"); + if (submitButton && !cancelLoader) { form.addEventListener("submit", () => attachLoadingSpinner(submitButton)); } diff --git a/static/sass/styles.scss b/static/sass/styles.scss index 57c658c5ff3..9f2ddf4b257 100644 --- a/static/sass/styles.scss +++ b/static/sass/styles.scss @@ -1538,3 +1538,18 @@ hr.is-extra-muted { background-color: rgba(0, 0, 0, 0.1); opacity: 0.5; } + +// Decimal number bug +// To be removed once is bug is fixed: https://github.com/canonical/vanilla-framework/issues/4998 +ol.p-list--divided .p-list__item::before { + content: counter(list-item) ". "; +} + +// Fix stepped list title grid bug +// To be removed once is bug is fixed: https://github.com/canonical/vanilla-framework/issues/5002 +@media screen and (max-width: $breakpoint-small - 1) { + .p-stepped-list--detailed .p-stepped-list__title { + grid-column-end: span 4; + margin-left: 0; + } +} diff --git a/templates/download/intel-iei-tank-870.html b/templates/download/intel-iei-tank-870.html index 16024f4ee9d..e5d707e9d59 100644 --- a/templates/download/intel-iei-tank-870.html +++ b/templates/download/intel-iei-tank-870.html @@ -85,32 +85,8 @@

Flash Ubuntu Core to the internal memory

-
  • -
    -

    First boot setup

    -
    -
      -
    1. The system will boot then become ready to configure.
      2. -
    2. The device will display the prompt "Press enter to configure".
      3. -
    3. Press enter then select "Start" to begin configuring your network and an administrator account. Follow the instructions on the screen, you will be asked to configure your network and enter your Ubuntu SSO credentials.
      4. -
    4. -

      At the end of the process, you will see your credentials to access your Ubuntu Core machine:

      - 
      This device is registered to <Ubuntu SSO email address>.
-      Remote access was enabled via authentication with the SSO user <Ubuntu SSO user name>
-      Public SSH keys were added to the device for remote access.
      -
      5. -
    -
    -
    • -
  • -
    -

    Connect to the device

    -
    -

    Once setup is done, you can login with SSH into Ubuntu Core, from a machine on the same network, using the following command:

    - 
    ssh <Ubuntu SSO user name>@<device IP address>
    -

    Your user name is your Ubuntu SSO user name, and the command should be displayed on the RPi.

    -
    -
    • + {% include "download/shared/_first-boot-setup.html" %} + {% include "download/shared/_login.html" %} @@ -152,5 +128,4 @@

    Get started with snaps

    {% include "download/shared/_resources.html" %} - -{% endblock content %} +{% endblock content %} \ No newline at end of file diff --git a/templates/download/intel-nuc.html b/templates/download/intel-nuc.html index 0273b8ce644..a6caf208674 100644 --- a/templates/download/intel-nuc.html +++ b/templates/download/intel-nuc.html @@ -1,135 +1,170 @@ {% extends "download/_base_download.html" %} -{% block title %}Install Ubuntu Core on the Intel® NUC{% endblock %}} +{% block title %}Install Ubuntu Core on the Intel® NUC{% endblock %} {% block meta_copydoc %}https://docs.google.com/document/d/1e2aWvVEEXvxDWSbxDzs-_tqKbKbW9sapjCjIRiuAdMg/edit{% endblock meta_copydoc %} +{% block body_class %}is-paper{% endblock body_class %} + {% block content %} -
    -
    -
    -

    Install Ubuntu Core on the Intel® NUC

    -

    There are two install options for the Intel NUC: Ubuntu Core or Ubuntu Desktop This page is for Ubuntu Core.

    +
    +
    +
    +

    Install Ubuntu Core
    on the Intel® NUC

    -
    -
    -
    -
    -
    -

    Install Ubuntu Core

    -

    We will walk you through the steps of flashing Ubuntu Core on an Intel NUC. At the end of this process, you will have a board ready for production or testing snaps.

    -
    -
    -

    Minimum requirements

    -
      -
    • An Ubuntu SSO account with an SSH key
      • -
    • An Intel NUC with BIOS updated to the latest version (update instructions)
      • -
    • 2 USB 2.0 or 3.0 flash drives (2GB minimum)
      • -
    • A monitor with an HDMI interface
      • -
    • A Mini HDMI to HDMI cable
      • -
    • A USB keyboard and a mouse
      • -
    • A monitor with VGA or HDMI interface
      • -
    • A VGA or HDMI cable
      • -
    • A network connection with Internet access
      • -
    • An Ubuntu Desktop {{ releases.lts.full_version }} LTS image
      • -
    • An Ubuntu Core image
      • -
    -
    -
    +
    +

    There are two install options for the Intel NUC: Ubuntu Core or Ubuntu Desktop. This page is for Ubuntu Core.

    +

    We will walk you through the steps of flashing Ubuntu Core on an Intel NUC. At the end of this process, you will have a board ready for production or testing snaps.

    +
    +

    Minimum requirements

    +
      +
    • An Ubuntu SSO account with an SSH key
      • +
    • An Intel®with BIOS updated to the latest version (update instructions)
      • +
    • 2 USB 2.0 or 3.0 flash drives (2GB minimum)
      • +
    • A monitor with an HDMI interface
      • +
    • A Mini HDMI to HDMI cable
      • +
    • A USB keyboard and a mouse
      • +
    • A monitor with VGA or HDMI interface
      • +
    • A VGA or HDMI cable
      • +
    • A network connection with Internet access
      • +
    • An Ubuntu Desktop {{ releases.lts.full_version }} LTS image
      • +
    • An Ubuntu Core image
      • +
    -
    +
    -

    Installation instructions

      - {% include "download/iot/_setup-ubuntu-sso.html" %}
    1. -

      - +
      +

      + Set up an Ubuntu SSO account +

      +
      +

      An Ubuntu SSO account is required to create the first user on an Ubuntu Core installation.

      +
        +
      1. Start by creating an Ubuntu SSO account.
        2. +
      2. Import an SSH Key into your Ubuntu SSO account. (instructions)
        3. +
      +
      +
      2. +
    2. +
      +

      Download Ubuntu Core -

      +
      -
    3. -

      +
      +

      Flash the USB drives -

      +
      -
        -
      1. Download and copy the Ubuntu Desktop {{ releases.lts.full_version }} LTS image on the first USB flash drive by following the live USB Ubuntu Desktop tutorial for Ubuntu, Windows, or macOS
        2. -
      2. Copy the Ubuntu Core image for Intel NUC on the second USB flash drive
        3. +
          +
        1. Download and copy the Ubuntu Desktop {{ releases.lts.full_version }} LTS image on the first USB flash drive by following the live USB Ubuntu Desktop tutorial for Ubuntu, Windows, or macOS
          2. +
        2. Copy the Ubuntu Core image for Intel NUC on the second USB flash drive
    4. -

      - +
      +

      Install Ubuntu Core -

      +
      -
        -
      1. Connect your USB hub, keyboard, mouse, monitor to the NUC.
        2. -
      2. Insert the first USB flash drive, containing Ubuntu Desktop {{ releases.lts.full_version }} LTS.
        3. -
      3. Connect the USB hub, keyboard, mouse and the monitor to the NUC.
        4. -
      4. Insert the Live USB Ubuntu Desktop flash drive in the NUC.
        5. +
          +
        1. Connect your USB hub, keyboard, mouse, monitor to the NUC.
          2. +
        2. Insert the first USB flash drive, containing Ubuntu Desktop {{ releases.lts.full_version }} LTS.
          3. +
        3. Connect the USB hub, keyboard, mouse and the monitor to the NUC.
          4. +
        4. Insert the Live USB Ubuntu Desktop flash drive in the NUC.
    5. -

      - +
      +

      Boot from the Live USB flash drive -

      +
      -
        -
      1. Start the NUC and push F10 to enter the boot menu.
        2. -
      2. Select the USB flash drive as a boot option.
        3. -
      3. Select "Try Ubuntu without installing".
        4. +
          +
        1. Start the NUC and push F10 to enter the boot menu.
          2. +
        2. Select the USB flash drive as a boot option.
          3. +
        3. Select "Try Ubuntu without installing".
    6. -

      +
      +

      + Flash Ubuntu Core +

      +
      +
        +
      1. Once the Ubuntu session has started, insert the second USB flash drive containing the Ubuntu Core image file.
        2. +
      2. Open a terminal and use the following command to find out the target disk device to install the Ubuntu Core image to: + 

        sudo fdisk -l

        +
        3. +
      3. Run the following command, where <disk label> is the label of the second USB flash drive: +

        + 
        xzcat /media/ubuntu/<disk label>/dawson-uc18-m7-20190122-10.img.xz | sudo dd of=/dev/<target disk device> bs=32M status=progress; sync
        +
      4. Reboot the system and remove the flash drives when prompted. It will then boot from the internal memory where Ubuntu Core has been flashed.
        5. +
      +
      +
      7. + {% include "download/shared/_first-boot-setup.html" %} + {% include "download/shared/_login.html" %} +
    +
    +
    - Flash Ubuntu Core - -
    -
      -
    1. Once the Ubuntu session has started, insert the second USB flash drive containing the Ubuntu Core image file.
      2. -

    2. Open a terminal and use the following command to find out the target disk device to install the Ubuntu Core image to:

      - 
      sudo fdisk -l
      3. -

    3. Run the following command, where <disk label> is the label of the second USB flash drive:

      - 
      xzcat /media/ubuntu/<disk label>/dawson-uc18-m7-20190122-10.img.xz | sudo dd of=/dev/<target disk device> bs=32M status=progress; sync
      4. -
    4. Reboot the system and remove the flash drives when prompted. It will then boot from the internal memory where Ubuntu Core has been flashed.
      5. -
    -
    - - {% with number=7 %}{% include "download/shared/_first-boot-setup.html" %}{% endwith %} - {% with number=8 %}{% include "download/shared/_login.html" %}{% endwith %} - +
    +
    +
    +
    +

    Next steps

    +
    +
    +
    +
    +
    +

    First boot tips

    +
    +
    +
      +
    1. During setup, console-conf will download the SSH key registered with your Store account and configure it so you can log into the device via ssh <Ubuntu SSO account name>@<device IP address> without a password.
      2. +
    2. There is no default ubuntu user on these images, but you can run sudo passwd <account name> to set a password if you need a local console login.
      3. +
    +
    +
    +
    +
    +
    +

    Get started with snaps

    +
    +
    +

    Your board is now ready to have snaps installed, it's time to use the snap command to install your first snap.

    +

    The Snap Store is where you can find the best Linux apps packaged as snaps to install on your Ubuntu device and get started with your secure IoT journey.

    +
    +
    +
    -{% with strip="p-strip--light" %}{% include "download/iot/_boot-tips-strip.html" %}{% endwith %} - -{% include "download/iot/_install-snaps-strip.html" %} -{% include "download/shared/_get-ebook-security.html"%} +{% include "download/shared/_download-security.html" %} -{% with first_item="_core_learn_more", second_item="_core_contribute", third_item="_iot_further_reading" %}{% include "shared/contextual_footers/_contextual_footer.html" %}{% endwith %} +{% include "download/shared/_resources.html" %} {% endblock content %} diff --git a/templates/download/shared/_first-boot-setup.html b/templates/download/shared/_first-boot-setup.html index 6e9953cbb0f..e26e448e8de 100644 --- a/templates/download/shared/_first-boot-setup.html +++ b/templates/download/shared/_first-boot-setup.html @@ -7,7 +7,8 @@

    First boot setup

  • The device will display the prompt "Press enter to configure".
  • Press enter then select "Start" to begin configuring your network and an administrator account. Follow the instructions on the screen, you will be asked to configure your network and enter your Ubuntu SSO credentials.
  • -

    At the end of the process, you will see your credentials to access your Ubuntu Core machine:

    + At the end of the process, you will see your credentials to access your Ubuntu Core machine: + 

    This device is registered to <Ubuntu SSO email address>.
 Remote access was enabled via authentication with the SSO user <Ubuntu SSO user name>
 Public SSH keys were added to the device for remote access.
    diff --git a/templates/download/shared/_login.html b/templates/download/shared/_login.html index 52702b4ac77..d370f526090 100644 --- a/templates/download/shared/_login.html +++ b/templates/download/shared/_login.html @@ -3,7 +3,7 @@

    Connect to the device

    Once setup is done, you can login with SSH into Ubuntu Core, from a machine on the same network, using the following command:

    - 
    ssh <Ubuntu SSO user name>@<device IP address>
    + 

    ssh <Ubuntu SSO user name>@<device IP address>

    Your user name is your Ubuntu SSO user name, and the command should be displayed on the RPi.

    • \ No newline at end of file diff --git a/templates/shared/forms/_desktop-security.html b/templates/shared/forms/_desktop-security.html index b41e5f0d144..123c03fc4ca 100644 --- a/templates/shared/forms/_desktop-security.html +++ b/templates/shared/forms/_desktop-security.html @@ -29,9 +29,9 @@
  • -
    • @@ -46,7 +46,7 @@ {# End of honey pots #}
  • - +