diff --git a/conf/wide.json b/conf/wide.json
index bed25cf..107a617 100644
--- a/conf/wide.json
+++ b/conf/wide.json
@@ -23,12 +23,10 @@
"D:\\go\\src\\pkg"
],
"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\\time\\main.go",
- "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\hello\\2.json",
- "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\hello\\main.go"
+ "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\time\\1.json"
],
- "CurrentFile": "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\hello\\main.go"
+ "CurrentFile": "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\time\\1.json"
}
}
]
diff --git a/data/user_workspaces/admin/src/mytest/time/1.json b/data/user_workspaces/admin/src/mytest/time/1.json
index 1b0f0d3..5cb2f19 100644
--- a/data/user_workspaces/admin/src/mytest/time/1.json
+++ b/data/user_workspaces/admin/src/mytest/time/1.json
@@ -1,24 +1,16 @@
-{
- "Server": "{IP}:7070",
- "StaticServer": "http://{IP}:7070",
- "EditorChannel": "ws://{IP}:7070",
- "OutputChannel": "ws://{IP}:7070",
- "ShellChannel": "ws://{IP}:7070",
- "SessionChannel": "ws://{IP}:7070",
- "StaticResourceVersion": "201409032040",
- "MaxProcs": 4,
- "RuntimeMode": "dev",
- "Pwd": "{pwd}",
- "Users": [
- {
- "Name": "admin",
- "Password": "admin",
- "Workspace": "{pwd}/data/user_workspaces/admin",
- "LatestSessionContent": {
- "FileTree": [],
- "Files": [],
- "CurrentFile": ""
- }
- }
- ]
-}
\ No newline at end of file
+package main
+
+import (
+ "fmt"
+ "mytest/time/pkg"
+ "time"
+)
+
+func main() {
+ for i := 0; i < 50; i++ {
+ fmt.Println("Hello, 世界", pkg.Now())
+
+ time.Sleep(time.Second)
+ }
+
+}
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 1144c86..b6af5f3 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -40,5 +40,8 @@
"stop": "停止",
"output": "输出",
"search": "搜索",
- "notification": "通知"
+ "notification": "通知",
+ "min": "最小化",
+ "max_side": "左侧窗口最大化",
+ "max_bottom": "底部窗口最大化"
}
\ No newline at end of file
diff --git a/static/css/base.css b/static/css/base.css
index f330378..dd575c5 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -3,6 +3,7 @@ body {
font-size: 13px;
margin: 0;
color: #000;
+ overflow-x: hidden;
}
ul {
@@ -53,6 +54,14 @@ ul {
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
+ color: #666;
+ cursor: pointer;
+ font-size: 13px;
+ line-height: 18px;
+}
+
+.font-ico:hover {
+ color: #333;
}
.ico-play:before {
@@ -79,17 +88,18 @@ ul {
content: "\e608";
}
-.ico-close {
- color: #666;
+.ico-max:before {
+ content: "\e60c";
}
-.ico-close:hover {
- color: #333;
+.ico-min:before {
+ content: "\e60d";
+ position: absolute;
+ right: 5px;
}
.ico-close:before {
content: "\e60a";
- cursor: pointer;
}
/* end reset & function */
@@ -143,7 +153,8 @@ ul {
.tabs > div {
float: left;
- line-height: 19px;
+ line-height: 18px;
+ height: 18px;
padding: 0 5px;
cursor: pointer;
background-color: #DDD;
@@ -160,6 +171,7 @@ ul {
/* start framework */
.content {
position: relative;
+ overflow: hidden;
}
.side {
@@ -168,6 +180,7 @@ ul {
position: absolute;
border-right: 1px solid #9B9B9B;
height: 100%;
+ z-index: 11;
}
.side-fullscreen {
@@ -194,18 +207,6 @@ ul {
padding: 5px;
text-decoration: none;
}
-
-.toolbars > span {
- color: #666;
- cursor: pointer;
- font-size: 16px;
- line-height: 25px;
- margin-right: 5px;
-}
-
-.toolbars > span:hover {
- color: #333;
-}
/* end menu */
/* start editor */
@@ -216,6 +217,7 @@ ul {
background-color: #D7D7D7;
width: 80%;
height: 70%;
+ overflow: hidden;
}
.edit-panel .tabs > div {
@@ -229,7 +231,13 @@ ul {
background-color: #F7F7F7;
}
-.edit-header .ico {
+.toolbars {
+ position: absolute;
+ right: 5px;
+ top: 1px;
+}
+
+.edit-panel .tabs .ico {
background-image: url("../images/ico-file.png");
float: left;
height: 16px;
@@ -252,6 +260,7 @@ ul {
width: 80%;
height: 30%;
top: 70%;
+ z-index: 11;
background-color: #fff;
}
@@ -295,6 +304,9 @@ ul {
.footer {
border-top: 1px solid #919191;
background-color: #F0F0F0;
+ padding-left: 5px;
+ height: 19px;
+ line-height: 18px;
}
.notification-count {
diff --git a/static/css/fonts/icomoon.eot b/static/css/fonts/icomoon.eot
index 8d8a97e..a493755 100644
Binary files a/static/css/fonts/icomoon.eot and b/static/css/fonts/icomoon.eot differ
diff --git a/static/css/fonts/icomoon.svg b/static/css/fonts/icomoon.svg
index 5086ee8..ea76cdf 100644
--- a/static/css/fonts/icomoon.svg
+++ b/static/css/fonts/icomoon.svg
@@ -14,11 +14,13 @@