[fix] site cleanups

foundation/erpnext_foundation/doctype/portal_job/portal_job.py

@@ -9,6 +9,7 @@ import foundation
 
 class PortalJob(WebsiteGenerator):
 	def get_context(self, context):
+		context.no_cache = True
 		context.parents = [dict(label='View All Jobs',
 			route='erpnext-jobs', title='View All Jobs')]
 		context.is_member = foundation.is_member()

foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html

@@ -27,7 +27,7 @@
 <h3>Details</h3>
 <p>{{ description }}</p>
 <h3>Contact</h3>
-{% if frappe.session.user != 'Guest' %}
+{% if frappe.user != 'Guest' %}
 <table class='table table-bordered small' style='max-width: 400px; margin-bottom: 0px;'>
 	<tr>
 		<td style='width: 38.2%'>Email</td>
@@ -41,4 +41,6 @@
 {% else %}
 <p><a href="/login">You must register and login to view contact details</a></p>
 {% endif %}
+<p><br><a href="/my-jobs?new=1" class='btn btn-primary'>Post a New Job</a></p>
+
 {% endblock %}

foundation/erpnext_foundation/doctype/service_provider/service_provider.py

@@ -18,5 +18,7 @@ class ServiceProvider(WebsiteGenerator):
 		context.parents = [dict(label='All Service Providers in {0}'.format(self.country),
 			route='service-providers?country={0}'.format(self.country),
 			title='All Service Providers in {0}'.format(self.country))]
+		if self.member:
+			context.membership_type = frappe.get_value('Member', self.member, 'membership_type')
 		if not context.website.startswith('http'):
 			context.website = 'http://' + context.website

foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html

@@ -4,13 +4,16 @@
 
 {% block page_content %}
 <h1 class="media-heading">{{ title }}</h1>
+{% if membership_type %}
+<p><span class=label>{{ membership_type }} Member<span></p>
+{% endif %}
 <section>
 	<div class="media" style="margin: 45px 0px; ">
-		<div class="media-left">
+		<div class="media-left" style='min-width: 80px;'>
 			<a href="#">
 				<img class="media-object"
 					src="{{ image }}"
-					style="width: 80px; height: 80px; max-width: 80px; ">
+					style="max-width: 80px; ">
 			</a>
 		</div>
 		<div class="media-body">

foundation/hooks.py

@@ -47,10 +47,9 @@ website_context = {
 		{"label": "Foundation", "child_items": [
 			{"label": "About", "url": "/about"},
 			{"label": "Memberships", "url": "/members"},
+			{"label": "Blog", "url": "/blog"},
 			{"label": "Contact", "url": "/contact"},
 			{"label": "Legal", "url": "/legal"},
-			{"label": "Terms", "url": "/terms"},
-			{"label": "Privacy Policy", "url": "/privacy"}
 		]},
 		{"label": "Community", "child_items": [
 			{"label": "Service Providers", "url": "/service-providers"},

foundation/public/css/style.css

@@ -1,8 +1,8 @@
-@import url('https://fonts.googleapis.com/css?family=Open+Sans');
+/*@import url('https://fonts.googleapis.com/css?family=Open+Sans');
-
+*/
 body {
-	font-family: 'Open Sans', sans-serif;
+/*	font-family: 'Open Sans', sans-serif;
-    font-size: 15px;
+*/    font-size: 14px;
 	color: #161c23;
 	text-rendering: optimizeLegibility !important;
 	line-height: 1.5em;
@@ -19,13 +19,13 @@ section:last-child {
 }
 
 section p, section li, section .media-body {
-	font-size: 16px;
+	font-size: 14px;
-	line-height: 1.8em;
+	line-height: 1.6em;
 }
 
 .page_content {
-	font-size: 16px;
+	font-size: 14px;
-	line-height: 1.8em;
+	line-height: 1.6em;
 }
 
 .page_content li {
@@ -69,9 +69,10 @@ h1, h2, h3, h4 {
 }
 
 .label {
+	font-weight: normal;
 	background-color: #d9f7dc;
-	font-size: 14px;
+	font-size: 13px;
-	padding: 5px 10px;
+	padding: 3px 7px;
 	margin-right: 10px;
 }
 
@@ -167,6 +168,6 @@ a:hover {
 
 .page-breadcrumbs .breadcrumb {
 	margin-bottom: 10px;
-	font-size: 16px;
+	font-size: 14px;
 	/*color: #8D99A6;*/
 }

foundation/www/legal.md

@@ -1,12 +1,12 @@
-# ERPNext Opens Source Software Foundation
+<!-- title: ERPNext Open Source Software Foundation -->
-
-## Memorandum of Association
-
-Company Registration Number (CIN): U74999MH2016NPL288653
-
----
-
 <div class='text-center'>
+
+<h1>ERPNext Open Source Software Foundation</h1>
+
+<h2>Memorandum of Association</h2>
+
+Company Registration Number (CIN): U74999MH2016NPL288653<br><br>
+
 THE COMPANIES ACT, 2013<br><br>
 
 MEMORANDUM OF ASSOCIATION<br><br>
@@ -105,3 +105,7 @@ If upon a winding up or dissolution of the company, there remains, after the sat
 
 The Company can be amalgamated only with another company registered under section 8 of the Companies Act, 2013 and having similar objects.
 
+---
+
+- [Terms of Membership](/terms)
+- [Privacy](/privacy)

foundation/www/members/index.html

@@ -31,5 +31,6 @@
 </section>
 <section>
 	<p><a href="/members/details" class="button green-btn">Become A Member</a></p>
+	<p><a href="/service-providers">See List of All Members</a></p>
 </section>
 {% endblock %}

foundation/www/privacy.md

@@ -19,7 +19,7 @@ EOSSF may use collected information for any lawful purpose, including, but not l
 1. To notify the user about EOSSF activities
 
 ###Is Information About Me Secure?
-We will ensure that Your Confidential Information is managed with the same level of security as Our Confidential Information. We will take all reasonable effort to ensure that any Confidential Information is managed in a secure manner by using rights management and password encryption. We may or may not publish our security measures to maintain their secrecy. 
+We will ensure that Your Confidential Information is managed with the same level of security as Our Confidential Information. We will take all reasonable effort to ensure that any Confidential Information is managed in a secure manner by using rights management and password encryption. We may or may not publish our security measures to maintain their secrecy.
 
 **Please Note**
 
@@ -27,3 +27,8 @@ We will ensure that Your Confidential Information is managed with the same level
 1. Public profiles are visible to all, including, Job posts and Service Provider profile
 1. Please do not put any confidential information on site. If EOSSF wants any confidential information, EOSSF will contact you personally.
 1. EOSSF will keep your membership data confidential, if you explicitly inform EOSSF
+
+---
+
+- [Legal](/legal)
+- [Terms of Use](/terms)

foundation/www/resources.html

@@ -35,7 +35,7 @@
 	"forum.png", "https://discuss.erpnext.com") }}
 
 	{{ media("Help Videos", "More than 50 videos explaining features, using ERPNext, detailed webinar recordings, tutorials and much more",
-	"video.png", "https://youtube.com") }}
+	"video.png", "https://www.youtube.com/c/erpnext") }}
 
 </section>
 <section>

