lsc 6 months ago
parent
commit
48dac79943
8 changed files with 18 additions and 18 deletions
  1. 3 3
      js/Controls/Basic.js
  2. 3 3
      js/Controls/Basic/Dialog.js
  3. 3 3
      js/Controls/index.js
  4. 3 3
      js/Desktop/DeskTop.js
  5. 2 2
      js/UForm/Login.js
  6. 1 1
      js/User/Logout.js
  7. 2 2
      uform.js
  8. 1 1
      uformd.js

+ 3 - 3
js/Controls/Basic.js

@@ -1560,7 +1560,7 @@ U.UF.UI.Confirm = U.UF.UI.confirm = function(content, determineFun, cancelFun) {
         "style": {
             "cssText": "text-align: center; color: rgb(255,255,255); width: 92px; line-height:28px; background: rgb(48,126,208); float: right; margin-right:29px; "
         },
-        innerHTML: "确定",
+        innerHTML: "Confirm",
         onclick: function() {
             var _bool = true;
             if (U.UF.C.isFunction(determineFun)) {
@@ -1577,7 +1577,7 @@ U.UF.UI.Confirm = U.UF.UI.confirm = function(content, determineFun, cancelFun) {
         "style": {
             "cssText": "text-align: center; color: rgb(255,255,255); width: 92px; line-height:28px; background: rgb(48,126,208); background: rgb(170,170,170); float: right; margin-right:21px;margin-left:29px;"
         },
-        "innerHTML": "取消",
+        "innerHTML": "Cancel",
         "onclick": function() {
             U.UF.C.isFunction(cancelFun) && cancelFun(); //判断是否存在回调 有则执行。
             U.UF.F.closeWindow(_form.form); //关闭窗口函数
@@ -1585,7 +1585,7 @@ U.UF.UI.Confirm = U.UF.UI.confirm = function(content, determineFun, cancelFun) {
     }, _footer);
     //调用Uform窗体创建函数将主体内容添加到窗体中
     var _form = new U.UF.UI.form(
-        "提示",
+        "Reminder",
         _confirm, {
             "style": {
                 "cssText": "font-size: 14px; background: rgb(255,255,255); width: 310px; position: absolute; box-shadow: 0 0 10px 3px rgb(0,0,0); "

+ 3 - 3
js/Controls/Basic/Dialog.js

@@ -35,7 +35,7 @@ U.UF.UI.Confirm = U.UF.UI.confirm = function (content, determineFun, cancelFun)
         "style": {
             "cssText": "text-align: center; color: rgb(255,255,255); width: 92px; line-height:28px; background: rgb(48,126,208); border-radius: 5px;float: right; margin-right:29px; "
         },
-        innerHTML: "确定",
+        innerHTML: "Confirm",
         onclick: function () {
             var _bool = true;
             if (U.UF.C.isFunction(determineFun)) {
@@ -52,7 +52,7 @@ U.UF.UI.Confirm = U.UF.UI.confirm = function (content, determineFun, cancelFun)
         "style": {
             "cssText": "text-align: center; color: rgb(255,255,255); width: 92px; line-height:28px; background: rgb(48,126,208); border-radius: 5px;background: rgb(170,170,170); float: right; margin-right:21px;margin-left:29px;"
         },
-        "innerHTML": "取消",
+        "innerHTML": "Cancel",
         "onclick": function () {
             U.UF.C.isFunction(cancelFun) && cancelFun(); //判断是否存在回调 有则执行。
             U.UF.F.closeWindow(_form.form);  //关闭窗口函数
@@ -60,7 +60,7 @@ U.UF.UI.Confirm = U.UF.UI.confirm = function (content, determineFun, cancelFun)
     }, _footer);
     //调用Uform窗体创建函数将主体内容添加到窗体中
     var _form = new U.UF.UI.form(
-        "提示",
+        "Reminder",
         _confirm,
         {
             "style": {

+ 3 - 3
js/Controls/index.js

@@ -1560,7 +1560,7 @@ U.UF.UI.Confirm = U.UF.UI.confirm = function(content, determineFun, cancelFun) {
         "style": {
             "cssText": "text-align: center; color: rgb(255,255,255); width: 92px; line-height:28px; background: rgb(48,126,208); border-radius: 5px;float: right; margin-right:29px; "
         },
-        innerHTML: "确定",
+        innerHTML: "Confirm",
         onclick: function() {
             var _bool = true;
             if (U.UF.C.isFunction(determineFun)) {
@@ -1577,7 +1577,7 @@ U.UF.UI.Confirm = U.UF.UI.confirm = function(content, determineFun, cancelFun) {
         "style": {
             "cssText": "text-align: center; color: rgb(255,255,255); width: 92px; line-height:28px; background: rgb(48,126,208); border-radius: 5px;background: rgb(170,170,170); float: right; margin-right:21px;margin-left:29px;"
         },
-        "innerHTML": "取消",
+        "innerHTML": "Cancel",
         "onclick": function() {
             U.UF.C.isFunction(cancelFun) && cancelFun(); //判断是否存在回调 有则执行。
             U.UF.F.closeWindow(_form.form); //关闭窗口函数
@@ -1585,7 +1585,7 @@ U.UF.UI.Confirm = U.UF.UI.confirm = function(content, determineFun, cancelFun) {
     }, _footer);
     //调用Uform窗体创建函数将主体内容添加到窗体中
     var _form = new U.UF.UI.form(
-        "提示",
+        "Reminder",
         _confirm, {
             "style": {
                 "cssText": "font-size: 14px; background: rgb(255,255,255); width: 310px; position: fixed; box-shadow: 0 0 10px 3px rgb(0,0,0); border-radius: 5px;"

+ 3 - 3
js/Desktop/DeskTop.js

@@ -16,13 +16,13 @@ U.MD.D.I.teacherDeskIcon = [
     { "Name": "Course Assessment", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
     { "Name": "Project Planning", "Url": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
     { "Name": "Project Library", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
-    { "Name": "Teachers Management", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
+    // { "Name": "Teachers Management", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
     // { "Name": "Learning Analytics", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
     // { "Name": "AI Chat", "Url": "AIprogram2", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.png)" } },
     { "Name": "CocoNote", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     { "Name": "AI Chat+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
-    { "Name": "Teacher Management", "Url": "testTeacherSies", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
-    { "Name": "Teacher Center", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
+    // { "Name": "Teacher Management", "Url": "testTeacherSies", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
+    // { "Name": "Teacher Center", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
 ];
 
 //极简模式

+ 2 - 2
js/UForm/Login.js

@@ -407,8 +407,8 @@ U.MD.U.LO.logoutSystem = function (callback) {
     //如果用户登录的情况
     if (US.userInfo.userid) {
         //弹出退出登录的提示
-        U.UF.UI.confirm("是否退出" + US.userInfo.username + "账号", function () {
-            U.MD.U.LO.logout(callback);
+        U.UF.UI.confirm("Do you want to logout of" + US.userInfo.username + "'s account", function () {
+            U.MD.U.LO.logout();
         });
     }
 }

+ 1 - 1
js/User/Logout.js

@@ -8,7 +8,7 @@ U.MD.U.LO.logoutSystem = function () {
     //如果用户登录的情况
     if (US.userInfo.userid) {
         //弹出退出登录的提示
-        U.UF.UI.confirm("是否退出" + US.userInfo.username + "账号", function () {
+        U.UF.UI.confirm("Do you want to logout of" + US.userInfo.username + "'s account", function () {
             U.MD.U.LO.logout();
         });
     }

+ 2 - 2
uform.js

@@ -12294,10 +12294,10 @@ U.MD.U.LO.logoutSystem = function(callback) {
     //如果用户登录的情况
     if (US.userInfo.userid) {
         //弹出退出登录的提示
-        U.UF.UI.confirm("是否退出" + US.userInfo.username + "账号", function() {
+        U.UF.UI.confirm("Do you want to logout of" + US.userInfo.username + "'s account", function () {
             U.A.Request(US.Config.server + "logout", [], function(res) {
                 U.A.Request(US.SCOKET, ["logout", US.userInfo.userid, US.pageId], function() {
-                    U.alert("退出成功!")
+                    U.alert("logout success!")
                     window.location.reload();
                 }, [], { "type": "POST", "withCredentials": true }); //在状态服务退出
             }, [], { "type": "POST", "withCredentials": true });

+ 1 - 1
uformd.js

@@ -11923,7 +11923,7 @@ U.MD.U.LO.logoutSystem = function (callback) {
     //如果用户登录的情况
     if (US.userInfo.userid) {
         //弹出退出登录的提示
-        U.UF.UI.confirm("是否退出" + US.userInfo.username + "账号", function () {
+        U.UF.UI.confirm("Do you want to logout of" + US.userInfo.username + "'s account", function () {
             U.MD.U.LO.logout(callback);
         });
     }