[Vtigercrm-commits] [vtiger-commits] r10464 - in /vtigercrm/branches/5.0.3: Smarty/templates/ include/js/ include/language/ include/utils/ install/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Sat Mar 17 04:04:21 EDT 2007
Author: saraj
Date: Sat Mar 17 02:04:01 2007
New Revision: 10464
Log:
changes made for alert message. --Minnie
Added:
vtigercrm/branches/5.0.3/Smarty/templates/JsArray.tpl
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl
vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl
vtigercrm/branches/5.0.3/include/js/ajax.js
vtigercrm/branches/5.0.3/include/js/dtlviewajax.js
vtigercrm/branches/5.0.3/include/language/en_us.lang.php
vtigercrm/branches/5.0.3/include/utils/export.php
vtigercrm/branches/5.0.3/install/2setConfig.php
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Sat Mar 17 02:04:01 2007
@@ -463,96 +463,9 @@
<td class="trackerList small"> <a href="index.php?module={$trackelements.module_name}&action=DetailView&record={$trackelements.crmid}">{$trackelements.item_summary}</a> </td><td class="trackerList small"> </td></tr>
{/foreach}
</table>
-</div>
+</div>
+{include file=JsArray.tpl}
<script>
- var alert_arr = {ldelim}DELETE:'{$APP.DELETE_CONFIRMATION}',
- RECORDS:'{$APP.RECORDS}',
- SELECT:'{$APP.SELECT_ATLEAST_ONE}',
- DELETE_ACCOUNT:'{$APP.DELETING_ACCOUNT}',
- DELETE_VENDOR:'{$APP.DELETING_VENDOR}',
- SELECT_MAILID:'{$APP.PLEASE_SELECT_MAILID}',
- OVERWRITE_EXISTING_ACCOUNT1:'{$APP.OVERWRITE_EXISTING_ACCOUNT1}',
- OVERWRITE_EXISTING_ACCOUNT2:'{$APP.OVERWRITE_EXISTING_ACCOUNT2}',
- MISSING_FIELDS:'{$APP.MISSING_FIELDS}',
- NOT_ALLOWED_TO_EDIT:'{$APP.NOT_ALLOWED_TO_EDIT}',
- COLUMNS_CANNOT_BE_EMPTY:'{$APP.COLUMNS_CANNOT_BE_EMPTY}',
- CANNOT_BE_EMPTY:'{$APP.CANNOT_BE_EMPTY}',
- CANNOT_BE_NONE:'{$APP.CANNOT_BE_NONE}',
- ENTER_VALID:'{$APP.ENTER_VALID}',
- SHOULDBE_LESS:'{$APP.SHOULDBE_LESS}',
- SHOULDBE_LESS_EQUAL:'{$APP.SHOULDBE_LESS_EQUAL}',
- SHOULDBE_EQUAL:'{$APP.SHOULDBE_EQUAL}',
- SHOULDBE_GREATER:'{$APP.SHOULDBE_GREATER}',
- SHOULDBE_GREATER_EQUAL:'{$APP.SHOULDBE_GREATER_EQUAL}',
- INVALID:'{$APP.INVALID}',
- EXCEEDS_MAX:'{$APP.EXCEEDS_MAX}',
- OUT_OF_RANGE:'{$APP.OUT_OF_RANGE}',
- SHOULDNOTBE_EQUAL:'{$APP.SHOULDNOTBE_EQUAL}',
- PORTAL_PROVIDE_EMAILID:'{$APP.PORTAL_PROVIDE_EMAILID}',
- ADD_CONFIRMATION:'{$APP.ADD_CONFIRMATION}',
- ADD_CONFIRMATION:'{$APP.ADD_CONFIRMATION}',
- ACCOUNTNAME_CANNOT_EMPTY:'{$APP.ACCOUNTNAME_CANNOT_EMPTY}',
- CANT_SELECT_CONTACTS:'{$APP.CANT_SELECT_CONTACTS}',
- LBL_THIS:'{$APP.LBL_THIS}',
- DOESNOT_HAVE_MAILIDS:'{$APP.DOESNOT_HAVE_MAILIDS}',
- ARE_YOU_SURE:'{$APP.ARE_YOU_SURE}',
- DOESNOT_HAVE_AN_MAILID:'{$APP.DOESNOT_HAVE_AN_MAILID}',
- MISSING_REQUIRED_FIELDS:'{$APP.MISSING_REQUIRED_FIELDS}',
- READONLY:'{$APP.READONLY}',
- SELECT_ATLEAST_ONE_USER:'{$APP.SELECT_ATLEAST_ONE_USER}',
- DISABLE_SHARING_CONFIRMATION:'{$APP.DISABLE_SHARING_CONFIRMATION}',
- USERS:'{$APP.USERS}',
- ENDTIME_GREATER_THAN_STARTTIME:'{$APP.ENDTIME_GREATER_THAN_STARTTIME}',
- FOLLOWUPTIME_GREATER_THAN_STARTTIME:'{$APP.FOLLOWUPTIME_GREATER_THAN_STARTTIME}',
- MISSING_EVENT_NAME:'{$APP.MISSING_EVENT_NAME}',
- EVENT_TYPE_NOT_SELECTED:'{$APP.EVENT_TYPE_NOT_SELECTED}',
- OPPORTUNITYNAME_CANNOT_BE_EMPTY:'{$APP.OPPORTUNITYNAME_CANNOT_BE_EMPTY}',
- CLOSEDATE_CANNOT_BE_EMPTY:'{$APP.CLOSEDATE_CANNOT_BE_EMPTY}',
- SITEURL_CANNOT_BE_EMPTY:'{$APP.SITEURL_CANNOT_BE_EMPTY}',
- SITENAME_CANNOT_BE_EMPTY:'{$APP.SITENAME_CANNOT_BE_EMPTY}',
- LISTPRICE_CANNOT_BE_EMPTY:'{$APP.LISTPRICE_CANNOT_BE_EMPTY}',
- INVALID_LIST_PRICE:'{$APP.INVALID_LIST_PRICE}',
- PROBLEM_ACCESSSING_URL:'{$APP.PROBLEM_ACCESSSING_URL}',
- CODE:'{$APP.CODE}',
- WISH_TO_QUALIFY_MAIL_AS_CONTACT:'{$APP.WISH_TO_QUALIFY_MAIL_AS_CONTACT}',
- SELECT_ATLEAST_ONEMSG_TO_DEL:'{$APP.SELECT_ATLEAST_ONEMSG_TO_DEL}',
- ERROR:'{$APP.ERROR}',
- FIELD_TYPE_NOT_SELECTED:'{$APP.FIELD_TYPE_NOT_SELECTED}',
- SPECIAL_CHARACTERS_NOT_ALLOWED:'{$APP.SPECIAL_CHARACTERS_NOT_ALLOWED}',
- PICKLIST_CANNOT_BE_EMPTY:'{$APP.PICKLIST_CANNOT_BE_EMPTY}',
- DUPLICATE_VALUES_FOUND:'{$APP.DUPLICATE_VALUES_FOUND}',
- DUPLICATE_MAPPING_ACCOUNTS:'{$APP.DUPLICATE_MAPPING_ACCOUNTS}',
- DUPLICATE_MAPPING_CONTACTS:'{$APP.DUPLICATE_MAPPING_CONTACTS}',
- DUPLICATE_MAPPING_POTENTIAL:'{$APP.DUPLICATE_MAPPING_POTENTIAL}',
- ERROR_WHILE_EDITING:'{$APP.ERROR_WHILE_EDITING}',
- CURRENCY_CHANGE_INFO:'{$APP.CURRENCY_CHANGE_INFO}',
- CURRENCY_CONVERSION_INFO:'{$APP.CURRENCY_CONVERSION_INFO}',
- THE_EMAILID:'{$APP.THE_EMAILID}',
- EMAIL_FIELD_INVALID:'{$APP.EMAIL_FIELD_INVALID}',
- MISSING_REPORT_NAME:'{$APP.MISSING_REPORT_NAME}',
- REPORT_NAME_EXISTS:'{$APP.REPORT_NAME_EXISTS}',
- WANT_TO_CHANGE_CONTACT_ADDR:'{$APP.WANT_TO_CHANGE_CONTACT_ADDR}',
- SURE_TO_DELETE:'{$APP.SURE_TO_DELETE}',
- NO_PRODUCT_SELECTED:'{$APP.NO_PRODUCT_SELECTED}',
- VALID_FINAL_PERCENT:'{$APP.VALID_FINAL_PERCENT}',
- VALID_FINAL_AMOUNT:'{$APP.VALID_FINAL_AMOUNT}',
- VALID_SHIPPING_CHARGE:'{$APP.VALID_SHIPPING_CHARGE}',
- VALID_ADJUSTMENT:'{$APP.VALID_ADJUSTMENT}',
- WANT_TO_CONTINUE:'{$APP.WANT_TO_CONTINUE}',
- ENTER_VALID_TAX:'{$APP.ENTER_VALID_TAX}',
- VALID_TAX_NAME:'{$APP.VALID_TAX_NAME}',
- CORRECT_TAX_VALUE:'{$APP.CORRECT_TAX_VALUE}',
- ENTER_POSITIVE_VALUE:'{$APP.ENTER_POSITIVE_VALUE}',
- LABEL_SHOULDNOT_EMPTY:'{$APP.LABEL_SHOULDNOT_EMPTY}',
- NOT_VALID_ENTRY:'{$APP.NOT_VALID_ENTRY}',
- VALID_DISCOUNT_PERCENT:'{$APP.VALID_DISCOUNT_PERCENT}',
- VALID_DISCOUNT_AMOUNT:'{$APP.VALID_DISCOUNT_AMOUNT}',
- SELECT_TEMPLATE_TO_MERGE:'{$APP.SELECT_TEMPLATE_TO_MERGE}',
- SELECTED_MORE_THAN_ONCE:'{$APP.SELECTED_MORE_THAN_ONCE}',
- YES:'{$APP.yes}',
- NO:'{$APP.no}',
- {rdelim};
-
var THandle = document.getElementById("Track_Handle");
var TRoot = document.getElementById("tracker");
Drag.init(THandle, TRoot);
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl Sat Mar 17 02:04:01 2007
@@ -22,6 +22,7 @@
{rdelim}
</script>
+{include file=JsArray.tpl}
<body class="small" marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 bottommargin=0 rightmargin=0>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="mailClient mailClientBg">
<tr>
Modified: vtigercrm/branches/5.0.3/include/js/ajax.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/ajax.js (original)
+++ vtigercrm/branches/5.0.3/include/js/ajax.js Sat Mar 17 02:04:01 2007
@@ -81,7 +81,7 @@
var response = me.callback(me.requester);
break;
default:
- alert(alert_arr.ERROR);
+ alert("Error");
break;
}
}
Modified: vtigercrm/branches/5.0.3/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/dtlviewajax.js (original)
+++ vtigercrm/branches/5.0.3/include/js/dtlviewajax.js Sat Mar 17 02:04:01 2007
@@ -197,7 +197,7 @@
var port_obj = getObj('portal').checked;
if(fieldName == "email" && tagValue == '' && port_obj == true)
{
- alert('Portal user should provide email id for portal login');
+ alert(alert_arr.PORTAL_PROVIDE_EMAILID);
return false;
}
}
@@ -279,7 +279,7 @@
var obj = getObj("email");
if((fieldName == "portal") && (obj.value == ''))
{
- alert("Portal user should provide email Id for portal login");
+ alert(alert_arr.PORTAL_PROVIDE_EMAILID);
return false;
}
Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Sat Mar 17 02:04:01 2007
@@ -810,6 +810,8 @@
'DATABASE_CHANGE_CONFIRMATION' => 'Are you sure to apply the Database Changes from ',
'TO' => ' to ',
'DELETE_RSSFEED_CONFIRMATION' => 'Are you sure to delete the rss feed?',
+'NOT_PERMITTED_TO_EXPORT' => 'you are not permitted to export!',
+
//Added for 5.0.3
'MSG_DEAR'=>'Dear',
'MSG_REGARDING'=>'Regarding',
Modified: vtigercrm/branches/5.0.3/include/utils/export.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/export.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/export.php Sat Mar 17 02:04:01 2007
@@ -32,7 +32,7 @@
require_once('modules/Products/Products.php');
require_once('include/utils/UserInfoUtil.php');
-global $allow_exports;
+global $allow_exports,$app_strings;
session_start();
@@ -60,7 +60,7 @@
?>
<script language=javascript>
- alert("you are not permitted to export!");
+ alert("<?php echo $app_strings['NOT_PERMITTED_TO_EXPORT']?>");
window.location="index.php?module=<?php echo $_REQUEST['module'] ?>&action=index";
</script>
<?php
Modified: vtigercrm/branches/5.0.3/install/2setConfig.php
==============================================================================
--- vtigercrm/branches/5.0.3/install/2setConfig.php (original)
+++ vtigercrm/branches/5.0.3/install/2setConfig.php Sat Mar 17 02:04:01 2007
@@ -27,8 +27,7 @@
// TODO: introduce Apache port as parameters to use non-default value 80
//$web_root = $_SERVER['SERVER_NAME']. ":" .$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF'];
//$web_root = $hostname.$_SERVER['PHP_SELF'];
-//$web_root = $HTTP_SERVER_VARS["HTTP_HOST"] . $HTTP_SERVER_VARS["REQUEST_URI"];
-$web_root = $_ENV["HOSTNAME"] . $HTTP_SERVER_VARS["REQUEST_URI"];
+$web_root = $HTTP_SERVER_VARS["HTTP_HOST"] . $HTTP_SERVER_VARS["REQUEST_URI"];
$web_root = str_replace("/install.php", "", $web_root);
$web_root = "http://".$web_root;
@@ -282,11 +281,11 @@
// Here we decide whether to submit the form.
if (isError == true) {
- alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage);
+ alert("Missing required fields:" + errorMessage);
return false;
}
if (trim(form.admin_email.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.admin_email.value)) {
- alert(alert_arr.THE_EMAILID+form.admin_email.value+alert_arr.EMAIL_FIELD_INVALID);
+ alert("The email id \'"+form.admin_email.value+"\' in the email field is invalid");
form.admin_email.focus();
exit();
}
More information about the vtigercrm-commits
mailing list