From ffe831ad6afb7cfd8d052ab8e0e909300d20ef20 Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Tue, 29 Apr 2014 00:43:10 +0200 Subject: [PATCH] Text and style improvements --- js/ConnectingToNetworkPage.js | 2 +- less/styles.less | 24 ++-- www/index.html | 229 +++++++++------------------------- 3 files changed, 68 insertions(+), 187 deletions(-) diff --git a/js/ConnectingToNetworkPage.js b/js/ConnectingToNetworkPage.js index adbd5e6..b91cc7d 100644 --- a/js/ConnectingToNetworkPage.js +++ b/js/ConnectingToNetworkPage.js @@ -81,7 +81,7 @@ case NetworkAPI.STATUS.CONNECTING: statusText = "Connecting to network "; //actionText = "Please reconnect yourself to "+_pageData.ssid+". Once you are connected return to this page."; - actionText = "Please reconnect yourself to "+_pageData.ssid+". Keep this page open."; + actionText = "Please reconnect yourself to "+_pageData.ssid+". Once connected return to this page."; _actionField.attr("class","notice"); break; case NetworkAPI.STATUS.CONNECTING_FAILED: diff --git a/less/styles.less b/less/styles.less index 5f0306d..1b636be 100644 --- a/less/styles.less +++ b/less/styles.less @@ -1,27 +1,23 @@ body { - text-align: center; + } #logo { - + text-align: center; + display: block; +} +#logo img{ margin: 10px 5px 5px 5px; max-width: 200px; } -.ui-content{ -text-align: center; +.ui-content ul { + padding: 0 0 0 1em; +} +.ui-content ul.ui-listview { + padding: 0; } -.ui-content p{ - text-align: left; -} - -#drawingCanvas { - border: 2px solid black; - height: 20em; - width: 100%; - border-radius: 15px; -} #action { margin: 0 -1em; diff --git a/www/index.html b/www/index.html index a4e4e05..78ec46b 100644 --- a/www/index.html +++ b/www/index.html @@ -24,17 +24,12 @@ - - +
- - +

makes 3D printing very easy

- -
- -
-
- - +
Back

-

-
-
- - +
- +
Back

Find WiFi-Box

-
- -

There's a big chance the Doodle3D WiFi-Box you're looking for is running it's own network. Please open your network settings and connect to a network like 'Doodle3D-...'. Once connected return to this page. (problems?) - - Next - -

-
- - - -
- - -
- Back -

Troubleshooting

-
- -
- -

Having troubles getting started with your WiFi-Box?

- -

Make sure that:

-
    -

  • The box gets power (green lights should be on).

    • -

  • The box has fully started (takes a minute or two)?

    • -

  • You are looking for the WiFi-Box in your local WiFi list. more info

    • -
- -

That is not the problem?

-
    -

  • Is your box connected to another network? more info

    • -

  • If your computer has an ethernet (network) port you can connect it directly to the Doodle3D WiFi-Box using the supplied ethernet cable. more info

    • - -
- -

Got stuck?

- - - -
-
- -
- - -
- Back -

Troubleshooting

-
- - -
-

If your computer has an Ethernet port you are able to connect to the WiFi-Box through the Ethernet cable. Use the Ethernet cable that is provided with the WiFi-Box. Plug one end of the cable in the WiFi-Box and the other in your computer. Usually this forces the connection of your WiFi-Box over the connection of the internet, making you able to connect to the WiFi-Box but unable to connect to the internet.

If this is not the case, search for a connection icon (on WINDOWS usually in the lower right corner and for MAC usually in the upper right corner). Click on the icon and search for options to change your current network(probably wireless) to a cable connection.

Once your computer is connected to the WiFi-Box, return to this page. The 'Find' page will automatically change if you have a connection to a WiFi-Box and will guide you further.

-
-
- -
- - -
- Back -

Troubleshooting

-
- -
-

Locate WiFi-Box

-

If you are able to connect to connect.doodle3d.com through the internet this means you are connected to a network.

+

Find box's WiFi network

+

The Doodle3D WiFi-Box you're looking for is probably running it's own WiFi network. Please open your network settings and connect to a network like Doodle3D-... (More info).

+

Connect to same WiFi network

+

Please make sure that you're connected to the same WiFi network the WiFi-Box is connected to.

+

Can't find WiFi-Box?

+

Please make sure that:

    -

  • If your device can connect to the internet wirelessly it is able to connect to the WiFi-Box through WiFi.

    • -

  • If your device is only able to connect to the internet through a cable it is usaully able to connect to the WiFi-Box through the Ethernet cable. In that case you are able to find more info here.

    • +
  • The box gets power (the big green light should be on).
    • +
  • The box has fully started (the big green light stopped blinking)
-

If you run the WiFi-Box for the first time it creates its own network. So aside of the network you are using right now to access the internet there is another network named 'Doodle3D-...' followed by the last 6 characters of the code that is printed on the side of the WiFi-Box.

-

To access this network you have to connect to the WiFi-Box network instead of your own network. How you are able to switch between a network differs from device you are using, here is a list of the most common used devices:

