more stuff

foundation/www/about.html

@@ -4,7 +4,7 @@
 
 {% from "foundation/templates/includes/macros.html" import media %}
 
-{% block content %}
+{% block page_content %}
 <section>
 	<h1>About ERPNext Foundation</h1>
 	<p class='lead'>Community of ERPNext Users, Developers and Service Providers</p>

foundation/www/index.css

@@ -0,0 +1,4 @@
+.page-content {
+	padding-top: 0px;
+	margin-top: -3px;
+}

foundation/www/index.html

@@ -2,7 +2,7 @@
 
 {% block title %}ERPNext Foundation{% endblock %}
 
-{% block content %}
+{% block page_content %}
 <div class='row-full'>
 <img src="/assets/foundation/img/community.png" class='img-responsive'>
 </div>

foundation/www/members/details.html

@@ -0,0 +1,31 @@
+{% extends "templates/web.html" %}
+
+{% block title %}Membership Details{% endblock %}
+
+{% block page_content %}
+<h2>Your Memberships</h2>
+{% if frappe.session.user=='Guest' %}
+<p>You must first sign up and login to become a member</p>
+<p><a href="/login" class='button green-btn'>Login</a></p>
+{% else %}
+
+{% if not last_membership %}
+	<p>You have never been a member of ERPNext Foundation. Click on the button below to start a new membership</p>
+	<p><a href="/memberships?new=1" class='btn btn-primary'>Become A Member</a></p>
+{% elif frappe.utils.getdate(last_membership[-1].to_date) < frappe.utils.getdate(frappe.utils.nowdate()) %}
+	<p>Your Membership has expired, Click the button below to start a new membership</p>
+	<p><a href="/memberships?new=1" class='btn btn-primary'>Renew</a></p>
+	<p><a href="/memberships" class='text-muted'>View Membership History</a></p>
+{% elif frappe.utils.getdate(frappe.utils.add_days(last_membership[-1].to_date, -30)) < frappe.utils.getdate(frappe.utils.nowdate())%}
+	<p>Your Membership is due to expire soon. Click on the button below to renew</p>
+	<p><a href="/memberships?new=1" class='btn btn-primary'>Renew</a></p>
+	<p><a href="/memberships" class='text-muted'>View Membership History</a></p>
+{% else %}
+	<p>Welcome back <b>{{ last_membership[-1].membership_type }} Member!</b></p>
+	<p>Your membership is due to expire on {{ frappe.format_date(last_membership[-1].to_date) }}.
+	<p><a href="/memberships" class='text-muted'>View Membership History</a></p>
+{% endif %}
+
+{% endif %}
+
+{% endblock %}

foundation/www/members/details.py

@@ -0,0 +1,7 @@
+import frappe
+
+def get_context(context):
+	if frappe.session.user != 'Guest':
+		context.show_sidebar = True
+		context.last_membership = frappe.get_all('Membership', 'name,to_date,membership_type',
+			dict(member=frappe.session.user), order_by='to_date desc', limit=1)

foundation/www/members/index.html

@@ -4,7 +4,7 @@
 
 {% from "foundation/templates/includes/macros.html" import media %}
 
-{% block content %}
+{% block page_content %}
 <section>
 	<h1>Memberships</h1>
 	<p class='lead'>Be a Part of the ERPNext Foundation</p>
@@ -30,6 +30,6 @@
 		"medal.png") }}
 </section>
 <section>
-	<p><a href="/members" class="button green-btn">Become A Member</a></p>
+	<p><a href="/members/details" class="button green-btn">Become A Member</a></p>
 </section>
 {% endblock %}

foundation/www/resources.html

@@ -4,7 +4,7 @@
 
 {% from "foundation/templates/includes/macros.html" import media %}
 
-{% block content %}
+{% block page_content %}
 <section>
 	<h1>Resources</h1>
 	<p class='lead'>Information to help you get started on ERPNext</p>

foundation/www/service-providers.html

@@ -4,15 +4,28 @@
 
 {% macro gold_member(m) %}
 <div class='gold-member'>
-	{{ media(m.title, m.introduction, m.image, m.route) }}
+	<div class="media" style="cursor: pointer;" onclick="location.href='{{ m.route }}'">
+		<div class="media-left">
+			<a href="{{ m.route }}">
+				<img class="media-object" src="{{ m.image or '/assets/foundation/img/gold.png' }}"
+					style="width: 72px; height: 72px; max-width: 72px; ">
+			</a>
+		</div>
+		<div class="media-body">
+			<h4 class="media-heading">{{ m.title }}</h4>
+			{{ m.introduction }}
+		</div>
+	</div>
 </div>
 {% endmacro %}
 
 {% macro silver_member(m) %}
 <div class='col-sm-4'>
-	<h4>{{ m.title }}</h4>
-	<p>{{ m.introduction[:100] }}</p>
-	<p><a class='btn btn-default btn-sm' href='{{ m.route }}'>Details</a></p>
+	<div class='silver-member'>
+		<h4>{{ m.title }}</h4>
+		<p>{{ m.introduction[:100] }}</p>
+		<p><a class='btn btn-default btn-sm' href='{{ m.route }}'>Details</a></p>
+	</div>
 </div>
 {% endmacro %}
 
@@ -20,7 +33,7 @@
 	<div class='col-sm-4'>
 		<p>
 			<a class='bold' href="/{{ s.route }}">{{ s.title.title()[:25] }}</a><br>
-			<div class='small'>{{ s.introduction[:100] }}</div>
+			{{ s.introduction[:100] }}
 		</p>
 	</div>
 {% endmacro %}
@@ -50,7 +63,7 @@
 </section>
 {% if form_dict.country %}
 <section>
-	<h2>ERPNext Foundation Members</h2>
+	<h2>Individual Members</h2>
 	<div class='row'>
 	{% for s in individual_members %}
 		{{ show_member(s) }}

foundation/www/service_providers.py

@@ -19,7 +19,7 @@ def get_context(context):
 		context.has_gold_member = 1
 	else:
 		context.gold_members.append(dict(
-			title='Gold Member',
+			title='Your Company',
 			introduction='Become a Gold Member today and get your company featured here',
 			image='/assets/foundation/img/gold.png',
 			route='/members'
@@ -35,7 +35,7 @@ def get_context(context):
 	# round to 3 columns
 	for i in xrange(3 - (len(context.silver_members) % 3)):
 		context.silver_members.append(dict(
-			title='Silver Member',
+			title='Your Company',
 			introduction='Become a Silver Member today and get your company featured here',
 			image='/assets/foundation/img/silver.png',
 			route='/members'
@@ -52,7 +52,7 @@ def get_context(context):
 			context.individual_members = frappe.get_all('Service Provider', 'title, introduction, `image`, route', filters)
 		else:
 			context.individual_members = [dict(
-				title='Individual Member',
+				title='Your Company',
 				introduction='Become an invidual member to list here',
 				route='/members'
 			)]