diff --git a/build/builder/core/ver.py b/build/builder/core/ver.py index b5ebd39..0180b99 100644 --- a/build/builder/core/ver.py +++ b/build/builder/core/ver.py @@ -1,3 +1,3 @@ # -*- coding: utf8 -*- -VER_TELEPORT_SERVER = "2.2.8.1" +VER_TELEPORT_SERVER = "2.2.9.3" VER_TELEPORT_ASSIST = "2.2.6.1" diff --git a/server/tp_core/core/tp_core.rc b/server/tp_core/core/tp_core.rc index 264df56..468f908 100644 Binary files a/server/tp_core/core/tp_core.rc and b/server/tp_core/core/tp_core.rc differ diff --git a/server/tp_core/core/ts_ver.h b/server/tp_core/core/ts_ver.h index 214ab3c..4205ff6 100644 --- a/server/tp_core/core/ts_ver.h +++ b/server/tp_core/core/ts_ver.h @@ -1,6 +1,6 @@ #ifndef __TS_SERVER_VER_H__ #define __TS_SERVER_VER_H__ -#define TP_SERVER_VER L"2.2.8.1" +#define TP_SERVER_VER L"2.2.9.3" #endif // __TS_SERVER_VER_H__ diff --git a/server/tp_web/src/tp_web.rc b/server/tp_web/src/tp_web.rc index e78c1af..b6df1a4 100644 Binary files a/server/tp_web/src/tp_web.rc and b/server/tp_web/src/tp_web.rc differ diff --git a/server/tp_web/src/ts_ver.h b/server/tp_web/src/ts_ver.h index 214ab3c..4205ff6 100644 --- a/server/tp_web/src/ts_ver.h +++ b/server/tp_web/src/ts_ver.h @@ -1,6 +1,6 @@ #ifndef __TS_SERVER_VER_H__ #define __TS_SERVER_VER_H__ -#define TP_SERVER_VER L"2.2.8.1" +#define TP_SERVER_VER L"2.2.9.3" #endif // __TS_SERVER_VER_H__ diff --git a/server/www/teleport/app/eom_ver.py b/server/www/teleport/app/eom_ver.py index a502a9e..5559b90 100644 --- a/server/www/teleport/app/eom_ver.py +++ b/server/www/teleport/app/eom_ver.py @@ -1,4 +1,4 @@ # -*- coding: utf8 -*- -TS_VER = "2.2.8.1" +TS_VER = "2.2.9.3" TP_ASSIST_LAST_VER = "2.2.6.1" TP_ASSIST_REQUIRE = "2.0.0.1" diff --git a/server/www/teleport/view/auth/login.mako b/server/www/teleport/view/auth/login.mako index 4e2212b..f84d311 100644 --- a/server/www/teleport/view/auth/login.mako +++ b/server/www/teleport/view/auth/login.mako @@ -26,8 +26,8 @@
- 账号/密码 登录 - 身份验证器 + 账号/密码登录 + 身份验证器登录
@@ -61,8 +61,8 @@ diff --git a/server/www/teleport/view/auth/page_base.mako b/server/www/teleport/view/auth/page_base.mako index 82e7a0d..fc77c4c 100644 --- a/server/www/teleport/view/auth/page_base.mako +++ b/server/www/teleport/view/auth/page_base.mako @@ -1,100 +1,100 @@ - - <%! - import eom_ver - page_title_ = '' - %> - - - - - - - - - - - - ${self.attr.page_title_}::TELEPORT - - - - - - - - - <%block name="extend_css"/> - - - - - - - -
-
- - ${self.body()} - -
-
- - - - - <%block name="extend_content" /> - - - - - - - - - - - - - - - - - - - <%block name="extend_js"/> - - - - <%block name="embed_js" /> - - + + <%! + import eom_ver + page_title_ = '' + %> + + + + + + + + + + + + ${self.attr.page_title_}::TELEPORT + + + + + + + + + <%block name="extend_css"/> + + + + + + + +
+
+ + ${self.body()} + +
+
+ + + + + <%block name="extend_content" /> + + + + + + + + + + + + + + + + + + + <%block name="extend_js"/> + + + + <%block name="embed_js" /> + + \ No newline at end of file diff --git a/server/www/teleport/view/uidesign/index.mako b/server/www/teleport/view/uidesign/index.mako index 041c184..443177d 100644 --- a/server/www/teleport/view/uidesign/index.mako +++ b/server/www/teleport/view/uidesign/index.mako @@ -33,10 +33,6 @@
-
- -
-

这是一级标题，This is H1.

这是二级标题，This is H2.

diff --git a/version.in b/version.in index acf43b0..7622b60 100644 --- a/version.in +++ b/version.in @@ -14,6 +14,6 @@ Build ： 构建号。构建号用于表明此版本发布之前进行了多少 -TELEPORT_SERVER 2.2.8.1 +TELEPORT_SERVER 2.2.9.3 TELEPORT_ASSIST 2.2.6.1 TELEPORT_ASSIST_REQUIRE 2.0.0.1