-
    -

  • SMARTPHONE/TABLET: Smartphones or tablets usually have a settings option in their main menu. Within the settings menu there usually is an option to change settings about your WiFi connection. Usually you are able to switch between different WiFi-spots (Networks) within these settings. Look for a list with different WiFi-spots, if everything works fine, and your WiFi-Box is on, there should be a WiFi-spot called 'Doodle3D...' followed by the last 6 characters of the code that is printed on the side of the WiFi-Box. Connect to this WiFi-spot and return to this page.

    • -

  • WINDOWS COMPUTER/LAPTOP: Windows computers usually (from windows Vista and above) have a small icon in the right lower corner of the screen which displays if you are currently connected to the internet (and if your connection is wireless or not). If you click on this icon a list will display with the network you are currently using and the networks that your computer is able to connect to. If everything works fine, and your WiFi-Box is on, there should be a WiFi-spot called 'Doodle3D...' followed by the last 6 characters of the code that is printed on the side of the WiFi-Box within this list. Connect to this WiFi-spot and return to this page.

    • -

  • MAC COMPUTER/LAPTOP: For most MAC computers there is a small WiFi icon in the upper right corner of their screen. If the WiFi connection is on you can click on the icon and a list with possible networks would appear. If everything works fine, and your WiFi-Box is on, there should be a WiFi-spot called 'Doodle3D...' followed by the last 6 characters of the code that is printed on the side of the WiFi-Box. Connect to this WiFi-spot and return to this page.

    • -
- -

Once you are connect to the WiFi-spot, the 'Find' page will automatically change and will guide you through the next steps.

+

You can always connect to it using an ethernet cable (more info).

+

If the problems remains, please E-mail us at help@doodle3d.com

- -
- +
+
Back -

Doodle3D-987654 (accesspoint)

+

Connecting

-
- - - +

If you're using the WiFi-Box for the first time it creates its own WiFi network. This means its in Access point mode, this is usefull to use the WiFi-Box standalone where internet isn't available.
+ To access it you need to connect to its WiFi network. By default its name is "Doodle3D-" followed by the last 6 characters of the MAC code that is printed on the side of the WiFi-Box. How you can switch to this network depends on the device you are using.

+

Smartphone / tablet

+

Smartphones or tablets usually have a settings section. There you should be able to find WiFi settings where you can switch between different WiFi networks. There should be a WiFi-spot called "Doodle3D-" followed by the last 6 characters of the MAC code that is printed on the side of the WiFi-Box. Connect to this WiFi-spot and return to the boxes page.

+

Windows computer

+

Windows computers usually have a small icon in the right lower corner of the screen which displays if you are currently connected to the internet (and if your connection is wireless or not). If you click on this icon a list will display with the network you are currently using and the networks that your computer is able to connect to. There should be a WiFi-spot called "Doodle3D-" followed by the last 6 characters of the MAC code that is printed on the side of the WiFi-Box. Connect to this WiFi-spot and return to the boxes page.

+

OS X computer

+

For most MAC computers there is a small WiFi icon in the upper right corner of their screen. If WiFi is turned on, you can click on the icon and a list with possible networks would appear. There should be a WiFi network called "Doodle3D-" followed by the last 6 characters of the MAC code that is printed on the side of the WiFi-Box. Connect to this WiFi-spot and return to the boxes page.

+ +
+ +
+ Back +

Cable connect

+
+
+

If your computer has an Ethernet port you are able to connect to the WiFi-Box through a Ethernet cable. Plug one end of the cable in the WiFi-Box and the other in your computer, then return to the boxes page.

+
+
+ +
- - +
Back

Join network

-
@@ -200,11 +127,11 @@
  • Other...
    • -
    +
    - +
    Back

    Connect

    @@ -218,8 +145,9 @@
    +
    - +
    Back

    Connect

    @@ -232,8 +160,9 @@
    +
    - +
    Back

    Connecting...

    @@ -246,89 +175,72 @@
    +
    - - - +
    Back

    Ultimaker @ Doodle3D-123456

    -
    -

    Tune [current value's]

    -
    -
    -
    -
    -
    -
    -
    -
    -
    - +
    +
    +
    +
    +
    +
    - - - +
    Back

    Update

    -
    -
    -
    - +
    Back

    Ultimaker @ Doodle3D-123456

    -
    -

    Control

    -
    -
    -
    @@ -336,38 +248,14 @@
    - -
    - -
    - Back -

    Troubleshooting

    -
    - -
    - -

    If your WiFi-Box is already connected to another network, it is possible to reset the WiFi-Box and make it run it's own network again.

    -
      -

    • You can do this by press and holding the green light button on the top of the WiFi-Box. By holding this button for 3 seconds the WiFi-Box will reset its own network.

      • - -

    • If you have a device with an Ethernet port, it is always possible to connect your WiFi-Box through the ethernet cable.

      • -
    - -
    -
    - -
    - - +
    Back

    Ultimaker @ Doodle3D-123456

    -
    -
    • temperature
    • nozzle: 223
      • @@ -376,10 +264,7 @@
    • printing time: 20m
    • time left: 2h30
    - -
    -