Merge branch 'hotfix_2016-08-30' into test

@@ -170,7 +170,7 @@
                     [[layout action_template]]
                 </select>
                 <input type="text" placeholder="url" value="[[item.url.url]]" data-field="[[index]].url.url" class="observe"/>
-                <a type="button" class="btn btn-danger btn-xs delBtn" data-event="textNav.data" data-index="[[index]]">删除</a>
+                <a type="button" class="btn btn-danger btn-xs delBtn" data-event="categoryNavigation.data" data-index="[[index]]">删除</a>
             </div>
         </li>
         [[/each]]

 {
   "name": "yohobuy-portal-fe",
-  "version": "4.9.7",
+  "version": "5.0.1",
   "description": "Construction of the presentation layer solution is based on express, handlebars",
   "main": "app.js",
   "scripts": {

@@ -173,7 +173,7 @@ var g = new common.grid({
                 if (items.recomReward == 0) {
                     HtmArr.push('<a  data-index="' + items.__index + '" data-type="pass" href="JavaScript:;" class="btn btn-success btn-xs recomment">推荐</a>');
                 } else {
-                    HtmArr.push('<a data-index="' + items.__index + '" data-type="fail" href="JavaScript:;" class="btn btn-danger btn-xs recomment">取消推荐</a>');
+                    HtmArr.push('<a data-index="' + items.__index + '" data-type="cancelpass" href="JavaScript:;" class="btn btn-danger btn-xs recomment">取消推荐</a>');
                 }
 
                 return HtmArr.join('');

-{"name":"yohobuy-portal-fe","version":"4.9.7","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","dev":"^0.1.3","express":"^4.13.4","express-session":"^1.13.0","glob":"^7.0.3","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","vue-router":"^0.7.13","vuex":"^1.0.0-rc.2","winston":"^2.2.0"}}
\ No newline at end of file
+{"name":"yohobuy-portal-fe","version":"5.0.1","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","dev":"^0.1.3","express":"^4.13.4","express-session":"^1.13.0","glob":"^7.0.3","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","vue-router":"^0.7.13","vuex":"^1.0.0-rc.2","winston":"^2.2.0"}}
\ No newline at end of file

+{
+    "apps": [
+        {
+            "name": "yohobuy-portal",
+            "script": "index.js",
+            "instances": "max",
+            "exec_mode": "cluster",
+            "merge_logs": true,
+            "log_data_format": "YYYY-MM-DD HH:mm Z",
+            "env": {
+                "PORT": 30012,
+                "TZ": "Asia/Shanghai"
+            }
+        }
+    ]
+}