From 8889c2d6545b9d877b5637636c9c4dcdd81208d7 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Wed, 14 Jun 2017 11:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=B7=BB=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=AE=9A=E5=88=B6=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/home-controller.js | 10 ++++++----
 public/views/menus.html                       |  4 ++--
 public/views/settings.html                    | 16 ++++++++++++++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/public/scripts/controllers/home-controller.js b/public/scripts/controllers/home-controller.js
index 5771dd8..b9fae95 100644
--- a/public/scripts/controllers/home-controller.js
+++ b/public/scripts/controllers/home-controller.js
@@ -7,10 +7,12 @@ app.controller('homeCtr', ['$scope', '$stateParams', '$filter', '$state', '$wind
                 pubSubService.publish('loginCtr.login', {
                     'login': data.logined,
                 });
-                $state.go('bookmarks', {
-                    showStyle: (data.user && data.user.show_style) || 'costomTag',
-                })
-                toastr.success('自动登陆成功，系统将自动跳转到主页', "提示");
+                // $state.go('bookmarks', {
+                //     showStyle: (data.user && data.user.show_style) || 'navigate',
+                // })
+                // toastr.success('自动登陆成功，系统将自动跳转到主页', "提示");
+                $state.go('tags');
+                toastr.success('自动登陆成功，系统将自动跳转到书签分类页面', "提示");
             } else {
                 console.log('autoLogin failed......................')
                 pubSubService.publish('Common.menuActive', {
diff --git a/public/views/menus.html b/public/views/menus.html
index 876a714..1b1d1ff 100644
--- a/public/views/menus.html
+++ b/public/views/menus.html
@@ -13,12 +13,12 @@
                             <label>导航</label>
                         </div>
                     </div>
-                    <div class="field item js-field-costomTag" ng-click="updateShowStyle('costomTag')">
+                    <!-- <div class="field item js-field-costomTag" ng-click="updateShowStyle('costomTag')">
                         <div class="ui radio checkbox js-radio-costomTag">
                             <input type="radio" name="costomTag-style">
                             <label>标签</label>
                         </div>
-                    </div>
+                    </div> -->
                     <div class="field item js-field-table" ng-click="updateShowStyle('table')">
                         <div class="ui radio checkbox js-radio-table">
                             <input type="radio" name="show-style">
diff --git a/public/views/settings.html b/public/views/settings.html
index 050c34a..8e565a8 100644
--- a/public/views/settings.html
+++ b/public/views/settings.html
@@ -12,6 +12,8 @@
                 </a>
                 <a class="item" ng-class="{active:form[4]}" ng-click="changeForm(4)">全局链接
                 </a>
+                <a class="item" ng-class="{active:form[5]}" ng-click="changeForm(5)">更新日志
+                </a>
             </div>
         </div>
         <div class="twelve wide stretched column">
@@ -42,12 +44,12 @@
                             <label>导航</label>
                         </div>
                     </div>
-                    <div class="field" ng-click="updateDefaultShowStyle('costomTag')">
+                    <!-- <div class="field" ng-click="updateDefaultShowStyle('costomTag')">
                         <div class="ui radio checkbox js-radio-default-costomTag">
                             <input type="radio" name="default-show-style">
                             <label>标签</label>
                         </div>
-                    </div>
+                    </div> -->
                     <div class="field" ng-click="updateDefaultShowStyle('table')">
                         <div class="ui radio checkbox js-radio-default-table">
                             <input type="radio" name="default-show-style">
@@ -198,6 +200,16 @@
                     </div>
                 </div>
             </div>
+            <div class="ui container js-p-info" ng-show="form[5]">
+                <h3 class="ui dividing header">更新日志</h3>
+                <div class="ui message">
+                  <div class="header">2017-06-14</div>
+                  <ul class="list">
+                    <li>打开mybookmark.cn，默认跳转到分类页面。</li>
+                    <li>移除书签栏目的标签选项，将功能移到分类页面里面的分类定制。</li>
+                  </ul>
+                </div>
+            </div>
         </div>
     </div>
 </div>