diff --git a/foundation/erpnext_foundation/doctype/chapter/chapter.json b/foundation/erpnext_foundation/doctype/chapter/chapter.json index 9a3dc214..94cb6076 100644 --- a/foundation/erpnext_foundation/doctype/chapter/chapter.json +++ b/foundation/erpnext_foundation/doctype/chapter/chapter.json @@ -26,7 +26,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_global_search": 0, - "in_list_view": 0, + "in_list_view": 1, "in_standard_filter": 0, "label": "Title", "length": 0, @@ -56,7 +56,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_global_search": 0, - "in_list_view": 0, + "in_list_view": 1, "in_standard_filter": 0, "label": "Chapter Head", "length": 0, @@ -87,7 +87,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_global_search": 0, - "in_list_view": 0, + "in_list_view": 1, "in_standard_filter": 0, "label": "Introduction", "length": 0, @@ -104,6 +104,36 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "meetup_embed_html", + "fieldtype": "Code", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 1, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Meetup Embed HTML", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -147,7 +177,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_global_search": 0, - "in_list_view": 0, + "in_list_view": 1, "in_standard_filter": 0, "label": "Route", "length": 0, @@ -267,7 +297,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-05-11 17:07:13.825474", + "modified": "2017-08-02 13:04:00.723298", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "Chapter", diff --git a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html index 23542e40..8649904c 100644 --- a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html +++ b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html @@ -4,11 +4,14 @@

{{ title }}

Details

{{ introduction }}

+{% if meetup_embed_html %} +{{ meetup_embed_html }} +{% endif %}

List of Members

{% if members %} - +
- + {% for user in members %} @@ -19,14 +22,11 @@
{{ frappe.db.get_value('User', user.user, 'full_name') }}
{% if user.website_url %} - {{ user.website_url }} - {% else %} - - {% endif %} + {{ user.website_url or '' }} + {% endif %}
- {% if user.website_url %} - + {% if user.introduction %} {{ user.introduction }} {% endif %}
@@ -40,18 +40,18 @@ {% endif %}

Chapter Head

-
Member Details
+
- + - + - +
NameName {{ frappe.db.get_value('User', chapter_head, 'full_name') }}
Email{{ frappe.db.get_value('User', chapter_head, 'email') }}{{ frappe.db.get_value('User', chapter_head, 'email') or '' }}
Phone{{ frappe.db.get_value('User', chapter_head, 'phone') }}{{ frappe.db.get_value('User', chapter_head, 'phone') or '' }}

Address

diff --git a/foundation/erpnext_foundation/doctype/chapter/test_chapter.js b/foundation/erpnext_foundation/doctype/chapter/test_chapter.js new file mode 100644 index 00000000..e3b75be4 --- /dev/null +++ b/foundation/erpnext_foundation/doctype/chapter/test_chapter.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Chapter", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially('Chapter', [ + // insert a new Chapter + () => frappe.tests.make([ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/foundation/erpnext_foundation/doctype/conference_talk_proposal/conference_talk_proposal.py b/foundation/erpnext_foundation/doctype/conference_talk_proposal/conference_talk_proposal.py index f04804fc..a49751bc 100644 --- a/foundation/erpnext_foundation/doctype/conference_talk_proposal/conference_talk_proposal.py +++ b/foundation/erpnext_foundation/doctype/conference_talk_proposal/conference_talk_proposal.py @@ -13,7 +13,6 @@ class ConferenceTalkProposal(WebsiteGenerator): def get_list_context(context): - context.show_sidebar = 1 - context.website_sidebar = 'Conference 2017 Sidebar' + context.title = 'Talk Proposals' context.no_breadcrumbs = 1 diff --git a/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal_row.html b/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal_row.html index c699f73e..9e4797b7 100644 --- a/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal_row.html +++ b/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal_row.html @@ -1,6 +1,6 @@

- {{ doc.title }} + {{ doc.title }} {{ doc.status or 'Pending Review' }}
By {{ doc.speaker }}

