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!44

abvw/js/contentview.js

@@ -6079,6 +6079,7 @@ CONTENTVIEW.ready = function(initContentId){
                         /* 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();
 
 
                         /* init pos bottom toolbar*/
                         /* init pos bottom toolbar*/
                         CONTENTVIEW_INITOBJECT.initDisplayToolbarDevice();
                         CONTENTVIEW_INITOBJECT.initDisplayToolbarDevice();

abvw/js/contentview_ImagePreview.js

@@ -119,6 +119,7 @@ CONTENTVIEW_IMAGEPREVIEW.optimizeSizeImagePreview = function() {
     
     
     $("#dialog").css('width', maxW + 'px');
     $("#dialog").css('width', maxW + 'px');
     $("#dialog").css('height', maxH + 'px');
     $("#dialog").css('height', maxH + 'px');
+    $("#dialog").css('background-color','black'); 
     
     
     /*
     /*
     if ($("#dialog").width() < maxW || $("#dialog").height() < maxH) {
     if ($("#dialog").width() < maxW || $("#dialog").height() < maxH) {

abvw/js/contentview_InitObjects.js

@@ -565,6 +565,7 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = 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();
 	
 	
     /* init pos bottom toolbar*/
     /* init pos bottom toolbar*/
     CONTENTVIEW_INITOBJECT.initDisplayToolbarDevice();
     CONTENTVIEW_INITOBJECT.initDisplayToolbarDevice();

abvw/js/login.js

@@ -119,7 +119,11 @@ LOGIN.checkDialogValidation = function() {
 	var confirmPass = $('#txtConfirmNew').val();
 	var confirmPass = $('#txtConfirmNew').val();
 	var msgError = $('#dialog-error-message');
 	var msgError = $('#dialog-error-message');
 
 
-	if (!ValidationUtil.CheckRequiredForText(currentPass)) {
+	if (!newPass.match("^(?=.*[a-zA-Z])(?=.*[0-9])")) {
+        isOK = false;
+        msgError.html(I18N.i18nText('msgPwdChangeNG'));
+        msgError.show();
+    }else if (!ValidationUtil.CheckRequiredForText(currentPass)) {
 		LOGIN.login_errorMessage = "";
 		LOGIN.login_errorMessage = "";
 		msgError.html(I18N.i18nText('msgPwdEmpty'));
 		msgError.html(I18N.i18nText('msgPwdEmpty'));
 		msgError.attr('lang', 'msgPwdEmpty');
 		msgError.attr('lang', 'msgPwdEmpty');
@@ -367,8 +371,10 @@ 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(I18N.i18nText('msgPwdOldWrong'));
+			$('#dialog-error-message').html(JSON.parse(xhr.responseText).errorMessage);
+			if(JSON.parse(xhr.responseText).errorMessage == "SC_FORBIDDEN"){
+				$('#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

@@ -738,8 +738,13 @@ SETTINGS.dspOptRes_Click = function(e) {
 SETTINGS.dspPwdUpd1_Click = function(e) {
 SETTINGS.dspPwdUpd1_Click = function(e) {
     e.preventDefault();
     e.preventDefault();
     var isOK = true;
     var isOK = true;
-	var msgError = $('#dialog-error-message');
+    var msgError = $('#dialog-error-message');
     // Check validation
     // Check validation
+    if (!SETTINGS.getNewPassword().match("^(?=.*[a-zA-Z])(?=.*[0-9])")) {
+        isOK = false;
+        msgError.html(I18N.i18nText('msgPwdChangeNG'));
+        msgError.show();
+    }
     if (!ValidationUtil.CheckRequiredForText(SETTINGS.getCurrentPassword())) {
     if (!ValidationUtil.CheckRequiredForText(SETTINGS.getCurrentPassword())) {
         isOK = false;
         isOK = false;
 	    msgError.html(I18N.i18nText('msgPwdEmpty'));
 	    msgError.html(I18N.i18nText('msgPwdEmpty'));
@@ -834,13 +839,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.show();
-
-        $('#dialog-error-message').html(I18N.i18nText('msgPwdOldWrong'));
-        $('#dialog-error-message').show();
+        msgError.html(JSON.parse(xhr.responseText).errorMessage);
+        if(JSON.parse(xhr.responseText).errorMessage == "SC_FORBIDDEN"){
+            msgError.html(I18N.i18nText('msgPwdOldWrong'));
+        }
+        msgError.show();
     }
     }
     else {
     else {
     	AVWEB.showSystemError();
     	AVWEB.showSystemError();