add feedback tab

import.js

@@ -166,6 +166,7 @@
 
         /* UI 菜单 - 帮助 */
         { path: 'ui/menu/help/help.js',                 pack: 'edit|share'},
+        { path: 'ui/menu/help/feedback.js',             pack: 'edit|share'},
 
         /* UI Top Bar */
         { path: 'ui/topbar/quickvisit.js',              pack: 'edit' },

lang/zh-cn/zh-cn.js

@@ -42,8 +42,8 @@ KityMinder.LANG['zh-cn'] = {
     },
     'ui': {
         'command': {
-            'appendsiblingnode': '新建兄弟节点',
-            'appendchildnode': '新建子节点',
+            'appendsiblingnode': '插入同级主题',
+            'appendchildnode': '插入下级主题',
             'removenode': '删除',
             'editnode': '编辑',
             'arrangeup': '上移',
@@ -66,7 +66,7 @@ KityMinder.LANG['zh-cn'] = {
             'new': '新建 (Ctrl + Alt + N)',
             'save': '保存 (Ctrl + S)',
             'share': '分享 (Ctrl + Alt + S)',
-            'help': '帮助与反馈（F1）'
+            'feedback': '反馈问题（F1）'
         },
 
         'menu': {
@@ -79,6 +79,7 @@ KityMinder.LANG['zh-cn'] = {
             'sharetab': '分享',
             'preferencetab': '设置',
             'helptab': '帮助',
+            'feedbacktab': '反馈',
             'recenttab': '最近使用',
             'netdisktab': '百度云存储',
             'localtab': '本地文件',
@@ -94,7 +95,8 @@ KityMinder.LANG['zh-cn'] = {
             'shareheader': '分享我的脑图',
             'downloadheader': '导出到指定格式',
             'preferenceheader': '偏好设置',
-            'helpheader': '帮助'
+            'helpheader': '帮助',
+            'feedbackheader': '反馈'
         },
 
         'mydocument': '我的文档',
@@ -175,8 +177,8 @@ KityMinder.LANG['zh-cn'] = {
         'clearstyle': '清除样式',
         'copystyle': '复制样式',
         'pastestyle': '粘贴样式',
-        'appendsiblingnode': '下一主题',
-        'appendchildnode': '儿子主题',
+        'appendsiblingnode': '同级主题',
+        'appendchildnode': '下级主题',
         'arrangeup': '前调',
         'arrangedown': '后调',
         'editnode': '编辑',
@@ -216,8 +218,8 @@ KityMinder.LANG['zh-cn'] = {
         'contact': '联系与反馈',
         'email': '邮件组',
         'qq_group': 'QQ 群',
-        'github_issue': 'Github Issue',
-        'baidu_tieba': '百度贴吧',
+        'github_issue': 'Github',
+        'baidu_tieba': '贴吧',
 
         'clipboardunsupported': '您的浏览器不支持剪贴板，请使用快捷键复制'
     },

static/pages/feedback.html

+<h2 class="contact">$lang.contact</h2>
+<p>
+    百度脑图当前版本： v<a class="km-version" target="_blank" href="https://github.com/fex-team/kityminder/tree/master/CHANGELOG.md"></a>
+</p>
+<p>
+    欢迎给我们反馈问题，以下是我们的反馈渠道。
+</p>
+<ul class="contact-content">
+    <li class="email">
+        <label>$lang.email</label>
+        <a href="mailto:kity@baidu.com?subject=脑图使用反馈">kity@baidu.com</a>
+    </li>
+    <li class="qq">
+        <label>$lang.qq_group</label>
+        <a>374918234</a>
+    </li>
+    <li class="tieba">
+        <label>$lang.baidu_tieba</label>
+        <a target="_blank" href="http://tieba.baidu.com/f?kw=%B0%D9%B6%C8%C4%D4%CD%BC">百度脑图</a></li>
+    <li class="github">
+        <label>$lang.github_issue</label>
+        <a target="_blank" href="https://github.com/fex-team/kityminder/issues">Issues</a>
+    </li>
+</ul>
\ No newline at end of file

static/pages/helpcontent.html

-<h2 class="contact">$lang.contact</h2>
-<p>
-    百度脑图 <a class="km-version" target="_blank" href="https://github.com/fex-team/kityminder/tree/master/CHANGELOG.md"></a>
-</p>
-<p>
-    欢迎给我们反馈问题，以下是我们的联系方式，您可以使用任意渠道反馈问题：
-</p>
-<ul class="contact-content">
-    <li>$lang.email: <a href="mailto:kity@baidu.com">kity@baidu.com</a></li>
-    <li>$lang.qq_group: <a>KityMinder (374918234)</a></li>
-    <li>$lang.baidu_tieba: <a target="_blank" href="http://tieba.baidu.com/f?kw=%E7%99%BE%E5%BA%A6%E8%84%91%E5%9B%BE">百度脑图</a></li>
-    <li>$lang.github_issue: <a target="_blank" href="https://github.com/fex-team/kityminder/issues">Github Issues</a></li>
-</ul>
 <h2 class="shortcut">$lang.shortcuts</h2>
 <div class="shortcut-content"></div>
\ No newline at end of file

ui/menu/default.js

@@ -56,6 +56,6 @@ KityMinder.registerUI('menu/default', function(minder) {
 
         $share.$tabs.select(0); // 当前脑图
         // $menu.show();
-        // $menu.$tabs.select(4);
+        // $menu.$tabs.select(5);
     });
 });
\ No newline at end of file

ui/menu/help/feedback.js

+/**
+ * @fileOverview
+ *
+ * 帮助面板
+ *
+ * @author: techird
+ * @copyright: Baidu FEX, 2014
+ */
+KityMinder.registerUI('menu/help/feedback', function (minder) {
+    var $menu = minder.getUI('menu/menu');
+    var $panel = $($menu.createSub('feedback'));
+
+    var $feedback = $('<div id="feedback-panel">')
+        .appendTo($panel)
+        .addClass('loading');
+
+    $.pajax({
+        url: 'static/pages/feedback.html',
+        dataType: 'text'
+    }).then(render);
+
+    function render(template) {
+        /* global jhtmls: true */
+        var renderer = jhtmls.render(template);
+        $feedback.html(renderer({
+            lang: minder.getLang('ui'),
+            minder: minder
+        }));
+
+        $feedback.on('click contextmenu keydown', function(e) {
+            e.stopPropagation();
+        });
+
+        $feedback.removeClass('loading');
+        $feedback.find('.km-version').text(KityMinder.version);
+    }
+
+});
\ No newline at end of file

ui/theme/default/css/_help.less

-#help-panel {
+#help-panel, #feedback-panel {
     .dock(50px, 0, 0, 0);
     overflow-y: auto;
     
@@ -35,19 +35,54 @@
     
     .contact-content {
         list-style: none;
-        margin-left: 50px;
         padding-left: 0;
+
         li {
-            padding: 5px 0;
+            display: block;
+            float: left;
+            padding: 0;
+            width: 150px;
+            height: 150px;
+            margin: 20px;
+            text-align: center;
+            position: relative;
             
             a {
                 -webkit-user-select: initial;
                 cursor: text;
+                color: @theme-color;
 
                 &[href] {
                     cursor: pointer;
                 }
             }
+
+            &:before {
+                .transition(all .3s ease);
+                opacity: 0.6;
+                content: ' ';
+                display: block;
+                width: 150px;
+                height: 150px;
+                background: white url(../images/feedback.png) no-repeat;
+            }
+
+            &:hover:before {
+                .transform(translate3d(0, -5px, 0));
+                opacity: 1;
+            }
+
+            &.email:before {
+                background-position: -150px 0;
+            }
+
+            &.github:before {
+                background-position: -300px 0;
+            }
+
+            &.tieba:before {
+                background-position: -450px 0;
+            }
         }
     }
 }
\ No newline at end of file

ui/theme/default/css/_quickvisit.less

@@ -41,11 +41,11 @@
         }
     }
 
