diff --git a/README.md b/README.md index 39dfd6c..028130e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Wide +# Wide [![Build Status](https://drone.io/github.com/b3log/wide/status.png)](https://drone.io/github.com/b3log/wide/latest) ## Intro diff --git a/conf/wide.json b/conf/wide.json index 11b4694..51afa6f 100644 --- a/conf/wide.json +++ b/conf/wide.json @@ -15,13 +15,23 @@ "Password": "admin", "Workspace": "{pwd}/data/user_workspaces/admin", "LatestSessionContent": { - "FileTree": [ - "D:\\GoGoGo\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest", - "D:\\GoGoGo\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\hello", - "D:\\GoGoGo\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\time" + "fileTree": [ + "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest", + "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\123", + "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\hello", + "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\time", + "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\time\\pkg", + "D:\\go\\src\\pkg\\archive", + "D:\\go\\src\\pkg\\archive\\tar", + "D:\\go\\src\\pkg\\archive\\tar\\testdata" ], - "Files": [], - "CurrentFile": "" + "files": [ + "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\1123", + "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\123\\q.exe", + "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\hello\\2.json", + "D:\\go\\src\\pkg\\archive\\tar\\testdata\\small.txt" + ], + "currentFile": "D:\\go\\src\\pkg\\archive\\tar\\testdata\\small.txt" } } ] diff --git a/data/user_workspaces/admin/src/mytest/1123 b/data/user_workspaces/admin/src/mytest/1123 new file mode 100644 index 0000000..e69de29 diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json index ce00aca..4b5a44d 100644 --- a/i18n/zh_CN.json +++ b/i18n/zh_CN.json @@ -34,5 +34,7 @@ "notification_3": "没有检查到 ide_stub,这将会导致 [跳转到声明]、[查找使用] 失效", "goto_line": "跳转到行", "goto": "跳转", - "input_no_empty": "输入不能为空" + "input_no_empty": "输入不能为空", + "tip": "提示", + "confirm": "确定" } \ No newline at end of file diff --git a/static/css/base.css b/static/css/base.css index 4b2a3e6..bdfd0ee 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -74,6 +74,19 @@ ul { .icon-buildrun:before { content: "\e607"; } + +.ico-close { + color: #666; +} + +.ico-close:hover { + color: #333; +} + +.ico-close:before { + content: "\e60a"; + cursor: pointer; +} /* end reset & function */ /* start frame */ @@ -133,20 +146,6 @@ ul { .tabs > div.current { background-color: #F7F7F7; } - -.tabs .ico-close { - color: #666; -} - -.tabs .ico-close:hover { - color: #333; -} - -.tabs .ico-close:before { - content: "\e60a"; - cursor: pointer; - -} /* end tabs */ /* start framework */ diff --git a/static/css/dialog.css b/static/css/dialog.css index 6115b51..97575de 100644 --- a/static/css/dialog.css +++ b/static/css/dialog.css @@ -43,16 +43,9 @@ } .dialog-close-icon { - background-position: -15px 0; - cursor: pointer; float: right; - height: 18px; - margin: 5px 3px 0 0; - width: 18px; -} - -.dialog-close-icon:hover { - background-position: -15px -18px; + margin: 3px; + text-decoration: none; } .dialog-main { @@ -71,7 +64,8 @@ } #dialogRemoveConfirm, -.dialog-prompt { +.dialog-prompt, +#dialogAlert { padding: 10px 20px 0; overflow: hidden; } diff --git a/static/js/dialog.js b/static/js/dialog.js index 1a675de..10a8183 100644 --- a/static/js/dialog.js +++ b/static/js/dialog.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -(function($) { +(function ($) { $.fn.extend({ dialog: { version: "0.0.1.7", @@ -24,7 +24,7 @@ var dpuuid = new Date().getTime(); var PROP_NAME = 'dialog'; - var Dialog = function() { + var Dialog = function () { this._defaults = { "styleClass": { "background": "dialog-background", @@ -41,7 +41,7 @@ }; $.extend(Dialog.prototype, { - _attach: function(target, settings) { + _attach: function (target, settings) { if (!target.id) { this.uuid++; target.id = 'dp' + this.uuid; @@ -53,21 +53,21 @@ this._init(target); }, /* Create a new instance object. */ - _newInst: function(target) { + _newInst: function (target) { // escape jQuery meta chars var id = target[0].id.replace(/([^A-Za-z0-9_])/g, '\\\\$1'); return { id: id }; }, - _getInst: function(target) { + _getInst: function (target) { try { return $.data(target, PROP_NAME); } catch (err) { throw 'Missing instance data for this dialog'; } }, - _destroyDialog: function(target) { + _destroyDialog: function (target) { var inst = $.dialog._getInst(target); var id = inst.id; $.removeData(target, PROP_NAME); @@ -79,7 +79,7 @@ $("." + styleClass.background).remove(); $("#" + id + "Dialog").remove(); }, - _init: function(target) { + _init: function (target) { var inst = this._getInst(target); var id = inst.id, settings = inst.settings; @@ -99,13 +99,16 @@ headerHTML = "
"; // Sets footerHTML. if (!settings.hideFooter) { - footerHTML = "