update

stmms-web/src/main/webapp/static/i18n/messages_en.properties

@@ -7,18 +7,18 @@ user.login.password=password
 user.login.submit=Login
 user.logout=logout
 #mark-control
-mark.assistant=<i class="icon-wrench"></i>Assistant
+mark.assistant=Assistant
 mark.mode.track=Track Mode
 mark.mode.common=Common Mode
 mark.function=Marking function
 #status
-mark.student.number=student number<em id="student-number"></em>
-mark.library.number=task number<em id="library-number"></em>
-mark.objective.score=objective score <em id="objective-score"></em>
-mark.marked.count=marked<em id="person-count"></em>
-mark.unmark.count=unmark<em id="todo-count"></em>
-mark.top.count=assigned<em id="top-count"></em>
-mark.progress=progress<em id="marked-percent"></em>
+mark.student.number=student number
+mark.library.number=task number
+mark.objective.score=objective score
+mark.marked.count=marked
+mark.unmark.count=unmark
+mark.top.count=assigned
+mark.progress=progress
 mark.continue=continue
 mark.top.count.finish=The assigned task has been completed. Do you want to continue?
 mark.loading=loading...
@@ -50,17 +50,17 @@ mark.thumbnail=thumbnail
 mark.sidebar=sidebar
 #mark-history
 mark.history=history
-mark.history.time=time<em class="up" id="time-sort"></em>
-mark.history.number=number<em class="up" id="studentId-sort">
-mark.history.score=score<em class="up" id="score-sort">
+mark.history.time=time
+mark.history.number=number
+mark.history.score=score
 mark.history.search=search
-mark.history.pre=pre<i class="yellow" id="history-start"></i>-pre<i class="yellow" id="history-end"></i>
+mark.history.pre=pre
 mark.history.success=successful,score: 
 mark.history.problem=submit problem successful 
 #mark-board
 mark.submit=submit
-mark.total.score.board=Score\uff1a<i class="yellow" id="score-board-total-score"></i>
-mark.total.score=Score <i id="total-score">5</i>
+mark.total.score.board=Score\uff1a
+mark.total.score=Score
 mark.score.zero=all zero
 mark.pass=pass
 mark.choose.result=choose result

stmms-web/src/main/webapp/static/i18n/messages_zh.properties

@@ -7,18 +7,18 @@ user.login.password=\u5bc6\u7801
 user.login.submit=\u767b\u5f55
 user.logout=\u9000\u51fa
 #mark-control
-mark.assistant=<i class="icon-wrench"></i> \u5c0f\u52a9\u624b
+mark.assistant=\u5c0f\u52a9\u624b
 mark.mode.track=\u5207\u6362\u5230\u8f68\u8ff9\u6a21\u5f0f
 mark.mode.common=\u5207\u6362\u5230\u666e\u901a\u6a21\u5f0f
 mark.function=\u8bc4\u5377\u529f\u80fd
 #status
-mark.student.number=\u8003\u751f\u7f16\u53f7<em id="student-number"></em>
-mark.library.number=\u4efb\u52a1\u7f16\u53f7<em id="library-number"></em>
-mark.objective.score=\u5ba2\u89c2\u5f97\u5206<em id="objective-score"></em>
-mark.marked.count=\u5df2\u8bc4<em id="person-count"></em>
-mark.unmark.count=\u672a\u8bc4<em id="todo-count"></em>
-mark.top.count=\u5206\u914d<em id="top-count"></em>
-mark.progress=\u8fdb\u5ea6<em id="marked-percent"></em>
+mark.student.number=\u8003\u751f\u7f16\u53f7
+mark.library.number=\u4efb\u52a1\u7f16\u53f7
+mark.objective.score=\u5ba2\u89c2\u5f97\u5206
+mark.marked.count=\u5df2\u8bc4
+mark.unmark.count=\u672a\u8bc4
+mark.top.count=\u5206\u914d
+mark.progress=\u8fdb\u5ea6
 mark.continue=\u7ee7\u7eed
 mark.top.count.finish=\u5206\u914d\u4efb\u52a1\u5df2\u8bc4\u5b8c\uff0c\u662f\u5426\u7ee7\u7eed\uff1f
 mark.loading=\u6b63\u5728\u52a0\u8f7d...
