From 7fb230bd1d66cf1e13ead83782adbc362ce31599 Mon Sep 17 00:00:00 2001
From: Jack Zhuang <zhuangjianguo@steedos.com>
Date: Tue, 12 Dec 2017 19:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 creator/app/objects/Customers.coffee                     | 2 +-
 .../packages/steedos-creator/client/layout/layout.coffee | 2 +-
 .../packages/steedos-creator/client/layout/layout.html   | 2 +-
 .../steedos-creator/client/layout/sidebar.coffee         | 9 +++++----
 .../packages/steedos-creator/client/layout/sidebar.html  | 6 +++---
 creator/packages/steedos-creator/client/router.coffee    | 7 ++-----
 creator/packages/steedos-creator/core.coffee             | 1 -
 7 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/creator/app/objects/Customers.coffee b/creator/app/objects/Customers.coffee
index 47abeb3616..98d3f67cc2 100644
--- a/creator/app/objects/Customers.coffee
+++ b/creator/app/objects/Customers.coffee
@@ -1,7 +1,7 @@
 Creator.Objects.customers = 
 	name: "customers"
 	label: "Customers"
-	icon: "ion-ios-people-outline"
+	icon: "ion-ios-world-outline"
 	schema: 
 		name: 
 			label: "Name",
diff --git a/creator/packages/steedos-creator/client/layout/layout.coffee b/creator/packages/steedos-creator/client/layout/layout.coffee
index c3345d0558..a62626cea6 100644
--- a/creator/packages/steedos-creator/client/layout/layout.coffee
+++ b/creator/packages/steedos-creator/client/layout/layout.coffee
@@ -1,3 +1,3 @@
-Template.recordLayout.helpers
+Template.creatorLayout.helpers
 	subsReady: ->
 		return Steedos.subsBootstrap.ready()
diff --git a/creator/packages/steedos-creator/client/layout/layout.html b/creator/packages/steedos-creator/client/layout/layout.html
index aef8701df4..a6cad1a6c5 100644
--- a/creator/packages/steedos-creator/client/layout/layout.html
+++ b/creator/packages/steedos-creator/client/layout/layout.html
@@ -1,4 +1,4 @@
-<template name="recordLayout">
+<template name="creatorLayout">
 	{{#if subsReady}}
 		<div class="steedos app-wrapper steedos-calendar skin-blue-light">
 			{{# AdminLTE skin="blue" sidebarMini="true" }}
diff --git a/creator/packages/steedos-creator/client/layout/sidebar.coffee b/creator/packages/steedos-creator/client/layout/sidebar.coffee
index deccb91a4e..1f2a9befa7 100644
--- a/creator/packages/steedos-creator/client/layout/sidebar.coffee
+++ b/creator/packages/steedos-creator/client/layout/sidebar.coffee
@@ -2,8 +2,9 @@ Template.creatorSidebar.helpers
 	app_objects: ()->
 		return Session.get("app_objects")
 
-	is_current_object: ()->
-		return this == FlowRouter.getParam("object_name")
+	object_i: ()->
+		return Creator.Objects[this]
 
-	object: ()->
-		return Creator.Objects[this]
\ No newline at end of file
+	object_class_name: (obj)->
+		if (obj == FlowRouter.getParam("object_name"))
+			return "active"
diff --git a/creator/packages/steedos-creator/client/layout/sidebar.html b/creator/packages/steedos-creator/client/layout/sidebar.html
index f19b983e92..32bc9b7c48 100644
--- a/creator/packages/steedos-creator/client/layout/sidebar.html
+++ b/creator/packages/steedos-creator/client/layout/sidebar.html
@@ -6,10 +6,10 @@
 					Creator
 				</li>
 				{{#each app_objects}}
-					<li class="inbox {{#if is_current_object}}active{{/if}}">
+					<li class="{{object_class_name this}}">
 						<a href="/creator/crm/{{this}}/list">
-							<i class="ion {{object.icon}}"></i>
-							<span>{{object.label}}</span>
+							<i class="ion {{object_i.icon}}"></i>
+							<span>{{object_i.label}}</span>
 							<!-- <span class="pull-right-container">
 								<span class="label pull-right bg-red">10</span>
 							</span> -->
diff --git a/creator/packages/steedos-creator/client/router.coffee b/creator/packages/steedos-creator/client/router.coffee
index 9eea84fdc1..126424ee96 100644
--- a/creator/packages/steedos-creator/client/router.coffee
+++ b/creator/packages/steedos-creator/client/router.coffee
@@ -11,8 +11,5 @@ FlowRouter.route '/creator',
 FlowRouter.route '/creator/:app_id/:object_name/list',
 	triggersEnter: [ checkUserSigned ],
 	action: (params, queryParams)->
-		Meteor.call "creator_object_init", params.object_name, (error, object)->
-			if object
-				Creator.objectClientInit(params.object_name, object);
-			BlazeLayout.render 'recordLayout',
-				main: "creator_list"
+		BlazeLayout.render 'creatorLayout',
+			main: "creator_list"
diff --git a/creator/packages/steedos-creator/core.coffee b/creator/packages/steedos-creator/core.coffee
index 5bd2012815..4501d67481 100644
--- a/creator/packages/steedos-creator/core.coffee
+++ b/creator/packages/steedos-creator/core.coffee
@@ -51,7 +51,6 @@ Creator.baseSchema =
 
 Meteor.startup ->
 	_.each Creator.Objects, (obj, object_name)->
-		console.log ("init " + object_name)
 		if !Creator.Collections[object_name]
 			schema = Creator.getObjectSchema(obj)
 			_simpleSchema = new SimpleSchema(schema)