From 651baae993bd94d2f33d11b6fc57ee5da4f6b9db Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 25 Dec 2012 18:18:16 +0530
Subject: [PATCH] added wesite slideshow and attributions on website

---
 public/css/legacy/body.css                   | 13 ++++---------
 public/js/legacy/widgets/form/form_fields.js |  2 +-
 webnotes/model/doc.py                        |  6 ++++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/public/css/legacy/body.css b/public/css/legacy/body.css
index 2dade9bc35..53999f1839 100644
--- a/public/css/legacy/body.css
+++ b/public/css/legacy/body.css
@@ -15,15 +15,6 @@ body {
 }
 
 footer {
-	background: #b7b7b7; /* Old browsers */
-	background: -moz-linear-gradient(top,  #b7b7b7 0%, #eeeeee 36%); /* FF3.6+ */
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b7b7b7), color-stop(36%,#eeeeee)); /* Chrome,Safari4+ */
-	background: -webkit-linear-gradient(top,  #b7b7b7 0%,#eeeeee 36%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(top,  #b7b7b7 0%,#eeeeee 36%); /* Opera 11.10+ */
-	background: -ms-linear-gradient(top,  #b7b7b7 0%,#eeeeee 36%); /* IE10+ */
-	background: linear-gradient(top,  #b7b7b7 0%,#eeeeee 36%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#b7b7b7', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
-	border-top: 1px solid #999;
 	text-align: center;
 	color: inherit;
 	padding: 10px;
@@ -31,6 +22,10 @@ footer {
 	line-height: 1.7;
 }
 
+footer, footer a {
+	color: #999;
+}
+
 label {
 	padding-top: 15px;
 	color: #404040;
diff --git a/public/js/legacy/widgets/form/form_fields.js b/public/js/legacy/widgets/form/form_fields.js
index 9dad59a654..73ebd2f8f4 100644
--- a/public/js/legacy/widgets/form/form_fields.js
+++ b/public/js/legacy/widgets/form/form_fields.js
@@ -288,7 +288,7 @@ _f.CodeField.prototype.make_input = function() {
 			valid_elements : "@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|"
 			+ "onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|"
 			+ "onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|"
-			+ "name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,"
+			+ "name|href|target|title|class|onfocus|onblur|data-slide],strong/b,em/i,strike,u,"
 			+ "#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|"
 			+ "src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,"
 			+ "-blockquote,-table[border=0|cellspacing|cellpadding|width|frame|rules|"
diff --git a/webnotes/model/doc.py b/webnotes/model/doc.py
index 89c08f49cd..1d74bdbbd3 100755
--- a/webnotes/model/doc.py
+++ b/webnotes/model/doc.py
@@ -445,13 +445,15 @@ class Document:
 
 		# if required, make new
 		if new or (not new and self.fields.get('__islocal')) and (not res.get('issingle')):
+			# new
 			r = self.insert(res.get('autoname'), res.get('istable'), res.get('name_case'),
 				make_autoname, keep_timestamps = keep_timestamps)
 			if r: 
 				return r
 
-		elif not webnotes.conn.exists(self.doctype, self.name):
-			webnotes.msgprint("""This document was updated before your change. Please refresh before saving.""", raise_exception=1)
+		else:
+			if not res.get('issingle') and not webnotes.conn.exists(self.doctype, self.name):
+				webnotes.msgprint("""This document was updated before your change. Please refresh before saving.""", raise_exception=1)
 				
 		# save the values
 		self._update_values(res.get('issingle'),