From 1a3f7f33781d2f90d2bf88311407effbe4fe8b72 Mon Sep 17 00:00:00 2001 From: Apex Liu Date: Sun, 4 Jun 2017 03:41:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=9C=8D=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E5=88=B0=202.2.9.3=EF=BC=8C?= =?UTF-8?q?=E5=87=86=E5=A4=87=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/builder/core/ver.py | 2 +- server/tp_core/core/tp_core.rc | Bin 5166 -> 5166 bytes server/tp_core/core/ts_ver.h | 2 +- server/tp_web/src/tp_web.rc | Bin 5168 -> 5168 bytes server/tp_web/src/ts_ver.h | 2 +- server/www/teleport/app/eom_ver.py | 2 +- server/www/teleport/view/auth/login.mako | 8 +- server/www/teleport/view/auth/page_base.mako | 198 +++++++++---------- server/www/teleport/view/uidesign/index.mako | 4 - version.in | 2 +- 10 files changed, 108 insertions(+), 112 deletions(-) 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 264df561d509077258cabfb0b2ff4195dd05bfa5..468f908ca7381f7eb4c0cd9d29cf3fe0e62a2b28 100644 GIT binary patch delta 74 zcmZ3du})*d0uEM71|0_D$xAu3p)7e$@y%~IjxcdsGUzcFGsG|$Fepv_$fddY3HKXD MG(q9b?|2>90N4%_Y5)KL delta 74 zcmZ3du})*d0uELS1|0^&$xAu3p)7e$@y%~IjxcdsFz7KDGQ=<#Fepv_$fddY3HKXD MG(q9b?|2>90M-c;UH||9 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 e78c1af8c887093c24eb50140d26f3f871a56a91..b6df1a413e8c1a1b4742dc5cd3b807b77b322186 100644 GIT binary patch delta 62 zcmdm>u|Z?Q0uEM71|0_D$xAu3p)7e$@y%~I&M*PFdJM*!_i~FvnUnW&OHO9t6WYwe Hr^5yS038nL delta 62 zcmdm>u|Z?Q0uELS1|0^&$xAu3p)7e$@y%~I&M*PFdJKk}_i~FvnUnW&OHO9t6WYwe Hr^5yS{(BDH 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