foundation/www/service-providers.html

@@ -13,6 +13,7 @@
 		</div>
 		<div class="media-body">
 			<h4 class="media-heading">{{ m.title }}</h4>
+			<p><span class=label>Gold Member</span></p>
 			{{ m.introduction }}
 		</div>
 	</div>
@@ -23,13 +24,14 @@
 <div class='col-sm-4'>
 	<div class='silver-member with-border clickable' style="cursor: pointer;" onclick="location.href='{{ m.route }}'">
 		<h4>{{ m.title }}</h4>
+			<p><span class=label>Silver Member</span></p>
 		<p>{{ m.introduction[:100] }}</p>
 	</div>
 </div>
 {% endmacro %}
 
 {% macro show_member(s) %}
-	<div class='col-sm-4'>
+	<div class='col-sm-4' style='height: 130px; padding-bottom: 30px'>
 		<p>
 			<a class='bold' href="/{{ s.route }}">{{ s.title.title()[:25] }}</a><br>
 			{{ s.introduction[:100] }}
@@ -38,11 +40,10 @@
 {% endmacro %}
 
 {% block page_content %}
-<h1 class='media-heading'>{{ title }}</h1>
+<h1 class='media-heading' style='margin-bottom: 30px;'>{{ title }}</h1>
 {% if form_dict.country %}
 {% endif %}
 <section>
-	<h2>Gold Members</h2>
 	{% for m in gold_members %}
 		{{ gold_member(m) }}
 	{% endfor %}
@@ -52,14 +53,12 @@
 	{% endif %}
 </section>
 <section>
-	<h2>Silver Members</h2>
 	<div class='row'>
 	{% for m in silver_members %}
 		{{ silver_member(m) }}
 	{% endfor %}
 	</div>
 </section>
-{% if form_dict.country %}
 <section>
 	<h2>Individual Members</h2>
 	<div class='row'>
@@ -68,6 +67,7 @@
 	{% endfor %}
 	</div>
 </section>
+{% if form_dict.country %}
 <section>
 	<h2>Other Service Providers</h2>
 	<div class='row'>

foundation/www/service_providers.py

@@ -47,21 +47,23 @@ def get_context(context):
 		))
 
 
+	context.individual_members = []
+	individual_members = [d.name for d in frappe.get_all('Member',
+		dict(membership_type='Individual'))]
+	if individual_members:
+		filters['member'] = ('in', individual_members)
+		context.individual_members = frappe.get_all('Service Provider',
+			'title, introduction, `image`, route', filters)
+	else:
+		context.individual_members = [dict(
+			title='Your Company',
+			introduction='Become an invidual member to list here',
+			route='/members'
+		)]
+
 	if context.form_dict.country:
 		context.title = 'ERPNext Service Providers in {0}'.format(context.form_dict.country)
 
-		context.individual_members = []
-		individual_members = [d.name for d in frappe.get_all('Member', dict(membership_type='Individual'))]
-		if individual_members:
-			filters['member'] = ('in', individual_members)
-			context.individual_members = frappe.get_all('Service Provider', 'title, introduction, `image`, route', filters)
-		else:
-			context.individual_members = [dict(
-				title='Your Company',
-				introduction='Become an invidual member to list here',
-				route='/members'
-			)]
-
 		context.service_providers = [d for d in frappe.get_all('Service Provider', 'name, title, introduction, `image`, route',
 			dict(country=frappe.form_dict.country, show_in_website=1), order_by='name') if d.name not in individual_members]
 

foundation/www/terms.md

@@ -11,4 +11,9 @@ These terms apply if you choose to become an ERPNext Open Source Software Founda
 1. As a member you will have the opportunity to participate in various committees. These committees will be invite only and you are expected to contribute your time and expertise if you want to remain a participant of the committee.
 1. The membership does not give you any decision making right on the foundation unless you are a member of a committee.
 
-If you have questions, please feel to email us at [foundation@erpnext.org](mailto:foundation@erpnext.com)
+If you have questions, please feel to email us at [foundation@erpnext.org](mailto:foundation@erpnext.com)
+
+---
+
+- [Legal](/legal)
+- [Privacy](/privacy)