-    &.help {
+    &.feedback {
         float: right;
         margin-right: 5px;
         &:after {
-            top: 8px;
+            top: 6.5px;
             left: 7px;
             background-position: 0 -970px;
         }

ui/theme/default/css/default.all.css

@@ -1798,12 +1798,12 @@ body {
 #panel .quick-visit-button.share:after {
   background-position: 0 -945px;
 }
-#panel .quick-visit-button.help {
+#panel .quick-visit-button.feedback {
   float: right;
   margin-right: 5px;
 }
-#panel .quick-visit-button.help:after {
-  top: 8px;
+#panel .quick-visit-button.feedback:after {
+  top: 6.5px;
   left: 7px;
   background-position: 0 -970px;
 }
@@ -2530,7 +2530,8 @@ body {
 .download-panel > .download-list li:active {
   background-color: #e5e7ec;
 }
-#help-panel {
+#help-panel,
+#feedback-panel {
   position: absolute;
   top: 50px;
   right: 0;
@@ -2538,47 +2539,99 @@ body {
   left: 0;
   overflow-y: auto;
 }
-#help-panel h2 {
+#help-panel h2,
+#feedback-panel h2 {
   font-weight: normal;
   color: #fc8383;
   margin: 10px 0;
 }
-#help-panel .shortcut-content {
+#help-panel .shortcut-content,
+#feedback-panel .shortcut-content {
   font-family: 'Microsoft Yahei';
   margin-left: 50px;
 }
