From 0f6bf727d88bf06d91ed99f0540a9de34c50a8fd Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Thu, 26 Feb 2015 16:06:31 +0530
Subject: [PATCH] Fixes in less

---
 frappe/frappeclient.py                   | 6 ++++--
 frappe/public/css/common.css             | 4 +++-
 frappe/public/css/desk.css               | 4 +++-
 frappe/public/css/navbar.css             | 1 +
 frappe/public/css/website.css            | 8 +++++++-
 frappe/public/less/common.less           | 5 ++++-
 frappe/public/less/navbar.less           | 1 +
 frappe/public/less/website.less          | 5 +++++
 frappe/templates/pages/website_script.py | 2 +-
 requirements.txt                         | 2 +-
 10 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/frappe/frappeclient.py b/frappe/frappeclient.py
index 523fc21625..1f73fbc45a 100644
--- a/frappe/frappeclient.py
+++ b/frappe/frappeclient.py
@@ -27,7 +27,7 @@ class FrappeClient(object):
 			'pwd': password
 		})
 
-		if r.json().get('message') == "Logged In":
+		if r.status_code==200 and r.json().get('message') == "Logged In":
 			return r.json()
 		else:
 			raise AuthError
@@ -49,7 +49,6 @@ class FrappeClient(object):
 		if limit_page_length:
 			params["limit_start"] = limit_start
 			params["limit_page_length"] = limit_page_length
-		print self.url
 		res = self.session.get(self.url + "/api/resource/" + doctype, params=params)
 		return self.post_process(res)
 
@@ -151,6 +150,9 @@ class FrappeClient(object):
 
 		print "inserting " + doctype
 		for doc in docs:
+			if not doc.get("owner"):
+				doc["owner"] = "Administrator"
+
 			if not frappe.db.exists("User", doc.get("owner")):
 				frappe.get_doc({"doctype": "User", "email": doc.get("owner"),
 					"first_name": doc.get("owner").split("@")[0] }).insert()
diff --git a/frappe/public/css/common.css b/frappe/public/css/common.css
index cdc36141bf..d32e272b8a 100644
--- a/frappe/public/css/common.css
+++ b/frappe/public/css/common.css
@@ -75,10 +75,12 @@ a.text-extra-muted:focus {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  display: inline-block;
   max-width: 100%;
   vertical-align: middle;
 }
+.inline-block {
+  display: inline-block;
+}
 .bold,
 .strong {
   font-weight: bold;
diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index cc7eb39772..79d7849cfd 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -75,10 +75,12 @@ a.text-extra-muted:focus {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  display: inline-block;
   max-width: 100%;
   vertical-align: middle;
 }
+.inline-block {
+  display: inline-block;
+}
 .bold,
 .strong {
   font-weight: bold;
diff --git a/frappe/public/css/navbar.css b/frappe/public/css/navbar.css
index bb76a1d6f0..393954bbd0 100644
--- a/frappe/public/css/navbar.css
+++ b/frappe/public/css/navbar.css
@@ -91,4 +91,5 @@
 .toolbar-user-fullname {
   margin-top: 2px;
   max-width: 200px;
+  display: inline-block;
 }
diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css
index 5fbcfd4429..4fd4c567fd 100644
--- a/frappe/public/css/website.css
+++ b/frappe/public/css/website.css
@@ -75,10 +75,12 @@ a.text-extra-muted:focus {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  display: inline-block;
   max-width: 100%;
   vertical-align: middle;
 }
+.inline-block {
+  display: inline-block;
+}
 .bold,
 .strong {
   font-weight: bold;
@@ -407,6 +409,10 @@ fieldset {
   padding-bottom: 20px;
   border-right: 1px solid #d1d8dd;
 }
+.page-content hr {
+  margin-left: -15px;
+  margin-right: -15px;
+}
 .page-sidebar {
   border-left: 1px solid #d1d8dd;
   padding: 0px 15px;
diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less
index 555feb44b7..dde993fad4 100644
--- a/frappe/public/less/common.less
+++ b/frappe/public/less/common.less
@@ -69,11 +69,14 @@ a.text-extra-muted:focus {
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
-	display: inline-block;
 	max-width: 100%;
 	vertical-align: middle;
 }
 
+.inline-block {
+	display: inline-block;
+}
+
 .bold,
 .strong {
 	font-weight: bold;
diff --git a/frappe/public/less/navbar.less b/frappe/public/less/navbar.less
index 65b7c9c57f..32930e0d64 100644
--- a/frappe/public/less/navbar.less
+++ b/frappe/public/less/navbar.less
@@ -97,4 +97,5 @@
 .toolbar-user-fullname {
 	margin-top: 2px;
 	max-width: 200px;
+	display: inline-block;
 }
diff --git a/frappe/public/less/website.less b/frappe/public/less/website.less
index c258be9f8d..2844933ae5 100644
--- a/frappe/public/less/website.less
+++ b/frappe/public/less/website.less
@@ -146,6 +146,11 @@ fieldset {
 	border-right: 1px solid @border-color;
 }
 
+.page-content hr {
+	margin-left: -15px;
+	margin-right: -15px;
+}
+
 .page-sidebar {
 	border-left: 1px solid @border-color;
 	padding: 0px 15px;
diff --git a/frappe/templates/pages/website_script.py b/frappe/templates/pages/website_script.py
index 56bea35b8f..e7b00df2a5 100644
--- a/frappe/templates/pages/website_script.py
+++ b/frappe/templates/pages/website_script.py
@@ -13,7 +13,7 @@ def get_context(context):
 	script_context = { "javascript": frappe.db.get_value('Website Script', None, 'javascript') }
 
 	theme = get_active_theme()
-	js = strip(theme.js or "")
+	js = strip(theme and theme.js or "")
 	if js:
 		script_context["javascript"] += "\n" + js
 
diff --git a/requirements.txt b/requirements.txt
index a997103653..a9d98de343 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ termcolor
 werkzeug
 semantic_version
 rauth>=0.6.2
-requests>=1.2.3
+requests
 celery
 redis
 selenium