Commit 9bf5eb79 authored by techird's avatar techird

Merge remote-tracking branch 'xiaohu/moreservice' into app-switcher

Conflicts:
	lang/zh-cn/zh-cn.js
	ui/theme/default/css/default.all.css
	ui/theme/default/css/default.all.css.map
parents 9fb02572 6cf3a467
...@@ -142,6 +142,9 @@ ...@@ -142,6 +142,9 @@
/* 视野导航 */ /* 视野导航 */
{ path: 'ui/nav.js', pack: 'edit|share' }, { path: 'ui/nav.js', pack: 'edit|share' },
/* UI Top Bar */
{ path: 'ui/topbar/moreservice.js', pack: 'edit|share'},
/* UI 菜单 */ /* UI 菜单 */
{ path: 'ui/menu/menu.js', pack: 'edit|share' }, { path: 'ui/menu/menu.js', pack: 'edit|share' },
{ path: 'ui/menu/header.js', pack: 'edit|share' }, { path: 'ui/menu/header.js', pack: 'edit|share' },
......
...@@ -154,7 +154,8 @@ KityMinder.LANG['zh-cn'] = { ...@@ -154,7 +154,8 @@ KityMinder.LANG['zh-cn'] = {
'resetlayout': '整理布局', 'resetlayout': '整理布局',
'expandtoleaf': '展开全部节点', 'expandtoleaf': '展开全部节点',
'collapsetolevel1': '收起到一级节点', 'collapsetolevel1': '收起到一级节点',
'fullscreen': '全屏' 'fullscreen': '全屏',
'outline': '大纲'
}, },
'back': '返回', 'back': '返回',
......
...@@ -21,7 +21,7 @@ KityMinder.registerUI('menu/share/share', function(minder) { ...@@ -21,7 +21,7 @@ KityMinder.registerUI('menu/share/share', function(minder) {
var BACKEND_URL = 'http://naotu.baidu.com/share.php'; var BACKEND_URL = 'http://naotu.baidu.com/share.php';
if (window.location.host == 'local.host') { if (window.location.host == 'local.host') {
BACKEND_URL = 'http://naotu.baidu.com/share_debug.php'; // 测试环境 BACKEND_URL = '/naotu/share.php'; // 测试环境
} }
var currentShare = null; var currentShare = null;
......
/**
* @fileOverview
*
* 搜索节点功能
*
* @author: yangxiaohu
* @copyright: Baidu FEX, 2014
*/
KityMinder.registerUI('topbar/moreservice', function(minder) {
var $service;
var $link = $('<link>').attr('href', "http://baiduoffice.duapp.com/public/assets/style/moreService.css").attr('rel', "stylesheet");
$('head').append($link);
$.getScript('http://baiduoffice.duapp.com/public/widget/moreService.js', startService);
$service = $('<div id="moreservice"></div>');
function startService(){
$service.prependTo('#panel').moreService({button: {float: 'left', width: '40px', height: '40px', 'border-right': '1px solid rgba(255, 255, 255, .5)'}});
};
return $service;
});
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment