From 358b5328107fdf4d492555c6b6e544aa37fda1dc Mon Sep 17 00:00:00 2001 From: Raghavendra Kamath Date: Thu, 26 Apr 2018 15:19:54 +0530 Subject: [PATCH] update bounty and get started page --- .../doctype/bounty/bounty.py | 6 +- .../doctype/bounty/templates/bounty_row.html | 17 ++-- foundation/templates/includes/list/list.html | 4 +- .../{web_form-bak.html => web_form.html} | 5 +- ...eb_form_row-bak.html => web_form_row.html} | 0 foundation/www/get-started.html | 91 +++++++++---------- 6 files changed, 59 insertions(+), 64 deletions(-) rename foundation/website/doctype/web_form/templates/{web_form-bak.html => web_form.html} (99%) rename foundation/website/doctype/web_form/templates/{web_form_row-bak.html => web_form_row.html} (100%) diff --git a/foundation/erpnext_foundation/doctype/bounty/bounty.py b/foundation/erpnext_foundation/doctype/bounty/bounty.py index 423c5114..0d17d851 100644 --- a/foundation/erpnext_foundation/doctype/bounty/bounty.py +++ b/foundation/erpnext_foundation/doctype/bounty/bounty.py @@ -69,16 +69,16 @@ def get_list_context(context): context.no_breadcrumbs = True context.order_by = 'creation desc' context.introduction = ''' -
+
Start a new bounty
''' context.list_footer = ''' -

Bounty FAQ

''' context.fmt_money = fmt_money def get_paid_backers(backers): - return [backer for backer in backers if backer.paid] \ No newline at end of file + return [backer for backer in backers if backer.paid] diff --git a/foundation/erpnext_foundation/doctype/bounty/templates/bounty_row.html b/foundation/erpnext_foundation/doctype/bounty/templates/bounty_row.html index 94fc47de..03bb0200 100644 --- a/foundation/erpnext_foundation/doctype/bounty/templates/bounty_row.html +++ b/foundation/erpnext_foundation/doctype/bounty/templates/bounty_row.html @@ -1,11 +1,12 @@ {% if doc.published %} -
- -

{{ doc.feature_name }}

+
+
+
+

{{ doc.feature_name }}

{% set bounty_progress = ((doc.bounty_collected/doc.goal)*100) %} {% set comments = (json.loads(doc._comments or '[]'))|len %}
-
{{ doc.bounty_collected }} of {{ doc.goal }}
@@ -27,7 +28,9 @@ {% endif %}

-

{{ html2text(doc.description[:200]) }}{% if doc.description|len > 200 %}...{% endif %}

- +

{{ html2text(doc.description[:200]) }}{% if doc.description|len > 200 %}...{% endif %}

+ Read More Details +
+
-{% endif %} \ No newline at end of file +{% endif %} diff --git a/foundation/templates/includes/list/list.html b/foundation/templates/includes/list/list.html index d198bff3..bb4d8d5e 100644 --- a/foundation/templates/includes/list/list.html +++ b/foundation/templates/includes/list/list.html @@ -2,7 +2,7 @@

{{ sub_title }}

{% endif %} {% if not result -%} -
+
{{ no_result_message or _("Nothing to show") }}
@@ -14,7 +14,7 @@ {%- endif %} --> {% if result_heading_template %}{% include result_heading_template %}{% endif %} -
+
{% for item in result %} {{ item }} {% endfor %} diff --git a/foundation/website/doctype/web_form/templates/web_form-bak.html b/foundation/website/doctype/web_form/templates/web_form.html similarity index 99% rename from foundation/website/doctype/web_form/templates/web_form-bak.html rename to foundation/website/doctype/web_form/templates/web_form.html index 4ab075e3..c0471370 100644 --- a/foundation/website/doctype/web_form/templates/web_form-bak.html +++ b/foundation/website/doctype/web_form/templates/web_form.html @@ -14,9 +14,9 @@ {% block header_actions %} {% if not read_only and has_header %} -
+
{% if login_required -%} - + {{ _("Cancel") }} {%- endif %} {% if not is_list %} @@ -373,7 +373,6 @@ window.web_form_settings = { {% endif %} {% endblock %} - {% block style %}