diff --git a/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json b/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json index 867a9681..7ab06050 100644 --- a/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json +++ b/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json @@ -1,28 +1,29 @@ { - "attach_print": 0, - "condition": "doc.paid and doc.amount and not doc.thank_you_email_sent", - "creation": "2017-07-07 11:29:54.935820", - "days_in_advance": 0, - "docstatus": 0, - "doctype": "Email Alert", - "document_type": "Conference Participant", - "enabled": 1, - "event": "Save", - "idx": 0, - "is_standard": 1, - "message": "Dear {{ doc.conference_participant }},

\n\n

Thank you for registering for the 2017 Conference!

\n\n

Here are your ticket details:

\n\n

\nFull Conference Tickets: {{ doc.full_conference_tickets or 0 }}\n
\nUser Conference Tickets: {{ doc.user_conference_tickets or 0 }}\n

\n\n

Total Amount Paid: {{ doc.get_formatted('amount') }}

\n\n

If you need any help, please email us at foundation@erpnext.com

", - "modified": "2017-07-07 16:06:47.764297", - "modified_by": "Administrator", - "module": "ERPNext Foundation", - "name": "Conference Registration", - "owner": "Administrator", - "property_value": "1", + "attach_print": 0, + "condition": "doc.paid and doc.amount and not doc.thank_you_email_sent", + "creation": "2017-07-07 11:29:54.935820", + "days_in_advance": 0, + "docstatus": 0, + "doctype": "Notification", + "channnel": "Email", + "document_type": "Conference Participant", + "enabled": 1, + "event": "Save", + "idx": 0, + "is_standard": 1, + "message": "Dear {{ doc.conference_participant }},

\n\n

Thank you for registering for the 2017 Conference!

\n\n

Here are your ticket details:

\n\n

\nFull Conference Tickets: {{ doc.full_conference_tickets or 0 }}\n
\nUser Conference Tickets: {{ doc.user_conference_tickets or 0 }}\n

\n\n

Total Amount Paid: {{ doc.get_formatted('amount') }}

\n\n

If you need any help, please email us at foundation@erpnext.com

", + "modified": "2017-07-07 16:06:47.764297", + "modified_by": "Administrator", + "module": "ERPNext Foundation", + "name": "Conference Registration", + "owner": "Administrator", + "property_value": "1", "recipients": [ { - "cc": "team@erpnext.com", + "cc": "team@erpnext.com", "email_by_document_field": "owner" } - ], - "set_property_after_alert": "thank_you_email_sent", + ], + "set_property_after_alert": "thank_you_email_sent", "subject": "Thank you for Registering for the Conference" } \ No newline at end of file diff --git a/foundation/hooks.py b/foundation/hooks.py index 1802d0d1..78167cfb 100644 --- a/foundation/hooks.py +++ b/foundation/hooks.py @@ -39,7 +39,7 @@ home_page = "index" template_apps = ['foundation', 'frappe_theme', 'erpnext', 'frappe'] website_context = { # "navbar_search": 1, - "brand_html": "Oensource ERP SoftwareERPNext.org", + "brand_html": "Opensource ERP SoftwareERPNext.org", "top_bar_items": [ {"label": "ERPNext", "child_items":[ {"label": "User Stories", "url": "/stories"}, @@ -67,7 +67,7 @@ website_context = { ], "right":1}, ], "hide_login": 0, - "favicon": "/assets/foundation/img/favicon.ico" + "favicon": "/assets/foundation/img/erpnext-logo-black.png" } # website user home page (by Role) # role_home_page = { diff --git a/foundation/public/img/erpnext-logo-black.png b/foundation/public/img/erpnext-logo-black.png new file mode 100644 index 00000000..50e721a7 Binary files /dev/null and b/foundation/public/img/erpnext-logo-black.png differ diff --git a/foundation/public/img/erpnext-logo-black.svg b/foundation/public/img/erpnext-logo-black.svg new file mode 100644 index 00000000..172d9a45 --- /dev/null +++ b/foundation/public/img/erpnext-logo-black.svg @@ -0,0 +1,21 @@ + + + + erpnext-logo + Created with Sketch. + + + + + \ No newline at end of file diff --git a/foundation/public/img/meetups/meetup.jpg b/foundation/public/img/meetups/meetup.jpg new file mode 100644 index 00000000..8b415024 Binary files /dev/null and b/foundation/public/img/meetups/meetup.jpg differ diff --git a/foundation/public/img/meetups/meetup.png b/foundation/public/img/meetups/meetup.png new file mode 100644 index 00000000..81d9d638 Binary files /dev/null and b/foundation/public/img/meetups/meetup.png differ diff --git a/foundation/public/img/stories/zerodha.jpg b/foundation/public/img/stories/zerodha.jpg index 6410df80..ca62c647 100644 Binary files a/foundation/public/img/stories/zerodha.jpg and b/foundation/public/img/stories/zerodha.jpg differ diff --git a/foundation/public/img/unsplash/digital-1.jpeg b/foundation/public/img/unsplash/digital-1.jpeg new file mode 100644 index 00000000..e9170503 Binary files /dev/null and b/foundation/public/img/unsplash/digital-1.jpeg differ diff --git a/foundation/public/img/unsplash/digital-2.jpeg b/foundation/public/img/unsplash/digital-2.jpeg new file mode 100644 index 00000000..34ecd3c4 Binary files /dev/null and b/foundation/public/img/unsplash/digital-2.jpeg differ diff --git a/foundation/public/img/unsplash/digital.jpeg b/foundation/public/img/unsplash/digital.jpeg new file mode 100644 index 00000000..ae022e50 Binary files /dev/null and b/foundation/public/img/unsplash/digital.jpeg differ diff --git a/foundation/public/img/unsplash/freedom.jpeg b/foundation/public/img/unsplash/freedom.jpeg new file mode 100644 index 00000000..dfdd27ce Binary files /dev/null and b/foundation/public/img/unsplash/freedom.jpeg differ diff --git a/foundation/www/about.html b/foundation/www/about.html index 6bd1b1d2..c4e1aab8 100644 --- a/foundation/www/about.html +++ b/foundation/www/about.html @@ -51,14 +51,15 @@ ]%} -
+
+
+

ERPNext Foundation

We are a registered not-for-profit entity representing a community of ERPNext users, developers and service providers.

-

diff --git a/foundation/www/chapter-list.html b/foundation/www/chapter-list.html index 6b851348..71ef3b87 100644 --- a/foundation/www/chapter-list.html +++ b/foundation/www/chapter-list.html @@ -1,6 +1,6 @@ -{% extends "templates/web.html" %} +{% extends "templates/base.html" %} -{% block page_content %} +{% block content %} {% set chapters = [ { @@ -58,43 +58,39 @@ 'members': 20 }, ] %} +
+
-
+

Chapters

Become a part of your local ERPNext Community by joining a chapter near you. If you can't find one, start your own!

-
-
-
-
-
- {% for item in chapters %} +
+ {% for item in chapters %} - - {{ item.city }} -
-
{{ item.city }}
-
{{ item.members }} members
+ + {{ item.city }} +
+
{{ item.city }}
+
{{ item.members }} members
+
+ + {% if loop.index is divisibleby 3 %}
- - {% if loop.index is divisibleby 3 %} -
- {% endif %} - {% endfor %} -
-
-
-
-
-
+
+ {% endif %} + {% endfor %} +
+
To start your own chapter, start a group on Meetup.com and get in touch with us.
-
+
{% endblock %} diff --git a/foundation/www/conf/2018/index.html b/foundation/www/conf/2018/index.html index 16f02d58..9b5440a3 100644 --- a/foundation/www/conf/2018/index.html +++ b/foundation/www/conf/2018/index.html @@ -5,16 +5,18 @@ {% from "templates/includes/media.html" import media %} {% block page_content %} -
+
+
+

ERPNext Conference 2018

The biggest gathering of ERPNext enthusiasts from all over the World.

-
-
+
-

Propose a Talk

+

Propose a Talk

Talk about your experience in the using or developing for ERPNext. These talks are live streamed and watched by thousands online.

Send Your Proposal
@@ -22,7 +24,7 @@
-

Dates and Venue

+

Dates and Venue

The ERPNext Conference will be held at the same venue as the previous four editions, in Mumbai.

diff --git a/foundation/www/conf/index.html b/foundation/www/conf/index.html index 495504f4..77c330d4 100644 --- a/foundation/www/conf/index.html +++ b/foundation/www/conf/index.html @@ -1,10 +1,10 @@ -{% extends "templates/web.html" %} +{% extends "templates/base.html" %} {% block title %}ERPNext Conferences{% endblock %} {% from "templates/includes/media.html" import media %} -{% block page_content %} +{% block content %}

ERPNext Conferences

diff --git a/foundation/www/erpnext-jobs.html b/foundation/www/erpnext-jobs.html index 3e8b5e89..25730660 100644 --- a/foundation/www/erpnext-jobs.html +++ b/foundation/www/erpnext-jobs.html @@ -1,8 +1,8 @@ -{% extends "templates/web.html" %} +{% extends "templates/base.html" %} {% block title %}ERPNext Job Board{% endblock %} -{% block page_content %} +{% block content %}

ERPNext Job Board

diff --git a/foundation/www/faq.html b/foundation/www/faq.html index 4540e1f4..a8d19acd 100644 --- a/foundation/www/faq.html +++ b/foundation/www/faq.html @@ -1,8 +1,8 @@ -{% extends "templates/web.html" %} +{% extends "templates/base.html" %} {% from "templates/includes/media.html" import media %} -{% block page_content %} +{% block content %}
diff --git a/foundation/www/fellows.html b/foundation/www/fellows.html index 968e826b..8e1f3c66 100644 --- a/foundation/www/fellows.html +++ b/foundation/www/fellows.html @@ -1,9 +1,9 @@ -{% extends "templates/web.html" %} +{% extends "templates/base.html" %} {% from "templates/includes/media.html" import media %} {% block title %}ERPNext Foundation Fellows{% endblock %} -{% block page_content %} +{% block content %} {% set fellows = [ { diff --git a/foundation/www/index.html b/foundation/www/index.html index ae02c7c3..87837b68 100644 --- a/foundation/www/index.html +++ b/foundation/www/index.html @@ -1,9 +1,15 @@ -{% extends "templates/web.html" %} +{% extends "templates/base.html" %} {% block title %}ERPNext Foundation - Open Source ERP Software{% endblock %} -{% block page_content %} -
+{% block content %} + +
+
+
- +

Enterprise System for the Digital Age

ERPNext is the modern, easy-to-use, 100% open source, business management system used by thousands of enterprises worldwide. diff --git a/foundation/www/open-source.html b/foundation/www/open-source.html index 43c36373..9271b2ab 100644 --- a/foundation/www/open-source.html +++ b/foundation/www/open-source.html @@ -1,9 +1,12 @@ {% from "templates/includes/media.html" import media %} -

+
+
+

100% Open Source

-

Unlike other open source business platforms, ERPNext is categorically Open Source, because unlike them, we don't think sustainability and open source live at odds.

+

Unlike other open source business platforms, ERPNext is fully Open Source, because unlike them, we don't think sustainability and open source live at odds.

diff --git a/foundation/www/service-providers.html b/foundation/www/service-providers.html index 0640200c..4abd2a0e 100644 --- a/foundation/www/service-providers.html +++ b/foundation/www/service-providers.html @@ -1,4 +1,4 @@ -{% extends "templates/web.html" %} +{% extends "templates/base.html" %} {% macro show_section(members, with_img = True, color=False) %}
@@ -29,7 +29,7 @@
{% endmacro %} -{% block page_content %} +{% block content %}
diff --git a/foundation/www/stories/index.html b/foundation/www/stories/index.html index b8a8a9c1..2e97c375 100644 --- a/foundation/www/stories/index.html +++ b/foundation/www/stories/index.html @@ -1,16 +1,18 @@ -{% extends "templates/web.html" %} +{% extends "templates/base.html" %} {% block title %}ERPNext User Stories{% endblock %} {% from "templates/includes/media.html" import media %} -{% block page_content %} -
+{% block content %} +
+
+ +

Trailblazing Companies Use ERPNext

For every industry or size or domain, ERPNext has been driving growth and systems for innovative companies worldwide.

-
-
{% set stories = [ { @@ -96,9 +98,8 @@ ] %} -
-
-
+ +
{% for item in stories %}