@@ -50,17 +50,17 @@ mark.thumbnail=\u7f29\u7565\u56fe
 mark.sidebar=\u4fa7\u8fb9\u680f
 #mark-history
 mark.history=\u56de\u8bc4
-mark.history.time=\u65f6\u95f4<em class="up" id="time-sort"></em>
-mark.history.number=\u7f16\u53f7<em class="up" id="studentId-sort">
-mark.history.score=\u603b\u5206<em class="up" id="score-sort">
+mark.history.time=\u65f6\u95f4
+mark.history.number=\u7f16\u53f7
+mark.history.score=\u603b\u5206
 mark.history.search=\u67e5\u627e\u8bd5\u5377
-mark.history.pre=\u524d<i class="yellow" id="history-start"></i>-\u524d<i class="yellow" id="history-end"></i>
+mark.history.pre=\u524d
 mark.history.success=\u56de\u8bc4\u6210\u529f\uff0c\u603b\u5206\uff1a
 mark.history.problem=\u56de\u8bc4\u6210\u529f\uff0c\u5df2\u63d0\u4ea4\u95ee\u9898\u5377
 #mark-board
 mark.submit=\u63d0\u4ea4
-mark.total.score.board=\u603b\u5206\uff1a<i class="yellow" id="score-board-total-score"></i>
-mark.total.score=\u603b\u5206 <i id="total-score">5</i>
+mark.total.score.board=\u603b\u5206\uff1a
+mark.total.score=\u603b\u5206
 mark.score.zero=\u5168\u96f6\u5206
 mark.pass=\u8df3 \u8fc7
 mark.choose.result=\u9009\u505a\u7ed3\u679c

stmms-web/src/main/webapp/static/mark-json/js/mark-control.js

@@ -656,7 +656,7 @@ MarkControl.prototype.center_dom = '<div class="center-content span12"></div>';
 
 MarkControl.prototype.center_header_dom = '<div class="row-fluid"><div class="header"><p class="tips">\
 <em>\
-<a href="javascript:void(0)" id="assistant-button" class="btn" data-i18n-html="mark.assistant"><i class="icon-wrench"></i> 小助手</a></em>\
+<a href="javascript:void(0)" id="assistant-button" class="btn"><i class="icon-wrench"></i><span data-i18n-text="mark.assistant">小助手</span></a></em>\
 <a class="useinfo" href="#"><i class="icon-user icon-white"></i><i id="mark-user-name"></i></a>\
 <a class="logout" id="logout-link" href="{logoutUrl}"><i class="icon-off icon-white"></i> <i id="logout-title" data-i18n-text="user.logout">退出</i></a>\
 </p></div></div>';
