From 4b9d56f610a084f76fed6f5f3b7acd1d00a282ac Mon Sep 17 00:00:00 2001
From: j3s <j3s@c3f.net>
Date: Wed, 20 May 2020 23:01:14 -0500
Subject: [PATCH] Clarify some common workflow confusion

---
 README.md                                |  4 +--
 capsulflask/templates/create-capsul.html | 43 +++++++++++-------------
 capsulflask/templates/login.html         |  7 ++--
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 4c59d52..8823825 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ Generate a private key and the accompanying bitpay SIN for the btcpay API client
   I used this code as an example: https://github.com/bitpay/bitpay-python/blob/master/bitpay/key_utils.py#L6
 
 ```
-$ python ./readme/generate_btcpay_keys.py
+$ pipenv run python ./readme/generate_btcpay_keys.py
 ```
 
 It should output something looking like this:
@@ -156,4 +156,4 @@ NOTE: make sure to use single quotes and replace the new lines with \n.
 
 ```
 BTCPAY_PRIVATE_KEY='-----BEGIN EC PRIVATE KEY-----\nEXAMPLEIArx/EXAMPLEKH23EXAMPLEsYXEXAMPLE5qdEXAMPLEcFHoAcEXAMPLEK\noUQDQgAEnWs47PT8+ihhzyvXX6/yYMAWWODluRTR2Ix6ZY7Z+MV7v0W1maJzqeqq\nNQ+cpBvPDbyrDk9+Uf/sEaRCma094g==\n-----END EC PRIVATE KEY-----'
-```
\ No newline at end of file
+```
diff --git a/capsulflask/templates/create-capsul.html b/capsulflask/templates/create-capsul.html
index bb27042..0cefbde 100644
--- a/capsulflask/templates/create-capsul.html
+++ b/capsulflask/templates/create-capsul.html
@@ -8,38 +8,33 @@
 </div>
 <div class="row third-margin">
   <div>
-    
+  <pre>
+    CAPSUL SIZES
+    ============
+    type     monthly*  cpus  mem     ssd   net*
+    -----    -------   ----  ---     ---   ---
+    f1-s     $5.33     1     512M    25G   .5TB
+    f1-m     $7.16     1     1024M   25G   1TB
+    f1-l     $8.92     1     2048M   25G   2TB
+    f1-x     $16.16    2     4096M   25G   4TB
+    f1-xx    $29.66    4     8096M   25G   8TB
+    f1-xxx   $57.58    8     16G     25G   16TB
 
+    * net is calculated as a per-month average
+    * vms are billed for a minimum of 24 hours upon creation
+    * all VMs come standard with one public IPv4 address</pre>
+  <pre>
+    Your <a href="/console/account-balance">account balance</a>: ${{ account_balance }}
+  </pre>
   {% if cant_afford  %} 
-    <p>
-      Your account does not have sufficient funds to create a Capsul.
-      (Must be funded enough to last at least one month at creation time).
-    </p> 
-    <p>You must <a href="/console/account-balance">add funds to your account</a> before you can create a Capsul.</p>
+  <p>Please <a href="/console/account-balance">fund your account</a> in order to create Capsuls</p>
+    <p>(At least one month of funding is required)</p>
   {% elif no_ssh_public_keys %}
     <p>You don't have any ssh public keys yet.</p> 
     <p>You must <a href="/console/ssh">upload one</a> before you can create a Capsul.</p>
   {% elif not capacity_avaliable %}
     <p>Host(s) at capacity. No capsuls can be created at this time. sorry. </p> 
   {% else %}
-    <pre>
-      CAPSUL SIZES
-      ============
-      type     monthly*  cpus  mem     ssd   net*
-      -----    -------   ----  ---     ---   --- 
-      f1-s     $5.33     1     512M    25G   .5TB
-      f1-m     $7.16     1     1024M   25G   1TB 
-      f1-l     $8.92     1     2048M   25G   2TB 
-      f1-x     $16.16    2     4096M   25G   4TB 
-      f1-xx    $29.66    4     8096M   25G   8TB 
-      f1-xxx   $57.58    8     16G     25G   16TB
-      
-      * net is calculated as a per-month average
-      * vms are billed for a minimum of 24 hours upon creation
-      * all VMs come standard with one public IPv4 addr</pre>
-    <pre>
-      Your <a href="/console/account-balance">account balance</a>: ${{ account_balance }}
-    </pre>
 
     <form method="post">
       <div class="row justify-start">
diff --git a/capsulflask/templates/login.html b/capsulflask/templates/login.html
index deff0cb..c63cdc3 100644
--- a/capsulflask/templates/login.html
+++ b/capsulflask/templates/login.html
@@ -1,11 +1,12 @@
 {% extends 'base.html' %}
 
-{% block title %}login{% endblock %}
+{% block title %}Login/Register{% endblock %}
 
 {% block content %}
   <div class="row half-margin">
-    <h1>LOGIN</h1>
+    <h1>LOGIN/REGISTER</h1>
   </div>
+  <p>If you do not already have an account, one will be made for you.</p>
   <form method="post" class="half-margin">
     <div class="row wrap">
       <label for="email">Email Address</label>
@@ -15,4 +16,4 @@
   </form>
 {% endblock %}
 
-{% block pagesource %}/templates/login.html{% endblock %}
\ No newline at end of file
+{% block pagesource %}/templates/login.html{% endblock %}