diff --git a/foundation/templates/includes/custom.css b/foundation/templates/includes/custom.css index 73bfb7d3..f86808ba 100644 --- a/foundation/templates/includes/custom.css +++ b/foundation/templates/includes/custom.css @@ -130,4 +130,22 @@ a { .full-name { display: none; -} \ No newline at end of file +} + +.sponsor { + height: 200px; + margin-top: 30px; + text-align: center; + vertical-align: center; + border: 1px solid #d1d8dd; + border-radius: 3px; + padding: 20px; +} + +.sponsor .lead { + margin-top: 60px; +} + +.sponsor img { + max-width: 150px; +} diff --git a/foundation/templates/includes/sponsors.html b/foundation/templates/includes/sponsors.html new file mode 100644 index 00000000..c8f54f66 --- /dev/null +++ b/foundation/templates/includes/sponsors.html @@ -0,0 +1,37 @@ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+

Become a patron for the conference and get associated with a global community
+ of tens of thousands of users and developers. Sponsors also get 5 complimentary passes for the full conference!

+ Become A Sponsor +
+
+
+ +
\ No newline at end of file diff --git a/foundation/www/conf/2017/_sidebar.json b/foundation/www/conf/2017/_sidebar.json new file mode 100644 index 00000000..c996f56b --- /dev/null +++ b/foundation/www/conf/2017/_sidebar.json @@ -0,0 +1,31 @@ +[ + { + "route": "/conf/2017", + "title": "Conference Home" + }, + { + "route": "/conf/2017/sponsors", + "title": "Sponsors" + }, + { + "route": "/conf/2017/agenda", + "title": "Agenda" + }, + { + "route": "/conf/2017/register", + "title": "Register" + }, + { + "route": "/conf/2017/proposals", + "title": "Talk Proposals" + }, + { + "route": "/conf/2017/volunteers", + "title": "Volunteers" + }, + { + "route": "/conf/2017/memories", + "title": "Memories" + } + +] \ No newline at end of file diff --git a/foundation/www/conf/2017/agenda.html b/foundation/www/conf/2017/agenda.html new file mode 100644 index 00000000..c939dde8 --- /dev/null +++ b/foundation/www/conf/2017/agenda.html @@ -0,0 +1,42 @@ +{% extends "templates/web.html" %} + +{% block page_content %} + + +
+

ERPNext Conference 2017, Mumbai

+

Agenda

+
+ +
+{% for day in agenda %} +
+

{{ day.title }}

+
+ {% for item in day['items'] %} +
+

{{ item.time }}

+
+

{{ item.title }}

+ {% if item.description %} +

{{ item.description }}

+ {% endif %} +
+
+ {% endfor %} +
+{% endfor %} +
+

Register Now

+ +{% endblock %} \ No newline at end of file diff --git a/foundation/www/conf/2017/agenda.py b/foundation/www/conf/2017/agenda.py new file mode 100644 index 00000000..cf763823 --- /dev/null +++ b/foundation/www/conf/2017/agenda.py @@ -0,0 +1,78 @@ +# -*- coding: utf-8 -*- + +from __future__ import unicode_literals + +def get_context(context): + context.agenda = [ + dict( + title = 'Day 1: Developer Talks', + items = [ + dict(time='10am-11am', + title='Frappé Framework Architecture and Way Forward', + description='Overview of the architecture of Frappé and the direction in which we are going'), + dict(time='11am-12pm', + title='Developing the User Interface', + description='Understanding controls, views, layouts, and other objects in the Frappé User Interface'), + dict(time='12pm-1pm', + title='Debugging Frappé', + description='Tips and tricks on how to debug client and serverside issues in Frappé'), + dict(time='1pm-2pm', + title='Lunch'), + dict(time='2pm-3pm', + title='Designing Portals in Frappé', + description='How to build web views, web forms, customize templates and other website related topics'), + dict(time='3pm-4pm', + title='Deployment and Release', + description='Understanding the Frappé Release process and best practices for deployment and updating'), + dict(time='4pm-5pm', + title='Contributing to ERPNext', + description='Constribution best practices, writing tests, updating docs and planning your contributions') + + ] + ), + dict( + title = 'Day 2: ERPNext Roadmap', + items = [ + dict(time='10am-11am', + title='ERPNext Roadmap', + description='Taking a look at the most requested features in ERPNext and how do we prioritize them'), + dict(time='11am-12pm', + title='Localizations', + description='How to design and contribute extensions for legal requirements for different countries.'), + dict(time='12pm-1pm', + title='Integrations', + description='How to build and contribute 3rd party integrations in ERPNext.'), + dict(time='1pm-2pm', + title='Lunch'), + dict(time='2pm-5pm', + title='Module Analysis', + description='In this session will will look at each ERPNext module including Accounting, Manufacturing, CRM etc and discuss what should be the priority development in each of these modules') + ] + ), + dict( + title = 'Day 3: Community and User Talks', + items = [ + dict(time='10am-11am', + title='Welcome and ERPNext Foundation', + description='A look back at what we have achieved in the 6 months and what is the vision for the ERPNext Foundation'), + dict(time='11am-12pm', + title='Business of ERPNext', + description='A panel discussion on how to make money on ERPNext and build a sustainable eco-system'), + dict(time='12pm-1pm', + title='User Stories', + description='Three ERPNext Users will share their ERPNext Journeys'), + dict(time='1pm-2pm', + title='Lunch'), + dict(time='2pm-3pm', + title='Feature Showcase', + description='Three developers from the community will showcase the extensions they have built on ERPNext'), + dict(time='3pm-4pm', + title='The Road Ahead', + description='Panel Disussion with Gold Members on how do we make ERPNext a mainstream ERP alternative to paid ERPs'), + dict(time='4pm-5pm', + title='Lightening Talks and Q&A', + description='5 min lightening talks by the audience and Q&A with the foundation members'), + + ] + ) + ] \ No newline at end of file diff --git a/foundation/www/conf/2017/index.css b/foundation/www/conf/2017/index.css index 3a863bcb..d0131070 100644 --- a/foundation/www/conf/2017/index.css +++ b/foundation/www/conf/2017/index.css @@ -8,20 +8,3 @@ padding: 5px; } -.sponsor { - height: 200px; - margin-top: 30px; - text-align: center; - vertical-align: center; - border: 1px solid #d1d8dd; - border-radius: 3px; - padding: 20px; -} - -.sponsor .lead { - margin-top: 60px; -} - -.sponsor img { - max-width: 200px; -} diff --git a/foundation/www/conf/2017/index.html b/foundation/www/conf/2017/index.html index 65115501..e21896fc 100644 --- a/foundation/www/conf/2017/index.html +++ b/foundation/www/conf/2017/index.html @@ -2,22 +2,6 @@ {% block title %}ERPNext Conference 2017{% endblock %} -{% block script %} - - - -{% endblock %} - {% block page_content %} @@ -28,7 +12,10 @@

ERPNext Conference 2017, Mumbai

October 12th to 14th

-

Register Now

+

Register Now +

+

Three days of amazing talks and discussions. See the full agenda. +

@@ -44,76 +31,9 @@ where by specialization and co-operation, all of us become better.

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-

Agenda

-

This conference will be divided in three days. On the first day, we will have a - community code sprint, where developers will from groups to work on specific problems. - On the second and third days we will have talks focussed on developers and end users. - Over this time there will be plenty of opportunity to network with developers, - service providers and users across the world.

-

- Propose A Talk -

-
-
-
- -
-
-

Sponsored By

-
- -
- -
- -
- -
- -
- -
- -
-
-

Become a patron for the conference and get associated with a global community
- of tens of thousands of users and developers.

- Become A Sponsor -
-
-
- -
+

Sponsored By

+{% include "foundation/templates/includes/sponsors.html" %}

Brought to you by the ERPNext Foundation

@@ -123,6 +43,7 @@

Learn about Memberships

+
@@ -153,8 +74,10 @@
-

- Register Now

+

+ Register Now +

+

See the full agenda.

{% endblock %} diff --git a/foundation/www/conf/2017/memories.html b/foundation/www/conf/2017/memories.html new file mode 100644 index 00000000..85ee5a1b --- /dev/null +++ b/foundation/www/conf/2017/memories.html @@ -0,0 +1,33 @@ + +
+

Memories

+

Snapshots of Earlier Events

+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ Register Now +

+

See the full agenda. +

diff --git a/foundation/www/conf/2017/proposals.html b/foundation/www/conf/2017/proposals.html new file mode 100644 index 00000000..efc38fab --- /dev/null +++ b/foundation/www/conf/2017/proposals.html @@ -0,0 +1,14 @@ +{% extends "templates/web.html" %} + +{% block page_content %} +
+

ERPNext Conference 2017, Mumbai

+

Talk Proposals

+
+ +{% include "templates/includes/list/list.html" %} +{% endblock %} + +{% block script %} + +{% endblock %} diff --git a/foundation/www/conf/2017/proposals.py b/foundation/www/conf/2017/proposals.py new file mode 100644 index 00000000..ae954b1d --- /dev/null +++ b/foundation/www/conf/2017/proposals.py @@ -0,0 +1,6 @@ +import frappe +import frappe.www.list + +def get_context(context): + context.update(frappe.www.list.get_context(context, + doctype='Conference Talk Proposal')) diff --git a/foundation/www/conf/2017/register.html b/foundation/www/conf/2017/register.html index b7cb401e..42990550 100644 --- a/foundation/www/conf/2017/register.html +++ b/foundation/www/conf/2017/register.html @@ -4,8 +4,8 @@ {% block page_content %} -
-

ERPNext Conference 2017, Mumbai

+
+

ERPNext Conference 2017, Mumbai

Tickets and Registration

@@ -25,7 +25,7 @@ - Full Conference (Code Sprint + Dev Talks + User Talks) + Full Conference (Full 3 days)
Oct 12-14
Includes Lunch @@ -35,7 +35,7 @@ - User Conference (User + Community Talks) + User Conference (Only last day)
Oct 14
Includes Lunch @@ -66,7 +66,7 @@ - Full Conference (Code Sprint + Dev Talks + User Talks) + Full Conference (Full 3 days)
Oct 12-14
Includes Lunch @@ -76,7 +76,7 @@ - User Conference (User + Community Talks) + User Conference (Only last day)
Oct 14
Includes Lunch diff --git a/foundation/www/conf/2017/register.py b/foundation/www/conf/2017/register.py deleted file mode 100644 index 5c164dea..00000000 --- a/foundation/www/conf/2017/register.py +++ /dev/null @@ -1,3 +0,0 @@ -def get_context(context): - context.show_sidebar = 1 - context.website_sidebar = 'Conference 2017 Sidebar' \ No newline at end of file diff --git a/foundation/www/conf/2017/sponsors.html b/foundation/www/conf/2017/sponsors.html new file mode 100644 index 00000000..9b8c2286 --- /dev/null +++ b/foundation/www/conf/2017/sponsors.html @@ -0,0 +1,6 @@ +
+

ERPNext Conference 2017, Mumbai

+

Sponsors

+
+ +{% include "foundation/templates/includes/sponsors.html" %} diff --git a/foundation/www/conf/2017/volunteers.html b/foundation/www/conf/2017/volunteers.html new file mode 100644 index 00000000..a370b6d8 --- /dev/null +++ b/foundation/www/conf/2017/volunteers.html @@ -0,0 +1,19 @@ +
+

ERPNext Conference 2017, Mumbai

+

Volunteers

+
+ +
+
+ {% for person in volunteers %} +

{{ person.name }}

+

+ {{ person.title }} +
{{ person.contact }} +

+
+ {% endfor %} +
+
+
+Interested in volunteering? Email us at foundation@erpnext.org diff --git a/foundation/www/conf/2017/volunteers.py b/foundation/www/conf/2017/volunteers.py new file mode 100644 index 00000000..d66941d2 --- /dev/null +++ b/foundation/www/conf/2017/volunteers.py @@ -0,0 +1,18 @@ +def get_context(context): + context.volunteers = [ + dict( + name='Manas Solanki', + title='Conference Manager', + contact='manas@erpnext.com' + ), + dict( + name='Prakash Hodage', + title='Tickets and Registration', + contact='prakash@erpnext.com' + ), + dict( + name='Ameya Shenoy', + title='Guest Relations', + contact='ameya@erpnext.com' + ) + ]