-
+
diff --git a/frontend/admin/src/App.vue b/frontend/admin/src/App.vue
index 5ec27386..71b628ea 100644
--- a/frontend/admin/src/App.vue
+++ b/frontend/admin/src/App.vue
@@ -21,7 +21,7 @@
\ No newline at end of file
diff --git a/frontend/admin/src/locales.js b/frontend/admin/src/locales.js
index da3a01d9..b05cab00 100644
--- a/frontend/admin/src/locales.js
+++ b/frontend/admin/src/locales.js
@@ -2,7 +2,9 @@ export default {
"zh-cn": {
alert: {
alert: "提示",
- OK: "确定"
+ OK: "确定",
+ confirm: "确认",
+ cancel: "取消"
},
nav: {
userManagement: "用户管理",
@@ -49,8 +51,13 @@ export default {
editAnnouncement: "编辑公告",
createAnnouncement: "创建公告",
contentCanNotBeEmpty: "内容不能为空"
-
-
+ },
+ problem: {
+ sample: "样例",
+ addSample: "添加样例",
+ fold: "折叠",
+ show: "展开",
+ deleteThisSample: "删除这组样例?"
},
adminUtils: {
search: "搜索",
@@ -72,6 +79,9 @@ export default {
back: "返回",
saveChanges: "保存修改",
+ delete: "删除",
+ input: "输入",
+ output: "输出",
unsupportedBrowserWarningMsg: "当前网页
不支持 你正在使用的浏览器, 为了正常的访问,请到
升级你的浏览器"
}
diff --git a/frontend/admin/src/main.js b/frontend/admin/src/main.js
index 14dafb48..90221b75 100644
--- a/frontend/admin/src/main.js
+++ b/frontend/admin/src/main.js
@@ -112,14 +112,17 @@ router.map({
"/announcement/edit/:announcementId": {
name: "editAnnouncement",
component: editAnnouncement
+ },
+ "/problem": {
+ component: problem
}
});
// hide loading
-document.getElementsByClassName("cssload-battery")[0].style.display = "none";
+document.getElementById("loading").style.display = "none";
// override window.alert
-function bootboxAlert(content) {
+window.alert = function bootboxAlert(content) {
bootbox.dialog({
message: content,
title: locale[lang].alert.alert,
@@ -130,8 +133,34 @@ function bootboxAlert(content) {
}
}
})
-}
-window.alert = bootboxAlert;
+};
+
+// override window.confirm
+window.confirm = function bootboxConfirm(content, okCallback, cancelCallback) {
+ bootbox.dialog ({
+ message: content,
+ title: locale[lang].alert.confirm,
+ buttons: {
+ cancel: {
+ label: locale[lang].alert.cancel,
+ className: "btn-success",
+ callback: function() {
+ if(cancelCallback) {
+ return cancelCallback;
+ }
+ else {
+ return function(){};
+ }
+ }
+ },
+ main: {
+ label: locale[lang].alert.OK,
+ className: "btn-danger",
+ callback: okCallback
+ }
+ }
+ })
+};
router.redirect({"/user": "/user/1"});
router.redirect({"/announcement": "/announcement/1"});