From f784ae346ef82b56d4aca1c3eff12a37b38426c0 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 1 May 2017 15:55:29 +0530 Subject: [PATCH] [fix] site cleanups --- .../doctype/portal_job/portal_job.py | 1 + .../portal_job/templates/portal_job.html | 4 ++- .../service_provider/service_provider.py | 2 ++ .../templates/service_provider.html | 7 +++-- foundation/hooks.py | 3 +-- foundation/public/css/style.css | 23 ++++++++-------- foundation/www/legal.md | 20 ++++++++------ foundation/www/members/index.html | 1 + foundation/www/privacy.md | 7 ++++- foundation/www/resources.html | 2 +- foundation/www/service-providers.html | 10 +++---- foundation/www/service_providers.py | 26 ++++++++++--------- foundation/www/terms.md | 7 ++++- 13 files changed, 69 insertions(+), 44 deletions(-) diff --git a/foundation/erpnext_foundation/doctype/portal_job/portal_job.py b/foundation/erpnext_foundation/doctype/portal_job/portal_job.py index ad26a53f..64e2d9ae 100644 --- a/foundation/erpnext_foundation/doctype/portal_job/portal_job.py +++ b/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() diff --git a/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html b/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html index 9d60fdc5..f12d6fc4 100644 --- a/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html +++ b/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html @@ -27,7 +27,7 @@

Details

{{ description }}

Contact

-{% if frappe.session.user != 'Guest' %} +{% if frappe.user != 'Guest' %} @@ -41,4 +41,6 @@ {% else %}

You must register and login to view contact details

{% endif %} +


Post a New Job

+ {% endblock %} \ No newline at end of file diff --git a/foundation/erpnext_foundation/doctype/service_provider/service_provider.py b/foundation/erpnext_foundation/doctype/service_provider/service_provider.py index 282c15d4..29bb2db7 100644 --- a/foundation/erpnext_foundation/doctype/service_provider/service_provider.py +++ b/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 \ No newline at end of file diff --git a/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html b/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html index 4418f71b..728ea57d 100644 --- a/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html +++ b/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html @@ -4,13 +4,16 @@ {% block page_content %}

{{ title }}

+{% if membership_type %} +

{{ membership_type }} Member

+{% endif %}
-
+
+ style="max-width: 80px; ">
diff --git a/foundation/hooks.py b/foundation/hooks.py index da0d3e6f..29678e0d 100644 --- a/foundation/hooks.py +++ b/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"}, diff --git a/foundation/public/css/style.css b/foundation/public/css/style.css index cead628d..1a8b67ea 100644 --- a/foundation/public/css/style.css +++ b/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-size: 15px; +/* font-family: 'Open Sans', sans-serif; +*/ 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; - line-height: 1.8em; + font-size: 14px; + line-height: 1.6em; } .page_content { - font-size: 16px; - line-height: 1.8em; + font-size: 14px; + 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; - padding: 5px 10px; + font-size: 13px; + 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;*/ } diff --git a/foundation/www/legal.md b/foundation/www/legal.md index 72ee0a41..3330ee7f 100644 --- a/foundation/www/legal.md +++ b/foundation/www/legal.md @@ -1,12 +1,12 @@ -# ERPNext Opens Source Software Foundation - -## Memorandum of Association - -Company Registration Number (CIN): U74999MH2016NPL288653 - ---- - +
+ +

ERPNext Open Source Software Foundation

+ +

Memorandum of Association

+ +Company Registration Number (CIN): U74999MH2016NPL288653

+ THE COMPANIES ACT, 2013

MEMORANDUM OF ASSOCIATION

@@ -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) diff --git a/foundation/www/members/index.html b/foundation/www/members/index.html index 1f17769b..ed759b3e 100644 --- a/foundation/www/members/index.html +++ b/foundation/www/members/index.html @@ -31,5 +31,6 @@

Become A Member

+

See List of All Members

{% endblock %} diff --git a/foundation/www/privacy.md b/foundation/www/privacy.md index 2c8f7c8e..d017c1cc 100644 --- a/foundation/www/privacy.md +++ b/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) diff --git a/foundation/www/resources.html b/foundation/www/resources.html index 5b950e5b..b635eefd 100644 --- a/foundation/www/resources.html +++ b/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") }}
diff --git a/foundation/www/service-providers.html b/foundation/www/service-providers.html index 34c8432d..926eb2e6 100644 --- a/foundation/www/service-providers.html +++ b/foundation/www/service-providers.html @@ -13,6 +13,7 @@

{{ m.title }}

+

Gold Member

{{ m.introduction }}
@@ -23,13 +24,14 @@

{{ m.title }}

+

Silver Member

{{ m.introduction[:100] }}

{% endmacro %} {% macro show_member(s) %} -
+

{{ s.title.title()[:25] }}
{{ s.introduction[:100] }} @@ -38,11 +40,10 @@ {% endmacro %} {% block page_content %} -

{{ title }}

+

{{ title }}

{% if form_dict.country %} {% endif %}
-

Gold Members

{% for m in gold_members %} {{ gold_member(m) }} {% endfor %} @@ -52,14 +53,12 @@ {% endif %}
-

Silver Members

{% for m in silver_members %} {{ silver_member(m) }} {% endfor %}
-{% if form_dict.country %}

Individual Members

@@ -68,6 +67,7 @@ {% endfor %}
+{% if form_dict.country %}

Other Service Providers

diff --git a/foundation/www/service_providers.py b/foundation/www/service_providers.py index cc998351..bfdd8ca0 100644 --- a/foundation/www/service_providers.py +++ b/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] diff --git a/foundation/www/terms.md b/foundation/www/terms.md index ddec6d2a..5a23f83c 100644 --- a/foundation/www/terms.md +++ b/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) \ No newline at end of file +If you have questions, please feel to email us at [foundation@erpnext.org](mailto:foundation@erpnext.com) + +--- + +- [Legal](/legal) +- [Privacy](/privacy)
Email