diff --git a/foundation/public/img/conf/sponsors/cloude8.webp b/foundation/public/img/conf/sponsors/cloude8.webp new file mode 100644 index 00000000..d03a9d62 Binary files /dev/null and b/foundation/public/img/conf/sponsors/cloude8.webp differ diff --git a/foundation/public/img/conf/sponsors/digithinkit.png b/foundation/public/img/conf/sponsors/digithinkit.png new file mode 100644 index 00000000..28019917 Binary files /dev/null and b/foundation/public/img/conf/sponsors/digithinkit.png differ diff --git a/foundation/public/img/conf/mnt-logo.png b/foundation/public/img/conf/sponsors/mnt-logo.png similarity index 100% rename from foundation/public/img/conf/mnt-logo.png rename to foundation/public/img/conf/sponsors/mnt-logo.png diff --git a/foundation/public/img/conf/mnt.svg b/foundation/public/img/conf/sponsors/mnt.svg similarity index 100% rename from foundation/public/img/conf/mnt.svg rename to foundation/public/img/conf/sponsors/mnt.svg diff --git a/foundation/public/img/conf/shs-logo.png b/foundation/public/img/conf/sponsors/shs-logo.png similarity index 100% rename from foundation/public/img/conf/shs-logo.png rename to foundation/public/img/conf/sponsors/shs-logo.png diff --git a/foundation/templates/includes/sponsors.html b/foundation/templates/includes/sponsors.html index e7893909..fc6b5516 100644 --- a/foundation/templates/includes/sponsors.html +++ b/foundation/templates/includes/sponsors.html @@ -1,11 +1,6 @@
-
- -
-
+ +
+ +
+ +
+ +
+ +
+ +
diff --git a/foundation/www/conf/2017/agenda.py b/foundation/www/conf/2017/agenda.py index 8408d611..b55e9aa9 100644 --- a/foundation/www/conf/2017/agenda.py +++ b/foundation/www/conf/2017/agenda.py @@ -8,43 +8,42 @@ def get_context(context): 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='Welcome', + description='Discovering how Open Source has evolved over the years.'), + dict(time='11am-12.30pm', + title='Developing a feature for ERPNext', + description='Learn the process of feature development and contribution'), + dict(time='12.30pm-1.30pm', 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'), + title='UI Development in Frappé', + description='Diving deep into the UI of Frappe and build a new barcode control'), dict(time='3pm-4pm', + title='Designing Portals in Frappé', + description='How to build web views, web forms and other website related topics'), + dict(time='4pm-5pm', 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='Contributing 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', + dict(time='10am-10.30am', + title='Introduction to Hub', + description='Our vision for open marketplace called Hub for an open web.'), + dict(time='10.30am-11.30am', + title='Localizations and Contribution Guidelines', description='How to design and contribute extensions for legal requirements for different countries.'), - dict(time='12pm-1pm', + dict(time='11.30am-12.30pm', title='Integrations', description='How to build and contribute 3rd party integrations in ERPNext.'), - dict(time='1pm-2pm', + dict(time='12.30pm-1.30pm', title='Lunch'), - dict(time='2pm-5pm', + dict(time='2pm-2.30pm', + title='ERPNext Roadmap', + description='Taking a look at the most requested features in ERPNext and how do we prioritize them'), + dict(time='2.30pm-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') ]