Merge branch 'master' of https://github.com/erpnext/foundation

foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json

@@ -4,7 +4,8 @@
  "creation": "2017-07-07 11:29:54.935820",
  "days_in_advance": 0,
  "docstatus": 0,
- "doctype": "Email Alert", 
+ "doctype": "Notification",
+ "channnel": "Email",
  "document_type": "Conference Participant",
  "enabled": 1,
  "event": "Save",

foundation/hooks.py

@@ -39,7 +39,7 @@ home_page = "index"
 template_apps = ['foundation', 'frappe_theme', 'erpnext', 'frappe']
 website_context = {
 	# "navbar_search": 1,
-	"brand_html": "<img class='mr-2 d-inline-block align-top' width='30px' height='30px' src='/assets/foundation/img/erpnext-logo-white.svg' alt='Oensource ERP Software'/>ERPNext.org",
+	"brand_html": "<img class='mr-2 d-inline-block align-top' width='30px' height='30px' src='/assets/foundation/img/erpnext-logo-black.svg' alt='Opensource ERP Software'/>ERPNext.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 = {

foundation/public/img/erpnext-logo-black.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="88px" height="88px" viewBox="0 0 88 88" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 44.1 (41455) - http://www.bohemiancoding.com/sketch -->
+    <title>erpnext-logo</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="erpnext-logo" transform="translate(-2.000000, -2.000000)" fill-rule="nonzero">
+            <g id="g1422-7-2" transform="translate(0.025630, 0.428785)" fill="#36414C">
+                <g id="g1418-4-6" transform="translate(0.268998, 0.867736)">
+                    <g id="g1416-4-9" transform="translate(0.749997, 0.000000)">
+                        <path d="M14.1845844,0.703479866 L75.0387175,0.703479866 C82.3677094,0.703479866 88.2679029,6.60367875 88.2679029,13.9326374 L88.2679029,74.7868158 C88.2679029,82.1157744 82.3677094,88.0159833 75.0387175,88.0159833 L14.1845844,88.0159833 C6.85569246,88.0159833 0.955398949,82.1157744 0.955398949,74.7868158 L0.955398949,13.9326374 C0.955398949,6.60367875 6.85569246,0.703479866 14.1845844,0.703479866 L14.1845844,0.703479866 Z" id="path1414-3-4"></path>
+                    </g>
+                </g>
+            </g>
+            <g id="g1444-6-7" transform="translate(27.708247, 23.320960)" fill="#FFFFFF">
+                <path d="M4.06942472,0.507006595 C3.79457554,0.507006595 3.52673783,0.534925429 3.26792241,0.587619847 C3.00908052,0.640314265 2.75926093,0.717948309 2.52171801,0.818098395 C2.40292009,0.868173438 2.28745592,0.924056085 2.17495509,0.985013441 C1.94997987,1.10692286 1.73828674,1.24983755 1.54244215,1.41134187 C0.661062132,2.13811791 0.100674618,3.23899362 0.100674618,4.4757567 L0.100674618,4.71760174 L0.100674618,39.9531653 L0.100674618,40.1945182 C0.100674618,42.3932057 1.87073716,44.1632683 4.06942472,44.1632683 L31.8263867,44.1632683 C34.0250742,44.1632683 35.7951368,42.3932057 35.7951368,40.1945182 L35.7951368,39.9531653 C35.7951368,37.7544777 34.0250742,35.9844152 31.8263867,35.9844152 L8.28000399,35.9844152 L8.28000399,26.0992376 L25.7874571,26.0992376 C27.9861447,26.0992376 29.7562072,24.3291751 29.7562072,22.1304875 L29.7562072,21.8891611 C29.7562072,19.6904735 27.9861447,17.920411 25.7874571,17.920411 L8.28000399,17.920411 L8.28000399,8.68635184 L31.8263867,8.68635184 C34.0250742,8.68635184 35.7951368,6.9162893 35.7951368,4.71760174 L35.7951368,4.4757567 C35.7951368,2.27706914 34.0250742,0.507006595 31.8263867,0.507006595 L4.06942472,0.507006595 Z" id="rect1436-8-4"></path>
+            </g>
+        </g>
+    </g>
+</svg>

foundation/www/about.html

@@ -51,14 +51,15 @@
 
 ]%}
 
-<section class='top-section'>
+<section class='section-padding splash'
+	style='background-image: url(/assets/foundation/img/community-colored.jpg)'>
+</section>
+<section class='top-section after-splash'>
 	<div class='container'>
 	<h1>ERPNext Foundation</h1>
 	<p class="lead">We are a registered not-for-profit
 		entity representing a community of ERPNext
 		users, developers and service providers.<p>
-	<img class="rounded mw-100 my-5 greyscale"
-		 src="/assets/foundation/img/community-colored.jpg">
 	</div>
 </section>
 <section class='section-padding section-bg'>

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
 	},
 ] %}
+<section class='section-padding splash'
+	style='background-image: url(/assets/foundation/img/meetups/meetup.jpg)'>
+</section>
 
-<section class='top-section'>
+<section class='top-section after-splash'>
 	<div class='container'>
 		<h1>Chapters</h1>
 		<p class='lead'>
 			Become a part of your local ERPNext Community by joining a chapter near you.
 			If you can't find one, start your own!
 		</p>
-	</div>
-</section>
-<section class='section-padding section-bg'>
-	<div class='container'>
-	<div class='card-deck'>
-	{% for item in chapters %}
+		<div class='card-deck mt-5'>
+		{% for item in chapters %}
 
