added user stories

foundation/www/conf/2017/index.html

@@ -5,15 +5,15 @@
 
 {% block page_content %}
 
-<section class='conf-hero text-center' style='margin-top: -30px'>
+<section class='section-padding text-center'>
 	<div class='text-center'>
 		<img src='/assets/foundation/img/conf/mumbai.png' style='width: 300px; margin-bottom: 50px;'>
 	</div>
 	<!--<h1>Better Together</h1>-->
 	<h1>ERPNext Conference 2017, Mumbai</h1>
 	<p class='lead'>October 12th to 14th</p>
-	<p><a href="https://www.youtube.com/playlist?list=PL3lFfCEoMxvyes3I4n2bGo6JG8DM97vti" class='btn btn-primary'>Watch ERPNext Conference 2017 - Community Talks</a>
-	<p><a href="https://www.youtube.com/playlist?list=PL3lFfCEoMxvy3mCFxFASXrImOMVq2_EpC" class='btn btn-primary'>Watch ERPNext Conference 2017 - Developer Talks</a>
+	<p><a href="https://www.youtube.com/playlist?list=PL3lFfCEoMxvyes3I4n2bGo6JG8DM97vti" class='btn btn-dark btn-sm'>Watch ERPNext Conference 2017 - Community Talks</a>
+	<p><a href="https://www.youtube.com/playlist?list=PL3lFfCEoMxvy3mCFxFASXrImOMVq2_EpC" class='btn btn-dark btn-sm'>Watch ERPNext Conference 2017 - Developer Talks</a>
 	</p>
 	<p><a href="/conf/2017/agenda">Three days of amazing talks and discussions. See the full agenda.</a>
 
@@ -34,7 +34,7 @@
 </section>
 <hr>
 <h2>Sponsored By</h2>
-{% include "foundation/templates/includes/sponsors.html" %}
+{% include "frappe_theme/templates/includes/sponsors.html" %}
 <hr>
 <section>
 	<h3>Brought to you by the ERPNext Foundation</h3>

foundation/www/conf/2017/sponsors.html

@@ -3,4 +3,4 @@
 	<h1>Sponsors</h1>
 </section>
 
-{% include "foundation/templates/includes/sponsors.html" %}
+{% include "frappe_theme/templates/includes/sponsors.html" %}

foundation/www/conf/2018/index.html

@@ -0,0 +1,41 @@
+{% extends "templates/web.html" %}
+
+{% block title %}ERPNext Conference 2018{% endblock %}
+
+{% from "templates/includes/media.html" import media %}
+
+{% block page_content %}
+<section class='top-section'>
+	<h1>ERPNext Conference 2018</h1>
+	<p class='lead'>The biggest gathering of ERPNext enthusiasts from all over the World.</p>
+	<img class='greyscale' src='/assets/foundation/img/conf/conf-1.png'>
+</section>
+<section class='section-padding text-center'>
+	<h1>Propose A Talk</h1>
+	<p class='lead text-muted'>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>
+</section>
+<hr>
+<section class='section-padding'>
+	<div class='text-center'>
+		<h1>Dates and Venue</h1>
+		<p class='lead text-muted 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'>
+		<div class='card-body'>
+			<h5>26th and 27th October, 2018</h5>
+			<div>Mysore Association Auditorium,<br>
+				King's Circle, Matunga,<br>
+				Mumbai - 400019,<br>
+				India
+			</div>
+		</div>
+	</div>
+	<div class='text-center mt-5'>
+		Registrations to Open Soon. For any queries, <a href='mailto:foundation@erpnext,org'>please email us</a>.
+	</div>
+
+</section>
+
+
+{% endblock %}

foundation/www/conf/index.html

@@ -1,30 +1,51 @@
 {% extends "templates/web.html" %}
 
-{% block title %}Conference Home{% endblock %}
+{% block title %}ERPNext Conferences{% endblock %}
 
-{% from "frappe_theme/templates/includes/macros.html" import media %}
+{% from "templates/includes/media.html" import media %}
 
 {% block page_content %}
-<section>
-	<h1>ERPNext Conferences</h1>
-	<p class='lead'>Meet the community at the ERPNext Conferences.</p>
+<section class='section-padding'>
+	<div class='text-center'>
+		<h1>ERPNext Conferences</h1>
+		<p class='lead text-muted'>Meeting people face-to-face at events always beats discussing remotely on the forum.</p>
+	</div>
+	{{ media(
+		"Paulo Almedia",
+		"I want to congratulate the Foundation and all participants for a wonderful conference. Great event, great presentations and great developer sessions.",
+		"https://discuss.erpnext.com/user_avatar/discuss.erpnext.com/almeidapaulopt/90/8907_1.png"
+	) }}
 </section>
-<section style='max-width: 500px'>
-	<h3>ERPNext Conference 2017</h3>
-	<p>
-		Join us for the annual conference in Mumbai from October 12-14, 2017.
-		There will be a code sprints, developer sessions and talks.
-		<br><br><a href="/conf/2017" class="btn btn-primary">Learn More</a>
+<hr>
+<section class='section-padding '>
+	<div class='text-center'>
+		<h1>ERPNext Conference 2018</h1>
+		<p class='lead text-muted'>
+			October 27th - 28th, Mumbai
+		</p>
+	</div>
+	<p class='text-center mt-3'>
+		<a href='/conf/2018' class='btn btn-dark btn-sm'>Learn More</a>
 	</p>
 </section>
-<section>
-	<br><br><br>
-	<h3>Past Conferences</h3>
-	<ul>
-		<li><a href="https://erpnext.com/conf/2017-eu">ERPNext Europe Conference 2017, Frankfurt</a></li>
-		<li><a href="https://erpnext.com/conf/2016">ERPNext Conference 2016, Mumbai</a></li>
-		<li><a href="https://erpnext.com/conf/2015">ERPNext Conference 2015, Mumbai</a></li>
-		<li><a href="https://erpnext.com/conf/2014">ERPNext Conference 2014, Mumbai</a></li>
-	</ul>
+<hr>
+<section class='section-padding'>
+	<div class='card w-400'>
+		<div class='card-body'>
+			<h5 class='card-title'>Past Conferences</h5>
+			<ul>
+				<li><a href="https://erpnext.org/conf/2017">
+					ERPNext Conference 2017, Mumbai</a></li>
+				<li><a href="https://erpnext.com/conf/2017-eu">
+					ERPNext Europe Conference 2017, Frankfurt</a></li>
+				<li><a href="https://erpnext.com/conf/2016">
+					ERPNext Conference 2016, Mumbai</a></li>
+				<li><a href="https://erpnext.com/conf/2015">
+					ERPNext Conference 2015, Mumbai</a></li>
+				<li><a href="https://erpnext.com/conf/2014">
+					ERPNext Conference 2014, Mumbai</a></li>
+			</ul>
+		</div>
+	</div>
 </section>
 {% endblock %}