[ui] flattified desktop icons

config.json

@@ -3,21 +3,21 @@
 		"To Do": {
 			"type": "page",
 			"link": "todo",
-			"color": "#febf04",
+			"color": "#f1c40f",
 			"label": "To Do",
 			"icon": "icon-check"
 		},
 		"Calendar": {
 			"type": "view",
 			"link": "Calendar/Event",
-			"color": "#026584",
+			"color": "#2980b9",
 			"label": "Calendar",
 			"icon": "icon-calendar"
 		},
 		"Messages": {
 			"type": "page",
 			"link": "messages",
-			"color": "#8d016e",
+			"color": "#9b59b6",
 			"label": "Messages",
 			"icon": "icon-comments"
 		}

core/page/desktop/desktop.css

@@ -1,15 +1,12 @@
 .case-border {
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
-	padding: 12px;
+	border-radius: 5px;
+	padding: 20px;
 	display: inline-block;
-	border: 2px solid white;
-	box-shadow: 0 0 4px 1px black;
+/*	box-shadow: 0 0 4px 1px black;
 	-moz-box-shadow: 0 0 4px 1px black;
 	-webkit-box-shadow: 0 0 4px 1px black;
 	-o-box-shadow: 0 0 4px 1px black;
-	margin: auto;
+*/	margin: auto;
 	text-align: center;
 }
 
@@ -37,18 +34,22 @@
 
 /* Hover and click effects */
 .case-border:hover, .circle:hover, .hover-effect {
-	box-shadow: 0 0 2px 0px black, 0 0 4px 1px white !important;
-	-moz-box-shadow: 0 0 2px 0px black, 0 0 4px 1px white !important;
-	-webkit-box-shadow: 0 0 2px 0px black, 0 0 4px 1px white !important;
-	-o-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important;
+	box-shadow: 0 0 1px 0px black, 0 0 2px 1px white ;
+	-moz-box-shadow: 0 0 1px 0px black, 0 0 2px 1px white ;
+	-webkit-box-shadow: 0 0 1px 0px black, 0 0 2px 1px white ;
+	-o-box-shadow: 0 0 1px 0px black, 0 0 2px 1px white ;
 }
 
 .case-border:active, .case-border:focus, .case-border-click {
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.3);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.3);
+
 	transform: scale(0.98, 0.98);
 	-ms-transform: scale(0.98, 0.98); /* IE 9 */
 	-webkit-transform: scale(0.98, 0.98); /* Safari and Chrome */
 	-o-transform: scale(0.98, 0.98); /* Opera */
 	-moz-transform: scale(0.98, 0.98); /* Firefox */
+
 }
 
 .circle:active, .circle:focus, .circle-click {
@@ -62,18 +63,13 @@
 .circle {
 	position: absolute;
 	top: -10px;
-	right: 10px;
+	right: 5px;
 	border-radius: 30px;
 	-moz-border-radius: 30px;
 	-webkit-border-radius: 30px;
 	line-height: 12px;
-	background: #B00D07;
-	padding: 3px;
-	border: 2px solid white;
-	box-shadow: 0 0 4px 1px black;
-	-moz-box-shadow: 0 0 4px 1px black;
-	-webkit-box-shadow: 0 0 4px 1px black;
-	-o-box-shadow: 0 0 4px 1px black;
+	background: #e74c3c;
+	padding: 7px;
 }
 
 .circle-text {

core/page/desktop/desktop.js

@@ -22,12 +22,12 @@ erpnext.desktop.render = function() {
 			module.label = m;
 		module.name = m;
 		module.label = wn._(module.label);
-		module.gradient_css = wn.get_gradient_css(module.color, 45);
+		//module.gradient_css = wn.get_gradient_css(module.color, 45);
 		module._link = module.link.toLowerCase().replace("/", "-");
 		
 		$module_icon = $(repl('<div id="module-icon-%(_link)s" class="case-wrapper" \
 				data-name="%(name)s" data-link="%(link)s">\
-				<div class="case-border" style="%(gradient_css)s">\
+				<div class="case-border" style="background-color: %(color)s">\
 					<i class="%(icon)s"></i>\
 				</div>\
 				<div class="case-label">%(label)s</div>\

public/js/wn/ui/appframe.js

@@ -90,24 +90,29 @@ wn.ui.AppFrame = Class.extend({
 		this.doctype = doctype;
 		var me = this,
 			meta = locals.DocType[doctype],
-			views = [
-			{
-				icon: wn.modules[meta.module].icon,
-				route: wn.modules[meta.module].link,
+			views = [],
+			module_info = wn.modules[meta.module];
+			
+		if(module_info) {
+			views.push({
+				icon: module_info.icon,
+				route: module_info.link,
 				type: "module"
-			},
-			{
-				icon: "icon-file-alt",
-				route: "",
-				type: "form",
-				set_route: function() {
-					if(wn.views.formview[me.doctype]) {
-						wn.set_route("Form", me.doctype, wn.views.formview[me.doctype].frm.docname);
-					} else {
-						new_doc(doctype);
-					}
+			})
+		}
+
+		views.push({
+			icon: "icon-file-alt",
+			route: "",
+			type: "form",
+			set_route: function() {
+				if(wn.views.formview[me.doctype]) {
+					wn.set_route("Form", me.doctype, wn.views.formview[me.doctype].frm.docname);
+				} else {
+					new_doc(doctype);
 				}
-			}];
+			}
+		});
 
 		
 		if(!meta.issingle) {

public/js/wn/views/doclistview.js

@@ -175,7 +175,7 @@ wn.views.DocListView = wn.ui.Listing.extend({
 				me.set_filter(key, val, true);
 			});
 		}
-		this.listview.run();
+		this.listview && this.listview.run();
 		this._super(arguments[0], arguments[1]);
 	},
 	

webnotes/widgets/form/utils.py

@@ -89,10 +89,16 @@ def add_comment(doclist):
 
 @webnotes.whitelist()
 def get_next(doctype, name, prev):
-	order = ["<", "desc"] if int(prev) else [">", "asc"]
-	res = webnotes.conn.sql("""select name from `tab%s` 
-		where name %s %s order by name %s limit 1""" % (doctype, 
-			order[0], "%s", order[1]), name)
+	import webnotes.widgets.reportview
+	
+	prev = int(prev)
+	field = "`tab%s`.name" % doctype
+	res = webnotes.widgets.reportview.execute(doctype,
+		fields = [field], 
+		filters = [[doctype, "name", "<" if prev else ">", name]],
+		order_by = field + " " + ("desc" if prev else "asc"),
+		limit_start=0, limit_page_length=1, as_list=True)
+
 	if not res:
 		webnotes.msgprint(_("No further records"))
 		return None