Commit 4b5e96e5 by Ha Jonguk

ウェブ版課題対応中

parent 7c43a4b8
...@@ -21,9 +21,12 @@ div.container ul.addition_list li.check .code { ...@@ -21,9 +21,12 @@ div.container ul.addition_list li.check .code {
div.container ul.addition_list li.read .code { div.container ul.addition_list li.read .code {
background-color: #FF7700; background-color: #FF7700;
} }
div.container ul.addition_list li p.projectName {
font-weight: normal;
font-size: 1.5em;
}
div.container ul.addition_list li p.workContent { div.container ul.addition_list li p.workContent {
font-weight: normal; font-weight: normal;
font-size: 1.5rem;
} }
/* /*
.ui-widget { .ui-widget {
...@@ -174,6 +177,7 @@ header button.addition { ...@@ -174,6 +177,7 @@ header button.addition {
text-align: center; text-align: center;
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
margin: auto; margin: auto;
line-height: 50px;
} }
.headerBar .headerBtn { .headerBar .headerBtn {
......
...@@ -28,7 +28,7 @@ $(document).ready(function() { ...@@ -28,7 +28,7 @@ $(document).ready(function() {
return; return;
} }
document.title = I18N.i18nText('dspHome') + ' | ' + I18N.i18nText('sysAppTitle'); document.title = "ABookCheck" + ' | ' + I18N.i18nText('sysAppTitle');
$('#dspCommunication').click(HOME_CHECK.showCommunicationDialog); $('#dspCommunication').click(HOME_CHECK.showCommunicationDialog);
$('#dspCommunication').show(); $('#dspCommunication').show();
...@@ -576,8 +576,8 @@ HOME_CHECK.renderAddProject = function(post) { ...@@ -576,8 +576,8 @@ HOME_CHECK.renderAddProject = function(post) {
taskInfo.append(codeAndExpiration); taskInfo.append(codeAndExpiration);
taskInfo.append($("<p/>").text(post.projectName)); taskInfo.append($("<p/>", {class: "projectName"}).text(post.projectName));
taskInfo.append($("<p/>", {class: "workContent"}).text(post.projectDescriptions)); taskInfo.append($("<p/>", {class: "workContent"}).html(post.projectDescriptions.replace(/\n/ig, "<br>")));
listLi.append(taskInfo); listLi.append(taskInfo);
...@@ -785,6 +785,7 @@ HOME_CHECK.showPushMessageList = function() { ...@@ -785,6 +785,7 @@ HOME_CHECK.showPushMessageList = function() {
$("#communication").hide(); $("#communication").hide();
$("#recept_push_message").css("top", ($(window).height()-$("#recept_push_message").height())/2); $("#recept_push_message").css("top", ($(window).height()-$("#recept_push_message").height())/2);
$("#recept_push_message").css("left", ($(window).width()-$("#recept_push_message").width())/2); $("#recept_push_message").css("left", ($(window).width()-$("#recept_push_message").width())/2);
$(".new_message_mark").remove();
$("#recept_push_message").show(); $("#recept_push_message").show();
var params = { var params = {
sid : ClientData.userInfo_sid() sid : ClientData.userInfo_sid()
...@@ -795,16 +796,20 @@ HOME_CHECK.showPushMessageList = function() { ...@@ -795,16 +796,20 @@ HOME_CHECK.showPushMessageList = function() {
$.each(data.pushMessageList, function(i, json) { $.each(data.pushMessageList, function(i, json) {
var li = $("<li/>", { style: "height:auto;border-bottom:1px solid black;width:560px;display:inline-block;position:relative;" }); var li = $("<li/>", { style: "height:auto;border-bottom:1px solid black;width:560px;display:inline-block;position:relative;" });
var leftDiv = $("<div/>", { style: "text-align:left;margin: 20px 5px 20px 20px;width:290px;" }); var leftDiv = $("<div/>", { style: "text-align:left;margin: 20px 5px 20px 20px;width:290px;" });
leftDiv.append($("<div/>", { style: "font-size:20px;overflow:hidden;width:100%;margin:10px 0;", title: json.pushMessage }).text(json.pushMessage)); leftDiv.append($("<div/>", { style: "font-size:20px;overflow:hidden;width:100%;margin:10px 0;" }).text(json.pushMessage));
leftDiv.append($("<div/>", { style: "font-size:16px;overflow:hidden;width:100%;" }).text(json.pushSendDate)); leftDiv.append($("<div/>", { style: "font-size:16px;overflow:hidden;width:100%;" }).text(json.pushSendDate));
var rightDiv = $("<div/>", { style: "text-align:right;width:200px;position:absolute;bottom:0;right:20px;" }); var rightDiv = $("<div/>", { style: "text-align:right;width:200px;position:absolute;bottom:0;right:20px;" });
rightDiv.append($("<div/>", { style: "font-size:16px;text-overflow:ellipsis;overflow:hidden;width:100%;white-space:nowrap;" }).text("プロジェクト名")); if (json.projectName) {
rightDiv.append($("<div/>", { style: "font-size:16px;text-overflow:ellipsis;overflow:hidden;width:100%;white-space:nowrap;font-weight:bold;", title: json.projectName }).text(json.projectName)); rightDiv.append($("<div/>", { style: "font-size:16px;text-overflow:ellipsis;overflow:hidden;width:100%;white-space:nowrap;" }).text("プロジェクト名"));
rightDiv.append($("<div/>", { style: "font-size:16px;text-overflow:ellipsis;overflow:hidden;width:100%;white-space:nowrap;margin:10px 0;", title: json.pushSendLoginId }).text("送信者: " + json.pushSendLoginId)); rightDiv.append($("<div/>", { style: "font-size:16px;text-overflow:ellipsis;overflow:hidden;width:100%;white-space:nowrap;font-weight:bold;" }).text(json.projectName));
}
if (json.pushSendLoginId) {
rightDiv.append($("<div/>", { style: "font-size:16px;text-overflow:ellipsis;overflow:hidden;width:100%;white-space:nowrap;margin:10px 0;" }).text("送信者: " + json.pushSendLoginId));
}
li.append(leftDiv); li.append(leftDiv);
li.append(rightDiv); li.append(rightDiv);
if (i < HOME_CHECK.newMessageCnt) { if (i < HOME_CHECK.newMessageCnt) {
li.append($("<p/>", { style: "background-color:red;width:10px;height:10px;border-radius:10px;position:absolute;top:0;left:5px;" })); li.append($("<p/>", { class:"new_message_mark", style: "background-color:red;width:10px;height:10px;border-radius:10px;position:absolute;top:0;left:5px;" }));
} }
$("#recept_push_message_list").append(li); $("#recept_push_message_list").append(li);
}); });
......
...@@ -12,7 +12,7 @@ $(document).ready(function () { ...@@ -12,7 +12,7 @@ $(document).ready(function () {
COMMON.LockScreen(); COMMON.LockScreen();
} }
document.title = I18N.i18nText('dspSetting') + ' | ' + I18N.i18nText('sysAppTitle'); // document.title = I18N.i18nText('dspSetting') + ' | ' + I18N.i18nText('sysAppTitle');
// Set bookmark screen // Set bookmark screen
ClientData.BookmarkScreen(COMMON.ScreenIds.Setting); ClientData.BookmarkScreen(COMMON.ScreenIds.Setting);
...@@ -126,7 +126,7 @@ $(document).ready(function () { ...@@ -126,7 +126,7 @@ $(document).ready(function () {
event of changing language event of changing language
*/ */
function changeLanguageCallBackFunction() { function changeLanguageCallBackFunction() {
document.title = I18N.i18nText('dspSetting') + ' | ' + I18N.i18nText('sysAppTitle'); // document.title = I18N.i18nText('dspSetting') + ' | ' + I18N.i18nText('sysAppTitle');
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment