Tweak getting started page and bounty page

foundation/erpnext_foundation/doctype/foundation_fellowship/foundation_fellowship.py

@@ -7,9 +7,10 @@ import frappe
 from frappe.website.website_generator import WebsiteGenerator
 
 class FoundationFellowship(WebsiteGenerator):
-    _website = frappe._dict(
+    website = frappe._dict(
-        condition_field = "show_in_website",
+        condition_field = "show_in_website"
     )
+    print( "website", website )
     def validate(self):
         if not self.route:
             self.route = 'foundation-fellow/' + self.scrub(self.name)

foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship.html

@@ -44,7 +44,6 @@
                 </tr>
                 </tr>
                     <td>Website</td>
-                    <td><a href="{{ website }}" target="_blank">{{ website }}</a></td>
                 </tr>
             </table>
 

foundation/public/css/erpnext-org-theme.css

@@ -166,17 +166,16 @@ a:hover {
 a:focus,
 a:visited {
   outline: 0;
-  background-color: transparent;
 }
-.header1 {
+.header-1 {
   font-size: 2.5rem;
   line-height: 1.025;
 }
-.header2 {
+.header-2 {
   font-size: 1.5rem;
   line-height: 1.025;
 }
-.header3 {
+.header-3 {
   font-size: 1rem;
   line-height: 1.025;
 }
@@ -570,6 +569,11 @@ caption {
 th {
   text-align: left;
 }
+.input-group {
+  position: relative;
+  display: table;
+  border-collapse: separate;
+}
 .btn-group,
 .btn-group-vertical {
   position: relative;
@@ -817,6 +821,49 @@ img.blog-cover-image,
 .btn-next-wrapper {
   margin-top: 4rem;
 }
+.input-group-btn {
+  display: table-cell;
+  vertical-align: middle;
+  white-space: nowrap;
+  height: 2rem;
+}
+.dropdown-menu {
+  display: none;
+  position: absolute;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  box-shadow: 0 5px 9px 0 rgba(0, 0, 0, 0.05);
+  background-color: #fff;
+}
+.dropdown-menu li {
+  padding: 0.5rem;
+  margin: 0;
+  transition: background-color 0.3s ease-out;
+  cursor: pointer;
+}
+.dropdown-menu li:hover {
+  background-color: #F0F4F7;
+}
+.display-block {
+  display: block;
+}
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  margin-left: 2px;
+  vertical-align: middle;
+  border-top: 0.25rem solid;
+  border-right: 0.25rem solid transparent;
+  border-left: 0.25rem solid transparent;
+}
+.bounty-amount .form-control {
+  margin-right: 1.5rem;
+}
+.input-group-btn .dropdown-toggle {
+  margin-left: 1.5rem;
+}
 /*blog*/
 /*TODO Needs refactor in frappe to use utilities.less*/
 .blog-list-content {
@@ -907,6 +954,12 @@ img.blog-cover-image,
   margin-bottom: 1.5rem;
   border-radius: 0.25em;
   padding: 1.5rem;
+  flex-direction: column;
+}
+@media screen and (min-width: 500px) {
+  .media {
+    flex-direction: row;
+  }
 }
 .media-left {
   width: 10%;
@@ -970,6 +1023,9 @@ img.blog-cover-image,
   width: 150px;
   padding-bottom: 1.5rem;
 }
+.feature-img {
+  width: 300px;
+}
 .community-bg {
   background-image: linear-gradient(to bottom, rgba(117, 116, 254, 0.52), #7574fe), url("/assets/foundation/img/community-2016.jpg");
   background-size: cover;
@@ -981,3 +1037,21 @@ img.blog-cover-image,
 .about .intro-copy {
   max-width: 800px;
 }
+/* added to make iframe responsive */
+.embed-container {
+  position: relative;
+  padding-bottom: 56.25%;
+  height: 0;
+  overflow: hidden;
+  max-width: 800px;
+  width: auto;
+}
+.embed-container iframe,
+.embed-container object,
+.embed-container embed {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}

foundation/public/css/reset.css

@@ -24,17 +24,28 @@ html {
 	line-height: 1.62;
 	font-size: 14px;
 }
-@media screen and (min-width: 767px){
-	html{
-	font-size: 16px;
 
+@media screen and (min-width: 767px) {
+	html {
+		font-size: 16px;
 	}
 }
+
 @-ms-viewport {
 	width: device-width;
 }
 
-article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {
+article,
+aside,
+dialog,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+nav,
+section {
 	display: block;
 }
 
@@ -42,16 +53,15 @@ body {
 	margin: 0;
 	font-weight: 400;
 	text-align: left;
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, Noto, Oxygen-Sans, "Noto Sans",  Ubuntu,Cantarell, sans-serif, "Apple Color Emoji", "Noto Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica", "Arial", "Noto", "Oxygen-Sans", "Noto Sans", "Ubuntu", "Cantarell", sans-serif, "Apple Color Emoji", "Noto Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
 	color: #36414c;
-    font-weight:normal;
 	font-feature-settings: "kern" 1;
 	font-kerning: normal;
 	text-rendering: optimizeLegibility;
 }
 
-[tabindex="-1"]:focus {
+[ tabindex = "-1" ]:focus {
-    outline: 0 !important;
+	outline: 0;
 }
 
 hr {
@@ -60,10 +70,14 @@ hr {
 	overflow: visible;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
 	margin-bottom: 1rem;
-	margin-top:0;
+	margin-top: 0;
-
 }
 
 p {
@@ -71,11 +85,10 @@ p {
 	margin-bottom: 1rem;
 }
 
-abbr[title],
+abbr[ title ],
-abbr[data-original-title] {
+abbr[ data-original-title ] {
 	text-decoration: underline;
 	-webkit-text-decoration: underline dotted;
-    text-decoration: underline dotted;
 	cursor: help;
 	border-bottom: 0;
 }
@@ -105,7 +118,7 @@ dt {
 }
 
 dd {
-    margin-bottom: .5rem;
+	margin-bottom: 0.5rem;
 	margin-left: 0;
 }
 
@@ -135,11 +148,11 @@ sup {
 }
 
 sub {
-    bottom: -.25em;
+	bottom: -0.25em;
 }
 
 sup {
-    top: -.5em;
+	top: -0.5em;
 }
 
 a {
@@ -149,21 +162,19 @@ a {
 }
 
 a:hover {
-    color: #0056b3;
 	text-decoration: underline;
 }
 
-a:not([href]):not([tabindex]) {
+a:not([ href ]):not([ tabindex ]) {
-    color: inherit;
 	text-decoration: none;
 }
 
-a:not([href]):not([tabindex]):focus, a:not([href]):not([tabindex]):hover {
+a:not([ href ]):not([ tabindex ]):focus,
-    color: inherit;
+a:not([ href ]):not([ tabindex ]):hover {
 	text-decoration: none;
 }
 
-a:not([href]):not([tabindex]):focus {
+a:not([ href ]):not([ tabindex ]):focus {
 	outline: 0;
 }
 
@@ -171,7 +182,7 @@ pre,
 code,
 kbd,
 samp {
-    font-family: monospace, monospace; */
+	font-family: monospace, monospace;
 	font-size: 1em;
 }
 
@@ -200,8 +211,8 @@ svg:not(:root) {
 a,
 area,
 button,
-[role="button"],
+[ role = "button" ],
-input:not([type="range"]),
+input:not([ type = "range" ]),
 label,
 select,
 summary,
@@ -228,7 +239,7 @@ th {
 
 label {
 	display: inline-block;
-    margin-bottom: .5rem;
+	margin-bottom: 0.5rem;
 }
 
 button {
@@ -236,7 +247,7 @@ button {
 }
 
 button:focus {
-    outline: 1px dotted;
+	outline: none;
 	outline: 5px auto -webkit-focus-ring-color;
 }
 
@@ -306,7 +317,7 @@ legend {
 	width: 100%;
 	max-width: 100%;
 	padding: 0;
-    margin-bottom: .5rem;
+	margin-bottom: 0.5rem;
 	font-size: 1.5rem;
 	line-height: inherit;
 	color: inherit;

foundation/public/less/erpnext-org-theme.less

@@ -16,21 +16,20 @@ a {
 	&:focus,
 	&:visited {
 		outline: 0;
-		background-color: transparent;
 	}
 }
 
-.header1 {
+.header-1 {
 	font-size: 2.5rem;
 	line-height: 1.025;
 }
 
-.header2 {
+.header-2 {
 	font-size: 1.5rem;
 	line-height: 1.025;
 }
 
-.header3 {
+.header-3 {
 	font-size: 1rem;
 	line-height: 1.025;
 }
@@ -469,6 +468,12 @@ th {
 	text-align: left;
 }
 
+.input-group {
+	position: relative;
+	display: table;
+	border-collapse: separate;
+}
+
 .btn-group,
 .btn-group-vertical {
 	position: relative;
@@ -758,6 +763,57 @@ img.blog-cover-image,
 	margin-top: 4rem;
 }
 
+.input-group-btn {
+	display: table-cell;
+	vertical-align: middle;
+	white-space: nowrap;
+	height: 2rem;
+}
+
+.dropdown-menu {
+	display: none;
+	position: absolute;
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	box-shadow: 0 5px 9px 0 rgba(0, 0, 0, 0.05);
+	background-color: #fff;
+
+	li {
+		padding: 0.5rem;
+		margin: 0;
+		transition: background-color @transition;
+		cursor: pointer;
+
+		&:hover {
+			background-color: @btn-bg;
+		}
+	}
+}
+
+.display-block {
+	display: block;
+}
+
+.caret {
+	display: inline-block;
+	width: 0;
+	height: 0;
+	margin-left: 2px;
+	vertical-align: middle;
+	border-top: 0.25rem solid;
+	border-right: 0.25rem solid transparent;
+	border-left: 0.25rem solid transparent;
+}
+
+.bounty-amount .form-control {
+	margin-right: 1.5rem;
+}
+
+.input-group-btn .dropdown-toggle {
+	margin-left: 1.5rem;
+}
+
 /*blog*/
 
 /*TODO Needs refactor in frappe to use utilities.less*/
@@ -872,6 +928,11 @@ img.blog-cover-image,
 	margin-bottom: 1.5rem;
 	border-radius: 0.25em;
 	padding: 1.5rem;
+	flex-direction: column;
+
+	@media screen and (min-width: @screen-palm) {
+		flex-direction: row;
+	}
 }
 
 .media-left {
@@ -952,6 +1013,10 @@ img.blog-cover-image,
 	padding-bottom: 1.5rem;
 }
 
+.feature-img {
+	width: 300px;
+}
+
 .community-bg {
 	background-image: linear-gradient(to bottom, rgba(117, 116, 254, 0.52), rgb(117, 116, 254)), url("/assets/foundation/img/community-2016.jpg");
 	background-size: cover;
@@ -964,3 +1029,23 @@ img.blog-cover-image,
 .about .intro-copy {
 	max-width: 800px;
 }
+
+/* added to make iframe responsive */
+.embed-container {
+	position: relative;
+	padding-bottom: 56.25%;
+	height: 0;
+	overflow: hidden;
+	max-width: 800px;
+	width: auto;
+}
+
+.embed-container iframe,
+.embed-container object,
+.embed-container embed {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}

foundation/templates/includes/navbar/navbar.html

@@ -9,7 +9,7 @@
             <div class="right">
                 <ul class="menu list-unstyled">
                     <li class="menu-items">
-                        <a href="/service-providers" class="menu-links">Service providers</a>
+                        <a href="/service-providers" class="menu-links">Services</a>
                     </li>
                     <li class="menu-items">
                         <a href="/blog" class="menu-links">Blog</a>

foundation/www/docs/user/manual/en/stock/stock-entry.md

@@ -39,8 +39,6 @@ The added additional costs will be distributed among the receiving items (where
 If perpetual inventory system is enabled, additional costs will be booked in "Expense Included In Valuation" account.
 
 <img class="screenshot" alt="Additional Costs General Ledger" src="/docs/assets/img/stock/additional-costs-general-ledger.png">
-
-
 > **Note:** To update Stock from a spreadsheet, see [Stock Reconciliation]({{doc_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html).
 
 {next}

foundation/www/get-started.html

@@ -1,37 +1,65 @@
 {% extends "foundation/templates/base.html" %}
 {% block title %} Get Started - ERPNext Foundation{% endblock %}
 {% block content %}
-<section class="feature">
+<section class="feature text-center">
 	<div class="container">
-        <h1 class="header1 text-center">Virtual Machine Images</h1>
+		<p class="text-center"><a class=""> 
+			<img class="grid-images" src="/assets/foundation/img/bench-logo.png">
+		</a></p>
+		<h1 class="header-1 text-center">Install ERPNext with Bench</h1>
+		<p class="text-medium text-light text-center">Bench is our in-house tool to install and manage ERPNext.</p>
+		<a class="primary-link text-medium" target="_blank"  href="https://github.com/frappe/bench#manual-install">Read the instructions on our wiki</a>
+	</div>
+</section>
+<section class="feature text-center">
+	<div class="container">
+		<p class="text-center"><a class=""> 
+			<img class="feature-img bottom-spacer" src="/assets/foundation/img/cloud.png">
+		</a></p>
+		<h1 class="header-1">Get ERPNext on cloud</h1>
+		<p class="text-medium intro-copy text-light">Start right away with a free trial account </br>and get priority support.</p>
+		<a class="button button-primary text-center" href="https://erpnext.com/pricing?source=org">Free 30 Day Trial</a></p>
+	</div>
+</section>
+<section class="feature gray-bg">
+    <div class="container">
+        <h1 class="header-1 text-center">Virtual Machine Images</h1>
         <p class='text-medium text-light text-center bottom-spacer-4'>Download a pre-installed Virtual Box Images</p>
         <ul class="list-unstyled grid-of-three">
-            <li class="list-items border grid-items">
+            <li class="list-items grid-items">
                 <a class="primary-links grid-boxes saturate" href="http://build.erpnext.com/ERPNext-Production.ova">
                     <img class="grid-images" src="/assets/foundation/img/vm-production.png" alt="Download ERPNext Production Image">
                 </a>
-                <h2 class="header3">Download Production Image</h2>
+                <h2 class="header-3">Download Production Image</h2>
                 <p class="text-muted">Stable build for Production use<br>(approx 1.5GB) | <a href="http://build.erpnext.com/ERPNext-Production.ova.md5">MD5</a></p>
             </li>
-            <li class="list-items border grid-items">
+            <li class="list-items grid-items">
                 <a class="primary-links grid-boxes saturate" href="http://build.erpnext.com/ERPNext-Dev.ova">
                     <img class="grid-images" src="/assets/foundation/img/vm-development.png" alt="Download ERPNext Development Image">
                 </a>
-                <h2 class="header3">Download Development Image</h2>
+                <h2 class="header-3">Download Development Image</h2>
                 <p class="text-muted">Bleeding edge build for development only<br>(approx 1.5GB) | <a href="http://build.erpnext.com/ERPNext-Dev.ova.md5">MD5</a>
                 </p>
             </li>
-            <li class="list-items border grid-items">
+            <li class="list-items grid-items">
                 <a class="primary-links grid-boxes saturate" href="http://build.erpnext.com/ERPNext-Vagrant.box">
                     <img class="grid-images" src="/assets/foundation/img/vm-dev-vagrant.png" alt="Download ERPNext Vagrant Box">
                 </a>
-                <h2 class="header3">Download Vagrant Box</h2>
+                <h2 class="header-3">Download Vagrant Box</h2>
                 <p class="text-muted">Bleeding edge Vagrant box for development only<br>(approx 1.5GB) | <a href="http://build.erpnext.com/ERPNext-Vagrant.box.md5">MD5</a>
                 </p>
             </li>
         </ul>
-        <p class="text-center top-spacer-4"><a class="secondary-link" href="https://github.com/frappe/frappe/wiki/The-Hitchhiker%27s-Guide-to-Installing-Frapp%C3%A9-on-Linux-OS">Read more in the wiki for manually installing ERPNext on your
+    </div>
-            machine</a></p>
+</section>
+<section class="feature text-center">
+	<div class="container">
+		<p class="text-center"><a class=""> 
+			<img class="feature-img bottom-spacer" src="/assets/foundation/img/service-providers.png">
+		</a></p>
+		<h1 class="header-1">Contact Service Providers</h1>
+		<p class="text-medium intro-copy text-light">For additional customisations, implementation and training requirements.</p>
+		<a class="primary-link text-medium text-center" href="/service-providers">See the list of all Service Providers</a>
 	</div>
 </section>
 {% endblock %}

foundation/www/index.html

@@ -4,14 +4,14 @@
 <section class='feature hero text-center'>
     <div class="container">
         <img class="hero-illustration bottom-spacer" src='/assets/foundation/img/hero-illustration-erpnext.png' alt="ERP software for Everybody">
-        <h1 class="header1">ERP for Everybody</h1>
+        <h1 class="header-1">ERP for Everybody</h1>
         <p class='intro-copy text-medium text-light'>Worlds Leading Fully Opensource ERP Software That Helps You Stay In Control Of Your Business</p>
         <a class="button button-primary" href="/get-started.html">Get Started</a>
     </div>
 </section>
 <section class="feature gray-bg left-aligned">
     <div class="container">
-        <h2 class="header1 bottom-spacer-4 text-center">One App Many Domains</h1>
+        <h2 class="header-1 bottom-spacer-4 text-center">Industries</h1>
           <ul class="list-unstyled grid-of-four">
             <li class="list-items grid-items">
 				<a class="primary-links grid-boxes" href="/docs/user/manual/en/manufacturing">
@@ -53,8 +53,8 @@
 <section class="feature community-bg text-white">
     <div class="container">
         <div class="text-center">
-            <h1 class="header1">ERPNext Foundation</h1>
+            <h1 class="header-1">ERPNext Foundation</h1>
-            <p class="intro-copy">ERPNext Foundation is a community of ERPNext users, developers and service providers. The goal of the ERPNext Foundation is to provide a platform for the ERPNext Community to come together, join hands and build assets to help build and enhance ERPNext around the world.</p>
+            <p class="intro-copy text-medium">ERPNext Foundation is a community of ERPNext users, developers and service providers. The goal of the ERPNext Foundation is to provide a platform for the ERPNext Community to come together, join hands and build assets to help build and enhance ERPNext around the world.</p>
             <a href="/members/details" class="button button-secondary">Become a Member</a>
         </div>
     </div>
@@ -63,7 +63,7 @@
     <div class="container">
         <div class="three-column left-aligned">
             <div class="columns">
-                <h1 class="header2">Events & Meetups</h1>
+                <h1 class="header-2">Events & Meetups</h1>
                 <ul class="bulleted-list list-circle">
                 {# get first three events from portal events doctype #}
                 {% for e in events[:3] %}
@@ -74,7 +74,7 @@
                 </ul>
             </div>
             <div class="columns">
-                <h1 class="header2">Help Us Improve</h1>
+                <h1 class="header-2">Help Us Improve</h1>
                 <ul class="bulleted-list list-circle">
                     <li>
                         <a href="https://github.com/frappe/erpnext/tree/develop/erpnext/docs" class="secondary-link">Write Documentation</a>
@@ -88,7 +88,7 @@
                 </ul>
             </div>
             <div class="columns">
-                <h1 class="header2">Need Help?</h1>
+                <h1 class="header-2">Need Help?</h1>
                 <ul class="bulleted-list list-circle">
                     <li>
                         <a href="/docs/user/manual" class="secondary-link">User Manual</a>