@@ -712,23 +712,23 @@ function getDom(content, markControl) {
     if (markControl != undefined && markControl.option.logoutUrl != undefined) {
         content = content.replace(/{logoutUrl}/g, markControl.option.logoutUrl);
     }
-    return $(content);
-}
-
-function isArray(obj) {
-    return obj != undefined && Object.prototype.toString.call(obj) === '[object Array]';
-}
-function loadLanguage() {  
-	$("[data-i18n-value]").each(function() {
+    var result = $(content);
+    result.find("[data-i18n-value]").each(function() {
 		$(this).val($.i18n.prop($(this).data("i18n-value")));
 	});
-	$("[data-i18n-text]").each(function() {
+    result.find("[data-i18n-text]").each(function() {
 		$(this).text($.i18n.prop($(this).data("i18n-text")));
 	});
-	$("[data-i18n-html]").each(function() {
-		$(this).html($.i18n.prop($(this).data("i18n-html")));
-	});
-	$("[data-i18n-placeholder]").each(function() {
+    result.find("[data-i18n-placeholder]").each(function() {
 		$(this).attr('placeholder',$.i18n.prop($(this).data("i18n-placeholder")));
 	});
+    return result;
+}
+
+function isArray(obj) {
+    return obj != undefined && Object.prototype.toString.call(obj) === '[object Array]';
+}
+
+function getMessage(message) { 
+	return $.i18n.prop(message);
 }

stmms-web/src/main/webapp/static/mark-new/js/mark-control.js

@@ -661,7 +661,7 @@ MarkControl.prototype.center_dom = '<div class="center-content span12"></div>';
 
 MarkControl.prototype.center_header_dom = '<div class="row-fluid"><div class="header"><p class="tips">\
 <em><a href="##" class="btn" id="switch-track-button" style="display:none" data-i18n-text="mark.mode.track">切换到轨迹模式</a>\
-<a href="javascript:void(0)" id="assistant-button" class="btn" data-i18n-html="mark.assistant"><i class="icon-wrench"></i> 小助手</a></em>\
+<a href="javascript:void(0)" id="assistant-button" class="btn"><i class="icon-wrench"></i><span data-i18n-text="mark.assistant"> 小助手</span></a></em>\
 <a class="useinfo" href="#"><i class="icon-user icon-white"></i><i id="mark-user-name"></i></a>\
 <a class="logout" id="logout-link" href="{logoutUrl}"><i class="icon-off icon-white"></i> <i id="logout-title" data-i18n-text="user.logout">退出</i></a>\
 </p></div></div>';
@@ -717,24 +717,23 @@ function getDom(content, markControl) {
     if (markControl != undefined && markControl.option.logoutUrl != undefined) {
         content = content.replace(/{logoutUrl}/g, markControl.option.logoutUrl);
     }
-    return $(content);
-}
-
-function isArray(obj) {
-    return obj != undefined && Object.prototype.toString.call(obj) === '[object Array]';
-}
-
-function loadLanguage() {  
-	$("[data-i18n-value]").each(function() {
+    var result = $(content);
+    result.find("[data-i18n-value]").each(function() {
 		$(this).val($.i18n.prop($(this).data("i18n-value")));
 	});
-	$("[data-i18n-text]").each(function() {
+    result.find("[data-i18n-text]").each(function() {
 		$(this).text($.i18n.prop($(this).data("i18n-text")));
 	});
-	$("[data-i18n-html]").each(function() {
-		$(this).html($.i18n.prop($(this).data("i18n-html")));
-	});
-	$("[data-i18n-placeholder]").each(function() {
+    result.find("[data-i18n-placeholder]").each(function() {
 		$(this).attr('placeholder',$.i18n.prop($(this).data("i18n-placeholder")));
 	});
+    return result;
+}
+
+function isArray(obj) {
+    return obj != undefined && Object.prototype.toString.call(obj) === '[object Array]';
+}
+
+function getMessage(message) { 
+	return $.i18n.prop(message);
 }

stmms-web/src/main/webapp/static/mark-new/js/modules/answer-view.js

@@ -9,7 +9,6 @@ function AnswerView(option) {
     this.markControl = option.markControl;
     this.server = option.server;
     this.init();
-    loadLanguage();
     this.markControl.on('task.get.success', this, function(event, context, eventObject) {
         this.render(this.server + context.task.answerUrl);
     });

stmms-web/src/main/webapp/static/mark-new/js/modules/change-name.js

@@ -75,7 +75,6 @@ function ChangeName(option) {
                     self.popover.userNameMessage.html('网络通信错误，请稍后重试');
                 });
     });
-    loadLanguage();
 }
 
 ChangeName.prototype.toggle = function(enable) {

stmms-web/src/main/webapp/static/mark-new/js/modules/mark-board.js

@@ -14,7 +14,6 @@ function MarkBoard(option) {
     this.enableSkip = option.enableSkip === true ? true : false;
 
     this.init();
-    loadLanguage();
     
     this.markControl.on('task.get.before', this, function(event, context, eventObject) {
         this.task = undefined;
@@ -681,7 +680,7 @@ MarkBoard.prototype.onFocusChange = function() {
 
 MarkBoard.prototype.step_board_dom = '<div class="span2 mark-steps" style="display:none"><div class="step-board">\
 <a href="#" class="header" id="show-score-board-button" data-i18n-text="mark.mouse"><< 鼠标给分</a>\
-<div class="sublist"><p class="fraction" data-i18n-html="mark.total.score">总分 <i id="total-score">5</i></p><div>\
+<div class="sublist"><p class="fraction"><span data-i18n-text="mark.total.score">总分</span> <i id="total-score">5</i></p><div>\
 <a href="#" class="header all-zero-button" data-i18n-text="mark.score.zero">全零分</a>\
 <div class="step-list"></div>\
 </div></div>';
@@ -714,7 +713,7 @@ MarkBoard.prototype.scoreBoard_step_dom = '<div class="sublist">\
 MarkBoard.prototype.scoreBoard_score_dom = '<a href="#" class="score-select"></a>';
 
 MarkBoard.prototype.scoreBoard_footer_dom = '<div class="footer">\
-<p class="font" data-i18n-html="mark.total.score.board">总分：<i class="yellow" id="score-board-total-score"></i></p>\
+<p class="font"><span data-i18n-text="mark.total.score.board">总分：</span><i class="yellow" id="score-board-total-score"></i></p>\
 <a id="task-submit-button" class="button" href="#" data-i18n-text="mark.submit">提 交</a>\
 <a class="button all-zero-button" href="##" data-i18n-text="mark.score.zero">全零分</a>\
 <a id="task-pass-button" class="button" href="#" style="display:none" data-i18n-text="mark.pass">跳 过</a>\

stmms-web/src/main/webapp/static/mark-new/js/modules/mark-history.js

@@ -166,7 +166,6 @@ MarkHistory.prototype.init = function() {
     this.container.find('#studentId-in').click(this, function(event) {
         self.markControl.trigger('mark.focus.change');
     });
-    loadLanguage();
 }
 MarkHistory.prototype.orderSearch = function(order) {
     this.order = order;
@@ -300,7 +299,7 @@ MarkHistory.prototype.header_dom = '<div class="header">\
 MarkHistory.prototype.paginator_dom = '<div class="c-page">\
 <a class="back" id="last-page-button" href="#"></a>\
 <a class="next" id="next-page-button" href="#"></a>\
-<span data-i18n-html="mark.history.pre">前<i class="yellow" id="history-start"></i>-前<i class="yellow" id="history-end"></i></span>\
+<span><span data-i18n-text="mark.history.pre">前</span><i class="yellow" id="history-start"></i>-<span data-i18n-text="mark.history.pre">前</span><i class="yellow" id="history-end"></i></span>\
 </div>';
 
 MarkHistory.prototype.history_search_dom = '<div class="c-scbar cl">\
@@ -310,9 +309,9 @@ MarkHistory.prototype.history_search_dom = '<div class="c-scbar cl">\
 
 MarkHistory.prototype.history_list_dom = '<div class="sublist"><div class="c-table">\
 <table class="table table-hover" cellpadding="0" cellspacing="0" width="100%"><thead><tr>\
-<th id="studentId-sort-th" data-i18n-html="mark.history.number">编号<em class="up" id="studentId-sort"></th>\
-<th id="time-sort-th" data-i18n-html="mark.history.time">时间<em class="up" id="time-sort"></em></th>\
-<th id="score-sort-th" data-i18n-html="mark.history.score">总分<em class="up" id="score-sort"></th></tr></thead>\
+<th id="studentId-sort-th"><span data-i18n-text="mark.history.number">编号</span><em class="up" id="studentId-sort"></th>\
+<th id="time-sort-th"><span data-i18n-text="mark.history.time">时间</span><em class="up" id="time-sort"></em></th>\
+<th id="score-sort-th"><span data-i18n-text="mark.history.score">总分</span><em class="up" id="score-sort"></th></tr></thead>\
 <tbody class="loding" id="history-loading"><tr><td colspan="3"><div><img src="{staticServer}/mark-new/images/loding.gif"/></div><p data-i18n-text="mark.loading">正在加载请稍候</p></td></tr></tbody>\
 <tbody id="history-list"></tbody></table></div></div>';
 

stmms-web/src/main/webapp/static/mark-new/js/modules/mark-status.js

@@ -8,7 +8,6 @@ var mark_status = function(option, success) {
 function MarkStatus(option) {
     this.markControl = option.markControl;
     this.init(option);
-    loadLanguage();
     this.markControl.on('task.get.before', this, function(event, context, statusInfo) {
         this.changeStatus('正在加载');
         this.clearTopTitle();
@@ -150,16 +149,16 @@ MarkStatus.prototype.render = function(status) {
 MarkStatus.prototype.status_dom = '<p class="text">\
 <i id="subject-title" style="cursor:pointer"><em id="subject-name"></em></i>\
 <i id="status-title"><em id="status-name" data-i18n-text="mark.loading"></em></i>\
-<i id="library-title" style="display:none" data-i18n-html="mark.library.number">任务编号<em id="library-number"></em></i>\
-<i id="student-title" style="display:none" data-i18n-html="mark.student.number">考生编号<em id="student-number"></em></i>\
-<i id="objective-area" style="display:none" data-i18n-html="mark.objective.score">客观得分<em id="objective-score"></em></i>\
-<i data-i18n-html="mark.marked.count">已评<em id="person-count"></em></i>\
+<i id="library-title" style="display:none"><soan data-i18n-text="mark.library.number">任务编号</span><em id="library-number"></em></i>\
+<i id="student-title" style="display:none"><span data-i18n-text="mark.student.number">考生编号</span><em id="student-number"></em></i>\
+<i id="objective-area" style="display:none"><span data-i18n-text="mark.objective.score">客观得分</span><em id="objective-score"></em></i>\
+<i><span data-i18n-text="mark.marked.count">已评</span><em id="person-count"></em></i>\
 </p>';
 
 MarkStatus.prototype.progress_dom = '<p class="text">\
-<i id="top-count-area" style="display:none" data-i18n-html="mark.top.count">分配<em id="top-count"></em></i>\
-<i data-i18n-html="mark.unmark.count">未评<em id="todo-count"></em></i>\
-<i data-i18n-html="mark.progress">进度<em id="marked-percent"></em></i>\
+<i id="top-count-area" style="display:none"><span data-i18n-text="mark.top.count">分配</span><em id="top-count"></em></i>\
+<i><span data-i18n-text="mark.unmark.count">未评</span><em id="todo-count"></em></i>\
+<i><span data-i18n-text="mark.progress">进度</span><em id="marked-percent"></em></i>\
 </p>';
 
 MarkStatus.prototype.popover_dom = '<div class="warning-popover">\

stmms-web/src/main/webapp/static/mark-new/js/modules/problem-process.js

@@ -10,7 +10,6 @@ function ProblemProcess(option) {
     this.problemTypes =JSON.parse(option.problemTypes);
     this.context = option.markControl.context;
     this.init();
-    loadLanguage() 
     this.markControl.on('task.get.before', this, function(event, context, eventObject) {
         this.task = undefined;
         this.reset();

stmms-web/src/main/webapp/static/mark-new/js/modules/sheet-view.js

@@ -14,7 +14,6 @@ function SheetView(option) {
         this.sheetConfig = [];
     }
     this.init();
-    loadLanguage();
     
     this.markControl.on('task.get.success', this, function(event, context, eventObject) {
         this.render(context.task.sheetUrls);

stmms-web/src/main/webapp/static/mark-new/js/modules/single-image-view.js

@@ -59,7 +59,6 @@ function SingleImageView(option) {
             this.scale = Number(scale);
         }
     });
-    loadLanguage();
 }
 
 SingleImageView.prototype.init = function() {

stmms-web/src/main/webapp/static/mark-new/js/modules/specialTag.js

@@ -11,7 +11,6 @@ function SpecialTag(option) {
     this.show = false;
     this.tagName = undefined;
     this.init();
-    loadLanguage();
     this.markControl.on('task.get.before', this, function(event, context, eventObject) {
         this.task = undefined;
         this.reset();

stmms-web/src/main/webapp/static/mark-new/js/modules/thumbnail.js

@@ -16,7 +16,6 @@ function Thumbnail(option) {
     this.mousePosition = undefined;
 
     this.init();
-    loadLanguage();
     
     this.markControl.on('task.get.before', this, function(event, context, eventObject) {
         this.task = undefined;

stmms-web/src/main/webapp/static/mark-new/js/modules/view-sidebar.js

@@ -9,7 +9,6 @@ function ViewSidebar(option) {
     this.markControl = option.markControl;
     this.list = option.list;
     this.init();
-    loadLanguage();
 }
 
 ViewSidebar.prototype.init = function() {

stmms-web/src/main/webapp/static/mark-new/js/modules/warning-info.js

@@ -9,7 +9,6 @@ function WarningInfo(option) {
     this.option = option;
     this.markControl = option.markControl;
     this.init();
-    loadLanguage();
     var self = this;
 
     this.markControl.on('task.get.success', this, function(event, context, eventObject) {

stmms-web/src/main/webapp/static/mark-track/js/mark-control.js

@@ -657,7 +657,7 @@ MarkControl.prototype.center_dom = '<div class="center-content span12"></div>';
 
 MarkControl.prototype.center_header_dom = '<div class="row-fluid"><div class="header"><p class="tips">\
 <em><a href="##" class="btn" id="switch-common-button" style="display:none" data-i18n-text="mark.mode.common">切换到普通模式</a>\
-<a href="javascript:void(0)" id="assistant-button" class="btn" data-i18n-html="mark.assistant"><i class="icon-wrench"></i> 小助手</a></em>\
+<a href="javascript:void(0)" id="assistant-button" class="btn"><i class="icon-wrench"></i><span data-i18n-text="mark.assistant"> 小助手</span></a></em>\
 <a class="useinfo" href="#"><i class="icon-user icon-white"></i><i id="mark-user-name"></i></a>\
 <a class="logout" id="logout-link" href="{logoutUrl}"><i class="icon-off icon-white"></i> <i id="logout-title" data-i18n-text="user.logout">退出</i></a>\
 </p></div></div>';
@@ -711,23 +711,23 @@ function getDom(content, markControl) {
     if (markControl != undefined && markControl.option.logoutUrl != undefined) {
         content = content.replace(/{logoutUrl}/g, markControl.option.logoutUrl);
     }
-    return $(content);
-}
-
-function isArray(obj) {
-    return obj != undefined && Object.prototype.toString.call(obj) === '[object Array]';
-}
-function loadLanguage() {  
-	$("[data-i18n-value]").each(function() {
+    var result = $(content);
+    result.find("[data-i18n-value]").each(function() {
 		$(this).val($.i18n.prop($(this).data("i18n-value")));
 	});
-	$("[data-i18n-text]").each(function() {
+    result.find("[data-i18n-text]").each(function() {
 		$(this).text($.i18n.prop($(this).data("i18n-text")));
 	});
-	$("[data-i18n-html]").each(function() {
-		$(this).html($.i18n.prop($(this).data("i18n-html")));
-	});
-	$("[data-i18n-placeholder]").each(function() {
+    result.find("[data-i18n-placeholder]").each(function() {
 		$(this).attr('placeholder',$.i18n.prop($(this).data("i18n-placeholder")));
 	});
+    return result;
+}
+
+function isArray(obj) {
+    return obj != undefined && Object.prototype.toString.call(obj) === '[object Array]';
+}
+
+function getMessage(message) { 
+	return $.i18n.prop(message);
 }

stmms-web/src/main/webapp/static/mark-track/js/modules/mark-board.js

@@ -492,7 +492,7 @@ MarkBoard.prototype.onFocusChange = function() {
 }
 
 MarkBoard.prototype.step_board_dom = '<div class="span3 mark-steps"><div class="step-board">\
-    <div class="sublist"><p class="fraction"data-i18n-html="mark.total.score" >总分 <i id="total-score">5</i></p></div>\
+    <div class="sublist"><p class="fraction"><span data-i18n-text="mark.total.score">总分</span> <i id="total-score">5</i></p></div>\
 <div class="button">\
 <input type="submit" value="全零分" class="btn1 all-zero-button" data-i18n-value="mark.score.zero"/>\
 <input type="submit" value="提&nbsp;交" class="btn2 task-submit-button" data-i18n-value="mark.submit"/></div>\