From bffa8e5bad8393e485f65ae81674ee35e7efc9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Mon, 25 Jan 2021 09:44:48 +0100 Subject: [PATCH] Various UX improvments, add terms page and contact form --- .gitignore | 1 + Makefile | 3 +- assets/css/main.css | 55 ++++++++++++++++++++++-- assets/images/contact.png | Bin 0 -> 5577 bytes contact.part | 12 +++++- index.part | 21 +++++----- manifesto.part | 86 +++++++++++++++++++------------------- page-template.sh | 6 +-- services.part | 6 +-- terms.part | 13 ++++++ 10 files changed, 137 insertions(+), 66 deletions(-) create mode 100644 .gitignore create mode 100644 assets/images/contact.png create mode 100644 terms.part diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2d19fc7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.html diff --git a/Makefile b/Makefile index 5bf6d8a..e2c74e7 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ .EXPORT_ALL_VARIABLES: BASE_TITLE = Recycled Cloud -PAGES = index.html services.html manifesto.html contact.html +PAGES = index.html services.html manifesto.html contact.html terms.html BLOBS = assets/ all: $(PAGES) @@ -24,3 +24,4 @@ index.html: TITLE = "$(BASE_TITLE) | Home" services.html: TITLE = "$(BASE_TITLE) | Services" manifesto.html: TITLE = "$(BASE_TITLE) | Manifesto" contact.html: TITLE = "$(BASE_TITLE) | Contact" +terms.html: TITLE = "$(BASE_TITLE) | Terms" diff --git a/assets/css/main.css b/assets/css/main.css index 7932e60..0337ebc 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -25,6 +25,10 @@ h2 { margin-bottom: 20px; } +.margin-right-20 { + margin-right: 20px; +} + #section-nav { padding-top: 25px; height: 75px; @@ -36,9 +40,26 @@ h2 { top: -15px; } +a { + color: #000; + text-decoration: underline; +} + +a:hover { + color: #000; + text-decoration: none; +} + #section-nav a { color: #000; padding-left: 10px; + text-decoration: none; +} + +#section-nav a:hover { + color: #000; + padding-left: 10px; + text-decoration: underline; } #section-members a { @@ -52,7 +73,7 @@ h2 { .nav-current { font-weight: bold; - text-decoration: underline; + text-decoration: underline !important; } #section-hero, #section-services, #section-members, #section-contact, @@ -83,7 +104,7 @@ h2 .service-logo { color: #fff; } -.btn:link, .btn:visited { +.btn:link, .btn:visited, .btn { background-color: #fff; color: #013366; padding: 10px 15px; @@ -148,12 +169,16 @@ h2 .service-logo { color: #003366; } -#section-tech a, #section-members a { +#section a, #section-members a { color: black; font-weight: bold; text-decoration: underline; } +#section-tech a { + font-weight: bold; +} + #section-tech a:hover, #section-members a:hover { text-decoration: none; } @@ -209,6 +234,11 @@ footer p { color: #003366; } +.contact-rightpane { + padding-top: 20px; + padding-right: 50px; +} + hr { background-image: linear-gradient(to right, #003366, #5d0066); height: 2px; @@ -217,3 +247,22 @@ hr { .center { text-align: center; } + +input[type=text], input[type=email], textarea { + margin-top: 5px; + padding: 5px; + border-radius: 5px; + border: 1px solid gray; + background-color: white; + color: black; + width: 100%; +} + +input[type=submit] { + border: 0; + float: right; +} + +textarea { + height: 150px; +} diff --git a/assets/images/contact.png b/assets/images/contact.png new file mode 100644 index 0000000000000000000000000000000000000000..19df043442a89027b8e4b7f17c5b211aea46e97b GIT binary patch literal 5577 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 literal 0 HcmV?d00001 diff --git a/contact.part b/contact.part index 23a5de9..64aca20 100644 --- a/contact.part +++ b/contact.part @@ -14,12 +14,20 @@

- $PHONE
- $MAIL +

Send a message

+
+ +
+ +
+ +
+ +
diff --git a/index.part b/index.part index f626b86..4926ec2 100644 --- a/index.part +++ b/index.part @@ -2,6 +2,7 @@

Local and recycled cloud services.

Swiss-based and as sustainable as we can.

+ Access the Console Read our Manifesto
@@ -13,18 +14,18 @@

Web Hosting

- Low-footprint, static website hosting. Wordpress and generic PHP hosting. + Low-footprint (static website), Wordpress and generic PHP hosting.