-#help-panel .shortcut-content section {
+#help-panel .shortcut-content section,
+#feedback-panel .shortcut-content section {
   min-width: 300px;
   margin: 0 20px 20px 0;
   float: left;
 }
-#help-panel .shortcut-content section h3 {
+#help-panel .shortcut-content section h3,
+#feedback-panel .shortcut-content section h3 {
   border-bottom: 1px solid #EEE;
 }
-#help-panel .shortcut-content section div.shortcut-group {
+#help-panel .shortcut-content section div.shortcut-group,
+#feedback-panel .shortcut-content section div.shortcut-group {
   margin: 5px auto;
 }
-#help-panel .shortcut-content section div.shortcut-group span.shortcut {
+#help-panel .shortcut-content section div.shortcut-group span.shortcut,
+#feedback-panel .shortcut-content section div.shortcut-group span.shortcut {
   display: inline-block;
   width: 220px;
   text-align: right;
   margin-right: 10px;
 }
-#help-panel .contact-content {
+#help-panel .contact-content,
+#feedback-panel .contact-content {
   list-style: none;
-  margin-left: 50px;
   padding-left: 0;
 }
-#help-panel .contact-content li {
-  padding: 5px 0;
+#help-panel .contact-content li,
+#feedback-panel .contact-content li {
+  display: block;
+  float: left;
+  padding: 0;
+  width: 150px;
+  height: 150px;
+  margin: 20px;
+  text-align: center;
+  position: relative;
 }
-#help-panel .contact-content li a {
+#help-panel .contact-content li a,
+#feedback-panel .contact-content li a {
   -webkit-user-select: initial;
   cursor: text;
+  color: #fc8383;
 }
-#help-panel .contact-content li a[href] {
+#help-panel .contact-content li a[href],
+#feedback-panel .contact-content li a[href] {
   cursor: pointer;
 }
+#help-panel .contact-content li:before,
+#feedback-panel .contact-content li:before {
+  -webkit-transition: all 0.3s ease;
+  -moz-transition: all 0.3s ease;
+  -ms-transition: all 0.3s ease;
+  -o-transition: all 0.3s ease;
+  transition: all 0.3s ease;
+  opacity: 0.6;
+  content: ' ';
+  display: block;
+  width: 150px;
+  height: 150px;
+  background: #ffffff url(../images/feedback.png) no-repeat;
+}
+#help-panel .contact-content li:hover:before,
+#feedback-panel .contact-content li:hover:before {
+  -webkit-transform: translate3d(0, -5px, 0);
+  -moz-transform: translate3d(0, -5px, 0);
+  -ms-transform: translate3d(0, -5px, 0);
+  -o-transform: translate3d(0, -5px, 0);
+  tranform: translate3d(0, -5px, 0);
+  opacity: 1;
+}
+#help-panel .contact-content li.email:before,
+#feedback-panel .contact-content li.email:before {
+  background-position: -150px 0;
+}
+#help-panel .contact-content li.github:before,
+#feedback-panel .contact-content li.github:before {
+  background-position: -300px 0;
+}
+#help-panel .contact-content li.tieba:before,
+#feedback-panel .contact-content li.tieba:before {
+  background-position: -450px 0;
+}
 #tab-container .command-buttonset.priority {
   width: 130px;
 }

ui/topbar/quickvisit.js

@@ -19,11 +19,11 @@ KityMinder.registerUI('topbar/quickvisit', function (minder) {
     var $new = btn('new'),
         $save = btn('save'),
         $share = btn('share'),
-        $help = btn('help');
+        $feedback = btn('feedback');
 
     minder.on('uiready', function quickVisit() {
 
-        $('#panel #search').after($help);
+        $('#panel #search').after($feedback);
 
         function quickNew() {
             var $doc = minder.getUI('doc');
@@ -50,16 +50,16 @@ KityMinder.registerUI('topbar/quickvisit', function (minder) {
             $menu.show();
         }
 
-        function quickHelp() {
+        function quickFeedback() {
             var $menu = minder.getUI('menu/menu');
-            $menu.$tabs.select(4);
+            $menu.$tabs.select(5);
             $menu.show();
         }
 
         $new.click(quickNew);
         $save.click(quickSave);
         $share.click(quickShare);
-        $help.click(quickHelp);
+        $feedback.click(quickFeedback);
 
         minder.addShortcut('ctrl+alt+n', quickNew);
         minder.addShortcut('ctrl+s', quickSave);
@@ -69,7 +69,7 @@ KityMinder.registerUI('topbar/quickvisit', function (minder) {
             $menu.$tabs.select(2);
             $menu.show();
         });
-        minder.addShortcut('f1', quickHelp);
+        minder.addShortcut('f1', quickFeedback);
 
     });
 });
\ No newline at end of file