[GNUnet-SVN] [taler-codeless] branch master updated: improved ui by adding explanations

[gnunet]

This is an automated email from the git hooks/post-receive script.

shivam-kohli pushed a commit to branch master
in repository codeless.

The following commit(s) were added to refs/heads/master by this push:
     new b0df61f  improved ui by adding explanations
b0df61f is described below

commit b0df61f757ab0ce721b9fd9476a99ea9f5f7e633
Author: shivam kohli <address@hidden>
AuthorDate: Thu Aug 2 05:54:45 2018 +0530

    improved ui by adding explanations
---
 inventory/forms.py                         |  2 +-
 templates/inventory/base1.html             |  6 +++---
 templates/inventory/digital_inventory.html |  6 +++---
 templates/inventory/home.html              | 12 ++++++------
 templates/inventory/login.html             |  2 ++
 templates/inventory/new_product.html       |  5 +++--
 templates/inventory/order.html             |  1 +
 templates/inventory/signup.html            |  4 ++++
 8 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/inventory/forms.py b/inventory/forms.py
index 36653b1..e450a53 100644
--- a/inventory/forms.py
+++ b/inventory/forms.py
@@ -39,7 +39,7 @@ class SignUpForm(UserCreationForm):
     last_name = forms.CharField(max_length=30, required=False)
     email = forms.EmailField(max_length=254)
     website =  forms.URLField(label='Enter website URL', max_length=250, 
required=False)
-    address = forms.CharField(label='Payment Address type ', 
widget=forms.Select(choices=ADDRESS_CHOICES))
+    address = forms.CharField(label='Payment Address type', 
widget=forms.Select(choices=ADDRESS_CHOICES))
     pay_url = forms.URLField(label='Directly enter the Plain PaytoURI', 
max_length=250, required=False)
 
     class Meta:
diff --git a/templates/inventory/base1.html b/templates/inventory/base1.html
index 4c227e9..93d7dec 100644
--- a/templates/inventory/base1.html
+++ b/templates/inventory/base1.html
@@ -36,9 +36,9 @@ with the Taler Codeless Merchant.  If not, see 
<https://www.gnu.org/licenses/>.
       <h1><span class="tt adorn-brackets">Codeless Demo</span></h1>
       <h1><span class="it"><a href="">Merchant</a></span></h1>
       <p>Codeless is a platform for the merchant where they can manage their 
inventory and simultaneously create a 'Buy Now' button for the specific 
product. This code can be directly copy pasted on the seller's frontend and can 
be used for 'Pay with Taler'.</p>
-        <li><a href="/accounts/login">LOGIN</a></li>
-        <li><a href="/signup">REGISTER</a></li></li>
-        <li><a href="/password_reset">FORGET PASSWORD</a></li>
+        <li><a href="/accounts/login">Login</a></li>
+        <li><a href="/signup">Register</a></li></li>
+        <li><a href="/password_reset">Forget Password</a></li>
       <p>You can learn more about Taler on our main <a 
href="https://taler.net";>website</a>.</p>
     </div>
     <div class="content">
diff --git a/templates/inventory/digital_inventory.html 
b/templates/inventory/digital_inventory.html
index 078233c..a3e92fe 100644
--- a/templates/inventory/digital_inventory.html
+++ b/templates/inventory/digital_inventory.html
@@ -21,16 +21,16 @@ with the Taler Codeless Merchant.  If not, see 
<https://www.gnu.org/licenses/>.
 {% extends "inventory/base2.html" %}
 
 {% block headermsg %}
-  <center><h1 class="nav">ADD A NEW PRODUCT</h1></center>
+  <center><h1 class="nav">ADD A NEW DIGITAL PRODUCT</h1></center>
+  <p>Upload Digital Inventory (like a PDF or html page) via the codeless 
payments frontend, and the user can then purchase it and view the version 
hosted by the codeless payment frontend. A large number of uploading format is 
accepted.</p>
 {% endblock headermsg %}
 
 {% block content %}
-<div class="main">
+<div class="main" style="overflow-x: hidden;">
     <section id="contact">
         <div class="container">
           <form method="post" enctype="multipart/form-data">
           <form method="post" enctype="multipart/form-data">
-          <h1>FOR DIGITAL INVENTORY</h1>
           {% csrf_token %}
           <!-- {{ form.as_p }} -->
 
diff --git a/templates/inventory/home.html b/templates/inventory/home.html
index 5b5d6b6..f7d2faa 100644
--- a/templates/inventory/home.html
+++ b/templates/inventory/home.html
@@ -24,11 +24,15 @@ with the Taler Codeless Merchant.  If not, see 
<https://www.gnu.org/licenses/>.
 {% load staticfiles %}
   <link rel="stylesheet" type="text/css" href="{% static 'card.css' %}" />
   <center><h1 class="nav">INVENTORY</h1></center>
+  <p>The current products in the inventory available has been displayed below. 
To add new physical or digital inventory click the buttons respectively below 
this text. For detailed information about specific product click on the card 
below (cards are displayed only when there is inventory in the stocks).</p>
 {% endblock headermsg %}
 
 {% block content %}
