Skip to content

C
check
Commit 709e8753 by Masaru Abe
Options

Merge branch 'feature/1.9.2.6_kim-ec' into 'feature/1.9.2.7' 

Feature/1.9.2.6 kim ec

See merge request abook_web/web-viewer!43
parents bb5fe704 112674f4
Showing with 221 additions and 6 deletions
abvw/js/contentview.js
...@@ -3106,6 +3106,32 @@ CONTENTVIEW.ContentPage.prototype.addPageObjects = function (pageObjects) { ...@@ -3106,6 +3106,32 @@ CONTENTVIEW.ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.enquete, obj.enquete,
obj.objectId obj.objectId
); );
}else if(obj.actionType == 22){
pageObj = new CONTENTVIEW_CREATEOBJECT.backToPage(
obj.mediaType,
obj.actionType,
obj.id,
obj.imageUrl,
obj.x,
obj.y,
obj.width,
obj.height,
obj.visible,
obj.objectId
);
}else if(obj.actionType == 23){
pageObj = new CONTENTVIEW_CREATEOBJECT.backToContent(
obj.mediaType,
obj.actionType,
obj.id,
obj.imageUrl,
obj.x,
obj.y,
obj.width,
obj.height,
obj.visible,
obj.objectId
);
} }
break; break;
case 2: case 2:
......
abvw/js/contentview_Anket.js
...@@ -15,6 +15,8 @@ CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) { ...@@ -15,6 +15,8 @@ CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) {
var width = fullscreen == true ? canvas.width : 340; var width = fullscreen == true ? canvas.width : 340;
var anketCommandsKey = canvas.getAttribute('anket-commands');
if (fullscreen == true) { if (fullscreen == true) {
$container.attr('style', 'width:' + width + 'px; left:10px;right:auto;'); $container.attr('style', 'width:' + width + 'px; left:10px;right:auto;');
} }
...@@ -22,6 +24,15 @@ CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) { ...@@ -22,6 +24,15 @@ CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) {
$container.attr('style', 'width:' + width + 'px; right:10px;left:auto;'); // !important $container.attr('style', 'width:' + width + 'px; right:10px;left:auto;'); // !important
} }
if(anketCommandsKey == 'anket-transparent'){
$('#dialog,#dialog iframe,#anket-commands,#anket-commands input').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-transparent');
$('#anket-container').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-transparent-content');
}else if(anketCommandsKey == 'anket-translucent'){
$('#dialog,#dialog iframe,#anket-commands,#anket-commands input,#anket-container').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-translucent');
}else if(anketCommandsKey == 'anket-opacity'){
$('#dialog,#dialog iframe,#anket-commands,#anket-commands input,#anket-container').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-opacity');
}
$container.draggable({ handle: "h1" }); $container.draggable({ handle: "h1" });
$container.html( $container.html(
'<h1>'+I18N.i18nText('txtEnqueteTitle') '<h1>'+I18N.i18nText('txtEnqueteTitle')
...@@ -43,6 +54,8 @@ CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) { ...@@ -43,6 +54,8 @@ CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) {
$container.removeAttr('style'); $container.removeAttr('style');
CONTENTVIEW_GENERAL.hideDialog(); CONTENTVIEW_GENERAL.hideDialog();
//dialog透明解除
$('#dialog,#dialog iframe,#anket-commands,#anket-commands input,#anket-container').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content');
return false; return false;
}, },
...@@ -84,16 +97,19 @@ CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) { ...@@ -84,16 +97,19 @@ CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) {
//set transparent //set transparent
$('#dialog,#dialog iframe,#anket-commands,#anket-commands input').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-transparent'); $('#dialog,#dialog iframe,#anket-commands,#anket-commands input').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-transparent');
$('#anket-container').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-transparent-content'); $('#anket-container').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-transparent-content');
canvas.setAttribute('anket-commands','anket-transparent');
} }
else if ($(this).index() == 1) { else if ($(this).index() == 1) {
// set translucent // set translucent
//END TRB00092 - EDITOR: Long - Date: 09/26/2013 - Summary : Fix opacity //END TRB00092 - EDITOR: Long - Date: 09/26/2013 - Summary : Fix opacity
$('#dialog,#dialog iframe,#anket-commands,#anket-commands input,#anket-container').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-translucent'); $('#dialog,#dialog iframe,#anket-commands,#anket-commands input,#anket-container').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-translucent');
canvas.setAttribute('anket-commands','anket-translucent');
} }
else { else {
//set opacity //set opacity
$('#dialog,#dialog iframe,#anket-commands,#anket-commands input,#anket-container').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-opacity'); $('#dialog,#dialog iframe,#anket-commands,#anket-commands input,#anket-container').removeClass('anket-opacity anket-transparent anket-translucent anket-transparent-content').addClass('anket-opacity');
canvas.setAttribute('anket-commands','anket-opacity');
} }
} }
); );
......
abvw/js/contentview_CreateObjects.js
...@@ -1522,6 +1522,53 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1522,6 +1522,53 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
CONTENTVIEW_CREATEOBJECT.moveToContent.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject(); CONTENTVIEW_CREATEOBJECT.moveToContent.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
//START TRB00033 - EDITOR: Long - Date : 09/12/2013 - Summary : limit content //START TRB00033 - EDITOR: Long - Date : 09/12/2013 - Summary : limit content
/* mediaType = 1 and actionType = 22 backToPage object*/
CONTENTVIEW_CREATEOBJECT.backToPage = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
objectLog.pageNo = CONTENTVIEW_GETDATA.getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
};
};
CONTENTVIEW_CREATEOBJECT.backToPage.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
/* mediaType = 1 and actionType = 23 backToContent object*/
CONTENTVIEW_CREATEOBJECT.backToContent = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
objectLog.pageNo = CONTENTVIEW_GETDATA.getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
};
};
CONTENTVIEW_CREATEOBJECT.backToContent.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg, contentType) { CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg, contentType) {
if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){ if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
......
abvw/js/contentview_GetData.js
...@@ -389,6 +389,26 @@ CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) { ...@@ -389,6 +389,26 @@ CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) {
pageObject["enquete"] = iValueObj.action.enquete; pageObject["enquete"] = iValueObj.action.enquete;
//pageObject["objectId"] = iValueObj.action.objectId; //pageObject["objectId"] = iValueObj.action.objectId;
} }
else if(iValueObj.action.actionType == 22){
/*get mediaInfo */
if (iValueObj.mediaInfo.resourceId) {
/* get image from Json */
pageObject['imageUrl'] = AVWEB.getURL("webResourceDownload") + "&sid=" + CONTENTVIEW.getSessionId() + "&resourceId=" + iValueObj.mediaInfo.resourceId;
} else {
pageObject['imageUrl'] = null;
}
}
else if(iValueObj.action.actionType == 23){
/*get mediaInfo */
if (iValueObj.mediaInfo.resourceId) {
/* get image from Json */
pageObject['imageUrl'] = AVWEB.getURL("webResourceDownload") + "&sid=" + CONTENTVIEW.getSessionId() + "&resourceId=" + iValueObj.mediaInfo.resourceId;
} else {
pageObject['imageUrl'] = null;
}
}
//End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary : //End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
return pageObject; return pageObject;
}; };
......
abvw/js/contentview_Gomu.js
...@@ -44,7 +44,41 @@ CONTENTVIEW_GOMU.Eraser_SetDefaultValue = function() { ...@@ -44,7 +44,41 @@ CONTENTVIEW_GOMU.Eraser_SetDefaultValue = function() {
// Choose type of eraser, and draw to canvas // Choose type of eraser, and draw to canvas
CONTENTVIEW_GOMU.dlgGomu_chooseType = function(typeValue) { CONTENTVIEW_GOMU.dlgGomu_chooseType = function(typeValue) {
var canvas = document.getElementById('dlgGomu_cvMain'); var canvas = document.getElementById('dlgGomu_cvMain');
var gomuLL = document.getElementById('text_dlgGomu_rdo4').getElementsByTagName('img')[0];
var gomuL = document.getElementById('text_dlgGomu_rdo3').getElementsByTagName('img')[0];
var gomuM = document.getElementById('text_dlgGomu_rdo2').getElementsByTagName('img')[0];
var gomuS = document.getElementById('text_dlgGomu_rdo1').getElementsByTagName('img')[0];
switch(typeValue){
case 5:
gomuS.setAttribute("style", "border: 1px solid #ff0000");
gomuM.removeAttribute("style");
gomuL.removeAttribute("style");
gomuLL.removeAttribute("style");
break;
case 12.5:
gomuS.removeAttribute("style");
gomuM.setAttribute("style", "border: 1px solid #ff0000");
gomuL.removeAttribute("style");
gomuLL.removeAttribute("style");
break;
case 25:
gomuS.removeAttribute("style");
gomuM.removeAttribute("style");
gomuL.setAttribute("style", "border: 1px solid #ff0000");
gomuLL.removeAttribute("style");
break;
case 50:
gomuS.removeAttribute("style");
gomuM.removeAttribute("style");
gomuL.removeAttribute("style");
gomuLL.setAttribute("style", "border: 1px solid #ff0000");
break;
}
if (canvas.getContext) { if (canvas.getContext) {
......
abvw/js/contentview_InitObjects.js
...@@ -127,6 +127,7 @@ CONTENTVIEW_INITOBJECT.initPage = function() { ...@@ -127,6 +127,7 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
/* init footer toolbar */ /* init footer toolbar */
$('#footer_toolbar_2').hide(); $('#footer_toolbar_2').hide();
$('#footer_toolbar_1').show(); $('#footer_toolbar_1').show();
$('#control_screen_2').hide();
if(ClientData.isGetitsMode() == true){ if(ClientData.isGetitsMode() == true){
$('#header_toolbar').show(); $('#header_toolbar').show();
} }
......
abvw/js/contentview_Maker.js
...@@ -171,6 +171,40 @@ CONTENTVIEW_MAKER.Maker_chooseType = function(typeValue, color) { ...@@ -171,6 +171,40 @@ CONTENTVIEW_MAKER.Maker_chooseType = function(typeValue, color) {
var fillColor; var fillColor;
CONTENTVIEW_MAKER.maker_Size = typeValue; CONTENTVIEW_MAKER.maker_Size = typeValue;
var canvas = document.getElementById('Maker_cvPreviewmaker'); var canvas = document.getElementById('Maker_cvPreviewmaker');
var markerLL = document.getElementById('marker-oversize-text').getElementsByTagName('img')[0];
var markerL = document.getElementById('marker-large-text').getElementsByTagName('img')[0];
var markerM = document.getElementById('marker-medium-text').getElementsByTagName('img')[0];
var markerS = document.getElementById('marker-small-text').getElementsByTagName('img')[0];
switch(typeValue){
case 5:
markerS.setAttribute("style", "border: 1px solid #ff0000");
markerM.removeAttribute("style");
markerL.removeAttribute("style");
markerLL.removeAttribute("style");
break;
case 12.5:
markerS.removeAttribute("style");
markerM.setAttribute("style", "border: 1px solid #ff0000");
markerL.removeAttribute("style");
markerLL.removeAttribute("style");
break;
case 25:
markerS.removeAttribute("style");
markerM.removeAttribute("style");
markerL.setAttribute("style", "border: 1px solid #ff0000");
markerLL.removeAttribute("style");
break;
case 50:
markerS.removeAttribute("style");
markerM.removeAttribute("style");
markerL.removeAttribute("style");
markerLL.setAttribute("style", "border: 1px solid #ff0000");
break;
}
if(color == null || color == 'undefined'){ if(color == null || color == 'undefined'){
fillColor = "f8ff00"; fillColor = "f8ff00";
......
abvw/js/contentview_Pen.js
...@@ -177,6 +177,40 @@ CONTENTVIEW_PEN.Pen_chooseType = function(typeValue, color) { ...@@ -177,6 +177,40 @@ CONTENTVIEW_PEN.Pen_chooseType = function(typeValue, color) {
var fillColor; var fillColor;
CONTENTVIEW_PEN.pen_Size = typeValue; CONTENTVIEW_PEN.pen_Size = typeValue;
var canvas = document.getElementById('Pen_cvPreviewPen'); var canvas = document.getElementById('Pen_cvPreviewPen');
var penLL = document.getElementById('pen-oversize-text').getElementsByTagName('img')[0];
var penL = document.getElementById('pen-large-text').getElementsByTagName('img')[0];
var penM = document.getElementById('pen-medium-text').getElementsByTagName('img')[0];
var penS = document.getElementById('pen-small-text').getElementsByTagName('img')[0];
switch(typeValue){
case 5:
penS.setAttribute("style", "border: 1px solid #ff0000");
penM.removeAttribute("style");
penL.removeAttribute("style");
penLL.removeAttribute("style");
break;
case 12.5:
penS.removeAttribute("style");
penM.setAttribute("style", "border: 1px solid #ff0000");
penL.removeAttribute("style");
penLL.removeAttribute("style");
break;
case 25:
penS.removeAttribute("style");
penM.removeAttribute("style");
penL.setAttribute("style", "border: 1px solid #ff0000");
penLL.removeAttribute("style");
break;
case 50:
penS.removeAttribute("style");
penM.removeAttribute("style");
penL.removeAttribute("style");
penLL.setAttribute("style", "border: 1px solid #ff0000");
break;
}
if (color == null || color == 'undefined') { if (color == null || color == 'undefined') {
fillColor="#fe0000"; fillColor="#fe0000";
......
abvw/js/login.js
...@@ -367,7 +367,8 @@ LOGIN.changePasswordProcess = function() { ...@@ -367,7 +367,8 @@ LOGIN.changePasswordProcess = function() {
} }
}, function(xhr, b, c) { }, function(xhr, b, c) {
if (xhr.responseText && xhr.status != 0) { if (xhr.responseText && xhr.status != 0) {
$('#dialog-error-message').html(JSON.parse(xhr.responseText).errorMessage); //$('#dialog-error-message').html(JSON.parse(xhr.responseText).errorMessage);
$('#dialog-error-message').html(I18N.i18nText('msgPwdOldWrong'));
$('#dialog-error-message').show(); $('#dialog-error-message').show();
} else { } else {
// Show systemerror // Show systemerror
......
abvw/js/settings.js
...@@ -834,11 +834,13 @@ SETTINGS.avwCmsApi_passwordChange_success = function(data) { ...@@ -834,11 +834,13 @@ SETTINGS.avwCmsApi_passwordChange_success = function(data) {
SETTINGS.avwCmsApi_passwordChange_fail = function(xhr, b, c) { SETTINGS.avwCmsApi_passwordChange_fail = function(xhr, b, c) {
if (xhr.responseText && xhr.status != 0) { if (xhr.responseText && xhr.status != 0) {
/* show error messages */ /* show error messages */
var msgError = $('#dialog-error-message'); //var msgError = $('#dialog-error-message');
//msgError.html(I18N.i18nText('msgPwdChangeNG')); //msgError.html(I18N.i18nText('msgPwdChangeNG'));
msgError.html(JSON.parse(xhr.responseText).errorMessage); //msgError.html(JSON.parse(xhr.responseText).errorMessage);
msgError.show(); //msgError.show();
$('#dialog-error-message').html(I18N.i18nText('msgPwdOldWrong'));
$('#dialog-error-message').show();
} }
else { else {
AVWEB.showSystemError(); AVWEB.showSystemError();
......
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