-	<a href='{{ item['meetup-link' ]}}' target='_blank' class='card mb-4'>
-		<img class="card-img-top greyscale" src="{{ item.image }}" alt="{{ item.city }}">
-		<div class="card-body">
-			<h5>{{ item.city }}</h5>
-			<div class='text-muted'>{{ item.members }} members</div>
+		<a href='{{ item['meetup-link' ]}}' target='_blank' class='card mb-4'>
+			<img class="card-img-top greyscale" src="{{ item.image }}" alt="{{ item.city }}">
+			<div class="card-body">
+				<h5>{{ item.city }}</h5>
+				<div class='text-muted'>{{ item.members }} members</div>
+			</div>
+		</a>
+		{% if loop.index is divisibleby 3 %}
 		</div>
-	</a>
-	{% if loop.index is divisibleby 3 %}
-	</div><div class='card-deck'>
-	{% endif %}
-	{% endfor %}
-	</div>
-	</div>
-</section>
-<section class='section-padding'>
-	<div class='container text-center'>
-		<div class='text-muted'>
+		<div class='card-deck'>
+		{% endif %}
+		{% endfor %}
+		</div>
+		<div class='text-muted mt-4'>
 			To start your own chapter, start a group on <a href='https://meetup.com' target='_blank'>Meetup.com</a> and get in touch with us.
 		</div>
 		<div>
-		<a class='mt-2 btn-dark btn' href="/contact">Contact Us To Start a New Chapter</a>
+		<a class='mt-4 btn-dark btn' href="/contact">Contact Us To Start a New Chapter</a>
 		</div>
 	</div>
-<section>
+</section>
 {% endblock %}

foundation/www/conf/2018/index.html

@@ -5,16 +5,18 @@
 {% from "templates/includes/media.html" import media %}
 
 {% block page_content %}
-<section class='top-section'>
+<section class='section-padding splash'
+	style='background-image: url(/assets/foundation/img/conf/conf-1.png)'>
+</section>
+<section class='top-section after-splash'>
 	<div class='container'>
 		<h1>ERPNext Conference 2018</h1>
 		<p class='lead'>The biggest gathering of ERPNext enthusiasts from all over the World.</p>
-		<img class='greyscale mt-4' src='/assets/foundation/img/conf/conf-1.png'>
 	</div>
 </section>
-<section class='section-padding text-center section-bg'>
+<section class='section-padding section-bg text-center'>
 	<div class='container'>
-		<h1>Propose a Talk</h1>
+		<h3 class='mt-5'>Propose a Talk</h3>
 		<p class='lead'>Talk about your experience in the using or developing for ERPNext. These talks are live streamed and watched by thousands online.</p>
 		<a href='mailto:foundation@erpnext.com' class='btn btn-dark btn-sm mt-4'>Send Your Proposal</a>
 	</div>
@@ -22,7 +24,7 @@
 <section class='section-padding'>
 	<div class='container'>
 		<div class='text-center'>
-			<h1>Dates and Venue</h1>
+			<h3>Dates and Venue</h3>
 			<p class='lead mb-5'>The ERPNext Conference will be held at the same venue as the previous four editions, in Mumbai.</p>
 		</div>
 		<div class='card w-400'>

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 %}
 <section class='top-section pb-4'>
 	<div class='container'>
 		<h1>ERPNext Conferences</h1>

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 %}
 <section class='top-section'>
 	<div class='container'>
 		<h1>ERPNext Job Board</h1>

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 %}
 
 <section class='top-section'>
 <div class='container'>

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 = [
 		{

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 %}
-<section class='top-section'>
+{% block content %}
+<style>
+	.page-head { display: none; }
+</style>
+<section class='section-padding splash'
+	style='background-image: url(/assets/foundation/img/unsplash/digital-2.jpeg)'>
+</section>
+<section class='top-section after-splash'>
 	<div class='container'>
-	<img src='/assets/foundation/img/icons/microprocessor.svg' style='height: 100px; margin-bottom: 2rem; margin-top: -1rem'>
+	<!-- <img src='/assets/foundation/img/icons/microprocessor.svg' style='height: 100px; margin-bottom: 2rem; margin-top: -1rem'> -->
 	<h1>Enterprise System for the Digital Age</h1>
 	<p class='lead'>
 		ERPNext is the modern, easy-to-use, 100% open source, business management system used by thousands of enterprises worldwide.

foundation/www/open-source.html

@@ -1,9 +1,12 @@
 {% from "templates/includes/media.html" import media %}
 
-<section class='top-section'>
+<section class='section-padding splash'
+	style='background-image: url(/assets/foundation/img/unsplash/freedom.jpeg)'>
+</section>
+<section class='top-section after-splash'>
 	<div class='container'>
 		<h1>100% Open Source</h1>
-		<p class='lead'>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.</p>
+		<p class='lead'>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.</p>
 	</div>
 </section>
 <section class='section-padding section-bg'>

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) %}
 	<div class='row'>
@@ -29,7 +29,7 @@
 	</div>
 {% endmacro %}
 
-{% block page_content %}
+{% block content %}
 
 <section class='top-section'>
 	<div class='container'>

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 %}
-<section class='top-section'>
+{% block content %}
+<section class='section-padding splash'
+	style='background-image: url(/assets/foundation/img/stories/zerodha.jpg)'>
+</section>
+
+<section class='top-section after-splash'>
 	<div class='container'>
 		<h1>Trailblazing Companies Use ERPNext</h1>
 		<p class='lead'>For every industry or size or domain, ERPNext has been driving growth and systems for innovative companies worldwide.</p>
-	</div>
-</section>
 
 {% set stories = [
 		{
@@ -96,9 +98,8 @@
 	]
 %}
 
-<section class='section-padding section-bg'>
-<div class='container'>
-	<div class='row'>
+
+	<div class='row mt-5'>
 	{% for item in stories %}
 		<div class='col-sm-4 mb-4'>
 		<div class='card h-100'>