-<div class="main">
-
+<div class="main" style="overflow-x: hidden;">
+  <div>
+    <center><a id='add_new_product' href="/new_product">ADD PHYSICAL 
INVENTORY</a></center></br>
+    <center><a href="/digital_inventory">ADD DIGITAL INVENTORY</a></center><br>
+  </div>
   <ul class="cards">
     {% for item in data %}
       <li class="cards__item">
@@ -48,9 +52,5 @@ with the Taler Codeless Merchant.  If not, see 
<https://www.gnu.org/licenses/>.
       </li>
     {% endfor %}
   </ul>
-
-  <center><a id='add_new_product' href="/new_product">ADD 
PRODUCT</a></center></br>
-  <center><a href="/digital_inventory">ADD DIGITAL INVENTORY</a></center>
-
 </div>
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/inventory/login.html b/templates/inventory/login.html
index 0160b15..1220b02 100644
--- a/templates/inventory/login.html
+++ b/templates/inventory/login.html
@@ -22,6 +22,7 @@ with the Taler Codeless Merchant.  If not, see 
<https://www.gnu.org/licenses/>.
 
 {% block headermsg %}
   <center><h1 class="nav">Login</h1></center>
+  <p>Login to the codeless payment. A platform for the merchant where they can 
manage their inventory and create a buy now button for 'Pay with Taler'</p>
 {% endblock headermsg %}
 
 {% block content %}
@@ -39,5 +40,6 @@ with the Taler Codeless Merchant.  If not, see 
<https://www.gnu.org/licenses/>.
           </form>
       </div>
     </section>
+    <p>If you are not registered as a merchant, please signup before 
proceeding. You can signup <a href="/signup">here</a>.</p>
 </div>
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/inventory/new_product.html 
b/templates/inventory/new_product.html
index 9875c4a..c50aaa1 100644
--- a/templates/inventory/new_product.html
+++ b/templates/inventory/new_product.html
@@ -21,11 +21,12 @@ with the Taler Codeless Merchant.  If not, see 
<https://www.gnu.org/licenses/>.
 {% extends "inventory/base2.html" %}
 
 {% block headermsg %}
-  <center><h1 class="nav">ADD A NEW PRODUCT</h1></center>
+  <center><h1 class="nav">ADD A NEW PHYSICAL INVENTORY</h1></center>
+  <p>In this kind of product the seller has a flexibilty to add any product 
(any phyical inventory). The Minimum Quantity of the Product that is required 
to be maintained in the stock. Whenever the stocks run below this limit the 
seller would be notified(Curently this feature has not been added but soon 
email notification would be added). </br> Whenever user purchases a product 
from the seller, after successful payment they will be redirected to the 
fullfillment page. On the fullfillment [...]
 {% endblock headermsg %}
 
 {% block content %}
-<div class="main">
+<div class="main" style="overflow-x: hidden;">
 
     <section id="contact">
         <div class="container">
diff --git a/templates/inventory/order.html b/templates/inventory/order.html
index d4a3424..5df03f6 100644
--- a/templates/inventory/order.html
+++ b/templates/inventory/order.html
@@ -24,6 +24,7 @@ with the Taler Codeless Merchant.  If not, see 
<https://www.gnu.org/licenses/>.
 {% load staticfiles %}
   <link rel="stylesheet" type="text/css" href="{% static 'card.css' %}" />
   <center><h1 style="text-transform: uppercase;" id="name">ORDERS 
PLACED</h1></center>
+  <p>All the pending orders are displayed below. Whenever user purchases a 
product from the seller, after successful payment they are redirected to the 
fullfillment page. For digital inventory the fullfillment page would be the 
direct display of the digital inventory(like pdf). But for physical product 
shipment tracking makes sence. Therefore on the fullfillment page the user can 
track his shipment. The status of the order is updated by the merchant and on 
this basis the user is updated  [...]
 {% endblock headermsg %}
 
 {% block content %}
diff --git a/templates/inventory/signup.html b/templates/inventory/signup.html
index 7ed3c8c..6dd4fda 100644
--- a/templates/inventory/signup.html
+++ b/templates/inventory/signup.html
@@ -22,6 +22,7 @@ with the Taler Codeless Merchant.  If not, see 
<https://www.gnu.org/licenses/>.
 
 {% block headermsg %}
   <center><h1 class="nav">Register</h1></center>
+  <p>Register as a Merchant. If you already registered, please login <a 
href="/accounts/login">here</a>.</p>
 {% endblock headermsg %}
 
 {% block content %}
@@ -36,6 +37,9 @@ with the Taler Codeless Merchant.  If not, see 
<https://www.gnu.org/licenses/>.
                   {% if field.label == 'Directly enter the Plain PaytoURI' %}
                      <br><br><label class="tooltip">{{ field.label }}<font 
size="1"><span class="tooltiptext">This field is not necessary, if you have 
choosen the address type.</span></font></label>
                      {{ field }}
+                  {% elif field.label == 'Payment Address type' %}
+                     <br><br><label class="tooltip">{{ field.label }}<font 
size="1"><span class="tooltiptext">Choose the type of payment method from the 
list.</span></font></label>
+                     {{ field }}
                   {% else %}
                     <label class="mylabel">{{ field.label }}</label>
                     {{ field }}

-- 
To stop receiving notification emails like this one, please contact
address@hidden