- Learn more + Learn more

Storage

-

Borg based backup service or file sharing with NextCloud.

+

Borg-based backup service and file syncing with NextCloud.

- Learn more + Learn more
@@ -33,7 +34,7 @@

KVM virtual machines, running either one of our images or your own.

- Learn more + Learn more
@@ -57,9 +58,9 @@
@@ -67,8 +68,8 @@
diff --git a/manifesto.part b/manifesto.part index a9f1464..637f424 100644 --- a/manifesto.part +++ b/manifesto.part @@ -1,7 +1,7 @@
-
+

Manifesto

We are saddened by the state of the world, and role that IT - which, @@ -17,52 +17,50 @@

-
-
-
-

- There is no such thing as 'green' or 'sustainable' IT. -
- It will always require high-tech globalised insdustries, as well as - rare and hard to get resources. A maddening amount of those are throwed - away: we get (most of) our hardware from the second-hand market... and - landfills. We try to be the lesser evil but are not and will never be - 'green'. -

-
-
-
-

- IT and 'high tech' in general is not necessarly the right solution to a - problem. -
- They are no different from any other tool. You can't work around a +

+
+
+

+ There is no such thing as 'green' or 'sustainable' IT. +
+ It will always require high-tech globalised insdustries, as well as + rare and hard to get resources. A maddening amount of those are throwed + away: we get (most of) our hardware from the second-hand market... and + landfills. We try to be the lesser evil but are not and will never be + 'green'. +

+
+
+

+ IT and 'high tech' in general is not necessarly the right solution to a + problem. +
+ They are no different from any other tool*. You can't work around a ill-defined problem by aimlessly throwing resources and 'solutions' at it. -

+

+
-
-
-
-
-

- For the better or worse, we already live in a world controlled by - technology. -
- We can't let an anyone size its control: we work in the open, with open - tools, gladly welcome anyone who want to join and don't lock them in. -

-
-
-
-

- We fight against the use of technology as a mean of control an - manipulation. -
- We fight against centralization, both from technical and governance - reasons. We are not one, but a federation of small hosting providers - with similar ideology. -

+
+
+

+ For the better or worse, we already live in a world controlled by + technology. +
+ We can't let an anyone size its control: we work in the open, with open + tools, gladly welcome anyone who want to join and don't lock them in. +

+
+
+

+ We fight against the use of technology as a mean of control an + manipulation. +
+ We fight against centralization, both from technical and governance + reasons. We are not one, but a federation of small hosting providers + with similar ideology. +

+
diff --git a/page-template.sh b/page-template.sh index 2f271d0..907b2eb 100755 --- a/page-template.sh +++ b/page-template.sh @@ -35,7 +35,7 @@ cat << EOF
- EN + EN
@@ -45,10 +45,10 @@ cat << EOF
-

Terms of Usage & Privacy Policy

+

Terms of Usage & Privacy Policy

-

CC-BY e-Durable SA | More about e-Durable SA

+

CC-BY e-Durable SA | More about e-Durable SA

diff --git a/services.part b/services.part index f429562..ad96b65 100644 --- a/services.part +++ b/services.part @@ -103,18 +103,18 @@

Linthal GL, Switzerland

- 100 Mbps (burstable to 1Gbps) upstream, operated by e-Durable SA in ungleich's Datacenterlight. + Three shelves, 100 Mbps (burstable to 1Gbps) upstream, operated by e-Durable SA in ungleich's Datacenterlight.

Lausanne VD, Switzerland

-

100 Mbps upstream, operated by e-Durable SA.

+

One 42U rack, 100 Mbps upstream, operated by e-Durable SA.

Froideville VD, Switzerland

-

1 Gbps upstream, operated by e-Durable SA.

+

Two 42 racks, 1 Gbps upstream, operated by e-Durable SA.

diff --git a/terms.part b/terms.part new file mode 100644 index 0000000..e67b5ac --- /dev/null +++ b/terms.part @@ -0,0 +1,13 @@ +

Terms of Usage & Privacy Policy

+ +

+We have yet to write proper terms, but it'll be along the lines of: +

    +
  • Use our services in good faith and don't get us in trouble.
    • +
  • We collect only what is strictly necessary (email, name and billing address).
    • +
  • We do not share your data with anyone outside our organization.
    • +
  • We'll email you before these terms change.
    • +
+ +Please contact us if you have any questions. +