Merge branch 'master' of github.com:webnotes/erpnext into edge

website/templates/js/blog_page.js

@@ -38,7 +38,8 @@ $(document).ready(function() {
 			cmd: "website.helpers.blog.add_comment",
 			comment_doctype: "Blog",
 			comment_docname: "{{ name }}",
-			page_name: "{{ page_name }}"
+			page_name: "{{ page_name }}",
+			_type: "POST"
 		}
 		
 		$("#comment-form .alert").toggle(false);

website/templates/js/login.js

@@ -62,7 +62,8 @@ login.show_forgot_password = function(){
 		url: "server.py",
 		data: {
 			cmd: "reset_password",
-			user: login_id
+			user: login_id,
+			_type: "POST"
 		},
 		success: function(data) {
 			login.set_message("A new password has been sent to your email id.", "GREEN");

website/templates/pages/about.html

@@ -20,12 +20,15 @@
 	{% endif %}
 	{% if obj.doclist.get({"doctype":"Employee"}) %}
 	<h3>{{ obj.doc.team_members_heading or "Team Members" }}</h3>
-	<table class="table table-bordered" style="width: 100%; table-layout: fixed">
+	<table class="table" style="width: 100%; table-layout: fixed">
 		<tbody>
 			{% for d in obj.doclist.get({"doctype":"Employee"}) %}
 			<tr itemscope itemtype="http://schema.org/Person">
-				<td style="text-align:right; width: 30%;">
-					<img src="{{ d.image }}" style="" itemprop="image"></td>
+				<td style="text-align:right; width: 20%;">
+					<div class="avatar avatar-x-large">
+						<img class="avatar" src="{{ d.image }}" style="" itemprop="image">
+					</div>
+				</td>
 				<td><h4 itemprop="name">{{ d.employee_name }}</h4>
 					<div itemprop="description">{{ d.bio }}</div></td>
 			</tr>

website/templates/pages/contact.html

@@ -8,23 +8,23 @@
 
 {% block content %}
 <div class="span12">
+	<h3>{{ obj.doc.heading or "Contact Us"}}</h3>
 	<div class="row">
 		<div class="web-form span8">
-			{{ obj.doc.introduction or "<h3>Contact Us</h3>"}}
 			<div class="row">
-			<div class="span4">
+			<div class="span6">
 				<p id="contact-alert" class="alert" 
 					style="display: none;">&nbsp;</p>
 			</div>
 			</div>
 			<div class="clearfix"></div>
-			<p><select class="span4" name="subject">
+			<p><select class="span6" name="subject">
 				{% for option in obj.doc.query_options %}
 					<option value="{{ option }}">{{ option }}</option>
 				{% endfor %}
 			</select></p>
-			<p><input class="span4" name="email" type="text" placeholder="Your Email Address" /></p>
-			<p><textarea class="span4" rows="10" name="message"></textarea></p>
+			<p><input class="span6" name="email" type="text" placeholder="Your Email Address" /></p>
+			<p><textarea class="span6" rows="10" name="message"></textarea></p>
 			<p><button class="btn btn-primary btn-send">Send</button></p>
 		</div>
 		{% if obj.doc.address %}
@@ -51,5 +51,6 @@
 		</div>
 		{% endif %}
 	</div>
+	{{ obj.doc.introduction }}
 </div>
 {% endblock %}