From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 01:36:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 08:36:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7720 - /vtigercrm/trunk/modules/Campaigns/Campaign.php Message-ID: <20060701083600.7B9B062BDAF@vtiger.fosslabs.com> Author: richie Date: Sat Jul 1 02:35:52 2006 New Revision: 7720 Log: sort given for all fields in Campaigns module Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Campaign.php (original) +++ vtigercrm/trunk/modules/Campaigns/Campaign.php Sat Jul 1 02:35:52 2006 @@ -30,7 +30,7 @@ var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_campaign'=>'campaignid','vtiger_campaignscf'=>'campaignid'); var $column_fields = Array(); - var $sortby_fields = Array('campaignname','smownerid','campaigntype','product_id','expectedrevenue','closingdate','campaignstatus','expectedresponse','targetaudience'); + var $sortby_fields = Array('campaignname','smownerid','campaigntype','product_id','expectedrevenue','closingdate','campaignstatus','expectedresponse','targetaudience','expectedcost'); var $list_fields = Array( 'Campaign Name'=>Array('campaign'=>'campaignname'), From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 01:56:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 08:56:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7721 - /vtigercrm/trunk/modules/Reports/ReportRun.php Message-ID: <20060701085636.22C6262BDCF@vtiger.fosslabs.com> Author: richie Date: Sat Jul 1 02:56:32 2006 New Revision: 7721 Log: issue in Invoice Reports has been fixed Modified: vtigercrm/trunk/modules/Reports/ReportRun.php Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Sat Jul 1 02:56:32 2006 @@ -834,6 +834,7 @@ if($secmodule == "Accounts") { $query = "left join vtiger_account on vtiger_account.accountid = vtiger_invoice.accountid + left join vtiger_contactdetails as vtiger_contactdetailsInvoice on vtiger_contactdetailsInvoice.contactid = vtiger_invoice.contactid left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 04:54:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 11:54:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?= =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?= =?utf-8?q?ges_in_codebase?= In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> Message-ID: <085.c1def5ed04da80b9e19ea178894af15b@vtiger.fosslabs.com> #1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase --------------------------+------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dependencies packaging libraries php javascript distributions --------------------------+------------------------------------------------- Comment (by jeffk): (In [7722]) refs #1416. switch DEPENDENCIES.txt from tab-separated to whitespace column aligned. readability is more important than parsing convenience. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 04:54:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 11:54:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7722 - /vtigercrm/trunk/DEPENDENCIES.txt Message-ID: <20060701115433.87F7A7E8AD1@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 05:54:29 2006 New Revision: 7722 Log: refs #1416. switch DEPENDENCIES.txt from tab-separated to whitespace column aligned. readability is more important than parsing convenience. Modified: vtigercrm/trunk/DEPENDENCIES.txt Modified: vtigercrm/trunk/DEPENDENCIES.txt ============================================================================== --- vtigercrm/trunk/DEPENDENCIES.txt (original) +++ vtigercrm/trunk/DEPENDENCIES.txt Sat Jul 1 05:54:29 2006 @@ -1,7 +1,7 @@ -#pkg pkgvers relpath statusmodified statusexternaldep dowloadurl -adodb adodb-4.90 adodb false unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz -FCKeditor FCKeditor-2.2 include/fckeditor true unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar -fpdf fpdf-1.53 include/fpdf true unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz -Image_Canvas Image_Canvas-0.3.0 include/Image true unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz -Image_Color Image_Color-1.0.2 include/Image true unknown http://pear.php.net/get/Image_Color-1.0.2.tgz -Image_Graph Image_Graph-0.7.2 include/Image true unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz +#pkg pkgvers relpath modified extdepok dowloadurl +adodb adodb-4.90 adodb false unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz +FCKeditor FCKeditor-2.2 include/fckeditor true unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar +fpdf fpdf-1.53 include/fpdf true unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz +Image_Canvas Image_Canvas-0.3.0 include/Image true unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz +Image_Color Image_Color-1.0.2 include/Image true unknown http://pear.php.net/get/Image_Color-1.0.2.tgz +Image_Graph Image_Graph-0.7.2 include/Image true unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 04:56:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 11:56:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?= =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?= =?utf-8?q?ges_in_codebase?= In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> Message-ID: <085.00dbe6b0d8bd5a642baca92d97945d93@vtiger.fosslabs.com> #1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase --------------------------+------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dependencies packaging libraries php javascript distributions --------------------------+------------------------------------------------- Comment (by jeffk): (In [7723]) refs #1416. switch DEPENDENCIES.txt from tab-separated to whitespace column aligned. readability is more important than parsing convenience. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 04:56:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 11:56:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7723 - /vtigercrm/branches/4.2/DEPENDENCIES.txt Message-ID: <20060701115631.4CD6B80435B@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 05:56:29 2006 New Revision: 7723 Log: refs #1416. switch DEPENDENCIES.txt from tab-separated to whitespace column aligned. readability is more important than parsing convenience. Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt ============================================================================== --- vtigercrm/branches/4.2/DEPENDENCIES.txt (original) +++ vtigercrm/branches/4.2/DEPENDENCIES.txt Sat Jul 1 05:56:29 2006 @@ -1,7 +1,7 @@ -#pkg pkgvers relpath statusmodified statusexternaldep dowloadurl -adodb adodb-4.90 adodb false unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz -FCKeditor FCKeditor-2.2 include/fckeditor true unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar -fpdf fpdf-1.53 include/fpdf true unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz -Image_Canvas Image_Canvas-0.3.0 include/Image true unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz -Image_Color Image_Color-1.0.2 include/Image true unknown http://pear.php.net/get/Image_Color-1.0.2.tgz -Image_Graph Image_Graph-0.7.2 include/Image true unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz +#pkg pkgvers relpath modified extdepok dowloadurl +adodb adodb-4.90 adodb false unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz +FCKeditor FCKeditor-2.2 include/fckeditor true unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar +fpdf fpdf-1.53 include/fpdf true unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz +Image_Canvas Image_Canvas-0.3.0 include/Image true unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz +Image_Color Image_Color-1.0.2 include/Image true unknown http://pear.php.net/get/Image_Color-1.0.2.tgz +Image_Graph Image_Graph-0.7.2 include/Image true unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 05:01:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 12:01:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?= =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?= =?utf-8?q?ges_in_codebase?= In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> Message-ID: <085.3965391777f4bb062caf2015417de3fb@vtiger.fosslabs.com> #1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase --------------------------+------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dependencies packaging libraries php javascript distributions --------------------------+------------------------------------------------- Comment (by jeffk): (In [7724]) refs #1416. whitespace fix -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 05:01:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 12:01:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7724 - /vtigercrm/trunk/DEPENDENCIES.txt Message-ID: <20060701120130.8F4718208C7@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 06:01:28 2006 New Revision: 7724 Log: refs #1416. whitespace fix Modified: vtigercrm/trunk/DEPENDENCIES.txt Modified: vtigercrm/trunk/DEPENDENCIES.txt ============================================================================== --- vtigercrm/trunk/DEPENDENCIES.txt (original) +++ vtigercrm/trunk/DEPENDENCIES.txt Sat Jul 1 06:01:28 2006 @@ -1,4 +1,4 @@ -#pkg pkgvers relpath modified extdepok dowloadurl +#pkg pkgvers relpath modified extdepok dowloadurl adodb adodb-4.90 adodb false unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz FCKeditor FCKeditor-2.2 include/fckeditor true unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar fpdf fpdf-1.53 include/fpdf true unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 05:01:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 12:01:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?= =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?= =?utf-8?q?ges_in_codebase?= In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> Message-ID: <085.7096596e2ed51e762f1a8b9aab6a099d@vtiger.fosslabs.com> #1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase --------------------------+------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dependencies packaging libraries php javascript distributions --------------------------+------------------------------------------------- Comment (by jeffk): (In [7725]) refs #1416. whitespace fix -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 05:01:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 12:01:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7725 - /vtigercrm/branches/4.2/DEPENDENCIES.txt Message-ID: <20060701120148.B7F848208CB@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 06:01:46 2006 New Revision: 7725 Log: refs #1416. whitespace fix Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt ============================================================================== --- vtigercrm/branches/4.2/DEPENDENCIES.txt (original) +++ vtigercrm/branches/4.2/DEPENDENCIES.txt Sat Jul 1 06:01:46 2006 @@ -1,4 +1,4 @@ -#pkg pkgvers relpath modified extdepok dowloadurl +#pkg pkgvers relpath modified extdepok dowloadurl adodb adodb-4.90 adodb false unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz FCKeditor FCKeditor-2.2 include/fckeditor true unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar fpdf fpdf-1.53 include/fpdf true unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 05:11:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 12:11:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?= =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?= =?utf-8?q?ges_in_codebase?= In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> Message-ID: <085.af464a581f78764193365f06bf0ca38b@vtiger.fosslabs.com> #1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase --------------------------+------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dependencies packaging libraries php javascript distributions --------------------------+------------------------------------------------- Comment (by jeffk): (In [7726]) refs #1416. add column indicating whether library snapshot modifications are known to be necessary for vtigercrm to work properly. some snapshot modifications have been made only to save disk space. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 05:11:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 12:11:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7726 - /vtigercrm/trunk/DEPENDENCIES.txt Message-ID: <20060701121137.4A0228208CB@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 06:11:35 2006 New Revision: 7726 Log: refs #1416. add column indicating whether library snapshot modifications are known to be necessary for vtigercrm to work properly. some snapshot modifications have been made only to save disk space. Modified: vtigercrm/trunk/DEPENDENCIES.txt Modified: vtigercrm/trunk/DEPENDENCIES.txt ============================================================================== --- vtigercrm/trunk/DEPENDENCIES.txt (original) +++ vtigercrm/trunk/DEPENDENCIES.txt Sat Jul 1 06:11:35 2006 @@ -1,7 +1,7 @@ -#pkg pkgvers relpath modified extdepok dowloadurl -adodb adodb-4.90 adodb false unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz -FCKeditor FCKeditor-2.2 include/fckeditor true unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar -fpdf fpdf-1.53 include/fpdf true unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz -Image_Canvas Image_Canvas-0.3.0 include/Image true unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz -Image_Color Image_Color-1.0.2 include/Image true unknown http://pear.php.net/get/Image_Color-1.0.2.tgz -Image_Graph Image_Graph-0.7.2 include/Image true unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz +#pkg pkgvers relpath modified unmodifiedok extdepok dowloadurl +adodb adodb-4.90 adodb false true unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz +FCKeditor FCKeditor-2.2 include/fckeditor true unknown unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar +fpdf fpdf-1.53 include/fpdf true unknown unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz +Image_Canvas Image_Canvas-0.3.0 include/Image true unknown unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz +Image_Color Image_Color-1.0.2 include/Image true unknown unknown http://pear.php.net/get/Image_Color-1.0.2.tgz +Image_Graph Image_Graph-0.7.2 include/Image true unknown unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 05:11:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 12:11:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?= =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?= =?utf-8?q?ges_in_codebase?= In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> Message-ID: <085.696e7919042928b4ba7ce272f3b267cc@vtiger.fosslabs.com> #1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase --------------------------+------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dependencies packaging libraries php javascript distributions --------------------------+------------------------------------------------- Comment (by jeffk): (In [7727]) refs #1416. add column indicating whether library snapshot modifications are known to be necessary for vtigercrm to work properly. some snapshot modifications have been made only to save disk space. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 05:11:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 12:11:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7727 - /vtigercrm/branches/4.2/DEPENDENCIES.txt Message-ID: <20060701121149.86CC883F055@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 06:11:47 2006 New Revision: 7727 Log: refs #1416. add column indicating whether library snapshot modifications are known to be necessary for vtigercrm to work properly. some snapshot modifications have been made only to save disk space. Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt ============================================================================== --- vtigercrm/branches/4.2/DEPENDENCIES.txt (original) +++ vtigercrm/branches/4.2/DEPENDENCIES.txt Sat Jul 1 06:11:47 2006 @@ -1,7 +1,7 @@ -#pkg pkgvers relpath modified extdepok dowloadurl -adodb adodb-4.90 adodb false unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz -FCKeditor FCKeditor-2.2 include/fckeditor true unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar -fpdf fpdf-1.53 include/fpdf true unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz -Image_Canvas Image_Canvas-0.3.0 include/Image true unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz -Image_Color Image_Color-1.0.2 include/Image true unknown http://pear.php.net/get/Image_Color-1.0.2.tgz -Image_Graph Image_Graph-0.7.2 include/Image true unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz +#pkg pkgvers relpath modified unmodifiedok extdepok dowloadurl +adodb adodb-4.90 adodb false true unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz +FCKeditor FCKeditor-2.2 include/fckeditor true unknown unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar +fpdf fpdf-1.53 include/fpdf true unknown unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz +Image_Canvas Image_Canvas-0.3.0 include/Image true unknown unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz +Image_Color Image_Color-1.0.2 include/Image true unknown unknown http://pear.php.net/get/Image_Color-1.0.2.tgz +Image_Graph Image_Graph-0.7.2 include/Image true unknown unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 05:17:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 12:17:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?= =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?= =?utf-8?q?ges_in_codebase?= In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> Message-ID: <085.c12d8ba37b595d459e99ee9c83996ce1@vtiger.fosslabs.com> #1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase --------------------------+------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dependencies packaging libraries php javascript distributions --------------------------+------------------------------------------------- Comment (by jeffk): (In [7728]) refs #1416. remove pkg column, pkgvers contains necessary info -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 05:17:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 12:17:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7728 - /vtigercrm/trunk/DEPENDENCIES.txt Message-ID: <20060701121701.31D5383F0E8@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 06:16:58 2006 New Revision: 7728 Log: refs #1416. remove pkg column, pkgvers contains necessary info Modified: vtigercrm/trunk/DEPENDENCIES.txt Modified: vtigercrm/trunk/DEPENDENCIES.txt ============================================================================== --- vtigercrm/trunk/DEPENDENCIES.txt (original) +++ vtigercrm/trunk/DEPENDENCIES.txt Sat Jul 1 06:16:58 2006 @@ -1,7 +1,7 @@ -#pkg pkgvers relpath modified unmodifiedok extdepok dowloadurl -adodb adodb-4.90 adodb false true unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz -FCKeditor FCKeditor-2.2 include/fckeditor true unknown unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar -fpdf fpdf-1.53 include/fpdf true unknown unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz -Image_Canvas Image_Canvas-0.3.0 include/Image true unknown unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz -Image_Color Image_Color-1.0.2 include/Image true unknown unknown http://pear.php.net/get/Image_Color-1.0.2.tgz -Image_Graph Image_Graph-0.7.2 include/Image true unknown unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz +#pkgvers relpath modified unmodifiedok extdepok dowloadurl +adodb-4.90 adodb false true unknown http://prdownloads.sf.net/adodb/adodb490.tgz +FCKeditor-2.2 include/fckeditor true unknown unknown http://prdownloads.sf.net/fckeditor/FCKeditor-2.2.gz.tar +fpdf-1.53 include/fpdf true unknown unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz +Image_Canvas-0.3.0 include/Image true unknown unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz +Image_Color-1.0.2 include/Image true unknown unknown http://pear.php.net/get/Image_Color-1.0.2.tgz +Image_Graph-0.7.2 include/Image true unknown unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 05:17:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 12:17:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?= =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?= =?utf-8?q?ges_in_codebase?= In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> Message-ID: <085.52cd302d838bf782141ad3d0d175787d@vtiger.fosslabs.com> #1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase --------------------------+------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dependencies packaging libraries php javascript distributions --------------------------+------------------------------------------------- Comment (by jeffk): (In [7729]) refs #1416. remove pkg column, pkgvers contains necessary info -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 05:17:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 12:17:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7729 - /vtigercrm/branches/4.2/DEPENDENCIES.txt Message-ID: <20060701121717.D762083F127@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 06:17:16 2006 New Revision: 7729 Log: refs #1416. remove pkg column, pkgvers contains necessary info Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt ============================================================================== --- vtigercrm/branches/4.2/DEPENDENCIES.txt (original) +++ vtigercrm/branches/4.2/DEPENDENCIES.txt Sat Jul 1 06:17:16 2006 @@ -1,7 +1,7 @@ -#pkg pkgvers relpath modified unmodifiedok extdepok dowloadurl -adodb adodb-4.90 adodb false true unknown http://prdownloads.sourceforge.net/adodb/adodb490.tgz -FCKeditor FCKeditor-2.2 include/fckeditor true unknown unknown http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar -fpdf fpdf-1.53 include/fpdf true unknown unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz -Image_Canvas Image_Canvas-0.3.0 include/Image true unknown unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz -Image_Color Image_Color-1.0.2 include/Image true unknown unknown http://pear.php.net/get/Image_Color-1.0.2.tgz -Image_Graph Image_Graph-0.7.2 include/Image true unknown unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz +#pkgvers relpath modified unmodifiedok extdepok dowloadurl +adodb-4.90 adodb false true unknown http://prdownloads.sf.net/adodb/adodb490.tgz +FCKeditor-2.2 include/fckeditor true unknown unknown http://prdownloads.sf.net/fckeditor/FCKeditor-2.2.gz.tar +fpdf-1.53 include/fpdf true unknown unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz +Image_Canvas-0.3.0 include/Image true unknown unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz +Image_Color-1.0.2 include/Image true unknown unknown http://pear.php.net/get/Image_Color-1.0.2.tgz +Image_Graph-0.7.2 include/Image true unknown unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 09:12:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 16:12:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231417=3A?= =?utf-8?q?_revert_single_log4php_customization=2C_suppresses_logfile_rena?= =?utf-8?q?me_warnings?= Message-ID: <076.05d002837480b7e724ec3b5a33b39530@vtiger.fosslabs.com> #1417: revert single log4php customization, suppresses logfile rename warnings ------------------------------------------------------------------------+--- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: dependencies packaging libraries php logging distributions | ------------------------------------------------------------------------+--- There are two warning suppression customizations in r6036 and r6086. I'm sure they solve some error condition, but I think its worth handling that exception in a catch clause rather than customizing our snapshot of log4php. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 09:15:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 16:15:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231417=3A?= =?utf-8?q?_revert_single_log4php_customization=2C_suppresses_logfile_rena?= =?utf-8?q?me_warnings?= In-Reply-To: <076.05d002837480b7e724ec3b5a33b39530@vtiger.fosslabs.com> References: <076.05d002837480b7e724ec3b5a33b39530@vtiger.fosslabs.com> Message-ID: <085.25953643ca07a869a8b9242f9736d1c6@vtiger.fosslabs.com> #1417: revert single log4php customization, suppresses logfile rename warnings ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dependencies packaging libraries php logging distributions ------------------------+--------------------------------------------------- Comment (by jeffk): (In [7730]) refs #1417. revert log4php customization. warning could be handled in vtigercrm source -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 09:15:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 16:15:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7730 - /vtigercrm/trunk/log4php/appenders/LoggerAppenderRollingFile.php Message-ID: <20060701161553.C17D183F45E@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 10:15:51 2006 New Revision: 7730 Log: refs #1417. revert log4php customization. warning could be handled in vtigercrm source Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderRollingFile.php Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderRollingFile.php ============================================================================== --- vtigercrm/trunk/log4php/appenders/LoggerAppenderRollingFile.php (original) +++ vtigercrm/trunk/log4php/appenders/LoggerAppenderRollingFile.php Sat Jul 1 10:15:51 2006 @@ -134,7 +134,7 @@ $file = $fileName . "." . $i; if (is_readable($file)) { $target = $fileName . '.' . ($i + 1); - @rename($file, $target); + rename($file, $target); } } @@ -144,7 +144,7 @@ $this->closeFile(); // keep windows happy. $file = $fileName; - @rename($file, $target); + rename($file, $target); } $this->setFile($fileName, false); From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 10:38:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 17:38:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231418=3A?= =?utf-8?q?_sync_snapshot_log4php_with_log4php-0=2E9_release_version?= Message-ID: <076.2473072ab7707f013c77822b7812dec4@vtiger.fosslabs.com> #1418: sync snapshot log4php with log4php-0.9 release version ------------------------------------------------------------------------+--- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Keywords: dependencies packaging libraries php logging distributions | ------------------------------------------------------------------------+--- source/vtigercrm/trunk/log4php has been updated in r5729:5720 to include the log4php-0.9 released 2003-12-10. source:vtigercrm/branches/4.2/log4php has an older version, update it to log4php-0.9 Note that in source:vtigercrm/branches/4.2/log4php there are two purposeful changes to the source: {{{ vtigercrm/log4php/LoggerBasicConfigurator.php @@ -59,7 +59,7 @@ $layout = LoggerLayout::factory('LoggerLayoutTTCC'); $appender->setLayout($layout); - $root->addAppender($appender); + $root->addAppender($appender)); } }}} and {{{ --- vtigercrm/log4php/appenders/LoggerAppenderFile.php @@ -26,12 +26,6 @@ require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); require_once(LOG4PHP_DIR . '/LoggerLog.php'); +if (!defined('ROOT_DIR')) define('ROOT_DIR', LOG4PHP_DIR . '/..'); +if (!defined('LOG_READ')) +{ + include(ROOT_DIR . '/config.php'); + define('LOG_READ', $log_readable); +} /** * FileAppender appends log events to a file. * @@ -81,11 +75,6 @@ $fileName = $this->getFile(); LoggerLog::debug("LoggerAppenderFile::activateOptions() opening file '{$fileName}'"); $this->fp = @fopen($fileName, ($this->getAppend()? 'a':'w')); + + // Denying read option for log file. Added for Vulnerability fix + if (is_readable($fileName) and (LOG_READ == 0)) chmod ($fileName,0200); + if (!is_readable($fileName) and (LOG_READ == 1)) chmod ($fileName,0600); + if ($this->fp) { if ($this->getAppend()) fseek($this->fp, 0, SEEK_END); }}} I will commit to update the snapshotted log4php to zero-diff with log4php-0.9. Please feel free to re-commit the above fixes if deemed necessary and worthy of having a local modification to the library. log4php may warrant different snapshot modification procedures, because the releases are so infrequent. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 10:40:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 17:40:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231418=3A?= =?utf-8?q?_sync_snapshot_log4php_with_log4php-0=2E9_release_version?= In-Reply-To: <076.2473072ab7707f013c77822b7812dec4@vtiger.fosslabs.com> References: <076.2473072ab7707f013c77822b7812dec4@vtiger.fosslabs.com> Message-ID: <085.0dd653a8d72cfeaf2596626c18fbf107@vtiger.fosslabs.com> #1418: sync snapshot log4php with log4php-0.9 release version ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: dependencies packaging libraries php logging distributions ------------------------+--------------------------------------------------- Comment (by jeffk): (In [7731]) refs #1418. bring log4php snapshot to zero-diff with log4php-0.9. please reapply two fixes documented in #1418 if deemed necessary. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 10:40:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 17:40:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7731 - in /vtigercrm/branches/4.2/log4php: ./ appenders/ config/ helpers/ layouts/ or/ spi/ varia/ xml/ Message-ID: <20060701174041.2C5A183F6FD@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 11:40:29 2006 New Revision: 7731 Log: refs #1418. bring log4php snapshot to zero-diff with log4php-0.9. please reapply two fixes documented in #1418 if deemed necessary. Modified: vtigercrm/branches/4.2/log4php/Logger.php vtigercrm/branches/4.2/log4php/LoggerAppender.php vtigercrm/branches/4.2/log4php/LoggerAppenderSkeleton.php vtigercrm/branches/4.2/log4php/LoggerBasicConfigurator.php vtigercrm/branches/4.2/log4php/LoggerCategory.php vtigercrm/branches/4.2/log4php/LoggerDefaultCategoryFactory.php vtigercrm/branches/4.2/log4php/LoggerHierarchy.php vtigercrm/branches/4.2/log4php/LoggerLayout.php vtigercrm/branches/4.2/log4php/LoggerLevel.php vtigercrm/branches/4.2/log4php/LoggerLog.php vtigercrm/branches/4.2/log4php/LoggerMDC.php vtigercrm/branches/4.2/log4php/LoggerManager.php vtigercrm/branches/4.2/log4php/LoggerNDC.php vtigercrm/branches/4.2/log4php/LoggerPropertyConfigurator.php vtigercrm/branches/4.2/log4php/LoggerRoot.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderConsole.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderDailyFile.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderDb.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderEcho.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderMail.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderMailEvent.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderNull.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderPhp.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderRollingFile.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderSocket.php vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderSyslog.php vtigercrm/branches/4.2/log4php/config/LoggerPropertyGetter.php vtigercrm/branches/4.2/log4php/config/LoggerPropertySetter.php vtigercrm/branches/4.2/log4php/helpers/LoggerOptionConverter.php vtigercrm/branches/4.2/log4php/helpers/LoggerPatternConverter.php vtigercrm/branches/4.2/log4php/helpers/LoggerPatternParser.php vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutHtml.php vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutSimple.php vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutTTCC.php vtigercrm/branches/4.2/log4php/layouts/LoggerPatternLayout.php vtigercrm/branches/4.2/log4php/layouts/LoggerXmlLayout.php vtigercrm/branches/4.2/log4php/or/LoggerObjectRenderer.php vtigercrm/branches/4.2/log4php/or/LoggerRendererMap.php vtigercrm/branches/4.2/log4php/spi/LoggerConfigurator.php vtigercrm/branches/4.2/log4php/spi/LoggerFactory.php vtigercrm/branches/4.2/log4php/spi/LoggerFilter.php vtigercrm/branches/4.2/log4php/spi/LoggerLocationInfo.php vtigercrm/branches/4.2/log4php/spi/LoggerLoggingEvent.php vtigercrm/branches/4.2/log4php/varia/LoggerDenyAllFilter.php vtigercrm/branches/4.2/log4php/varia/LoggerLevelMatchFilter.php vtigercrm/branches/4.2/log4php/varia/LoggerLevelRangeFilter.php vtigercrm/branches/4.2/log4php/varia/LoggerStringMatchFilter.php vtigercrm/branches/4.2/log4php/xml/LoggerDOMConfigurator.php Modified: vtigercrm/branches/4.2/log4php/Logger.php ============================================================================== --- vtigercrm/branches/4.2/log4php/Logger.php (original) +++ vtigercrm/branches/4.2/log4php/Logger.php Sat Jul 1 11:40:29 2006 @@ -28,7 +28,7 @@ * Main class for logging operations * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.9 $ * @package log4php */ class Logger extends LoggerCategory { Modified: vtigercrm/branches/4.2/log4php/LoggerAppender.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerAppender.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerAppender.php Sat Jul 1 11:40:29 2006 @@ -25,7 +25,7 @@ * Abstract class that defines output logs strategies. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.14 $ * @package log4php * @abstract */ Modified: vtigercrm/branches/4.2/log4php/LoggerAppenderSkeleton.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerAppenderSkeleton.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerAppenderSkeleton.php Sat Jul 1 11:40:29 2006 @@ -35,7 +35,7 @@ * * @author VxR * @author Sergio Strampelli - * @version $Revision: 1.1 $ + * @version $Revision: 1.15 $ * @package log4php * @abstract */ Modified: vtigercrm/branches/4.2/log4php/LoggerBasicConfigurator.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerBasicConfigurator.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerBasicConfigurator.php Sat Jul 1 11:40:29 2006 @@ -33,7 +33,7 @@ *

For XML based configuration see {@link LoggerDOMConfigurator}. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * @package log4php * @since 0.5 */ @@ -59,7 +59,7 @@ $layout = LoggerLayout::factory('LoggerLayoutTTCC'); $appender->setLayout($layout); - $root->addAppender($appender); + $root->addAppender($appender)); } /** @@ -77,4 +77,4 @@ LoggerManager::resetConfiguration(); } } -?> +?> Modified: vtigercrm/branches/4.2/log4php/LoggerCategory.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerCategory.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerCategory.php Sat Jul 1 11:40:29 2006 @@ -30,7 +30,7 @@ * This class has been deprecated and replaced by the Logger subclass. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.17 $ * @package log4php * @see Logger */ Modified: vtigercrm/branches/4.2/log4php/LoggerDefaultCategoryFactory.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerDefaultCategoryFactory.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerDefaultCategoryFactory.php Sat Jul 1 11:40:29 2006 @@ -28,7 +28,7 @@ * Creates instances of {@link Logger} with a given name. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * @package log4php * @since 0.5 */ Modified: vtigercrm/branches/4.2/log4php/LoggerHierarchy.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerHierarchy.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerHierarchy.php Sat Jul 1 11:40:29 2006 @@ -47,7 +47,7 @@ * themselves to the previously created provision node.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.20 $ * @package log4php */ class LoggerHierarchy { Modified: vtigercrm/branches/4.2/log4php/LoggerLayout.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerLayout.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerLayout.php Sat Jul 1 11:40:29 2006 @@ -25,7 +25,7 @@ * Extend this abstract class to create your own log layout format. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.10 $ * @package log4php * @abstract */ Modified: vtigercrm/branches/4.2/log4php/LoggerLevel.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerLevel.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerLevel.php Sat Jul 1 11:40:29 2006 @@ -43,7 +43,7 @@ * level set.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.11 $ * @package log4php * @since 0.5 */ Modified: vtigercrm/branches/4.2/log4php/LoggerLog.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerLog.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerLog.php Sat Jul 1 11:40:29 2006 @@ -29,7 +29,7 @@ *

You need to recode methods to output messages in a different way.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.9 $ * @package log4php */ class LoggerLog { Modified: vtigercrm/branches/4.2/log4php/LoggerMDC.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerMDC.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerMDC.php Sat Jul 1 11:40:29 2006 @@ -45,7 +45,7 @@ *

The MDC is managed on a per thread basis. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.4 $ * @since 0.3 * @package log4php */ Modified: vtigercrm/branches/4.2/log4php/LoggerManager.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerManager.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerManager.php Sat Jul 1 11:40:29 2006 @@ -32,7 +32,7 @@ * Use the LoggerManager to get Logger instances. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.18 $ * @package log4php * @see Logger * @todo create a configurator selector Modified: vtigercrm/branches/4.2/log4php/LoggerNDC.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerNDC.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerNDC.php Sat Jul 1 11:40:29 2006 @@ -91,7 +91,7 @@ * * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.5 $ * @package log4php * @since 0.3 */ Modified: vtigercrm/branches/4.2/log4php/LoggerPropertyConfigurator.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerPropertyConfigurator.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerPropertyConfigurator.php Sat Jul 1 11:40:29 2006 @@ -85,7 +85,7 @@ * for details.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.6 $ * @package log4php * @since 0.5 */ @@ -336,16 +336,13 @@ */ function doConfigureProperties($properties, &$hierarchy) { - if(array_key_exists(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY, $properties)) - $value = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY]; - + $value = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY]; + if (!empty($value)) { LoggerLog::internalDebugging(LoggerOptionConverter::toBoolean($value, LoggerLog::internalDebugging())); } - $thresholdStr = null; - if(array_key_exists(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX, $properties)) - $thresholdStr = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX]; + $thresholdStr = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX]; $hierarchy->setThreshold(LoggerOptionConverter::toLevel($thresholdStr, LoggerLevel::getLevelAll())); $this->configureRootCategory($properties, $hierarchy); @@ -376,8 +373,7 @@ */ function configureLoggerFactory($props) { - if(array_key_exists(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY, $props)) - $factoryFqcn = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY]; + $factoryFqcn = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY]; if(!empty($factoryFqcn)) { $factoryClassName = basename($factoryFqcn); LoggerLog::debug( Modified: vtigercrm/branches/4.2/log4php/LoggerRoot.php ============================================================================== --- vtigercrm/branches/4.2/log4php/LoggerRoot.php (original) +++ vtigercrm/branches/4.2/log4php/LoggerRoot.php Sat Jul 1 11:40:29 2006 @@ -30,7 +30,7 @@ * The root logger. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.9 $ * @package log4php * @see Logger */ Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderConsole.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderConsole.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderConsole.php Sat Jul 1 11:40:29 2006 @@ -40,7 +40,7 @@ *

This appender requires a layout.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.11 $ * @package log4php * @subpackage appenders */ Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderDailyFile.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderDailyFile.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderDailyFile.php Sat Jul 1 11:40:29 2006 @@ -34,7 +34,7 @@ * before {@link $file} param.

* * @author Abel Gonzalez - * @version $Revision: 1.1 $ + * @version $Revision: 1.7 $ * @package log4php * @subpackage appenders */ Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderDb.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderDb.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderDb.php Sat Jul 1 11:40:29 2006 @@ -35,7 +35,7 @@ *

See examples in test directory.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.7 $ * @package log4php * @subpackage appenders * @since 0.3 Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderEcho.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderEcho.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderEcho.php Sat Jul 1 11:40:29 2006 @@ -33,7 +33,7 @@ *

This appender requires a layout.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.5 $ * @package log4php * @subpackage appenders */ Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php Sat Jul 1 11:40:29 2006 @@ -26,12 +26,6 @@ require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); require_once(LOG4PHP_DIR . '/LoggerLog.php'); -if (!defined('ROOT_DIR')) define('ROOT_DIR', LOG4PHP_DIR . '/..'); -if (!defined('LOG_READ')) -{ - include(ROOT_DIR . '/config.php'); - define('LOG_READ', $log_readable); -} /** * FileAppender appends log events to a file. * @@ -39,7 +33,7 @@ * {@link $append}. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.15 $ * @package log4php * @subpackage appenders */ @@ -81,11 +75,6 @@ $fileName = $this->getFile(); LoggerLog::debug("LoggerAppenderFile::activateOptions() opening file '{$fileName}'"); $this->fp = @fopen($fileName, ($this->getAppend()? 'a':'w')); - - // Denying read option for log file. Added for Vulnerability fix - if (is_readable($fileName) and (LOG_READ == 0)) chmod ($fileName,0200); - if (!is_readable($fileName) and (LOG_READ == 1)) chmod ($fileName,0600); - if ($this->fp) { if ($this->getAppend()) fseek($this->fp, 0, SEEK_END); @@ -188,4 +177,4 @@ } } } -?> +?> Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderMail.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderMail.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderMail.php Sat Jul 1 11:40:29 2006 @@ -32,7 +32,7 @@ *

This appender requires a layout.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.8 $ * @package log4php * @subpackage appenders */ Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderMailEvent.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderMailEvent.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderMailEvent.php Sat Jul 1 11:40:29 2006 @@ -40,7 +40,7 @@ * * @author Domenico Lordi * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.10 $ * @package log4php * @subpackage appenders */ Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderNull.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderNull.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderNull.php Sat Jul 1 11:40:29 2006 @@ -29,7 +29,7 @@ * A NullAppender merely exists, it never outputs a message to any device. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.4 $ * @package log4php * @subpackage appenders */ Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderPhp.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderPhp.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderPhp.php Sat Jul 1 11:40:29 2006 @@ -35,7 +35,7 @@ * - level >= ERROR mapped to E_USER_ERROR * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.11 $ * @package log4php * @subpackage appenders */ Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderRollingFile.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderRollingFile.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderRollingFile.php Sat Jul 1 11:40:29 2006 @@ -33,7 +33,7 @@ *

Contributors: Sergio Strampelli.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.14 $ * @package log4php * @subpackage appenders */ @@ -236,4 +236,4 @@ } } } -?> +?> Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderSocket.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderSocket.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderSocket.php Sat Jul 1 11:40:29 2006 @@ -37,7 +37,7 @@ * {@link $locationInfo}, {@link $useXml} and {@link $log4jNamespace}. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.17 $ * @package log4php * @subpackage appenders */ Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderSyslog.php ============================================================================== --- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderSyslog.php (original) +++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderSyslog.php Sat Jul 1 11:40:29 2006 @@ -37,7 +37,7 @@ * - INFO > level >= DEBUG to LOG_DEBUG * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.11 $ * @package log4php * @subpackage appenders */ Modified: vtigercrm/branches/4.2/log4php/config/LoggerPropertyGetter.php ============================================================================== --- vtigercrm/branches/4.2/log4php/config/LoggerPropertyGetter.php (original) +++ vtigercrm/branches/4.2/log4php/config/LoggerPropertyGetter.php Sat Jul 1 11:40:29 2006 @@ -24,7 +24,7 @@ /** * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * @package log4php * @subpackage config * @since 0.5 Modified: vtigercrm/branches/4.2/log4php/config/LoggerPropertySetter.php ============================================================================== --- vtigercrm/branches/4.2/log4php/config/LoggerPropertySetter.php (original) +++ vtigercrm/branches/4.2/log4php/config/LoggerPropertySetter.php Sat Jul 1 11:40:29 2006 @@ -46,7 +46,7 @@ * if such methods exist. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.4 $ * @package log4php * @subpackage config * @since 0.5 Modified: vtigercrm/branches/4.2/log4php/helpers/LoggerOptionConverter.php ============================================================================== --- vtigercrm/branches/4.2/log4php/helpers/LoggerOptionConverter.php (original) +++ vtigercrm/branches/4.2/log4php/helpers/LoggerOptionConverter.php Sat Jul 1 11:40:29 2006 @@ -33,7 +33,7 @@ * A convenience class to convert property values to specific types. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.6 $ * @package log4php * @subpackage helpers * @static Modified: vtigercrm/branches/4.2/log4php/helpers/LoggerPatternConverter.php ============================================================================== --- vtigercrm/branches/4.2/log4php/helpers/LoggerPatternConverter.php (original) +++ vtigercrm/branches/4.2/log4php/helpers/LoggerPatternConverter.php Sat Jul 1 11:40:29 2006 @@ -43,7 +43,7 @@ * converting a logging event in a converter specific manner.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.13 $ * @package log4php * @subpackage helpers * @abstract Modified: vtigercrm/branches/4.2/log4php/helpers/LoggerPatternParser.php ============================================================================== --- vtigercrm/branches/4.2/log4php/helpers/LoggerPatternParser.php (original) +++ vtigercrm/branches/4.2/log4php/helpers/LoggerPatternParser.php Sat Jul 1 11:40:29 2006 @@ -75,7 +75,7 @@ * a chained list of {@link LoggerPatternConverter} converters.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.10 $ * @package log4php * @subpackage helpers * Modified: vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutHtml.php ============================================================================== --- vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutHtml.php (original) +++ vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutHtml.php Sat Jul 1 11:40:29 2006 @@ -47,7 +47,7 @@ * Parameters are: {@link $title}, {@link $locationInfo}. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.14 $ * @package log4php * @subpackage layouts */ Modified: vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutSimple.php ============================================================================== --- vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutSimple.php (original) +++ vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutSimple.php Sat Jul 1 11:40:29 2006 @@ -47,7 +47,7 @@ * INFO - "A message" * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.8 $ * @package log4php * @subpackage layouts */ Modified: vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutTTCC.php ============================================================================== --- vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutTTCC.php (original) +++ vtigercrm/branches/4.2/log4php/layouts/LoggerLayoutTTCC.php Sat Jul 1 11:40:29 2006 @@ -70,7 +70,7 @@ * - {@link $dateFormat} (string) set date format. See php {@link PHP_MANUAL#date} function for details. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.12 $ * @package log4php * @subpackage layouts */ Modified: vtigercrm/branches/4.2/log4php/layouts/LoggerPatternLayout.php ============================================================================== --- vtigercrm/branches/4.2/log4php/layouts/LoggerPatternLayout.php (original) +++ vtigercrm/branches/4.2/log4php/layouts/LoggerPatternLayout.php Sat Jul 1 11:40:29 2006 @@ -152,7 +152,7 @@ * * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.7 $ * @package log4php * @subpackage layouts * @since 0.3 Modified: vtigercrm/branches/4.2/log4php/layouts/LoggerXmlLayout.php ============================================================================== --- vtigercrm/branches/4.2/log4php/layouts/LoggerXmlLayout.php (original) +++ vtigercrm/branches/4.2/log4php/layouts/LoggerXmlLayout.php Sat Jul 1 11:40:29 2006 @@ -44,7 +44,7 @@ * a correct XML file.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.16 $ * @package log4php * @subpackage layouts */ Modified: vtigercrm/branches/4.2/log4php/or/LoggerObjectRenderer.php ============================================================================== --- vtigercrm/branches/4.2/log4php/or/LoggerObjectRenderer.php (original) +++ vtigercrm/branches/4.2/log4php/or/LoggerObjectRenderer.php Sat Jul 1 11:40:29 2006 @@ -26,7 +26,7 @@ * Subclass this abstract class in order to render objects as strings. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.3 $ * @package log4php * @subpackage or * @abstract Modified: vtigercrm/branches/4.2/log4php/or/LoggerRendererMap.php ============================================================================== --- vtigercrm/branches/4.2/log4php/or/LoggerRendererMap.php (original) +++ vtigercrm/branches/4.2/log4php/or/LoggerRendererMap.php Sat Jul 1 11:40:29 2006 @@ -32,7 +32,7 @@ * Map class objects to an {@link LoggerObjectRenderer}. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.4 $ * @package log4php * @subpackage or * @since 0.3 Modified: vtigercrm/branches/4.2/log4php/spi/LoggerConfigurator.php ============================================================================== --- vtigercrm/branches/4.2/log4php/spi/LoggerConfigurator.php (original) +++ vtigercrm/branches/4.2/log4php/spi/LoggerConfigurator.php Sat Jul 1 11:40:29 2006 @@ -40,7 +40,7 @@ * Implemented by classes capable of configuring log4php using a URL. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * @package log4php * @subpackage spi * @since 0.5 Modified: vtigercrm/branches/4.2/log4php/spi/LoggerFactory.php ============================================================================== --- vtigercrm/branches/4.2/log4php/spi/LoggerFactory.php (original) +++ vtigercrm/branches/4.2/log4php/spi/LoggerFactory.php Sat Jul 1 11:40:29 2006 @@ -29,7 +29,7 @@ * {@link Logger} or a sub-class of {@link Logger}. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.3 $ * @package log4php * @subpackage spi * @since 0.5 Modified: vtigercrm/branches/4.2/log4php/spi/LoggerFilter.php ============================================================================== --- vtigercrm/branches/4.2/log4php/spi/LoggerFilter.php (original) +++ vtigercrm/branches/4.2/log4php/spi/LoggerFilter.php Sat Jul 1 11:40:29 2006 @@ -73,7 +73,7 @@ * Linux ipchains. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.4 $ * @package log4php * @subpackage spi */ Modified: vtigercrm/branches/4.2/log4php/spi/LoggerLocationInfo.php ============================================================================== --- vtigercrm/branches/4.2/log4php/spi/LoggerLocationInfo.php (original) +++ vtigercrm/branches/4.2/log4php/spi/LoggerLocationInfo.php Sat Jul 1 11:40:29 2006 @@ -33,7 +33,7 @@ * The internal representation of caller location information. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.5 $ * @package log4php * @subpackage spi * @since 0.3 Modified: vtigercrm/branches/4.2/log4php/spi/LoggerLoggingEvent.php ============================================================================== --- vtigercrm/branches/4.2/log4php/spi/LoggerLoggingEvent.php (original) +++ vtigercrm/branches/4.2/log4php/spi/LoggerLoggingEvent.php Sat Jul 1 11:40:29 2006 @@ -33,7 +33,7 @@ * The internal representation of logging event. * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.16 $ * @package log4php * @subpackage spi */ Modified: vtigercrm/branches/4.2/log4php/varia/LoggerDenyAllFilter.php ============================================================================== --- vtigercrm/branches/4.2/log4php/varia/LoggerDenyAllFilter.php (original) +++ vtigercrm/branches/4.2/log4php/varia/LoggerDenyAllFilter.php Sat Jul 1 11:40:29 2006 @@ -35,7 +35,7 @@ * behaviour.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.4 $ * @package log4php * @subpackage varia * @since 0.3 Modified: vtigercrm/branches/4.2/log4php/varia/LoggerLevelMatchFilter.php ============================================================================== --- vtigercrm/branches/4.2/log4php/varia/LoggerLevelMatchFilter.php (original) +++ vtigercrm/branches/4.2/log4php/varia/LoggerLevelMatchFilter.php Sat Jul 1 11:40:29 2006 @@ -40,7 +40,7 @@ * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * @package log4php * @subpackage varia * @since 0.6 Modified: vtigercrm/branches/4.2/log4php/varia/LoggerLevelRangeFilter.php ============================================================================== --- vtigercrm/branches/4.2/log4php/varia/LoggerLevelRangeFilter.php (original) +++ vtigercrm/branches/4.2/log4php/varia/LoggerLevelRangeFilter.php Sat Jul 1 11:40:29 2006 @@ -58,7 +58,7 @@ * @log4j-author based on code by Ceki Gülcü * * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * @package log4php * @subpackage varia * @since 0.6 Modified: vtigercrm/branches/4.2/log4php/varia/LoggerStringMatchFilter.php ============================================================================== --- vtigercrm/branches/4.2/log4php/varia/LoggerStringMatchFilter.php (original) +++ vtigercrm/branches/4.2/log4php/varia/LoggerStringMatchFilter.php Sat Jul 1 11:40:29 2006 @@ -39,7 +39,7 @@ * is returned.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.4 $ * @package log4php * @subpackage varia * @since 0.3 Modified: vtigercrm/branches/4.2/log4php/xml/LoggerDOMConfigurator.php ============================================================================== --- vtigercrm/branches/4.2/log4php/xml/LoggerDOMConfigurator.php (original) +++ vtigercrm/branches/4.2/log4php/xml/LoggerDOMConfigurator.php Sat Jul 1 11:40:29 2006 @@ -77,7 +77,7 @@ * subdirectories.

* * @author VxR - * @version $Revision: 1.1 $ + * @version $Revision: 1.12 $ * @package log4php * @subpackage xml * @since 0.4 From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 10:44:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 17:44:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?= =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?= =?utf-8?q?ges_in_codebase?= In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> Message-ID: <085.86b2a225486c98775777f4375c84ec4b@vtiger.fosslabs.com> #1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase --------------------------+------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dependencies packaging libraries php javascript distributions --------------------------+------------------------------------------------- Comment (by jeffk): (In [7732]) refs #1416. add log4php to DEPENDENCIES.txt -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 10:44:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 17:44:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7732 - /vtigercrm/trunk/DEPENDENCIES.txt Message-ID: <20060701174446.7C69583F768@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 11:44:44 2006 New Revision: 7732 Log: refs #1416. add log4php to DEPENDENCIES.txt Modified: vtigercrm/trunk/DEPENDENCIES.txt Modified: vtigercrm/trunk/DEPENDENCIES.txt ============================================================================== --- vtigercrm/trunk/DEPENDENCIES.txt (original) +++ vtigercrm/trunk/DEPENDENCIES.txt Sat Jul 1 11:44:44 2006 @@ -5,3 +5,4 @@ Image_Canvas-0.3.0 include/Image true unknown unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz Image_Color-1.0.2 include/Image true unknown unknown http://pear.php.net/get/Image_Color-1.0.2.tgz Image_Graph-0.7.2 include/Image true unknown unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz +log4php-0.9 log4php false true unknown http://www.vxr.it/log4php/log4php-0.9.tar.gz From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 10:45:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 17:45:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?= =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?= =?utf-8?q?ges_in_codebase?= In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com> Message-ID: <085.9ed634c3b72570689528fcfa212e3bfe@vtiger.fosslabs.com> #1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase --------------------------+------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dependencies packaging libraries php javascript distributions --------------------------+------------------------------------------------- Comment (by jeffk): (In [7733]) refs #1416. add log4php to DEPENDENCIES.txt -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 1 10:45:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Jul 2006 17:45:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7733 - /vtigercrm/branches/4.2/DEPENDENCIES.txt Message-ID: <20060701174509.22DB583F784@vtiger.fosslabs.com> Author: jeffk Date: Sat Jul 1 11:45:07 2006 New Revision: 7733 Log: refs #1416. add log4php to DEPENDENCIES.txt Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt ============================================================================== --- vtigercrm/branches/4.2/DEPENDENCIES.txt (original) +++ vtigercrm/branches/4.2/DEPENDENCIES.txt Sat Jul 1 11:45:07 2006 @@ -5,3 +5,4 @@ Image_Canvas-0.3.0 include/Image true unknown unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz Image_Color-1.0.2 include/Image true unknown unknown http://pear.php.net/get/Image_Color-1.0.2.tgz Image_Graph-0.7.2 include/Image true unknown unknown http://pear.php.net/get/Image_Graph-0.7.2.tgz +log4php-0.9 log4php false true unknown http://www.vxr.it/log4php/log4php-0.9.tar.gz From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 13:39:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 20:39:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231419=3A?= =?utf-8?q?_Parse_error=3A_syntax_error=2C_unexpected_=27=3B=27_in_user=5F?= =?utf-8?q?privileges/user=5Fprivileges=5F0=2Ephp_on_line_13?= Message-ID: <076.5f338eee0df8aa130a538fcf553615d5@vtiger.fosslabs.com> #1419: Parse error: syntax error, unexpected ';' in user_privileges/user_privileges_0.php on line 13 ---------------------------------------+------------------------------------ Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: install parse permissions | ---------------------------------------+------------------------------------ Running an install with demo data population as of r7732, postgresql, newly created database, not created by installer script. At stage 5 of 5, error message is generated: {{{ Creating Core tables: Tables Successfully created. Parse error: syntax error, unexpected ';' in user_privileges/user_privileges_0.php on line 13 }}} contents of file user_privileges/user_privileges_0.php: {{{ '','address_postalcode'=>'','address_state'=>'','address_city'=>'','address_street'=>'','description'=>'','signature'=>'','tagcloud'=>'','date_format'=>'','imagename'=>'','phone_home'=>'','yahoo_id'=>'','phone_fax'=>'','email2'=>'','phone_other'=>'','reports_to_id'=>'','phone_mobile'=>'','department'=>'','phone_work'=>'','title'=>'','start_hour'=>'','end_hour'=>'','hour_format'=>'','currency_id'=>'','lead_view'=>'','activity_view'=>'','status'=>'','email1'=>'','roleid'=>'','last_name'=>'','first_name'=>'','confirm_password'=>'','user_password'=>'','is_admin'=>'','user_name'=>'','id'=>'0'); }}} -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Jul 1 15:07:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Jul 2006 22:07:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231420=3A?= =?utf-8?q?_XTemplate_xtpl=2Ephp_may_be_able_to_be_removed=2C_customized_v?= =?utf-8?q?ersion_of_XTemplate-0=2E2=2E4-3?= Message-ID: <076.ff360e3ef9ea7556aed657294a248528@vtiger.fosslabs.com> #1420: XTemplate xtpl.php may be able to be removed, customized version of XTemplate-0.2.4-3 ---------------------------------------------------------------------------+ Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: dependencies packaging libraries php templating distributions | ---------------------------------------------------------------------------+ Not sure how pervasive the switch to Smarty templating is at this time, but this ticket identifies the remaining uses of XTemplate's xtpl.php. I looked for the version of XTemplate snapshotted for the source:vtigercrm/DEPENDENCIES.txt list described in #1416. From what I can tell, the bundled xtpl.php is from XTemplate-0.2.4-3.tar.gz, with heavy customizations by SugarCRM between its release date of 2001-03-26 and 2004-10-06: {{{ $Log: xtpl.php,v $ Revision 1.2 2004/10/06 09:02:02 jack * Modifications made for 3.0 Beta Features Revision 1.8 2004/08/26 00:43:37 sugarmsi added an exists method to check if a block exists in a template Revision 1.7 2004/08/08 09:28:36 sugarjacob Fix: XTemplate changed to use vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Jul 2 22:11:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 05:11:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23890=3A_?= =?utf-8?q?Email_popup_issue?= In-Reply-To: <076.af87ee9fab4462c5b5f953df35dd36b6@vtiger.fosslabs.com> References: <076.af87ee9fab4462c5b5f953df35dd36b6@vtiger.fosslabs.com> Message-ID: <085.7ce29157ff11ba8480c8336c7d50f4f6@vtiger.fosslabs.com> #890: Email popup issue ------------------------+--------------------------------------------------- Reporter: mickie | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Jul 2 22:12:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 05:12:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231184=3A?= =?utf-8?q?_system_configuration_page_needs_css_implementation?= In-Reply-To: <076.147d86285bbc713c647806428425b67d@vtiger.fosslabs.com> References: <076.147d86285bbc713c647806428425b67d@vtiger.fosslabs.com> Message-ID: <085.a97d833f1e1d1ca32829f67a50ef03f3@vtiger.fosslabs.com> #1184: system configuration page needs css implementation ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Jul 2 22:15:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 05:15:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231387=3A?= =?utf-8?q?_ALL_Menu_layer_showing_inconsistent_border_lines=2E?= In-Reply-To: <076.d418171c6cb5f98dec1db7b9af0277d5@vtiger.fosslabs.com> References: <076.d418171c6cb5f98dec1db7b9af0277d5@vtiger.fosslabs.com> Message-ID: <085.bbfc710b690fef3091195e5a07db0f5c@vtiger.fosslabs.com> #1387: ALL Menu layer showing inconsistent border lines. ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Jul 2 22:15:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 05:15:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23473=3A_?= =?utf-8?q?Legend_missing_in_Organisation_Sharing_Privileges?= In-Reply-To: <076.82f3a4ce36a4b9d8059cadb927004fb9@vtiger.fosslabs.com> References: <076.82f3a4ce36a4b9d8059cadb927004fb9@vtiger.fosslabs.com> Message-ID: <085.ba4a6457e4f560c57fb062d11d8e0159@vtiger.fosslabs.com> #473: Legend missing in Organisation Sharing Privileges ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Jul 2 22:16:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 05:16:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23515=3A_?= =?utf-8?q?Organisation_Sharing_Privileges_UI_Issue?= In-Reply-To: <076.f0e39bafb1f5481a041bf921297f9af2@vtiger.fosslabs.com> References: <076.f0e39bafb1f5481a041bf921297f9af2@vtiger.fosslabs.com> Message-ID: <085.c636accf9df4ce7cb55d7fc24b8ead10@vtiger.fosslabs.com> #515: Organisation Sharing Privileges UI Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * resolution: => duplicate * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sun Jul 2 23:21:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Jul 2006 06:21:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7734 - in /vtigercrm/trunk: Popup.php Smarty/templates/Popup.tpl modules/Emails/Email.php Message-ID: <20060703062104.4AA0A16749C@vtiger.fosslabs.com> Author: richie Date: Mon Jul 3 00:20:57 2006 New Revision: 7734 Log: issue in Popup has been fixed Modified: vtigercrm/trunk/Popup.php vtigercrm/trunk/Smarty/templates/Popup.tpl vtigercrm/trunk/modules/Emails/Email.php Modified: vtigercrm/trunk/Popup.php ============================================================================== --- vtigercrm/trunk/Popup.php (original) +++ vtigercrm/trunk/Popup.php Mon Jul 3 00:20:57 2006 @@ -205,6 +205,11 @@ } else { + if(isset($_REQUEST['recordid']) && $_REQUEST['recordid'] != '') + { + $smarty->assign("RECORDID",$_REQUEST['recordid']); + $url_string .='&recordid='.$_REQUEST['recordid']; + } $where_relquery = getRelCheckquery($currentModule,$_REQUEST['return_module'],$_REQUEST['recordid']); $query = getListQuery($currentModule,$where_relquery); } @@ -280,6 +285,8 @@ $url_string .='&popuptype='.$popuptype; if(isset($_REQUEST['select']) && $_REQUEST['select'] == 'enable') $url_string .='&select=enable'; +if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != '') + $url_string .='&return_module='.$_REQUEST['return_module']; $listview_header_search=getSearchListHeaderValues($focus,"$currentModule",$url_string,$sorder,$order_by); $smarty->assign("SEARCHLISTHEADER", $listview_header_search); Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Popup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Popup.tpl Mon Jul 3 00:20:57 2006 @@ -18,7 +18,6 @@ -{/literal} Modified: vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Mon Jul 3 10:20:18 2006 @@ -13,7 +13,7 @@ - + @@ -56,7 +56,7 @@ - + Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Mon Jul 3 10:20:18 2006 @@ -1426,6 +1426,182 @@ } } return $coltotalhtml; + }elseif($outputformat == "PRINT") + { + $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist); + $result = $adb->query($sSQL); + $y=$adb->num_fields($result); + + if($result) + { + for ($x=0; $x<$y; $x++) + { + $fld = $adb->field_name($result, $x); + $header .= "".str_replace($modules," ",$fld->name).""; + } + + $noofrows = $adb->num_rows($result); + $custom_field_values = $adb->fetch_array($result); + $groupslist = $this->getGroupingList($this->reportid); + + do + { + $arraylists = Array(); + if(count($groupslist) == 1) + { + $newvalue = $custom_field_values[0]; + }elseif(count($groupslist) == 2) + { + $newvalue = $custom_field_values[0]; + $snewvalue = $custom_field_values[1]; + }elseif(count($groupslist) == 3) + { + $newvalue = $custom_field_values[0]; + $snewvalue = $custom_field_values[1]; + $tnewvalue = $custom_field_values[2]; + } + + if($newvalue == "") $newvalue = "-"; + + if($snewvalue == "") $snewvalue = "-"; + + if($tnewvalue == "") $tnewvalue = "-"; + + $valtemplate .= ""; + + for ($i=0; $i<$y; $i++) + { + $fld = $adb->field_name($result, $i); + $fieldvalue = $custom_field_values[$i]; + + if($fieldvalue == "" ) + { + $fieldvalue = "-"; + } + if(($lastvalue == $fieldvalue) && $this->reporttype == "summary") + { + if($this->reporttype == "summary") + { + $valtemplate .= " "; + }else + { + $valtemplate .= "".$fieldvalue.""; + } + }else if(($secondvalue == $fieldvalue) && $this->reporttype == "summary") + { + if($lastvalue == $newvalue) + { + $valtemplate .= " "; + }else + { + $valtemplate .= "".$fieldvalue.""; + } + } + else if(($thirdvalue == $fieldvalue) && $this->reporttype == "summary") + { + if($secondvalue == $snewvalue) + { + $valtemplate .= " "; + }else + { + $valtemplate .= "".$fieldvalue.""; + } + } + else + { + if($this->reporttype == "tabular") + { + $valtemplate .= "".$fieldvalue.""; + }else + { + $valtemplate .= "".$fieldvalue.""; + } + } + } + $valtemplate .= ""; + $lastvalue = $newvalue; + $secondvalue = $snewvalue; + $thirdvalue = $tnewvalue; + $arr_val[] = $arraylists; + }while($custom_field_values = $adb->fetch_array($result)); + + $sHTML = ''.$header.''.$valtemplate; + $return_data[] = $sHTML; + $return_data[] = $noofrows; + return $return_data; + } + }elseif($outputformat == "PRINT_TOTAL") + { + $escapedchars = Array('_SUM','_AVG','_MIN','_MAX'); + $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist,"COLUMNSTOTOTAL"); + if(isset($this->totallist)) + { + if($sSQL != "") + { + $result = $adb->query($sSQL); + $y=$adb->num_fields($result); + $custom_field_values = $adb->fetch_array($result); + + $coltotalhtml .= ''; + + foreach($this->totallist as $key=>$value) + { + $fieldlist = explode(":",$key); + $totclmnflds[str_replace($escapedchars," ",$fieldlist[3])] = str_replace($escapedchars," ",$fieldlist[3]); + } + + for($i =0;$i<$y;$i++) + { + $fld = $adb->field_name($result, $i); + $keyhdr[$fld->name] = $custom_field_values[$i]; + } + foreach($totclmnflds as $key=>$value) + { + + $coltotalhtml .= ''; + $arraykey = trim($value).'_SUM'; + if(isset($keyhdr[$arraykey])) + { + $coltotalhtml .= ''; + }else + { + $coltotalhtml .= ''; + } + + $arraykey = trim($value).'_AVG'; + if(isset($keyhdr[$arraykey])) + { + $coltotalhtml .= ''; + }else + { + $coltotalhtml .= ''; + } + + $arraykey = trim($value).'_MIN'; + if(isset($keyhdr[$arraykey])) + { + $coltotalhtml .= ''; + }else + { + $coltotalhtml .= ''; + } + + $arraykey = trim($value).'_MAX'; + if(isset($keyhdr[$arraykey])) + { + $coltotalhtml .= ''; + }else + { + $coltotalhtml .= ''; + } + + $coltotalhtml .= ''; + } + + $coltotalhtml .= "
TotalsSUMAVGMINMAX
'.str_replace($modules," ",$value).''.$keyhdr[$arraykey].' '.$keyhdr[$arraykey].' '.$keyhdr[$arraykey].' '.$keyhdr[$arraykey].' 
"; + } + } + return $coltotalhtml; } } From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 10:14:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 17:14:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231427=3A?= =?utf-8?q?_SO=2C_PO=2C_Invoice=2C_PriceBook_not_displayed_in_Product_Rela?= =?utf-8?q?ted_List?= Message-ID: <076.b252c89e37cb222c0c69ae66bcf277da@vtiger.fosslabs.com> #1427: SO, PO, Invoice, PriceBook not displayed in Product Related List -----------------------+---------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 10:51:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 17:51:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231427=3A?= =?utf-8?q?_SO=2C_PO=2C_Invoice=2C_PriceBook_not_displayed_in_Product_Rela?= =?utf-8?q?ted_List?= In-Reply-To: <076.b252c89e37cb222c0c69ae66bcf277da@vtiger.fosslabs.com> References: <076.b252c89e37cb222c0c69ae66bcf277da@vtiger.fosslabs.com> Message-ID: <085.9e5cc96cc3c5aa0bc7004560c97a684e@vtiger.fosslabs.com> #1427: SO, PO, Invoice, PriceBook not displayed in Product Related List ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: new => closed Old description: New description: -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Jul 3 11:16:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Jul 2006 18:16:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7739 - /vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php Message-ID: <20060703181627.AC1691879F6@vtiger.fosslabs.com> Author: saraj Date: Mon Jul 3 12:16:24 2006 New Revision: 7739 Log: * Modified to avoid the comment save, when we edit other fields through ajax edit Modified: vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php Modified: vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php Mon Jul 3 12:16:24 2006 @@ -28,6 +28,11 @@ { $modObj = new HelpDesk(); $modObj->retrieve_entity_info($crmid,"HelpDesk"); + + //Added to avoid the comment save, when we edit other fields through ajax edit + if($fieldname != 'comments') + $modObj->column_fields['comments'] = ''; + $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; $modObj->mode = "edit"; From vtigercrm-commits at vtiger.fosslabs.com Mon Jul 3 11:18:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Jul 2006 18:18:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7740 - /vtigercrm/trunk/data/CRMEntity.php Message-ID: <20060703181815.AD6623ACCA8@vtiger.fosslabs.com> Author: saraj Date: Mon Jul 3 12:18:10 2006 New Revision: 7740 Log: * Modified to get the assigned_user_id from column_fields instead of request which had caused problem in ajas edit Modified: vtigercrm/trunk/data/CRMEntity.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== --- vtigercrm/trunk/data/CRMEntity.php (original) +++ vtigercrm/trunk/data/CRMEntity.php Mon Jul 3 12:18:10 2006 @@ -981,7 +981,7 @@ global $current_user; $current_time = date('Y-m-d H:i:s'); - if($_REQUEST['assigned_user_id'] != '') + if($this->column_fields['assigned_user_id'] != '') $ownertype = 'user'; else $ownertype = 'customer'; From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 11:31:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 18:31:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231428=3A?= =?utf-8?q?_Tag_Link_Search_Shows_results_in_all_modules_but_the_combo_sho?= =?utf-8?q?ws_only_the_particular_module_from_which_the_tag_link_was_click?= =?utf-8?q?ed?= Message-ID: <076.3157abd3f895b92ed4d0788ca4d4e05b@vtiger.fosslabs.com> #1428: Tag Link Search Shows results in all modules but the combo shows only the particular module from which the tag link was clicked -----------------------+---------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 11:32:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 18:32:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231429=3A?= =?utf-8?q?_Alphabetical_Search_Shows_inconsistent_results_across_all_modu?= =?utf-8?q?les?= Message-ID: <076.89ac94ae8aba97f602fc8ab5c27a8cbe@vtiger.fosslabs.com> #1429: Alphabetical Search Shows inconsistent results across all modules -----------------------+---------------------------------------------------- Reporter: ahmed | Owner: saraj Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 11:35:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 18:35:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231430=3A?= =?utf-8?q?_More_Link_in_KeyMetrics_HomePage_is_showing_Error?= Message-ID: <076.46b8999d4ab90dfba95133f2057d8a61@vtiger.fosslabs.com> #1430: More Link in KeyMetrics HomePage is showing Error --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 11:39:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 18:39:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231431=3A?= =?utf-8?q?_DashBoards_Home_Page_Issue?= Message-ID: <076.a2154eeeb75ee87d438fcc4126753944@vtiger.fosslabs.com> #1431: DashBoards Home Page Issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- Some modules dont have assigned user But in homepage dashboard it is showing as assigned to the current logged in user ex:Products,PriceBooks -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 11:39:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 18:39:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231432=3A?= =?utf-8?q?_DashBoards_Home_Page_Issue?= Message-ID: <076.6fb35acbbe8c2ac015b89a61ae22c153@vtiger.fosslabs.com> #1432: DashBoards Home Page Issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- In Home Page the lead assigned to user is 9 records but on clicking the bar it shows all the records -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 11:41:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 18:41:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231433=3A?= =?utf-8?q?_Product_not_Duplicated_while_duplicating_SO=2C_PO=2C_Invoice?= =?utf-8?q?=2C_Quotes?= Message-ID: <076.3e6cce2a2d8ad915899af50a3e6f94b1@vtiger.fosslabs.com> #1433: Product not Duplicated while duplicating SO, PO, Invoice, Quotes -----------------------+---------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 11:54:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 18:54:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231434=3A?= =?utf-8?q?_Fatal_Error_when_selecting_Sales_Order_from_Popup?= Message-ID: <076.4c10c59fa71fd636c310b75e4ed7c1ce@vtiger.fosslabs.com> #1434: Fatal Error when selecting Sales Order from Popup -----------------------+---------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Fatal error: Call to a member function Move() on a non-object in /home /crm- test3/QEngine/vtigerCRM5_beta/apache/htdocs/vtigerCRM/vtiger_crm/include/database/PearDatabase.php on line 439 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 12:14:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 19:14:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231435=3A?= =?utf-8?q?_Javascript_Error_in_mass_Delete/Change_in_ListViews_=28documen?= =?utf-8?q?t=2Emassdelete=2Eviewname_error=29?= Message-ID: <076.7c24a51898221161b98a2d2637f73472@vtiger.fosslabs.com> #1435: Javascript Error in mass Delete/Change in ListViews (document.massdelete.viewname error) -----------------------+---------------------------------------------------- Reporter: ahmed | Owner: jeri Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Jul 3 12:15:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Jul 2006 19:15:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7741 - /vtigercrm/trunk/modules/Faq/DetailViewAjax.php Message-ID: <20060703191536.4374D18782C@vtiger.fosslabs.com> Author: saraj Date: Mon Jul 3 13:15:32 2006 New Revision: 7741 Log: * Modified to avoid the comment save, when we edit other fields through ajax edit Modified: vtigercrm/trunk/modules/Faq/DetailViewAjax.php Modified: vtigercrm/trunk/modules/Faq/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Faq/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Faq/DetailViewAjax.php Mon Jul 3 13:15:32 2006 @@ -27,6 +27,11 @@ { $modObj = new Faq(); $modObj->retrieve_entity_info($crmid,"Faq"); + + //Added to avoid the comment save, when we edit other fields through ajax edit + if($fieldname != 'comments') + $modObj->column_fields['comments'] = ''; + $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; $modObj->mode = "edit"; From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 12:24:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 19:24:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231436=3A?= =?utf-8?q?_Field_Access_UI_Issue?= Message-ID: <076.7f0f6ad0e791bb2d2d3bdc3e924d999a@vtiger.fosslabs.com> #1436: Field Access UI Issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- In Field Access in EditView it is showing two columns and in detailview it shows 4 columns it should be uniform -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 12:36:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 19:36:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231437=3A?= =?utf-8?q?_Related_to_field_in_HelpDesk_is_not_coming_properly_in_Reports?= Message-ID: <076.90ee1459edc80127c9bbdc822e269d03@vtiger.fosslabs.com> #1437: Related to field in HelpDesk is not coming properly in Reports --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Jul 3 12:45:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Jul 2006 19:45:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7742 - /vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Message-ID: <20060703194516.063393ACD09@vtiger.fosslabs.com> Author: saraj Date: Mon Jul 3 13:45:13 2006 New Revision: 7742 Log: * Added prefix vtiger_ with the tablename Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Mon Jul 3 13:45:13 2006 @@ -265,7 +265,7 @@ $this->db->println('key : '.$key.'...........value : '.$value); $val = explode(" = ",$value); $this->db->println('val0 : '.$val[0].'...........val1 : '.$val[1]); - if($val[0] == 'troubletickets.title') + if($val[0] == 'vtiger_troubletickets.title') { $where_conditions .= $val[0]." ".$val[1]; if($count != $key) $where_conditions .= $join; From vtigercrm-commits at vtiger.fosslabs.com Mon Jul 3 12:47:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Jul 2006 19:47:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7743 - /customerportal/trunk/Tickets/TicketSearch.php Message-ID: <20060703194704.CC0F83ACD09@vtiger.fosslabs.com> Author: saraj Date: Mon Jul 3 13:47:01 2006 New Revision: 7743 Log: * Added prefix vtiger_ with the table name Modified: customerportal/trunk/Tickets/TicketSearch.php Modified: customerportal/trunk/Tickets/TicketSearch.php ============================================================================== --- customerportal/trunk/Tickets/TicketSearch.php (original) +++ customerportal/trunk/Tickets/TicketSearch.php Mon Jul 3 13:47:01 2006 @@ -15,25 +15,25 @@ $match_condition = $_REQUEST['search_match']; if(trim($_REQUEST['search_ticketid']) != '') { - $where .= "troubletickets.ticketid = '".addslashes($_REQUEST['search_ticketid'])."'&&&"; + $where .= "vtiger_troubletickets.ticketid = '".addslashes($_REQUEST['search_ticketid'])."'&&&"; } if(trim($_REQUEST['search_title']) != '') { - //$where .= "troubletickets.title = '".$_REQUEST['search_title']."'&&&"; - $where .= "troubletickets.title = like '%".addslashes(trim($_REQUEST['search_title']))."%'&&&"; + //$where .= "vtiger_troubletickets.title = '".$_REQUEST['search_title']."'&&&"; + $where .= "vtiger_troubletickets.title = like '%".addslashes(trim($_REQUEST['search_title']))."%'&&&"; } if(trim($_REQUEST['search_ticketstatus']) != '') { - $where .= "troubletickets.status = '".$_REQUEST['search_ticketstatus']."'&&&"; + $where .= "vtiger_troubletickets.status = '".$_REQUEST['search_ticketstatus']."'&&&"; } if(trim($_REQUEST['search_ticketpriority']) != '') { - $where .= "troubletickets.priority = '".$_REQUEST['search_ticketpriority']."'&&&"; + $where .= "vtiger_troubletickets.priority = '".$_REQUEST['search_ticketpriority']."'&&&"; } if(trim($_REQUEST['search_ticketcategory']) != '') { - $where .= "troubletickets.category = '".$_REQUEST['search_ticketcategory']."'&&&"; + $where .= "vtiger_troubletickets.category = '".$_REQUEST['search_ticketcategory']."'&&&"; } $where = trim($where,'&&&'); From vtigercrm-commits at vtiger.fosslabs.com Mon Jul 3 12:50:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 03 Jul 2006 19:50:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7744 - /vtigercrm/trunk/modules/Reports/ReportRun.php Message-ID: <20060703195010.DB2483ACD09@vtiger.fosslabs.com> Author: richie Date: Mon Jul 3 13:50:02 2006 New Revision: 7744 Log: Issues in Reports because of adding vtiger_ has been fixed Modified: vtigercrm/trunk/modules/Reports/ReportRun.php Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Mon Jul 3 13:50:02 2006 @@ -1005,7 +1005,7 @@ left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid - left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=crmentityRelProducts.crmid + left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=vtiger_crmentityRelProducts.crmid left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_crmentityRelProducts.crmid left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_crmentityRelProducts.crmid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." @@ -1019,10 +1019,10 @@ on vtiger_crmentityHelpDesk.crmid=vtiger_troubletickets.ticketid inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id - left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid + left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=vtiger_crmentityRelHelpDesk.crmid left join vtiger_contactdetails as vtiger_contactdetailsRelHelpDesk on vtiger_contactdetailsRelHelpDesk.contactid= vtiger_crmentityRelHelpDesk.crmid left join vtiger_products as vtiger_productsRel on vtiger_productsRel.productid = vtiger_crmentityRelHelpDesk.crmid - left join vtiger_users as vtiger_usersHelpDesk on vtiger_crmentityHelpDesk.smownerid=usersHelpDesk.id + left join vtiger_users as vtiger_usersHelpDesk on vtiger_crmentityHelpDesk.smownerid=vtiger_usersHelpDesk.id ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where vtiger_crmentityHelpDesk.deleted=0 "; } From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 13:10:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 03 Jul 2006 20:10:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231438=3A?= =?utf-8?q?_Custom_View_Issue?= Message-ID: <076.71083884e25f3969ba3441b45bf37759@vtiger.fosslabs.com> #1438: Custom View Issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- If I Select filename in the HelpDesk Field in customview of HelpDesk i am geting errors -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Jul 3 20:27:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 03:27:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7745 - /vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php Message-ID: <20060704032746.C655F3B44A0@vtiger.fosslabs.com> Author: saraj Date: Mon Jul 3 21:27:43 2006 New Revision: 7745 Log: array chunk modified to 4 Modified: vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php Modified: vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php (original) +++ vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php Mon Jul 3 21:27:43 2006 @@ -70,7 +70,7 @@ } $standCustFld=array_chunk($standCustFld,2); - $standCustFld=array_chunk($standCustFld,2); + $standCustFld=array_chunk($standCustFld,4); return $standCustFld; } From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 20:28:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 03:28:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231436=3A?= =?utf-8?q?_Field_Access_UI_Issue?= In-Reply-To: <076.7f0f6ad0e791bb2d2d3bdc3e924d999a@vtiger.fosslabs.com> References: <076.7f0f6ad0e791bb2d2d3bdc3e924d999a@vtiger.fosslabs.com> Message-ID: <085.00feba19f1ac0f40560beff0c73c41fb@vtiger.fosslabs.com> #1436: Field Access UI Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 20:59:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 03:59:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231439=3A?= =?utf-8?q?_Sorting_in_Notes_List_View_gives_inconsistent_subject/title_an?= =?utf-8?q?d_fatal_error?= Message-ID: <076.5ead1921b41f55b8465e7cc523881189@vtiger.fosslabs.com> #1439: Sorting in Notes List View gives inconsistent subject/title and fatal error -----------------------+---------------------------------------------------- Reporter: ahmed | Owner: saraj Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Jul 3 21:02:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 04:02:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7746 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060704040216.C7FDA3B44CB@vtiger.fosslabs.com> Author: saraj Date: Mon Jul 3 22:02:13 2006 New Revision: 7746 Log: FAQ name updated Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Mon Jul 3 22:02:13 2006 @@ -754,7 +754,7 @@ 'Campaigns'=>'Campaigns', 'PriceBooks'=>'PriceBooks', 'Notes'=>'Notes', -'Faq'=>'Faq', +'Faq'=>'FAQ', 'Dashboards'=>'Dashboard', 'Reports'=>'Reports', 'Vendors'=>'Vendors', @@ -978,7 +978,7 @@ , 'HelpDesk'=>'HelpDesk' - , 'Faq'=>'Faq' + , 'Faq'=>'FAQ' , 'Calendar'=>'Calendar' From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 21:08:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 04:08:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231383=3A?= =?utf-8?q?_Usage_of_=22Faq=22_module_name?= In-Reply-To: <076.2e1bf80fcff6a7f829a7cb26e55a7836@vtiger.fosslabs.com> References: <076.2e1bf80fcff6a7f829a7cb26e55a7836@vtiger.fosslabs.com> Message-ID: <085.14fab251401dd1618d06cb3d1c8cc30e@vtiger.fosslabs.com> #1383: Usage of "Faq" module name ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Faq updated to FAQ -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 21:16:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 04:16:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231440=3A?= =?utf-8?q?_inconsistency_in_activity_listview?= Message-ID: <076.d80bbbd4e8c5338cd6ec0ca70978155e@vtiger.fosslabs.com> #1440: inconsistency in activity listview -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Activity listview is inconsistent while deleting the record from listview -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Jul 3 21:27:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 04:27:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7747 - in /vtigercrm/trunk/Smarty/templates: Buttons_List.tpl Buttons_List1.tpl Message-ID: <20060704042707.5004B3B44A6@vtiger.fosslabs.com> Author: saraj Date: Mon Jul 3 22:27:03 2006 New Revision: 7747 Log: Updated the button list removing the alt & title for faded buttons - ahmed Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Mon Jul 3 22:27:03 2006 @@ -50,13 +50,13 @@ {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}... {/if} {else} - {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}... + {/if} {if $CHECK.index eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} {$APP.LBL_SEARCH_ALT}{$MODULE}... {else} - {$APP.LBL_SEARCH_ALT}{$MODULE}... + {/if} @@ -89,25 +89,25 @@ {if $CHECK.Import eq 'yes'} {$APP.LBL_IMPORT} {$APP.$MODULE} {else} - {$APP.LBL_IMPORT} {$APP.$MODULE} + {/if} {if $CHECK.Export eq 'yes'} {$APP.LBL_EXPORT} {$APP.$MODULE} {else} - {$APP.LBL_EXPORT} {$APP.$MODULE} + {/if} {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} {if $CHECK.Export eq 'yes'} - {$APP.LBL_IMPORT} {$APP.$MODULE} + {$APP.LBL_EXPORT} {$APP.$MODULE} {else} - {$APP.LBL_IMPORT} {$APP.$MODULE} - {$APP.LBL_EXPORT} {$APP.$MODULE} + + {/if} {else} - {$APP.LBL_IMPORT} {$APP.$MODULE} - {$APP.LBL_EXPORT} {$APP.$MODULE} + + {/if} Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Mon Jul 3 22:27:03 2006 @@ -50,10 +50,10 @@ {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}... {/if} {else} - {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}... + {/if} - {$APP.LBL_SEARCH_ALT}{$MODULE}... + @@ -85,25 +85,25 @@ {if $CHECK.Import eq 'yes'} {$APP.LBL_IMPORT} {$APP.$MODULE} {else} - {$APP.LBL_IMPORT} {$APP.$MODULE} + {/if} {if $CHECK.Export eq 'yes'} {$APP.LBL_EXPORT} {$APP.$MODULE} {else} - {$APP.LBL_EXPORT} {$APP.$MODULE} + {/if} {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} {if $CHECK.Export eq 'yes'} - {$APP.LBL_IMPORT} {$APP.$MODULE} + {$APP.LBL_EXPORT} {$APP.$MODULE} {else} - {$APP.LBL_IMPORT} {$APP.$MODULE} - {$APP.LBL_EXPORT} {$APP.$MODULE} + + {/if} {else} {$APP.LBL_IMPORT} {$APP.$MODULE} - {$APP.LBL_EXPORT} {$APP.$MODULE} + {/if} From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 21:27:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 04:27:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231368=3A?= =?utf-8?q?_Inactive_Import/Export_button_in_Campaigns_module?= In-Reply-To: <076.e9c23975424fab1b5c70a96fbb22a0fb@vtiger.fosslabs.com> References: <076.e9c23975424fab1b5c70a96fbb22a0fb@vtiger.fosslabs.com> Message-ID: <085.ca00326f475e1c46493a8bbf2bf83b37@vtiger.fosslabs.com> #1368: Inactive Import/Export button in Campaigns module ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Jul 3 22:05:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 05:05:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7748 - /vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Message-ID: <20060704050501.E27F23B44A3@vtiger.fosslabs.com> Author: saraj Date: Mon Jul 3 23:04:57 2006 New Revision: 7748 Log: Added the product ui type for campaign quick create Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Mon Jul 3 23:04:57 2006 @@ -294,6 +294,10 @@ {$fldlabel} + + +  Select  + {elseif $uitype eq 55} {$fldlabel} From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 22:05:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 05:05:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231422=3A?= =?utf-8?q?_no_field_for_product_in_campaign_quickcreate?= In-Reply-To: <076.aa2b743116531a036dd475da7fb39a09@vtiger.fosslabs.com> References: <076.aa2b743116531a036dd475da7fb39a09@vtiger.fosslabs.com> Message-ID: <085.0b8766c0bb4710ef22a8dc6ee19faa00@vtiger.fosslabs.com> #1422: no field for product in campaign quickcreate ------------------------+--------------------------------------------------- Reporter: mangai | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Field addded to the product label -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 22:49:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 05:49:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231441=3A?= =?utf-8?q?_Advanced_Search_in_Potentials_list_view_gives_undefined_error?= Message-ID: <076.7b417185f91d02c772ccc57e702917af@vtiger.fosslabs.com> #1441: Advanced Search in Potentials list view gives undefined error -----------------------+---------------------------------------------------- Reporter: ahmed | Owner: saraj Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 22:56:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 05:56:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231228=3A?= =?utf-8?q?_AddEvent_mouseover_persists_for_long?= In-Reply-To: <076.8a08c7ad8c090a6fc574e4ebe19bc6b1@vtiger.fosslabs.com> References: <076.8a08c7ad8c090a6fc574e4ebe19bc6b1@vtiger.fosslabs.com> Message-ID: <085.0c6887d8f0fcc27abb442e5804df8a3b@vtiger.fosslabs.com> #1228: AddEvent mouseover persists for long ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 23:58:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 06:58:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231438=3A?= =?utf-8?q?_Custom_View_Issue?= In-Reply-To: <076.71083884e25f3969ba3441b45bf37759@vtiger.fosslabs.com> References: <076.71083884e25f3969ba3441b45bf37759@vtiger.fosslabs.com> Message-ID: <085.7ed9592c68478fe2ae9a9809bb70c91f@vtiger.fosslabs.com> #1438: Custom View Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * priority: major => blocker -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 23:58:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 06:58:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231437=3A?= =?utf-8?q?_Related_to_field_in_HelpDesk_is_not_coming_properly_in_Reports?= In-Reply-To: <076.90ee1459edc80127c9bbdc822e269d03@vtiger.fosslabs.com> References: <076.90ee1459edc80127c9bbdc822e269d03@vtiger.fosslabs.com> Message-ID: <085.f3725bcb1fb93f43fc38ed919ad488cf@vtiger.fosslabs.com> #1437: Related to field in HelpDesk is not coming properly in Reports ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * priority: major => blocker -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Jul 3 23:58:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 06:58:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231430=3A?= =?utf-8?q?_More_Link_in_KeyMetrics_HomePage_is_showing_Error?= In-Reply-To: <076.46b8999d4ab90dfba95133f2057d8a61@vtiger.fosslabs.com> References: <076.46b8999d4ab90dfba95133f2057d8a61@vtiger.fosslabs.com> Message-ID: <085.9b9446b97854638f108ac26d5db20b0a@vtiger.fosslabs.com> #1430: More Link in KeyMetrics HomePage is showing Error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * priority: major => blocker -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 00:19:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 07:19:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7749 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060704071924.777BC4CCF17@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 01:19:20 2006 New Revision: 7749 Log: * Modified to avoid the error when quote id is empty Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Tue Jul 4 01:19:20 2006 @@ -463,9 +463,17 @@ $log->debug("Entering getQuoteName(".$quote_id.") method ..."); $log->info("in getQuoteName ".$quote_id); global $adb; - $sql = "select * from vtiger_quotes where quoteid=".$quote_id; - $result = $adb->query($sql); - $quote_name = $adb->query_result($result,0,"subject"); + if($quote_id != NULL && $quote_id != '') + { + $sql = "select * from vtiger_quotes where quoteid=".$quote_id; + $result = $adb->query($sql); + $quote_name = $adb->query_result($result,0,"subject"); + } + else + { + $log->debug("Quote Id is empty."); + $quote_name = ''; + } $log->debug("Exiting getQuoteName method ..."); return $quote_name; } From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 00:37:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 07:37:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231434=3A?= =?utf-8?q?_Fatal_Error_when_selecting_Sales_Order_from_Popup?= In-Reply-To: <076.4c10c59fa71fd636c310b75e4ed7c1ce@vtiger.fosslabs.com> References: <076.4c10c59fa71fd636c310b75e4ed7c1ce@vtiger.fosslabs.com> Message-ID: <085.76cea64c49e204410caffd642a244859@vtiger.fosslabs.com> #1434: Fatal Error when selecting Sales Order from Popup ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue has been fixed. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 00:47:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 07:47:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23513=3A_?= =?utf-8?q?Org_Sharing_privileges_UI_Issue?= In-Reply-To: <076.a530b8fd2e3ff2377239b98d5909c3f4@vtiger.fosslabs.com> References: <076.a530b8fd2e3ff2377239b98d5909c3f4@vtiger.fosslabs.com> Message-ID: <085.227bddb2054ca7d2f1ed0d303ad7a1ab@vtiger.fosslabs.com> #513: Org Sharing privileges UI Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jeri Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * status: assigned => new * owner: ela => jeri -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 00:54:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 07:54:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7750 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060704075427.1B1164CCF16@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 01:54:23 2006 New Revision: 7750 Log: * Modified to copy the bill/ship street to PO when select vendor (change the street name from treet) to fix ticket 1403 Modified: vtigercrm/trunk/include/utils/ListViewUtils.php Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Tue Jul 4 01:54:23 2006 @@ -1438,7 +1438,7 @@ $acct_focus = new Vendor(); $acct_focus->retrieve_entity_info($entity_id,"Vendors"); - $value = 'column_fields['treet']).'", "'.br2nl($acct_focus->column_fields['city']).'", "'.br2nl($acct_focus->column_fields['state']).'", "'.br2nl($acct_focus->column_fields['postalcode']).'", "'.br2nl($acct_focus->column_fields['country']).'","'.br2nl($acct_focus->column_fields['pobox']).'"); window.close()\'>'.$temp_val.''; + $value = 'column_fields['street']).'", "'.br2nl($acct_focus->column_fields['city']).'", "'.br2nl($acct_focus->column_fields['state']).'", "'.br2nl($acct_focus->column_fields['postalcode']).'", "'.br2nl($acct_focus->column_fields['country']).'","'.br2nl($acct_focus->column_fields['pobox']).'"); window.close()\'>'.$temp_val.''; } elseif($popuptype == "specific_campaign") From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 00:55:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 07:55:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231403=3A?= =?utf-8?q?_Billing/Shipping_Address_not_copied_while_selecting_vendor_in_?= =?utf-8?q?Create_PO?= In-Reply-To: <076.42e49747ae640cf03d761f3ac3d3938e@vtiger.fosslabs.com> References: <076.42e49747ae640cf03d761f3ac3d3938e@vtiger.fosslabs.com> Message-ID: <085.5d7e3d6a15698e37152546a3c388a9c4@vtiger.fosslabs.com> #1403: Billing/Shipping Address not copied while selecting vendor in Create PO ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue has been fixed. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 01:09:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 08:09:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23513=3A_?= =?utf-8?q?Org_Sharing_privileges_UI_Issue?= In-Reply-To: <076.a530b8fd2e3ff2377239b98d5909c3f4@vtiger.fosslabs.com> References: <076.a530b8fd2e3ff2377239b98d5909c3f4@vtiger.fosslabs.com> Message-ID: <085.927f2cfa107175bb1e49ea1ed020c97c@vtiger.fosslabs.com> #513: Org Sharing privileges UI Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jeri Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [7751]) issue in edit sharing rule has been fixed.Fixes #513 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 01:09:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 08:09:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7751 - in /vtigercrm/trunk/modules/Users: CreateSharingRule.php language/en_us.lang.php Message-ID: <20060704080931.3A227167502@vtiger.fosslabs.com> Author: richie Date: Tue Jul 4 02:09:25 2006 New Revision: 7751 Log: issue in edit sharing rule has been fixed.Fixes #513 Modified: vtigercrm/trunk/modules/Users/CreateSharingRule.php vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/CreateSharingRule.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateSharingRule.php (original) +++ vtigercrm/trunk/modules/Users/CreateSharingRule.php Tue Jul 4 02:09:25 2006 @@ -250,8 +250,12 @@
- - +'; +else + $output .=$mod_strings[LBL_ADD_CUSTOM_RULE].''; +$output .= ' Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Tue Jul 4 02:09:25 2006 @@ -312,6 +312,7 @@ 'LBL_WELCOME_PROFILE_CREATE'=>'Welcome to Privilege Profile Creator ', 'LBL_SELECT_CHOICE_NEW_PROFILE'=>'Select your choice of creating the new profile', 'LBL_ADD_CUSTOM_RULE'=>'Add Custom Privilege Rule', +'LBL_EDIT_CUSTOM_RULE'=>'Edit Custom Privilege Rule', 'LBL_CLOSE'=>'Close', 'LBL_SELECT_ENTITY'=>'Select an entity below', 'LBL_CAN_BE_ACCESSED_BY'=>'Can be accessed by', From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 01:10:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 08:10:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231414=3A?= =?utf-8?q?_Searching_Activities_by_ActivityType_from_Custom_View_does_not?= =?utf-8?q?_show_any_result?= In-Reply-To: <076.58b65d03d785097bb14a301cda2997bc@vtiger.fosslabs.com> References: <076.58b65d03d785097bb14a301cda2997bc@vtiger.fosslabs.com> Message-ID: <085.4b04bd4f14019d55272e6e9c7852c6ab@vtiger.fosslabs.com> #1414: Searching Activities by ActivityType from Custom View does not show any result ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: jeri Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 01:47:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 08:47:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7752 - /vtigercrm/trunk/modules/CustomView/CustomView.php Message-ID: <20060704084711.CC2A616752D@vtiger.fosslabs.com> Author: richie Date: Tue Jul 4 02:47:07 2006 New Revision: 7752 Log: attachments fields in HelpDesk has been escaped from customview Modified: vtigercrm/trunk/modules/CustomView/CustomView.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Tue Jul 4 02:47:07 2006 @@ -243,7 +243,9 @@ } $fieldlabel1 = str_replace(" ","_",$fieldlabel); $optionvalue = $fieldtablename.":".$fieldcolname.":".$fieldname.":".$module."_".$fieldlabel1.":".$fieldtypeofdata; - $module_columnlist[$optionvalue] = $fieldlabel; + //added to escape attachments fields in customview as we have multiple attachments + if($module != 'HelpDesk' || $fieldname !='filename') + $module_columnlist[$optionvalue] = $fieldlabel; if($fieldtype[1] == "M") { $this->mandatoryvalues[] = "'".$optionvalue."'"; From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 01:51:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 08:51:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231442=3A?= =?utf-8?q?_Product_Name_is_not_coming_in_HelpDesk_Reports?= Message-ID: <076.d715eea78dae98faffc0e6ab64d1c134@vtiger.fosslabs.com> #1442: Product Name is not coming in HelpDesk Reports --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 01:53:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 08:53:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7753 - /vtigercrm/trunk/modules/Reports/Reports.php Message-ID: <20060704085333.C6D9716752D@vtiger.fosslabs.com> Author: richie Date: Tue Jul 4 02:53:30 2006 New Revision: 7753 Log: attachments fields in HelpDesk has been escaped from Reports Modified: vtigercrm/trunk/modules/Reports/Reports.php Modified: vtigercrm/trunk/modules/Reports/Reports.php ============================================================================== --- vtigercrm/trunk/modules/Reports/Reports.php (original) +++ vtigercrm/trunk/modules/Reports/Reports.php Tue Jul 4 02:53:30 2006 @@ -375,7 +375,9 @@ $fieldlabel = $adb->query_result($result,$i,"fieldlabel"); $fieldlabel1 = str_replace(" ","_",$fieldlabel); $optionvalue = $fieldtablename.":".$fieldcolname.":".$module."_".$fieldlabel1.":".$fieldname.":".$fieldtypeofdata; - $module_columnlist[$optionvalue] = $fieldlabel; + //added to escape attachments fields in Reports as we have multiple attachments + if($module != 'HelpDesk' || $fieldname !='filename') + $module_columnlist[$optionvalue] = $fieldlabel; } $log->info("Reports :: FieldColumns->Successfully returned ColumnslistbyBlock".$module.$block); return $module_columnlist; From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 01:55:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 08:55:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231438=3A?= =?utf-8?q?_Custom_View_Issue?= In-Reply-To: <076.71083884e25f3969ba3441b45bf37759@vtiger.fosslabs.com> References: <076.71083884e25f3969ba3441b45bf37759@vtiger.fosslabs.com> Message-ID: <085.47b73d30ffb6ead8424593555b6e08a6@vtiger.fosslabs.com> #1438: Custom View Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 02:03:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 09:03:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231430=3A?= =?utf-8?q?_More_Link_in_KeyMetrics_HomePage_is_showing_Error?= In-Reply-To: <076.46b8999d4ab90dfba95133f2057d8a61@vtiger.fosslabs.com> References: <076.46b8999d4ab90dfba95133f2057d8a61@vtiger.fosslabs.com> Message-ID: <085.c542fce8316f84cce9a5fbf13f73e6c6@vtiger.fosslabs.com> #1430: More Link in KeyMetrics HomePage is showing Error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [7754]) more link in Home Page KeyMetrics has been removed.Fixes #1430 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 02:03:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 09:03:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7754 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060704090356.7926D167585@vtiger.fosslabs.com> Author: richie Date: Tue Jul 4 03:03:51 2006 New Revision: 7754 Log: more link in Home Page KeyMetrics has been removed.Fixes #1430 Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue Jul 4 03:03:51 2006 @@ -168,7 +168,12 @@ {/foreach} - +
'.$app_strings[$sharing_module].' - '.$mod_strings[LBL_ADD_CUSTOM_RULE].''.$mod_strings[LBL_CLOSE].''.$app_strings[$sharing_module].' - '; +if($mode == 'edit') + $output .=$mod_strings[LBL_EDIT_CUSTOM_RULE].''.$mod_strings[LBL_CLOSE].'
 
{$APP.LBL_MORE}..
+ {if $modulename neq 'CustomView'} + {$APP.LBL_MORE}.. + {else} +   + {/if}
From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 02:08:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 09:08:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7755 - /vtigercrm/trunk/adodb/adodb-datadict.inc.php Message-ID: <20060704090823.2560C16757F@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 03:08:19 2006 New Revision: 7755 Log: changes made to get log entry for create tabel queries Modified: vtigercrm/trunk/adodb/adodb-datadict.inc.php Modified: vtigercrm/trunk/adodb/adodb-datadict.inc.php ============================================================================== --- vtigercrm/trunk/adodb/adodb-datadict.inc.php (original) +++ vtigercrm/trunk/adodb/adodb-datadict.inc.php Tue Jul 4 03:08:19 2006 @@ -260,16 +260,24 @@ // Executes the sql array returned by GetTableSQL and GetIndexSQL function ExecuteSQLArray($sql, $continueOnError = true) { + global $log; $rez = 2; $conn = &$this->connection; $saved = $conn->debug; foreach($sql as $line) { if ($this->debug) $conn->debug = true; + $log->fatal($line); $ok = $conn->Execute($line); $conn->debug = $saved; if (!$ok) { - if ($this->debug) ADOConnection::outp($conn->ErrorMsg()); + $log->fatal("Table Creation Error: Query Failed"); + $log->fatal(" "); + if ($this->debug)] + { + $log->fatal("InstallError: ".$conn->ErrorMsg()); + ADOConnection::outp($conn->ErrorMsg()); + } if (!$continueOnError) return 0; $rez = 1; } From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 02:19:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 09:19:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7756 - in /vtigercrm/trunk/modules/Products: AddProductToPriceBooks.php AddProductsToPriceBook.php Message-ID: <20060704091907.07F0116757F@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 03:19:03 2006 New Revision: 7756 Log: * Modified to fix the vtiger_ prefix issue Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php Tue Jul 4 03:19:03 2006 @@ -50,7 +50,7 @@ $list_query = getListQuery("PriceBooks"); $xtpl->assign("PRICEBOOKLISTHEADER", get_form_header($current_module_strings['LBL_LIST_PRICEBOOK_FORM_TITLE'], $other_text, false )); -$list_query .= ' ORDER BY vtiger_pricebookid DESC '; +$list_query .= ' ORDER BY pricebookid DESC '; $list_result = $adb->query($list_query); $num_rows = $adb->num_rows($list_result); Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Tue Jul 4 03:19:03 2006 @@ -58,7 +58,7 @@ $where_clauses = Array(); //Added for Custom Field Search - $sql="select * from vtiger_field where vtiger_tablename='productcf' order by vtiger_fieldlabel"; + $sql="select * from vtiger_field where tablename='productcf' order by fieldlabel"; $result=$adb->query($sql); for($i=0;$i<$adb->num_rows($result);$i++) { From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 02:21:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 09:21:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7757 - in /vtigercrm/trunk/modules/Products: AddProductToPriceBooks.php AddProductsToPriceBook.php Message-ID: <20060704092144.BEE3216757F@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 03:21:40 2006 New Revision: 7757 Log: * Modified to fix the vtiger_ prefix issue Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php Tue Jul 4 03:21:40 2006 @@ -57,7 +57,7 @@ $record_string= "Total No of Rows: ".$num_rows; -//Retreiving the array of already releated vtiger_products; +//Retreiving the array of already releated products; $sql1="select vtiger_crmentity.crmid, vtiger_pricebookproductrel.pricebookid,vtiger_products.unit_price from vtiger_pricebookproductrel inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_pricebookproductrel.productid inner join vtiger_products on vtiger_products.productid=vtiger_pricebookproductrel.productid where vtiger_crmentity.deleted=0 and vtiger_pricebookproductrel.productid=".$productid; $res1 = $adb->query($sql1); Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Tue Jul 4 03:21:40 2006 @@ -180,7 +180,7 @@ //Retreiving the array of already releated vtiger_products; -$sql1 = "select productid from vtiger_pricebookproductrel where vtiger_pricebookid=".$pricebook_id; +$sql1 = "select productid from vtiger_pricebookproductrel where pricebookid=".$pricebook_id; $res1 = $adb->query($sql1); $num_prod_rows = $adb->num_rows($res1); $prod_array = Array(); @@ -224,7 +224,7 @@ for($i=0; $i<$num_rows; $i++) { - $log->info("Products :: Showing the List of vtiger_products to be added in price book"); + $log->info("Products :: Showing the List of products to be added in price book"); $entity_id = $adb->query_result($list_result,$i,"crmid"); if(! array_key_exists($entity_id, $prod_array)) { From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 02:24:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 09:24:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231402=3A?= =?utf-8?q?_PriceBook_Issues_in_Product?= In-Reply-To: <076.3865925b10005a3ad66a5dec37e66865@vtiger.fosslabs.com> References: <076.3865925b10005a3ad66a5dec37e66865@vtiger.fosslabs.com> Message-ID: <085.0ddb1210b616d529164ca549283e1266@vtiger.fosslabs.com> #1402: PriceBook Issues in Product ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue has been fixed. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 02:34:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 09:34:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7758 - in /vtigercrm/trunk/install: 2setConfig.php 3confirmConfig.php Message-ID: <20060704093420.294A51677C6@vtiger.fosslabs.com> Author: richie Date: Tue Jul 4 03:34:16 2006 New Revision: 7758 Log: validation added for installation Modified: vtigercrm/trunk/install/2setConfig.php vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== --- vtigercrm/trunk/install/2setConfig.php (original) +++ vtigercrm/trunk/install/2setConfig.php Tue Jul 4 03:34:16 2006 @@ -228,11 +228,18 @@ errorMessage += "\n temp directory path"; form.root_directory.focus(); } - + if(document.getElementById('check_createdb').checked == true) + { + if (trim(form.root_user.value) =='') { + isError = true; + errorMessage += "\n root username"; + form.root_user.focus(); + } + } // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required vtiger_fields: " + errorMessage); + alert("Missing required fields: " + errorMessage); return false; } @@ -331,7 +338,7 @@ " /> - Password * + Password " /> @@ -347,7 +354,7 @@ - Root Password * + Root Password Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== --- vtigercrm/trunk/install/3confirmConfig.php (original) +++ vtigercrm/trunk/install/3confirmConfig.php Tue Jul 4 03:34:16 2006 @@ -1,304 +1,304 @@ -Connect($db_hostname,$db_username,$db_password)) { - $db_server_status = true; - if($db_type=='mysql') - { - $mysql_conn = mysql_connect($db_hostname,$db_username,$db_password); - $version = explode('-',mysql_get_server_info($mysql_conn)); - $mysql_server_version=$version[0]; - mysql_close($mysql_conn); - } - if($_REQUEST['check_createdb'] == 'on') - { - $root_user = $_REQUEST['root_user']; - $root_password = $_REQUEST['root_password']; - - // drop the current database if it exists - $dropdb_conn = &NewADOConnection($db_type); - if($dropdb_conn->Connect($db_hostname, $root_user, $root_password, $db_name)) - { - $query = "drop database ".$db_name; - $dropdb_conn->Execute($query); - $dropdb_conn->Close(); - } - - // create the new database - $db_creation_failed = true; - $createdb_conn = &NewADOConnection($db_type); - if($createdb_conn->Connect($db_hostname, $root_user, $root_password)) { - $query = "create database ".$db_name; - if($createdb_conn->Execute($query)) { - $db_creation_failed = false; - } - $createdb_conn->Close(); - } - } - - // test the connection to the database - if($conn->Connect($db_hostname, $db_username, $db_password, $db_name)) - { - $db_exist_status = true; - } - $conn->Close(); - } -} - -$error_msg = ''; -$error_msg_info = ''; - -if(!$db_type_status || !$db_server_status) -{ - $error_msg = 'Unable to connect to database Server. Invalid mySQL Connection Parameters specified'; - $error_msg_info = 'This may be due to the following reasons:
- - specified database user, password, hostname, database type, or port is invalid.
- - specified database user does not have access to connect to the database server from the host'; -} -elseif($db_type == 'mysql' && $mysql_server_version < '4.1') -{ - $error_msg = 'MySQL version '.$mysql_server_version.' is not supported, kindly connect to MySQL 4.1.x or above'; -} -elseif($db_creation_failed) -{ - $error_msg = 'Unable to Create Database '.$db_name; - $error_msg_info = 'Message: The database User "'. $root_user .'" doesn\'t have permission to Create database. Try changing the Database settings'; -} -elseif(!$db_exist_status) -{ - $error_msg = 'The Database "'.$db_name.'" is not found.Try changing the Database settings'; -} -else -{ - $next = true; -} - -?> - - - - - - vtiger CRM 5.0 Beta Configuration Wizard: Step 3 - - - - - - - - - -
-

- - - - - - -
vtiger CRMv5alpha4
- - - - - - - - - - - - -
Confirm Configuration - - - - - - - - -
vtiger CRM Configuration WizardStep 3 of 5
Confirm Configuration
-
-
- -
- -
- -

- - - - - - - - - - - - - - - - - - - - - - - - - - -
Database Configuration
Host Name
User Name
Password
Database Type
Database Name
- - - - - - - - - - - - - - - - - - - - - -

Site Configuration

URL
Path
Cache Path
Admin Password
- -

- - - - - - - - -
-
- - " /> - " /> - " /> - " /> - " /> - " /> - " /> - " /> - " /> - " /> - - - - - " /> - " /> - " /> - -
- 		- -
- - - - - - -
Populate database with demo data
- " /> - " /> - " /> - " /> - " /> - " /> - " /> - " /> - " /> - " /> - - - - - " /> - " /> - " /> - -
- -
- -

- -

- - - - - - -
-
- - - + $db_server_status = true; + if($db_type=='mysql') + { + $mysql_conn = mysql_connect($db_hostname,$db_username,$db_password); + $version = explode('-',mysql_get_server_info($mysql_conn)); + $mysql_server_version=$version[0]; + mysql_close($mysql_conn); + } + if($_REQUEST['check_createdb'] == 'on') + { + $root_user = $_REQUEST['root_user']; + $root_password = $_REQUEST['root_password']; + + // drop the current database if it exists + $dropdb_conn = &NewADOConnection($db_type); + if(@$dropdb_conn->Connect($db_hostname, $root_user, $root_password, $db_name)) + { + $query = "drop database ".$db_name; + $dropdb_conn->Execute($query); + $dropdb_conn->Close(); + } + + // create the new database + $db_creation_failed = true; + $createdb_conn = &NewADOConnection($db_type); + if(@$createdb_conn->Connect($db_hostname, $root_user, $root_password)) { + $query = "create database ".$db_name; + if($createdb_conn->Execute($query)) { + $db_creation_failed = false; + } + $createdb_conn->Close(); + } + } + + // test the connection to the database + if(@$conn->Connect($db_hostname, $db_username, $db_password, $db_name)) + { + $db_exist_status = true; + } + $conn->Close(); + } +} + +$error_msg = ''; +$error_msg_info = ''; + +if(!$db_type_status || !$db_server_status) +{ + $error_msg = 'Unable to connect to database Server. Invalid mySQL Connection Parameters specified'; + $error_msg_info = 'This may be due to the following reasons:
+ - specified database user, password, hostname, database type, or port is invalid.
+ - specified database user does not have access to connect to the database server from the host'; +} +elseif($db_type == 'mysql' && $mysql_server_version < '4.1') +{ + $error_msg = 'MySQL version '.$mysql_server_version.' is not supported, kindly connect to MySQL 4.1.x or above'; +} +elseif($db_creation_failed) +{ + $error_msg = 'Unable to Create Database '.$db_name; + $error_msg_info = 'Message: The database User "'. $root_user .'" doesn\'t have permission to Create database. Try changing the Database settings'; +} +elseif(!$db_exist_status) +{ + $error_msg = 'The Database "'.$db_name.'" is not found.Try changing the Database settings'; +} +else +{ + $next = true; +} + +?> + + + + + + vtiger CRM 5.0 Beta Configuration Wizard: Step 3 + + + + + + + + + +
+

+ + + + + + +
vtiger CRMv5alpha4
+ + + + + + + + + + + + +
Confirm Configuration + + + + + + + + +
vtiger CRM Configuration WizardStep 3 of 5
Confirm Configuration
+
+
+ +
+ +
+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Database Configuration
Host Name
User Name
Password
Database Type
Database Name
+ + + + + + + + + + + + + + + + + + + + + +

Site Configuration

URL
Path
Cache Path
Admin Password
+ +

+ + + + + + + + +
+
+ + " /> + " /> + " /> + " /> + " /> + " /> + " /> + " /> + " /> + " /> + + + + + " /> + " /> + " /> + +
+ 		+ +
+ + + + + + +
Populate database with demo data
+ " /> + " /> + " /> + " /> + " /> + " /> + " /> + " /> + " /> + " /> + + + + + " /> + " /> + " /> + +
+ +
+ +

+ +

+ + + + + + +
+
+ + + From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 02:54:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 09:54:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7759 - in /vtigercrm/trunk/modules: Invoice/ListView.php PurchaseOrder/ListView.php Message-ID: <20060704095432.490503ACCBC@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 03:54:27 2006 New Revision: 7759 Log: Search options issue fixed. Fixes 1406 Modified: vtigercrm/trunk/modules/Invoice/ListView.php vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Tue Jul 4 03:54:27 2006 @@ -189,6 +189,10 @@ $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Invoice","index",$viewid); $alphabetical = AlphabeticalSearch($currentModule,'index','subject','true','basic',"","","","",$viewid); +$fieldnames = getAdvSearchfields($module); +$criteria = getcriteria_options(); +$smarty->assign("CRITERIA", $criteria); +$smarty->assign("FIELDNAMES", $fieldnames); $smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); $smarty->assign("VIEWID", $viewid); $smarty->assign("BUTTONS", $other_text); Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Tue Jul 4 03:54:27 2006 @@ -185,6 +185,10 @@ $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"PurchaseOrder","index",$viewid); $alphabetical = AlphabeticalSearch($currentModule,'index','subject','true','basic',"","","","",$viewid); +$fieldnames = getAdvSearchfields($module); +$criteria = getcriteria_options(); +$smarty->assign("CRITERIA", $criteria); +$smarty->assign("FIELDNAMES", $fieldnames); $smarty->assign("ALPHABETICAL", $alphabetical); $smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("RECORD_COUNTS", $record_string); From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 02:57:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 09:57:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231406=3A?= =?utf-8?q?_Advanced_Search_in_Purchase_Order_displays_no_values_in_combo?= =?utf-8?q?=2E?= In-Reply-To: <076.604b3fbca2f49db5e075d878933ccd89@vtiger.fosslabs.com> References: <076.604b3fbca2f49db5e075d878933ccd89@vtiger.fosslabs.com> Message-ID: <085.ff07a62dff080f61736d0b295d317728@vtiger.fosslabs.com> #1406: Advanced Search in Purchase Order displays no values in combo. ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: saraj Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 02:58:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 09:58:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231409=3A?= =?utf-8?q?_Advanced_Search_in_Invoice_displays_no_values_in_combo=2E?= In-Reply-To: <076.a2da11cba0da9c78ff0beaa17549d577@vtiger.fosslabs.com> References: <076.a2da11cba0da9c78ff0beaa17549d577@vtiger.fosslabs.com> Message-ID: <085.1d0f4063f8786a2cdb40af0f87b2f60f@vtiger.fosslabs.com> #1409: Advanced Search in Invoice displays no values in combo. ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: saraj Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 03:18:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 10:18:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7760 - /vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Message-ID: <20060704101808.AA8914CCF15@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 04:18:05 2006 New Revision: 7760 Log: * Modified to fix the problem that when create product from vendor relatedlist product saved but the product not displayed in Product Listview, avoid passing parent id Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Tue Jul 4 04:18:05 2006 @@ -18,7 +18,10 @@ - +{* Avoid to pass the parent id when create product from Vendors relatedlist, product saved but not listed in Product LV *} +{if $MODULE neq 'Vendors'} + +{/if} {if $MODULE eq 'Activities'} From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 03:19:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 10:19:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231404=3A?= =?utf-8?q?_Product_not_getting_displayed_in_List_view_when_added_from_ven?= =?utf-8?q?dor_related_list?= In-Reply-To: <076.a2f1476f2b295979718cb1f522ba91a7@vtiger.fosslabs.com> References: <076.a2f1476f2b295979718cb1f522ba91a7@vtiger.fosslabs.com> Message-ID: <085.149c37eeb9c76336446d20e3ca30d6af@vtiger.fosslabs.com> #1404: Product not getting displayed in List view when added from vendor related list ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue has been fixed. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 03:25:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 10:25:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231415=3A?= =?utf-8?q?_Change_Password_of_Users_Non_functional?= In-Reply-To: <076.da83271b37f799418751d0d82a587681@vtiger.fosslabs.com> References: <076.da83271b37f799418751d0d82a587681@vtiger.fosslabs.com> Message-ID: <085.ea8594c517fe537f75db3bd57e535f8f@vtiger.fosslabs.com> #1415: Change Password of Users Non functional ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: don Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * owner: Jeri => don -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 03:26:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 10:26:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7761 - /vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Message-ID: <20060704102614.B4DB74CCF8F@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 04:26:11 2006 New Revision: 7761 Log: * Modified to fix the vtiger_ prefix issue Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Tue Jul 4 04:26:11 2006 @@ -140,7 +140,7 @@ $returnset = '&return_module=PurchaseOrder&return_action=CallRelatedList&return_id='.$id; - $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' && vtiger_activity.eventstatus = 'Planned')"; + $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' && vtiger_activity.eventstatus = 'Planned')"; $log->debug("Exiting get_activities method ..."); return GetRelatedList('PurchaseOrder','Activities',$focus,$query,$button,$returnset); } From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 03:26:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 10:26:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231405=3A?= =?utf-8?q?_Task_is_not_getting_displayed_in_Porder_Related_List_after_add?= =?utf-8?q?in?= In-Reply-To: <076.95f1de3e7c6dbd3c93787f87e760d526@vtiger.fosslabs.com> References: <076.95f1de3e7c6dbd3c93787f87e760d526@vtiger.fosslabs.com> Message-ID: <085.157c4fafe17239b94cca5c093e8fa847@vtiger.fosslabs.com> #1405: Task is not getting displayed in Porder Related List after addin ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 03:40:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 10:40:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7762 - in /vtigercrm/trunk/Smarty/templates: RelatedListContents.tpl RelatedListsHidden.tpl Message-ID: <20060704104053.D18545F34AC@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 04:40:49 2006 New Revision: 7762 Log: * Modified to avoid save the product vendor relationship in seproducts table so that product_id value is emptied when create product from vendor related list Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Tue Jul 4 04:40:49 2006 @@ -30,6 +30,8 @@ {elseif $header eq 'Products'} {if $MODULE eq 'PriceBooks'} + {elseif $MODULE eq 'Vendors'} + {else} {/if} Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Tue Jul 4 04:40:49 2006 @@ -18,10 +18,7 @@ -{* Avoid to pass the parent id when create product from Vendors relatedlist, product saved but not listed in Product LV *} -{if $MODULE neq 'Vendors'} - -{/if} + {if $MODULE eq 'Activities'} From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 03:53:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 10:53:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7763 - /vtigercrm/trunk/include/utils/DeleteUtils.php Message-ID: <20060704105350.CF9CF5F9190@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 04:53:47 2006 New Revision: 7763 Log: * Added code to delete the contact - vendor relationship when we delete contact from vendor relatedlist Modified: vtigercrm/trunk/include/utils/DeleteUtils.php Modified: vtigercrm/trunk/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DeleteUtils.php (original) +++ vtigercrm/trunk/include/utils/DeleteUtils.php Tue Jul 4 04:53:47 2006 @@ -67,6 +67,11 @@ if($return_module == 'Products') { $sql = 'delete from vtiger_vendorcontactrel where contactid='.$record.' and vendorid='.$return_id; + $adb->query($sql); + } + if($return_module == 'Vendors') + { + $sql = "delete from vtiger_vendorcontactrel where vendorid=$return_id and contactid=$record"; $adb->query($sql); } break; From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 03:54:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 10:54:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231407=3A?= =?utf-8?q?_Not_able_to_delete_contact_from_vendor_related_list?= In-Reply-To: <076.7a0430f79de907a68048a0360a372261@vtiger.fosslabs.com> References: <076.7a0430f79de907a68048a0360a372261@vtiger.fosslabs.com> Message-ID: <085.5e47930915ea63146ed5f28c69ac3320@vtiger.fosslabs.com> #1407: Not able to delete contact from vendor related list ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 04:06:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 11:06:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7764 - /vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Message-ID: <20060704110643.6E7ED5FD33E@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 05:06:39 2006 New Revision: 7764 Log: changes made to remove contactname from All view of activitylistview Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/PopulateCustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Tue Jul 4 05:06:39 2006 @@ -260,7 +260,6 @@ Array('vtiger_activity:status:taskstatus:Activities_Status:V', 'vtiger_activity:activitytype:activitytype:Activities_Type:V', 'vtiger_activity:subject:subject:Activities_Subject:V', - 'vtiger_cntactivityrel:contactid:contact_id:Activities_Contact_Name:I', 'vtiger_seactivityrel:crmid:parent_id:Activities_Related_to:V', 'vtiger_activity:date_start:date_start:Activities_Start_Date:D', 'vtiger_activity:due_date:due_date:Activities_End_Date:D', From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 04:08:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 11:08:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7765 - /vtigercrm/trunk/modules/Users/Users.js Message-ID: <20060704110832.C08935F5F42@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 05:08:29 2006 New Revision: 7765 Log: SelectAll js function has been removed as it is defined in general.js Modified: vtigercrm/trunk/modules/Users/Users.js Modified: vtigercrm/trunk/modules/Users/Users.js ============================================================================== --- vtigercrm/trunk/modules/Users/Users.js (original) +++ vtigercrm/trunk/modules/Users/Users.js Tue Jul 4 05:08:29 2006 @@ -16,58 +16,3 @@ window.opener.document.EditView.reports_to_id.value = user_id; } -//Function added for Mass select in Popup - Philip -function SelectAll() -{ - - x = document.selectall.selected_id.length; - var entity_id = window.opener.document.getElementById('parent_id').value - var module = window.opener.document.getElementById('return_module').value - document.selectall.action.value='updateRelations' - idstring = ""; - - if ( x == undefined) - { - - if (document.selectall.selected_id.checked) - { - document.selectall.idlist.value=document.selectall.selected_id.value; - } - else - { - alert("Please select at least one entity"); - return false; - } - } - else - { - xx = 0; - for(i = 0; i < x ; i++) - { - if(document.selectall.selected_id[i].checked) - { - idstring = document.selectall.selected_id[i].value +";"+idstring - xx++ - } - } - if (xx != 0) - { - document.selectall.idlist.value=idstring; - } - else - { - alert("Please select at least one entity"); - return false; - } - } - if(confirm("Are you sure you want to add the selected "+xx+" records ?")) - { - opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module=Users&idlist="+idstring; - self.close(); - } - else - { - return false; - } -} - From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 04:14:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 11:14:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7766 - /vtigercrm/trunk/include/js/general.js Message-ID: <20060704111403.9E8AC5F34AB@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 05:13:59 2006 New Revision: 7766 Log: changes made to fix the issue in activity relatedlist Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Tue Jul 4 05:13:59 2006 @@ -1638,6 +1638,7 @@ { x = document.selectall.selected_id.length; + var y=0; var entity_id = window.opener.document.getElementById('parent_id').value var module = window.opener.document.getElementById('return_module').value document.selectall.action.value='updateRelations' @@ -1648,7 +1649,8 @@ if (document.selectall.selected_id.checked) { - document.selectall.idlist.value=document.selectall.selected_id.value; + idstring = document.selectall.selected_id.value; + y=1; } else { @@ -1658,34 +1660,34 @@ } else { - xx = 0; + y=0; for(i = 0; i < x ; i++) { if(document.selectall.selected_id[i].checked) { - idstring = document.selectall.selected_id[i].value +";"+idstring - xx++ + idstring = document.selectall.selected_id[i].value +";"+idstring; + y=y+1; } } - if (xx != 0) - { - document.selectall.idlist.value=idstring; - } - else - { - alert("Please select at least one entity"); - return false; - } + } + if (y != 0) + { + document.selectall.idlist.value=idstring; } - if(confirm("Are you sure you want to add the selected "+xx+" records ?")) - { - opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module="+mod+"&idlist="+idstring; + else + { + alert("Please select at least one entity"); + return false; + } + if(confirm("Are you sure you want to add the selected "+y+" records ?")) + { + opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module="+mod+"&idlist="+idstring; self.close(); - } - else - { - return false; - } + } + else + { + return false; + } } function ShowEmail(id) { From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 04:14:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 11:14:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231437=3A?= =?utf-8?q?_Related_to_field_in_HelpDesk_is_not_coming_properly_in_Reports?= In-Reply-To: <076.90ee1459edc80127c9bbdc822e269d03@vtiger.fosslabs.com> References: <076.90ee1459edc80127c9bbdc822e269d03@vtiger.fosslabs.com> Message-ID: <085.1a6a9f30956061f924d2f587bf350ee0@vtiger.fosslabs.com> #1437: Related to field in HelpDesk is not coming properly in Reports ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [7767]) related to field of HelpDesk in Reports has been fixed.Fixes #1437 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 04:14:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 11:14:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7767 - /vtigercrm/trunk/modules/Reports/ReportRun.php Message-ID: <20060704111412.2EAA45FD33E@vtiger.fosslabs.com> Author: richie Date: Tue Jul 4 05:14:07 2006 New Revision: 7767 Log: related to field of HelpDesk in Reports has been fixed.Fixes #1437 Modified: vtigercrm/trunk/modules/Reports/ReportRun.php Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Tue Jul 4 05:14:07 2006 @@ -80,9 +80,10 @@ $fieldname = $selectedfields[3]; if($fieldname == "parent_id") { - if($this->primarymodule == "HelpDesk") + if($this->primarymodule == "HelpDesk" && $selectedfields[0] == "vtiger_crmentityRelHelpDesk") { $querycolumn = "case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then vtiger_contactdetailsRelHelpDesk.lastname End"." '".$selectedfields[2]."', vtiger_crmentityRelHelpDesk.setype 'Entity_type'"; + return $querycolumn; } if($this->primarymodule == "Products" || $this->secondarymodule == "Products") { From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 04:16:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 11:16:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231443=3A?= =?utf-8?q?_Outlook_Installer_Hangs_after_installation?= Message-ID: <076.50e749c979af5ab4aee2e61a62d25da5@vtiger.fosslabs.com> #1443: Outlook Installer Hangs after installation -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- After installing Outlook Plugin, the installer hangs in MS Outlook 2000. Gopal -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 04:17:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 11:17:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7768 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060704111715.EFCE45FD33E@vtiger.fosslabs.com> Author: saraj Date: Tue Jul 4 05:17:12 2006 New Revision: 7768 Log: changes made to fix the issue in activity relatedlist Modified: vtigercrm/trunk/include/utils/ListViewUtils.php Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Tue Jul 4 05:17:12 2006 @@ -2550,10 +2550,9 @@ } elseif($currentmodule=="Contacts" && $returnmodule == "Activities") { - $reltable = 'vtiger_seactivityrel'; + $reltable = 'vtiger_cntactivityrel'; $condition = 'WHERE activityid = '.$recordid; - $selectfield = 'crmid'; - $field = 'contactid'; + $field = $selectfield = 'contactid'; $table = 'vtiger_contactdetails'; } elseif($currentmodule=="Leads" && $returnmodule == "Campaigns") From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 04:20:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 11:20:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231435=3A?= =?utf-8?q?_Javascript_Error_in_mass_Delete/Change_in_ListViews_=28documen?= =?utf-8?q?t=2Emassdelete=2Eviewname_error=29?= In-Reply-To: <076.7c24a51898221161b98a2d2637f73472@vtiger.fosslabs.com> References: <076.7c24a51898221161b98a2d2637f73472@vtiger.fosslabs.com> Message-ID: <085.6f3c2e265b73465b28ed39dc11c278dc@vtiger.fosslabs.com> #1435: Javascript Error in mass Delete/Change in ListViews (document.massdelete.viewname error) ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: jeri Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * priority: critical => major -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 04:25:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 11:25:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231444=3A?= =?utf-8?q?_Outlook_Plugin_-_Unable_to_Login?= Message-ID: <076.c2322ae5413c06f8234f71971067af79@vtiger.fosslabs.com> #1444: Outlook Plugin - Unable to Login ---------------------------+------------------------------------------------ Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: outlookplugin | Version: 5.0.0 Keywords: | ---------------------------+------------------------------------------------ I am unable to log in to Outlook Plugin, after specifying a correct user name password. Gopal -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 04:29:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 11:29:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7769 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060704112906.45169167745@vtiger.fosslabs.com> Author: richie Date: Tue Jul 4 05:28:45 2006 New Revision: 7769 Log: fixed the foreign key issue. Now the foreign keys will be created and the database engine type will be innodb Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Tue Jul 4 05:28:45 2006 @@ -1,5298 +1,6108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - user_name - - - user_password - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - smcreatorid - - - smownerid - - - modifiedby - - - deleted - smownerid - - - smownerid - deleted - - Type=InnoDB -
- - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - name - - - - modifiedby - - - tabid - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tabid - -
- - - - - - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tabid - - - fieldname - - - block - - - displaytype - - Type=InnoDB -
- - - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - account_type - - Type=InnoDB -
- - - - - - REFERENCES vtiger_account(accountid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_account(accountid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_account(accountid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - accountid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - - - - - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - - - - - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - - - - - - - - - - - - -
- - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - - -
- - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - converted - leadstatus - - Type=InnoDB -
- - - - - - REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE - - - - - - - - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE - - - - - - - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - - - - title - - - notesid - - - crmid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - accountid - - - potentialid - - - sales_stage - - Type=InnoDB -
- - - - - - - - - REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE - - - - - - - - - - potentialid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - activityid - subject - - - activitytype - date_start - - - date_start - due_date - - - date_start - time_start - - - eventstatus - - - status - eventstatus - - Type=InnoDB -
- - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - attachmentsid - - - description - name - type - attachmentsid - - Type=InnoDB -
- - - - - - - - - - REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE - - - - attachmentsid - - - crmid - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - attachmentsid - crmid - - Type=InnoDB -
- - - - - - - - - - -
- - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE - - - - REFERENCES vtiger_competitor(competitorid) ON DELETE CASCADE - - - - potentialid - - - competitorid - - Type=InnoDB -
- - - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - - - - - - - - Type=InnoDB -
- - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - - currency - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - visibility - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - - manufacturer - - Type=InnoDB -
- - - - - REFERENCES vtiger_products(productid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - - - productid - filename - - Type=InnoDB -
- - - - - - - - - - Type=InnoDB -
- - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - - roleid - - Type=InnoDB -
- - - - - - - - - - groupname - - - Type=InnoDB -
- - - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - groupid - userid - -
- - - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - -
- - - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - -
- - - - - - REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE - - - - - REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE - - - - leadid - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - - - - - - - - campaignstatus - - - campaignname - - - campaignid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE - - - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - - contactid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE - - - - - - REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE - - - - leadid - campaignid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE - - - - - - - - contactid - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - Type=InnoDB -
- - - - - - REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE - - - - - REFERENCES vtiger_account(accountid) ON DELETE CASCADE - - - - accountid - - Type=InnoDB -
- - - - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - - - REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE - - - - potentialid - - - contactid - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - dealname - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - - - REFERENCES vtiger_activity(activityid) ON DELETE CASCADE - - - - contactid - - Type=InnoDB -
- - - - - - - - - - - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - - - - name - - - - createdby - - Type=InnoDB -
- - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - REFERENCES vtiger_notes(notesid) ON DELETE CASCADE - - - - notesid - - - crmid - - Type=InnoDB -
- - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - - - ticketid - - - status - - Type=InnoDB -
- - - - - - - - REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE - - - - - - - - - - - - - ticketid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - - REFERENCES vtiger_activity(activityid) ON DELETE CASCADE - - - - activityid - - - smid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE - - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - - vendorid - - - contactid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - - REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE - - - - smid - - - id - - Type=InnoDB -
- - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - REFERENCES vtiger_activity(activityid) ON DELETE CASCADE - - - - activityid - - - crmid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - REFERENCES vtiger_products(productid) ON DELETE CASCADE - - - - productid - - - crmid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE - - - - crmid - - - ticketid - - Type=InnoDB -
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - assigned_user_id - module - name - deleted - -
- - - - - REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupname) ON DELETE CASCADE - - - - leadid - - - groupname - - Type=InnoDB -
- - - - - REFERENCES vtiger_account(accountid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupname) ON DELETE CASCADE - - - - groupname - - Type=InnoDB -
- - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupname) ON DELETE CASCADE - - - - groupname - - Type=InnoDB -
- - - - - REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupname) ON DELETE CASCADE - - - - groupname - - Type=InnoDB -
- - - - - REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupname) ON DELETE CASCADE - - - - groupname - - Type=InnoDB -
- - - - - REFERENCES vtiger_activity(activityid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupname) ON DELETE CASCADE - - - - activityid - - - groupname - - Type=InnoDB -
- - - - - REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupname) ON DELETE CASCADE - - - - ticketid - - - groupname - - Type=InnoDB -
- - - - - - - - - - - -
- - - - - - - - - - - - - - - - -
- - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - - -
- - - - - - - - - - - - - - - - - - foldername - templatename - subject - -
- - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - - - - - - - - id - - Type=InnoDB -
- - - - - - - - REFERENCES vtiger_faq(id) ON DELETE CASCADE - - - - - - - - faqid - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - assigned_user_id - name - deleted - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - REFERENCES vtiger_notes(notesid) ON DELETE CASCADE - - - - notesid - - - crmid - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - - ticket_id - -
- - - - - - REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_products(productid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - - - - - - - - - - - - assigned_user_id - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - deploymentstatus - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - ownership - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - rating - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - region - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - accounttype - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - contacttype - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - opportunity_type - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - stage - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - - - - stage - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - priority - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - businesstype - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - industry - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - revenuetype - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - activitytype - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - usertype - - - Type=InnoDB -
- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - purpose - - - Type=InnoDB -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
- - - - - - - - - - - - Type=InnoDB -
- - - - - REFERENCES vtiger_profile(profileid) ON DELETE CASCADE - - - - - - - - profileid - globalactionid - - Type=InnoDB -
- - - - - - - - - - - profileid - tabid - -
- - - - - - - - - - - - - - - profileid - tabid - Operation - -
- - - - - - - - - - - - - - profileid - tabid - fieldname - - - tabid - profileid - - - visible - profileid - -
- - - - - - - - - - roleid - profileid - -
- - - - - - - - Type=InnoDB -
- - - - - - - - - - - REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE - - -
- - - - - - - - - - - tabid - fieldid - - - tabid - - - visible - fieldid - -
- - - - - - - - - - - - - - - profileid - tabid - activityid - -
- - - - - - - - - - - - - - - - - - - - productcategory - - - Type=InnoDB -
- - - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - - vendorid - - - contactid - - Type=InnoDB -
- - - - - REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupname) ON DELETE CASCADE - - - - groupname - - Type=InnoDB -
- - - - - - REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE - - - - REFERENCES vtiger_products(productid) ON DELETE CASCADE - - - - - - - - - salesorderid - - - productid - - Type=InnoDB -
- - - - - - - - - - - - - - schedulednotificationname - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_activity(activityid) ON DELETE CASCADE - - - - - REFERENCES vtiger_products(productid) ON DELETE CASCADE - - - - activityid - - - productid - - Type=InnoDB -
- - - - - - - - - - - - - - - - - relation_id - -
- - - - - - - - - - - - - - - - -
- - - - - - REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE - - - - REFERENCES vtiger_products(productid) ON DELETE CASCADE - - - - - pricebookid - - - productid - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE - - - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - - - - - - - - - - - - - quotestage - - - potentialid - - - contactid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupname) ON DELETE CASCADE - - - - groupname - - Type=InnoDB -
- - - - - - REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE - - - - REFERENCES vtiger_products(productid) ON DELETE CASCADE - - - - - - - - - quoteid - - - productid - - Type=InnoDB -
- - - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE - - - REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE - - - - - REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE - - - - - - - - - - - - - - - vendorid - - - quoteid - - - contactid - - Type=InnoDB -
- - - - - REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupname) ON DELETE CASCADE - - - - groupname - purchaseorderid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE - - - - REFERENCES vtiger_products(productid) ON DELETE CASCADE - - - - - - - - - quoteid - - - productid - - Type=InnoDB -
- - - - - - - REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - - - - REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - - - - - - invoiceid - - Type=InnoDB -
- - - - - REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupname) ON DELETE CASCADE - - - - groupname - invoiceid - - Type=InnoDB -
- - - - - - REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE - - - - REFERENCES vtiger_products(productid) ON DELETE CASCADE - - - - - - - - - invoice - - - productid - - Type=InnoDB -
- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - Type=InnoDB -
- - - - - - REFERENCES vtiger_customview (cvid) ON DELETE CASCADE - - - - - - - - - - - columnindex - - - cvid - - Type=InnoDB -
- - - - - REFERENCES vtiger_customview (cvid) ON DELETE CASCADE - - - - - - - - - - - - - - - - cvid - - Type=InnoDB -
- - - - - REFERENCES vtiger_customview (cvid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - cvid - - Type=InnoDB -
- - - - - REFERENCES vtiger_customview (cvid) ON DELETE CASCADE - - - - - - - - - - - - - cvid - - Type=InnoDB -
- - - - - - - - - - - - - - queryid - - Type=InnoDB -
- - - - - REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE - - - - - - - - - - - - queryid - - Type=InnoDB -
- - - - - REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE - - - - - - - - - - - - - - - - - queryid - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - Type=InnoDB -
- - - - - - - - REFERENCES vtiger_reportfolder (folderid) ON DELETE CASCADE - - - - - - - - - - - - - - REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE - - - - - - - - - - - - - queryid - - - folderid - - Type=InnoDB -
- - - - - REFERENCES vtiger_report (reportid) ON DELETE CASCADE - - - - - - - - - - Type=InnoDB -
- - - - - - - - REFERENCES vtiger_report (reportid) ON DELETE CASCADE - - - - - - - - - Type=InnoDB -
- - - - - REFERENCES vtiger_report (reportid) ON DELETE CASCADE - - - - - - - - - - - - - - - - datefilterid - - Type=InnoDB -
- - - - - REFERENCES vtiger_report (reportid) ON DELETE CASCADE - - - - - - - - - - - reportsummaryid - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - usageunit - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - glacct - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - quotestage - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - invoicestatus - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - postatus - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - sostatus - - - Type=InnoDB - -
- - - - - - - - - - - - - - - - - - - - carrier - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - taxclass - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - recurringtype - - - Type=InnoDB -
- - - - - - - - - - - - - Type=InnoDB -
- - - - - - - - - - - - Type=InnoDB -
- - - - - - - - - -
- - - - - - - - - - - - - - Type=InnoDB -
- - - - - - - - - - - Type=InnoDB -
- - - - - REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - Type=InnoDB -
- - - - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - - - tabid - user_id - - Type=InnoDB -
- - - - - - - - crmid - flag - - Type=InnoDB -
- - - - - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - Type=InnoDB - - tabid - -
- - - - - REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - - - share_groupid - - - to_groupid - - Type=InnoDB -
- - - - - REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - - - share_groupid - - - to_roleid - - Type=InnoDB -
- - - - - REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - - - share_groupid - - - to_roleandsubid - - Type=InnoDB -
- - - - - REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - - - share_roleid - - - to_groupid - - Type=InnoDB -
- - - - - REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - - - share_roleid - - - to_roleid - - Type=InnoDB -
- - - - - REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - - - share_roleid - - - to_roleandsubid - - Type=InnoDB -
- - - - - REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - - - share_roleandsubid - - - to_groupid - - Type=InnoDB -
- - - - - REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - - - share_roleandsubid - - - to_roleid - - Type=InnoDB -
- - - - - REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - REFERENCES vtiger_role(roleid) ON DELETE CASCADE - - - - - share_roleandsubid - - - to_roleandsubid - - Type=InnoDB -
- - - - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - tabid - - - relatedto_tabid - - Type=InnoDB -
- - - - - - - - - - - - shareid - permission - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - parenttabid - parenttab_label - visible - -
- - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - userid - shareduserid - - Type=InnoDB -
- - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - - userid - sharedgroupid - - Type=InnoDB -
- - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - userid - shareduserid - - Type=InnoDB -
- - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - - userid - sharedgroupid - - Type=InnoDB -
- - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - userid - shareduserid - relatedtabid - - Type=InnoDB -
- - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - - userid - sharedgroupid - tabid - - Type=InnoDB -
- - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - userid - shareduserid - tabid - - Type=InnoDB -
- - - - - REFERENCES vtiger_users(id) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - - - - REFERENCES vtiger_groups(groupid) ON DELETE CASCADE - - - - userid - sharedgroupid - tabid - - Type=InnoDB -
- - - - - - - - - - - - - - tabid - parenttabid - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - campaigntype - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - campaignstatus - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - expectedresponse - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - portalname - - Type=InnoDB -
- - - - - - - - - - - - - creatorid - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - - - - nick - - - session - - - ping - - Type=InnoDB -
- - - - - - - - - - - REFERENCES vtiger_chat_users(id) ON DELETE CASCADE - - - - - - - - - - - - - - chat_from - - - chat_to - - - born - - Type=InnoDB -
- - - - - - - - - - REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE - - - - msg - - - Type=InnoDB -
- - - - - - - - - - REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE - - - msg - - - Type=InnoDB -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - tag_id - tagger_id - object_id - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- - - - - - - - - - - - - - taxname - - - Type=InnoDB -
- - - - - REFERENCES vtiger_products(productid) ON DELETE CASCADE - - - - - - - - - productid - - - taxid - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
- - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
- - - - - - - - - REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE - - - - - - - - purchaseorderid - - Type=InnoDB -
- - - - - - - - REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE - - - - - - - - salesorderid - - Type=InnoDB -
- - - - - - - - REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE - - - - - - - - quoteid - - Type=InnoDB -
- - - - - - - - REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE - - - - - - - - invoiceid - - Type=InnoDB -
- - - - - - - - - - Type=InnoDB -
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + user_name + + + user_password + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + smcreatorid + + + smownerid + + + modifiedby + + + deleted + smownerid + + + smownerid + deleted + + Type=InnoDB +
+ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + name + + + + modifiedby + + + tabid + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tabid + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tabid + + + fieldname + + + block + + + displaytype + + Type=InnoDB +
+ + + ADD CONSTRAINT fk_1_vtiger_field FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE + Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + account_type + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_account FOREIGN KEY (accountid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_accountbillads FOREIGN KEY (accountaddressid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_accountshipads FOREIGN KEY (accountaddressid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_accountscf FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + accountid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_contactdetails FOREIGN KEY (contactid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_contactsubdetails FOREIGN KEY (contactsubscriptionid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_contactaddress FOREIGN KEY (contactaddressid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_contactscf FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + +
+ + +ADD CONSTRAINT fk_1_vtiger_portalinfo FOREIGN KEY (id) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + +
+ + +ADD CONSTRAINT fk_1_vtiger_customerdetails FOREIGN KEY (customerid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + converted + leadstatus + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_leaddetails FOREIGN KEY (leadid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_leadsubdetails FOREIGN KEY (leadsubscriptionid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_leadaddress FOREIGN KEY (leadaddressid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_leadscf FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + title + + + notesid + + + crmid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_notes FOREIGN KEY (notesid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + accountid + + + potentialid + + + sales_stage + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_potential FOREIGN KEY (potentialid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + potentialid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_potstagehistory FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_potentialscf FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + activityid + subject + + + activitytype + date_start + + + date_start + due_date + + + date_start + time_start + + + eventstatus + + + status + eventstatus + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_activity FOREIGN KEY (activityid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + attachmentsid + + + description + name + type + attachmentsid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_attachments FOREIGN KEY (attachmentsid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + attachmentsid + + + crmid + + + attachmentsid + crmid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_seattachmentsrel FOREIGN KEY (attachmentsid) REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seattachmentsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_competitor FOREIGN KEY (competitorid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + potentialid + + + competitorid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_potcompetitorrel FOREIGN KEY (competitorid) REFERENCES vtiger_competitor(competitorid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_potcompetitorrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_vendor FOREIGN KEY (vendorid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_products FOREIGN KEY (productid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + currency + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + visibility + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + + manufacturer + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + + + + productid + filename + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_productcollaterals FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + Type=InnoDB +
+ + + + + + + + + + + roleid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_user2role FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_user2role FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + groupname + + + Type=InnoDB +
+ + + + + + + + + + + groupid + userid + +
+ + +ADD CONSTRAINT fk_1_vtiger_users2group FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_users2group FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_group2grouprel FOREIGN KEY (containsgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_group2grouprel FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + +
+ + +ADD CONSTRAINT fk_1_vtiger_group2role FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_group2role FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + +
+ + +ADD CONSTRAINT fk_1_vtiger_group2rs FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_group2rs FOREIGN KEY (roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + leadid + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_leadpotrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadpotrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + campaignstatus + + + campaignname + + + campaignid + + Type=InnoDB +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_campaignscf FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + contactid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_campaigncontrel FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_campaigncontrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + leadid + campaignid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_campaignleadrel FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_campaignleadrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + contactid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_leadcontrel FOREIGN KEY (leadcontrel_contactid_idx) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadcontrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + accountid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_leadacctrel FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadacctrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + potentialid + + + contactid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_contpotentialrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_contpotentialrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dealname + + + Type=InnoDB +
+ + + + + + + + + + + + + contactid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_cntactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_cntactivityrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + name + + + + createdby + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_lar FOREIGN KEY (createdby) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + notesid + + + crmid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_crmentitynotesrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_crmentitynotesrel FOREIGN KEY (notesid) REFERENCES vtiger_notes(notesid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + ticketid + + + status + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_troubletickets FOREIGN KEY (ticketid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + ticketid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_ticketcomments FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + activityid + + + smid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_salesmanactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_salesmanactivityrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + vendorid + + + contactid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_vendorcontactrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_vendorcontactrel FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + smid + + + id + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_salesmanticketrel FOREIGN KEY (id) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_salesmanticketrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + activityid + + + crmid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_seactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seactivityrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + productid + + + crmid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_seproductsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seproductsrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + crmid + + + ticketid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_seticketsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seticketsrel FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + assigned_user_id + module + name + deleted + +
+ + + + + + + + + + leadid + + + groupname + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_leadgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadgrouprelation FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + groupname + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_accountgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + groupname + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_contactgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + groupname + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_potentialgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + groupname + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_campaigngrouprelation FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_campaigngrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + activityid + + + groupname + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_activitygrouprelation FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_activitygrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + ticketid + + + groupname + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_ticketgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_ticketgrouprelation FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + +ADD CONSTRAINT fk_1_vtiger_defaultcv FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + foldername + templatename + subject + +
+ + + + + + + + + + + + + + + + + + + + id + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_faq FOREIGN KEY (id) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + faqid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_faqcomments FOREIGN KEY (faqid) REFERENCES vtiger_faq(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + assigned_user_id + name + deleted + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + notesid + + + crmid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_senotesrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_senotesrel FOREIGN KEY (notesid) REFERENCES vtiger_notes(notesid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + ticket_id + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_ticketcf FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_productcf FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + assigned_user_id + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + deploymentstatus + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + ownership + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + rating + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + region + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + accounttype + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + contacttype + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + opportunity_type + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + stage + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + + + + stage + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + priority + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + businesstype + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + industry + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + revenuetype + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + activitytype + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + usertype + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + purpose + + + Type=InnoDB +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
+ + + + + + + + + + + + Type=InnoDB +
+ + + + + + + + + + + + profileid + globalactionid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_profile2globalpermissions FOREIGN KEY (profileid) REFERENCES vtiger_profile(profileid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + profileid + tabid + +
+ + + + + + + + + + + + + + + profileid + tabid + Operation + +
+ + + + + + + + + + + + + + profileid + tabid + fieldname + + + tabid + profileid + + + visible + profileid + +
+ + + + + + + + + + roleid + profileid + +
+ + + + + + + + Type=InnoDB +
+ + + + + + + + + + + + +
+ + +ADD CONSTRAINT fk_1_vtiger_def_org_share FOREIGN KEY (permission) REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + tabid + fieldid + + + tabid + + + visible + fieldid + +
+ + + + + + + + + + + + + + + profileid + tabid + activityid + +
+ + + + + + + + + + + + + + + + + + + + productcategory + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vendorid + + + contactid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_salesorder FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_salesorder FOREIGN KEY (salesorderid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_salesorder FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + groupname + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_sogrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_sobillads FOREIGN KEY (sobilladdressid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_soshipads FOREIGN KEY (soshipaddressid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_salesordercf FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + salesorderid + + + productid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_soproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_soproductrel FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + schedulednotificationname + + + Type=InnoDB +
+ + + + + + + + + + + + + activityid + + + productid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_activityproductrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_activityproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + relation_id + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_vendorcf FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_pricebook FOREIGN KEY (pricebookid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_pricebookcf FOREIGN KEY (pricebookid) REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + pricebookid + + + productid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_pricebookproductrel FOREIGN KEY (pricebookid) REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_pricebookproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + quotestage + + + potentialid + + + contactid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_quotes FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_quotes FOREIGN KEY (quoteid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_quotes FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_quotesbillads FOREIGN KEY (quotebilladdressid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_quotesshipads FOREIGN KEY (quoteshipaddressid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + groupname + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_quotegrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_quotescf FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + quoteid + + + productid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_quotesproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_quotesproductrel FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vendorid + + + quoteid + + + contactid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_purchaseorder FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_purchaseorder FOREIGN KEY (purchaseorderid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_purchaseorder FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_purchaseorder FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + groupname + purchaseorderid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_pogrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_pobillads FOREIGN KEY (pobilladdressid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_poshipads FOREIGN KEY (poshipaddressid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_purchaseordercf FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + quoteid + + + productid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_poproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_poproductrel FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + invoiceid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_invoice FOREIGN KEY (invoiceid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_invoice FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + groupname + invoiceid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_invoicegrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_invoicebillads FOREIGN KEY (invoicebilladdressid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_invoiceshipads FOREIGN KEY (invoiceshipaddressid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_invoicecf FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + invoice + + + productid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_invoiceproductrel FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_invoiceproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + columnindex + + + cvid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_cvcolumnlist FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + cvid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_cvstdfilter FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + cvid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_cvadvfilter FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + cvid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_customaction FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + queryid + + Type=InnoDB +
+ + + + + + + + + + + + + + + + queryid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_selectcolumn FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + + queryid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_relcriteria FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + queryid + + + folderid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_report FOREIGN KEY (folderid) REFERENCES vtiger_reportfolder (folderid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_report FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_reportmodules FOREIGN KEY (reportmodulesid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_reportsortcol FOREIGN KEY (reportid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + datefilterid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_reportdatefilter FOREIGN KEY (datefilterid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + reportsummaryid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_reportsummary FOREIGN KEY (reportsummaryid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + usageunit + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + glacct + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + quotestage + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + invoicestatus + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + postatus + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + sostatus + + + Type=InnoDB + +
+ + + + + + + + + + + + + + + + + + + + carrier + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + taxclass + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + recurringtype + + + Type=InnoDB +
+ + + + + + + + + + + + + Type=InnoDB +
+ + + + + + + + + + + + Type=InnoDB +
+ + + + + + + + + +
+ + + + + + + + + + + + + + Type=InnoDB +
+ + + + + + + + + + + Type=InnoDB +
+ + + + + + + + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_org_share_action2tab FOREIGN KEY (share_action_id) REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_org_share_action2tab FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + tabid + user_id + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_moduleowners FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + crmid + flag + + Type=InnoDB +
+ + + + + + + + + + + Type=InnoDB + + tabid + +
+ + +ADD CONSTRAINT fk_1_vtiger_datashare_module_rel FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + share_groupid + + + to_groupid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_datashare_grp2grp FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_grp2grp FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_grp2grp FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + share_groupid + + + to_roleid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_datashare_grp2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_grp2role FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_grp2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + share_groupid + + + to_roleandsubid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_datashare_grp2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_grp2rs FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_grp2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + share_roleid + + + to_groupid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_datashare_role2group FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_role2group FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_role2group FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + share_roleid + + + to_roleid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_datashare_role2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_role2role FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_role2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + share_roleid + + + to_roleandsubid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_datashare_role2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_role2rs FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_role2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + share_roleandsubid + + + to_groupid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_datashare_rs2grp FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_rs2grp FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_rs2grp FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + share_roleandsubid + + + to_roleid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_datashare_rs2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_rs2role FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_rs2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + share_roleandsubid + + + to_roleandsubid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_datashare_rs2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_rs2rs FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_rs2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + tabid + + + relatedto_tabid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_datashare_relatedmodules FOREIGN KEY (relatedto_tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_relatedmodules FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + shareid + permission + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + parenttabid + parenttab_label + visible + +
+ + + + + + + + + + + + + + userid + shareduserid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_tmp_read_user_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_user_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_user_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + userid + sharedgroupid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_tmp_read_group_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_group_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_group_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + userid + shareduserid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_tmp_write_user_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_user_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_user_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + userid + sharedgroupid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_tmp_write_group_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_group_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_group_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + userid + shareduserid + relatedtabid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + userid + sharedgroupid + tabid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + userid + shareduserid + tabid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + userid + sharedgroupid + tabid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + tabid + parenttabid + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + campaigntype + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + campaignstatus + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + expectedresponse + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + portalname + + Type=InnoDB +
+ + + + + + + + + + + + + creatorid + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + + + + nick + + + session + + + ping + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + + + + + chat_from + + + chat_to + + + born + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_chat_msg FOREIGN KEY (chat_from) REFERENCES vtiger_chat_users(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + msg + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_chat_pchat FOREIGN KEY (msg) REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + msg + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_chat_pvchat FOREIGN KEY (msg) REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + tag_id + tagger_id + object_id + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + + + + + + taxname + + + Type=InnoDB +
+ + + + + + + + + + + + + productid + + + taxid + + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_producttaxrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
+ + + + + + + + + + + + + + + + purchaseorderid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_postatushistory FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + salesorderid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_sostatushistory FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + quoteid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_quotestagehistory FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + + + + + + + invoiceid + + Type=InnoDB +
+ + +ADD CONSTRAINT fk_1_vtiger_invoicestatushistory FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
+ + + + + + + + + + Type=InnoDB +
+ + From vtiger-tickets at vtiger.fosslabs.com Tue Jul 4 04:30:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 04 Jul 2006 11:30:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231445=3A?= =?utf-8?q?_Outlook_Plugin_-_Unable_to_install?= Message-ID: <076.8252ba0846307701ff5d759d89a6bbb2@vtiger.fosslabs.com> #1445: Outlook Plugin - Unable to install -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- I am unable to uninstall Outlook Plugin from Settings --> Add/Remove Tools settings. Gopal -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 04:32:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 11:32:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7770 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060704113201.78EDF5F34AB@vtiger.fosslabs.com> Author: richie Date: Tue Jul 4 05:31:53 2006 New Revision: 7770 Log: checked for DB connection in createTables() Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Tue Jul 4 05:31:53 2006 @@ -1,215 +1,217 @@ -column_fields["last_name"] = 'Administrator'; - $user->column_fields["user_name"] = 'admin'; - $user->column_fields["status"] = 'Active'; - $user->column_fields["is_admin"] = 'on'; - $user->column_fields["user_password"] = $admin_password; - $user->column_fields["tz"] = 'Europe/Berlin'; - $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,'; - $user->column_fields["workdays"] = '0,1,2,3,4,5,6,'; - $user->column_fields["weekstart"] = '1'; - $user->column_fields["namedays"] = ''; - $user->column_fields["currency_id"] = 1; - $user->column_fields["date_format"] = 'yyyy-mm-dd'; - $user->column_fields["hour_format"] = 'am/pm'; - $user->column_fields["start_hour"] = '08:00'; - $user->column_fields["end_hour"] = '23:00'; - // added by jeri to populate default image and tagcloud for admin - $user->column_fields["imagename"] = 'shanky.jpg'; - $user->column_fields["tagcloud"] = ''; - $user->column_fields["activity_view"] = 'This Year'; - $user->column_fields["defhomeview"] = 'home_metrics'; - //added by philip for default default admin emailid - if($admin_email == '') - $admin_email ="admin at administrator.com"; - $user->column_fields["email"] = $admin_email; - //to get the role id for standard_user - $role_query = "select roleid from vtiger_role where rolename='CEO'"; - $db->database->SetFetchMode(ADODB_FETCH_ASSOC); - $role_result = $db->query($role_query); - $role_id = $db->query_result($role_result,0,"roleid"); - $user->column_fields["roleid"] = $role_id; - - $user->save("Users"); - - // we need to change the admin user to a fixed id of 1. - //$query = "update vtiger_users set id='1' where user_name='$user->user_name'"; - //$result = $db->query($query, true, "Error updating admin user ID: "); - - $log->info("Created ".$user->table_name." vtiger_table. for user $user->id"); - - //Creating the flat files - createUserPrivilegesfile($user->id); - createUserSharingPrivilegesfile($user->id); - - - //Creating the Standard User - $user = new User(); - $user->column_fields["last_name"] = 'StandardUser'; - $user->column_fields["user_name"] = 'standarduser'; - $user->column_fields["is_admin"] = 'off'; - $user->column_fields["status"] = 'Active'; - $user->column_fields["user_password"] = 'standarduser'; - $user->column_fields["tz"] = 'Europe/Berlin'; - $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,'; - $user->column_fields["workdays"] = '0,1,2,3,4,5,6,'; - $user->column_fields["weekstart"] = '1'; - $user->column_fields["namedays"] = ''; - $user->column_fields["currency_id"] = 1; - $user->column_fields["date_format"] = 'yyyy-mm-dd'; - // added by jeri to populate default image and tagcloud for admin - $user->column_fields["imagename"] = 'ela.jpg'; - $user->column_fields["activity_view"] = 'This Year'; - $user->column_fields["tagcloud"] = ''; - $user->column_fields["defhomeview"] = 'home_metrics'; - //added by philip for default default admin emailid - if($admin_email == '') - $std_email ="standarduser at standarduser.com"; - $user->column_fields["email"] = $std_email; - //to get the role id for standard_user - $role_query = "select roleid from vtiger_role where rolename='Vice President'"; - $db->database->SetFetchMode(ADODB_FETCH_ASSOC); - $role_result = $db->query($role_query); - $role_id = $db->query_result($role_result,0,"roleid"); - $user->column_fields["roleid"] = $role_id; - - $user->save('Users'); - - //Creating the flat vtiger_files - createUserPrivilegesfile($user->id); - createUserSharingPrivilegesfile($user->id); - -} - -//$startTime = microtime(); -$modules = array("DefaultDataPopulator"); -$focus=0; -// tables creation -eecho("Creating Core tables: "); -$success = $db->createTables("schema/DatabaseSchema.xml"); - -// TODO HTML -if($success==0) - die("Error: Tables not created. Table creation failed.\n"); -elseif ($success==1) - die("Error: Tables partially created. Table creation failed.\n"); -else - eecho("Tables Successfully created.\n"); - -foreach ($modules as $module ) -{ - $focus = new $module(); - $focus->create_tables(); -} - - -// create and populate combo tables -require_once('include/PopulateComboValues.php'); -$combo = new PopulateComboValues(); -$combo->create_tables(); - -//Writing tab data in flat file -create_tab_data_file(); -create_parenttab_data_file(); - -create_default_users(); - -// default report population -require_once('modules/Reports/PopulateReports.php'); - -// default customview population -require_once('modules/CustomView/PopulateCustomView.php'); - - -// ensure required sequences are created (adodb creates them as needed, but if -// creation occurs within a transaction we get problems -$db->getUniqueID("vtiger_crmentity"); -$db->getUniqueID("vtiger_seactivityrel"); -$db->getUniqueID("vtiger_freetags"); - -// populate the db with seed data -if ($db_populate) { - eecho ("Populate seed data into $db_name"); - include("install/populateSeedData.php"); - eecho ("...done

\n"); -} - -// populate forums data -global $log, $db; - -//$endTime = microtime(); -//$deltaTime = microtime_diff($startTime, $endTime); - - -// populate calendar data - -//eecho ("total time: $deltaTime seconds.\n"); -?> +column_fields["last_name"] = 'Administrator'; + $user->column_fields["user_name"] = 'admin'; + $user->column_fields["status"] = 'Active'; + $user->column_fields["is_admin"] = 'on'; + $user->column_fields["user_password"] = $admin_password; + $user->column_fields["tz"] = 'Europe/Berlin'; + $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,'; + $user->column_fields["workdays"] = '0,1,2,3,4,5,6,'; + $user->column_fields["weekstart"] = '1'; + $user->column_fields["namedays"] = ''; + $user->column_fields["currency_id"] = 1; + $user->column_fields["date_format"] = 'yyyy-mm-dd'; + $user->column_fields["hour_format"] = 'am/pm'; + $user->column_fields["start_hour"] = '08:00'; + $user->column_fields["end_hour"] = '23:00'; + // added by jeri to populate default image and tagcloud for admin + $user->column_fields["imagename"] = 'shanky.jpg'; + $user->column_fields["tagcloud"] = ''; + $user->column_fields["activity_view"] = 'This Year'; + $user->column_fields["defhomeview"] = 'home_metrics'; + //added by philip for default default admin emailid + if($admin_email == '') + $admin_email ="admin at administrator.com"; + $user->column_fields["email"] = $admin_email; + //to get the role id for standard_user + $role_query = "select roleid from vtiger_role where rolename='CEO'"; + $db->checkConnection(); + $db->database->SetFetchMode(ADODB_FETCH_ASSOC); + $role_result = $db->query($role_query); + $role_id = $db->query_result($role_result,0,"roleid"); + $user->column_fields["roleid"] = $role_id; + + $user->save("Users"); + + // we need to change the admin user to a fixed id of 1. + //$query = "update vtiger_users set id='1' where user_name='$user->user_name'"; + //$result = $db->query($query, true, "Error updating admin user ID: "); + + $log->info("Created ".$user->table_name." vtiger_table. for user $user->id"); + + //Creating the flat files + createUserPrivilegesfile($user->id); + createUserSharingPrivilegesfile($user->id); + + + //Creating the Standard User + $user = new User(); + $user->column_fields["last_name"] = 'StandardUser'; + $user->column_fields["user_name"] = 'standarduser'; + $user->column_fields["is_admin"] = 'off'; + $user->column_fields["status"] = 'Active'; + $user->column_fields["user_password"] = 'standarduser'; + $user->column_fields["tz"] = 'Europe/Berlin'; + $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,'; + $user->column_fields["workdays"] = '0,1,2,3,4,5,6,'; + $user->column_fields["weekstart"] = '1'; + $user->column_fields["namedays"] = ''; + $user->column_fields["currency_id"] = 1; + $user->column_fields["date_format"] = 'yyyy-mm-dd'; + // added by jeri to populate default image and tagcloud for admin + $user->column_fields["imagename"] = 'ela.jpg'; + $user->column_fields["activity_view"] = 'This Year'; + $user->column_fields["tagcloud"] = ''; + $user->column_fields["defhomeview"] = 'home_metrics'; + //added by philip for default default admin emailid + if($admin_email == '') + $std_email ="standarduser at standarduser.com"; + $user->column_fields["email"] = $std_email; + //to get the role id for standard_user + $role_query = "select roleid from vtiger_role where rolename='Vice President'"; + $db->database->SetFetchMode(ADODB_FETCH_ASSOC); + $role_result = $db->query($role_query); + $role_id = $db->query_result($role_result,0,"roleid"); + $user->column_fields["roleid"] = $role_id; + + $user->save('Users'); + + //Creating the flat vtiger_files + createUserPrivilegesfile($user->id); + createUserSharingPrivilegesfile($user->id); + +} + +//$startTime = microtime(); +$modules = array("DefaultDataPopulator"); +$focus=0; +// tables creation +eecho("Creating Core tables: "); +//$adb->setDebug(true); +$success = $adb->createTables("schema/DatabaseSchema.xml"); + +// TODO HTML +if($success==0) + die("Error: Tables not created. Table creation failed.\n"); +elseif ($success==1) + die("Error: Tables partially created. Table creation failed.\n"); +else + eecho("Tables Successfully created.\n"); + +foreach ($modules as $module ) +{ + $focus = new $module(); + $focus->create_tables(); +} + + +// create and populate combo tables +require_once('include/PopulateComboValues.php'); +$combo = new PopulateComboValues(); +$combo->create_tables(); + +//Writing tab data in flat file +create_tab_data_file(); +create_parenttab_data_file(); + +create_default_users(); + +// default report population +require_once('modules/Reports/PopulateReports.php'); + +// default customview population +require_once('modules/CustomView/PopulateCustomView.php'); + + +// ensure required sequences are created (adodb creates them as needed, but if +// creation occurs within a transaction we get problems +$db->getUniqueID("vtiger_crmentity"); +$db->getUniqueID("vtiger_seactivityrel"); +$db->getUniqueID("vtiger_freetags"); + +// populate the db with seed data +if ($db_populate) { + eecho ("Populate seed data into $db_name"); + include("install/populateSeedData.php"); + eecho ("...done

\n"); +} + +// populate forums data +global $log, $db; + +//$endTime = microtime(); +//$deltaTime = microtime_diff($startTime, $endTime); + + +// populate calendar data + +//eecho ("total time: $deltaTime seconds.\n"); +?> From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 04:39:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 11:39:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7771 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060704113955.06EDA5F34AB@vtiger.fosslabs.com> Author: richie Date: Tue Jul 4 05:39:52 2006 New Revision: 7771 Log: Notes added to Marketing tab Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jul 4 05:39:52 2006 @@ -2155,6 +2155,7 @@ $this->db->query("insert into vtiger_parenttabrel values (4,9,8)"); $this->db->query("insert into vtiger_parenttabrel values (2,17,7)"); $this->db->query("insert into vtiger_parenttabrel values (4,17,9)"); + $this->db->query("insert into vtiger_parenttabrel values (2,8,8)"); //Added to populate the default inventory tax informations $this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("vtiger_inventorytaxinfo").",'VAT','4.5')"); From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 4 04:43:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 04 Jul 2006 11:43:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7772 - /vtigertoolbar/trunk/firefox/chrome/content/create_rss.xul Message-ID: <20060704114335.63FCC5FD352@vtiger.fosslabs.com> Author: richie Date: Tue Jul 4 05:43:31 2006 New Revision: 7772 Log: changed the label Modified: vtigertoolbar/trunk/firefox/chrome/content/create_rss.xul Modified: vtigertoolbar/trunk/firefox/chrome/content/create_rss.xul ============================================================================== --- vtigertoolbar/trunk/firefox/chrome/content/create_rss.xul (original) +++ vtigertoolbar/trunk/firefox/chrome/content/create_rss.xul Tue Jul 4 05:43:31 2006 @@ -28,7 +28,7 @@

{elseif $MODULE eq 'Contacts' && $SEARCH_MODULE eq ''}
+{elseif $SEARCH_MODULE neq ''} + + + + +
From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 5 06:02:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Jul 2006 13:02:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7866 - /vtigercrm/trunk/include/RelatedListView.php Message-ID: <20060705130237.6E0FE83FFB8@vtiger.fosslabs.com> Author: richie Date: Wed Jul 5 07:02:33 2006 New Revision: 7866 Log: changes made to fix the relatedlist issue Modified: vtigercrm/trunk/include/RelatedListView.php Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== --- vtigercrm/trunk/include/RelatedListView.php (original) +++ vtigercrm/trunk/include/RelatedListView.php Wed Jul 5 07:02:33 2006 @@ -135,7 +135,7 @@ //Retreiving the no of rows $count_query = "select count(*) count ".substr($query, stripos($query,'from'),strlen($query)); - $count_result = $adb->query(substr($count_query, stripos($count_query,'select'),stripos($count_query,'ORDER'))); + $count_result = $adb->query(substr($count_query, stripos($count_query,'select'),stripos($count_query,'ORDER BY'))); $noofrows = $adb->query_result($count_result,0,"count"); //Setting Listview session object while sorting/pagination From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 5 06:03:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Jul 2006 13:03:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7867 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060705130332.9150B83FFC0@vtiger.fosslabs.com> Author: richie Date: Wed Jul 5 07:03:22 2006 New Revision: 7867 Log: Release Notes updated for vtigerCRM Beta2 Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Wed Jul 5 07:03:22 2006 @@ -23,6 +23,141 @@

+

vtiger CRM 5.0 Beta 2: Release Notes

+

Date: July 05, 2006

+

vtiger CRM 5.0 Beta 2 release is ready for end-user community testing. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Beta release i.e., changes since May, 06'. The noteworthy features in v5 Beta 2 are New user interface for Settings module, Audit Trails as part of the security management, complete Web mail integration (including Outgoing and Incoming mail capability), edit custom fields, enhanced user interface for Calendar, optimized the database queries further for List Views function in all the modules, and others.

+

IMPORTANT NOTES:

+
    +
  • We strongly recommend CRM community NOT to USE vtiger CRM 5 Beta 2 for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
    • +
  • vtiger CRM user interface can be best viewed in Mozilla/Firefox. We have some page loading page formatting issues in Internet Explorer, which will be fixed very soon.
    • +
  • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
    • +
  • Database migration script is provided for migrating data from v4.2.3 to v5 Beta 2 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
    • +
  • Database migration script is not provided for migrating data from v 5 Beta to v5 Beta 2. Hence users are strongly recommended to take a backup of the the v 5 Beta data before testing the migration script.
    • +
+

Appeal to Developers, Testers, Analysts, Writers, and real end users!

+

Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Beta 2,

+

Step 1: Browse through Live Demo

+

Step 2: Download product from the vtiger.com and install in your favorite Operating System.

+

Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

+

Table of Contents

+
    +
  1. Summary
    2. +
  2. Features
    3. +
  3. Bug Fixes
    4. +
  4. Known Issues
    5. +
+

1. Summary

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S. NoItemStatus
1 Features +

12

3Product SizePlatform Independent - 5.2 MB
+ Windows (EXE) - 26 MB
+ Linux (BIN) - 40 MB
4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 Beta 2)
5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
6Product Documentation

Available at the Wiki

+

2. Features

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S. No Feature
1Proxy Server configuration for accessing RSS feeds and information based on Ticker Symbol
2Vertical bar chart in Home page
3Security Management support for Emails module
4Database table prefix support for a deploying vtiger CRM in other working databases
5Audit Trial support for tracking all users system access details
6Last 5 records visited
7New User interface for Settings module
8Print Report function
9Email Detail View from Related List
10Attach multiple documents to email message
11Delete option for Tag cloud
12AJAX based edit option for User details
+

 

+ + + + + + +
+

Note:

+

Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

+

Line: 166

+

Assign values to the given variables: $server,$port,$user,$pwd

+

Bug Fixes

+

We have fixed about 1000 issues after v5 Beta release. For more details, kindly refer to the vtiger CRM Bug Tracker:

+

http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority

+

4. Known Issues

+

As of July 5, 2006 there are about 100 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

+

http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&group=owner&version=5.0.0&order=priority

+

vtiger CRM 5.0 Beta: Release Notes

Date: May 31, 2006

vtiger CRM 5.0 Beta release is ready for end-user community testing. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Alpha 5 release i.e., changes since Apr , 06' . The noteworthy features in v5 Beta are complete Web mail integration (including Outgoing and Incoming mail capability), Office Plugin, Outlook Plugin, Customer Portal, Web-Forms, Firefox Toolbar, @@ -48,7 +183,6 @@

  1. Summary
  2. Features
    3. -
  3. Bug Fixes
  4. Known Issues

1. Summary

From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 5 06:40:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Jul 2006 13:40:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7868 - /vtigercrm/trunk/index.php Message-ID: <20060705134036.9929A7727FA@vtiger.fosslabs.com> Author: saraj Date: Wed Jul 5 07:40:32 2006 New Revision: 7868 Log: Update audit trail query Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Wed Jul 5 07:40:32 2006 @@ -562,8 +562,12 @@ if($server == 'enabled') { + if($record == '') + $auditrecord = 0; + else + $auditrecord = $record; $date_var = date('YmdHis'); - $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$current_user->id.",'".$module."','".$action."',$date_var)"; + $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$current_user->id.",'".$module."','".$action."',".$auditrecord.",$date_var)"; $adb->query($query); } From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 5 06:43:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Jul 2006 13:43:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7869 - /vtigercrm/trunk/modules/Users/ShowAuditTrail.php Message-ID: <20060705134303.40CF883FFC1@vtiger.fosslabs.com> Author: saraj Date: Wed Jul 5 07:42:59 2006 New Revision: 7869 Log: Updated the show audit trail file Modified: vtigercrm/trunk/modules/Users/ShowAuditTrail.php Modified: vtigercrm/trunk/modules/Users/ShowAuditTrail.php ============================================================================== --- vtigercrm/trunk/modules/Users/ShowAuditTrail.php (original) +++ vtigercrm/trunk/modules/Users/ShowAuditTrail.php Wed Jul 5 07:42:59 2006 @@ -22,7 +22,7 @@ global $mod_strings; global $app_list_strings; global $current_language, $current_user, $adb; -$current_module_strings = return_module_language($current_language, 'Users'); +$current_module_strings = return_module_language($current_language, 'Settings'); global $list_max_entries_per_page; global $urlPrefix; @@ -64,8 +64,10 @@ $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Users","ShowAuditTrail",''); $smarty->assign("MOD", $current_module_strings); +$smarty->assign("CMOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("THEME_PATH",$theme_path); $smarty->assign("LIST_HEADER",$focus->getAuditTrailHeader()); $smarty->assign("LIST_ENTRIES",$focus->getAuditTrailEntries($userid, $navigation_array, $sorder, $sortby)); $smarty->assign("RECORD_COUNTS", $record_string); From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 5 06:54:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 05 Jul 2006 13:54:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7870 - in /vtigercrm/trunk: Smarty/templates/Header.tpl modules/Activities/Activity.php Message-ID: <20060705135424.1BB2283FFC1@vtiger.fosslabs.com> Author: richie Date: Wed Jul 5 07:54:18 2006 New Revision: 7870 Log: issue in activity has been fixed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl vtigercrm/trunk/modules/Activities/Activity.php Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed Jul 5 07:54:18 2006 @@ -444,7 +444,7 @@
- + From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 5 22:22:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Jul 2006 05:22:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7875 - /branches/VTIGERCRM-5.0.2-MMBRICH/ Message-ID: <20060706052209.E0E717F23B6@vtiger.fosslabs.com> Author: mmbrich Date: Wed Jul 5 23:22:08 2006 New Revision: 7875 Log: New branch for mmbrich feature devel. Added: branches/VTIGERCRM-5.0.2-MMBRICH/ - copied from r7874, vtigercrm/trunk/ From vtiger-tickets at vtiger.fosslabs.com Thu Jul 6 08:20:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 06 Jul 2006 15:20:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231459=3A?= =?utf-8?q?_revert_adodb_instrumentation/modifications_prior_to_release?= Message-ID: <076.3653d0a305d5e2e7043325f0f9bebfc3@vtiger.fosslabs.com> #1459: revert adodb instrumentation/modifications prior to release ------------------------------------+--------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: adodb database package | ------------------------------------+--------------------------------------- There's no mention of why these modifications are necessary, but instrumenting the snapshotted adodb library for debugging purposes is something that should only be present in beta status. I'm filing this as a ticket so we don't forget to revert these changes before anyone proposes moving to rc status. I still think it is better to let the library trigger the inconvenient but valid exception, and handle the code in your catch block. It would be much better to add a few lines of code duplicating adodb functionality in a catch block than to modify the external library source. The first way is robust documentation of an error condition, the second way is 'technical debt', which must be balanced with additional deferred effort. If there's something that inavoidably must be changed in an external library (such as a bug fix), lobby the library maintainers to incorporate the change upstream. It is in that case not uncommon to snapshot a library based on a prerelease version, which can be removed once the library has a new release incorporating the change. Changesets releated so far: r7685, r7755, r7814 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Jul 6 08:23:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Jul 2006 15:23:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7876 - /vtigercrm/trunk/DEPENDENCIES.txt Message-ID: <20060706152311.A970683FF76@vtiger.fosslabs.com> Author: jeffk Date: Thu Jul 6 09:23:09 2006 New Revision: 7876 Log: refs #1459. adodb has been modified/instrumented in r7685, r7755, r7814. mark as a modified library until changes reverted Modified: vtigercrm/trunk/DEPENDENCIES.txt Modified: vtigercrm/trunk/DEPENDENCIES.txt ============================================================================== --- vtigercrm/trunk/DEPENDENCIES.txt (original) +++ vtigercrm/trunk/DEPENDENCIES.txt Thu Jul 6 09:23:09 2006 @@ -1,5 +1,5 @@ #pkgvers relpath modified unmodifiedok extdepok dowloadurl -adodb-4.90 adodb false true unknown http://prdownloads.sf.net/adodb/adodb490.tgz +adodb-4.90 adodb true false unknown http://prdownloads.sf.net/adodb/adodb490.tgz FCKeditor-2.2 include/fckeditor true unknown unknown http://prdownloads.sf.net/fckeditor/FCKeditor-2.2.gz.tar fpdf-1.53 include/fpdf true unknown unknown http://www.fpdf.org/en/dl.php?v=153&f=tgz Image_Canvas-0.3.0 include/Image true unknown unknown http://pear.php.net/get/Image_Canvas-0.3.0.tgz From vtiger-tickets at vtiger.fosslabs.com Thu Jul 6 08:23:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 06 Jul 2006 15:23:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231459=3A?= =?utf-8?q?_revert_adodb_instrumentation/modifications_prior_to_release?= In-Reply-To: <076.3653d0a305d5e2e7043325f0f9bebfc3@vtiger.fosslabs.com> References: <076.3653d0a305d5e2e7043325f0f9bebfc3@vtiger.fosslabs.com> Message-ID: <085.1855365abdefbc50a0873e459f79ca2d@vtiger.fosslabs.com> #1459: revert adodb instrumentation/modifications prior to release ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: adodb database package ------------------------+--------------------------------------------------- Comment (by jeffk): (In [7876]) refs #1459. adodb has been modified/instrumented in r7685, r7755, r7814. mark as a modified library until changes reverted -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Jul 6 10:21:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Jul 2006 17:21:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7877 - in /branches/VTIGERCRM-5.0.2-MMBRICH: include/pclzip.lib.php modules/Accounts/Merge.php modules/Contacts/Merge.php Message-ID: <20060706172108.845B083FFC4@vtiger.fosslabs.com> Author: mmbrich Date: Thu Jul 6 11:21:07 2006 New Revision: 7877 Log: ODT merge capabilites, thanks to Nico (nango) for this contribution Added: branches/VTIGERCRM-5.0.2-MMBRICH/include/pclzip.lib.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Accounts/Merge.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/Contacts/Merge.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Accounts/Merge.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Accounts/Merge.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Accounts/Merge.php Thu Jul 6 11:21:07 2006 @@ -5,31 +5,19 @@ * The Original Code is: vtiger CRM Open Source * The Initial Developer of the Original Code is vtiger. * Portions created by vtiger are Copyright (C) vtiger. + * Portions created by prudento are Copyright (C) prudento. * All Rights Reserved. * ********************************************************************************/ + ?> - - + + if (document.layers) + { + document.write(\"This feature requires IE 5.5 or higher for Windows on Microsoft Windows 2000, Windows NT4 SP6, Windows XP.\"); + document.write(\"

Click here to return to the previous page\"); + } + else if (document.layers || (!document.all && document.getElementById)) + { + document.write(\"This feature requires IE 5.5 or higher for Windows on Microsoft Windows 2000, Windows NT4 SP6, Windows XP.\"); + document.write(\"

Click here to return to the previous page\"); + } + else if(document.all) + { + document.write(\"\"); + } + "; +} +$sql = "select filename,data,filesize from wordtemplates where templateid=".$templateid; $result = $adb->query($sql); $temparray = $adb->fetch_array($result); -$fileContent = $temparray['data']; +$filecontent = $temparray['data']; $filename=$temparray['filename']; $filesize=$temparray['filesize']; -$wordtemplatedownloadpath =$root_directory ."/test/wordtemplatedownload/"; - - -$handle = fopen($wordtemplatedownloadpath.$temparray['filename'],"wb"); -fwrite($handle,base64_decode($fileContent),$filesize); -fclose($handle); - -//<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>> +$wordtemplatedownloadpath ='test/wordtemplatedownload/'; +//$wordtemplatedownloadpath =$root_directory .'test/wordtemplatedownload/'; + +//<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> $mass_merge = $_REQUEST['idlist']; $single_record = $_REQUEST['record']; @@ -73,10 +75,8 @@ die("Record Id is not found, cannot merge the document"); } -//echo $mass_merge; -//die; -//for setting vtiger_accountid=0 for the contacts which are deleted -$ct_query = "select crmid from vtiger_crmentity where setype='Contacts' and deleted=1"; +//for setting accountid=0 for the contacts which are deleted +$ct_query = "select crmid from crmentity where setype='Contacts' and deleted=1"; $result = $adb->query($ct_query); while($row = $adb->fetch_array($result)) @@ -87,45 +87,44 @@ if(count($deleted_id) > 0) { $deleted_id = implode(",",$deleted_id); - $update_query = "update vtiger_contactdetails set accountid = 0 where contactid in (".$deleted_id.")"; + $update_query = "update contactdetails set accountid = 0 where contactid in (".$deleted_id.")"; $result = $adb->query($update_query); } -//End setting vtiger_accountid=0 for the contacts which are deleted +//End setting accountid=0 for the contacts which are deleted //<<<<<<<<<<<<<<<
>>>>>>>>>>>>>>>>>>>>>>> -$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 6 and vtiger_field.block <> 75 order by vtiger_field.tablename"; - -$result = $adb->query($query1); +$sql="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) order by field.tablename"; + +$result = $adb->query($sql); $y=$adb->num_rows($result); - for ($x=0; $x<$y; $x++) { - $tablename = $adb->query_result($result,$x,"tablename"); - $columnname = $adb->query_result($result,$x,"columnname"); - $modulename = $adb->query_result($result,$x,"name"); - - if($tablename == "crmentity") - { - if($modulename == "Contacts") + $tablename = $adb->query_result($result,$x,"tablename"); + $columnname = $adb->query_result($result,$x,"columnname"); + $modulename = $adb->query_result($result,$x,"name"); + + if($tablename == "crmentity") { - $tablename = "crmentityContacts"; + if($modulename == "Accounts") + { + $tablename = "crmentityAccounts"; + } } - } - $querycolumns[$x] = $tablename.".".$columnname; - if($columnname == "smownerid") - { - if($modulename == "Accounts") - { - $querycolumns[$x] = "concat(vtiger_users.last_name,' ',vtiger_users.first_name) as userjoinname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country"; - } - if($modulename == "Contacts") - { - $querycolumns[$x] = "concat(usersContacts.last_name,' ',usersContacts.first_name) as userjoincname"; - } - } + $querycolumns[$x] = $tablename.".".$columnname; + if($columnname == "smownerid") + { + if($modulename == "Accounts") + { + $querycolumns[$x]="concat(usersAccounts.last_name,' ',usersAccounts.first_name) as username"; + } + if($modulename == "Contacts") + { + $querycolumns[$x]="concat(users.last_name,' ',users.first_name) as usercname,users.first_name,users.last_name,users.user_name,users.yahoo_id,users.title,users.phone_work,users.department,users.phone_mobile,users.phone_other,users.phone_fax,users.email1,users.phone_home,users.email2,users.address_street,users.address_city,users.address_state,users.address_postalcode,users.address_country"; + } + } if($columnname == "parentid") { - $querycolumns[$x] = "accountAccount.accountname"; + $querycolumns[$x] = "accountAccounts.accountname"; } if($columnname == "accountid") { @@ -135,48 +134,49 @@ { $querycolumns[$x] = "contactdetailsContacts.lastname"; } - if($modulename == "Accounts") - { - $field_label[$x] = "ACCOUNT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); + { + $field_label[$x] = "ACCOUNT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); if($columnname == "smownerid") { - $field_label[$x] = $field_label[$x].",USER_FIRSTNAME,USER_LASTNAME,USER_USERNAME,USER_YAHOOID,USER_TITLE,USER_OFFICEPHONE,USER_DEPARTMENT,USER_MOBILE,USER_OTHERPHONE,USER_FAX,USER_EMAIL,USER_HOMEPHONE,USER_OTHEREMAIL,USER_PRIMARYADDRESS,USER_CITY,USER_STATE,USER_POSTALCODE,USER_COUNTRY"; + $field_label[$x] = $field_label[$x].",USER_FIRSTNAME,USER_LASTNAME,USER_USERNAME,USER_YAHOOID,USER_TITLE,USER_OFFICEPHONE,USER_DEPARTMENT,USER_MOBILE,USER_OTHERPHONE,USER_FAX,USER_EMAIL,USER_HOMEPHONE,USER_OTHEREMAIL,USER_PRIMARYADDRESS,USER_CITY,USER_STATE,USER_POSTALCODE,USER_COUNTRY"; } } - if($modulename == "Contacts") - { - $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); - } - + { + $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); + } } $csvheader = implode(",",$field_label); + //<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> - + if(count($querycolumns) > 0) { $selectcolumns = implode($querycolumns,","); - -$query = "select ".$selectcolumns." from vtiger_account - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid - inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid - inner join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid - inner join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid - left join vtiger_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_account.parentid - left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid - left join vtiger_contactdetails on vtiger_contactdetails.accountid=vtiger_account.accountid - left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid - left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid - left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid - left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid - left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto - left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid - left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid - where vtiger_crmentity.deleted=0 and (crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null) and vtiger_account.accountid in(".$mass_merge.")"; -//echo $query; -//die; +} + +$query = "select ".$selectcolumns." from account + inner join crmentity on crmentity.crmid=account.accountid + inner join accountbillads on account.accountid=accountbillads.accountaddressid + inner join accountshipads on account.accountid=accountshipads.accountaddressid + inner join accountscf on account.accountid = accountscf.accountid + left join account as accountAccounts on accountAccounts.accountid = account.parentid + left join users on users.id = crmentity.smownerid + left join contactdetails on contactdetails.accountid=account.accountid + left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid + left join crmentity as crmentityAccounts on crmentityAccounts.crmid = account.accountid + left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid + left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid + left join contactscf on contactdetails.contactid = contactscf.contactid + left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto + left join account as accountContacts on accountContacts.accountid = contactdetails.accountid + left join users as usersAccounts on usersAccounts.id = crmentityContacts.smownerid + left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid + left join customerdetails on contactdetails.contactid = customerdetails.customerid + where crmentity.deleted=0 and (crmentityContacts.deleted=0 || crmentityContacts.deleted is null) and account.accountid in(".$mass_merge.")"; + $result = $adb->query($query); while($columnValues = $adb->fetch_array($result)) @@ -204,20 +204,253 @@ } $actual_values[$x] = str_replace(","," ",$actual_values[$x]); } - $mergevalue[] = implode($actual_values,","); -} -$csvdata = implode($mergevalue,"###"); -}else -{ - die("No fields to do Merge"); -} - -$handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb"); -fwrite($handle,$csvheader."\r\n"); -fwrite($handle,str_replace("###","\r\n",$csvdata)); -fclose($handle); + $mergevalue[] = implode(",",$actual_values); +} +$csvdata = implode("###",$mergevalue); + +echo "




"; +$extension = GetFileExtention($filename); +if($extension == "doc") +{ + $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb"); + fwrite($handle,$csvheader."\r\n"); + fwrite($handle,str_replace("###","\r\n",$csvdata)); + fclose($handle); +} +else if($extension == "odt") +{ + //delete old .odt files in the wordtemplatedownload directory + foreach (glob("$wordtemplatedownloadpath/*.odt") as $delefile) + { + unlink($delefile); + } + $mass_merge = explode(",",$mass_merge); + $y=count($mass_merge); + if ($y>1) + { + //Mass Merge + for($x=0;$x<$y;$x++) + { + //Unzip the .odt file + $temp_dir=entpack($filename,$wordtemplatedownloadpath,$filecontent); + // copy the content.xml into a variable + $concontent=file_get_contents($wordtemplatedownloadpath.$temp_dir.'/content.xml'); + //delete the content.xml + unlink($wordtemplatedownloadpath.$temp_dir.'/content.xml'); + // Merge the Template with the selected data + if ($y-$x>1) + { + $new_filecontent=crmmerge($csvheader,$concontent,'true'); + } + else + { + $new_filecontent=crmmerge($csvheader,$concontent,'false'); + } + //Zip all to a new .odt File + packen($filename,$wordtemplatedownloadpath,$temp_dir,$new_filecontent); + //rename the filename + $newfilename = "$x-$filename"; + rename($wordtemplatedownloadpath.$filename,$wordtemplatedownloadpath.$newfilename); + //remove the unziped data + remove_dir($wordtemplatedownloadpath.$temp_dir); + echo "download merged document here
"; + } + } + else + { + $temp_dir=entpack($filename,$wordtemplatedownloadpath,$filecontent); + $concontent=file_get_contents($wordtemplatedownloadpath.$temp_dir.'/content.xml'); + unlink($wordtemplatedownloadpath.$temp_dir.'/content.xml'); + $new_filecontent=crmmerge($csvheader,$concontent,'false'); + packen($filename,$wordtemplatedownloadpath,$temp_dir,$new_filecontent); + + //Send Document to the Browser + + //header("Content-Type: $mimetype"); + //header("Content-Disposition: attachment; filename=$filename"); + + //echo file_get_contents($wordtemplatedownloadpath .$filename); + //readfile($root_directory .$wordtemplatedownloadpath .$filename); + + echo "download merged document here
"; + remove_dir($wordtemplatedownloadpath.$temp_dir); + } +} +else if($extension == "rtf") +{ + foreach (glob("$wordtemplatedownloadpath/*.rtf") as $delefile) + { + unlink($delefile); + } + $mass_merge = explode(",",$mass_merge); + $y=count($mass_merge); + $filecontent = base64_decode($filecontent); + if ($y>1) + { + for($x=0;$x<$y;$x++) + { + $handle = fopen($wordtemplatedownloadpath.$filename,"wb"); + if ($y-$x>1) + { + $new_filecontent=crmmerge($csvheader,$concontent,'true'); + } + else + { + $new_filecontent=crmmerge($csvheader,$concontent,'false'); + } + fwrite($handle,$new_filecontent); + fclose($handle); + $newfilename = "$x-$filename"; + rename($wordtemplatedownloadpath .$filename, $wordtemplatedownloadpath .$newfilename); + echo "download merged document here
"; + } + } + else + { + $handle = fopen($wordtemplatedownloadpath.$filename,"wb"); + $new_filecontent = crmmerge($csvheader,$filecontent,'false'); + fwrite($handle,$new_filecontent); + fclose($handle); + echo "download merged document here
"; + } +} +else +{ + die("unknown file format"); +} + +function GetFileExtention($filename) +{ + $pathinfo = pathinfo($filename); + return $pathinfo['extension']; +} + +function crmmerge($csvheader,$content,$y) +{ + global $csvdata; + $Header = explode (",",$csvheader); + if($y) + // if mass merge + { + //Search for account_name + $i=0; + while($Header[$i]!="ACCOUNT_ACCOUNTNAME") + { + $i++; + } + //unpacking all into string array Temp + $Temp = explode ("###",$csvdata); + $z=count($Temp); + //unpacking all into array array Temp_Values + for ($x=0;$x<$z;$x++) + { + $Temp_Values[$x] = explode (",",$Temp[$x]); + } + $Values = explode (",",$Temp[0]); + //echo $Header[$i].' '.$Temp_Values[0][$i].' '.$z.'
'; + $j=1; + //echo $Temp_Values[$j][$i].' und j:'.$j.'
'; + while ($Temp_Values[$j][$i] == $Temp_Values[0][$i]) + { + $j++; + //echo $Temp_Values[$j][$i].' und j:'.$j.'
'; + } + //packing it without read data + /* + for($x=$j;$x<$z;$x++) + { + $test[$x-$j]=$Temp_Values[$x]; + } + $csvdata = implode ("###", $test);*/ + if ($z>$j) + { + $csvdata = $Temp[$j]; + if ($z>($j+1)) + { + for($x=$j;$x<$z;$x++) + { + $csvdata=$csvdata.'###'.$Temp[$x]; + } + } + } + } + else + { + $Temp = explode ("###",$csvdata); + $Values = explode (",",$Temp[0]); + } + for($i=0;$iextract(PCLZIP_OPT_PATH,$wordtemplatedownloadpath.'/'.$temp_dir) == 0) + { + die("Error : ".$archive->errorInfo(true)); + } + //delete the template + unlink($wordtemplatedownloadpath.$filename); + return $temp_dir; +} + +function packen($filename,$wordtemplatedownloadpath,$temp_dir,$concontent) +{ + //write a new content.xml + $handle=fopen($wordtemplatedownloadpath.$temp_dir.'/content.xml',"w"); + fwrite($handle,$concontent); + fclose($handle); + $archive = new PclZip($wordtemplatedownloadpath.$filename); + //make a new archive (or .odt file) + $v_list = $archive->add($wordtemplatedownloadpath.$temp_dir,PCLZIP_OPT_REMOVE_PATH, $wordtemplatedownloadpath.$temp_dir); + if ($v_list == 0) + { + die("Error : ".$archive->errorInfo(true)); + } +} + +function remove_dir($dir) +{ + $handle = opendir($dir); + while (false!==($item = readdir($handle))) + { + if($item != '.' && $item != '..') + { + if(is_dir($dir.'/'.$item)) + { + remove_dir($dir.'/'.$item); + } + else + { + unlink($dir.'/'.$item); + } + } + } + closedir($handle); + if(rmdir($dir)) + { + $success = true; + } + return $success; +} + ?> + + if (document.layers) + { + document.write(\"This feature requires IE 5.5 or higher for Windows on Microsoft Windows 2000, Windows NT4 SP6, Windows XP.\"); + document.write(\"

Click here to return to the previous page\"); + } + else if (document.layers || (!document.all && document.getElementById)) + { + document.write(\"This feature requires IE 5.5 or higher for Windows on Microsoft Windows 2000, Windows NT4 SP6, Windows XP.\"); + document.write(\"

Click here to return to the previous page\"); + } + else if(document.all) + { + document.write(\"\"); + } + "; +} + +$sql = "select filename,data,filesize from wordtemplates where templateid=".$templateid; $result = $adb->query($sql); $temparray = $adb->fetch_array($result); -$fileContent = $temparray['data']; +$filecontent = $temparray['data']; $filename=$temparray['filename']; $filesize=$temparray['filesize']; -$wordtemplatedownloadpath =$root_directory ."/test/wordtemplatedownload/"; - -$handle = fopen($wordtemplatedownloadpath .$temparray['filename'],"wb"); -fwrite($handle,base64_decode($fileContent),$filesize); -fclose($handle); - +$wordtemplatedownloadpath ='test/wordtemplatedownload/'; +//$wordtemplatedownloadpath =$root_directory .'test/wordtemplatedownload/'; //<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> $mass_merge = $_REQUEST['idlist']; @@ -77,36 +77,35 @@ } //<<<<<<<<<<<<<<<
>>>>>>>>>>>>>>>>>>>>>>> -$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 6 and vtiger_field.block <> 75 order by vtiger_field.tablename"; - -$result = $adb->query($query1); +$sql="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) order by field.tablename"; + +$result = $adb->query($sql); $y=$adb->num_rows($result); - for ($x=0; $x<$y; $x++) { - $tablename = $adb->query_result($result,$x,"tablename"); - $columnname = $adb->query_result($result,$x,"columnname"); - $modulename = $adb->query_result($result,$x,"name"); - + $tablename = $adb->query_result($result,$x,"tablename"); + $columnname = $adb->query_result($result,$x,"columnname"); + $modulename = $adb->query_result($result,$x,"name"); + if($tablename == "crmentity") - { - if($modulename == "Accounts") { - $tablename = "crmentityAccounts"; + if($modulename == "Accounts") + { + $tablename = "crmentityAccounts"; + } } - } - $querycolumns[$x] = $tablename.".".$columnname; - if($columnname == "smownerid") - { - if($modulename == "Accounts") - { + $querycolumns[$x] = $tablename.".".$columnname; + if($columnname == "smownerid") + { + if($modulename == "Accounts") + { $querycolumns[$x]="concat(usersAccounts.last_name,' ',usersAccounts.first_name) as username"; - } + } if($modulename == "Contacts") - { - $querycolumns[$x]="concat(vtiger_users.last_name,' ',vtiger_users.first_name) as usercname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country"; - } - } + { + $querycolumns[$x]="concat(users.last_name,' ',users.first_name) as usercname,users.first_name,users.last_name,users.user_name,users.yahoo_id,users.title,users.phone_work,users.department,users.phone_mobile,users.phone_other,users.phone_fax,users.email1,users.phone_home,users.email2,users.address_street,users.address_city,users.address_state,users.address_postalcode,users.address_country"; + } + } if($columnname == "parentid") { $querycolumns[$x] = "accountAccounts.accountname"; @@ -119,69 +118,62 @@ { $querycolumns[$x] = "contactdetailsContacts.lastname"; } - - if($modulename == "Accounts") - { - $field_label[$x] = "ACCOUNT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); - } - + { + $field_label[$x] = "ACCOUNT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); + } if($modulename == "Contacts") - { - $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); - if($columnname == "smownerid") + { + $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); + if($columnname == "smownerid") { $field_label[$x] = $field_label[$x].",USER_FIRSTNAME,USER_LASTNAME,USER_USERNAME,USER_YAHOOID,USER_TITLE,USER_OFFICEPHONE,USER_DEPARTMENT,USER_MOBILE,USER_OTHERPHONE,USER_FAX,USER_EMAIL,USER_HOMEPHONE,USER_OTHEREMAIL,USER_PRIMARYADDRESS,USER_CITY,USER_STATE,USER_POSTALCODE,USER_COUNTRY"; } - } - - + } } $csvheader = implode(",",$field_label); -//echo $csvheader; -//<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> - + if(count($querycolumns) > 0) { $selectcolumns = implode($querycolumns,","); - - -$query = "select ".$selectcolumns." from vtiger_contactdetails - inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid - inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid - inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid - inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid - left join vtiger_contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = vtiger_contactdetails.reportsto - left join vtiger_account as accountContacts on accountContacts.accountid = contactdetails.accountid - left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid - left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid - left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid=vtiger_account.accountid - left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid - left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid - left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid - left join vtiger_account as accountAccounts on accountAccounts.accountid = vtiger_account.parentid - left join vtiger_users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid - where vtiger_crmentity.deleted=0 and (crmentityAccounts.deleted <> 1) and vtiger_contactdetails.contactid in(".$mass_merge.")"; - + +$query = "select ".$selectcolumns." from contactdetails + inner join crmentity on crmentity.crmid = contactdetails.contactid + inner join contactaddress on contactdetails.contactid = contactaddress.contactaddressid + inner join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid + inner join contactscf on contactdetails.contactid = contactscf.contactid + left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto + left join account as accountContacts on accountContacts.accountid = contactdetails.accountid + left join users on users.id = crmentity.smownerid + left join account on account.accountid = contactdetails.accountid + left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid + left join accountbillads on account.accountid=accountbillads.accountaddressid + left join accountshipads on account.accountid=accountshipads.accountaddressid + left join accountscf on account.accountid = accountscf.accountid + left join account as accountAccounts on accountAccounts.accountid = account.parentid + left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid + left join customerdetails on contactdetails.contactid = customerdetails.customerid + where crmentity.deleted=0 and (crmentityAccounts.deleted <> 1) and contactdetails.contactid in(".$mass_merge.")"; $result = $adb->query($query); while($columnValues = $adb->fetch_array($result)) { $y=$adb->num_fields($result); + for($x=0; $x<$y; $x++) - { - $value = $columnValues[$x]; - //<<<<<<<<<<<<<<< For blank Fields >>>>>>>>>>>>>>>>>>>>>>>>>>>> - if($value == "0") - { - $value = ""; - } - if(trim($value) == "--None--" || trim($value) == "--none--") - { - $value = ""; - } - //<<<<<<<<<<<<<<< End >>>>>>>>>>>>>>>>>>>>>>>>>>>> + { + $value = $columnValues[$x]; + //<<<<<<<<<<<<<<< For blank Fields >>>>>>>>>>>>>>>>>>>>>>>>>>>> + if($value == "0") + { + $value = ""; + } + if(trim($value) == "--None--" || trim($value) == "--none--") + { + $value = ""; + } + //<<<<<<<<<<<<<<< End >>>>>>>>>>>>>>>>>>>>>>>>>>>> $actual_values[$x] = $value; $actual_values[$x] = str_replace('"'," ",$actual_values[$x]); //if value contains any line feed or carriage return replace the value with ".value." @@ -190,23 +182,230 @@ $actual_values[$x] = '"'.$actual_values[$x].'"'; } $actual_values[$x] = str_replace(","," ",$actual_values[$x]); - } - - $mergevalue[] = implode($actual_values,","); -} -$csvdata = implode($mergevalue,"###"); -}else -{ - die("No fields to do Merge"); + } + $mergevalue[] = implode(",",$actual_values); + + $csvdata = implode("###",$mergevalue); +} +echo "




"; +$extension = GetFileExtention($filename); +if($extension == "doc") +{ + $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb"); + fwrite($handle,$csvheader."\r\n"); + fwrite($handle,str_replace("###","\r\n",$csvdata)); + fclose($handle); +} +else if($extension == "odt") +{ + //delete old .odt files in the wordtemplatedownload directory + foreach (glob("$wordtemplatedownloadpath/*.odt") as $delefile) + { + unlink($delefile); + } + $mass_merge = explode(",",$mass_merge); + $y=count($mass_merge); + if ($y>1) + { + //Mass Merge + for($x=0;$x<$y;$x++) + { + //Unzip the .odt file + $temp_dir=entpack($filename,$wordtemplatedownloadpath,$filecontent); + // copy the content.xml into a variable + $concontent=file_get_contents($wordtemplatedownloadpath.$temp_dir.'/content.xml'); + //delete the content.xml + unlink($wordtemplatedownloadpath.$temp_dir.'/content.xml'); + // Merge the Template with the selected data + if ($y-$x>1) + { + $new_filecontent=crmmerge($csvheader,$concontent,'true'); + } + else + { + $new_filecontent=crmmerge($csvheader,$concontent,'false'); + } + //Zip all to a new .odt File + packen($filename,$wordtemplatedownloadpath,$temp_dir,$new_filecontent); + //rename the filename + $newfilename = "$x-$filename"; + rename($wordtemplatedownloadpath.$filename,$wordtemplatedownloadpath.$newfilename); + //remove the unziped data + remove_dir($wordtemplatedownloadpath.$temp_dir); + echo "download merged document here
"; + } + } + else + { + $temp_dir=entpack($filename,$wordtemplatedownloadpath,$filecontent); + $concontent=file_get_contents($wordtemplatedownloadpath.$temp_dir.'/content.xml'); + unlink($wordtemplatedownloadpath.$temp_dir.'/content.xml'); + $new_filecontent=crmmerge($csvheader,$concontent,'false'); + packen($filename,$wordtemplatedownloadpath,$temp_dir,$new_filecontent); + + //Send Document to the Browser + + //header("Content-Type: $mimetype"); + //header("Content-Disposition: attachment; filename=$filename"); + + //echo file_get_contents($wordtemplatedownloadpath .$filename); + //readfile($root_directory .$wordtemplatedownloadpath .$filename); + + echo "download merged document here
"; + remove_dir($wordtemplatedownloadpath.$temp_dir); + } +} +else if($extension == "rtf") +{ + foreach (glob("$wordtemplatedownloadpath/*.rtf") as $delefile) + { + unlink($delefile); + } + $mass_merge = explode(",",$mass_merge); + $y=count($mass_merge); + $filecontent = base64_decode($filecontent); + if ($y>1) + { + for($x=0;$x<$y;$x++) + { + $handle = fopen($wordtemplatedownloadpath.$filename,"wb"); + if ($y-$x>1) + { + $new_filecontent=crmmerge($csvheader,$concontent,'true'); + } + else + { + $new_filecontent=crmmerge($csvheader,$concontent,'false'); + } + fwrite($handle,$new_filecontent); + fclose($handle); + $newfilename = "$x-$filename"; + rename($wordtemplatedownloadpath .$filename, $wordtemplatedownloadpath .$newfilename); + echo "download merged document here
"; + } + } + else + { + $handle = fopen($wordtemplatedownloadpath.$filename,"wb"); + $new_filecontent = crmmerge($csvheader,$filecontent,'false'); + fwrite($handle,$new_filecontent); + fclose($handle); + echo "download merged document here
"; + } +} +else +{ + die("unknown file format"); +} + +function GetFileExtention($filename) +{ + $pathinfo = pathinfo($filename); + return $pathinfo['extension']; +} + +function crmmerge($csvheader,$content,$y) +{ + global $csvdata; + $Header = explode (",",$csvheader); + if($y) + // if mass merge + { + //unpacking all into string array Temp + $Temp = explode ("###",$csvdata); + $Values = explode (",",$Temp[0]); + //packing it without read data + /* + for($x=1;$x2) + { + for($x=2;$xextract(PCLZIP_OPT_PATH,$wordtemplatedownloadpath.'/'.$temp_dir) == 0) + { + die("Error : ".$archive->errorInfo(true)); + } + //delete the template + unlink($wordtemplatedownloadpath.$filename); + return $temp_dir; } -$handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb"); -fwrite($handle,$csvheader."\r\n"); -fwrite($handle,str_replace("###","\r\n",$csvdata)); -fclose($handle); - +function packen($filename,$wordtemplatedownloadpath,$temp_dir,$concontent) +{ + //write a new content.xml + $handle=fopen($wordtemplatedownloadpath.$temp_dir.'/content.xml',"w"); + fwrite($handle,$concontent); + fclose($handle); + $archive = new PclZip($wordtemplatedownloadpath.$filename); + //make a new archive (or .odt file) + $v_list = $archive->add($wordtemplatedownloadpath.$temp_dir,PCLZIP_OPT_REMOVE_PATH, $wordtemplatedownloadpath.$temp_dir); + if ($v_list == 0) + { + die("Error : ".$archive->errorInfo(true)); + } +} + +function remove_dir($dir) +{ + $handle = opendir($dir); + while (false!==($item = readdir($handle))) + { + if($item != '.' && $item != '..') + { + if(is_dir($dir.'/'.$item)) + { + remove_dir($dir.'/'.$item); + } + else + { + unlink($dir.'/'.$item); + } + } + } + closedir($handle); + if(rmdir($dir)) + { + $success = true; + } + return $success; +} ?> + + + @@ -417,6 +420,14 @@ }//end return true; } + +/* START COMMUNICATIONS SYSTEM */ +function openCommSystem() { + var CS = new CommSystem("CommSliderDiv"); +} +var VtUser = {} +new VtigerUser(); + {/literal} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml Thu Jul 6 14:22:43 2006 @@ -6105,6 +6105,26 @@ Type=InnoDB -
- + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
+ From vtigercrm-commits at vtiger.fosslabs.com Thu Jul 6 13:23:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 06 Jul 2006 20:23:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7879 - in /branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects: ./ CommSystem.js VtigerUser.js Message-ID: <20060706202309.655E1840146@vtiger.fosslabs.com> Author: mmbrich Date: Thu Jul 6 14:23:08 2006 New Revision: 7879 Log: base js classes Added: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/VtigerUser.js From vtigercrm-commits at vtiger.fosslabs.com Thu Jul 6 17:17:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 00:17:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7880 - in /branches/VTIGERCRM-5.0.2-MMBRICH: Smarty/templates/Header.tpl include/js/objects/CommSystem.js modules/CommSystem/CommSystem.php modules/CommSystem/CommSystemAjax.php themes/blue/header.php themes/blue/style.css Message-ID: <20060707001726.CAEC7298E1A@vtiger.fosslabs.com> Author: mmbrich Date: Thu Jul 6 18:17:25 2006 New Revision: 7880 Log: more comm system stuff Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl Thu Jul 6 18:17:25 2006 @@ -18,12 +18,13 @@ +   - + @@ -141,6 +142,10 @@ + + +{$USERLIST} +
{include file="Clock.tpl"} @@ -423,10 +428,13 @@ /* START COMMUNICATIONS SYSTEM */ function openCommSystem() { - var CS = new CommSystem("CommSliderDiv"); + CS.OpenSlider(); } var VtUser = {} new VtigerUser(); +addOnloadEvent(function() { + CS = new CommSystem("CommSliderDiv"); +}); {/literal} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Thu Jul 6 18:17:25 2006 @@ -6,6 +6,7 @@ this.username = VtUser.user_name; this.sliderElement = element; this.CheckSession(); + this.sliderOpen = "false"; this.timer; }, @@ -22,10 +23,7 @@ {queue: {position: 'end', scope: 'commsys'}, method: 'post', postBody: 'module=CommSystem&action=CommSystemAjax&command=getPeriodicalInfo', - onComplete: function(response) { - alert(response.responseText); - //this.timer = window.setTimeout('globalCommSystem.CommUpdate()',this.refreshtime); - }, + onComplete: this.HandleEvent, onFailure: function() { window.ClearTimeout(globalCommSystem.timer); } @@ -40,14 +38,34 @@ * class value to change the appearance */ OpenSlider: function() { - Try.these( - function() { - new Effect.Appear($(this.sliderElement)); - }, - function() { - $(this.sliderElement).className = "OpenCommSlider"; - } - ); + globalCommSystem = this; + if(this.sliderOpen == "false") { + Try.these ( + function() { + $(globalCommSystem.sliderElement).className = "commSliderOpen"; + }, + function() { + $(globalCommSystem.sliderElement).style.width = '180px'; + }, + function() { + new Effect.Appear($(globalCommSystem.sliderElement)); + } + ); + this.sliderOpen = "true"; + } else { + Try.these ( + function() { + $(globalCommSystem.sliderElement).className = "commSlider"; + }, + function() { + new Effect.Fade($(globalCommSystem.sliderElement)); + }, + function() { + $(globalCommSystem.sliderElement).style.width = '0px'; + } + ); + this.sliderOpen = "false"; + } }, /* @@ -57,11 +75,8 @@ */ CheckSession: function() { try { - if(this.debug) - alert("Check Session Start"); - - window.clearTimeout(this.timer); - this.CommUpdate(); + window.clearTimeout(this.timer); + this.CommUpdate(); }catch(e){if(this.debug) alert(e);} }, @@ -75,8 +90,9 @@ 'index.php', {queue: {position: 'end', scope: 'commsys'}, method: 'post', - postBody: 'module=Users&action=UsersAjax&announce_rss=yes', + postBody: 'module=CommSystem&action=CommSystemAjax&command=sendChatMessage&receivers='+otheruser+'&msg='+msg+'msg_type=P2PIM', onComplete: function(response) { + alert(response.responseText); } } ); @@ -87,7 +103,140 @@ * or open a past window that was closed during * this session */ - ShowNewChatMessage: function(otheruser,msg) { - + ShowNewChatMessage: function(msg,header_msg) { + Try.these ( + function() { + new Effect.Appear("msgwindow_"+msg.sending_user); + }, + function() { + if(msg.msg_type == "P2PIM") + var clsname = "chatWindow"; + else if(msg.msg_type == "GRPCHAT") + var clsname = "grpChatWindow"; + + var main_table = Builder.node( + 'table', + { + cellpadding:'2',cellspacing:'0',border:'0',className:clsname, + id:'msgwindow_'+msg.sending_user + } + ); + var top_bar = Builder.node( + 'tr', + { + align:'center',width:'100%',valign:'top' + }, + [ Builder.node( + 'td', + [ Builder.node( + 'span', + { + className:'chatWindowHeaderLeft' + }, + header_msg+" " + )], + [ Builder.node( + 'span', + { + className:'chatWindowHeaderRight' + }, + [ Builder.node( + 'img', + {src:'themes/blue/images/close.gif', + onClick: 'new Effect.Fade(\'msgwindow_'+msg.sending_user+'\')' + } + )] + )] + )] + ); + main_table.appendChild(top_bar); + + msg.msg_data +="
"; + var chat_data = Builder.node( + 'tr', + { + valign:'top',align:'center' + }, + [ Builder.node( + 'td', + { + width:'100%',height:'100%',colspan:'2' + }, + [ Builder.node( + 'div', {id:'chat_data_'+msg.sending_user,className:'chatWindowDataArea'} + )] + )] + ); + main_table.appendChild(chat_data); + + var msg_input = Builder.node( + 'tr', + { + valign:'top',align:'center' + }, + [ Builder.node( + 'td', + { + width:'100%',height:'100%',colspan:'2' + }, + [ Builder.node( + 'div', {id:'msg_input_'+msg.sending_user}, + [ Builder.node( + 'textarea' + )] + )] + )] + ); + main_table.appendChild(msg_input); + + main_table.style.display = "none"; + $("comm_sys").appendChild(main_table); + + $("chat_data_"+msg.sending_user).innerHTML += msg.msg_data; + $("msg_input_"+msg.sending_user).innerHTML += ''; + + new Effect.Appear(main_table); + } + ); + }, + + /* + * function to parse JSON msg data + * and act on alerts or messages + * for alerts the system will open a small slider + * on the screen to alert the user + * for messages (IMs) a window object will be built for the message. + */ + HandleEvent: function(responseData) { + //alert(responseData.responseText); + if(responseData.responseText.match(/none/)) + return false; + else { + var msgs = eval('(' + responseData.responseText + ')'); + for (var i=0;idb->query($q); - return true; + return "true"; } else - return false; + return "false"; } } @@ -83,28 +83,35 @@ $p2p = $this->db->query($q); // This query will get all group/broadcast messages - $q = "SELECT * FROM vtiger_comm_system WHERE receivers LIKE '%".$userid."%' AND viewed = '0'"; + $q = "SELECT * FROM vtiger_comm_system WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0'"; $grp = $this->db->query($q); $ret = array(); // load return array with p2p messages + $c=0; while($row = $this->db->fetch_array($p2p)) { - $msgid=$row["msgid"]; - $ret[$msgid]["msg_type"] = $row["msg_type"]; - $ret[$msgid]["msg_data"] = $row["msg_data"]; - $ret[$msgid]["recordid"] = $row["recordid"]; - $ret[$msgid]["sending_user"] = $row["sending_user"]; - $ret[$msgid]["sentdate"] = $row["sentdate"]; + if($row["msgid"] != "" && isset($row["msgid"])) { + $ret[$c]["msgid"] = $row["msgid"]; + $ret[$c]["msg_type"] = $row["msg_type"]; + $ret[$c]["msg_data"] = $row["msg_data"]; + $ret[$c]["recordid"] = $row["recordid"]; + $ret[$c]["sending_user"] = $row["sending_user"]; + $ret[$c]["sentdate"] = $row["sentdate"]; + $c++; + } } // load return array with group messages while($row = $this->db->fetch_array($grp)) { - $msgid=$row["msgid"]; - $ret[$msgid]["msg_type"] = $row["msg_type"]; - $ret[$msgid]["msg_data"] = $row["msg_data"]; - $ret[$msgid]["recordid"] = $row["recordid"]; - $ret[$msgid]["sending_user"] = $row["sending_user"]; - $ret[$msgid]["sentdate"] = $row["sentdate"]; + if($row["msgid"] != "" && isset($row["msgid"])) { + $ret[$c]["msgid"] = $row["msgid"]; + $ret[$c]["msg_type"] = $row["msg_type"]; + $ret[$c]["msg_data"] = $row["msg_data"]; + $ret[$c]["recordid"] = $row["recordid"]; + $ret[$c]["sending_user"] = $row["sending_user"]; + $ret[$c]["sentdate"] = $row["sentdate"]; + $c++; + } } return $ret; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Thu Jul 6 18:17:25 2006 @@ -30,20 +30,37 @@ require_once("modules/CommSystem/CommSystem.php"); $commSys = new CommSystem(); $msg = $commSys->GetNewAlerts($_SESSION["authenticated_user_id"]); - /* $ret = ''; - $ret = '{"VtUser":['; - $ret .= '{"data":'; - $ret .= '{'; - while($row = $adb->fetch_array($rs)) { - foreach($row as $name=>$value) { - $ret .= '"'.$name.'":"'.$value.'",'; - } - } - $ret .= '}'; - $ret .= '}'; - $ret .= ']}'; - */ - echo print_r($msg); - //echo $ret; + $ret = ''; + $cnt=count($msg); + if($cnt == 0) + $ret = "none"; + else { + $ret = '{"CommSysMessages":['; + for($i=0;$i<$cnt;$i++) { + $ret .= '{"message":'; + $ret .= '{'; + $ret .= '"msgid":"'.$msg[$i]["msgid"].'",'; + $ret .= '"msg_type":"'.$msg[$i]["msg_type"].'",'; + $ret .= '"recordid":"'.$msg[$i]["recordid"].'",'; + $ret .= '"sending_user":"'.$msg[$i]["sending_user"].'",'; + $ret .= '"timestamp":"'.$msg[$i]["sentdate"].'",'; + $ret .= '"msg_data":"'.$msg[$i]["msg_data"].'"}'; + + if(($i+1) == $cnt) + $ret .= '}'; + else + $ret .= '},'; + } + $ret .= ']}'; + } + echo $ret; +} +if($_REQUEST["command"] == "sendChatMessage") { + require_once("modules/CommSystem/CommSystem.php"); + $commSys = new CommSystem(); + if($commSys->SendAlert($_REQUEST["msg"],$_REQUEST["msg_type"],$_SESSION["authenticated_user_id"],$_REQUEST["receivers"]) == "false") + echo "failed"; + else + echo "success"; } ?> Modified: branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php Thu Jul 6 18:17:25 2006 @@ -101,6 +101,15 @@ global $module_menu; +$q = "select user_name,id from vtiger_users"; +$rs = $adb->query($q); +$list = "
CRM Users:"; +while($row=$adb->fetch_array($rs)) { + $list .= "
".$row["user_name"].""; +} +$list .= "
"; + +$smarty->assign("USERLIST",$list); require_once('data/Tracker.php'); $tracFocus=new Tracker(); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css Thu Jul 6 18:17:25 2006 @@ -2876,4 +2876,52 @@ .trackerList { border-bottom:1px solid #eeeeee; } - + +/* Comm System */ +.chatWindow { + position: absolute; + width: 200px; + height: 300px; + top: 50px; + left: 1px; + border: 1px solid gray; + background-color: white; + z-index:2000000; +} +.chatWindowHeaderLeft { + width: 75%; + height: 25px; + float:left +} +.chatWindowHeaderRight { + width: 22%; + height: 25px; + float:right +} +.chatWindowDataArea { + border: 1px solid gray; + width: 95%; + height: 200px; + text-align:left; + padding-left:3px; +} +.commSlider { + position: absolute; + width: 180px; + height: 300px; + top: 50px; + right: 1px; + border: 1px solid gray; + background-color: white; + display: none; +} +.commSliderOpen { + position: absolute; + width: 180px; + height: 300px; + top: 50px; + right: 1px; + border: 1px solid gray; + background-color: white; + z-index:1900000; +} From vtigercrm-commits at vtiger.fosslabs.com Thu Jul 6 22:54:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 05:54:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7881 - /vtigercrm/trunk/Smarty/templates/SetMenu.tpl Message-ID: <20060707055457.66C0564FCB2@vtiger.fosslabs.com> Author: saraj Date: Thu Jul 6 23:54:53 2006 New Revision: 7881 Log: Updated the setmenu tpl Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Thu Jul 6 23:54:53 2006 @@ -95,9 +95,9 @@ {/if} {if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'} - {$MOD.INVENTORY_TANDC} + {$MOD.LBL_INVENTORY_TANDC} {else} - {$MOD.INVENTORY_TANDC} + {$MOD.LBL_INVENTORY_TANDC} {/if} From vtigercrm-commits at vtiger.fosslabs.com Thu Jul 6 23:10:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 06:10:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7882 - in /branches/VTIGERCRM-5.0.2-MMBRICH: Smarty/templates/ include/js/objects/ modules/CommSystem/ themes/blue/ Message-ID: <20060707061013.66EC183FF66@vtiger.fosslabs.com> Author: mmbrich Date: Fri Jul 7 00:10:12 2006 New Revision: 7882 Log: more comm system stuff Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/VtigerUser.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl Fri Jul 7 00:10:12 2006 @@ -24,7 +24,7 @@ - + @@ -146,6 +146,7 @@ {$USERLIST} +
{include file="Clock.tpl"} @@ -426,6 +427,7 @@ return true; } +try { /* START COMMUNICATIONS SYSTEM */ function openCommSystem() { CS.OpenSlider(); @@ -433,8 +435,9 @@ var VtUser = {} new VtigerUser(); addOnloadEvent(function() { - CS = new CommSystem("CommSliderDiv"); + CS = new CommSystem("CommSliderDiv",VtUser); }); +}catch(m){alert(m);} {/literal} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Fri Jul 7 00:10:12 2006 @@ -1,6 +1,6 @@ CommSystem = Class.create(); CommSystem.prototype = { - initialize: function(element) { + initialize: function(element,CurrentUser) { this.debug=true; this.refreshtime = '5000'; this.username = VtUser.user_name; @@ -8,6 +8,9 @@ this.CheckSession(); this.sliderOpen = "false"; this.timer; + this.keycount=0; + this.keytimer; + this.user=CurrentUser; }, /* @@ -25,7 +28,7 @@ postBody: 'module=CommSystem&action=CommSystemAjax&command=getPeriodicalInfo', onComplete: this.HandleEvent, onFailure: function() { - window.ClearTimeout(globalCommSystem.timer); + window.clearTimeout(globalCommSystem.timer); } } ); @@ -48,7 +51,7 @@ $(globalCommSystem.sliderElement).style.width = '180px'; }, function() { - new Effect.Appear($(globalCommSystem.sliderElement)); + new Effect.Appear($(globalCommSystem.sliderElement),{duration:'0.2'}); } ); this.sliderOpen = "true"; @@ -58,7 +61,7 @@ $(globalCommSystem.sliderElement).className = "commSlider"; }, function() { - new Effect.Fade($(globalCommSystem.sliderElement)); + new Effect.Fade($(globalCommSystem.sliderElement),{duration:'0.2'}); }, function() { $(globalCommSystem.sliderElement).style.width = '0px'; @@ -74,10 +77,8 @@ * Creates elements and populates with past info */ CheckSession: function() { - try { window.clearTimeout(this.timer); this.CommUpdate(); - }catch(e){if(this.debug) alert(e);} }, /* @@ -86,16 +87,45 @@ * message text. */ SendChatMessage: function(otheruser,msg) { + msgStruct = { + sending_user: otheruser, + msg_data: msg, + msg_type: 'P2PIM' + } + globalCommSystem = this; new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'commsys'}, method: 'post', - postBody: 'module=CommSystem&action=CommSystemAjax&command=sendChatMessage&receivers='+otheruser+'&msg='+msg+'msg_type=P2PIM', + postBody: 'module=CommSystem&action=CommSystemAjax&command=sendChatMessage&receivers='+otheruser+'&msg='+msg+'&msg_type=P2PIM', onComplete: function(response) { - alert(response.responseText); + if(!response.responseText.match(/^failed/)) { + Object.extend(msgStruct, {msg_data:''+globalCommSystem.user.user_name+": "+response.responseText}); + globalCommSystem.ShowNewChatMessage(msgStruct,""); + } else { + Object.extend(msgStruct, {msg_data:'Failed to deliver message: '+msgStruct.msg_data}); + globalCommSystem.ShowNewChatMessage(msgStruct,""); + } } } ); + } +, + SendMsg: function(evt) { + var dat = $("msg_input_"+Event.element(evt).name); + try { + globalCommSystem.SendChatMessage(Event.element(evt).name,dat.value); + }catch(e){alert(e);} + dat.value = ""; + }, + + OpenChatSession: function(receivers) { + msgStruct = { + sending_user: receivers, + msg_data: '', + msg_type: 'P2PIM' + } + this.ShowNewChatMessage(msgStruct,"Chatting with: "+receivers); }, /* @@ -106,7 +136,9 @@ ShowNewChatMessage: function(msg,header_msg) { Try.these ( function() { - new Effect.Appear("msgwindow_"+msg.sending_user); + new Effect.Appear("msgwindow_"+msg.sending_user,{duration:'0.2'}); + $("chat_data_"+msg.sending_user).innerHTML += "
"+msg.msg_data; + globalCommSystem.ScrollChatWindow($("chat_data_"+msg.sending_user)); }, function() { if(msg.msg_type == "P2PIM") @@ -143,7 +175,7 @@ [ Builder.node( 'img', {src:'themes/blue/images/close.gif', - onClick: 'new Effect.Fade(\'msgwindow_'+msg.sending_user+'\')' + onClick: 'new Effect.Fade(\'msgwindow_'+msg.sending_user+'\',{duration:\'0.2\'})' } )] )] @@ -163,7 +195,7 @@ width:'100%',height:'100%',colspan:'2' }, [ Builder.node( - 'div', {id:'chat_data_'+msg.sending_user,className:'chatWindowDataArea'} + 'div', {id:'chat_data_'+msg.sending_user,className:'chatWindowDataArea',name:msg.sending_user} )] )] ); @@ -171,20 +203,19 @@ var msg_input = Builder.node( 'tr', - { - valign:'top',align:'center' - }, + {valign:'top',align:'center'}, [ Builder.node( 'td', - { - width:'100%',height:'100%',colspan:'2' - }, - [ Builder.node( - 'div', {id:'msg_input_'+msg.sending_user}, + [ Builder.node( + 'div', {id:'msg_wrapper_'+msg.sending_user}, [ Builder.node( - 'textarea' - )] - )] + 'textarea', {id:'msg_input_'+msg.sending_user,name:msg.sending_user} + )] //, [ Builder.node('br') ], + )], + [ Builder.node( + 'p',{id:'status_bar_'+msg.sending_user},'Status Bar' + )], + {width:'100%',colspan:'2'} )] ); main_table.appendChild(msg_input); @@ -192,12 +223,48 @@ main_table.style.display = "none"; $("comm_sys").appendChild(main_table); - $("chat_data_"+msg.sending_user).innerHTML += msg.msg_data; - $("msg_input_"+msg.sending_user).innerHTML += ''; - - new Effect.Appear(main_table); + try { + $("chat_data_"+msg.sending_user).innerHTML += "
"+msg.msg_data; + $("msg_wrapper_"+msg.sending_user).innerHTML += ''; + Event.observe($("msg_input_"+msg.sending_user), 'keypress', globalCommSystem.UserTyping.bindAsEventListener(this)); + Event.observe($("send_button_"+msg.sending_user), 'click', globalCommSystem.SendMsg.bindAsEventListener(this)); + }catch(f){alert(f);} + + new Effect.Appear(main_table,{duration:'0.2'}); + new Draggable(main_table); } ); + }, + + ScrollChatWindow: function(evt) { + //$("debug_win").innerHTML += "
Scrolling"; + Try.these ( + function() { + var tname = "chat_data_"+Event.element(evt).name; + $(tname).scrollTop = $(tname).scrollHeight; + }, + function() { + evt.scrollTop = evt.scrollHeight; + } + ); + }, + + UserTyping: function(evt) { + window.clearTimeout(this.keytimer); + var tname = "status_bar_"+Event.element(evt).name; + if(evt.type === "keypress") { + if(globalCommSystem.keycount == 0) { + $(tname).innerHTML = "User is typing"; + this.keycount++; + } + this.keytimer = window.setTimeout('globalCommSystem.UserStopTyping("'+Event.element(evt).name+'")',2000); + } + }, + + UserStopTyping: function(sending_user) { + window.clearTimeout(this.keytimer); + this.keycount=0; + $("status_bar_"+sending_user).innerHTML = "Stopped typing..."; }, /* @@ -208,18 +275,15 @@ * for messages (IMs) a window object will be built for the message. */ HandleEvent: function(responseData) { - //alert(responseData.responseText); - if(responseData.responseText.match(/none/)) - return false; - else { + if(!responseData.responseText.match(/none/)) { var msgs = eval('(' + responseData.responseText + ')'); for (var i=0;idb->query($q); - return "true"; - } else - return "false"; } + if(isset($q) && $q != "") { + $rs = $this->db->query($q); + return "true"; + } else + return "false"; } function GetNewAlerts($userid) { @@ -113,6 +113,15 @@ $c++; } } + + $q = "UPDATE vtiger_comm_system SET viewed='1' WHERE "; + for($i=0,$cnt=count($ret);$i<$cnt;$i++) { + if($i==0) + $q .= "msgid='".$ret[$i]["msgid"]."'"; + else + $q .= " OR msgid='".$ret[$i]["msgid"]."'"; + } + $this->db->query($q); return $ret; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Fri Jul 7 00:10:12 2006 @@ -58,9 +58,9 @@ if($_REQUEST["command"] == "sendChatMessage") { require_once("modules/CommSystem/CommSystem.php"); $commSys = new CommSystem(); - if($commSys->SendAlert($_REQUEST["msg"],$_REQUEST["msg_type"],$_SESSION["authenticated_user_id"],$_REQUEST["receivers"]) == "false") + if($commSys->SendAlert(nl2br($_REQUEST["msg"]),$_REQUEST["msg_type"],'0',$_SESSION["authenticated_user_id"],$_REQUEST["receivers"]) == "false") echo "failed"; else - echo "success"; + echo nl2br($_REQUEST["msg"]); } ?> Modified: branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php Fri Jul 7 00:10:12 2006 @@ -105,7 +105,7 @@ $rs = $adb->query($q); $list = "
CRM Users:"; while($row=$adb->fetch_array($rs)) { - $list .= "
".$row["user_name"].""; + $list .= "
".$row["user_name"].""; } $list .= "
"; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css Fri Jul 7 00:10:12 2006 @@ -2904,6 +2904,7 @@ height: 200px; text-align:left; padding-left:3px; + overflow: auto; } .commSlider { position: absolute; From vtigercrm-commits at vtiger.fosslabs.com Thu Jul 6 23:15:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 06:15:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7883 - /branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml Message-ID: <20060707061514.AEBFB83FF66@vtiger.fosslabs.com> Author: mmbrich Date: Fri Jul 7 00:15:13 2006 New Revision: 7883 Log: comm sys fixes Modified: branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml Modified: branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml Fri Jul 7 00:15:13 2006 @@ -6110,7 +6110,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 00:23:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 07:23:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7884 - /vtigercrm/trunk/modules/Users/Authenticate.php Message-ID: <20060707072330.3019783FD2B@vtiger.fosslabs.com> Author: saraj Date: Fri Jul 7 01:23:26 2006 New Revision: 7884 Log: added the record value as 0 in authenticate php - ahmed Modified: vtigercrm/trunk/modules/Users/Authenticate.php Modified: vtigercrm/trunk/modules/Users/Authenticate.php ============================================================================== --- vtigercrm/trunk/modules/Users/Authenticate.php (original) +++ vtigercrm/trunk/modules/Users/Authenticate.php Fri Jul 7 01:23:26 2006 @@ -40,7 +40,7 @@ { $date_var = date('YmdHis'); - $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate',$date_var)"; + $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate',0,$date_var)"; $adb->query($query); From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 00:34:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 07:34:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7885 - /vtigercrm/tags/vtigercrm-5.0.0beta2/ Message-ID: <20060707073443.1724B1879F6@vtiger.fosslabs.com> Author: richie Date: Fri Jul 7 01:34:32 2006 New Revision: 7885 Log: made a copy Added: vtigercrm/tags/vtigercrm-5.0.0beta2/ - copied from r7873, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 00:47:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 07:47:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7886 - /vtigercrm/trunk/index.php Message-ID: <20060707074713.E340D83F52D@vtiger.fosslabs.com> Author: saraj Date: Fri Jul 7 01:47:10 2006 New Revision: 7886 Log: Updated the index php file by moving the audit trail query inside user login session - ahmed Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Fri Jul 7 01:47:10 2006 @@ -360,7 +360,24 @@ foreach ($moduleList as $mod) { $moduleDefaultFile[$mod] = "modules/".$currentModule."/index.php"; } - + + //auditing + + $qry = "select server from vtiger_systems where server_type = 'audit_trail'"; + + $result = $adb->query($qry); + $server = $adb->query_result($result,0,'server'); + + if($server == 'enabled') + { + if($record == '') + $auditrecord = 0 else + $auditrecord = $record; + + $date_var = date('YmdHis'); + $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$current_user->id.",'".$module."','".$action."',".$auditrecord.",$date_var)"; + $adb->query($query); + } $log->debug('Current user is: '.$current_user->user_name); } @@ -552,24 +569,6 @@ $theme = $default_theme; } - - -//auditing - -$qry = "select server from vtiger_systems where server_type = 'audit_trail'"; -$result = $adb->query($qry); -$server = $adb->query_result($result,0,'server'); - -if($server == 'enabled') -{ - if($record == '') - $auditrecord = 0; - else - $auditrecord = $record; - $date_var = date('YmdHis'); - $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$current_user->id.",'".$module."','".$action."',".$auditrecord.",$date_var)"; - $adb->query($query); -} //logging the security Information $seclog->debug('######## Module --> '.$module.' :: Action --> '.$action.' :: UserID --> '.$current_user->id.' :: RecordID --> '.$record.' #######'); From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 01:01:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 08:01:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231450=3A?= =?utf-8?q?_Analytics_-_First_pipeline_graph_contains_no_data=2E?= In-Reply-To: <076.a5be7598faf251344fb8aa9bf0176d79@vtiger.fosslabs.com> References: <076.a5be7598faf251344fb8aa9bf0176d79@vtiger.fosslabs.com> Message-ID: <085.72f7427b8c1c22abc43c2e56900d154f@vtiger.fosslabs.com> #1450: Analytics - First pipeline graph contains no data. ------------------------+--------------------------------------------------- Reporter: andrewr | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by andrewr): Update - Potentials assigned to groups don't show up in the first pipeline graph - Pipeline By Sales Stage -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 01:24:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 08:24:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7887 - in /branches/VTIGERCRM-5.0.2-MMBRICH: Smarty/templates/Header.tpl Smarty/templates/HomePage.tpl include/js/objects/CommSystem.js modules/CommSystem/CommSystem.php modules/CommSystem/CommSystemAjax.php themes/blue/header.php Message-ID: <20060707082419.9B46C83FE37@vtiger.fosslabs.com> Author: mmbrich Date: Fri Jul 7 02:24:18 2006 New Revision: 7887 Log: partially working communications system with simple peer2peer IM Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/HomePage.tpl branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl Fri Jul 7 02:24:18 2006 @@ -427,7 +427,6 @@ return true; } -try { /* START COMMUNICATIONS SYSTEM */ function openCommSystem() { CS.OpenSlider(); @@ -437,7 +436,6 @@ addOnloadEvent(function() { CS = new CommSystem("CommSliderDiv",VtUser); }); -}catch(m){alert(m);} {/literal} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/HomePage.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/HomePage.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/HomePage.tpl Fri Jul 7 02:24:18 2006 @@ -85,7 +85,12 @@ - + +
{$APP.LBL_CALENDAR_ALT} {$APP.LBL_CLOCK_ALT} {$APP.LBL_CALCULATOR_ALT}{$APP.LBL_CHAT_ALT} + + {$APP.LBL_CHAT_ALT} + + {$APP.LBL_LAST_VIEWED}
Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Fri Jul 7 02:24:18 2006 @@ -1,8 +1,10 @@ +try { CommSystem = Class.create(); +} catch(r){alert(r);} CommSystem.prototype = { initialize: function(element,CurrentUser) { this.debug=true; - this.refreshtime = '5000'; + this.refreshtime = '2000'; this.username = VtUser.user_name; this.sliderElement = element; this.CheckSession(); @@ -11,6 +13,7 @@ this.keycount=0; this.keytimer; this.user=CurrentUser; + this.tmpCount=0; }, /* @@ -19,15 +22,16 @@ * */ CommUpdate: function() { + window.clearTimeout(this.timer); globalCommSystem = this; - window.clearTimeout(this.timer); new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'commsys'}, method: 'post', postBody: 'module=CommSystem&action=CommSystemAjax&command=getPeriodicalInfo', - onComplete: this.HandleEvent, + onComplete: globalCommSystem.HandleEvent, onFailure: function() { + alert("Failed"); window.clearTimeout(globalCommSystem.timer); } } @@ -77,8 +81,8 @@ * Creates elements and populates with past info */ CheckSession: function() { - window.clearTimeout(this.timer); - this.CommUpdate(); + window.clearTimeout(this.timer); + this.CommUpdate(); }, /* @@ -90,7 +94,8 @@ msgStruct = { sending_user: otheruser, msg_data: msg, - msg_type: 'P2PIM' + msg_type: 'P2PIM', + user_name: '' } globalCommSystem = this; new Ajax.Request( @@ -112,20 +117,21 @@ } , SendMsg: function(evt) { - var dat = $("msg_input_"+Event.element(evt).name); try { - globalCommSystem.SendChatMessage(Event.element(evt).name,dat.value); - }catch(e){alert(e);} + var dat = $("msg_input_"+Event.element(evt).name); + globalCommSystem.SendChatMessage(Event.element(evt).name,dat.value); + }catch(p){alert(p);} dat.value = ""; }, - OpenChatSession: function(receivers) { + OpenChatSession: function(receivers,usr_name) { msgStruct = { sending_user: receivers, msg_data: '', - msg_type: 'P2PIM' - } - this.ShowNewChatMessage(msgStruct,"Chatting with: "+receivers); + msg_type: 'P2PIM', + user_name: usr_name + } + this.ShowNewChatMessage(msgStruct, "Chatting with "+usr_name); }, /* @@ -137,7 +143,12 @@ Try.these ( function() { new Effect.Appear("msgwindow_"+msg.sending_user,{duration:'0.2'}); - $("chat_data_"+msg.sending_user).innerHTML += "
"+msg.msg_data; + if(msg.user_name != globalCommSystem.user.user_name) + msg.msg_data = "
"+msg.user_name+" "+msg.msg_data; + else + msg.msg_data = "
"+msg.msg_data; + + $("chat_data_"+msg.sending_user).innerHTML += msg.msg_data; globalCommSystem.ScrollChatWindow($("chat_data_"+msg.sending_user)); }, function() { @@ -183,7 +194,15 @@ ); main_table.appendChild(top_bar); - msg.msg_data +="
"; + Try.these ( + function() { + if(msg.user_name != globalCommSystem.user.user_name) {return false;} + msg.msg_data = "
"+msg.user_name+": "+msg.msg_data; + }, + function() { + msg.msg_data += "
"; + } + ); var chat_data = Builder.node( 'tr', { @@ -228,7 +247,7 @@ $("msg_wrapper_"+msg.sending_user).innerHTML += ''; Event.observe($("msg_input_"+msg.sending_user), 'keypress', globalCommSystem.UserTyping.bindAsEventListener(this)); Event.observe($("send_button_"+msg.sending_user), 'click', globalCommSystem.SendMsg.bindAsEventListener(this)); - }catch(f){alert(f);} + }catch(g){alert(g);} new Effect.Appear(main_table,{duration:'0.2'}); new Draggable(main_table); @@ -267,6 +286,19 @@ $("status_bar_"+sending_user).innerHTML = "Stopped typing..."; }, + MarkAsRead: function(msgid) { + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'commsys'}, + method: 'post', + postBody: 'module=CommSystem&action=CommSystemAjax&command=markAsRead&msgid='+msgid, + onComplete: function(response) { + + } + } + ); + }, + /* * function to parse JSON msg data * and act on alerts or messages @@ -275,15 +307,21 @@ * for messages (IMs) a window object will be built for the message. */ HandleEvent: function(responseData) { + globalCommSystem.tmpCount++; if(!responseData.responseText.match(/none/)) { var msgs = eval('(' + responseData.responseText + ')'); for (var i=0;i= 2) { + globalCommSystem.tmpCount = 0; + //globalCommSystem.MarkAsRead(msgid); + } + if(msg.sending_user == globalCommSystem.user.user_id) {return;} switch(msg_type) { case 'P2PIM': - globalCommSystem.ShowNewChatMessage(msg,"Message from matt"); + globalCommSystem.ShowNewChatMessage(msg,"Chatting with "+msg.user_name); break; case 'GRPIM': alert(msgs.CommSysMessages[i].message.msg_data); @@ -297,11 +335,9 @@ case 'VOICEMAIL': alert(msgs.CommSysMessages[i].message.msg_data); break; - default: - break; } } } - this.timer = window.setTimeout('globalCommSystem.CommUpdate()',this.refreshtime); + globalCommSystem.timer = window.setTimeout('globalCommSystem.CommUpdate()',globalCommSystem.refreshtime); } } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Fri Jul 7 02:24:18 2006 @@ -40,7 +40,7 @@ $q = "INSERT INTO vtiger_comm_system (msg_type,sending_user,receivers,msg_data,sentdate) VALUES - ('".$msg_type."','".$sending_user."','".$receivers."','".$msg_data."','".$nowdate."')"; + ('".$msg_type."','".$sending_user."','".$receivers."','".addslashes($msg_data)."','".$nowdate."')"; break; case 'EMAIL': if($recordid == 0 || $sending_user == 0) { return "false"; } @@ -79,11 +79,11 @@ function GetNewAlerts($userid) { // This query will get all non-group/non-broadcast messages - $q = "SELECT * FROM vtiger_comm_system WHERE receivers='".$userid."' AND viewed = '0'"; + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND viewed = '0'"; $p2p = $this->db->query($q); // This query will get all group/broadcast messages - $q = "SELECT * FROM vtiger_comm_system WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0'"; + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0'"; $grp = $this->db->query($q); $ret = array(); @@ -96,6 +96,7 @@ $ret[$c]["msg_data"] = $row["msg_data"]; $ret[$c]["recordid"] = $row["recordid"]; $ret[$c]["sending_user"] = $row["sending_user"]; + $ret[$c]["user_name"] = $row["user_name"]; $ret[$c]["sentdate"] = $row["sentdate"]; $c++; } @@ -109,6 +110,7 @@ $ret[$c]["msg_data"] = $row["msg_data"]; $ret[$c]["recordid"] = $row["recordid"]; $ret[$c]["sending_user"] = $row["sending_user"]; + $ret[$c]["user_name"] = $row["user_name"]; $ret[$c]["sentdate"] = $row["sentdate"]; $c++; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Fri Jul 7 02:24:18 2006 @@ -43,6 +43,7 @@ $ret .= '"msg_type":"'.$msg[$i]["msg_type"].'",'; $ret .= '"recordid":"'.$msg[$i]["recordid"].'",'; $ret .= '"sending_user":"'.$msg[$i]["sending_user"].'",'; + $ret .= '"user_name":"'.$msg[$i]["user_name"].'",'; $ret .= '"timestamp":"'.$msg[$i]["sentdate"].'",'; $ret .= '"msg_data":"'.$msg[$i]["msg_data"].'"}'; @@ -63,4 +64,9 @@ else echo nl2br($_REQUEST["msg"]); } +if($_REQUEST["command"] == "markAsRead") { + $q="Update vtiger_comm_system set viewed='2' where msgid='".$_REQUEST["msgid"]."'"; + $adb->query($q); + echo "success"; +} ?> Modified: branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php Fri Jul 7 02:24:18 2006 @@ -105,7 +105,7 @@ $rs = $adb->query($q); $list = "
CRM Users:"; while($row=$adb->fetch_array($rs)) { - $list .= "
".$row["user_name"].""; + $list .= "
".$row["user_name"].""; } $list .= "
"; From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 01:56:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 08:56:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7888 - /vtigercrm/trunk/Smarty/templates/AuditTrailList.tpl Message-ID: <20060707085656.8DBCF83FE37@vtiger.fosslabs.com> Author: saraj Date: Fri Jul 7 02:56:52 2006 New Revision: 7888 Log: Updated the audit image Modified: vtigercrm/trunk/Smarty/templates/AuditTrailList.tpl Modified: vtigercrm/trunk/Smarty/templates/AuditTrailList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AuditTrailList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AuditTrailList.tpl Fri Jul 7 02:56:52 2006 @@ -31,7 +31,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 02:12:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 09:12:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7889 - /vtigercrm/trunk/themes/blue/images/ico-users.gif Message-ID: <20060707091219.ACDC683FE41@vtiger.fosslabs.com> Author: saraj Date: Fri Jul 7 03:12:16 2006 New Revision: 7889 Log: Deleted old users icon Removed: vtigercrm/trunk/themes/blue/images/ico-users.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 02:14:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 09:14:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7890 - /vtigercrm/trunk/themes/blue/images/ico-users.gif Message-ID: <20060707091419.C744C83FE4D@vtiger.fosslabs.com> Author: saraj Date: Fri Jul 7 03:14:15 2006 New Revision: 7890 Log: added new users icon-ahmed Added: vtigercrm/trunk/themes/blue/images/ico-users.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 03:39:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 10:39:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7891 - /vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Message-ID: <20060707103911.703C81818C9@vtiger.fosslabs.com> Author: saraj Date: Fri Jul 7 04:39:06 2006 New Revision: 7891 Log: Added the Select Product Button in the Potential Related List Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Fri Jul 7 04:39:06 2006 @@ -1,134 +1,138 @@ -{**} -{foreach key=header item=detail from=$RELATEDLISTS} -
{$MOD.LBL_USERS}{$MOD.LBL_AUDIT_TRAIL} {$MOD.LBL_SETTINGS} > {$MOD.LBL_AUDIT_TRAIL}
- - - {if $detail ne ''} - - {$detail.navigation.1} - {/if} - - {elseif $header eq 'PriceBooks'} - {if $MODULE eq 'Products'} - - {/if} - {elseif $header eq 'Products'} - {if $MODULE eq 'PriceBooks'} - - {elseif $MODULE eq 'Vendors'} - - {else} - - {/if} - {elseif $header eq 'Leads'} - {if $MODULE eq 'Campaigns'} - {$LEADCVCOMBO} - - {/if} - - {elseif $header eq 'Contacts' } - {if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'} - - {elseif $MODULE eq 'Emails'} -   - - {elseif $MODULE eq 'Campaigns'} - {$CONTCVCOMBO} - - - {else} - - {/if} - {elseif $header eq 'Activities'} - {if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Campaigns'} - - - {else} - -   - - {/if} - {elseif $header eq 'HelpDesk'} - - {elseif $header eq 'Campaigns'} - - {elseif $header eq 'Attachments'} -   - - - {elseif $header eq 'Quotes'} - - {elseif $header eq 'Invoice'} - {if $MODULE eq 'SalesOrder'} - - {else} - - {/if} - {elseif $header eq 'Sales Order'} - {if $MODULE eq 'Quotes'} - - {else} - - {/if} - {elseif $header eq 'Purchase Order'} - - {elseif $header eq 'Emails'} - - - - {elseif $header eq 'Users'} - {if $MODULE eq 'Activities'} - - {elseif $MODULE eq 'Emails'} -   -   - {/if} - {elseif $header eq 'Activity History'} -   - {/if} - -
{$APP.$header}{$detail.navigation.0} - {if $header eq 'Potentials'} - -
-{if $detail ne ''} - {foreach key=header item=detail from=$detail} - {if $header eq 'header'} - - - {foreach key=header item=headerfields from=$detail} - - {/foreach} - - {elseif $header eq 'entries'} - {foreach key=header item=detail from=$detail} - - {foreach key=header item=listfields from=$detail} - - {/foreach} - - {/foreach} -
{$headerfields}
{$listfields}
- {/if} - {/foreach} -{else} - - - - -
{$APP.LBL_NONE_INCLUDED}
-{/if} -

-{/foreach} +{**} +{foreach key=header item=detail from=$RELATEDLISTS} + + + + {if $detail ne ''} + + {$detail.navigation.1} + {/if} + + {elseif $header eq 'PriceBooks'} + {if $MODULE eq 'Products'} + + {/if} + {elseif $header eq 'Products'} + {if $MODULE eq 'PriceBooks'} + + {elseif $MODULE eq 'Potentials'} +   + + + {elseif $MODULE eq 'Vendors'} + + {else} + + {/if} + {elseif $header eq 'Leads'} + {if $MODULE eq 'Campaigns'} + {$LEADCVCOMBO} + + {/if} + + {elseif $header eq 'Contacts' } + {if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'} + + {elseif $MODULE eq 'Emails'} +   + + {elseif $MODULE eq 'Campaigns'} + {$CONTCVCOMBO} + + + {else} + + {/if} + {elseif $header eq 'Activities'} + {if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Campaigns'} + + + {else} + +   + + {/if} + {elseif $header eq 'HelpDesk'} + + {elseif $header eq 'Campaigns'} + + {elseif $header eq 'Attachments'} +   + + + {elseif $header eq 'Quotes'} + + {elseif $header eq 'Invoice'} + {if $MODULE eq 'SalesOrder'} + + {else} + + {/if} + {elseif $header eq 'Sales Order'} + {if $MODULE eq 'Quotes'} + + {else} + + {/if} + {elseif $header eq 'Purchase Order'} + + {elseif $header eq 'Emails'} + + + + {elseif $header eq 'Users'} + {if $MODULE eq 'Activities'} + + {elseif $MODULE eq 'Emails'} +   +   + {/if} + {elseif $header eq 'Activity History'} +   + {/if} + +
{$APP.$header}{$detail.navigation.0} + {if $header eq 'Potentials'} + +
+{if $detail ne ''} + {foreach key=header item=detail from=$detail} + {if $header eq 'header'} + + + {foreach key=header item=headerfields from=$detail} + + {/foreach} + + {elseif $header eq 'entries'} + {foreach key=header item=detail from=$detail} + + {foreach key=header item=listfields from=$detail} + + {/foreach} + + {/foreach} +
{$headerfields}
{$listfields}
+ {/if} + {/foreach} +{else} + + + + +
{$APP.LBL_NONE_INCLUDED}
+{/if} +

+{/foreach} From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 03:54:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 10:54:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7892 - in /branches/VTIGERCRM-5.0.2-MMBRICH: Smarty/templates/Header.tpl include/js/objects/CommSystem.js modules/CommSystem/CommSystem.php modules/CommSystem/CommSystemAjax.php themes/blue/style.css Message-ID: <20060707105453.5608083FF64@vtiger.fosslabs.com> Author: mmbrich Date: Fri Jul 7 04:54:52 2006 New Revision: 7892 Log: more comm system improvements, added email notification Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl Fri Jul 7 04:54:52 2006 @@ -491,5 +491,5 @@ Drag.init(THandle, TRoot); - - +  + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Fri Jul 7 04:54:52 2006 @@ -229,7 +229,7 @@ 'div', {id:'msg_wrapper_'+msg.sending_user}, [ Builder.node( 'textarea', {id:'msg_input_'+msg.sending_user,name:msg.sending_user} - )] //, [ Builder.node('br') ], + )] )], [ Builder.node( 'p',{id:'status_bar_'+msg.sending_user},'Status Bar' @@ -243,7 +243,14 @@ $("comm_sys").appendChild(main_table); try { - $("chat_data_"+msg.sending_user).innerHTML += "
"+msg.msg_data; + Try.these ( + function() { + $("chat_data_"+msg.sending_user).innerHTML = "
"+msg.user_name+": "+msg.msg_data; + }, + function() { + $("chat_data_"+msg.sending_user).innerHTML += "
"+msg.msg_data; + } + ); $("msg_wrapper_"+msg.sending_user).innerHTML += ''; Event.observe($("msg_input_"+msg.sending_user), 'keypress', globalCommSystem.UserTyping.bindAsEventListener(this)); Event.observe($("send_button_"+msg.sending_user), 'click', globalCommSystem.SendMsg.bindAsEventListener(this)); @@ -253,6 +260,29 @@ new Draggable(main_table); } ); + }, + + ShowAlertSlider: function(msg) { + $("alert_display").innerHTML = ""+msg+""; + Try.these ( + function() { + $("alert_display").style.display = "block"; + window.setTimeout(function() { + globalCommSystem.HideAlertSlider(); + },3000); + }, + function() { + new Effect.Appear($("alert_display")); + window.setTimeout(function() { + globalCommSystem.HideAlertSlider(); + },3000); + } + ); + }, + + HideAlertSlider: function() { + new Effect.Fade($("alert_display")); + $("alert_display").innerHTML = ""; }, ScrollChatWindow: function(evt) { @@ -307,19 +337,22 @@ * for messages (IMs) a window object will be built for the message. */ HandleEvent: function(responseData) { + //$("debug_win").innerHTML += "
"+responseData.responseText; globalCommSystem.tmpCount++; + try { if(!responseData.responseText.match(/none/)) { var msgs = eval('(' + responseData.responseText + ')'); for (var i=0;i= 2) { + try { + var msg = msgs.CommSysMessages[i].message; + var msgid = msg.msgid; + var msg_type = msg.msg_type; + if(globalCommSystem.tmpCount >= 2) { globalCommSystem.tmpCount = 0; //globalCommSystem.MarkAsRead(msgid); - } - if(msg.sending_user == globalCommSystem.user.user_id) {return;} - switch(msg_type) { + } + if(msg.sending_user == globalCommSystem.user.user_id) {return;} + switch(msg_type) { case 'P2PIM': globalCommSystem.ShowNewChatMessage(msg,"Chatting with "+msg.user_name); break; @@ -335,9 +368,21 @@ case 'VOICEMAIL': alert(msgs.CommSysMessages[i].message.msg_data); break; - } - } - } + } + }catch(h){} + Try.these ( + function() { + if(msgs.CommSysMessages[i].email.email_count > 0) + globalCommSystem.ShowAlertSlider("You have "+msgs.CommSysMessages[i].email.email_count+" new emails"); + }, + function() { + if(msgs.CommSysMessages[(i+1)].email.email_count > 0) + globalCommSystem.ShowAlertSlider("You have "+msgs.CommSysMessages[i].email.email_count+" new emails"); + } + ); + } + } + }catch(f){} globalCommSystem.timer = window.setTimeout('globalCommSystem.CommUpdate()',globalCommSystem.refreshtime); } } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Fri Jul 7 04:54:52 2006 @@ -22,6 +22,7 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); +global $current_user; class CommSystem { var $user; @@ -130,5 +131,23 @@ function MarkRead($msgid) { } + + function CheckEmails() { + global $current_user; + require_once('include/utils/UserInfoUtil.php'); + require_once("modules/Webmails/MailParse.php"); + require_once("modules/Webmails/Webmail.php"); + + $mailInfo = getMailServerInfo($current_user); + $temprow = $this->db->fetch_array($mailInfo); + $imapServerAddress=$temprow["mail_servername"]; + if($imapServerAddress != "" && isset($imapServerAddress)) { + $mbox = getImapMbox("INBOX",$temprow,"true"); + $box = imap_status($mbox, "{".$imapServerAddress."}"."INBOX", SA_ALL); + return $box->unseen; + } else { + return "0"; + } + } } ?> Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Fri Jul 7 04:54:52 2006 @@ -28,6 +28,12 @@ if($_REQUEST["command"] == "getPeriodicalInfo") { require_once("modules/CommSystem/CommSystem.php"); + + if(!isset($_SESSION["refresh_count"])) + $_SESSION["refresh_count"]=0; + else + $_SESSION["refresh_count"]++; + $commSys = new CommSystem(); $msg = $commSys->GetNewAlerts($_SESSION["authenticated_user_id"]); $ret = ''; @@ -52,8 +58,36 @@ else $ret .= '},'; } - $ret .= ']}'; } + if($_SESSION["refresh_count"] >= 20) { + $_SESSION["refresh_count"] = 0; + $email_cnt = $commSys->CheckEmails(); + + if($email_cnt > 0) { + if($ret == "none") + $ret = '{"CommSysMessages":['; + else + $ret .= ','; + } else { + if($ret == "none") + $ret = 'none'; + else + $ret .= ''; + } + + if($email_cnt > 0) { + $ret .= '{"email":'; + $ret .= '{'; + $ret .= '"email_count":"'.$email_cnt.'",'; + $ret .= '}'; + $ret .= '}'; + $ret .= ']}'; + } else if($ret != "none") { + $ret .= ']}'; + } + } elseif($ret != "none") + $ret .= ']}'; + echo $ret; } if($_REQUEST["command"] == "sendChatMessage") { @@ -69,4 +103,10 @@ $adb->query($q); echo "success"; } + +function check_email() { + require_once("modules/CommSystem/CommSystem.php"); + $commSys = new CommSystem(); + echo $commSys->CheckEmails(); +} ?> Modified: branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css Fri Jul 7 04:54:52 2006 @@ -2926,3 +2926,15 @@ background-color: white; z-index:1900000; } +.alertDisplay { + position: absolute; + width: 220px; + height: 100px; + bottom: 50px; + right: 1px; + border: 1px solid gray; + text-align: center; + background-color: #FFFFCC; + z-index:2000000; + display: none; +} From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 04:43:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 11:43:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7893 - /vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Message-ID: <20060707114355.8735283FF61@vtiger.fosslabs.com> Author: saraj Date: Fri Jul 7 05:43:50 2006 New Revision: 7893 Log: removed an extra td Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Fri Jul 7 05:43:50 2006 @@ -293,7 +293,6 @@ {elseif $uitype eq 59} {$fldlabel} -  Select  From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 06:13:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 13:13:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23132=3A_?= =?utf-8?q?groups=2C_default_organization=2Cassign_module_owners_icon_not_?= =?utf-8?q?proper?= In-Reply-To: <076.e71334eb43ddc9fb65b8db70042e99cb@vtiger.fosslabs.com> References: <076.e71334eb43ddc9fb65b8db70042e99cb@vtiger.fosslabs.com> Message-ID: <085.1d81bf425bd56af159b192bd26bfd19e@vtiger.fosslabs.com> #132: groups, default organization,assign module owners icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: icons ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 06:13:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 13:13:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23133=3A_?= =?utf-8?q?Settings_icon_not_proper?= In-Reply-To: <076.f8f9273f78f9179ab6e89a6779e07153@vtiger.fosslabs.com> References: <076.f8f9273f78f9179ab6e89a6779e07153@vtiger.fosslabs.com> Message-ID: <085.3ebb8b3266e1017873f9b874f81f6302@vtiger.fosslabs.com> #133: Settings icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: icons ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 06:15:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 13:15:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2314=3A_T?= =?utf-8?q?oo_late_for_unit_testing=2C_consider_functional_testing_with_se?= =?utf-8?q?lenium?= In-Reply-To: <076.80be249f77bed75d5430ff99ca979397@vtiger.fosslabs.com> References: <076.80be249f77bed75d5430ff99ca979397@vtiger.fosslabs.com> Message-ID: <085.c11033a26eda3803b4d7ecb01bd6073b@vtiger.fosslabs.com> #14: Too late for unit testing, consider functional testing with selenium ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: task | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: testing ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: using QEngine for the same. Hence closing the ticket. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 06:35:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 13:35:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7894 - /vtigercrm/trunk/modules/Users/UsersAjax.php Message-ID: <20060707133507.1906F8401E2@vtiger.fosslabs.com> Author: richie Date: Fri Jul 7 07:35:02 2006 New Revision: 7894 Log: table name changed from announcements to vtiger_announcement Modified: vtigercrm/trunk/modules/Users/UsersAjax.php Modified: vtigercrm/trunk/modules/Users/UsersAjax.php ============================================================================== --- vtigercrm/trunk/modules/Users/UsersAjax.php (original) +++ vtigercrm/trunk/modules/Users/UsersAjax.php Fri Jul 7 07:35:02 2006 @@ -41,9 +41,9 @@ $sql="select * from vtiger_announcement where creatorid=".$current_user->id; $is_announce=$adb->query($sql); if($adb->num_rows($is_announce) > 0) - $query="update vtiger_announcement set announcement=".$adb->formatString("announcement","announcement",$announcement).",time=".$adb->formatString("announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id; + $query="update vtiger_announcement set announcement=".$adb->formatString("vtiger_announcement","announcement",$announcement).",time=".$adb->formatString("vtiger_announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id; else - $query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",'announcement','".$date_var."')"; + $query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("vtiger_announcement","announcement",$announcement).",'announcement','".$date_var."')"; $result=$adb->query($query); echo $announcement; } From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 07:33:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 14:33:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7895 - in /vtigercrm/trunk/Smarty/templates: UserDetailView.tpl UserEditView.tpl Message-ID: <20060707143343.4EFB983FEFD@vtiger.fosslabs.com> Author: richie Date: Fri Jul 7 08:33:38 2006 New Revision: 7895 Log: Updated the new user image Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Fri Jul 7 08:33:38 2006 @@ -55,7 +55,7 @@ - + - + +
{if $CATEGORY eq 'Settings'} Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Fri Jul 7 08:33:38 2006 @@ -81,7 +81,7 @@
- + From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 08:45:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 15:45:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7897 - in /branches/VTIGERCRM-5.0.2-MMBRICH: include/js/objects/CommSystem.js modules/CommSystem/CommSystemAjax.php Message-ID: <20060707154504.21D5683FEFD@vtiger.fosslabs.com> Author: mmbrich Date: Fri Jul 7 09:45:02 2006 New Revision: 7897 Log: small fixes for comm system Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Fri Jul 7 09:45:02 2006 @@ -269,20 +269,23 @@ $("alert_display").style.display = "block"; window.setTimeout(function() { globalCommSystem.HideAlertSlider(); - },3000); + },4500); }, function() { new Effect.Appear($("alert_display")); window.setTimeout(function() { globalCommSystem.HideAlertSlider(); - },3000); + },4500); } ); }, HideAlertSlider: function() { - new Effect.Fade($("alert_display")); - $("alert_display").innerHTML = ""; + new Effect.Fold($("alert_display"),{onFinish: function() { + $("alert_display").innerHTML = ""; + } + } + ); }, ScrollChatWindow: function(evt) { @@ -372,12 +375,12 @@ }catch(h){} Try.these ( function() { - if(msgs.CommSysMessages[i].email.email_count > 0) - globalCommSystem.ShowAlertSlider("You have "+msgs.CommSysMessages[i].email.email_count+" new emails"); - }, - function() { - if(msgs.CommSysMessages[(i+1)].email.email_count > 0) - globalCommSystem.ShowAlertSlider("You have "+msgs.CommSysMessages[i].email.email_count+" new emails"); + if(msgs.CommSysMessages[i].email.unseen_emails > 0) + globalCommSystem.ShowAlertSlider("You have "+msgs.CommSysMessages[i].email.unseen_emails+" new emails"); + }, + function() { + if(msgs.CommSysMessages[(i+1)].email.unseen_emails > 0) + globalCommSystem.ShowAlertSlider("You have "+msgs.CommSysMessages[i].email.unseen_emails+" new emails"); } ); } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Fri Jul 7 09:45:02 2006 @@ -78,7 +78,8 @@ if($email_cnt > 0) { $ret .= '{"email":'; $ret .= '{'; - $ret .= '"email_count":"'.$email_cnt.'",'; + $ret .= '"unseen_emails":"'.$email_cnt.'",'; + $ret .= '"total_emails":"'.$email_cnt.'"'; $ret .= '}'; $ret .= '}'; $ret .= ']}'; From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 08:56:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 15:56:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231460=3A?= =?utf-8?q?_Custom_fields_edition_display_an_error_message_with_ie?= Message-ID: <076.51562ac2a8130e70466d79c12a0fae12@vtiger.fosslabs.com> #1460: Custom fields edition display an error message with ie --------------------------------------------------+------------------------- Reporter: aissafranc | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: custom fields, internet explorer, ie | --------------------------------------------------+------------------------- Dear team, with internet explorer, the custom field edition display an javascript alert when saving: "Field Type is not selected", with ie, it's impossible to save a custom field. Also the text field for label and size are really too small with ie. regards, A?ssa -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 08:58:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 15:58:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231461=3A?= =?utf-8?q?_Accents_problem?= Message-ID: <076.cb47c8a1335091d6951263aa3c4dc15e@vtiger.fosslabs.com> #1461: Accents problem ------------------------+--------------------------------------------------- Reporter: aissafranc | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: character | ------------------------+--------------------------------------------------- In custom field edition, pick list edition, announcement, we have a problem with accents, an ? became ??, character set problem ? -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 09:38:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 16:38:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7898 - /branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Message-ID: <20060707163803.4B480840399@vtiger.fosslabs.com> Author: mmbrich Date: Fri Jul 7 10:38:02 2006 New Revision: 7898 Log: misc comm system fixes Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Fri Jul 7 10:38:02 2006 @@ -104,8 +104,7 @@ method: 'post', postBody: 'module=CommSystem&action=CommSystemAjax&command=sendChatMessage&receivers='+otheruser+'&msg='+msg+'&msg_type=P2PIM', onComplete: function(response) { - if(!response.responseText.match(/^failed/)) { - Object.extend(msgStruct, {msg_data:''+globalCommSystem.user.user_name+": "+response.responseText}); + if(response.responseText != "failed") { globalCommSystem.ShowNewChatMessage(msgStruct,""); } else { Object.extend(msgStruct, {msg_data:'Failed to deliver message: '+msgStruct.msg_data}); @@ -143,8 +142,10 @@ Try.these ( function() { new Effect.Appear("msgwindow_"+msg.sending_user,{duration:'0.2'}); - if(msg.user_name != globalCommSystem.user.user_name) - msg.msg_data = "
"+msg.user_name+" "+msg.msg_data; + if(msg.user_name == "") + msg.msg_data = "
"+globalCommSystem.user.user_name+": "+msg.msg_data; + else if(msg.user_name != globalCommSystem.user.user_name) + msg.msg_data = "
"+msg.user_name+": "+msg.msg_data; else msg.msg_data = "
"+msg.msg_data; @@ -245,7 +246,8 @@ try { Try.these ( function() { - $("chat_data_"+msg.sending_user).innerHTML = "
"+msg.user_name+": "+msg.msg_data; + if(msg.msg_data != "") + $("chat_data_"+msg.sending_user).innerHTML = "
"+msg.user_name+": "+msg.msg_data; }, function() { $("chat_data_"+msg.sending_user).innerHTML += "
"+msg.msg_data; @@ -281,7 +283,7 @@ }, HideAlertSlider: function() { - new Effect.Fold($("alert_display"),{onFinish: function() { + new Effect.Fold($("alert_display"), {onFinish: function() { $("alert_display").innerHTML = ""; } } @@ -363,13 +365,13 @@ alert(msgs.CommSysMessages[i].message.msg_data); break; case 'EMAIL': - alert(msgs.CommSysMessages[i].message.recordid); + globalCommSystem.ShowAlertSlider("New Email:
"+msgs.CommSysMessages[i].message.recordid); break; case 'INPHONE': - alert(msgs.CommSysMessages[i].message.msg_data); + globalCommSystem.ShowAlertSlider("Incoming Call:
"+msgs.CommSysMessages[i].message.msg_data); break; case 'VOICEMAIL': - alert(msgs.CommSysMessages[i].message.msg_data); + globalCommSystem.ShowAlertSlider("New Voicemial:
"+msgs.CommSysMessages[i].message.msg_data); break; } }catch(h){} From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 10:17:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 17:17:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231462=3A?= =?utf-8?q?_Lead_assigned_to_group?= Message-ID: <076.03c7ea568ace9d3aa45999c080f4cfb6@vtiger.fosslabs.com> #1462: Lead assigned to group -----------------------+---------------------------------------------------- Reporter: pieper | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- - create a group with users as members - create a lead and assign the lead to this group - save the lead the assignment to the group ist not stored -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 10:27:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 17:27:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231463=3A?= =?utf-8?q?_i18n_issues_at_Beta2?= Message-ID: <076.afc61449a57d391dd755d412e2e76ca8@vtiger.fosslabs.com> #1463: i18n issues at Beta2 -----------------------+---------------------------------------------------- Reporter: pieper | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- attached are screenshots that display i18n issues we discovered when generating language files. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 11:26:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 18:26:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231375=3A?= =?utf-8?q?_Ajax_Chat_window_need_to_be_improved?= In-Reply-To: <076.9a61ff39258b85bdf4e662518c1eefac@vtiger.fosslabs.com> References: <076.9a61ff39258b85bdf4e662518c1eefac@vtiger.fosslabs.com> Message-ID: <085.b1568c3847a400215416e13d79ab292b@vtiger.fosslabs.com> #1375: Ajax Chat window need to be improved ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by brianlaughlin): Chat will also pass your user name as admin even if you are logged in as another user. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 11:29:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 18:29:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231464=3A?= =?utf-8?q?_Decouple_Accounts_from_Contacts_and_Potential?= Message-ID: <076.861f8a0fd2b37c54625037dd56b97668@vtiger.fosslabs.com> #1464: Decouple Accounts from Contacts and Potential ---------------------------+------------------------------------------------ Reporter: brianlaughlin | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.1 Keywords: Accounts, B2C | ---------------------------+------------------------------------------------ Known issue for B2C service sales. We're willing to contribute for this feature, just want to make sure we coordinate with vTiger team so that in the future this can be picked up into the branch. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 11:34:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 18:34:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231380=3A?= =?utf-8?q?_Calendar=3A_Add_event_page_need_improvement?= In-Reply-To: <076.cfb74cfa6ccd0580016cef47d94dfed2@vtiger.fosslabs.com> References: <076.cfb74cfa6ccd0580016cef47d94dfed2@vtiger.fosslabs.com> Message-ID: <085.9e0e33770785c230a25adb778e26f997@vtiger.fosslabs.com> #1380: Calendar: Add event page need improvement ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by brianlaughlin): Also consider killing the white space on the event form. Even on a large screen user has to scroll in the browser to see the whole event form. Ideally, this should be small and compact, especially with the new design using tabs. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 11:37:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 18:37:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231465=3A?= =?utf-8?q?_Importing_Contacts_not_working?= Message-ID: <076.bf42f6ededa4febe676605bfc47109ec@vtiger.fosslabs.com> #1465: Importing Contacts not working ------------------------+--------------------------------------------------- Reporter: simonsac77 | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.1 Keywords: contacts | ------------------------+--------------------------------------------------- Whe I import accounts there is no problem but when I import contacts the contacts do not appear as saved in vTiger nor do they appear in the database tables: contactscf, contactaddress, contact details, however they do add to the crmentity table, the customerdetails table, and users_last_import table. This worked fine in the 5.0 version for us. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 11:41:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 18:41:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231466=3A?= =?utf-8?q?_Currency_Symbols_Not_Supported?= Message-ID: <076.10181a4e1f7edc44de823ba6a76312c8@vtiger.fosslabs.com> #1466: Currency Symbols Not Supported ------------------------------+--------------------------------------------- Reporter: simonsac77 | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.1 Keywords: currency symbols | ------------------------------+--------------------------------------------- Symbols other than the $ in the currency symbol field for currency configuration are saved as ? question marks. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 11:44:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 18:44:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231467=3A?= =?utf-8?q?_Unable_to_change_the_default_currency=2E?= Message-ID: <076.5d07974ee809a29eb64a9ab44d72fe98@vtiger.fosslabs.com> #1467: Unable to change the default currency. ------------------------------+--------------------------------------------- Reporter: simonsac77 | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.1 Keywords: default currency | ------------------------------+--------------------------------------------- It would be a good improvement were we able to change the default currency setting. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 11:46:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 18:46:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7899 - in /branches/VTIGERCRM-5.0.2-MMBRICH: include/js/objects/CommSystem.js modules/CommSystem/CommSystem.php modules/CommSystem/CommSystemAjax.php Message-ID: <20060707184644.81050840ADE@vtiger.fosslabs.com> Author: mmbrich Date: Fri Jul 7 12:46:43 2006 New Revision: 7899 Log: enabled stateful tracking of IM's in new comm system Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Fri Jul 7 12:46:43 2006 @@ -22,13 +22,20 @@ * */ CommUpdate: function() { - window.clearTimeout(this.timer); globalCommSystem = this; + window.clearTimeout(globalCommSystem.timer); + if(globalCommSystem.tmpCount == 0 || typeof(globalCommSystem.tmpCount) == "undefined") { + var first = 'true'; + globalCommSystem.tmpCount++; + } else { + var first = 'false'; + globalCommSystem.tmpCount++; + } new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'commsys'}, method: 'post', - postBody: 'module=CommSystem&action=CommSystemAjax&command=getPeriodicalInfo', + postBody: 'module=CommSystem&action=CommSystemAjax&command=getPeriodicalInfo&first_load='+first, onComplete: globalCommSystem.HandleEvent, onFailure: function() { alert("Failed"); @@ -266,24 +273,28 @@ ShowAlertSlider: function(msg) { $("alert_display").innerHTML = ""+msg+""; - Try.these ( - function() { - $("alert_display").style.display = "block"; - window.setTimeout(function() { - globalCommSystem.HideAlertSlider(); - },4500); - }, - function() { - new Effect.Appear($("alert_display")); - window.setTimeout(function() { - globalCommSystem.HideAlertSlider(); - },4500); + $("alert_display").style.display = "block"; + + new Effect.Highlight("alert_display",{startcolor:'#ff99ff',endcolor:'#999999', + queue: {position: 'end', scope: 'commsys'}, + afterFinish:function() { + new Effect.Highlight("alert_display",{ + startcolor:'#ff99ff',endcolor:'#999999', + queue: {position: 'end', scope: 'commsys'} + } + ) + } } ); + window.setTimeout(function() { + globalCommSystem.HideAlertSlider(); + },4500); }, HideAlertSlider: function() { - new Effect.Fold($("alert_display"), {onFinish: function() { + new Effect.Squish($("alert_display"), { + queue: {position: 'end', scope: 'commsys'}, + afterFinish: function() { $("alert_display").innerHTML = ""; } } @@ -326,10 +337,7 @@ 'index.php', {queue: {position: 'end', scope: 'commsys'}, method: 'post', - postBody: 'module=CommSystem&action=CommSystemAjax&command=markAsRead&msgid='+msgid, - onComplete: function(response) { - - } + postBody: 'module=CommSystem&action=CommSystemAjax&command=markAsRead&msgid='+msgid } ); }, @@ -343,7 +351,6 @@ */ HandleEvent: function(responseData) { //$("debug_win").innerHTML += "
"+responseData.responseText; - globalCommSystem.tmpCount++; try { if(!responseData.responseText.match(/none/)) { var msgs = eval('(' + responseData.responseText + ')'); @@ -352,25 +359,26 @@ var msg = msgs.CommSysMessages[i].message; var msgid = msg.msgid; var msg_type = msg.msg_type; - if(globalCommSystem.tmpCount >= 2) { - globalCommSystem.tmpCount = 0; - //globalCommSystem.MarkAsRead(msgid); - } if(msg.sending_user == globalCommSystem.user.user_id) {return;} switch(msg_type) { case 'P2PIM': + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',2000); globalCommSystem.ShowNewChatMessage(msg,"Chatting with "+msg.user_name); break; case 'GRPIM': + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',2000); alert(msgs.CommSysMessages[i].message.msg_data); break; case 'EMAIL': + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',2000); globalCommSystem.ShowAlertSlider("New Email:
"+msgs.CommSysMessages[i].message.recordid); break; case 'INPHONE': + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',2000); globalCommSystem.ShowAlertSlider("Incoming Call:
"+msgs.CommSysMessages[i].message.msg_data); break; case 'VOICEMAIL': + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',2000); globalCommSystem.ShowAlertSlider("New Voicemial:
"+msgs.CommSysMessages[i].message.msg_data); break; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Fri Jul 7 12:46:43 2006 @@ -78,13 +78,19 @@ return "false"; } - function GetNewAlerts($userid) { + function GetNewAlerts($userid,$get_old='') { // This query will get all non-group/non-broadcast messages - $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND viewed = '0'"; + if($get_old == 'true') + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND viewed = '0' OR viewed = '1' AND msg_type='P2PIM'"; + else + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND viewed = '0' AND msg_type='P2PIM'"; $p2p = $this->db->query($q); // This query will get all group/broadcast messages - $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0'"; + if($get_old == 'true') + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0' OR viewed = '1' AND msg_type='GRPIM'"; + else + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0' AND msg_type='GRPIM'"; $grp = $this->db->query($q); $ret = array(); @@ -117,7 +123,11 @@ } } - $q = "UPDATE vtiger_comm_system SET viewed='1' WHERE "; + if($get_old == 'true') + $viewed='2'; + else + $viewed='1'; + $q = "UPDATE vtiger_comm_system SET viewed='".$viewed."' WHERE "; for($i=0,$cnt=count($ret);$i<$cnt;$i++) { if($i==0) $q .= "msgid='".$ret[$i]["msgid"]."'"; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Fri Jul 7 12:46:43 2006 @@ -29,13 +29,18 @@ if($_REQUEST["command"] == "getPeriodicalInfo") { require_once("modules/CommSystem/CommSystem.php"); - if(!isset($_SESSION["refresh_count"])) + if(!isset($_SESSION["refresh_count"])) { $_SESSION["refresh_count"]=0; - else + } else $_SESSION["refresh_count"]++; + if($_SESSION["refresh_count"] <= 0 || $_REQUEST["first_load"] == 'true') + $get_old = 'true'; + else + $get_old = 'false'; + $commSys = new CommSystem(); - $msg = $commSys->GetNewAlerts($_SESSION["authenticated_user_id"]); + $msg = $commSys->GetNewAlerts($_SESSION["authenticated_user_id"],$get_old); $ret = ''; $cnt=count($msg); if($cnt == 0) @@ -59,8 +64,8 @@ $ret .= '},'; } } - if($_SESSION["refresh_count"] >= 20) { - $_SESSION["refresh_count"] = 0; + if($_SESSION["refresh_count"] >= 5) { + $_SESSION["refresh_count"] = 1; $email_cnt = $commSys->CheckEmails(); if($email_cnt > 0) { @@ -78,8 +83,7 @@ if($email_cnt > 0) { $ret .= '{"email":'; $ret .= '{'; - $ret .= '"unseen_emails":"'.$email_cnt.'",'; - $ret .= '"total_emails":"'.$email_cnt.'"'; + $ret .= '"unseen_emails":"'.$email_cnt.'"'; $ret .= '}'; $ret .= '}'; $ret .= ']}'; From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 11:49:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 18:49:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231468=3A?= =?utf-8?q?_Email_subject_line_missing_hyperlink_look=2E__I=2Ee=2E_Blue_an?= =?utf-8?q?d_underlined?= Message-ID: <076.a3166a63a5a0fa0a67136d6f79c9be5b@vtiger.fosslabs.com> #1468: Email subject line missing hyperlink look. I.e. Blue and underlined ---------------------------+------------------------------------------------ Reporter: brianlaughlin | Owner: developer Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | ---------------------------+------------------------------------------------ When on email tab the subject link is black. UI should be changed to blue and underlined. Browser: Firefox 1.5.0.4 Page http://vtiger.com/products/crm/demo_5beta/index.php?module=Emails&action=index&parenttab=Marketing -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 11:56:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 18:56:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231469=3A?= =?utf-8?q?_Custom_date_field_-_should_default_to_null_value?= Message-ID: <076.7640ac5d0884a40c96aa6c5e6c0dfdd6@vtiger.fosslabs.com> #1469: Custom date field - should default to null value --------------------------------------+------------------------------------- Reporter: brianlaughlin | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: date field, custom field | --------------------------------------+------------------------------------- The issue can be seen in Ticket #72 http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/72 This issue still exists in v5 Beta 2. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 12:19:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 19:19:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7900 - in /branches/VTIGERCRM-5.0.2-MMBRICH: Smarty/templates/Header.tpl include/js/objects/CommSystem.js modules/CommSystem/CommSystem.php themes/blue/header.php Message-ID: <20060707191933.5B98C840E93@vtiger.fosslabs.com> Author: mmbrich Date: Fri Jul 7 13:19:31 2006 New Revision: 7900 Log: First alpha version of comm system, This system does statefull p2p chats, email alerts, Voicemail alerts and more. Most of the framework is in place to start pluggin things in but the API is subject to plenty of change yet. Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl Fri Jul 7 13:19:31 2006 @@ -146,6 +146,7 @@ {$USERLIST} +
Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Fri Jul 7 13:19:31 2006 @@ -98,11 +98,13 @@ * message text. */ SendChatMessage: function(otheruser,msg) { + var myDate=new Date(); msgStruct = { sending_user: otheruser, msg_data: msg, msg_type: 'P2PIM', - user_name: '' + user_name: '', + timestamp: myDate.getHours()+":"+myDate.getMinutes()+":"+myDate.getSeconds() } globalCommSystem = this; new Ajax.Request( @@ -120,8 +122,8 @@ } } ); - } -, + }, + SendMsg: function(evt) { try { var dat = $("msg_input_"+Event.element(evt).name); @@ -131,11 +133,13 @@ }, OpenChatSession: function(receivers,usr_name) { + var myDate=new Date(); msgStruct = { sending_user: receivers, msg_data: '', msg_type: 'P2PIM', - user_name: usr_name + user_name: usr_name, + timestamp: myDate.getHours()+":"+myDate.getMinutes()+":"+myDate.getSeconds() } this.ShowNewChatMessage(msgStruct, "Chatting with "+usr_name); }, @@ -150,9 +154,9 @@ function() { new Effect.Appear("msgwindow_"+msg.sending_user,{duration:'0.2'}); if(msg.user_name == "") - msg.msg_data = "
"+globalCommSystem.user.user_name+": "+msg.msg_data; + msg.msg_data = "
"+globalCommSystem.user.user_name+" ("+msg.timestamp+"): "+msg.msg_data; else if(msg.user_name != globalCommSystem.user.user_name) - msg.msg_data = "
"+msg.user_name+": "+msg.msg_data; + msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; else msg.msg_data = "
"+msg.msg_data; @@ -205,7 +209,7 @@ Try.these ( function() { if(msg.user_name != globalCommSystem.user.user_name) {return false;} - msg.msg_data = "
"+msg.user_name+": "+msg.msg_data; + msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; }, function() { msg.msg_data += "
"; @@ -254,7 +258,7 @@ Try.these ( function() { if(msg.msg_data != "") - $("chat_data_"+msg.sending_user).innerHTML = "
"+msg.user_name+": "+msg.msg_data; + $("chat_data_"+msg.sending_user).innerHTML = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; }, function() { $("chat_data_"+msg.sending_user).innerHTML += "
"+msg.msg_data; @@ -362,23 +366,23 @@ if(msg.sending_user == globalCommSystem.user.user_id) {return;} switch(msg_type) { case 'P2PIM': - window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',2000); + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); globalCommSystem.ShowNewChatMessage(msg,"Chatting with "+msg.user_name); break; case 'GRPIM': - window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',2000); + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); alert(msgs.CommSysMessages[i].message.msg_data); break; case 'EMAIL': - window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',2000); + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); globalCommSystem.ShowAlertSlider("New Email:
"+msgs.CommSysMessages[i].message.recordid); break; case 'INPHONE': - window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',2000); + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); globalCommSystem.ShowAlertSlider("Incoming Call:
"+msgs.CommSysMessages[i].message.msg_data); break; case 'VOICEMAIL': - window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',2000); + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); globalCommSystem.ShowAlertSlider("New Voicemial:
"+msgs.CommSysMessages[i].message.msg_data); break; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Fri Jul 7 13:19:31 2006 @@ -33,7 +33,7 @@ } function SendAlert($msg_data,$msg_type,$recordid='0',$sending_user='0',$receivers='0') { - //$nowdate=date(); + $nowdate=date('Y-m-d H:i:s'); switch($msg_type) { case 'GRPIM': case 'P2PIM': @@ -104,7 +104,7 @@ $ret[$c]["recordid"] = $row["recordid"]; $ret[$c]["sending_user"] = $row["sending_user"]; $ret[$c]["user_name"] = $row["user_name"]; - $ret[$c]["sentdate"] = $row["sentdate"]; + $ret[$c]["sentdate"] = substr($row["sentdate"],(strlen($row["sentdate"])-8),(strlen($row["sentdate"]))); $c++; } } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php Fri Jul 7 13:19:31 2006 @@ -103,10 +103,12 @@ $q = "select user_name,id from vtiger_users"; $rs = $adb->query($q); -$list = "
CRM Users:"; +$list = "
CRM Users:
"; while($row=$adb->fetch_array($rs)) { - $list .= "
".$row["user_name"].""; + if($row["id"] != $_SESSION["authenticated_user_id"]) + $list .= "
".$row["user_name"].""; } +$list .= "

HelpDesk Users
"; $list .= "
"; $smarty->assign("USERLIST",$list); From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 12:28:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 19:28:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7901 - /branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Message-ID: <20060707192846.87848840E92@vtiger.fosslabs.com> Author: mmbrich Date: Fri Jul 7 13:28:45 2006 New Revision: 7901 Log: changed email message check to 1 minute Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Fri Jul 7 13:28:45 2006 @@ -64,7 +64,7 @@ $ret .= '},'; } } - if($_SESSION["refresh_count"] >= 5) { + if($_SESSION["refresh_count"] >= 20) { $_SESSION["refresh_count"] = 1; $email_cnt = $commSys->CheckEmails(); From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 12:49:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 19:49:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231470=3A?= =?utf-8?q?_custom_fields_problem_with_IE?= Message-ID: <076.482fb7e6d4c5d5049da13bf3b9f14dbf@vtiger.fosslabs.com> #1470: custom fields problem with IE -----------------------+---------------------------------------------------- Reporter: pieper | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- see screenshot attached, works fine with Firefox -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 13:05:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 20:05:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7902 - /branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Message-ID: <20060707200517.96988840E99@vtiger.fosslabs.com> Author: mmbrich Date: Fri Jul 7 14:05:16 2006 New Revision: 7902 Log: cross tab/window focus checks Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Fri Jul 7 14:05:16 2006 @@ -14,6 +14,7 @@ this.keytimer; this.user=CurrentUser; this.tmpCount=0; + this.Focused='true'; }, /* @@ -23,26 +24,31 @@ */ CommUpdate: function() { globalCommSystem = this; - window.clearTimeout(globalCommSystem.timer); - if(globalCommSystem.tmpCount == 0 || typeof(globalCommSystem.tmpCount) == "undefined") { - var first = 'true'; - globalCommSystem.tmpCount++; + if(globalCommSystem.Focused == 'false') { + window.clearTimeout(globalCommSystem.timer); + globalCommSystem.timer = window.setTimeout('globalCommSystem.CommUpdate()',globalCommSystem.refreshtime); } else { - var first = 'false'; - globalCommSystem.tmpCount++; - } - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'commsys'}, - method: 'post', - postBody: 'module=CommSystem&action=CommSystemAjax&command=getPeriodicalInfo&first_load='+first, - onComplete: globalCommSystem.HandleEvent, - onFailure: function() { - alert("Failed"); - window.clearTimeout(globalCommSystem.timer); + window.clearTimeout(globalCommSystem.timer); + if(globalCommSystem.tmpCount == 0 || typeof(globalCommSystem.tmpCount) == "undefined") { + var first = 'true'; + globalCommSystem.tmpCount++; + } else { + var first = 'false'; + globalCommSystem.tmpCount++; + } + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'commsys'}, + method: 'post', + postBody: 'module=CommSystem&action=CommSystemAjax&command=getPeriodicalInfo&first_load='+first, + onComplete: globalCommSystem.HandleEvent, + onFailure: function() { + alert("Failed"); + window.clearTimeout(globalCommSystem.timer); + } } - } - ); + ); + } }, /* @@ -88,8 +94,18 @@ * Creates elements and populates with past info */ CheckSession: function() { + this.Focused='true'; + Event.observe(document, 'focus', this.OnFocusEvent.bindAsEventListener(this)); + Event.observe(document, 'blur', this.OnFocusEvent.bindAsEventListener(this)); window.clearTimeout(this.timer); this.CommUpdate(); + }, + + OnFocusEvent: function(evt) { + if(evt.type == "focus") + this.Focused='true'; + else if(evt.type == "blur") + this.Focused='false'; }, /* From vtiger-tickets at vtiger.fosslabs.com Fri Jul 7 13:11:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 07 Jul 2006 20:11:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231471=3A?= =?utf-8?q?_i18n_issue_at__EditInventoryNotify=2Etpl?= Message-ID: <076.83523f1424c732553a9fe2240ddf7e0a@vtiger.fosslabs.com> #1471: i18n issue at EditInventoryNotify.tpl -----------------------+---------------------------------------------------- Reporter: pieper | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- line 22 still hardcoded while label exists in language files.
-- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 15:59:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 22:59:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7903 - in /branches/VTIGERCRM-5.0.2-MMBRICH: include/js/objects/CommSystem.js modules/CommSystem/CommSystem.php modules/CommSystem/CommSystemAjax.php Message-ID: <20060707225959.A3C14840EAA@vtiger.fosslabs.com> Author: mmbrich Date: Fri Jul 7 16:59:58 2006 New Revision: 7903 Log: added ability to send "User typing" status messages Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Fri Jul 7 16:59:58 2006 @@ -4,7 +4,7 @@ CommSystem.prototype = { initialize: function(element,CurrentUser) { this.debug=true; - this.refreshtime = '2000'; + this.refreshtime = '1000'; this.username = VtUser.user_name; this.sliderElement = element; this.CheckSession(); @@ -108,12 +108,26 @@ this.Focused='false'; }, + SendStatusMessage: function(period,users) { + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'commsys'}, + method: 'post', + postBody: 'module=CommSystem&action=CommSystemAjax&command=sendStatusMessage&receivers='+users+'&period='+period, + onComplete: function(response) { + //alert(response.responseText); + } + } + ); + }, + /* * Function to send an instant message to another * user and update the chat window element with * message text. */ SendChatMessage: function(otheruser,msg) { + if(msg == "") {return;} var myDate=new Date(); msgStruct = { sending_user: otheruser, @@ -339,17 +353,17 @@ var tname = "status_bar_"+Event.element(evt).name; if(evt.type === "keypress") { if(globalCommSystem.keycount == 0) { - $(tname).innerHTML = "User is typing"; - this.keycount++; - } - this.keytimer = window.setTimeout('globalCommSystem.UserStopTyping("'+Event.element(evt).name+'")',2000); + globalCommSystem.SendStatusMessage('begin',Event.element(evt).name); + globalCommSystem.keycount++; + } + globalCommSystem.keytimer = window.setTimeout('globalCommSystem.UserStopTyping("'+Event.element(evt).name+'")',2000); } }, UserStopTyping: function(sending_user) { - window.clearTimeout(this.keytimer); - this.keycount=0; - $("status_bar_"+sending_user).innerHTML = "Stopped typing..."; + window.clearTimeout(globalCommSystem.keytimer); + globalCommSystem.keycount=0; + globalCommSystem.SendStatusMessage('end',sending_user); }, MarkAsRead: function(msgid) { @@ -373,6 +387,7 @@ //$("debug_win").innerHTML += "
"+responseData.responseText; try { if(!responseData.responseText.match(/none/)) { + //alert(responseData.responseText); var msgs = eval('(' + responseData.responseText + ')'); for (var i=0;iNew Voicemial:
"+msgs.CommSysMessages[i].message.msg_data); break; + case 'GENERAL': + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); + globalCommSystem.ShowAlertSlider("New Voicemial:
"+msgs.CommSysMessages[i].message.msg_data); + break; + case 'STATUS': + $("status_bar_"+msg.sending_user).innerHTML = msg.msg_data; + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); + break; } }catch(h){} Try.these ( Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Fri Jul 7 16:59:58 2006 @@ -5,11 +5,10 @@ msg_type: P2PIM = Peer to Peer Instant Message; GRPIM = Group IM (receiver list is comma separated) EMAIL = Email Alert (recordid is the related email ID) - BATTACH = Attachment (msg_data == blob) - RATTACH = Attachment (recordid == attachment recordid) GENERAL = General Alert INPHONE = Incoming Call Alert VOICEMAIL = Voicemail Alert + STATUS = chat status messages (user it typing, etc) recordid: record id of related CRM entity (if any) sending_user: record id of the user sending the message receivers: single or comma separated list of receiving CRM users @@ -44,31 +43,27 @@ ('".$msg_type."','".$sending_user."','".$receivers."','".addslashes($msg_data)."','".$nowdate."')"; break; case 'EMAIL': - if($recordid == 0 || $sending_user == 0) { return "false"; } + if($recordid == 0 || $sending_user == 0 || $receivers == 0) { return "false"; } + $q = "INSERT INTO vtiger_comm_system + (msg_type,sending_user,recordid,receivers,sentdate) + VALUES + ('".$msg_type."','".$sending_user."','".$recordid."','".$receivers."','".$nowdate."')"; + break; + case 'GENERAL': + case 'INPHONE': + case 'VOICEMAIL': + if($receivers == 0 || $sending_user == 0) { return "false"; } $q = "INSERT INTO vtiger_comm_system (msg_type,sending_user,recordid,sentdate) VALUES - ('".$msg_type."','".$sending_user."','".$recordid."','".$nowdate."')"; + ('".$msg_type."','".$sending_user."','".$receivers."','".$nowdate."')"; break; - case 'BATTACH': - if($sending_user == 0 || $receivers == 0) { return "false"; } + case 'STATUS': + if($receivers == 0 || $sending_user == 0) { return "false"; } $q = "INSERT INTO vtiger_comm_system - (msg_type,sending_user,receivers,msg_data,sentdate) + (msg_data,msg_type,sending_user,receivers,sentdate) VALUES - ('".$msg_type."','".$sending_user."','".$receivers."','".$msg_data."','".$nowdate."')"; - break; - case 'RATTACH': - if($sending_user == 0 || $recordid == 0 || $receivers == 0) { return "false"; } - $q = "INSERT INTO vtiger_comm_system - (msg_type,sending_user,receivers,recordid,sentdate) - VALUES - ('".$msg_type."','".$sending_user."','".$receivers."','".$recordid."','".$nowdate."')"; - break; - case 'GENERAL': - break; - case 'INPHONE': - break; - case 'VOICEMAIL': + ('".$msg_data."','".$msg_type."','".$sending_user."','".$receivers."','".$nowdate."')"; break; } if(isset($q) && $q != "") { @@ -81,17 +76,21 @@ function GetNewAlerts($userid,$get_old='') { // This query will get all non-group/non-broadcast messages if($get_old == 'true') - $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND viewed = '0' OR viewed = '1' AND msg_type='P2PIM'"; + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND viewed = '0' OR viewed = '1' AND msg_type='P2PIM' ORDER BY sentdate"; else - $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND viewed = '0' AND msg_type='P2PIM'"; + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND viewed = '0' AND msg_type='P2PIM' ORDER BY sentdate"; $p2p = $this->db->query($q); // This query will get all group/broadcast messages if($get_old == 'true') - $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0' OR viewed = '1' AND msg_type='GRPIM'"; + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0' OR viewed = '1' AND msg_type='GRPIM' ORDER BY sentdate"; else - $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0' AND msg_type='GRPIM'"; + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0' AND msg_type='GRPIM' ORDER BY sentdate"; $grp = $this->db->query($q); + + // GET STATUS MESSAGES + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND viewed = '0' AND msg_type='STATUS' ORDER BY sentdate"; + $stat = $this->db->query($q); $ret = array(); // load return array with p2p messages @@ -123,10 +122,24 @@ } } - if($get_old == 'true') - $viewed='2'; - else + // load return array with status messages + while($row = $this->db->fetch_array($stat)) { + if($row["msgid"] != "" && isset($row["msgid"])) { + $ret[$c]["msgid"] = $row["msgid"]; + $ret[$c]["msg_type"] = $row["msg_type"]; + $ret[$c]["msg_data"] = $row["msg_data"]; + $ret[$c]["sending_user"] = $row["sending_user"]; + $ret[$c]["user_name"] = $row["user_name"]; + $ret[$c]["sentdate"] = $row["sentdate"]; + $c++; + } + } + + //if($get_old == 'true') + //$viewed='2'; + //else $viewed='1'; + $q = "UPDATE vtiger_comm_system SET viewed='".$viewed."' WHERE "; for($i=0,$cnt=count($ret);$i<$cnt;$i++) { if($i==0) Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Fri Jul 7 16:59:58 2006 @@ -4,10 +4,6 @@ require_once('include/utils/utils.php'); global $adb; - -//if($_POST["command"] == "getSessionValue" && $_POST["module"] == "User") { - //echo "HellO"; -//} if($_REQUEST["command"] == "getDbValues") { $rs = $adb->query("select * from vtiger_users where id='".$_SESSION["authenticated_user_id"]."'"); @@ -103,6 +99,11 @@ else echo nl2br($_REQUEST["msg"]); } +if($_REQUEST["command"] == "sendStatusMessage") { + $ret = send_typing_message($_REQUEST["receivers"]); + echo $ret; +} + if($_REQUEST["command"] == "markAsRead") { $q="Update vtiger_comm_system set viewed='2' where msgid='".$_REQUEST["msgid"]."'"; $adb->query($q); @@ -114,4 +115,21 @@ $commSys = new CommSystem(); echo $commSys->CheckEmails(); } +function send_typing_message($receivers) { + require_once("modules/CommSystem/CommSystem.php"); + global $adb; + $commSys = new CommSystem(); + + if($_REQUEST["period"] == "begin") + $tmsg = "User is typing a message"; + else + $tmsg = "User stopped typing"; + + $adb->query("delete from vtiger_comm_system where msg_type='STATUS' AND sending_user='".$_SESSION["authenticated_user_id"]."' AND receivers='".$receivers."'"); + + if($commSys->SendAlert($tmsg,'STATUS','0',$_SESSION["authenticated_user_id"],$receivers) == "false") + return "failed"; + else + return "success"; +} ?> From vtiger-tickets at vtiger.fosslabs.com Sat Jul 8 01:23:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 08 Jul 2006 08:23:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231472=3A?= =?utf-8?q?_announcement_does_not_work?= Message-ID: <076.80db5b61a4bb91f36c2a13e9f4d5df2a@vtiger.fosslabs.com> #1472: announcement does not work -----------------------+---------------------------------------------------- Reporter: pieper | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- nothing is shown at the top of the pages after you entered an annoucement (Beta 2) -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Jul 8 10:08:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 08 Jul 2006 17:08:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231473=3A?= =?utf-8?q?_Group_membership_not_working_properly?= Message-ID: <076.b0ac87de605bbd4c349b78811d64ff37@vtiger.fosslabs.com> #1473: Group membership not working properly -----------------------+---------------------------------------------------- Reporter: pieper | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- - create a user[[BR]] - create a group with this user as a memeber only [[BR]] - goto users detail view[[BR]] the group memebership is not displayed; when you try to use this group for the selection of data, it also does not work -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 8 12:27:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 08 Jul 2006 19:27:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7904 - /branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Message-ID: <20060708192742.A045C76FDB6@vtiger.fosslabs.com> Author: mmbrich Date: Sat Jul 8 13:27:41 2006 New Revision: 7904 Log: function comments to help developers or feature creators find their way around this class. Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sat Jul 8 13:27:41 2006 @@ -18,9 +18,9 @@ }, /* - * Timer function to fire @ refreshtime - * updates the element used during creation time - * + * Update function to fire @ refreshtime + * Calls the HandleEvent function which + * will react on the JSON data passed to it. */ CommUpdate: function() { globalCommSystem = this; @@ -101,6 +101,9 @@ this.CommUpdate(); }, + /* + * Called when this window is focused or un-focused + */ OnFocusEvent: function(evt) { if(evt.type == "focus") this.Focused='true'; @@ -108,6 +111,9 @@ this.Focused='false'; }, + /* + * Send a "User is typing" or "Done typing" message + */ SendStatusMessage: function(period,users) { new Ajax.Request( 'index.php', @@ -154,6 +160,10 @@ ); }, + /* + * Called prior to SendChatMessage so that proper variables + * can be populated + */ SendMsg: function(evt) { try { var dat = $("msg_input_"+Event.element(evt).name); @@ -181,6 +191,7 @@ */ ShowNewChatMessage: function(msg,header_msg) { Try.these ( + /* Try to open a window from past messaging with this user */ function() { new Effect.Appear("msgwindow_"+msg.sending_user,{duration:'0.2'}); if(msg.user_name == "") @@ -193,6 +204,7 @@ $("chat_data_"+msg.sending_user).innerHTML += msg.msg_data; globalCommSystem.ScrollChatWindow($("chat_data_"+msg.sending_user)); }, + /* Build a new chat window */ function() { if(msg.msg_type == "P2PIM") var clsname = "chatWindow"; @@ -248,7 +260,7 @@ var chat_data = Builder.node( 'tr', { - valign:'top',align:'center' + valign:'top',align:'center',id:'chatd_row_'+msg.sending_user }, [ Builder.node( 'td', @@ -264,7 +276,7 @@ var msg_input = Builder.node( 'tr', - {valign:'top',align:'center'}, + {valign:'top',align:'center',id:'bchat_row_'+msg.sending_user}, [ Builder.node( 'td', [ Builder.node( @@ -305,6 +317,10 @@ ); }, + /* + * call this function with any old message + * to have it appear in the alert slider + */ ShowAlertSlider: function(msg) { $("alert_display").innerHTML = ""+msg+""; $("alert_display").style.display = "block"; @@ -325,6 +341,9 @@ },4500); }, + /* + * Hide the alert slider + */ HideAlertSlider: function() { new Effect.Squish($("alert_display"), { queue: {position: 'end', scope: 'commsys'}, @@ -335,6 +354,12 @@ ); }, + /* + * Call this any time you suspect the chat window + * content has changed. Can either be called with + * the prototype event listener or with the actual + * element passed to this function + */ ScrollChatWindow: function(evt) { //$("debug_win").innerHTML += "
Scrolling"; Try.these ( @@ -348,6 +373,10 @@ ); }, + /* + * called from event listeners. This will send a user typing + * status message to the other user + */ UserTyping: function(evt) { window.clearTimeout(this.keytimer); var tname = "status_bar_"+Event.element(evt).name; @@ -360,12 +389,22 @@ } }, + /* + * stop your last UserTyping() message + */ UserStopTyping: function(sending_user) { window.clearTimeout(globalCommSystem.keytimer); globalCommSystem.keycount=0; globalCommSystem.SendStatusMessage('end',sending_user); }, + /* + * Call this function (n) seconds after your message + * was first opened. This is for session tracking. + * If this function isn't called after a message is + * displayed it will appear again the next time the + * receiving user opens a CRM window of any kind. + */ MarkAsRead: function(msgid) { new Ajax.Request( 'index.php', @@ -387,7 +426,6 @@ //$("debug_win").innerHTML += "
"+responseData.responseText; try { if(!responseData.responseText.match(/none/)) { - //alert(responseData.responseText); var msgs = eval('(' + responseData.responseText + ')'); for (var i=0;i Author: mmbrich Date: Sat Jul 8 15:05:43 2006 New Revision: 7905 Log: fix for newline issues Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sat Jul 8 15:05:43 2006 @@ -147,7 +147,7 @@ 'index.php', {queue: {position: 'end', scope: 'commsys'}, method: 'post', - postBody: 'module=CommSystem&action=CommSystemAjax&command=sendChatMessage&receivers='+otheruser+'&msg='+msg+'&msg_type=P2PIM', + postBody: 'module=CommSystem&action=CommSystemAjax&command=sendChatMessage&receivers='+otheruser+'&msg='+msg.stripTags()+'&msg_type=P2PIM', onComplete: function(response) { if(response.responseText != "failed") { globalCommSystem.ShowNewChatMessage(msgStruct,""); @@ -380,12 +380,14 @@ UserTyping: function(evt) { window.clearTimeout(this.keytimer); var tname = "status_bar_"+Event.element(evt).name; - if(evt.type === "keypress") { + if(evt.type === "keypress" && evt.keyCode != Event.KEY_RETURN) { if(globalCommSystem.keycount == 0) { globalCommSystem.SendStatusMessage('begin',Event.element(evt).name); globalCommSystem.keycount++; } globalCommSystem.keytimer = window.setTimeout('globalCommSystem.UserStopTyping("'+Event.element(evt).name+'")',2000); + } else if (evt.keyCode == Event.KEY_RETURN) { + //globalCommSystem.SendMsg(evt); } }, Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Sat Jul 8 15:05:43 2006 @@ -60,7 +60,7 @@ $ret .= '},'; } } - if($_SESSION["refresh_count"] >= 20) { + if($_SESSION["refresh_count"] >= 60) { $_SESSION["refresh_count"] = 1; $email_cnt = $commSys->CheckEmails(); @@ -94,10 +94,10 @@ if($_REQUEST["command"] == "sendChatMessage") { require_once("modules/CommSystem/CommSystem.php"); $commSys = new CommSystem(); - if($commSys->SendAlert(nl2br($_REQUEST["msg"]),$_REQUEST["msg_type"],'0',$_SESSION["authenticated_user_id"],$_REQUEST["receivers"]) == "false") + if($commSys->SendAlert(str_replace("\n","
",trim($_REQUEST["msg"])),$_REQUEST["msg_type"],'0',$_SESSION["authenticated_user_id"],$_REQUEST["receivers"]) == "false") echo "failed"; else - echo nl2br($_REQUEST["msg"]); + echo str_replace("\n","
",$_REQUEST["msg"]); } if($_REQUEST["command"] == "sendStatusMessage") { $ret = send_typing_message($_REQUEST["receivers"]); From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 8 15:05:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 08 Jul 2006 22:05:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7906 - in /branches/VTIGERCRM-5.0.2-MMBRICH: Smarty/templates/ include/js/objects/ include/language/ modules/CommSystem/ modules/CommSystem/language/ themes/blue/ Message-ID: <20060708220535.AE74F76FDE3@vtiger.fosslabs.com> Author: mmbrich Date: Sat Jul 8 16:05:34 2006 New Revision: 7906 Log: fixed internationalization Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/include/language/en_us.lang.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/language/en_us.lang.php branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl Sat Jul 8 16:05:34 2006 @@ -435,7 +435,7 @@ var VtUser = {} new VtigerUser(); addOnloadEvent(function() { - CS = new CommSystem("CommSliderDiv",VtUser); + CS = new CommSystem("CommSliderDiv",VtUser,{/literal}"{$APP.LBL_CHATTING_WITH}"{literal},{/literal}"{$APP.LBL_SEND_VALUE}"{literal}); }); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sat Jul 8 16:05:34 2006 @@ -2,7 +2,7 @@ CommSystem = Class.create(); } catch(r){alert(r);} CommSystem.prototype = { - initialize: function(element,CurrentUser) { + initialize: function(element,CurrentUser,chatWith,sendValue) { this.debug=true; this.refreshtime = '1000'; this.username = VtUser.user_name; @@ -15,6 +15,8 @@ this.user=CurrentUser; this.tmpCount=0; this.Focused='true'; + this.ChattingWith=chatWith; + this.SendValue=sendValue; }, /* @@ -181,7 +183,7 @@ user_name: usr_name, timestamp: myDate.getHours()+":"+myDate.getMinutes()+":"+myDate.getSeconds() } - this.ShowNewChatMessage(msgStruct, "Chatting with "+usr_name); + this.ShowNewChatMessage(msgStruct, this.ChattingWith+" "+usr_name); }, /* @@ -286,7 +288,7 @@ )] )], [ Builder.node( - 'p',{id:'status_bar_'+msg.sending_user},'Status Bar' + 'p',{id:'status_bar_'+msg.sending_user} )], {width:'100%',colspan:'2'} )] @@ -306,7 +308,7 @@ $("chat_data_"+msg.sending_user).innerHTML += "
"+msg.msg_data; } ); - $("msg_wrapper_"+msg.sending_user).innerHTML += ''; + $("msg_wrapper_"+msg.sending_user).innerHTML += ''; Event.observe($("msg_input_"+msg.sending_user), 'keypress', globalCommSystem.UserTyping.bindAsEventListener(this)); Event.observe($("send_button_"+msg.sending_user), 'click', globalCommSystem.SendMsg.bindAsEventListener(this)); }catch(g){alert(g);} @@ -438,7 +440,7 @@ switch(msg_type) { case 'P2PIM': window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); - globalCommSystem.ShowNewChatMessage(msg,"Chatting with "+msg.user_name); + globalCommSystem.ShowNewChatMessage(msg,globalCommSystem.ChattingWith+" "+msg.user_name); break; case 'GRPIM': window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/language/en_us.lang.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/language/en_us.lang.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/language/en_us.lang.php Sat Jul 8 16:05:34 2006 @@ -947,6 +947,11 @@ 'LBL_RECORD_ID'=>'Record ID', 'LBL_ACTION_DATE'=>'Action Date', +'LBL_CRM_USERS'=>'CRM Users:', +'LBL_HELPDESK_USERS'=>'Help Desk Users', +'LBL_CHATTING_WITH'=>'Chatting with ', +'LBL_SEND_VALUE'=>'Send Message ', + ); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Sat Jul 8 16:05:34 2006 @@ -1,4 +1,9 @@ query("delete from vtiger_comm_system where msg_type='STATUS' AND sending_user='".$_SESSION["authenticated_user_id"]."' AND receivers='".$receivers."'"); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/language/en_us.lang.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/language/en_us.lang.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/language/en_us.lang.php Sat Jul 8 16:05:34 2006 @@ -1,10 +1,9 @@ 'Emails', -'LBL_MODULE_TITLE'=>'Emails: Home', -'LBL_SEARCH_FORM_TITLE'=>'Email Search', -'LBL_LIST_FORM_TITLE'=>'Email List', -'LBL_NEW_FORM_TITLE'=>'Track Email' +'LBL_MODULE_NAME'=>'Communications System', +'LBL_MODULE_TITLE'=>'Comm Sysytem Home', +'LBL_USER_TYPING'=>'User is typing...', +'LBL_USER_STOP_TYPING'=>'User stopped typing.' ); ?> Modified: branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/header.php Sat Jul 8 16:05:34 2006 @@ -103,12 +103,12 @@ $q = "select user_name,id from vtiger_users"; $rs = $adb->query($q); -$list = "
CRM Users:
"; +$list = "
".$app_strings['LBL_CRM_USERS']."
"; while($row=$adb->fetch_array($rs)) { if($row["id"] != $_SESSION["authenticated_user_id"]) $list .= "
".$row["user_name"].""; } -$list .= "

HelpDesk Users
"; +$list .= "

".$app_strings['LBL_HELPDESK_USERS']."
"; $list .= "
"; $smarty->assign("USERLIST",$list); From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 8 15:13:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 08 Jul 2006 22:13:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7907 - /branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Message-ID: <20060708221302.2572B76FDD3@vtiger.fosslabs.com> Author: mmbrich Date: Sat Jul 8 16:13:01 2006 New Revision: 7907 Log: more newline and special charater fixes Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Sat Jul 8 16:13:01 2006 @@ -57,7 +57,7 @@ $ret .= '"sending_user":"'.$msg[$i]["sending_user"].'",'; $ret .= '"user_name":"'.$msg[$i]["user_name"].'",'; $ret .= '"timestamp":"'.$msg[$i]["sentdate"].'",'; - $ret .= '"msg_data":"'.$msg[$i]["msg_data"].'"}'; + $ret .= '"msg_data":"'.stripslashes($msg[$i]["msg_data"]).'"}'; if(($i+1) == $cnt) $ret .= '}'; @@ -99,10 +99,10 @@ if($_REQUEST["command"] == "sendChatMessage") { require_once("modules/CommSystem/CommSystem.php"); $commSys = new CommSystem(); - if($commSys->SendAlert(str_replace("\n","
",trim($_REQUEST["msg"])),$_REQUEST["msg_type"],'0',$_SESSION["authenticated_user_id"],$_REQUEST["receivers"]) == "false") + if($commSys->SendAlert(str_replace("\n","
",addslashes($_REQUEST["msg"])),$_REQUEST["msg_type"],'0',$_SESSION["authenticated_user_id"],$_REQUEST["receivers"]) == "false") echo "failed"; else - echo str_replace("\n","
",$_REQUEST["msg"]); + echo nl2br($_REQUEST["msg"]); } if($_REQUEST["command"] == "sendStatusMessage") { $ret = send_typing_message($_REQUEST["receivers"]); From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 8 15:29:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 08 Jul 2006 22:29:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7908 - /branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Message-ID: <20060708222918.303E476FDD0@vtiger.fosslabs.com> Author: mmbrich Date: Sat Jul 8 16:29:17 2006 New Revision: 7908 Log: fixes for "user typing" messages flooding the system Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sat Jul 8 16:29:17 2006 @@ -168,6 +168,7 @@ */ SendMsg: function(evt) { try { + globalCommSystem.UserStopTyping(Event.element(evt).name); var dat = $("msg_input_"+Event.element(evt).name); globalCommSystem.SendChatMessage(Event.element(evt).name,dat.value); }catch(p){alert(p);} @@ -380,16 +381,14 @@ * status message to the other user */ UserTyping: function(evt) { - window.clearTimeout(this.keytimer); var tname = "status_bar_"+Event.element(evt).name; - if(evt.type === "keypress" && evt.keyCode != Event.KEY_RETURN) { + if(evt.type === "keypress") { + window.clearTimeout(globalCommSystem.keytimer); if(globalCommSystem.keycount == 0) { globalCommSystem.SendStatusMessage('begin',Event.element(evt).name); globalCommSystem.keycount++; } globalCommSystem.keytimer = window.setTimeout('globalCommSystem.UserStopTyping("'+Event.element(evt).name+'")',2000); - } else if (evt.keyCode == Event.KEY_RETURN) { - //globalCommSystem.SendMsg(evt); } }, From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 8 15:42:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 08 Jul 2006 22:42:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7909 - /branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Message-ID: <20060708224206.652F276FDD0@vtiger.fosslabs.com> Author: mmbrich Date: Sat Jul 8 16:42:05 2006 New Revision: 7909 Log: fix for "undefined" user names no first messages Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sat Jul 8 16:42:05 2006 @@ -141,7 +141,7 @@ sending_user: otheruser, msg_data: msg, msg_type: 'P2PIM', - user_name: '', + user_name: globalCommSystem.user_name, timestamp: myDate.getHours()+":"+myDate.getMinutes()+":"+myDate.getSeconds() } globalCommSystem = this; @@ -197,7 +197,7 @@ /* Try to open a window from past messaging with this user */ function() { new Effect.Appear("msgwindow_"+msg.sending_user,{duration:'0.2'}); - if(msg.user_name == "") + if(msg.user_name == "" || typeof(msg.user_name) == "undefined") msg.msg_data = "
"+globalCommSystem.user.user_name+" ("+msg.timestamp+"): "+msg.msg_data; else if(msg.user_name != globalCommSystem.user.user_name) msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; @@ -388,7 +388,7 @@ globalCommSystem.SendStatusMessage('begin',Event.element(evt).name); globalCommSystem.keycount++; } - globalCommSystem.keytimer = window.setTimeout('globalCommSystem.UserStopTyping("'+Event.element(evt).name+'")',2000); + globalCommSystem.keytimer = window.setTimeout('globalCommSystem.UserStopTyping("'+Event.element(evt).name+'")',1000); } }, From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 8 17:18:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 09 Jul 2006 00:18:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7910 - in /branches/VTIGERCRM-5.0.2-MMBRICH/modules: Calendar/header.php Dashboard/display_charts.php Dashboard/index.php Message-ID: <20060709001815.AD29D76FE32@vtiger.fosslabs.com> Author: mmbrich Date: Sat Jul 8 18:18:14 2006 New Revision: 7910 Log: fixes for chat button Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Calendar/header.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/display_charts.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/index.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Calendar/header.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Calendar/header.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Calendar/header.php Sat Jul 8 18:18:14 2006 @@ -44,6 +44,13 @@
+ + +
{if $PARENTTAB neq ''} From vtigercrm-commits at vtiger.fosslabs.com Fri Jul 7 07:48:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 07 Jul 2006 14:48:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7896 - /vtigercrm/trunk/modules/Portal/Popup.php Message-ID: <20060707144857.503BF83FEFD@vtiger.fosslabs.com> Author: richie Date: Fri Jul 7 08:48:53 2006 New Revision: 7896 Log: applied language to save and cancel buttons in portal popup - ahmed Modified: vtigercrm/trunk/modules/Portal/Popup.php Modified: vtigercrm/trunk/modules/Portal/Popup.php ============================================================================== --- vtigercrm/trunk/modules/Portal/Popup.php (original) +++ vtigercrm/trunk/modules/Portal/Popup.php Fri Jul 7 08:48:53 2006 @@ -43,8 +43,8 @@
-    - +    +
 
*Note: Donot remove or alter the values within {ldelim} {rdelim}
'.$app_strings['LBL_CLOCK_ALT'].' '.$app_strings['LBL_CALCULATOR_ALT'].' '.$app_strings['LBL_CHAT_ALT'].' + + {$APP.LBL_CHAT_ALT} + + '.$app_strings['LBL_LAST_VIEWED'].'
Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/display_charts.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/display_charts.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/display_charts.php Sat Jul 8 18:18:14 2006 @@ -160,7 +160,13 @@ 		<? echo $app_strings['LBL_CALENDAR_ALT']; ?> <? echo $app_strings['LBL_CLOCK_ALT']; ?> <? echo $app_strings['LBL_CALCULATOR_ALT']; ?><? echo $app_strings['LBL_CHAT_ALT']; ?> + + + {$APP.LBL_CHAT_ALT} + +
Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/index.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/index.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/index.php Sat Jul 8 18:18:14 2006 @@ -94,7 +94,13 @@ <? echo $app_strings['LBL_CALENDAR_ALT']; ?> <? echo $app_strings['LBL_CLOCK_ALT']; ?> <? echo $app_strings['LBL_CALCULATOR_ALT']; ?> - <? echo $app_strings['LBL_CHAT_ALT']; ?> + + + {$APP.LBL_CHAT_ALT} + + + + From vtigercrm-commits at vtiger.fosslabs.com Sat Jul 8 17:22:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 09 Jul 2006 00:22:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7911 - in /branches/VTIGERCRM-5.0.2-MMBRICH/modules: Calendar/header.php Dashboard/display_charts.php Dashboard/index.php Message-ID: <20060709002208.5DD2776FE32@vtiger.fosslabs.com> Author: mmbrich Date: Sat Jul 8 18:22:07 2006 New Revision: 7911 Log: fixes for chat button Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Calendar/header.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/display_charts.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/index.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Calendar/header.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Calendar/header.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Calendar/header.php Sat Jul 8 18:22:07 2006 @@ -43,14 +43,13 @@ '.$app_strings['LBL_CALENDAR_ALT'].' '.$app_strings['LBL_CLOCK_ALT'].' '.$app_strings['LBL_CALCULATOR_ALT'].' - '.$app_strings['LBL_CHAT_ALT'].' + - - {$APP.LBL_CHAT_ALT} + + '.$app_strings['LBL_CHAT_ALT'].' - '.$app_strings['LBL_LAST_VIEWED'].' Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/display_charts.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/display_charts.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/display_charts.php Sat Jul 8 18:22:07 2006 @@ -162,7 +162,7 @@ <? echo $app_strings['LBL_CALCULATOR_ALT']; ?> - {$APP.LBL_CHAT_ALT} + <? echo $app_strings['LBL_CHAT_ALT']; ?> Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/index.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/index.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Dashboard/index.php Sat Jul 8 18:22:07 2006 @@ -96,7 +96,7 @@ <? echo $app_strings['LBL_CALCULATOR_ALT']; ?> - {$APP.LBL_CHAT_ALT} + <? echo $app_strings['LBL_CHAT_ALT']; ?> From vtigercrm-commits at vtiger.fosslabs.com Sun Jul 9 12:17:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 09 Jul 2006 19:17:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7912 - in /branches/VTIGERCRM-5.0.2-MMBRICH: include/js/objects/CommSystem.js modules/CommSystem/CommSystem.php modules/CommSystem/CommSystemAjax.php Message-ID: <20060709191739.BBCD57CEE54@vtiger.fosslabs.com> Author: mmbrich Date: Sun Jul 9 13:17:38 2006 New Revision: 7912 Log: misc comm system fixes Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sun Jul 9 13:17:38 2006 @@ -109,8 +109,10 @@ OnFocusEvent: function(evt) { if(evt.type == "focus") this.Focused='true'; - else if(evt.type == "blur") + else if(evt.type == "blur") { + window.focus(); this.Focused='false'; + } }, /* @@ -141,7 +143,7 @@ sending_user: otheruser, msg_data: msg, msg_type: 'P2PIM', - user_name: globalCommSystem.user_name, + user_name: globalCommSystem.user.user_name, timestamp: myDate.getHours()+":"+myDate.getMinutes()+":"+myDate.getSeconds() } globalCommSystem = this; @@ -197,9 +199,9 @@ /* Try to open a window from past messaging with this user */ function() { new Effect.Appear("msgwindow_"+msg.sending_user,{duration:'0.2'}); - if(msg.user_name == "" || typeof(msg.user_name) == "undefined") + if(msg.user_name == "" || typeof(msg.user_name) == "undefined" || msg.user_name == globalCommSystem.user.user_name) { msg.msg_data = "
"+globalCommSystem.user.user_name+" ("+msg.timestamp+"): "+msg.msg_data; - else if(msg.user_name != globalCommSystem.user.user_name) + } else if(msg.user_name != globalCommSystem.user.user_name) msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; else msg.msg_data = "
"+msg.msg_data; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Sun Jul 9 13:17:38 2006 @@ -40,7 +40,7 @@ $q = "INSERT INTO vtiger_comm_system (msg_type,sending_user,receivers,msg_data,sentdate) VALUES - ('".$msg_type."','".$sending_user."','".$receivers."','".addslashes($msg_data)."','".$nowdate."')"; + ('".$msg_type."','".$sending_user."','".$receivers."','".$msg_data."','".$nowdate."')"; break; case 'EMAIL': if($recordid == 0 || $sending_user == 0 || $receivers == 0) { return "false"; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Sun Jul 9 13:17:38 2006 @@ -57,7 +57,7 @@ $ret .= '"sending_user":"'.$msg[$i]["sending_user"].'",'; $ret .= '"user_name":"'.$msg[$i]["user_name"].'",'; $ret .= '"timestamp":"'.$msg[$i]["sentdate"].'",'; - $ret .= '"msg_data":"'.stripslashes($msg[$i]["msg_data"]).'"}'; + $ret .= '"msg_data":"'.$msg[$i]["msg_data"].'"}'; if(($i+1) == $cnt) $ret .= '}'; From vtigercrm-commits at vtiger.fosslabs.com Sun Jul 9 13:21:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 09 Jul 2006 20:21:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7913 - /branches/VTIGERCRM-5.0.2-MMBRICH/soap/commsystem.php Message-ID: <20060709202145.6315283F091@vtiger.fosslabs.com> Author: mmbrich Date: Sun Jul 9 14:21:44 2006 New Revision: 7913 Log: live helpdesk chat soap module Added: branches/VTIGERCRM-5.0.2-MMBRICH/soap/commsystem.php From vtigercrm-commits at vtiger.fosslabs.com Sun Jul 9 13:43:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 09 Jul 2006 20:43:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7914 - /branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Message-ID: <20060709204334.21D7B83F0A8@vtiger.fosslabs.com> Author: mmbrich Date: Sun Jul 9 14:43:33 2006 New Revision: 7914 Log: API comments Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Sun Jul 9 14:43:33 2006 @@ -31,6 +31,30 @@ $this->db = new PearDatabase(); } + /* check for online help desk users in the CRM + * so that we can display an on-line/off-line status + * for the helpdesk module via SOAP + * + * @return array of ids for online CRM users who are + * agents in the helpdesk + */ + function OnlineCRMHDeskUsers() { + + } + + /* check the helpdesk db and see who is currently online + * so that agents may initiate a live chat + * + * @return array of ids for online helpdesk users + */ + function OnlineHDeskUsers() { + + } + + /* + * Send an Alert or IM Message to any CRM user. + * @return boolean success result + */ function SendAlert($msg_data,$msg_type,$recordid='0',$sending_user='0',$receivers='0') { $nowdate=date('Y-m-d H:i:s'); switch($msg_type) { @@ -73,6 +97,15 @@ return "false"; } + /* + * Get unread alerts for a user. + * @param $userid - user id of the person checking for alerts + * @param $get_old - boolean. Use this when first loading a chat agent + * in a page. Messages go through 3 stages. 0=unread, 1=seen, 2=seen for N seconds (usually about 2) + * if $get_old=true then all messages with a 0 or 1 status will be returned + * @return multi-dimensional array of message details + * array=($num=>'msgid',$num=>'msg_type',$num=>'msg_data',$num=>'recordid',$num=>'sending_user',$num=>'user_name',$num=>'sentdate'); + */ function GetNewAlerts($userid,$get_old='') { // This query will get all non-group/non-broadcast messages if($get_old == 'true') @@ -155,6 +188,10 @@ } + /* + * get all unseen mails for a user + * @return number of unseen emails + */ function CheckEmails() { global $current_user; require_once('include/utils/UserInfoUtil.php'); From vtigercrm-commits at vtiger.fosslabs.com Sun Jul 9 13:43:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 09 Jul 2006 20:43:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7915 - in /branches/VTIGERCRM-5.0.2-MMBRICH: include/js/objects/CommSystem.js modules/CommSystem/CommSystemAjax.php Message-ID: <20060709204347.57B9883F0A8@vtiger.fosslabs.com> Author: mmbrich Date: Sun Jul 9 14:43:46 2006 New Revision: 7915 Log: misc fixes for comm syste Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sun Jul 9 14:43:46 2006 @@ -219,8 +219,8 @@ var main_table = Builder.node( 'table', { - cellpadding:'2',cellspacing:'0',border:'0',className:clsname, - id:'msgwindow_'+msg.sending_user + name:msg.sending_user,cellpadding:'2',cellspacing:'0',border:'0', + className:clsname,id:'msgwindow_'+msg.sending_user } ); var top_bar = Builder.node( @@ -301,8 +301,7 @@ main_table.style.display = "none"; $("comm_sys").appendChild(main_table); - try { - Try.these ( + Try.these ( function() { if(msg.msg_data != "") $("chat_data_"+msg.sending_user).innerHTML = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; @@ -310,7 +309,8 @@ function() { $("chat_data_"+msg.sending_user).innerHTML += "
"+msg.msg_data; } - ); + ); + try { $("msg_wrapper_"+msg.sending_user).innerHTML += ''; Event.observe($("msg_input_"+msg.sending_user), 'keypress', globalCommSystem.UserTyping.bindAsEventListener(this)); Event.observe($("send_button_"+msg.sending_user), 'click', globalCommSystem.SendMsg.bindAsEventListener(this)); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Sun Jul 9 14:43:46 2006 @@ -114,12 +114,6 @@ $adb->query($q); echo "success"; } - -function check_email() { - require_once("modules/CommSystem/CommSystem.php"); - $commSys = new CommSystem(); - echo $commSys->CheckEmails(); -} function send_typing_message($receivers) { require_once("modules/CommSystem/CommSystem.php"); global $adb; From vtigercrm-commits at vtiger.fosslabs.com Sun Jul 9 13:58:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 09 Jul 2006 20:58:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7916 - in /branches/VTIGERCRM-5.0.2-MMBRICH: Smarty/templates/ include/js/objects/ modules/CommSystem/ soap/ Message-ID: <20060709205833.072E783F0A8@vtiger.fosslabs.com> Author: mmbrich Date: Sun Jul 9 14:58:32 2006 New Revision: 7916 Log: copyrights Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Buttons_List.tpl branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Buttons_List1.tpl branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/VtigerUser.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php branches/VTIGERCRM-5.0.2-MMBRICH/soap/commsystem.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Buttons_List.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Buttons_List.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Buttons_List.tpl Sun Jul 9 14:58:32 2006 @@ -5,6 +5,7 @@ * The Original Code is: vtiger CRM Open Source * The Initial Developer of the Original Code is vtiger. * Portions created by vtiger are Copyright (C) vtiger. + * Portions created by FOSS Labs are Copyright (C) FOSS Labs. * All Rights Reserved. * ********************************************************************************/ Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Buttons_List1.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Buttons_List1.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Buttons_List1.tpl Sun Jul 9 14:58:32 2006 @@ -5,6 +5,7 @@ * The Original Code is: vtiger CRM Open Source * The Initial Developer of the Original Code is vtiger. * Portions created by vtiger are Copyright (C) vtiger. + * Portions created by FOSS Labs are Copyright (C) FOSS Labs. * All Rights Reserved. * ********************************************************************************/ Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/Header.tpl Sun Jul 9 14:58:32 2006 @@ -5,6 +5,7 @@ * The Original Code is: vtiger CRM Open Source * The Initial Developer of the Original Code is vtiger. * Portions created by vtiger are Copyright (C) vtiger. + * Portions created by FOSS Labs are Copyright (C) FOSS Labs. * All Rights Reserved. * ********************************************************************************/ Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sun Jul 9 14:58:32 2006 @@ -1,6 +1,14 @@ -try { +/****************************************** + * The contents of this file are subject to the vtiger CRM Public License Version 1.0 + * ("License"); You may not use this file except in compliance with the License + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is FOSS Labs. + * Portions created by FOSS Labs are Copyright (C) FOSS Lbas. + * All Rights Reserved. + * + *****************************************/ CommSystem = Class.create(); -} catch(r){alert(r);} + CommSystem.prototype = { initialize: function(element,CurrentUser,chatWith,sendValue) { this.debug=true; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/VtigerUser.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/VtigerUser.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/VtigerUser.js Sun Jul 9 14:58:32 2006 @@ -1,3 +1,12 @@ +/****************************************** + * The contents of this file are subject to the vtiger CRM Public License Version 1.0 + * ("License"); You may not use this file except in compliance with the License + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is FOSS Labs. + * Portions created by FOSS Labs are Copyright (C) FOSS Lbas. + * All Rights Reserved. + * + *****************************************/ VtigerUser = Class.create(); VtigerUser.prototype = { initialize: function() { Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Sun Jul 9 14:58:32 2006 @@ -1,4 +1,14 @@ Author: mmbrich Date: Sun Jul 9 17:10:04 2006 New Revision: 7917 Log: retrieve last 5 minutes worth of messages for page reloads (still need to terminate session) Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sun Jul 9 17:10:04 2006 @@ -25,6 +25,7 @@ this.Focused='true'; this.ChattingWith=chatWith; this.SendValue=sendValue; + this.reloadMsg="This is reloaded content:"; }, /* @@ -39,13 +40,7 @@ globalCommSystem.timer = window.setTimeout('globalCommSystem.CommUpdate()',globalCommSystem.refreshtime); } else { window.clearTimeout(globalCommSystem.timer); - if(globalCommSystem.tmpCount == 0 || typeof(globalCommSystem.tmpCount) == "undefined") { - var first = 'true'; - globalCommSystem.tmpCount++; - } else { - var first = 'false'; - globalCommSystem.tmpCount++; - } + var first = globalCommSystem.IsPageReload(); new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'commsys'}, @@ -59,6 +54,19 @@ } ); } + }, + + IsPageReload: function() { + if(typeof(globalCommSystem.tmpCount) == "undefined") { + globalCommSystem.tmpCount++; + var answer = 'true'; + } else if(globalCommSystem.tmpCount < 1) { + globalCommSystem.tmpCount++; + var answer = 'true'; + } else + var answer = 'false'; + + return answer; }, /* @@ -209,9 +217,9 @@ new Effect.Appear("msgwindow_"+msg.sending_user,{duration:'0.2'}); if(msg.user_name == "" || typeof(msg.user_name) == "undefined" || msg.user_name == globalCommSystem.user.user_name) { msg.msg_data = "
"+globalCommSystem.user.user_name+" ("+msg.timestamp+"): "+msg.msg_data; - } else if(msg.user_name != globalCommSystem.user.user_name) - msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; - else + } else if(msg.user_name != globalCommSystem.user.user_name && msg.msg_data != "") { + msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; + } else if(msg.msg_data != "") msg.msg_data = "
"+msg.msg_data; $("chat_data_"+msg.sending_user).innerHTML += msg.msg_data; @@ -253,7 +261,7 @@ [ Builder.node( 'img', {src:'themes/blue/images/close.gif', - onClick: 'new Effect.Fade(\'msgwindow_'+msg.sending_user+'\',{duration:\'0.2\'})' + onClick: 'new Effect.Fade(\'msgwindow_'+msg.sending_user+'\',{duration:\'0.2\'})}' } )] )] @@ -264,12 +272,13 @@ Try.these ( function() { if(msg.user_name != globalCommSystem.user.user_name) {return false;} - msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; + msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; }, function() { msg.msg_data += "
"; } ); + var chat_data = Builder.node( 'tr', { @@ -309,15 +318,12 @@ main_table.style.display = "none"; $("comm_sys").appendChild(main_table); - Try.these ( - function() { - if(msg.msg_data != "") - $("chat_data_"+msg.sending_user).innerHTML = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; - }, - function() { - $("chat_data_"+msg.sending_user).innerHTML += "
"+msg.msg_data; - } - ); + if(globalCommSystem.IsPageReload() != 'true' && msg.sending_user != globalCommSystem.user.user_name && msg.msg_data != "") { + $("chat_data_"+msg.sending_user).innerHTML = ""+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; + } else if(msg.msg_data != "") { + $("chat_data_"+msg.sending_user).innerHTML = ""+globalCommSystem.reloadMsg+"
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; + } + try { $("msg_wrapper_"+msg.sending_user).innerHTML += ''; Event.observe($("msg_input_"+msg.sending_user), 'keypress', globalCommSystem.UserTyping.bindAsEventListener(this)); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Sun Jul 9 17:10:04 2006 @@ -117,16 +117,31 @@ * array=($num=>'msgid',$num=>'msg_type',$num=>'msg_data',$num=>'recordid',$num=>'sending_user',$num=>'user_name',$num=>'sentdate'); */ function GetNewAlerts($userid,$get_old='') { + if($get_old == 'true') { + $ymd=date('Y-m-d'); + $h=date('H'); + $m=date('i'); + $s=date('s'); + + // get the last 5 minutes worth of messages + if($m <= 04) + $m=(($m-05)+60); + else + $m=($m-05); + + $pastdate = $ymd." ".$h.":".$m.":".$s; + } + // This query will get all non-group/non-broadcast messages if($get_old == 'true') - $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND viewed = '0' OR viewed = '1' AND msg_type='P2PIM' ORDER BY sentdate"; + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND sentdate > '".$pastdate."' AND msg_type='P2PIM' ORDER BY sentdate"; else $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers='".$userid."' AND viewed = '0' AND msg_type='P2PIM' ORDER BY sentdate"; $p2p = $this->db->query($q); // This query will get all group/broadcast messages if($get_old == 'true') - $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0' OR viewed = '1' AND msg_type='GRPIM' ORDER BY sentdate"; + $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND sentdate > '".$pastdate."' AND msg_type='GRPIM' ORDER BY sentdate"; else $q = "SELECT vtiger_comm_system.*,vtiger_users.user_name FROM vtiger_comm_system INNER JOIN vtiger_users ON vtiger_users.id=vtiger_comm_system.sending_user WHERE receivers LIKE '%,".$userid.",%' OR receivers LIKE '".$userid.",%' OR receivers LIKE '%,".$userid."' AND viewed = '0' AND msg_type='GRPIM' ORDER BY sentdate"; $grp = $this->db->query($q); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/style.css Sun Jul 9 17:10:04 2006 @@ -2925,6 +2925,7 @@ border: 1px solid gray; background-color: white; z-index:1900000; + display: block; } .alertDisplay { position: absolute; @@ -2938,3 +2939,6 @@ z-index:2000000; display: none; } +.button { + border: 1px solid gray; +} From vtigercrm-commits at vtiger.fosslabs.com Sun Jul 9 16:19:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 09 Jul 2006 23:19:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7918 - in /branches/VTIGERCRM-5.0.2-MMBRICH: include/js/objects/CommSystem.js modules/CommSystem/CommSystemAjax.php Message-ID: <20060709231944.9274083FC5B@vtiger.fosslabs.com> Author: mmbrich Date: Sun Jul 9 17:19:43 2006 New Revision: 7918 Log: delete messages from database when window is closed. This keeps the system from pulling the records when they shouldn't be and also keeps the DB from getting too large. Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sun Jul 9 17:19:43 2006 @@ -261,7 +261,7 @@ [ Builder.node( 'img', {src:'themes/blue/images/close.gif', - onClick: 'new Effect.Fade(\'msgwindow_'+msg.sending_user+'\',{duration:\'0.2\'})}' + onClick: 'globalCommSystem.CloseSession(\''+msg.sending_user+'\')' } )] )] @@ -373,6 +373,17 @@ ); }, + CloseSession: function(sending_user) { + new Effect.Fade($("msgwindow_"+sending_user),{duration:'0.2'}); + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'commsys'}, + method: 'post', + postBody: 'module=CommSystem&action=CommSystemAjax&command=closeSession&sending_user='+sending_user + } + ); + }, + /* * Call this any time you suspect the chat window * content has changed. Can either be called with Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystemAjax.php Sun Jul 9 17:19:43 2006 @@ -117,11 +117,14 @@ $ret = send_typing_message($_REQUEST["receivers"]); echo $ret; } - if($_REQUEST["command"] == "markAsRead") { $q="Update vtiger_comm_system set viewed='2' where msgid='".$_REQUEST["msgid"]."'"; $adb->query($q); echo "success"; +} +if($_REQUEST["command"] == "closeSession") { + $q="DELETE FROM vtiger_comm_system WHERE receivers='".$_SESSION["authenticated_user_id"]."' AND sending_user='".$_REQUEST["sending_user"]."' AND msg_type='P2PIM' OR msg_type='STATUS'"; + $adb->query($q); } function send_typing_message($receivers) { require_once("modules/CommSystem/CommSystem.php"); From vtigercrm-commits at vtiger.fosslabs.com Sun Jul 9 19:56:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 10 Jul 2006 02:56:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7919 - in /branches/VTIGERCRM-5.0.2-MMBRICH: include/js/objects/CommSystem.js schema/DatabaseSchema.xml Message-ID: <20060710025632.92A7583FF96@vtiger.fosslabs.com> Author: mmbrich Date: Sun Jul 9 20:56:31 2006 New Revision: 7919 Log: merge with trunk Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sun Jul 9 20:56:31 2006 @@ -15,7 +15,6 @@ this.refreshtime = '1000'; this.username = VtUser.user_name; this.sliderElement = element; - this.CheckSession(); this.sliderOpen = "false"; this.timer; this.keycount=0; @@ -26,6 +25,7 @@ this.ChattingWith=chatWith; this.SendValue=sendValue; this.reloadMsg="This is reloaded content:"; + this.CheckSession(); }, /* @@ -56,6 +56,12 @@ } }, + /* + * internal function. Please increase the number + * of times this function returns true if you call it + * more than it already is (ie: each time it's called in the first + * loop should return true) + */ IsPageReload: function() { if(typeof(globalCommSystem.tmpCount) == "undefined") { globalCommSystem.tmpCount++; @@ -510,3 +516,516 @@ globalCommSystem.timer = window.setTimeout('globalCommSystem.CommUpdate()',globalCommSystem.refreshtime); } } +======= +/****************************************** + * The contents of this file are subject to the vtiger CRM Public License Version 1.0 + * ("License"); You may not use this file except in compliance with the License + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is FOSS Labs. + * Portions created by FOSS Labs are Copyright (C) FOSS Lbas. + * All Rights Reserved. + * + *****************************************/ +CommSystem = Class.create(); + +CommSystem.prototype = { + initialize: function(element,CurrentUser,chatWith,sendValue) { + this.debug=true; + this.refreshtime = '1000'; + this.username = VtUser.user_name; + this.sliderElement = element; + this.CheckSession(); + this.sliderOpen = "false"; + this.timer; + this.keycount=0; + this.keytimer; + this.user=CurrentUser; + this.tmpCount=0; + this.Focused='true'; + this.ChattingWith=chatWith; + this.SendValue=sendValue; + this.reloadMsg="This is reloaded content:"; + }, + + /* + * Update function to fire @ refreshtime + * Calls the HandleEvent function which + * will react on the JSON data passed to it. + */ + CommUpdate: function() { + globalCommSystem = this; + if(globalCommSystem.Focused == 'false') { + window.clearTimeout(globalCommSystem.timer); + globalCommSystem.timer = window.setTimeout('globalCommSystem.CommUpdate()',globalCommSystem.refreshtime); + } else { + window.clearTimeout(globalCommSystem.timer); + var first = globalCommSystem.IsPageReload(); + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'commsys'}, + method: 'post', + postBody: 'module=CommSystem&action=CommSystemAjax&command=getPeriodicalInfo&first_load='+first, + onComplete: globalCommSystem.HandleEvent, + onFailure: function() { + alert("Failed"); + window.clearTimeout(globalCommSystem.timer); + } + } + ); + } + }, + + IsPageReload: function() { + if(typeof(globalCommSystem.tmpCount) == "undefined") { + globalCommSystem.tmpCount++; + var answer = 'true'; + } else if(globalCommSystem.tmpCount < 1) { + globalCommSystem.tmpCount++; + var answer = 'true'; + } else + var answer = 'false'; + + return answer; + }, + + /* + * Function to open slider for comm center. + * First the function tries to open the slider by + * using an Effect(), if that fails it uses a css + * class value to change the appearance + */ + OpenSlider: function() { + globalCommSystem = this; + if(this.sliderOpen == "false") { + Try.these ( + function() { + $(globalCommSystem.sliderElement).className = "commSliderOpen"; + }, + function() { + $(globalCommSystem.sliderElement).style.width = '180px'; + }, + function() { + new Effect.Appear($(globalCommSystem.sliderElement),{duration:'0.2'}); + } + ); + this.sliderOpen = "true"; + } else { + Try.these ( + function() { + $(globalCommSystem.sliderElement).className = "commSlider"; + }, + function() { + new Effect.Fade($(globalCommSystem.sliderElement),{duration:'0.2'}); + }, + function() { + $(globalCommSystem.sliderElement).style.width = '0px'; + } + ); + this.sliderOpen = "false"; + } + }, + + /* + * Function to check past sessions and load elements + * that were open when window was reloaded, etc. + * Creates elements and populates with past info + */ + CheckSession: function() { + this.Focused='true'; + Event.observe(document, 'focus', this.OnFocusEvent.bindAsEventListener(this)); + Event.observe(document, 'blur', this.OnFocusEvent.bindAsEventListener(this)); + window.clearTimeout(this.timer); + this.CommUpdate(); + }, + + /* + * Called when this window is focused or un-focused + */ + OnFocusEvent: function(evt) { + if(evt.type == "focus") + this.Focused='true'; + else if(evt.type == "blur") { + window.focus(); + this.Focused='false'; + } + }, + + /* + * Send a "User is typing" or "Done typing" message + */ + SendStatusMessage: function(period,users) { + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'commsys'}, + method: 'post', + postBody: 'module=CommSystem&action=CommSystemAjax&command=sendStatusMessage&receivers='+users+'&period='+period, + onComplete: function(response) { + //alert(response.responseText); + } + } + ); + }, + + /* + * Function to send an instant message to another + * user and update the chat window element with + * message text. + */ + SendChatMessage: function(otheruser,msg) { + if(msg == "") {return;} + var myDate=new Date(); + msgStruct = { + sending_user: otheruser, + msg_data: msg, + msg_type: 'P2PIM', + user_name: globalCommSystem.user.user_name, + timestamp: myDate.getHours()+":"+myDate.getMinutes()+":"+myDate.getSeconds() + } + globalCommSystem = this; + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'commsys'}, + method: 'post', + postBody: 'module=CommSystem&action=CommSystemAjax&command=sendChatMessage&receivers='+otheruser+'&msg='+msg.stripTags()+'&msg_type=P2PIM', + onComplete: function(response) { + if(response.responseText != "failed") { + globalCommSystem.ShowNewChatMessage(msgStruct,""); + } else { + Object.extend(msgStruct, {msg_data:'Failed to deliver message: '+msgStruct.msg_data}); + globalCommSystem.ShowNewChatMessage(msgStruct,""); + } + } + } + ); + }, + + /* + * Called prior to SendChatMessage so that proper variables + * can be populated + */ + SendMsg: function(evt) { + try { + globalCommSystem.UserStopTyping(Event.element(evt).name); + var dat = $("msg_input_"+Event.element(evt).name); + globalCommSystem.SendChatMessage(Event.element(evt).name,dat.value); + }catch(p){alert(p);} + dat.value = ""; + }, + + OpenChatSession: function(receivers,usr_name) { + var myDate=new Date(); + msgStruct = { + sending_user: receivers, + msg_data: '', + msg_type: 'P2PIM', + user_name: usr_name, + timestamp: myDate.getHours()+":"+myDate.getMinutes()+":"+myDate.getSeconds() + } + this.ShowNewChatMessage(msgStruct, this.ChattingWith+" "+usr_name); + }, + + /* + * Open a new chat window for a fresh session + * or open a past window that was closed during + * this session + */ + ShowNewChatMessage: function(msg,header_msg) { + Try.these ( + /* Try to open a window from past messaging with this user */ + function() { + new Effect.Appear("msgwindow_"+msg.sending_user,{duration:'0.2'}); + if(msg.user_name == "" || typeof(msg.user_name) == "undefined" || msg.user_name == globalCommSystem.user.user_name) { + msg.msg_data = "
"+globalCommSystem.user.user_name+" ("+msg.timestamp+"): "+msg.msg_data; + } else if(msg.user_name != globalCommSystem.user.user_name && msg.msg_data != "") { + msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; + } else if(msg.msg_data != "") + msg.msg_data = "
"+msg.msg_data; + + $("chat_data_"+msg.sending_user).innerHTML += msg.msg_data; + globalCommSystem.ScrollChatWindow($("chat_data_"+msg.sending_user)); + }, + /* Build a new chat window */ + function() { + if(msg.msg_type == "P2PIM") + var clsname = "chatWindow"; + else if(msg.msg_type == "GRPCHAT") + var clsname = "grpChatWindow"; + + var main_table = Builder.node( + 'table', + { + name:msg.sending_user,cellpadding:'2',cellspacing:'0',border:'0', + className:clsname,id:'msgwindow_'+msg.sending_user + } + ); + var top_bar = Builder.node( + 'tr', + { + align:'center',width:'100%',valign:'top' + }, + [ Builder.node( + 'td', + [ Builder.node( + 'span', + { + className:'chatWindowHeaderLeft' + }, + header_msg+" " + )], + [ Builder.node( + 'span', + { + className:'chatWindowHeaderRight' + }, + [ Builder.node( + 'img', + {src:'themes/blue/images/close.gif', + onClick: 'globalCommSystem.CloseSession(\''+msg.sending_user+'\')' + } + )] + )] + )] + ); + main_table.appendChild(top_bar); + + Try.these ( + function() { + if(msg.user_name != globalCommSystem.user.user_name) {return false;} + msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; + }, + function() { + msg.msg_data += "
"; + } + ); + + var chat_data = Builder.node( + 'tr', + { + valign:'top',align:'center',id:'chatd_row_'+msg.sending_user + }, + [ Builder.node( + 'td', + { + width:'100%',height:'100%',colspan:'2' + }, + [ Builder.node( + 'div', {id:'chat_data_'+msg.sending_user,className:'chatWindowDataArea',name:msg.sending_user} + )] + )] + ); + main_table.appendChild(chat_data); + + var msg_input = Builder.node( + 'tr', + {valign:'top',align:'center',id:'bchat_row_'+msg.sending_user}, + [ Builder.node( + 'td', + [ Builder.node( + 'div', {id:'msg_wrapper_'+msg.sending_user}, + [ Builder.node( + 'textarea', {id:'msg_input_'+msg.sending_user,name:msg.sending_user} + )] + )], + [ Builder.node( + 'p',{id:'status_bar_'+msg.sending_user} + )], + {width:'100%',colspan:'2'} + )] + ); + main_table.appendChild(msg_input); + + main_table.style.display = "none"; + $("comm_sys").appendChild(main_table); + + if(globalCommSystem.IsPageReload() != 'true' && msg.sending_user != globalCommSystem.user.user_name && msg.msg_data != "") { + $("chat_data_"+msg.sending_user).innerHTML = ""+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; + } else if(msg.msg_data != "") { + $("chat_data_"+msg.sending_user).innerHTML = ""+globalCommSystem.reloadMsg+"
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; + } + + try { + $("msg_wrapper_"+msg.sending_user).innerHTML += ''; + Event.observe($("msg_input_"+msg.sending_user), 'keypress', globalCommSystem.UserTyping.bindAsEventListener(this)); + Event.observe($("send_button_"+msg.sending_user), 'click', globalCommSystem.SendMsg.bindAsEventListener(this)); + }catch(g){alert(g);} + + new Effect.Appear(main_table,{duration:'0.2'}); + new Draggable(main_table); + } + ); + }, + + /* + * call this function with any old message + * to have it appear in the alert slider + */ + ShowAlertSlider: function(msg) { + $("alert_display").innerHTML = ""+msg+""; + $("alert_display").style.display = "block"; + + new Effect.Highlight("alert_display",{startcolor:'#ff99ff',endcolor:'#999999', + queue: {position: 'end', scope: 'commsys'}, + afterFinish:function() { + new Effect.Highlight("alert_display",{ + startcolor:'#ff99ff',endcolor:'#999999', + queue: {position: 'end', scope: 'commsys'} + } + ) + } + } + ); + window.setTimeout(function() { + globalCommSystem.HideAlertSlider(); + },4500); + }, + + /* + * Hide the alert slider + */ + HideAlertSlider: function() { + new Effect.Squish($("alert_display"), { + queue: {position: 'end', scope: 'commsys'}, + afterFinish: function() { + $("alert_display").innerHTML = ""; + } + } + ); + }, + + CloseSession: function(sending_user) { + new Effect.Fade($("msgwindow_"+sending_user),{duration:'0.2'}); + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'commsys'}, + method: 'post', + postBody: 'module=CommSystem&action=CommSystemAjax&command=closeSession&sending_user='+sending_user + } + ); + }, + + /* + * Call this any time you suspect the chat window + * content has changed. Can either be called with + * the prototype event listener or with the actual + * element passed to this function + */ + ScrollChatWindow: function(evt) { + //$("debug_win").innerHTML += "
Scrolling"; + Try.these ( + function() { + var tname = "chat_data_"+Event.element(evt).name; + $(tname).scrollTop = $(tname).scrollHeight; + }, + function() { + evt.scrollTop = evt.scrollHeight; + } + ); + }, + + /* + * called from event listeners. This will send a user typing + * status message to the other user + */ + UserTyping: function(evt) { + var tname = "status_bar_"+Event.element(evt).name; + if(evt.type === "keypress") { + window.clearTimeout(globalCommSystem.keytimer); + if(globalCommSystem.keycount == 0) { + globalCommSystem.SendStatusMessage('begin',Event.element(evt).name); + globalCommSystem.keycount++; + } + globalCommSystem.keytimer = window.setTimeout('globalCommSystem.UserStopTyping("'+Event.element(evt).name+'")',1000); + } + }, + + /* + * stop your last UserTyping() message + */ + UserStopTyping: function(sending_user) { + window.clearTimeout(globalCommSystem.keytimer); + globalCommSystem.keycount=0; + globalCommSystem.SendStatusMessage('end',sending_user); + }, + + /* + * Call this function (n) seconds after your message + * was first opened. This is for session tracking. + * If this function isn't called after a message is + * displayed it will appear again the next time the + * receiving user opens a CRM window of any kind. + */ + MarkAsRead: function(msgid) { + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'commsys'}, + method: 'post', + postBody: 'module=CommSystem&action=CommSystemAjax&command=markAsRead&msgid='+msgid + } + ); + }, + + /* + * function to parse JSON msg data + * and act on alerts or messages + * for alerts the system will open a small slider + * on the screen to alert the user + * for messages (IMs) a window object will be built for the message. + */ + HandleEvent: function(responseData) { + //$("debug_win").innerHTML += "
"+responseData.responseText; + try { + if(!responseData.responseText.match(/none/)) { + var msgs = eval('(' + responseData.responseText + ')'); + for (var i=0;iNew Email:
"+msgs.CommSysMessages[i].message.recordid); + break; + case 'INPHONE': + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); + globalCommSystem.ShowAlertSlider("Incoming Call:
"+msgs.CommSysMessages[i].message.msg_data); + break; + case 'VOICEMAIL': + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); + globalCommSystem.ShowAlertSlider("New Voicemial:
"+msgs.CommSysMessages[i].message.msg_data); + break; + case 'GENERAL': + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); + globalCommSystem.ShowAlertSlider("New Voicemial:
"+msgs.CommSysMessages[i].message.msg_data); + break; + case 'STATUS': + $("status_bar_"+msg.sending_user).innerHTML = msg.msg_data; + window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); + break; + } + }catch(h){} + Try.these ( + function() { + if(msgs.CommSysMessages[i].email.unseen_emails > 0) + globalCommSystem.ShowAlertSlider("You have "+msgs.CommSysMessages[i].email.unseen_emails+" new emails"); + }, + function() { + if(msgs.CommSysMessages[(i+1)].email.unseen_emails > 0) + globalCommSystem.ShowAlertSlider("You have "+msgs.CommSysMessages[i].email.unseen_emails+" new emails"); + } + ); + } + } + }catch(f){} + globalCommSystem.timer = window.setTimeout('globalCommSystem.CommUpdate()',globalCommSystem.refreshtime); + } +} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/schema/DatabaseSchema.xml Sun Jul 9 20:56:31 2006 @@ -6127,4 +6127,4 @@ Type=InnoDB - + From vtigercrm-commits at vtiger.fosslabs.com Sun Jul 9 19:59:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 10 Jul 2006 02:59:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7920 - /branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Message-ID: <20060710025914.29FDF83FF96@vtiger.fosslabs.com> Author: mmbrich Date: Sun Jul 9 20:59:13 2006 New Revision: 7920 Log: conflict resolution Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/js/objects/CommSystem.js Sun Jul 9 20:59:13 2006 @@ -516,516 +516,3 @@ globalCommSystem.timer = window.setTimeout('globalCommSystem.CommUpdate()',globalCommSystem.refreshtime); } } -======= -/****************************************** - * The contents of this file are subject to the vtiger CRM Public License Version 1.0 - * ("License"); You may not use this file except in compliance with the License - * The Original Code is: vtiger CRM Open Source - * The Initial Developer of the Original Code is FOSS Labs. - * Portions created by FOSS Labs are Copyright (C) FOSS Lbas. - * All Rights Reserved. - * - *****************************************/ -CommSystem = Class.create(); - -CommSystem.prototype = { - initialize: function(element,CurrentUser,chatWith,sendValue) { - this.debug=true; - this.refreshtime = '1000'; - this.username = VtUser.user_name; - this.sliderElement = element; - this.CheckSession(); - this.sliderOpen = "false"; - this.timer; - this.keycount=0; - this.keytimer; - this.user=CurrentUser; - this.tmpCount=0; - this.Focused='true'; - this.ChattingWith=chatWith; - this.SendValue=sendValue; - this.reloadMsg="This is reloaded content:"; - }, - - /* - * Update function to fire @ refreshtime - * Calls the HandleEvent function which - * will react on the JSON data passed to it. - */ - CommUpdate: function() { - globalCommSystem = this; - if(globalCommSystem.Focused == 'false') { - window.clearTimeout(globalCommSystem.timer); - globalCommSystem.timer = window.setTimeout('globalCommSystem.CommUpdate()',globalCommSystem.refreshtime); - } else { - window.clearTimeout(globalCommSystem.timer); - var first = globalCommSystem.IsPageReload(); - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'commsys'}, - method: 'post', - postBody: 'module=CommSystem&action=CommSystemAjax&command=getPeriodicalInfo&first_load='+first, - onComplete: globalCommSystem.HandleEvent, - onFailure: function() { - alert("Failed"); - window.clearTimeout(globalCommSystem.timer); - } - } - ); - } - }, - - IsPageReload: function() { - if(typeof(globalCommSystem.tmpCount) == "undefined") { - globalCommSystem.tmpCount++; - var answer = 'true'; - } else if(globalCommSystem.tmpCount < 1) { - globalCommSystem.tmpCount++; - var answer = 'true'; - } else - var answer = 'false'; - - return answer; - }, - - /* - * Function to open slider for comm center. - * First the function tries to open the slider by - * using an Effect(), if that fails it uses a css - * class value to change the appearance - */ - OpenSlider: function() { - globalCommSystem = this; - if(this.sliderOpen == "false") { - Try.these ( - function() { - $(globalCommSystem.sliderElement).className = "commSliderOpen"; - }, - function() { - $(globalCommSystem.sliderElement).style.width = '180px'; - }, - function() { - new Effect.Appear($(globalCommSystem.sliderElement),{duration:'0.2'}); - } - ); - this.sliderOpen = "true"; - } else { - Try.these ( - function() { - $(globalCommSystem.sliderElement).className = "commSlider"; - }, - function() { - new Effect.Fade($(globalCommSystem.sliderElement),{duration:'0.2'}); - }, - function() { - $(globalCommSystem.sliderElement).style.width = '0px'; - } - ); - this.sliderOpen = "false"; - } - }, - - /* - * Function to check past sessions and load elements - * that were open when window was reloaded, etc. - * Creates elements and populates with past info - */ - CheckSession: function() { - this.Focused='true'; - Event.observe(document, 'focus', this.OnFocusEvent.bindAsEventListener(this)); - Event.observe(document, 'blur', this.OnFocusEvent.bindAsEventListener(this)); - window.clearTimeout(this.timer); - this.CommUpdate(); - }, - - /* - * Called when this window is focused or un-focused - */ - OnFocusEvent: function(evt) { - if(evt.type == "focus") - this.Focused='true'; - else if(evt.type == "blur") { - window.focus(); - this.Focused='false'; - } - }, - - /* - * Send a "User is typing" or "Done typing" message - */ - SendStatusMessage: function(period,users) { - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'commsys'}, - method: 'post', - postBody: 'module=CommSystem&action=CommSystemAjax&command=sendStatusMessage&receivers='+users+'&period='+period, - onComplete: function(response) { - //alert(response.responseText); - } - } - ); - }, - - /* - * Function to send an instant message to another - * user and update the chat window element with - * message text. - */ - SendChatMessage: function(otheruser,msg) { - if(msg == "") {return;} - var myDate=new Date(); - msgStruct = { - sending_user: otheruser, - msg_data: msg, - msg_type: 'P2PIM', - user_name: globalCommSystem.user.user_name, - timestamp: myDate.getHours()+":"+myDate.getMinutes()+":"+myDate.getSeconds() - } - globalCommSystem = this; - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'commsys'}, - method: 'post', - postBody: 'module=CommSystem&action=CommSystemAjax&command=sendChatMessage&receivers='+otheruser+'&msg='+msg.stripTags()+'&msg_type=P2PIM', - onComplete: function(response) { - if(response.responseText != "failed") { - globalCommSystem.ShowNewChatMessage(msgStruct,""); - } else { - Object.extend(msgStruct, {msg_data:'Failed to deliver message: '+msgStruct.msg_data}); - globalCommSystem.ShowNewChatMessage(msgStruct,""); - } - } - } - ); - }, - - /* - * Called prior to SendChatMessage so that proper variables - * can be populated - */ - SendMsg: function(evt) { - try { - globalCommSystem.UserStopTyping(Event.element(evt).name); - var dat = $("msg_input_"+Event.element(evt).name); - globalCommSystem.SendChatMessage(Event.element(evt).name,dat.value); - }catch(p){alert(p);} - dat.value = ""; - }, - - OpenChatSession: function(receivers,usr_name) { - var myDate=new Date(); - msgStruct = { - sending_user: receivers, - msg_data: '', - msg_type: 'P2PIM', - user_name: usr_name, - timestamp: myDate.getHours()+":"+myDate.getMinutes()+":"+myDate.getSeconds() - } - this.ShowNewChatMessage(msgStruct, this.ChattingWith+" "+usr_name); - }, - - /* - * Open a new chat window for a fresh session - * or open a past window that was closed during - * this session - */ - ShowNewChatMessage: function(msg,header_msg) { - Try.these ( - /* Try to open a window from past messaging with this user */ - function() { - new Effect.Appear("msgwindow_"+msg.sending_user,{duration:'0.2'}); - if(msg.user_name == "" || typeof(msg.user_name) == "undefined" || msg.user_name == globalCommSystem.user.user_name) { - msg.msg_data = "
"+globalCommSystem.user.user_name+" ("+msg.timestamp+"): "+msg.msg_data; - } else if(msg.user_name != globalCommSystem.user.user_name && msg.msg_data != "") { - msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; - } else if(msg.msg_data != "") - msg.msg_data = "
"+msg.msg_data; - - $("chat_data_"+msg.sending_user).innerHTML += msg.msg_data; - globalCommSystem.ScrollChatWindow($("chat_data_"+msg.sending_user)); - }, - /* Build a new chat window */ - function() { - if(msg.msg_type == "P2PIM") - var clsname = "chatWindow"; - else if(msg.msg_type == "GRPCHAT") - var clsname = "grpChatWindow"; - - var main_table = Builder.node( - 'table', - { - name:msg.sending_user,cellpadding:'2',cellspacing:'0',border:'0', - className:clsname,id:'msgwindow_'+msg.sending_user - } - ); - var top_bar = Builder.node( - 'tr', - { - align:'center',width:'100%',valign:'top' - }, - [ Builder.node( - 'td', - [ Builder.node( - 'span', - { - className:'chatWindowHeaderLeft' - }, - header_msg+" " - )], - [ Builder.node( - 'span', - { - className:'chatWindowHeaderRight' - }, - [ Builder.node( - 'img', - {src:'themes/blue/images/close.gif', - onClick: 'globalCommSystem.CloseSession(\''+msg.sending_user+'\')' - } - )] - )] - )] - ); - main_table.appendChild(top_bar); - - Try.these ( - function() { - if(msg.user_name != globalCommSystem.user.user_name) {return false;} - msg.msg_data = "
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; - }, - function() { - msg.msg_data += "
"; - } - ); - - var chat_data = Builder.node( - 'tr', - { - valign:'top',align:'center',id:'chatd_row_'+msg.sending_user - }, - [ Builder.node( - 'td', - { - width:'100%',height:'100%',colspan:'2' - }, - [ Builder.node( - 'div', {id:'chat_data_'+msg.sending_user,className:'chatWindowDataArea',name:msg.sending_user} - )] - )] - ); - main_table.appendChild(chat_data); - - var msg_input = Builder.node( - 'tr', - {valign:'top',align:'center',id:'bchat_row_'+msg.sending_user}, - [ Builder.node( - 'td', - [ Builder.node( - 'div', {id:'msg_wrapper_'+msg.sending_user}, - [ Builder.node( - 'textarea', {id:'msg_input_'+msg.sending_user,name:msg.sending_user} - )] - )], - [ Builder.node( - 'p',{id:'status_bar_'+msg.sending_user} - )], - {width:'100%',colspan:'2'} - )] - ); - main_table.appendChild(msg_input); - - main_table.style.display = "none"; - $("comm_sys").appendChild(main_table); - - if(globalCommSystem.IsPageReload() != 'true' && msg.sending_user != globalCommSystem.user.user_name && msg.msg_data != "") { - $("chat_data_"+msg.sending_user).innerHTML = ""+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; - } else if(msg.msg_data != "") { - $("chat_data_"+msg.sending_user).innerHTML = ""+globalCommSystem.reloadMsg+"
"+msg.user_name+" ("+msg.timestamp+"): "+msg.msg_data; - } - - try { - $("msg_wrapper_"+msg.sending_user).innerHTML += ''; - Event.observe($("msg_input_"+msg.sending_user), 'keypress', globalCommSystem.UserTyping.bindAsEventListener(this)); - Event.observe($("send_button_"+msg.sending_user), 'click', globalCommSystem.SendMsg.bindAsEventListener(this)); - }catch(g){alert(g);} - - new Effect.Appear(main_table,{duration:'0.2'}); - new Draggable(main_table); - } - ); - }, - - /* - * call this function with any old message - * to have it appear in the alert slider - */ - ShowAlertSlider: function(msg) { - $("alert_display").innerHTML = ""+msg+""; - $("alert_display").style.display = "block"; - - new Effect.Highlight("alert_display",{startcolor:'#ff99ff',endcolor:'#999999', - queue: {position: 'end', scope: 'commsys'}, - afterFinish:function() { - new Effect.Highlight("alert_display",{ - startcolor:'#ff99ff',endcolor:'#999999', - queue: {position: 'end', scope: 'commsys'} - } - ) - } - } - ); - window.setTimeout(function() { - globalCommSystem.HideAlertSlider(); - },4500); - }, - - /* - * Hide the alert slider - */ - HideAlertSlider: function() { - new Effect.Squish($("alert_display"), { - queue: {position: 'end', scope: 'commsys'}, - afterFinish: function() { - $("alert_display").innerHTML = ""; - } - } - ); - }, - - CloseSession: function(sending_user) { - new Effect.Fade($("msgwindow_"+sending_user),{duration:'0.2'}); - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'commsys'}, - method: 'post', - postBody: 'module=CommSystem&action=CommSystemAjax&command=closeSession&sending_user='+sending_user - } - ); - }, - - /* - * Call this any time you suspect the chat window - * content has changed. Can either be called with - * the prototype event listener or with the actual - * element passed to this function - */ - ScrollChatWindow: function(evt) { - //$("debug_win").innerHTML += "
Scrolling"; - Try.these ( - function() { - var tname = "chat_data_"+Event.element(evt).name; - $(tname).scrollTop = $(tname).scrollHeight; - }, - function() { - evt.scrollTop = evt.scrollHeight; - } - ); - }, - - /* - * called from event listeners. This will send a user typing - * status message to the other user - */ - UserTyping: function(evt) { - var tname = "status_bar_"+Event.element(evt).name; - if(evt.type === "keypress") { - window.clearTimeout(globalCommSystem.keytimer); - if(globalCommSystem.keycount == 0) { - globalCommSystem.SendStatusMessage('begin',Event.element(evt).name); - globalCommSystem.keycount++; - } - globalCommSystem.keytimer = window.setTimeout('globalCommSystem.UserStopTyping("'+Event.element(evt).name+'")',1000); - } - }, - - /* - * stop your last UserTyping() message - */ - UserStopTyping: function(sending_user) { - window.clearTimeout(globalCommSystem.keytimer); - globalCommSystem.keycount=0; - globalCommSystem.SendStatusMessage('end',sending_user); - }, - - /* - * Call this function (n) seconds after your message - * was first opened. This is for session tracking. - * If this function isn't called after a message is - * displayed it will appear again the next time the - * receiving user opens a CRM window of any kind. - */ - MarkAsRead: function(msgid) { - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'commsys'}, - method: 'post', - postBody: 'module=CommSystem&action=CommSystemAjax&command=markAsRead&msgid='+msgid - } - ); - }, - - /* - * function to parse JSON msg data - * and act on alerts or messages - * for alerts the system will open a small slider - * on the screen to alert the user - * for messages (IMs) a window object will be built for the message. - */ - HandleEvent: function(responseData) { - //$("debug_win").innerHTML += "
"+responseData.responseText; - try { - if(!responseData.responseText.match(/none/)) { - var msgs = eval('(' + responseData.responseText + ')'); - for (var i=0;iNew Email:
"+msgs.CommSysMessages[i].message.recordid); - break; - case 'INPHONE': - window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); - globalCommSystem.ShowAlertSlider("Incoming Call:
"+msgs.CommSysMessages[i].message.msg_data); - break; - case 'VOICEMAIL': - window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); - globalCommSystem.ShowAlertSlider("New Voicemial:
"+msgs.CommSysMessages[i].message.msg_data); - break; - case 'GENERAL': - window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); - globalCommSystem.ShowAlertSlider("New Voicemial:
"+msgs.CommSysMessages[i].message.msg_data); - break; - case 'STATUS': - $("status_bar_"+msg.sending_user).innerHTML = msg.msg_data; - window.setTimeout('globalCommSystem.MarkAsRead("'+msgid+'")',3000); - break; - } - }catch(h){} - Try.these ( - function() { - if(msgs.CommSysMessages[i].email.unseen_emails > 0) - globalCommSystem.ShowAlertSlider("You have "+msgs.CommSysMessages[i].email.unseen_emails+" new emails"); - }, - function() { - if(msgs.CommSysMessages[(i+1)].email.unseen_emails > 0) - globalCommSystem.ShowAlertSlider("You have "+msgs.CommSysMessages[i].email.unseen_emails+" new emails"); - } - ); - } - } - }catch(f){} - globalCommSystem.timer = window.setTimeout('globalCommSystem.CommUpdate()',globalCommSystem.refreshtime); - } -} From vtigercrm-commits at vtiger.fosslabs.com Sun Jul 9 20:59:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 10 Jul 2006 03:59:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7921 - /vtigercrm/trunk/index.php Message-ID: <20060710035940.7FECB84016A@vtiger.fosslabs.com> Author: richie Date: Sun Jul 9 21:59:36 2006 New Revision: 7921 Log: Updated the file by adding a semi colon - ahmed Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Sun Jul 9 21:59:36 2006 @@ -371,13 +371,14 @@ if($server == 'enabled') { if($record == '') - $auditrecord = 0 else + $auditrecord = 0; + else $auditrecord = $record; - $date_var = date('YmdHis'); - $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$current_user->id.",'".$module."','".$action."',".$auditrecord.",$date_var)"; - $adb->query($query); - } + $date_var = date('YmdHis'); + $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$current_user->id.",'".$module."','".$action."',".$auditrecord.",$date_var)"; + $adb->query($query); + } $log->debug('Current user is: '.$current_user->user_name); } From vtiger-tickets at vtiger.fosslabs.com Mon Jul 10 00:08:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 10 Jul 2006 07:08:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231474=3A?= =?utf-8?q?_Unable_to_update_Field_Access?= Message-ID: <076.cdf66ae35ce0cc94cac4db3d75e3f779@vtiger.fosslabs.com> #1474: Unable to update Field Access -----------------------+---------------------------------------------------- Reporter: pxtreme | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.1 Keywords: | -----------------------+---------------------------------------------------- When trying to update the field access,like unchecking Assigned to Field and then saving it,it won't update. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Jul 10 01:28:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 10 Jul 2006 08:28:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7922 - in /vtigercrm/trunk: ./ modules/Dashboard/ themes/blue/ Message-ID: <20060710082842.D6FAE76FE80@vtiger.fosslabs.com> Author: richie Date: Mon Jul 10 02:28:30 2006 New Revision: 7922 Log: ajaxified dashboard integrated Added: vtigercrm/trunk/modules/Dashboard/DashboardAjax.php vtigercrm/trunk/modules/Dashboard/DashboardHome.php Modified: vtigercrm/trunk/index.php vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php vtigercrm/trunk/modules/Dashboard/Chart_outcome_by_month.php vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_lead_source.php vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_sales_stage.php vtigercrm/trunk/modules/Dashboard/display_charts.php vtigercrm/trunk/modules/Dashboard/index.php vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Mon Jul 10 02:28:30 2006 @@ -630,7 +630,7 @@ $theme = $default_theme; } -if((!$viewAttachment) && (!$viewAttachment && $action != 'home_rss') && $action != 'Tickerdetail' && $action != $module."Ajax" && $action != "chat" && $action != "HeadLines" && $action != 'massdelete') +if((!$viewAttachment) && (!$viewAttachment && $action != 'home_rss') && $action != 'Tickerdetail' && $action != $module."Ajax" && $action != "chat" && $action != "HeadLines" && $action != 'massdelete' && $action != "DashboardAjax") { // Under the SPL you do not have the right to remove this copyright statement. $copyrightstatement=" - + @@ -34,7 +34,7 @@ - + {**}
  {$ANNOUNCEMENT} RSS is not configured. Click here to configure
@@ -178,24 +178,6 @@ {rdelim} ); {rdelim} - -function Announcement_rss() -{ldelim} - new Ajax.Request( - 'index.php', - {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim}, - method: 'post', - postBody: 'module=Users&action=UsersAjax&announce_rss=yes', - onComplete: function(response) - {ldelim} - if($("rss").innerHTML != response.responseText) - $("rss").innerHTML=response.responseText; - {rdelim} - {rdelim} - ); - -{rdelim} -setInterval("Announcement_rss()",300000) + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/detailviewemailtemplate.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/detailviewemailtemplate.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/detailviewemailtemplate.php Tue Jul 11 15:21:12 2006 @@ -49,7 +49,7 @@ $smarty->assign("TEMPLATEID", $emailtemplateResult["templateid"]); $smarty->assign("SUBJECT", $emailtemplateResult["subject"]); -$smarty->assign("BODY", nl2br($emailtemplateResult["body"])); +$smarty->assign("BODY", nl2br($emailtemplateResult["text_body"])); $smarty->display("DetailViewEmailTemplate.tpl"); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/editemailtemplate.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/editemailtemplate.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/editemailtemplate.php Tue Jul 11 15:21:12 2006 @@ -50,6 +50,7 @@ $smarty->assign("DESCRIPTION", $emailtemplateResult["description"]); $smarty->assign("SUBJECT", $emailtemplateResult["subject"]); $smarty->assign("BODY", $emailtemplateResult["body"]); +$smarty->assign("TEXT_BODY", $emailtemplateResult["text_body"]); $smarty->assign("MODULE", 'Settings'); $smarty->assign("PARENTTAB", $_REQUEST['parenttab']); $smarty->assign("EMODE", $mode); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/saveemailtemplate.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/saveemailtemplate.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/saveemailtemplate.php Tue Jul 11 15:21:12 2006 @@ -25,6 +25,7 @@ $log->debug("the subject is ".$subject); $body = $_REQUEST["body"]; $log->debug("the body is ".$body); +$text_body = $_REQUEST["text_body"]; if ($body !='') { $body = to_html($body); @@ -33,7 +34,7 @@ if(isset($templateid) && $templateid !='') { $log->info("the templateid is set"); - $sql = "update vtiger_emailtemplates set foldername = '".$folderName."', templatename ='".$templateName."', subject ='".$subject."', description ='".$description."', body ='".$body."' where templateid =".$templateid; + $sql = "update vtiger_emailtemplates set foldername = '".$folderName."', templatename ='".$templateName."', subject ='".$subject."', description ='".$description."', body ='".$body."', text_body='".$text_body."' where templateid =".$templateid; $adb->query($sql); $log->info("about to invoke the detailviewemailtemplate file"); @@ -42,7 +43,7 @@ else { $templateid = $db->getUniqueID('vtiger_emailtemplates'); - $sql = "insert into vtiger_emailtemplates values ('". $folderName. "','".$templateName."','".$subject."','".$description."','".$body."',0,".$templateid.")"; + $sql = "insert into vtiger_emailtemplates values ('". $folderName. "','".$templateName."','".$subject."','".$description."','".$body."',0,".$templateid.",'".$text_body."')"; $adb->query($sql); $log->info("added to the db the emailtemplate"); From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 11 17:17:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 00:17:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7958 - in /branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users: detailviewemailtemplate.php editemailtemplate.php saveemailtemplate.php Message-ID: <20060712001707.542F5841DBD@vtiger.fosslabs.com> Author: mmbrich Date: Tue Jul 11 18:17:05 2006 New Revision: 7958 Log: more quick changes to email template system for html/plain text emails Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/detailviewemailtemplate.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/editemailtemplate.php branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/saveemailtemplate.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/detailviewemailtemplate.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/detailviewemailtemplate.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/detailviewemailtemplate.php Tue Jul 11 18:17:05 2006 @@ -49,7 +49,7 @@ $smarty->assign("TEMPLATEID", $emailtemplateResult["templateid"]); $smarty->assign("SUBJECT", $emailtemplateResult["subject"]); -$smarty->assign("BODY", nl2br($emailtemplateResult["text_body"])); +$smarty->assign("BODY", nl2br(stripslashes($emailtemplateResult["text_body"]))); $smarty->display("DetailViewEmailTemplate.tpl"); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/editemailtemplate.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/editemailtemplate.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/editemailtemplate.php Tue Jul 11 18:17:05 2006 @@ -49,8 +49,8 @@ $smarty->assign("TEMPLATEID", $emailtemplateResult["templateid"]); $smarty->assign("DESCRIPTION", $emailtemplateResult["description"]); $smarty->assign("SUBJECT", $emailtemplateResult["subject"]); -$smarty->assign("BODY", $emailtemplateResult["body"]); -$smarty->assign("TEXT_BODY", $emailtemplateResult["text_body"]); +$smarty->assign("BODY", stripslashes($emailtemplateResult["body"])); +$smarty->assign("TEXT_BODY", stripslashes($emailtemplateResult["text_body"])); $smarty->assign("MODULE", 'Settings'); $smarty->assign("PARENTTAB", $_REQUEST['parenttab']); $smarty->assign("EMODE", $mode); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/saveemailtemplate.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/saveemailtemplate.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/saveemailtemplate.php Tue Jul 11 18:17:05 2006 @@ -28,7 +28,8 @@ $text_body = $_REQUEST["text_body"]; if ($body !='') { - $body = to_html($body); + $body = addslashes($body); + $text_body = addslashes($text_body); $log->info("the body value is set "); } if(isset($templateid) && $templateid !='') From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 11 17:17:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 00:17:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7959 - in /branches/VTIGERCRM-5.0.2-MMBRICH: Smarty/templates/CampaignActions.tpl Smarty/templates/CampaignActionsContent.tpl Smarty/templates/DetailView.tpl Smarty/templates/RelatedLists.tpl modules/Campaigns/CampaignListActions.php Message-ID: <20060712001754.2FC5B841DBD@vtiger.fosslabs.com> Author: mmbrich Date: Tue Jul 11 18:17:53 2006 New Revision: 7959 Log: more SFA stuff, this is not functional yet, still building the layouts and frameworks, use with caution Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActions.tpl branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActionsContent.tpl branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/DetailView.tpl branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/RelatedLists.tpl branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/CampaignListActions.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActions.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActions.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActions.tpl Tue Jul 11 18:17:53 2006 @@ -25,7 +25,7 @@
- [ {$ID} ] {$NAME} - {$SINGLE_MOD} {$APP.LBL_ACTIONS}
+ [ {$ID} ] {$APP.LBL_SFA}

@@ -47,7 +47,7 @@ {$APP.LBL_MORE} {$APP.LBL_INFORMATION}   - {$APP.Campaign} {$APP.LBL_ACTIONS} + {$APP.LBL_SFA}   Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActionsContent.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActionsContent.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActionsContent.tpl Tue Jul 11 18:17:53 2006 @@ -14,7 +14,7 @@ - + + + {if $MODULE eq 'Campaigns'} + + + {/if} {/if} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/RelatedLists.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/RelatedLists.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/RelatedLists.tpl Tue Jul 11 18:17:53 2006 @@ -93,6 +93,11 @@ {/if} + {if $MODULE eq 'Campaigns'} + + + {/if} +
Direct Mail Designer:Bulk Mail Designer: (currently mailing)e-Mail Designer: (currently mailing)
@@ -48,7 +48,7 @@
Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/DetailView.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/DetailView.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/DetailView.tpl Tue Jul 11 18:17:53 2006 @@ -129,6 +129,11 @@
{$SINGLE_MOD} {$APP.LBL_INFORMATION}   {$APP.LBL_MORE} {$APP.LBL_INFORMATION} {$APP.LBL_SFA}   {$APP.LBL_MORE} {$APP.LBL_INFORMATION} {$APP.LBL_SFA} 
Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/CampaignListActions.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/CampaignListActions.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/CampaignListActions.php Tue Jul 11 18:17:53 2006 @@ -26,8 +26,8 @@ $smarty->assign("ID", $_REQUEST["record"]); -if(isset($_REQUEST["campaign_step"]) && isset($_REQUEST["action_type"])) - $smarty->assign("TEMPLATE_FILE",'CampaignActions_'.$_REQUEST["action_type"].'_Step'.$_REQUEST["campaign_step"].'.tpl'); +if(isset($_REQUEST["action_step"]) && isset($_REQUEST["action_type"])) + $smarty->assign("TEMPLATE_FILE",'CampaignActions_'.$_REQUEST["action_type"].'_Step'.$_REQUEST["action_step"].'.tpl'); else $smarty->assign("TEMPLATE_FILE","CampaignActionsContent.tpl"); From vtiger-tickets at vtiger.fosslabs.com Tue Jul 11 18:40:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 12 Jul 2006 01:40:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231482=3A?= =?utf-8?q?_Dashboard_charts_do_not_refresh_when_browser_caching_is_on?= In-Reply-To: <076.80515f5076be40630b7c1099a517fc7c@vtiger.fosslabs.com> References: <076.80515f5076be40630b7c1099a517fc7c@vtiger.fosslabs.com> Message-ID: <085.da92f1ec2e53978a313c54421cf7ae09@vtiger.fosslabs.com> #1482: Dashboard charts do not refresh when browser caching is on ------------------------+--------------------------------------------------- Reporter: nokes | Owner: developer Type: defect | Status: new Priority: trivial | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by allanbush): * version: => 4.2.4rc3 Comment: I thought this was done on purpose to speed up the seclusive loading of graphs, however if every graph is created every time on the server then we should probably do as is suggested as there is probably very little page loading time savings by not downloading the image for most implementation of vtiger. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 11 23:03:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 06:03:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7960 - /vtigercrm/trunk/modules/Users/LoginHistory.php Message-ID: <20060712060358.4BB2E841DE4@vtiger.fosslabs.com> Author: saraj Date: Wed Jul 12 00:03:53 2006 New Revision: 7960 Log: updated login history php Modified: vtigercrm/trunk/modules/Users/LoginHistory.php Modified: vtigercrm/trunk/modules/Users/LoginHistory.php ============================================================================== --- vtigercrm/trunk/modules/Users/LoginHistory.php (original) +++ vtigercrm/trunk/modules/Users/LoginHistory.php Wed Jul 12 00:03:53 2006 @@ -134,7 +134,7 @@ $entries_list[] = $entries; } - log->debug("Exiting getHistoryListViewEntries() method ..."); + $log->debug("Exiting getHistoryListViewEntries() method ..."); return $entries_list; } From vtigercrm-commits at vtiger.fosslabs.com Tue Jul 11 23:29:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 06:29:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7961 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060712062901.4086E841DE8@vtiger.fosslabs.com> Author: saraj Date: Wed Jul 12 00:28:56 2006 New Revision: 7961 Log: Updated the demo data for product module Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== --- vtigercrm/trunk/install/populateSeedData.php (original) +++ vtigercrm/trunk/install/populateSeedData.php Wed Jul 12 00:28:56 2006 @@ -452,7 +452,7 @@ $category = "Hardware"; $website = ""; $manufacturer = ""; - $commission_rate= rand(10,99); + $commission_rate= rand(10,20); $unit_price = rand(100,999); $product_image_name = ''; } @@ -461,13 +461,13 @@ $account_key = array_rand($account_ids); $product->column_fields["parent_id"]=$account_ids[$account_key]; - $usageunit = ""; - $qty_per_unit = ""; - $qty_in_stock = ""; + $usageunit = "Each"; + $qty_per_unit = 1; + $qty_in_stock = rand(10000, 99999); $category = "Software"; $website = "www.vtiger.com"; $manufacturer = "vtiger"; - $commission_rate= 0; + $commission_rate= rand(1,10); $unit_price = $subscription_rate[$i]; $product_image_name = $product_image_array[$i]; } From vtiger-tickets at vtiger.fosslabs.com Tue Jul 11 23:59:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 12 Jul 2006 06:59:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231275=3A?= =?utf-8?q?_Move_Tickets_to_FAQ?= In-Reply-To: <076.3172336494b1ae9199990df7c684d75e@vtiger.fosslabs.com> References: <076.3172336494b1ae9199990df7c684d75e@vtiger.fosslabs.com> Message-ID: <085.a2f718cf329bfad8e52fc16dd1344e83@vtiger.fosslabs.com> #1275: Move Tickets to FAQ --------------------------+------------------------------------------------- Reporter: anonymous | Owner: mickie Type: enhancement | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: | Keywords: --------------------------+------------------------------------------------- Changes (by mickie): * version: 5.0.0 => 5.0.1 Comment: In general we did not see attachments for FAQ. There is no need for attachments to FAQ. Common thing is, if we need any attachments for FAQ then what we will do is we will upload the attachments in somewhere and then we will give that links in the FAQ. if you have any other scenarios then please let us know. we will discuss further and then we will decide, whether we will take this or not in future. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 12 00:16:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 07:16:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7962 - /vtigercrm/trunk/Popup.php Message-ID: <20060712071620.F2B68841DF6@vtiger.fosslabs.com> Author: saraj Date: Wed Jul 12 01:16:16 2006 New Revision: 7962 Log: * Modified the list query which is used to get the list of pricebooks associated with the correspondinf product Modified: vtigercrm/trunk/Popup.php Modified: vtigercrm/trunk/Popup.php ============================================================================== --- vtigercrm/trunk/Popup.php (original) +++ vtigercrm/trunk/Popup.php Wed Jul 12 01:16:16 2006 @@ -201,7 +201,7 @@ if($currentModule == 'PriceBooks') { $productid=$_REQUEST['productid']; - $query = 'select pricebook.*, pricebookproductrel.productid, pricebookproductrel.listprice, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from pricebook inner join pricebookproductrel on pricebookproductrel.pricebookid = pricebook.pricebookid inner join crmentity on crmentity.crmid = pricebook.pricebookid where pricebookproductrel.productid='.$productid.' and crmentity.deleted=0'; + $query = 'select vtiger_pricebook.*, vtiger_pricebookproductrel.productid, vtiger_pricebookproductrel.listprice, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_pricebook inner join vtiger_pricebookproductrel on vtiger_pricebookproductrel.pricebookid = vtiger_pricebook.pricebookid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_pricebook.pricebookid where vtiger_pricebookproductrel.productid='.$productid.' and vtiger_crmentity.deleted=0'; } else { From vtiger-tickets at vtiger.fosslabs.com Wed Jul 12 00:21:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 12 Jul 2006 07:21:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231424=3A?= =?utf-8?q?_No_pricebooks_found_in_from_quote_/_salesorder?= In-Reply-To: <076.86b37bbce61749a9f650a88987e80ad4@vtiger.fosslabs.com> References: <076.86b37bbce61749a9f650a88987e80ad4@vtiger.fosslabs.com> Message-ID: <085.e034748e9129a923df068a41f3bf0df6@vtiger.fosslabs.com> #1424: No pricebooks found in from quote / salesorder ------------------------+--------------------------------------------------- Reporter: andrewr | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: Thanks for notifying the issue. The issue is due to the table rename with prefix vtiger_ To fix this please add vtiger_ prefix in Popup.php which is parellel to config.php In this file in line 201 there will be a if condition if($currentModule == 'PriceBooks') Inside this function there will be a query available. please add vtiger_ in the tables in this query. we have chaged this and checkedin in svn. (svn commited revision 7962 - line 204) -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Jul 12 01:10:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 12 Jul 2006 08:10:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231483=3A?= =?utf-8?q?_Problem_with_imports_field_description?= Message-ID: <076.b115d9a3ed1c15f5ad261b4b14a8e21f@vtiger.fosslabs.com> #1483: Problem with imports field description ----------------------------+----------------------------------------------- Reporter: aissafranc | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: import, scroll | ----------------------------+----------------------------------------------- Hi, the import function, import the field description on one line (tested with account). If you have a long description, all is imported on one and unique line, so we have a long horizontal scrollbar. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Jul 12 01:35:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 12 Jul 2006 08:35:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231484=3A?= =?utf-8?q?_All_activities_displaying_on_all_leads?= Message-ID: <076.b805c0ea630046ac74cf3d9aee50ba65@vtiger.fosslabs.com> #1484: All activities displaying on all leads -----------------------+---------------------------------------------------- Reporter: andrewr | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- On the lead more information screen all activites related to all leads are displayed. SVN 7962. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Jul 12 01:35:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 12 Jul 2006 08:35:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231485=3A?= =?utf-8?q?_Maximum_length_in_field_table_is_not_used_any_where?= Message-ID: <076.ebab7567d6af00f149203f60c7971533@vtiger.fosslabs.com> #1485: Maximum length in field table is not used any where --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- No check for maximun length of fields -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Jul 12 01:40:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 12 Jul 2006 08:40:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231427=3A?= =?utf-8?q?_SO=2C_PO=2C_Invoice=2C_PriceBook_not_displayed_in_Product_Rela?= =?utf-8?q?ted_List?= In-Reply-To: <076.b252c89e37cb222c0c69ae66bcf277da@vtiger.fosslabs.com> References: <076.b252c89e37cb222c0c69ae66bcf277da@vtiger.fosslabs.com> Message-ID: <085.59377cb57658a1bde9cd422f20162c4f@vtiger.fosslabs.com> #1427: SO, PO, Invoice, PriceBook not displayed in Product Related List ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by andrewr): * resolution: => duplicate * status: reopened => closed Comment: See ticket 1424 (svn commited revision 7962 - line 204) -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 12 02:41:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 09:41:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7963 - /branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php Message-ID: <20060712094117.4DE5D8411F5@vtiger.fosslabs.com> Author: mmbrich Date: Wed Jul 12 03:41:15 2006 New Revision: 7963 Log: an attempt at _some_ kind of useful API for data manipulation/etc Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php Wed Jul 12 03:41:15 2006 @@ -81,26 +81,104 @@ $focus = new Contact(); $button = ''; $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - $query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_campaigncontrel on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaigncontrel.campaignid = '.$id.' and vtiger_crmentity.deleted=0'; + $query = $this->get_related_contacts_query($id); $log->debug("Exiting get_contacts method ..."); return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset); } + function get_related_contacts_query($id) { + global $log; + $log->debug("Entering get_contacts_query(".$id.") method ..."); + + $query = "SELECT vtiger_contactdetails.accountid" + ." ,vtiger_users.user_name,vtiger_groups.groupname" + ." ,vtiger_contactdetails.contactid, vtiger_contactdetails.lastname" + ." ,vtiger_contactdetails.firstname, vtiger_contactdetails.title" + ." ,vtiger_contactdetails.department, vtiger_contactdetails.email" + ." ,vtiger_contactdetails.phone, vtiger_crmentity.crmid" + ." ,vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime" + ." FROM vtiger_contactdetails" + ." INNER JOIN vtiger_campaigncontrel" + ." ON vtiger_campaigncontrel.contactid=vtiger_contactdetails.contactid" + ." INNER JOIN vtiger_crmentity" + ." ON vtiger_crmentity.crmid=vtiger_contactdetails.contactid" + ." LEFT JOIN vtiger_contactgrouprelation" + ." ON vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid" + ." LEFT JOIN vtiger_groups" + ." ON vtiger_groups.groupname=vtiger_contactgrouprelation.groupname" + ." LEFT JOIN vtiger_users" + ." ON vtiger_crmentity.smownerid=vtiger_users.id" + ." WHERE vtiger_campaigncontrel.campaignid='".$id."' AND vtiger_crmentity.deleted='0'" + ; + + return $query; + } function get_leads($id) { global $log; $log->debug("Entering get_leads(".$id.") method ..."); global $mod_strings; + $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; + $focus = new Lead(); $button = ''; - $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - - $query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_campaignleadrel on vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_campaignleadrel.campaignid = '.$id; - $log->debug("Exiting get_leads method ..."); + $query = $this->get_related_leads_query($id); return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset); } + function get_related_leads_query($id) { + global $log; + $log->debug("Entering get_leads_query(".$id.") method ..."); + + $query = "SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name" + ." ,vtiger_groups.groupname, vtiger_crmentity.smownerid" + ." FROM vtiger_leaddetails" + ." INNER JOIN vtiger_campaignleadrel" + ." ON vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid" + ." INNER JOIN vtiger_crmentity" + ." ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid" + ." LEFT JOIN vtiger_users" + ." ON vtiger_crmentity.smownerid=vtiger_users.id" + ." LEFT JOIN vtiger_leadgrouprelation" + ." ON vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid" + ." LEFT JOIN vtiger_groups" + ." ON vtiger_groups.groupname=vtiger_leadgrouprelation.groupname" + ." WHERE vtiger_crmentity.deleted='0' AND vtiger_campaignleadrel.campaignid='".$id."'" + ; + + $log->debug("Exiting get_leads method ..."); + return $query; + } + /* + * @param integer - id of campaign to retrieve list from + * @return array - array of all contacts and leads from the get_related_[leads,contacts]_query function + * + */ + function get_related_entities($id) { + $ret = array(); + // first lets get the leads + $lead_rs = $this->db->query($this->get_related_leads_query($id)); + + $i=0; + while($lrow = $this->db->fetch_array($lead_rs)) { + $ret[$i]=$row; + $i++; + } + // now the contacts + $contact_rs = $this->db->query($this->get_related_contacts_query($id)); + while($crow = $this->db->fetch_array($contact_rs)) { + $ret[$i]=$row; + $i++; + } + return $ret; + } + function get_related_actions($id) { + + } + function get_related_oportunities($id) { + + } function get_opportunities($id) { global $log; @@ -112,12 +190,73 @@ $button = ''; $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - $query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0'; + $query = $this->get_related_opportunities_query($id); if($this->column_fields['account_id'] != 0) $log->debug("Exiting get_opportunities method ..."); return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset); } + function get_related_opportunities_query($id) { + global $log; + $log->debug("Entering get_related_opportunities_query(".$id.") method ..."); + + $query = "SELECT vtiger_users.user_name,vtiger_groups.groupname," + ." vtiger_potential.potentialid, vtiger_potential.potentialname," + ." vtiger_potential.potentialtype, vtiger_potential.sales_stage," + ." vtiger_potential.amount, vtiger_potential.closingdate," + ." vtiger_crmentity.crmid, vtiger_crmentity.smownerid" + ." FROM vtiger_campaign" + ." INNER JOIN vtiger_potential" + ." ON vtiger_campaign.campaignid = vtiger_potential.campaignid" + ." INNER JOIN vtiger_crmentity" + ." ON vtiger_crmentity.crmid = vtiger_potential.potentialid" + ." LEFT JOIN vtiger_potentialgrouprelation" + ." ON vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid" + ." LEFT JOIN vtiger_groups" + ." ON vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname" + ." LEFT JOIN vtiger_users" + ." ON vtiger_users.id=vtiger_crmentity.smownerid" + ." WHERE vtiger_campaign.campaignid='".$id."' AND vtiger_crmentity.deleted='0'" + ; + return $query; + } + function get_related_activities_query($id) { + global $log; + $log->debug("Entering get_related_activities_query(".$id.") method ..."); + + $query = "SELECT vtiger_contactdetails.lastname," + ." vtiger_contactdetails.firstname," + ." vtiger_contactdetails.contactid," + ." vtiger_activity.*," + ." vtiger_seactivityrel.*," + ." vtiger_crmentity.crmid, vtiger_crmentity.smownerid," + ." vtiger_crmentity.modifiedtime," + ." vtiger_users.user_name," + ." vtiger_recurringevents.recurringtype" + ." FROM vtiger_activity" + ." INNER JOIN vtiger_seactivityrel" + ." ON vtiger_seactivityrel.activityid = vtiger_activity.activityid" + ." INNER JOIN vtiger_crmentity" + ." ON vtiger_crmentity.crmid=vtiger_activity.activityid" + ." LEFT JOIN vtiger_cntactivityrel" + ." ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid" + ." LEFT JOIN vtiger_contactdetails" + ." ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid" + ." LEFT JOIN vtiger_users" + ." ON vtiger_users.id = vtiger_crmentity.smownerid" + ." LEFT OUTER JOIN vtiger_recurringevents" + ." ON vtiger_recurringevents.activityid = vtiger_activity.activityid" + ." LEFT JOIN vtiger_activitygrouprelation" + ." ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid" + ." LEFT JOIN vtiger_groups" + ." ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname" + ." WHERE vtiger_seactivityrel.crmid='".$id."'" + ." AND (activitytype = 'Task'" + ." OR activitytype = 'Call'" + ." OR activitytype = 'Meeting')" + ; + return $query; + } function get_activities($id) { global $log; @@ -132,36 +271,8 @@ $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - $query = "SELECT vtiger_contactdetails.lastname, - vtiger_contactdetails.firstname, - vtiger_contactdetails.contactid, - vtiger_activity.*, - vtiger_seactivityrel.*, - vtiger_crmentity.crmid, vtiger_crmentity.smownerid, - vtiger_crmentity.modifiedtime, - vtiger_users.user_name, - vtiger_recurringevents.recurringtype - FROM vtiger_activity - INNER JOIN vtiger_seactivityrel - ON vtiger_seactivityrel.activityid = vtiger_activity.activityid - INNER JOIN vtiger_crmentity - ON vtiger_crmentity.crmid=vtiger_activity.activityid - LEFT JOIN vtiger_cntactivityrel - ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid - LEFT JOIN vtiger_contactdetails - ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid - LEFT JOIN vtiger_users - ON vtiger_users.id = vtiger_crmentity.smownerid - LEFT OUTER JOIN vtiger_recurringevents - ON vtiger_recurringevents.activityid = vtiger_activity.activityid - LEFT JOIN vtiger_activitygrouprelation - ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname - WHERE vtiger_seactivityrel.crmid=".$id." - AND (activitytype = 'Task' - OR activitytype = 'Call' - OR activitytype = 'Meeting')"; + $query = $this->get_related_activities_query($id); + $log->debug("Exiting get_activities method ..."); return GetRelatedList('Campaigns','Activities',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 12 02:58:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 09:58:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7964 - /branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php Message-ID: <20060712095840.88AD28411F5@vtiger.fosslabs.com> Author: mmbrich Date: Wed Jul 12 03:58:39 2006 New Revision: 7964 Log: more API usability issues Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php Wed Jul 12 03:58:39 2006 @@ -86,33 +86,6 @@ $log->debug("Exiting get_contacts method ..."); return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset); } - function get_related_contacts_query($id) { - global $log; - $log->debug("Entering get_contacts_query(".$id.") method ..."); - - $query = "SELECT vtiger_contactdetails.accountid" - ." ,vtiger_users.user_name,vtiger_groups.groupname" - ." ,vtiger_contactdetails.contactid, vtiger_contactdetails.lastname" - ." ,vtiger_contactdetails.firstname, vtiger_contactdetails.title" - ." ,vtiger_contactdetails.department, vtiger_contactdetails.email" - ." ,vtiger_contactdetails.phone, vtiger_crmentity.crmid" - ." ,vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime" - ." FROM vtiger_contactdetails" - ." INNER JOIN vtiger_campaigncontrel" - ." ON vtiger_campaigncontrel.contactid=vtiger_contactdetails.contactid" - ." INNER JOIN vtiger_crmentity" - ." ON vtiger_crmentity.crmid=vtiger_contactdetails.contactid" - ." LEFT JOIN vtiger_contactgrouprelation" - ." ON vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid" - ." LEFT JOIN vtiger_groups" - ." ON vtiger_groups.groupname=vtiger_contactgrouprelation.groupname" - ." LEFT JOIN vtiger_users" - ." ON vtiger_crmentity.smownerid=vtiger_users.id" - ." WHERE vtiger_campaigncontrel.campaignid='".$id."' AND vtiger_crmentity.deleted='0'" - ; - - return $query; - } function get_leads($id) { global $log; @@ -127,32 +100,27 @@ $query = $this->get_related_leads_query($id); return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset); } - function get_related_leads_query($id) { - global $log; - $log->debug("Entering get_leads_query(".$id.") method ..."); - - $query = "SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name" - ." ,vtiger_groups.groupname, vtiger_crmentity.smownerid" - ." FROM vtiger_leaddetails" - ." INNER JOIN vtiger_campaignleadrel" - ." ON vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid" - ." INNER JOIN vtiger_crmentity" - ." ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid" - ." LEFT JOIN vtiger_users" - ." ON vtiger_crmentity.smownerid=vtiger_users.id" - ." LEFT JOIN vtiger_leadgrouprelation" - ." ON vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid" - ." LEFT JOIN vtiger_groups" - ." ON vtiger_groups.groupname=vtiger_leadgrouprelation.groupname" - ." WHERE vtiger_crmentity.deleted='0' AND vtiger_campaignleadrel.campaignid='".$id."'" - ; - - $log->debug("Exiting get_leads method ..."); - return $query; - } + function get_opportunities($id) + { + global $log; + $log->debug("Entering get_opportunities(".$id.") method ..."); + global $mod_strings; + + $focus = new Potential(); + + $button = ''; + $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; + + $query = $this->get_related_opportunities_query($id); + if($this->column_fields['account_id'] != 0) + $log->debug("Exiting get_opportunities method ..."); + return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset); + + } + /* * @param integer - id of campaign to retrieve list from - * @return array - array of all contacts and leads from the get_related_[leads,contacts]_query function + * @return array - array of all db rows from the get_related_[leads,contacts]_query function * */ function get_related_entities($id) { @@ -179,22 +147,63 @@ function get_related_oportunities($id) { } - function get_opportunities($id) - { - global $log; - $log->debug("Entering get_opportunities(".$id.") method ..."); - global $mod_strings; - - $focus = new Potential(); - - $button = ''; - $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - - $query = $this->get_related_opportunities_query($id); - if($this->column_fields['account_id'] != 0) - $log->debug("Exiting get_opportunities method ..."); - return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset); - + function get_related_leads_query($id) { + global $log; + $log->debug("Entering get_leads_query(".$id.") method ..."); + + $query = "SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name" + ." ,vtiger_groups.groupname, vtiger_crmentity.smownerid" + ." ,vtiger_leadaddress.*, vtiger_leadsubdetails.*" + ." FROM vtiger_leaddetails" + ." INNER JOIN vtiger_leadaddress" + ." ON vtiger_leadaddress.leadaddressid=vtiger_leaddetails.leadid" + ." INNER JOIN vtiger_leadsubdetails" + ." ON vtiger_leadsubdetails.leadsubscriptionid=vtiger_leaddetails.leadid" + ." INNER JOIN vtiger_campaignleadrel" + ." ON vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid" + ." INNER JOIN vtiger_crmentity" + ." ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid" + ." LEFT JOIN vtiger_users" + ." ON vtiger_crmentity.smownerid=vtiger_users.id" + ." LEFT JOIN vtiger_leadgrouprelation" + ." ON vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid" + ." LEFT JOIN vtiger_groups" + ." ON vtiger_groups.groupname=vtiger_leadgrouprelation.groupname" + ." WHERE vtiger_crmentity.deleted='0' AND vtiger_campaignleadrel.campaignid='".$id."'" + ." GROUP BY vtiger_leaddetails.leadid" + ; + + $log->debug("Exiting get_leads method ..."); + return $query; + } + function get_related_contacts_query($id) { + global $log; + $log->debug("Entering get_contacts_query(".$id.") method ..."); + + $query = "SELECT vtiger_contactdetails.*, vtiger_contactsubdetails.*, vtiger_contactaddress.*" + ." ,vtiger_users.user_name,vtiger_groups.groupname" + ." ,vtiger_crmentity.crmid" + ." ,vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime" + ." FROM vtiger_contactdetails" + ." INNER JOIN vtiger_contactaddress" + ." ON vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid" + ." INNER JOIN vtiger_contactsubdetails" + ." ON vtiger_contactsubdetails.contactsubscriptionid=vtiger_contactdetails.contactid" + ." INNER JOIN vtiger_campaigncontrel" + ." ON vtiger_campaigncontrel.contactid=vtiger_contactdetails.contactid" + ." INNER JOIN vtiger_crmentity" + ." ON vtiger_crmentity.crmid=vtiger_contactdetails.contactid" + ." LEFT JOIN vtiger_contactgrouprelation" + ." ON vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid" + ." LEFT JOIN vtiger_groups" + ." ON vtiger_groups.groupname=vtiger_contactgrouprelation.groupname" + ." LEFT JOIN vtiger_users" + ." ON vtiger_crmentity.smownerid=vtiger_users.id" + ." WHERE vtiger_campaigncontrel.campaignid='".$id."' AND vtiger_crmentity.deleted='0'" + ." GROUP BY vtiger_contactdetails.contactid" + ; + + return $query; } function get_related_opportunities_query($id) { global $log; From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 12 03:02:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 10:02:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7965 - /branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php Message-ID: <20060712100242.C20B5841207@vtiger.fosslabs.com> Author: mmbrich Date: Wed Jul 12 04:02:41 2006 New Revision: 7965 Log: phpdoc comments for Campaigns module Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/Campaign.php Wed Jul 12 04:02:41 2006 @@ -72,6 +72,7 @@ $this->column_fields = getColumnFields('Campaigns'); } + /* internal function used by UI creator to display related entites */ function get_contacts($id) { global $log; @@ -86,6 +87,7 @@ $log->debug("Exiting get_contacts method ..."); return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset); } + /* internal function used by UI creator to display related entites */ function get_leads($id) { global $log; @@ -100,6 +102,7 @@ $query = $this->get_related_leads_query($id); return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset); } + /* internal function used by UI creator to display related entites */ function get_opportunities($id) { global $log; @@ -117,11 +120,30 @@ return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset); } + /* internal function used by UI creator to display related entites */ + function get_activities($id) + { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); + global $app_strings; + + require_once('modules/Activities/Activity.php'); + + $focus = new Activity(); + + $button = ''; + + $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; + + $query = $this->get_related_activities_query($id); + + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Campaigns','Activities',$focus,$query,$button,$returnset); + } /* * @param integer - id of campaign to retrieve list from * @return array - array of all db rows from the get_related_[leads,contacts]_query function - * */ function get_related_entities($id) { $ret = array(); @@ -147,6 +169,10 @@ function get_related_oportunities($id) { } + /* + * @param integer - id of campaign to retrieve query from + * @return string - SQL query to retrieve records + */ function get_related_leads_query($id) { global $log; $log->debug("Entering get_leads_query(".$id.") method ..."); @@ -176,6 +202,10 @@ $log->debug("Exiting get_leads method ..."); return $query; } + /* + * @param integer - id of campaign to retrieve query from + * @return string - SQL query to retrieve records + */ function get_related_contacts_query($id) { global $log; $log->debug("Entering get_contacts_query(".$id.") method ..."); @@ -205,6 +235,10 @@ return $query; } + /* + * @param integer - id of campaign to retrieve query from + * @return string - SQL query to retrieve records + */ function get_related_opportunities_query($id) { global $log; $log->debug("Entering get_related_opportunities_query(".$id.") method ..."); @@ -229,6 +263,10 @@ ; return $query; } + /* + * @param integer - id of campaign to retrieve query from + * @return string - SQL query to retrieve records + */ function get_related_activities_query($id) { global $log; $log->debug("Entering get_related_activities_query(".$id.") method ..."); @@ -266,25 +304,5 @@ ; return $query; } - function get_activities($id) - { - global $log; - $log->debug("Entering get_activities(".$id.") method ..."); - global $app_strings; - - require_once('modules/Activities/Activity.php'); - - $focus = new Activity(); - - $button = ''; - - $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - - $query = $this->get_related_activities_query($id); - - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Campaigns','Activities',$focus,$query,$button,$returnset); - } - } ?> From vtiger-tickets at vtiger.fosslabs.com Wed Jul 12 04:16:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 12 Jul 2006 11:16:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231486=3A?= =?utf-8?q?_User_Based_Custom_Views?= Message-ID: <076.cf5c8326a14629a0842308da617191e4@vtiger.fosslabs.com> #1486: User Based Custom Views --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: jerrydgeorge Type: enhancement | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- Currently the Custom Views are not user based.We should have user based Custom Views --Feedbacks from drax [http://forums.vtiger.com/viewtopic.php?p=27666&highlight=#27666] -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 12 05:58:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 12:58:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7966 - in /branches/VTIGERCRM-5.0.2-MMBRICH: include/fckeditor/fckconfig.js modules/Users/TemplateMerge.php Message-ID: <20060712125820.D3C5684121A@vtiger.fosslabs.com> Author: mmbrich Date: Wed Jul 12 06:58:19 2006 New Revision: 7966 Log: someone thought it would be a good idea to change fckeditor even though it was a perfectly fine (and working) editor "out of the box" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fckconfig.js branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/TemplateMerge.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fckconfig.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fckconfig.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fckconfig.js Wed Jul 12 06:58:19 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -22,7 +22,7 @@ FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ; -FCKConfig.DocType = '' ; +FCKConfig.DocType = '' ; FCKConfig.BaseHref = '' ; @@ -32,22 +32,21 @@ FCKConfig.AllowQueryStringDebug = true ; FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ; +FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCKConfig.SkinPath + 'images/toolbar.buttonarrow.gif' ] ; FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ; -// FCKConfig.Plugins.Add( 'placeholder', 'de,en,fr,it,pl' ) ; +// FCKConfig.Plugins.Add( 'autogrow' ) ; +FCKConfig.AutoGrowMax = 400 ; FCKConfig.ProtectedSource.Add( //gi ) ; // From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 12 06:07:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 13:07:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7967 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060712130746.098F984121A@vtiger.fosslabs.com> Author: richie Date: Wed Jul 12 07:07:43 2006 New Revision: 7967 Log: parameter has been changed in function call Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Wed Jul 12 07:07:43 2006 @@ -216,7 +216,7 @@ $query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0"; $log->debug("Exiting get_campaigns method ..."); - return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset); + return GetRelatedList('Leads','Campaigns',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 12 06:12:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 13:12:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7968 - /vtigercrm/trunk/modules/Campaigns/Campaign.php Message-ID: <20060712131243.27E4984121A@vtiger.fosslabs.com> Author: richie Date: Wed Jul 12 07:12:39 2006 New Revision: 7968 Log: functions getSortOrder and getOrderBy has been included Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Campaign.php (original) +++ vtigercrm/trunk/modules/Campaigns/Campaign.php Wed Jul 12 07:12:39 2006 @@ -72,6 +72,35 @@ $this->column_fields = getColumnFields('Campaigns'); } + // Mike Crowe Mod --------------------------------------------------------Default ordering for us + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['CAMPAIGN_SORT_ORDER'] != '')?($_SESSION['CAMPAIGN_SORT_ORDER']):($this->default_sort_order)); + + $log->debug("Exiting getSortOrder method ..."); + return $sorder; + } + + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['CAMPAIGN_ORDER_BY'] != '')?($_SESSION['CAMPAIGN_ORDER_BY']):($this->default_order_by)); + + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + // Mike Crowe Mod -------------------------------------------------------- + + function get_contacts($id) { global $log; From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 12 06:15:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 13:15:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7969 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060712131508.E3EDC84121A@vtiger.fosslabs.com> Author: richie Date: Wed Jul 12 07:15:04 2006 New Revision: 7969 Log: sorting - stored in session has been modified Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Wed Jul 12 07:15:04 2006 @@ -51,15 +51,8 @@ } //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> -if($_REQUEST['order_by'] != '') - $order_by = $_REQUEST['order_by']; -else - $order_by = (($_SESSION['CAMPAIGN_ORDER_BY'] != '')?($_SESSION['CAMPAIGN_ORDER_BY']):($focus->default_order_by)); - -if($_REQUEST['sorder'] != '') - $sorder = $_REQUEST['sorder']; -else - $sorder = (($_SESSION['CAMPAIGN_SORT_ORDER'] != '')?($_SESSION['CAMPAIGN_SORT_ORDER']):($focus->default_sort_order)); +$sorder = $focus->getSortOrder(); +$order_by = $focus->getOrderBy(); $_SESSION['CAMPAIGN_ORDER_BY'] = $order_by; $_SESSION['CAMPAIGN_SORT_ORDER'] = $sorder; From vtiger-tickets at vtiger.fosslabs.com Wed Jul 12 06:35:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 12 Jul 2006 13:35:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231487=3A?= =?utf-8?q?_Link_between_potential_and_product?= Message-ID: <076.03b879817667a09c3cf2780e968dd83c@vtiger.fosslabs.com> #1487: Link between potential and product -----------------------------------------+---------------------------------- Reporter: aissafranc | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc3 Keywords: potential, product, related | -----------------------------------------+---------------------------------- Hi, when i select a product from a potential related list, the "linkage" is never made. To check that, open the detailview for a potential, go to the related list, and try to link a product. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Jul 12 06:45:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 12 Jul 2006 13:45:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r7970 - in /branches/VTIGERCRM-5.0.2-MMBRICH: Smarty/templates/ include/fckeditor/ include/fckeditor/editor/ include/fckeditor/editor/_source/classes/ include/fckeditor/editor/_source/commandclasses/ include/fckeditor/editor/_source/internals/ include/fckeditor/editor/css/ include/fckeditor/editor/css/behaviors/ include/fckeditor/editor/dialog/ include/fckeditor/editor/dialog/common/ include/fckeditor/editor/dialog/fck_about/ include/fckeditor/editor/dialog/fck_docprops/ include/fckeditor/editor/dialog/fck_image/ include/fckeditor/editor/dialog/fck_link/ include/fckeditor/editor/dialog/fck_select/ include/fckeditor/editor/dialog/fck_universalkey/ include/fckeditor/editor/filemanager/browser/default/ include/fckeditor/editor/filemanager/browser/default/connectors/ include/fckeditor/editor/filemanager/browser/default/connectors/asp/ include/fckeditor/editor/filemanager/browser/default/connectors/aspx/ include/fckeditor/editor/filemanager/browser/default/connectors/cfm/ include/fckeditor/editor/filemanager/browser/default/connectors/perl/ include/fckeditor/editor/filemanager/browser/default/connectors/php/ include/fckeditor/editor/filemanager/browser/default/js/ include/fckeditor/editor/lang/ include/fckeditor/editor/plugins/placeholder/ include/fckeditor/editor/plugins/placeholder/lang/ include/fckeditor/editor/plugins/tablecommands/ include/fckeditor/editor/skins/default/ include/fckeditor/editor/skins/default/images/ include/fckeditor/editor/skins/silver/ include/fckeditor/editor/skins/silver/images/ modules/Users/ Message-ID: <20060712134518.4A44B842303@vtiger.fosslabs.com> Author: mmbrich Date: Wed Jul 12 07:45:05 2006 New Revision: 7970 Log: last fixes for fckeditor and newest version of uploaded Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActions_Emails_Step1.tpl branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckevents.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckplugin.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckspecialcombo.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstylesloader.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbar.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbutton.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckxml_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckxml_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fck_othercommands.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcknamedcommand.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckstylecommand.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcktablecommand.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_1.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_1_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_1_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckbrowserinfo.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckcodeformatter.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckcommands.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckconfig.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdebug.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcklanguagemanager.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcknamespace.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckplugins.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckregexlib.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktoolbaritems.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktoolbarset.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckundo_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckundo_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckurlparams.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml_gecko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml_ie.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtmlentities.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/behaviors/showtableborders.htc branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_editorarea.css branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_internal.css branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_showtableborders_gecko.css branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/fck_dialog_common.css branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/fck_dialog_common.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/moz-bindings.xml branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_about.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_about/lgpl.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_anchor.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_button.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_checkbox.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_colorselector.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_docprops.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_find.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_flash.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_form.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_hiddenfield.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_image.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_image/fck_image.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_image/fck_image_preview.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_link.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_link/fck_link.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_listprop.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_paste.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_radiobutton.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_replace.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_select.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_select/fck_select.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_smiley.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_source.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_specialchar.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_spellerpages.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_table.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_tablecell.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_template.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_textarea.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_textfield.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_universalkey.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_universalkey/data.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_universalkey/diacritic.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_universalkey/dialogue.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_universalkey/fck_universalkey.css branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_universalkey/multihexa.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckblank.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckdebug.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckdialog.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckeditor.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckeditor.original.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/browser.css branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/browser.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/asp/basexml.asp branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/asp/class_upload.asp branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/asp/commands.asp branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/asp/config.asp branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/asp/connector.asp branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/asp/io.asp branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/asp/util.asp branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/aspx/connector.aspx branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/cfm/config.cfm branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/cfm/connector.cfm branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/perl/basexml.pl branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/perl/commands.pl branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/perl/connector.cgi branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/perl/io.pl branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/perl/upload_fck.pl branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/perl/util.pl branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/php/basexml.php branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/php/commands.php branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/php/config.php branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/php/connector.php branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/php/io.php branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/php/util.php branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/connectors/test.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmactualfolder.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmfolders.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmresourceslist.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmresourcetype.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmupload.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/js/common.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/js/fckxml.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/_getfontformat.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/_translationstatus.txt branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ar.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/bg.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/bs.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ca.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/cs.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/da.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/de.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/el.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en-au.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en-uk.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/eo.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/es.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/et.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/eu.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fa.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fi.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fo.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fr.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/gl.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/he.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hi.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hr.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hu.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/it.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ja.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ko.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/lt.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/lv.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/mn.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ms.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/nl.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/no.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/pl.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/pt-br.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/pt.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ro.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ru.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/sk.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/sl.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/sr-latn.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/sr.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/sv.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/th.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/tr.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/uk.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/vi.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/zh-cn.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/zh.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/plugins/placeholder/fck_placeholder.html branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/plugins/placeholder/fckplugin.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/plugins/placeholder/lang/de.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/plugins/placeholder/lang/en.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/plugins/placeholder/lang/fr.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/plugins/placeholder/lang/it.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/plugins/placeholder/lang/pl.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/plugins/placeholder/placeholder.gif branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/plugins/tablecommands/fckplugin.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/skins/default/fck_dialog.css branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/skins/default/fck_editor.css branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/skins/default/images/toolbar.start.gif branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/skins/silver/fck_dialog.css branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/skins/silver/fck_editor.css branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/skins/silver/images/toolbar.buttonbg.gif branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/skins/silver/images/toolbar.start.gif branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fckeditor.js branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fckeditor.php branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fckstyles.xml branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fcktemplates.xml branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/TemplateMerge.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActions_Emails_Step1.tpl ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActions_Emails_Step1.tpl (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActions_Emails_Step1.tpl Wed Jul 12 07:45:05 2006 @@ -18,8 +18,9 @@ - - + + + @@ -36,7 +37,7 @@ From Name:* @@ -44,7 +45,7 @@ From Email Address:* @@ -52,7 +53,7 @@ Subject:* @@ -60,7 +61,7 @@ Track Email: @@ -68,7 +69,7 @@ Show Un-subscribe Link: @@ -78,12 +79,12 @@
- +
- +
- +
- +
- +
- +
- +   @@ -95,7 +96,7 @@
- +
@@ -125,7 +126,10 @@ $('from_name_text').style.border='1px solid red'; ret = false; } - return ret; + if(ret) + form.submit(); + else + return ret; } function PopulatePlainTextEmail() { @@ -136,8 +140,12 @@ $('text_mail').innerHTML = (tmp.stripTags()); }catch(e){alert(e);} } -var oFCKeditor = null; -oFCKeditor = new FCKeditor( "description" ,"100%","370") ; +function populateFckEditor(html) { + $('description___Frame').contentWindow.document.getElementById('eEditorArea').contentWindow.document.body.innerHTML=html; +} +var oFCKeditor = new FCKeditor( "description" ); +oFCKeditor.Width = "100%"; +oFCKeditor.Height = "370"; oFCKeditor.BasePath = "include/fckeditor/" ; oFCKeditor.ReplaceTextarea(); Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckevents.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckevents.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckevents.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -19,32 +19,33 @@ var FCKEvents ; -if ( !( FCKEvents = NS.FCKEvents ) ) +FCKEvents = function( eventsOwner ) { - FCKEvents = NS.FCKEvents = function( eventsOwner ) + this.Owner = eventsOwner ; + this.RegisteredEvents = new Object() ; +} + +FCKEvents.prototype.AttachEvent = function( eventName, functionPointer ) +{ + var aTargets ; + + if ( !( aTargets = this.RegisteredEvents[ eventName ] ) ) + this.RegisteredEvents[ eventName ] = [ functionPointer ] ; + else + aTargets.push( functionPointer ) ; +} + +FCKEvents.prototype.FireEvent = function( eventName, params ) +{ + var bReturnValue = true ; + + var oCalls = this.RegisteredEvents[ eventName ] ; + + if ( oCalls ) { - this.Owner = eventsOwner ; - this.RegisteredEvents = new Object() ; + for ( var i = 0 ; i < oCalls.length ; i++ ) + bReturnValue = ( oCalls[ i ]( this.Owner, params ) && bReturnValue ) ; } - FCKEvents.prototype.AttachEvent = function( eventName, functionPointer ) - { - if ( ! this.RegisteredEvents[ eventName ] ) this.RegisteredEvents[ eventName ] = new Array() ; - - this.RegisteredEvents[ eventName ][ this.RegisteredEvents[ eventName ].length ] = functionPointer ; - } - - FCKEvents.prototype.FireEvent = function( eventName, params ) - { - var bReturnValue = true ; - - var oCalls = this.RegisteredEvents[ eventName ] ; - if ( oCalls ) - { - for ( var i = 0 ; i < oCalls.length ; i++ ) - bReturnValue = ( oCalls[ i ]( this.Owner, params ) && bReturnValue ) ; - } - - return bReturnValue ; - } + return bReturnValue ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckplugin.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckplugin.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckplugin.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -16,10 +16,6 @@ * File Authors: * Frederico Caldeira Knabben (fredck at fckeditor.net) */ - -// Certifies that the "PluginsPath" configuration ends with a slash. -if ( !FCKConfig.PluginsPath.endsWith('/') ) - FCKConfig.PluginsPath += '/' ; var FCKPlugin = function( name, availableLangs, basePath ) { @@ -48,9 +44,9 @@ sLang = this.AvailableLangs[0] ; // Add the main plugin script. - FCKScriptLoader.AddScript( this.Path + 'lang/' + sLang + '.js' ) ; + LoadScript( this.Path + 'lang/' + sLang + '.js' ) ; } // Add the main plugin script. - FCKScriptLoader.AddScript( this.Path + 'fckplugin.js' ) ; + LoadScript( this.Path + 'fckplugin.js' ) ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckspecialcombo.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckspecialcombo.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckspecialcombo.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -32,16 +32,19 @@ this.Items = new Object() ; - this._Panel = new FCKPanel( parentWindow ) ; - this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_contextmenu.css' ) ; - this._PanelBox = this._Panel.PanelDiv.appendChild( this._Panel.Document.createElement( 'DIV' ) ) ; + this._Panel = new FCKPanel( parentWindow || window, true ) ; + this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ; + this._PanelBox = this._Panel.MainNode.appendChild( this._Panel.Document.createElement( 'DIV' ) ) ; this._PanelBox.className = 'SC_Panel' ; this._PanelBox.style.width = this.PanelWidth + 'px' ; this._PanelBox.innerHTML = '
' ; this._ItemsHolderEl = this._PanelBox.getElementsByTagName('TD')[0] ; - + + if ( FCK.IECleanup ) + FCK.IECleanup.AddItem( this, FCKSpecialCombo_Cleanup ) ; + // this._Panel.StyleSheet = FCKConfig.SkinPath + 'fck_contextmenu.css' ; // this._Panel.Create() ; // this._Panel.PanelDiv.className += ' SC_Panel' ; @@ -61,6 +64,8 @@ function FCKSpecialCombo_ItemOnClick() { + this.className = this.originalClass ; + this.FCKSpecialCombo._Panel.Hide() ; this.FCKSpecialCombo.SetLabel( this.FCKItemLabel ) ; @@ -69,16 +74,23 @@ this.FCKSpecialCombo.OnSelect( this.FCKItemID, this ) ; } -FCKSpecialCombo.prototype.AddItem = function( id, html, label ) +FCKSpecialCombo.prototype.AddItem = function( id, html, label, bgColor ) { //
Bold 1
var oDiv = this._ItemsHolderEl.appendChild( this._Panel.Document.createElement( 'DIV' ) ) ; oDiv.className = oDiv.originalClass = 'SC_Item' ; oDiv.innerHTML = html ; oDiv.FCKItemID = id ; - oDiv.FCKItemLabel = label ? label : id ; + oDiv.FCKItemLabel = label || id ; oDiv.FCKSpecialCombo = this ; oDiv.Selected = false ; + + // In IE, the width must be set so the borders are shown correctly when the content overflows. + if ( FCKBrowserInfo.IsIE ) + oDiv.style.width = '100%' ; + + if ( bgColor ) + oDiv.style.backgroundColor = bgColor ; oDiv.onmouseover = FCKSpecialCombo_ItemOnMouseOver ; oDiv.onmouseout = FCKSpecialCombo_ItemOnMouseOut ; @@ -155,11 +167,11 @@ FCKSpecialCombo.prototype.Create = function( targetElement ) { - this._OuterTable = targetElement.appendChild( document.createElement( 'TABLE' ) ) ; - this._OuterTable.cellPadding = 0 ; - this._OuterTable.cellSpacing = 0 ; - - this._OuterTable.insertRow(-1) ; + var eOuterTable = this._OuterTable = targetElement.appendChild( targetElement.ownerDocument.createElement( 'TABLE' ) ) ; + eOuterTable.cellPadding = 0 ; + eOuterTable.cellSpacing = 0 ; + + eOuterTable.insertRow(-1) ; var sClass ; var bShowLabel ; @@ -181,34 +193,37 @@ if ( this.Caption && this.Caption.length > 0 && bShowLabel ) { - var oCaptionCell = this._OuterTable.rows[0].insertCell(-1) ; + var oCaptionCell = eOuterTable.rows[0].insertCell(-1) ; oCaptionCell.innerHTML = this.Caption ; oCaptionCell.className = 'SC_FieldCaption' ; } // Create the main DIV element. - var oField = this._OuterTable.rows[0].insertCell(-1).appendChild( document.createElement( 'DIV' ) ) ; + var oField = eOuterTable.rows[0].insertCell(-1).appendChild( targetElement.ownerDocument.createElement( 'DIV' ) ) ; if ( bShowLabel ) { oField.className = 'SC_Field' ; oField.style.width = this.FieldWidth + 'px' ; oField.innerHTML = '
 
' ; - this._LabelEl = oField.getElementsByTagName('label')[0] ; + this._LabelEl = oField.getElementsByTagName('label')[0] ; // Memory Leak this._LabelEl.innerHTML = this.Label ; } else { oField.className = 'TB_Button_Off' ; //oField.innerHTML = '' + this.Caption + '
 
' ; - oField.innerHTML = '
 
' ; + //oField.innerHTML = '
 
' ; // Gets the correct CSS class to use for the specified style (param). - oField.innerHTML ='' + + oField.innerHTML = '
' + '' + //'' + + '' + '' + + '' + '' + + '' + '' + '
' + this.Caption + '
' ; } @@ -225,6 +240,20 @@ FCKTools.DisableSelection( this._Panel.Document.body ) ; } +function FCKSpecialCombo_Cleanup() +{ + this._LabelEl = null ; + this._OuterTable = null ; + this._ItemsHolderEl = null ; + this._PanelBox = null ; + + if ( this.Items ) + { + for ( var key in this.Items ) + this.Items[key] = null ; + } +} + function FCKSpecialCombo_OnMouseOver() { if ( this.SpecialCombo.Enabled ) @@ -232,10 +261,10 @@ switch ( this.SpecialCombo.Style ) { case FCK_TOOLBARITEM_ONLYICON : - this.className = 'TB_Button_On'; + this.className = 'TB_Button_On_Over'; break ; case FCK_TOOLBARITEM_ONLYTEXT : - this.className = 'TB_Button_On'; + this.className = 'TB_Button_On_Over'; break ; case FCK_TOOLBARITEM_ICONTEXT : this.className = 'SC_Field SC_FieldOver' ; @@ -283,23 +312,26 @@ oSpecialCombo.OnBeforeClick( oSpecialCombo ) ; // This is a tricky thing. We must call the "Load" function, otherwise - // it will not be possible to retrieve "oItemsHolder.offsetHeight". - oPanel.Load( 0, this.offsetHeight, this ) ; + // it will not be possible to retrieve "oItemsHolder.offsetHeight" (IE only). + if ( FCKBrowserInfo.IsIE ) + oPanel.Preload( 0, this.offsetHeight, this ) ; if ( oItemsHolder.offsetHeight > iMaxHeight ) +// { oPanelBox.style.height = iMaxHeight + 'px' ; + +// if ( FCKBrowserInfo.IsGecko ) +// oPanelBox.style.overflow = '-moz-scrollbars-vertical' ; +// } else - oPanelBox.style.height = oItemsHolder.offsetHeight + 'px' ; + oPanelBox.style.height = '' ; // oPanel.PanelDiv.style.width = oSpecialCombo.PanelWidth + 'px' ; - - if ( FCKBrowserInfo.IsGecko ) - oPanelBox.style.overflow = '-moz-scrollbars-vertical' ; oPanel.Show( 0, this.offsetHeight, this ) ; } - return false ; +// return false ; } /* Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -11,7 +11,7 @@ * "Support Open Source software. What about a donation today?" * * File Name: fckstyledef.js - * FCKStyleDef Class: represents a single stylke definition. + * FCKStyleDef Class: represents a single style definition. * * File Authors: * Frederico Caldeira Knabben (fredck at fckeditor.net) @@ -49,7 +49,7 @@ FCKStyleDef.prototype.RemoveFromSelection = function() { if ( FCKSelection.GetType() == 'Control' ) - this._RemoveMe( FCKSelection.GetSelectedElement() ) ; + this._RemoveMe( FCK.ToolbarSet.CurrentInstance.Selection.GetSelectedElement() ) ; else - this._RemoveMe( FCKSelection.GetParentElement() ) ; + this._RemoveMe( FCK.ToolbarSet.CurrentInstance.Selection.GetParentElement() ) ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef_gecko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef_gecko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef_gecko.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -21,10 +21,10 @@ { if ( FCKSelection.GetType() == 'Text' && !this.IsObjectElement ) { - var oSelection = FCK.EditorWindow.getSelection() ; + var oSelection = FCK.ToolbarSet.CurrentInstance.EditorWindow.getSelection() ; // Create the main element. - var e = FCK.EditorDocument.createElement( this.Element ) ; + var e = FCK.ToolbarSet.CurrentInstance.EditorDocument.createElement( this.Element ) ; for ( var i = 0 ; i < oSelection.rangeCount ; i++ ) { @@ -42,7 +42,7 @@ } else { - var oControl = FCKSelection.GetSelectedElement() ; + var oControl = FCK.ToolbarSet.CurrentInstance.Selection.GetSelectedElement() ; if ( oControl.tagName == this.Element ) this._AddAttributes( oControl ) ; } @@ -51,7 +51,16 @@ FCKStyleDef.prototype._AddAttributes = function( targetElement ) { for ( var a in this.Attributes ) - targetElement.setAttribute( a, this.Attributes[a], 0 ) ; + { + switch ( a.toLowerCase() ) + { + case 'src' : + targetElement.setAttribute( '_fcksavedurl', this.Attributes[a], 0 ) ; + + default : + targetElement.setAttribute( a, this.Attributes[a], 0 ) ; + } + } } FCKStyleDef.prototype._RemoveDuplicates = function( parent ) Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstyledef_ie.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -19,7 +19,7 @@ FCKStyleDef.prototype.ApplyToSelection = function() { - var oSelection = FCK.EditorDocument.selection ; + var oSelection = FCK.ToolbarSet.CurrentInstance.EditorDocument.selection ; if ( oSelection.type == 'Text' ) { @@ -40,7 +40,7 @@ } else if ( oSelection.type == 'Control' ) { - var oControl = FCKSelection.GetSelectedElement() ; + var oControl = FCK.ToolbarSet.CurrentInstance.Selection.GetSelectedElement() ; if ( oControl.tagName == this.Element ) this._AddAttributes( oControl ) ; } @@ -55,11 +55,14 @@ case 'style' : targetElement.style.cssText = this.Attributes[a] ; break ; - + case 'class' : targetElement.setAttribute( 'className', this.Attributes[a], 0 ) ; break ; - + + case 'src' : + targetElement.setAttribute( '_fcksavedurl', this.Attributes[a], 0 ) ; + default : targetElement.setAttribute( a, this.Attributes[a], 0 ) ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstylesloader.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstylesloader.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckstylesloader.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbar.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbar.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbar.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -11,8 +11,8 @@ * "Support Open Source software. What about a donation today?" * * File Name: fcktoolbar.js - * FCKToolbar Class: represents a toolbar. A toolbar is not the complete - * toolbar set visible, but just a strip on it... a group of items. + * FCKToolbar Class: represents a toolbar in the toolbarset. It is a group of + * toolbar items. * * File Authors: * Frederico Caldeira Knabben (fredck at fckeditor.net) @@ -21,41 +21,96 @@ var FCKToolbar = function() { this.Items = new Array() ; - - var e = this.DOMTable = document.createElement( 'table' ) ; - e.className = 'TB_Toolbar' ; - // Sets the toolbar direction. IE uses "styleFloat" and Gecko uses "cssFloat". - e.style.styleFloat = e.style.cssFloat = FCKLang.Dir == 'rtl' ? 'right' : 'left' ; - - e.cellPadding = 0 ; - e.cellSpacing = 0 ; - e.border = 0 ; - - this.DOMRow = e.insertRow(-1) ; - - var oCell = this.DOMRow.insertCell(-1) ; - oCell.className = 'TB_Start' ; - oCell.innerHTML = '' ; - - FCKToolbarSet.DOMElement.appendChild( e ) ; + if ( FCK.IECleanup ) + FCK.IECleanup.AddItem( this, FCKToolbar_Cleanup ) ; } -FCKToolbar.prototype.AddItem = function( toolbarItem ) +FCKToolbar.prototype.AddItem = function( item ) { - this.Items[ this.Items.length ] = toolbarItem ; - toolbarItem.CreateInstance( this ) ; + return this.Items[ this.Items.length ] = item ; +} + +FCKToolbar.prototype.AddButton = function( name, label, tooltip, iconPathOrStripInfoArrayOrIndex, style, state ) +{ + if ( typeof( iconPathOrStripInfoArrayOrIndex ) == 'number' ) + iconPathOrStripInfoArrayOrIndex = [ this.DefaultIconsStrip, this.DefaultIconSize, iconPathOrStripInfoArrayOrIndex ] ; + + var oButton = new FCKToolbarButtonUI( name, label, tooltip, iconPathOrStripInfoArrayOrIndex, style, state ) ; + oButton._FCKToolbar = this ; + oButton.OnClick = FCKToolbar_OnItemClick ; + + return this.AddItem( oButton ) ; +} + +function FCKToolbar_OnItemClick( item ) +{ + var oToolbar = item._FCKToolbar ; + + if ( oToolbar.OnItemClick ) + oToolbar.OnItemClick( oToolbar, item ) ; } FCKToolbar.prototype.AddSeparator = function() { - var oCell = this.DOMRow.insertCell(-1) ; - oCell.innerHTML = '' ; + this.AddItem( new FCKToolbarSeparator() ) ; } -FCKToolbar.prototype.AddTerminator = function() +FCKToolbar.prototype.Create = function( parentElement ) { - var oCell = this.DOMRow.insertCell(-1) ; - oCell.className = 'TB_End' ; - oCell.innerHTML = '' ; + if ( this.MainElement ) + { +// this._Cleanup() ; + if ( this.MainElement.parentNode ) + this.MainElement.parentNode.removeChild( this.MainElement ) ; + this.MainElement = null ; + } + + var oDoc = parentElement.ownerDocument ; // This is IE 6+ + + var e = this.MainElement = oDoc.createElement( 'table' ) ; + e.className = 'TB_Toolbar' ; + e.style.styleFloat = e.style.cssFloat = ( FCKLang.Dir == 'ltr' ? 'left' : 'right' ) ; + e.dir = FCKLang.Dir ; + e.cellPadding = 0 ; + e.cellSpacing = 0 ; + + this.RowElement = e.insertRow(-1) ; + + // Insert the start cell. + var eCell ; + + if ( !this.HideStart ) + { + eCell = this.RowElement.insertCell(-1) ; + eCell.appendChild( oDoc.createElement( 'div' ) ).className = 'TB_Start' ; + } + + for ( var i = 0 ; i < this.Items.length ; i++ ) + { + this.Items[i].Create( this.RowElement.insertCell(-1) ) ; + } + + // Insert the ending cell. + if ( !this.HideEnd ) + { + eCell = this.RowElement.insertCell(-1) ; + eCell.appendChild( oDoc.createElement( 'div' ) ).className = 'TB_End' ; + } + + parentElement.appendChild( e ) ; } + +function FCKToolbar_Cleanup() +{ + this.MainElement = null ; + this.RowElement = null ; +} + +var FCKToolbarSeparator = function() +{} + +FCKToolbarSeparator.prototype.Create = function( parentElement ) +{ + parentElement.appendChild( parentElement.ownerDocument.createElement( 'div' ) ).className = 'TB_Separator' ; +} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -12,7 +12,7 @@ * * File Name: fcktoolbarbreak_gecko.js * FCKToolbarBreak Class: breaks the toolbars. - * It makes it possible to force the toolbar to brak to a new line. + * It makes it possible to force the toolbar to break to a new line. * This is the Gecko specific implementation. * * File Authors: @@ -20,10 +20,13 @@ */ var FCKToolbarBreak = function() +{} + +FCKToolbarBreak.prototype.Create = function( targetElement ) { - var oBreakDiv = document.createElement( 'div' ) ; + var oBreakDiv = targetElement.ownerDocument.createElement( 'div' ) ; oBreakDiv.style.clear = oBreakDiv.style.cssFloat = FCKLang.Dir == 'rtl' ? 'right' : 'left' ; - FCKToolbarSet.DOMElement.appendChild( oBreakDiv ) ; + targetElement.appendChild( oBreakDiv ) ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -20,12 +20,15 @@ */ var FCKToolbarBreak = function() +{} + +FCKToolbarBreak.prototype.Create = function( targetElement ) { - var oBreakDiv = document.createElement( 'div' ) ; + var oBreakDiv = targetElement.ownerDocument.createElement( 'div' ) ; oBreakDiv.className = 'TB_Break' ; oBreakDiv.style.clear = FCKLang.Dir == 'rtl' ? 'left' : 'right' ; - FCKToolbarSet.DOMElement.appendChild( oBreakDiv ) ; + targetElement.appendChild( oBreakDiv ) ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbutton.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbutton.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarbutton.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -17,120 +17,45 @@ * Frederico Caldeira Knabben (fredck at fckeditor.net) */ -var FCKToolbarButton = function( commandName, label, tooltip, style, sourceView, contextSensitive ) +var FCKToolbarButton = function( commandName, label, tooltip, style, sourceView, contextSensitive, icon ) { - this.Command = FCKCommands.GetCommand( commandName ) ; - this.Label = label ? label : commandName ; - this.Tooltip = tooltip ? tooltip : ( label ? label : commandName) ; - this.Style = style ? style : FCK_TOOLBARITEM_ONLYICON ; + this.CommandName = commandName ; + this.Label = label ; + this.Tooltip = tooltip ; + this.Style = style ; this.SourceView = sourceView ? true : false ; - this.ContextSensitive = contextSensitive ? true : false ; - this.IconPath = FCKConfig.SkinPath + 'toolbar/' + commandName.toLowerCase() + '.gif' ; - this.State = FCK_UNKNOWN ; + this.ContextSensitive = contextSensitive ? true : false ; + + if ( icon == null ) + this.IconPath = FCKConfig.SkinPath + 'toolbar/' + commandName.toLowerCase() + '.gif' ; + else if ( typeof( icon ) == 'number' ) + this.IconPath = [ FCKConfig.SkinPath + 'fck_strip.gif', 16, icon ] ; } -FCKToolbarButton.prototype.CreateInstance = function( parentToolbar ) +FCKToolbarButton.prototype.Create = function( targetElement ) { - this.DOMDiv = document.createElement( 'div' ) ; - this.DOMDiv.className = 'TB_Button_Off' ; - - this.DOMDiv.FCKToolbarButton = this ; - - var sHtml = - '' + - '' ; - - if ( this.Style != FCK_TOOLBARITEM_ONLYTEXT ) - sHtml += '' ; - - if ( this.Style != FCK_TOOLBARITEM_ONLYICON ) - sHtml += '' ; - - sHtml += - '' + - '
' + this.Label + '
' ; - - this.DOMDiv.innerHTML = sHtml ; - - var oCell = parentToolbar.DOMRow.insertCell(-1) ; - oCell.appendChild( this.DOMDiv ) ; - - this.RefreshState() ; + this._UIButton = new FCKToolbarButtonUI( this.CommandName, this.Label, this.Tooltip, this.IconPath, this.Style ) ; + this._UIButton.OnClick = this.Click ; + this._UIButton._ToolbarButton = this ; + this._UIButton.Create( targetElement ) ; } FCKToolbarButton.prototype.RefreshState = function() { -/* - TODO: Delete this comment block on stable version. // Gets the actual state. -// var eState ; - -// if ( FCK.EditMode == FCK_EDITMODE_SOURCE && ! this.SourceView ) -// eState = FCK_TRISTATE_DISABLED ; -// else -*/ - // Gets the actual state. - var eState = this.Command.GetState() ; + var eState = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).GetState() ; // If there are no state changes than do nothing and return. - if ( eState == this.State ) return ; + if ( eState == this._UIButton.State ) return ; // Sets the actual state. - this.State = eState ; - - switch ( this.State ) - { - case FCK_TRISTATE_ON : - this.DOMDiv.className = 'TB_Button_On' ; - - this.DOMDiv.onmouseover = FCKToolbarButton_OnMouseOnOver ; - this.DOMDiv.onmouseout = FCKToolbarButton_OnMouseOnOut ; - this.DOMDiv.onclick = FCKToolbarButton_OnClick ; - - break ; - case FCK_TRISTATE_OFF : - this.DOMDiv.className = 'TB_Button_Off' ; - - this.DOMDiv.onmouseover = FCKToolbarButton_OnMouseOffOver ; - this.DOMDiv.onmouseout = FCKToolbarButton_OnMouseOffOut ; - this.DOMDiv.onclick = FCKToolbarButton_OnClick ; - - break ; - default : - this.Disable() ; - break ; - } -} - -function FCKToolbarButton_OnMouseOnOver() -{ - this.className = 'TB_Button_On TB_Button_On_Over' ; -} - -function FCKToolbarButton_OnMouseOnOut() -{ - this.className = 'TB_Button_On' ; -} - -function FCKToolbarButton_OnMouseOffOver() -{ - this.className = 'TB_Button_On TB_Button_Off_Over' ; -} - -function FCKToolbarButton_OnMouseOffOut() -{ - this.className = 'TB_Button_Off' ; -} - -function FCKToolbarButton_OnClick(e) -{ - this.FCKToolbarButton.Click(e) ; - return false ; + this._UIButton.ChangeState( eState ) ; } FCKToolbarButton.prototype.Click = function() { - this.Command.Execute() ; + var oToolbarButton = this._ToolbarButton || this ; + FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( oToolbarButton.CommandName ).Execute() ; } FCKToolbarButton.prototype.Enable = function() @@ -140,9 +65,6 @@ FCKToolbarButton.prototype.Disable = function() { - this.State = FCK_TRISTATE_DISABLED ; - this.DOMDiv.className = 'TB_Button_Disabled' ; - this.DOMDiv.onmouseover = null ; - this.DOMDiv.onmouseout = null ; - this.DOMDiv.onclick = null ; + // Sets the actual state. + this._UIButton.ChangeState( FCK_TRISTATE_DISABLED ) ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -19,7 +19,7 @@ var FCKToolbarFontFormatCombo = function( tooltip, style ) { - this.Command = FCKCommands.GetCommand( 'FontFormat' ) ; + this.CommandName = 'FontFormat' ; this.Label = this.GetLabel() ; this.Tooltip = tooltip ? tooltip : this.Label ; this.Style = style ? style : FCK_TOOLBARITEM_ICONTEXT ; @@ -31,6 +31,7 @@ // Inherit from FCKToolbarSpecialCombo. FCKToolbarFontFormatCombo.prototype = new FCKToolbarSpecialCombo ; + FCKToolbarFontFormatCombo.prototype.GetLabel = function() { Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -19,7 +19,7 @@ var FCKToolbarFontsCombo = function( tooltip, style ) { - this.Command = FCKCommands.GetCommand( 'FontName' ) ; + this.CommandName = 'FontName' ; this.Label = this.GetLabel() ; this.Tooltip = tooltip ? tooltip : this.Label ; this.Style = style ? style : FCK_TOOLBARITEM_ICONTEXT ; @@ -27,6 +27,7 @@ // Inherit from FCKToolbarSpecialCombo. FCKToolbarFontsCombo.prototype = new FCKToolbarSpecialCombo ; + FCKToolbarFontsCombo.prototype.GetLabel = function() { Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -19,7 +19,7 @@ var FCKToolbarFontSizeCombo = function( tooltip, style ) { - this.Command = FCKCommands.GetCommand( 'FontSize' ) ; + this.CommandName = 'FontSize' ; this.Label = this.GetLabel() ; this.Tooltip = tooltip ? tooltip : this.Label ; this.Style = style ? style : FCK_TOOLBARITEM_ICONTEXT ; @@ -27,6 +27,7 @@ // Inherit from FCKToolbarSpecialCombo. FCKToolbarFontSizeCombo.prototype = new FCKToolbarSpecialCombo ; + FCKToolbarFontSizeCombo.prototype.GetLabel = function() { Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -18,67 +18,70 @@ * Frederico Caldeira Knabben (fredck at fckeditor.net) */ -var FCKToolbarPanelButton = function( commandName, label, tooltip, style ) +var FCKToolbarPanelButton = function( commandName, label, tooltip, style, icon ) { - this.Command = FCKCommands.GetCommand( commandName ) ; - this.Label = label ? label : commandName ; - this.Tooltip = tooltip ? tooltip : ( label ? label : commandName) ; - this.Style = style ? style : FCK_TOOLBARITEM_ONLYICON ; - this.State = FCK_UNKNOWN ; - this.IconPath = FCKConfig.SkinPath + 'toolbar/' + commandName.toLowerCase() + '.gif' ; + this.CommandName = commandName ; + + var oIcon ; + + if ( icon == null ) + oIcon = FCKConfig.SkinPath + 'toolbar/' + commandName.toLowerCase() + '.gif' ; + else if ( typeof( icon ) == 'number' ) + oIcon = [ FCKConfig.SkinPath + 'fck_strip.gif', 16, icon ] ; + + var oUIButton = this._UIButton = new FCKToolbarButtonUI( commandName, label, tooltip, oIcon, style ) ; + oUIButton._FCKToolbarPanelButton = this ; + oUIButton.ShowArrow = true ; + oUIButton.OnClick = FCKToolbarPanelButton_OnButtonClick ; } -FCKToolbarPanelButton.prototype.Click = function(e) +FCKToolbarPanelButton.prototype.TypeName = 'FCKToolbarPanelButton' ; + +FCKToolbarPanelButton.prototype.Create = function( parentElement ) { - // For Mozilla we must stop the event propagation to avoid it hiding - // the panel because of a click outside of it. -// if ( e ) -// { -// e.stopPropagation() ; -// FCKPanelEventHandlers.OnDocumentClick( e ) ; -// } + parentElement.className += 'Menu' ; - if ( this.State != FCK_TRISTATE_DISABLED ) - { - this.Command.Execute(0, this.DOMDiv.offsetHeight, this.DOMDiv) ; -// this.FCKToolbarButton.HandleOnClick( this, e ) ; - } - - return false ; + this._UIButton.Create( parentElement ) ; + + var oPanel = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName )._Panel ; + oPanel._FCKToolbarPanelButton = this ; + + var eLineDiv = oPanel.Document.body.appendChild( oPanel.Document.createElement( 'div' ) ) ; + eLineDiv.style.position = 'absolute' ; + eLineDiv.style.top = '0px' ; + + var eLine = this.LineImg = eLineDiv.appendChild( oPanel.Document.createElement( 'IMG' ) ) ; + eLine.className = 'TB_ConnectionLine' ; +// eLine.style.backgroundColor = 'Red' ; + eLine.src = FCK_SPACER_PATH ; + + oPanel.OnHide = FCKToolbarPanelButton_OnPanelHide ; } -FCKToolbarPanelButton.prototype.CreateInstance = function( parentToolbar ) +/* + Events +*/ + +function FCKToolbarPanelButton_OnButtonClick( toolbarButton ) { - this.DOMDiv = document.createElement( 'div' ) ; - this.DOMDiv.className = 'TB_Button_Off' ; + var oButton = this._FCKToolbarPanelButton ; + var e = oButton._UIButton.MainElement ; + + oButton._UIButton.ChangeState( FCK_TRISTATE_ON ) ; + + oButton.LineImg.style.width = ( e.offsetWidth - 2 ) + 'px' ; - this.DOMDiv.FCKToolbarButton = this ; - - var sHtml = - '' + - '' ; - - if ( this.Style != FCK_TOOLBARITEM_ONLYTEXT ) - sHtml += '' ; - - if ( this.Style != FCK_TOOLBARITEM_ONLYICON ) - sHtml += '' ; - - sHtml += - '' + - '' + - '
' + this.Label + '
' ; - - this.DOMDiv.innerHTML = sHtml ; + FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( oButton.CommandName ).Execute( 0, e.offsetHeight - 1, e ) ; // -1 to be over the border +} - var oCell = parentToolbar.DOMRow.insertCell(-1) ; - oCell.appendChild( this.DOMDiv ) ; - - this.RefreshState() ; +function FCKToolbarPanelButton_OnPanelHide() +{ + var oMenuButton = this._FCKToolbarPanelButton ; + oMenuButton._UIButton.ChangeState( FCK_TRISTATE_OFF ) ; } // The Panel Button works like a normal button so the refresh state functions // defined for the normal button can be reused here. FCKToolbarPanelButton.prototype.RefreshState = FCKToolbarButton.prototype.RefreshState ; FCKToolbarPanelButton.prototype.Enable = FCKToolbarButton.prototype.Enable ; -FCKToolbarPanelButton.prototype.Disable = FCKToolbarButton.prototype.Disable ; +FCKToolbarPanelButton.prototype.Disable = FCKToolbarButton.prototype.Disable ; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -16,7 +16,7 @@ * * The following properties and methods must be implemented when inheriting from * this class: - * - Property: Command [ The command to be executed ] + * - Property: CommandName [ The command name to be executed ] * - Method: GetLabel() [ Returns the label ] * - CreateItems( targetSpecialCombo ) [ Add all items in the special combo ] * @@ -30,14 +30,15 @@ this.ContextSensitive = true ; } + function FCKToolbarSpecialCombo_OnSelect( itemId, item ) { - this.Command.Execute( itemId, item ) ; + FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).Execute( itemId, item ) ; } -FCKToolbarSpecialCombo.prototype.CreateInstance = function( parentToolbar ) +FCKToolbarSpecialCombo.prototype.Create = function( targetElement ) { - this._Combo = new FCKSpecialCombo( this.GetLabel(), this.FieldWidth, this.PanelWidth, this.PanelMaxHeight ) ; + this._Combo = new FCKSpecialCombo( this.GetLabel(), this.FieldWidth, this.PanelWidth, this.PanelMaxHeight, FCKBrowserInfo.IsIE ? window : FCKTools.GetElementWindow( targetElement ).parent ) ; /* this._Combo.FieldWidth = this.FieldWidth != null ? this.FieldWidth : 100 ; @@ -52,9 +53,9 @@ this.CreateItems( this._Combo ) ; - this._Combo.Create( parentToolbar.DOMRow.insertCell(-1) ) ; + this._Combo.Create( targetElement ) ; - this._Combo.Command = this.Command ; + this._Combo.CommandName = this.CommandName ; this._Combo.OnSelect = FCKToolbarSpecialCombo_OnSelect ; } @@ -75,7 +76,9 @@ // eState = FCK_TRISTATE_DISABLED ; // else // { - var sValue = this.Command.GetState() ; + var sValue = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).GetState() ; + +// FCKDebug.Output( 'RefreshState of Special Combo "' + this.TypeOf + '" - State: ' + sValue ) ; if ( sValue != FCK_TRISTATE_DISABLED ) { @@ -85,12 +88,11 @@ this.RefreshActiveItems( this._Combo, sValue ) ; else { - if ( this._LastValue == sValue ) - return ; - - this._LastValue = sValue ; - - FCKToolbarSpecialCombo_RefreshActiveItems( this._Combo, sValue ) ; + if ( this._LastValue != sValue ) + { + this._LastValue = sValue ; + FCKToolbarSpecialCombo_RefreshActiveItems( this._Combo, sValue ) ; + } } } else Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -19,7 +19,7 @@ var FCKToolbarStyleCombo = function( tooltip, style ) { - this.Command = FCKCommands.GetCommand( 'Style' ) ; + this.CommandName = 'Style' ; this.Label = this.GetLabel() ; this.Tooltip = tooltip ? tooltip : this.Label ; this.Style = style ? style : FCK_TOOLBARITEM_ICONTEXT ; @@ -28,6 +28,7 @@ // Inherit from FCKToolbarSpecialCombo. FCKToolbarStyleCombo.prototype = new FCKToolbarSpecialCombo ; + FCKToolbarStyleCombo.prototype.GetLabel = function() { return FCKLang.Style ; @@ -35,19 +36,24 @@ FCKToolbarStyleCombo.prototype.CreateItems = function( targetSpecialCombo ) { + var oTargetDoc = targetSpecialCombo._Panel.Document ; + // Add the Editor Area CSS to the Styles panel so the style classes are previewed correctly. - FCKTools.AppendStyleSheet( targetSpecialCombo._Panel.Document, FCKConfig.EditorAreaCSS ) ; + var aCSSs = FCKConfig.EditorAreaCSS ; + for ( var i = 0 ; i < aCSSs.length ; i++ ) + FCKTools.AppendStyleSheet( oTargetDoc, aCSSs[i] ) ; - targetSpecialCombo._Panel.Document.body.className += ' ForceBaseFont' ; + oTargetDoc.body.className += ' ForceBaseFont' ; // For some reason Gecko is blocking inside the "RefreshVisibleItems" function. if ( ! FCKBrowserInfo.IsGecko ) targetSpecialCombo.OnBeforeClick = this.RefreshVisibleItems ; // Add the styles to the special combo. - for ( var s in this.Command.Styles ) + var aCommandStyles = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).Styles ; + for ( var s in aCommandStyles ) { - var oStyle = this.Command.Styles[s] ; + var oStyle = aCommandStyles[s] ; var oItem ; if ( oStyle.IsObjectElement ) @@ -65,7 +71,7 @@ targetSpecialCombo.DeselectAll() ; // Get the active styles. - var aStyles = this.Command.GetActiveStyles() ; + var aStyles = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).GetActiveStyles() ; if ( aStyles.length > 0 ) { Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckxml_gecko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckxml_gecko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckxml_gecko.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -17,55 +17,50 @@ * Frederico Caldeira Knabben (fredck at fckeditor.net) */ -var FCKXml ; +var FCKXml = function() +{} -if ( !( FCKXml = NS.FCKXml ) ) +FCKXml.prototype.LoadUrl = function( urlToCall ) { - FCKXml = NS.FCKXml = function() - {} + var oFCKXml = this ; - FCKXml.prototype.LoadUrl = function( urlToCall ) + var oXmlHttp = FCKTools.CreateXmlObject( 'XmlHttp' ) ; + oXmlHttp.open( "GET", urlToCall, false ) ; + oXmlHttp.send( null ) ; + + if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 ) + this.DOMDocument = oXmlHttp.responseXML ; + else if ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) + this.DOMDocument = oXmlHttp.responseXML ; + else + alert( 'Error loading "' + urlToCall + '"' ) ; +} + +FCKXml.prototype.SelectNodes = function( xpath, contextNode ) +{ + var aNodeArray = new Array(); + + var xPathResult = this.DOMDocument.evaluate( xpath, contextNode ? contextNode : this.DOMDocument, + this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), XPathResult.ORDERED_NODE_ITERATOR_TYPE, null) ; + if ( xPathResult ) { - var oFCKXml = this ; + var oNode = xPathResult.iterateNext() ; + while( oNode ) + { + aNodeArray[aNodeArray.length] = oNode ; + oNode = xPathResult.iterateNext(); + } + } + return aNodeArray ; +} - var oXmlHttp = FCKTools.CreateXmlObject( 'XmlHttp' ) ; - oXmlHttp.open( "GET", urlToCall, false ) ; - oXmlHttp.send( null ) ; - - if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 ) - this.DOMDocument = oXmlHttp.responseXML ; - else if ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) - this.DOMDocument = oXmlHttp.responseXML ; - else - alert( 'Error loading "' + urlToCall + '"' ) ; - } +FCKXml.prototype.SelectSingleNode = function( xpath, contextNode ) +{ + var xPathResult = this.DOMDocument.evaluate( xpath, contextNode ? contextNode : this.DOMDocument, + this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), 9, null); - FCKXml.prototype.SelectNodes = function( xpath, contextNode ) - { - var aNodeArray = new Array(); - - var xPathResult = this.DOMDocument.evaluate( xpath, contextNode ? contextNode : this.DOMDocument, - this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), XPathResult.ORDERED_NODE_ITERATOR_TYPE, null) ; - if ( xPathResult ) - { - var oNode = xPathResult.iterateNext() ; - while( oNode ) - { - aNodeArray[aNodeArray.length] = oNode ; - oNode = xPathResult.iterateNext(); - } - } - return aNodeArray ; - } - - FCKXml.prototype.SelectSingleNode = function( xpath, contextNode ) - { - var xPathResult = this.DOMDocument.evaluate( xpath, contextNode ? contextNode : this.DOMDocument, - this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), 9, null); - - if ( xPathResult && xPathResult.singleNodeValue ) - return xPathResult.singleNodeValue ; - else - return null ; - } + if ( xPathResult && xPathResult.singleNodeValue ) + return xPathResult.singleNodeValue ; + else + return null ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckxml_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckxml_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/classes/fckxml_ie.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -18,66 +18,61 @@ * Frederico Caldeira Knabben (fredck at fckeditor.net) */ -var FCKXml ; +var FCKXml = function() +{ + this.Error = false ; +} -if ( !( FCKXml = NS.FCKXml ) ) +FCKXml.prototype.LoadUrl = function( urlToCall ) { - FCKXml = NS.FCKXml = function() + this.Error = false ; + + var oXmlHttp = FCKTools.CreateXmlObject( 'XmlHttp' ) ; + + if ( !oXmlHttp ) { - this.Error = false ; + this.Error = true ; + return ; } - FCKXml.prototype.LoadUrl = function( urlToCall ) + oXmlHttp.open( "GET", urlToCall, false ) ; + + oXmlHttp.send( null ) ; + + if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 ) + this.DOMDocument = oXmlHttp.responseXML ; + else if ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) { - this.Error = false ; + this.DOMDocument = FCKTools.CreateXmlObject( 'DOMDocument' ) ; + this.DOMDocument.async = false ; + this.DOMDocument.resolveExternals = false ; + this.DOMDocument.loadXML( oXmlHttp.responseText ) ; + } + else + { + this.Error = true ; + alert( 'Error loading "' + urlToCall + '"' ) ; + } +} - var oXmlHttp = FCKTools.CreateXmlObject( 'XmlHttp' ) ; +FCKXml.prototype.SelectNodes = function( xpath, contextNode ) +{ + if ( this.Error ) + return new Array() ; - if ( !oXmlHttp ) - { - this.Error = true ; - return ; - } + if ( contextNode ) + return contextNode.selectNodes( xpath ) ; + else + return this.DOMDocument.selectNodes( xpath ) ; +} - oXmlHttp.open( "GET", urlToCall, false ) ; +FCKXml.prototype.SelectSingleNode = function( xpath, contextNode ) +{ + if ( this.Error ) + return ; - oXmlHttp.send( null ) ; - - if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 ) - this.DOMDocument = oXmlHttp.responseXML ; - else if ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) - { - this.DOMDocument = FCKTools.CreateXmlObject( 'DOMDocument' ) ; - this.DOMDocument.async = false ; - this.DOMDocument.resolveExternals = false ; - this.DOMDocument.loadXML( oXmlHttp.responseText ) ; - } - else - { - this.Error = true ; - alert( 'Error loading "' + urlToCall + '"' ) ; - } - } - - FCKXml.prototype.SelectNodes = function( xpath, contextNode ) - { - if ( this.Error ) - return new Array() ; - - if ( contextNode ) - return contextNode.selectNodes( xpath ) ; - else - return this.DOMDocument.selectNodes( xpath ) ; - } - - FCKXml.prototype.SelectSingleNode = function( xpath, contextNode ) - { - if ( this.Error ) - return ; - - if ( contextNode ) - return contextNode.selectSingleNode( xpath ) ; - else - return this.DOMDocument.selectSingleNode( xpath ) ; - } + if ( contextNode ) + return contextNode.selectSingleNode( xpath ) ; + else + return this.DOMDocument.selectSingleNode( xpath ) ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fck_othercommands.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fck_othercommands.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fck_othercommands.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -197,7 +197,7 @@ FCKSourceCommand.prototype.Execute = function() { - if ( FCKBrowserInfo.IsGecko ) + if ( FCKConfig.SourcePopup ) // Until v2.2, it was mandatory for FCKBrowserInfo.IsGecko. { var iWidth = FCKConfig.ScreenWidth * 0.65 ; var iHeight = FCKConfig.ScreenHeight * 0.65 ; @@ -273,11 +273,37 @@ e.style.pageBreakAfter = 'always' ; e.innerHTML = ' ' ; - var oFakeImage = FCKDocumentProcessors_CreateFakeImage( 'FCK__PageBreak', e ) ; + var oFakeImage = FCKDocumentProcessor_CreateFakeImage( 'FCK__PageBreak', e ) ; oFakeImage = FCK.InsertElement( oFakeImage ) ; } FCKPageBreakCommand.prototype.GetState = function() { return 0 ; // FCK_TRISTATE_OFF +} + +// FCKUnlinkCommand - by Johnny Egeland (johnny at coretrek.com) +var FCKUnlinkCommand = function() +{ + this.Name = 'Unlink' ; +} + +FCKUnlinkCommand.prototype.Execute = function() +{ + if ( FCKBrowserInfo.IsGecko ) + { + var oLink = FCK.Selection.MoveToAncestorNode( 'A' ) ; + if ( oLink ) + FCK.Selection.SelectNode( oLink ) ; + } + + FCK.ExecuteNamedCommand( this.Name ) ; + + if ( FCKBrowserInfo.IsGecko ) + FCK.Selection.Collapse( true ) ; +} + +FCKUnlinkCommand.prototype.GetState = function() +{ + return FCK.GetNamedCommandState( this.Name ) ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcknamedcommand.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcknamedcommand.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcknamedcommand.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js Wed Jul 12 07:45:05 2006 @@ -1,4 +1,24 @@ -???var FCKSpellCheckCommand = function() +???/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2006 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * "Support Open Source software. What about a donation today?" + * + * File Name: fckspellcheckcommand_gecko.js + * FCKStyleCommand Class: represents the "Spell Check" command. + * (Gecko specific implementation) + * + * File Authors: + * Frederico Caldeira Knabben (fredck at fckeditor.net) + */ + +var FCKSpellCheckCommand = function() { this.Name = 'SpellCheck' ; this.IsEnabled = ( FCKConfig.SpellChecker == 'SpellerPages' ) ; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js Wed Jul 12 07:45:05 2006 @@ -1,4 +1,24 @@ -???var FCKSpellCheckCommand = function() +???/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2006 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * "Support Open Source software. What about a donation today?" + * + * File Name: fckspellcheckcommand_ie.js + * FCKStyleCommand Class: represents the "Spell Check" command. + * (IE specific implementation) + * + * File Authors: + * Frederico Caldeira Knabben (fredck at fckeditor.net) + */ + +var FCKSpellCheckCommand = function() { this.Name = 'SpellCheck' ; this.IsEnabled = ( FCKConfig.SpellChecker == 'ieSpell' || FCKConfig.SpellChecker == 'SpellerPages' ) ; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckstylecommand.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckstylecommand.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fckstylecommand.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -45,6 +45,9 @@ FCKStyleCommand.prototype.GetState = function() { + if ( !FCK.EditorDocument ) + return FCK_TRISTATE_DISABLED ; + var oSelection = FCK.EditorDocument.selection ; if ( FCKSelection.GetType() == 'Control' ) Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcktablecommand.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcktablecommand.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcktablecommand.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -25,43 +25,25 @@ this.Name = type == 'ForeColor' ? 'TextColor' : 'BGColor' ; this.Type = type ; - /* BEGIN ### - The panel should be created in the "Execute" method for best - memory use, but it not works in Gecko in that way. - */ + var oWindow ; + + if ( FCKBrowserInfo.IsIE ) + oWindow = window ; + else if ( FCK.ToolbarSet._IFrame ) + oWindow = FCKTools.GetElementWindow( FCK.ToolbarSet._IFrame ) ; + else + oWindow = window.parent ; - this._Panel = new FCKPanel() ; - this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_contextmenu.css' ) ; -// this._Panel.StyleSheet = FCKConfig.SkinPath + 'fck_contextmenu.css' ; -// this._Panel.Create() ; - - this._CreatePanelBody( this._Panel.Document, this._Panel.PanelDiv ) ; + this._Panel = new FCKPanel( oWindow, true ) ; + this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ; + this._Panel.MainNode.className = 'FCK_Panel' ; + this._CreatePanelBody( this._Panel.Document, this._Panel.MainNode ) ; FCKTools.DisableSelection( this._Panel.Document.body ) ; - - // END ### } FCKTextColorCommand.prototype.Execute = function( panelX, panelY, relElement ) { - /* - BEGIN ### - This is the right code to create the panel, but it is not - working well with Gecko, so it has been moved to the - class contructor. - - // Create the Color Panel if needed. - if ( ! this._Panel ) - { - this._Panel = new FCKPanel() ; - this._Panel.StyleSheet = FCKConfig.SkinPath + 'fck_contextmenu.css' ; - this._Panel.Create() ; - - this._CreatePanelBody( this._Panel.Document, this._Panel.PanelDiv ) ; - } - END ### - */ - // We must "cache" the actual panel type to be used in the SetColor method. FCK._ActiveColorPanelType = this.Type ; @@ -73,8 +55,16 @@ { if ( FCK._ActiveColorPanelType == 'ForeColor' ) FCK.ExecuteNamedCommand( 'ForeColor', color ) ; - else if ( FCKBrowserInfo.IsGecko ) + else if ( FCKBrowserInfo.IsGeckoLike ) + { + if ( FCKBrowserInfo.IsGecko && !FCKConfig.GeckoUseSPAN ) + FCK.EditorDocument.execCommand( 'useCSS', false, false ) ; + FCK.ExecuteNamedCommand( 'hilitecolor', color ) ; + + if ( FCKBrowserInfo.IsGecko && !FCKConfig.GeckoUseSPAN ) + FCK.EditorDocument.execCommand( 'useCSS', false, true ) ; + } else FCK.ExecuteNamedCommand( 'BackColor', color ) ; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -56,22 +56,22 @@ FCKTempBin.AddElement = function( element ) { - var iIndex = FCKTempBin.Elements.length ; - FCKTempBin.Elements[ iIndex ] = element ; + var iIndex = this.Elements.length ; + this.Elements[ iIndex ] = element ; return iIndex ; } FCKTempBin.RemoveElement = function( index ) { - var e = FCKTempBin.Elements[ index ] ; - FCKTempBin.Elements[ index ] = null ; + var e = this.Elements[ index ] ; + this.Elements[ index ] = null ; return e ; } FCKTempBin.Reset = function() { var i = 0 ; - while ( i < FCKTempBin.Elements.length ) - FCKTempBin.Elements[ i++ ] == null ; - FCKTempBin.Elements.length = 0 ; + while ( i < this.Elements.length ) + this.Elements[ i++ ] == null ; + this.Elements.length = 0 ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_1.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_1.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_1.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -22,46 +22,21 @@ FCK.Events = new FCKEvents( FCK ) ; FCK.Toolbar = null ; - -FCK.TempBaseTag = FCKConfig.BaseHref.length > 0 ? '' : '' ; +FCK.HasFocus = false ; FCK.StartEditor = function() { - // Get the editor's window and document (DOM) - this.EditorWindow = window.frames[ 'eEditorArea' ] ; - this.EditorDocument = this.EditorWindow.document ; - - // TODO: Wait stable version and remove the following commented lines. - // The Base Path of the editor is saved to rebuild relative URL (IE issue). -// this.BaseUrl = this.EditorDocument.location.protocol + '//' + this.EditorDocument.location.host ; - -// if ( FCKBrowserInfo.IsGecko ) -// this.MakeEditable() ; + FCK.TempBaseTag = FCKConfig.BaseHref.length > 0 ? '' : '' ; + + FCK.EditingArea = new FCKEditingArea( document.getElementById( 'xEditingArea' ) ) ; // Set the editor's startup contents this.SetHTML( FCKTools.GetLinkedFieldValue() ) ; - - // Save the startup value for the "IsDirty()" check. - this.ResetIsDirty() ; - - // Attach the editor to the form onsubmit event - FCKTools.AttachToLinkedFieldFormSubmit( this.UpdateLinkedField ) ; - - FCKUndo.SaveUndoStep() ; - - this.SetStatus( FCK_STATUS_ACTIVE ) ; -} - -function Window_OnFocus() -{ - FCK.Focus() ; - FCK.Events.FireEvent( "OnFocus" ) ; -} - -function Window_OnBlur() -{ - if ( !FCKDialog.IsOpened ) - return FCK.Events.FireEvent( "OnBlur" ) ; +} + +FCK.Focus = function() +{ + FCK.EditingArea.Focus() ; } FCK.SetStatus = function( newStatus ) @@ -70,110 +45,26 @@ if ( newStatus == FCK_STATUS_ACTIVE ) { - // Force the focus in the window to go to the editor. - window.frameElement.onfocus = window.document.body.onfocus = Window_OnFocus ; - window.frameElement.onblur = Window_OnBlur ; + FCKFocusManager.AddWindow( window, true ) ; + + if ( FCKBrowserInfo.IsIE ) + FCKFocusManager.AddWindow( window.frameElement, true ) ; // Force the focus in the editor. if ( FCKConfig.StartupFocus ) FCK.Focus() ; - - // @Packager.Compactor.Remove.Start - var sBrowserSuffix = FCKBrowserInfo.IsIE ? "ie" : "gecko" ; - - FCKScriptLoader.AddScript( '_source/internals/fck_2.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fck_2_' + sBrowserSuffix + '.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fckselection.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fckselection_' + sBrowserSuffix + '.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fckpanel_' + sBrowserSuffix + '.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fcktablehandler.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fcktablehandler_' + sBrowserSuffix + '.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fckxml_' + sBrowserSuffix + '.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fckstyledef.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fckstyledef_' + sBrowserSuffix + '.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fckstylesloader.js' ) ; - - FCKScriptLoader.AddScript( '_source/commandclasses/fcknamedcommand.js' ) ; - FCKScriptLoader.AddScript( '_source/commandclasses/fck_othercommands.js' ) ; - FCKScriptLoader.AddScript( '_source/commandclasses/fckspellcheckcommand_' + sBrowserSuffix + '.js' ) ; - FCKScriptLoader.AddScript( '_source/commandclasses/fcktextcolorcommand.js' ) ; - FCKScriptLoader.AddScript( '_source/commandclasses/fckpasteplaintextcommand.js' ) ; - FCKScriptLoader.AddScript( '_source/commandclasses/fckpastewordcommand.js' ) ; - FCKScriptLoader.AddScript( '_source/commandclasses/fcktablecommand.js' ) ; - FCKScriptLoader.AddScript( '_source/commandclasses/fckstylecommand.js' ) ; - - FCKScriptLoader.AddScript( '_source/internals/fckcommands.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fcktoolbarbutton.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fckspecialcombo.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fcktoolbarspecialcombo.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fcktoolbarfontscombo.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fcktoolbarfontsizecombo.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fcktoolbarfontformatcombo.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fcktoolbarstylecombo.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fcktoolbarpanelbutton.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fcktoolbaritems.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fcktoolbar.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fcktoolbarbreak_' + sBrowserSuffix + '.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fcktoolbarset.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fckdialog.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fckdialog_' + sBrowserSuffix + '.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fckcontextmenuitem.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fckcontextmenuseparator.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fckcontextmenugroup.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fckcontextmenu.js' ) ; -// FCKScriptLoader.AddScript( '_source/internals/fckcontextmenu_' + sBrowserSuffix + '.js' ) ; - FCKScriptLoader.AddScript( '_source/classes/fckplugin.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fckplugins.js' ) ; - FCKScriptLoader.AddScript( '_source/internals/fck_last.js' ) ; - // @Packager.Compactor.Remove.End - - /* @Packager.Compactor.RemoveLine - - if ( FCKBrowserInfo.IsIE ) - FCKScriptLoader.AddScript( 'js/fckeditorcode_ie_2.js' ) ; - else - FCKScriptLoader.AddScript( 'js/fckeditorcode_gecko_2.js' ) ; - - @Packager.Compactor.RemoveLine */ } this.Events.FireEvent( 'OnStatusChange', newStatus ) ; } -// Deprecated : returns the same value as GetXHTML. -FCK.GetHTML = function( format ) -{ - FCK.GetXHTML( format ) ; -/* - var sHTML ; - - if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) - { - // TODO: Wait stable version and remove the following commented lines. -// if ( FCKBrowserInfo.IsIE ) -// FCK.CheckRelativeLinks() ; - - if ( FCKBrowserInfo.IsIE ) - sHTML = this.EditorDocument.body.innerHTML.replace( FCKRegexLib.ToReplace, '$1' ) ; - else - sHTML = this.EditorDocument.body.innerHTML ; - } - else - sHTML = document.getElementById('eSourceField').value ; - - if ( format ) - return FCKCodeFormatter.Format( sHTML ) ; - else - return sHTML ; -*/ -} - -FCK.GetXHTML = function( format ) -{ - var bSource = ( FCK.EditMode == FCK_EDITMODE_SOURCE ) ; - - if ( bSource ) - this.SwitchEditMode() ; +// GetHTML is Deprecated : returns the same value as GetXHTML. +FCK.GetHTML = FCK.GetXHTML = function( format ) +{ + // We assume that if the user is in source editing, the editor value must + // represent the exact contents of the source, as the user wanted it to be. + if ( FCK.EditMode == FCK_EDITMODE_SOURCE ) + return FCK.EditingArea.Textarea.value ; var sXHTML ; @@ -187,9 +78,6 @@ sXHTML = FCKXHtml.GetXHTML( this.EditorDocument.body, false, format ) ; } - if ( bSource ) - this.SwitchEditMode() ; - if ( FCKBrowserInfo.IsIE ) sXHTML = sXHTML.replace( FCKRegexLib.ToReplace, '$1' ) ; @@ -204,22 +92,8 @@ FCK.UpdateLinkedField = function() { - // EnableXHTML has been deprecated -// if ( FCKConfig.EnableXHTML ) - FCK.LinkedField.value = FCK.GetXHTML( FCKConfig.FormatOutput ) ; -// else -// FCK.LinkedField.value = FCK.GetHTML( FCKConfig.FormatOutput ) ; - + FCK.LinkedField.value = FCK.GetXHTML( FCKConfig.FormatOutput ) ; FCK.Events.FireEvent( 'OnAfterLinkedFieldUpdate' ) ; -} - -FCK.ShowContextMenu = function( x, y ) -{ - if ( this.Status != FCK_STATUS_COMPLETE ) - return ; - - FCKContextMenu.Show( x, y ) ; - this.Events.FireEvent( "OnContextMenu" ) ; } FCK.RegisteredDoubleClickHandlers = new Object() ; @@ -239,11 +113,8 @@ FCK.OnAfterSetHTML = function() { - var oProcessor, i = 0 ; - while( ( oProcessor = FCKDocumentProcessors[i++] ) ) - oProcessor.ProcessDocument( FCK.EditorDocument ) ; - - this.Events.FireEvent( 'OnAfterSetHTML' ) ; + FCKDocumentProcessor.Process( FCK.EditorDocument ) ; + FCK.Events.FireEvent( 'OnAfterSetHTML' ) ; } // Saves URLs on links and images on special attributes, so they don't change when @@ -272,206 +143,213 @@ FCK_StartupValue = FCK.EditorDocument.body.innerHTML ; } -// Advanced document processors. - -var FCKDocumentProcessors = new Array() ; - -var FCKDocumentProcessors_CreateFakeImage = function( fakeClass, realElement ) -{ - var oImg = FCK.EditorDocument.createElement( 'IMG' ) ; - oImg.className = fakeClass ; - oImg.src = FCKConfig.FullBasePath + 'images/spacer.gif' ; - oImg.setAttribute( '_fckfakelement', 'true', 0 ) ; - oImg.setAttribute( '_fckrealelement', FCKTempBin.AddElement( realElement ), 0 ) ; - return oImg ; -} - -// Link Anchors -var FCKAnchorsProcessor = new Object() ; -FCKAnchorsProcessor.ProcessDocument = function( document ) -{ - var aLinks = document.getElementsByTagName( 'A' ) ; - - var oLink ; - var i = aLinks.length - 1 ; - while ( i >= 0 && ( oLink = aLinks[i--] ) ) - { - // If it is anchor. - if ( oLink.name.length > 0 && ( !oLink.getAttribute('href') || oLink.getAttribute('href').length == 0 ) ) +FCK.SetHTML = function( html ) +{ + this.EditingArea.Mode = FCK.EditMode ; + + if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) + { + // Firefox can't handle correctly the editing of the STRONG and EM tags. + // We must replace them with B and I. + if ( FCKBrowserInfo.IsGecko ) { - var oImg = FCKDocumentProcessors_CreateFakeImage( 'FCK__Anchor', oLink.cloneNode(true) ) ; - oImg.setAttribute( '_fckanchor', 'true', 0 ) ; + html = html.replace( FCKRegexLib.StrongOpener, '' ) ; + html = html.replace( FCKRegexLib.EmOpener, '' ) ; + } + + html = FCKConfig.ProtectedSource.Protect( html ) ; + html = FCK.ProtectUrls( html ) ; + + var sHtml ; + + if ( FCKConfig.FullPage ) + { + var sHtml ; + + if ( FCKBrowserInfo.IsIE ) + sHtml = FCK._GetBehaviorsStyle() ; + else if ( FCKConfig.ShowBorders ) + sHtml = '' ; + + sHtml += '' ; + + sHtml = html.replace( FCKRegexLib.HeadCloser, sHtml + '$&' ) ; + + // Insert the base tag (FCKConfig.BaseHref), if not exists in the source. + if ( FCK.TempBaseTag.length > 0 && !FCKRegexLib.HasBaseTag.test( html ) ) + sHtml = sHtml.replace( FCKRegexLib.HeadOpener, '$&' + FCK.TempBaseTag ) ; + } + else + { + sHtml = + FCKConfig.DocType + + '' + + this._GetEditorAreaStyleTags() + + '' ; + + if ( FCKBrowserInfo.IsIE ) + sHtml += FCK._GetBehaviorsStyle() ; + else if ( FCKConfig.ShowBorders ) + sHtml += '' ; + + sHtml += FCK.TempBaseTag ; + sHtml += '' ; + + if ( FCKBrowserInfo.IsGecko && ( html.length == 0 || FCKRegexLib.EmptyParagraph.test( html ) ) ) + sHtml += GECKO_BOGUS ; + else + sHtml += html ; + + sHtml += '' ; } - } -} - -FCKDocumentProcessors.addItem( FCKAnchorsProcessor ) ; - -// Page Breaks -var FCKPageBreaksProcessor = new Object() ; -FCKPageBreaksProcessor.ProcessDocument = function( document ) -{ - var aDIVs = document.getElementsByTagName( 'DIV' ) ; - - var eDIV ; - var i = aDIVs.length - 1 ; - while ( i >= 0 && ( eDIV = aDIVs[i--] ) ) - { - if ( eDIV.style.pageBreakAfter == 'always' && eDIV.childNodes.length == 1 && eDIV.childNodes[0].style && eDIV.childNodes[0].style.display == 'none' ) - { - var oFakeImage = FCKDocumentProcessors_CreateFakeImage( 'FCK__PageBreak', eDIV.cloneNode(true) ) ; - - eDIV.parentNode.insertBefore( oFakeImage, eDIV ) ; - eDIV.parentNode.removeChild( eDIV ) ; - } - } -/* - var aCenters = document.getElementsByTagName( 'CENTER' ) ; - - var oCenter ; - var i = aCenters.length - 1 ; - while ( i >= 0 && ( oCenter = aCenters[i--] ) ) - { - if ( oCenter.style.pageBreakAfter == 'always' && oCenter.innerHTML.trim().length == 0 ) - { - var oFakeImage = FCKDocumentProcessors_CreateFakeImage( 'FCK__PageBreak', oCenter.cloneNode(true) ) ; - - oCenter.parentNode.insertBefore( oFakeImage, oCenter ) ; - oCenter.parentNode.removeChild( oCenter ) ; - } - } -*/ -} - -FCKDocumentProcessors.addItem( FCKPageBreaksProcessor ) ; - -// Flash Embeds. -var FCKFlashProcessor = new Object() ; -FCKFlashProcessor.ProcessDocument = function( document ) -{ - /* - Sample code: - This is some sample text. You are  using FCKeditor. - */ - - var aEmbeds = document.getElementsByTagName( 'EMBED' ) ; - - var oEmbed ; - var i = aEmbeds.length - 1 ; - while ( i >= 0 && ( oEmbed = aEmbeds[i--] ) ) - { - if ( oEmbed.src.endsWith( '.swf', true ) ) - { - var oCloned = oEmbed.cloneNode( true ) ; - - // On IE, some properties are not getting clonned properly, so we - // must fix it. Thanks to Alfonso Martinez. - if ( FCKBrowserInfo.IsIE ) - { - oCloned.setAttribute( 'scale', oEmbed.getAttribute( 'scale' ) ); - oCloned.setAttribute( 'play', oEmbed.getAttribute( 'play' ) ); - oCloned.setAttribute( 'loop', oEmbed.getAttribute( 'loop' ) ); - oCloned.setAttribute( 'menu', oEmbed.getAttribute( 'menu' ) ); - } + + this.EditingArea.OnLoad = FCK_EditingArea_OnLoad ; + this.EditingArea.Start( sHtml ) ; + } + else + { + this.EditingArea.OnLoad = null ; + this.EditingArea.Start( html ) ; - var oImg = FCKDocumentProcessors_CreateFakeImage( 'FCK__Flash', oCloned ) ; - oImg.setAttribute( '_fckflash', 'true', 0 ) ; - - FCKFlashProcessor.RefreshView( oImg, oEmbed ) ; - - oEmbed.parentNode.insertBefore( oImg, oEmbed ) ; - oEmbed.parentNode.removeChild( oEmbed ) ; - -// oEmbed.setAttribute( '_fckdelete', 'true', 0) ; -// oEmbed.style.display = 'none' ; -// oEmbed.hidden = true ; - } - } -} - -FCKFlashProcessor.RefreshView = function( placholderImage, originalEmbed ) -{ - if ( originalEmbed.width > 0 ) - placholderImage.style.width = FCKTools.ConvertHtmlSizeToStyle( originalEmbed.width ) ; + // Enables the context menu in the textarea. + this.EditingArea.Textarea._FCKShowContextMenu = true ; + } +} + +function FCK_EditingArea_OnLoad() +{ + // Get the editor's window and document (DOM) + FCK.EditorWindow = FCK.EditingArea.Window ; + FCK.EditorDocument = FCK.EditingArea.Document ; + + FCK.InitializeBehaviors() ; + + FCK.OnAfterSetHTML() ; + + // Check if it is not a startup call, otherwise complete the startup. + if ( FCK.Status != FCK_STATUS_NOTLOADED ) + return ; + + // Save the startup value for the "IsDirty()" check. + FCK.ResetIsDirty() ; + + // Attach the editor to the form onsubmit event + FCKTools.AttachToLinkedFieldFormSubmit( FCK.UpdateLinkedField ) ; + + FCKUndo.SaveUndoStep() ; + + FCK.SetStatus( FCK_STATUS_ACTIVE ) ; +} + +FCK._GetEditorAreaStyleTags = function() +{ + var sTags = '' ; + var aCSSs = FCKConfig.EditorAreaCSS ; + + for ( var i = 0 ; i < aCSSs.length ; i++ ) + sTags += '' ; + + return sTags ; +} + +// # Focus Manager: Manages the focus in the editor. +var FCKFocusManager = FCK.FocusManager = new Object() ; +FCKFocusManager.IsLocked = false ; +FCK.HasFocus = false ; + +FCKFocusManager.AddWindow = function( win, sendToEditingArea ) +{ + var oTarget ; + + if ( FCKBrowserInfo.IsIE ) + oTarget = win.nodeType == 1 ? win : win.frameElement ? win.frameElement : win.document ; + else + oTarget = win.document ; + + FCKTools.AddEventListener( oTarget, 'blur', FCKFocusManager_Win_OnBlur ) ; + FCKTools.AddEventListener( oTarget, 'focus', sendToEditingArea ? FCKFocusManager_Win_OnFocus_Area : FCKFocusManager_Win_OnFocus ) ; +} + +FCKFocusManager.RemoveWindow = function( win ) +{ + if ( FCKBrowserInfo.IsIE ) + oTarget = win.nodeType == 1 ? win : win.frameElement ? win.frameElement : win.document ; + else + oTarget = win.document ; + + FCKTools.RemoveEventListener( oTarget, 'blur', FCKFocusManager_Win_OnBlur ) ; + FCKTools.RemoveEventListener( oTarget, 'focus', FCKFocusManager_Win_OnFocus_Area ) ; + FCKTools.RemoveEventListener( oTarget, 'focus', FCKFocusManager_Win_OnFocus ) ; +} + +FCKFocusManager.Lock = function() +{ + this.IsLocked = true ; +} + +FCKFocusManager.Unlock = function() +{ + if ( this._HasPendingBlur ) + FCKFocusManager._Timer = window.setTimeout( FCKFocusManager_FireOnBlur, 100 ) ; - if ( originalEmbed.height > 0 ) - placholderImage.style.height = FCKTools.ConvertHtmlSizeToStyle( originalEmbed.height ) ; -} - -FCKDocumentProcessors.addItem( FCKFlashProcessor ) ; - -FCK.GetRealElement = function( fakeElement ) -{ - var e = FCKTempBin.Elements[ fakeElement.getAttribute('_fckrealelement') ] ; - - if ( fakeElement.getAttribute('_fckflash') ) - { - if ( fakeElement.style.width.length > 0 ) - e.width = FCKTools.ConvertStyleSizeToHtml( fakeElement.style.width ) ; - - if ( fakeElement.style.height.length > 0 ) - e.height = FCKTools.ConvertStyleSizeToHtml( fakeElement.style.height ) ; - } - - return e ; -} - -// START iCM MODIFICATIONS -/* -var FCKTablesProcessor = new Object() ; -FCKTablesProcessor.ProcessDocument = function( document ) -{ - FCKTablesProcessor.CheckTablesNesting( document ) ; -} - -// Ensure that tables are not incorrectly nested within P, H1, H2, etc tags -FCKTablesProcessor.CheckTablesNesting = function( document ) -{ - var aTables = document.getElementsByTagName( "TABLE" ) ; - var oParentNode ; - - for ( var i=0; i tag for the bold, italic and underline. - FCK.EditorDocument.execCommand( 'useCSS', false, !FCKConfig.GeckoUseSPAN ) ; - - // Analysing Firefox 1.5 source code, it seams that there is support for a - // "insertBrOnReturn" command. Applying it gives no error, but it doesn't - // gives the same behavior that you have with IE. It works only if you are - // already inside a paragraph and it doesn't render correctly in the first enter. - // FCK.EditorDocument.execCommand( 'insertBrOnReturn', false, false ) ; - - // Tell Gecko (Firefox 1.5+) to enable or not live resizing of objects (by Alfonso Martinez) - FCK.EditorDocument.execCommand( 'enableObjectResizing', false, !FCKConfig.DisableImageHandles ) ; - - // Disable the standard table editing features of Firefox. - FCK.EditorDocument.execCommand( 'enableInlineTableEditing', false, !FCKConfig.DisableTableHandles ) ; - } - catch (e) {} + this.EditingArea.MakeEditable() ; } -FCK.Focus = function() +// Disable the context menu in the editor (outside the editing area). +function Document_OnContextMenu( e ) { - try - { -// window.focus() ; - FCK.EditorWindow.focus() ; - } - catch(e) {} + if ( !e.target._FCKShowContextMenu ) + e.preventDefault() ; } - -// @Packager.Compactor.Remove.Start -if ( FCKBrowserInfo.IsSafari ) -{ -FCK.SetHTML = function( html, forceWYSIWYG ) -{ - if( window.console ) window.console.log( 'FCK.SetHTML()' ) ; // @Packager.Compactor.RemoveLine - - sHtml = - FCKConfig.DocType + - '' + - '' + - '' + - '' ; - -// sHtml += FCK.TempBaseTag ; - sHtml += '' + html + '' ; - - this.EditorDocument.open() ; - this.EditorDocument.write( sHtml ) ; - this.EditorDocument.close() ; - -// this.InitializeBehaviors() ; - -// FCK.MakeEditable() ; - FCK.EditorDocument.designMode = 'on' ; - FCK.OnAfterSetHTML() ; -} -} -else -{ -// @Packager.Compactor.Remove.End -FCK.SetHTML = function( html, forceWYSIWYG ) -{ - // Firefox can't handle correctly the editing of the STRONG and EM tags. - // We must replace them with B and I. - html = html.replace( FCKRegexLib.StrongOpener, '' ) ; - html = html.replace( FCKRegexLib.EmOpener, '' ) ; - - if ( forceWYSIWYG || FCK.EditMode == FCK_EDITMODE_WYSIWYG ) - { - html = FCKConfig.ProtectedSource.Protect( html ) ; - html = FCK.ProtectUrls( html ) ; - - // Gecko has a lot of bugs mainly when handling editing features. - // To avoid an Aplication Exception (that closes the browser!) we - // must first write the contents with an empty body, and - // then insert the body contents. - // (Oh yes... it took me a lot of time to find out this workaround) - - if ( FCKConfig.FullPage && FCKRegexLib.BodyContents.test( html ) ) - { - // Add the tag to the input HTML. - if ( FCK.TempBaseTag.length > 0 && !FCKRegexLib.HasBaseTag.test( html ) ) - html = html.replace( FCKRegexLib.HeadOpener, '$&' + FCK.TempBaseTag ) ; - - html = html.replace( FCKRegexLib.HeadCloser, '' ) ; - - // Extract the BODY contents from the html. - var oMatch = html.match( FCKRegexLib.BodyContents ) ; - var sOpener = oMatch[1] ; // This is the HTML until the tag, inclusive. - var sContents = oMatch[2] ; // This is the BODY tag contents. - var sCloser = oMatch[3] ; // This is the HTML from the tag, inclusive. - - var sHtml = sOpener + ' ' + sCloser ; - -/* - if ( !this._Initialized ) - { - FCK.EditorDocument.designMode = "on" ; - - // Tell Gecko to use or not the tag for the bold, italic and underline. - FCK.EditorDocument.execCommand( "useCSS", false, !FCKConfig.GeckoUseSPAN ) ; - - this._Initialized = true ; - } -*/ - FCK.MakeEditable() ; - - this.EditorDocument.open() ; - this.EditorDocument.write( sHtml ) ; - this.EditorDocument.close() ; - - if ( this.EditorDocument.body ) - this.EditorDocument.body.innerHTML = sContents ; - else - this.EditorWindow._FCK_HTML = sContents ; - - this.InitializeBehaviors() ; - } - else - { - /* TODO: Wait stable and remove it. - sHtml = - '' + - '' + - '' + - '' + - '' ; - - sHtml += FCK.TempBaseTag ; - - sHtml += ' ' ; - */ - - if ( !this._Initialized ) - { - this.EditorDocument.dir = FCKConfig.ContentLangDirection ; - - var sHtml = - '' + - '' + - '' + - FCK.TempBaseTag ; - - this.EditorDocument.getElementsByTagName("HEAD")[0].innerHTML = sHtml ; - - this.InitializeBehaviors() ; - - this._Initialized = true ; - } - - // On Gecko we must disable editing before setting the BODY innerHTML. -// FCK.EditorDocument.designMode = 'off' ; - - if ( html.length == 0 ) - FCK.EditorDocument.body.innerHTML = GECKO_BOGUS ; - else if ( FCKRegexLib.EmptyParagraph.test( html ) ) - FCK.EditorDocument.body.innerHTML = html.replace( FCKRegexLib.TagBody, '>' + GECKO_BOGUS + '<' ) ; - else - FCK.EditorDocument.body.innerHTML = html ; - - FCK.MakeEditable() ; - } - - FCK.OnAfterSetHTML() ; - } - else - document.getElementById('eSourceField').value = html ; -} -} // @Packager.Compactor.RemoveLine +document.oncontextmenu = Document_OnContextMenu ; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_1_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_1_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_1_ie.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -21,27 +21,36 @@ FCK.Description = "FCKeditor for Internet Explorer 5.5+" ; -// The behaviors should be pointed using the FullBasePath to avoid security -// errors when using a differente BaseHref. -FCK._BehaviorsStyle = - '' ; +FCK._GetBehaviorsStyle = function() +{ + if ( !FCK._BehaviorsStyle ) + { + var sBasePath = FCKConfig.FullBasePath ; + var sStyle ; + + // The behaviors should be pointed using the FullBasePath to avoid security + // errors when using a differente BaseHref. + sStyle = + '' ; + FCK._BehaviorsStyle = sStyle ; + } + + return FCK._BehaviorsStyle ; +} function Doc_OnMouseUp() { @@ -61,6 +70,7 @@ return false ; } +/* function Doc_OnContextMenu() { var e = FCK.EditorWindow.event ; @@ -68,6 +78,7 @@ FCK.ShowContextMenu( e.screenX, e.screenY ) ; return false ; } +*/ function Doc_OnKeyDown() { @@ -176,8 +187,8 @@ // Intercept pasting operations this.EditorDocument.body.attachEvent( 'onpaste', Doc_OnPaste ) ; - // Disable Right-Click and shows the context menu. - this.EditorDocument.attachEvent('oncontextmenu', Doc_OnContextMenu ) ; + // Reset the context menu. + FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument.body ) ; // Build the "TAB" key replacement (if necessary). if ( FCKConfig.TabSpaces > 0 ) @@ -197,71 +208,6 @@ // this.EditorDocument.body.contentEditable = true ; } -FCK.Focus = function() -{ - try - { - if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) - FCK.EditorDocument.body.focus() ; - else - document.getElementById('eSourceField').focus() ; - } - catch(e) {} -} - -FCK.SetHTML = function( html, forceWYSIWYG ) -{ - if ( forceWYSIWYG || FCK.EditMode == FCK_EDITMODE_WYSIWYG ) - { - html = FCKConfig.ProtectedSource.Protect( html ) ; - html = FCK.ProtectUrls( html ) ; - - var sHtml ; - - if ( FCKConfig.FullPage ) - { - var sHtml = - FCK._BehaviorsStyle + - '' ; - - if ( FCK.TempBaseTag.length > 0 && !FCKRegexLib.HasBaseTag.test( html ) ) - sHtml += FCK.TempBaseTag ; - - sHtml = html.replace( FCKRegexLib.HeadOpener, '$&' + sHtml ) ; - } - else - { - sHtml = - FCKConfig.DocType + - '' + - '' + - '' ; - - sHtml += FCK._BehaviorsStyle ; - sHtml += FCK.TempBaseTag ; - sHtml += '' + html + '' ; - } - -// this.EditorDocument.open( '', '_self', '', true ) ; // This one opens popups in IE 5.5 - BUG 1204220 (I was not able to reproduce the problem). - this.EditorDocument.open( '', 'replace' ) ; - this.EditorDocument.write( sHtml ) ; - this.EditorDocument.close() ; - - this.InitializeBehaviors() ; - this.EditorDocument.body.contentEditable = true ; - - FCK.OnAfterSetHTML() ; - } - else - document.getElementById('eSourceField').value = html ; -} - FCK.InsertHtml = function( html ) { html = FCKConfig.ProtectedSource.Protect( html ) ; @@ -275,7 +221,7 @@ var oSel = FCK.EditorDocument.selection ; // Deletes the actual selection contents. - if ( oSel.type.toLowerCase() != "none" ) + if ( oSel.type.toLowerCase() == 'control' ) oSel.clear() ; // Insert the HTML. @@ -289,4 +235,51 @@ // be preserved. oDoc.body.innerHTML = '
 
' + html ; oDoc.getElementById('__fakeFCKRemove__').removeNode( true ) ; +} + +var FCK_PreloadImages_Count = 0 ; +var FCK_PreloadImages_Images = new Array() ; + +function FCK_PreloadImages() +{ + // Get the images to preload. + var aImages = FCKConfig.PreloadImages || [] ; + + if ( typeof( aImages ) == 'string' ) + aImages = aImages.split( ';' ) ; + + // Add the skin icons strip. + aImages.push( FCKConfig.SkinPath + 'fck_strip.gif' ) ; + + FCK_PreloadImages_Count = aImages.length ; + + var aImageElements = new Array() ; + + for ( var i = 0 ; i < aImages.length ; i++ ) + { + var eImg = document.createElement( 'img' ) ; + eImg.onload = eImg.onerror = FCK_PreloadImages_OnImage ; + eImg.src = aImages[i] ; + + FCK_PreloadImages_Images[i] = eImg ; + } +} + +function FCK_PreloadImages_OnImage() +{ + if ( (--FCK_PreloadImages_Count) == 0 ) + FCKTools.RunFunction( LoadToolbarSetup ) ; +} + +// Disable the context menu in the editor (outside the editing area). +function Document_OnContextMenu() +{ + return ( event.srcElement._FCKShowContextMenu == true ) ; +} +document.oncontextmenu = Document_OnContextMenu ; + +function FCK_Cleanup() +{ + this.EditorWindow = null ; + this.EditorDocument = null ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -75,45 +75,6 @@ FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.PasteFromWord, 'dialog/fck_paste.html', 400, 330, 'Word' ) ; } -// TODO: Wait Stable and remove this block. -//FCK.CleanAndPaste = function( html ) -//{ - // Remove all SPAN tags -// html = html.replace(/<\/?SPAN[^>]*>/gi, "" ); - -// html = html.replace(/ <\/o:p>/g, "") ; -// html = html.replace(/<\/o:p>/g, "") ; - - // Remove mso-xxx styles. -// html = html.replace( /mso-.[^:]:.[^;"]/g, "" ) ; - - // Remove Class attributes -// html = html.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3") ; - - // Remove Style attributes -// html = html.replace(/<(\w[^>]*) style="([^"]*)"([^>]*)/gi, "<$1$3") ; - - // Remove Lang attributes -// html = html.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3") ; - - // Remove XML elements and declarations -// html = html.replace(/<\\?\?xml[^>]*>/gi, "") ; - - // Remove Tags with XML namespace declarations: -// html = html.replace(/<\/?\w+:[^>]*>/gi, "") ; - - // Replace the   -// html = html.replace(/ /, " " ); - // Replace the   from the beggining. -// html = html.replace(/^ [\s\r\n]*/, ""); - - // Transform

to

-// var re = new RegExp("(]*>.*?)(<\/P>)","gi") ; // Different because of a IE 5.0 error -// html = html.replace( re, "" ) ; - -// FCK.InsertHtml( html ) ; -//} - FCK.Preview = function() { var iWidth = FCKConfig.ScreenWidth * 0.8 ; @@ -135,9 +96,10 @@ sHTML = FCKConfig.DocType + '' + - '' + FCKLang.Preview + '' + - '' + + '' + FCK.TempBaseTag + + '' + FCKLang.Preview + '' + + FCK._GetEditorAreaStyleTags() + '' + FCK.GetXHTML() + '' ; @@ -147,36 +109,34 @@ oWindow.document.close(); } -FCK.SwitchEditMode = function() +FCK.SwitchEditMode = function( noUndo ) { - // Check if the actual mode is WYSIWYG. - var bWYSIWYG = ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) ; + var bIsWysiwyg = ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) ; + var sHtml ; - // Display/Hide the TRs. - document.getElementById('eWysiwyg').style.display = bWYSIWYG ? 'none' : '' ; - document.getElementById('eSource').style.display = bWYSIWYG ? '' : 'none' ; - // Update the HTML in the view output to show. - if ( bWYSIWYG ) + if ( bIsWysiwyg ) { - if ( FCKBrowserInfo.IsIE ) + if ( !noUndo && FCKBrowserInfo.IsIE ) FCKUndo.SaveUndoStep() ; - // EnableXHTML and EnableSourceXHTML has been deprecated -// document.getElementById('eSourceField').value = ( FCKConfig.EnableXHTML && FCKConfig.EnableSourceXHTML ? FCK.GetXHTML( FCKConfig.FormatSource ) : FCK.GetHTML( FCKConfig.FormatSource ) ) ; - document.getElementById('eSourceField').value = FCK.GetXHTML( FCKConfig.FormatSource ) ; + sHtml = FCK.GetXHTML( FCKConfig.FormatSource ) ; } else - FCK.SetHTML( document.getElementById('eSourceField').value, true ) ; + sHtml = this.EditingArea.Textarea.value ; - // Updates the actual mode status. - FCK.EditMode = bWYSIWYG ? FCK_EDITMODE_SOURCE : FCK_EDITMODE_WYSIWYG ; - - // Update the toolbar. - FCKToolbarSet.RefreshModeState() ; + FCK.EditMode = bIsWysiwyg ? FCK_EDITMODE_SOURCE : FCK_EDITMODE_WYSIWYG ; + + FCK.SetHTML( sHtml ) ; + + if ( FCKBrowserInfo.IsGecko ) + window.onresize() ; // Set the Focus. FCK.Focus() ; + + // Update the toolbar (Running it directly causes IE to fail). + FCKTools.RunFunction( FCK.ToolbarSet.RefreshModeState, FCK.ToolbarSet ) ; } FCK.CreateElement = function( tag ) @@ -187,7 +147,7 @@ FCK.InsertElementAndGetIt = function( e ) { - e.setAttribute( '__FCKTempLabel', 1 ) ; + e.setAttribute( 'FCKTempLabel', 'true' ) ; this.InsertElement( e ) ; @@ -195,9 +155,9 @@ for ( var i = 0 ; i < aEls.length ; i++ ) { - if ( aEls[i].getAttribute( '__FCKTempLabel' ) ) + if ( aEls[i].getAttribute( 'FCKTempLabel' ) ) { - aEls[i].removeAttribute( '__FCKTempLabel' ) ; + aEls[i].removeAttribute( 'FCKTempLabel' ) ; return aEls[i] ; } } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2_gecko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2_gecko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2_gecko.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fck_2_ie.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckbrowserinfo.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckbrowserinfo.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckbrowserinfo.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -11,22 +11,27 @@ * "Support Open Source software. What about a donation today?" * * File Name: fckbrowserinfo.js - * Defines the FCKBrowserInfo object that hold some browser informations. + * Contains browser detection information. * * File Authors: * Frederico Caldeira Knabben (fredck at fckeditor.net) */ -var FCKBrowserInfo ; +var s = navigator.userAgent.toLowerCase() ; -if ( !( FCKBrowserInfo = NS.FCKBrowserInfo ) ) +var FCKBrowserInfo = { - FCKBrowserInfo = NS.FCKBrowserInfo = new Object() ; + IsIE : s.Contains('msie'), + IsIE7 : s.Contains('msie 7'), + IsGecko : s.Contains('gecko/'), + IsSafari : s.Contains('safari'), + IsOpera : s.Contains('opera') +} - var sAgent = navigator.userAgent.toLowerCase() ; +FCKBrowserInfo.IsGeckoLike = FCKBrowserInfo.IsGecko || FCKBrowserInfo.IsSafari || FCKBrowserInfo.IsOpera ; - FCKBrowserInfo.IsIE = ( sAgent.indexOf("msie") != -1 ) ; - FCKBrowserInfo.IsGecko = !FCKBrowserInfo.IsIE ; - FCKBrowserInfo.IsSafari = ( sAgent.indexOf("safari") != -1 ) ; - FCKBrowserInfo.IsNetscape = ( sAgent.indexOf("netscape") != -1 ) ; -} +if ( FCKBrowserInfo.IsGecko ) +{ + var sGeckoVersion = s.match( /gecko\/(\d+)/ )[1] ; + FCKBrowserInfo.IsGecko10 = sGeckoVersion < 20051111 ; // Actually "10" refers to versions before Firefox 1.5, where Gecko 20051111 has been released. +} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckcodeformatter.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckcodeformatter.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckcodeformatter.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -17,79 +17,80 @@ * Frederico Caldeira Knabben (fredck at fckeditor.net) */ -var FCKCodeFormatter ; +var FCKCodeFormatter = new Object() ; -if ( !( FCKCodeFormatter = NS.FCKCodeFormatter ) ) +FCKCodeFormatter.Init = function() { - FCKCodeFormatter = NS.FCKCodeFormatter = new Object() ; - - FCKCodeFormatter.Regex = new Object() ; + var oRegex = this.Regex = new Object() ; // Regex for line breaks. - FCKCodeFormatter.Regex.BlocksOpener = /\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ; - FCKCodeFormatter.Regex.BlocksCloser = /\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ; + oRegex.BlocksOpener = /\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ; + oRegex.BlocksCloser = /\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ; - FCKCodeFormatter.Regex.NewLineTags = /\<(BR|HR)[^\>]\>/gi ; + oRegex.NewLineTags = /\<(BR|HR)[^\>]*\>/gi ; - FCKCodeFormatter.Regex.MainTags = /\<\/?(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR)[^\>]*\>/gi ; + oRegex.MainTags = /\<\/?(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR)[^\>]*\>/gi ; - FCKCodeFormatter.Regex.LineSplitter = /\s*\n+\s*/g ; + oRegex.LineSplitter = /\s*\n+\s*/g ; // Regex for indentation. - FCKCodeFormatter.Regex.IncreaseIndent = /^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \/\>]/i ; - FCKCodeFormatter.Regex.DecreaseIndent = /^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \>]/i ; - FCKCodeFormatter.Regex.FormatIndentatorRemove = new RegExp( FCKConfig.FormatIndentator ) ; + oRegex.IncreaseIndent = /^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \/\>]/i ; + oRegex.DecreaseIndent = /^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \>]/i ; + oRegex.FormatIndentatorRemove = new RegExp( '^' + FCKConfig.FormatIndentator ) ; - FCKCodeFormatter.Regex.ProtectedTags = /(]*>)([\s\S]*?)(<\/PRE>)/gi ; + oRegex.ProtectedTags = /(]*>)([\s\S]*?)(<\/PRE>)/gi ; +} - FCKCodeFormatter._ProtectData = function( outer, opener, data, closer ) +FCKCodeFormatter._ProtectData = function( outer, opener, data, closer ) +{ + return opener + '___FCKpd___' + FCKCodeFormatter.ProtectedData.AddItem( data ) + closer ; +} + +FCKCodeFormatter.Format = function( html ) +{ + if ( !this.Regex ) + this.Init() ; + + // Protected content that remain untouched during the + // process go in the following array. + FCKCodeFormatter.ProtectedData = new Array() ; + + var sFormatted = html.replace( this.Regex.ProtectedTags, FCKCodeFormatter._ProtectData ) ; + + // Line breaks. + sFormatted = sFormatted.replace( this.Regex.BlocksOpener, '\n$&' ) ; ; + sFormatted = sFormatted.replace( this.Regex.BlocksCloser, '$&\n' ) ; + sFormatted = sFormatted.replace( this.Regex.NewLineTags, '$&\n' ) ; + sFormatted = sFormatted.replace( this.Regex.MainTags, '\n$&\n' ) ; + + // Indentation. + var sIndentation = '' ; + + var asLines = sFormatted.split( this.Regex.LineSplitter ) ; + sFormatted = '' ; + + for ( var i = 0 ; i < asLines.length ; i++ ) { - return opener + '___FCKpd___' + FCKCodeFormatter.ProtectedData.addItem( data ) + closer ; + var sLine = asLines[i] ; + + if ( sLine.length == 0 ) + continue ; + + if ( this.Regex.DecreaseIndent.test( sLine ) ) + sIndentation = sIndentation.replace( this.Regex.FormatIndentatorRemove, '' ) ; + + sFormatted += sIndentation + sLine + '\n' ; + + if ( this.Regex.IncreaseIndent.test( sLine ) ) + sIndentation += FCKConfig.FormatIndentator ; + } + + // Now we put back the protected data. + for ( var i = 0 ; i < FCKCodeFormatter.ProtectedData.length ; i++ ) + { + var oRegex = new RegExp( '___FCKpd___' + i ) ; + sFormatted = sFormatted.replace( oRegex, FCKCodeFormatter.ProtectedData[i].replace( /\$/g, '$$$$' ) ) ; } - FCKCodeFormatter.Format = function( html ) - { - // Protected content that remain untouched during the - // process go in the following array. - FCKCodeFormatter.ProtectedData = new Array() ; - - var sFormatted = html.replace( this.Regex.ProtectedTags, FCKCodeFormatter._ProtectData ) ; - - // Line breaks. - sFormatted = sFormatted.replace( this.Regex.BlocksOpener, '\n$&' ) ; ; - sFormatted = sFormatted.replace( this.Regex.BlocksCloser, '$&\n' ) ; - sFormatted = sFormatted.replace( this.Regex.NewLineTags, '$&\n' ) ; - sFormatted = sFormatted.replace( this.Regex.MainTags, '\n$&\n' ) ; - - // Indentation. - var sIndentation = '' ; - - var asLines = sFormatted.split( this.Regex.LineSplitter ) ; - sFormatted = '' ; - - for ( var i = 0 ; i < asLines.length ; i++ ) - { - var sLine = asLines[i] ; - - if ( sLine.length == 0 ) - continue ; - - if ( this.Regex.DecreaseIndent.test( sLine ) ) - sIndentation = sIndentation.replace( this.Regex.FormatIndentatorRemove, '' ) ; - - sFormatted += sIndentation + sLine + '\n' ; - - if ( this.Regex.IncreaseIndent.test( sLine ) ) - sIndentation += FCKConfig.FormatIndentator ; - } - - // Now we put back the protected data. - for ( var i = 0 ; i < FCKCodeFormatter.ProtectedData.length ; i++ ) - { - var oRegex = new RegExp( '___FCKpd___' + i ) ; - sFormatted = sFormatted.replace( oRegex, FCKCodeFormatter.ProtectedData[i] ) ; - } - - return sFormatted.trim() ; - } + return sFormatted.trim() ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckcommands.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckcommands.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckcommands.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -37,6 +37,7 @@ case 'DocProps' : oCommand = new FCKDialogCommand( 'DocProps' , FCKLang.DocProps , 'dialog/fck_docprops.html' , 400, 390, FCKCommands.GetFullPageState ) ; break ; case 'Templates' : oCommand = new FCKDialogCommand( 'Templates' , FCKLang.DlgTemplatesTitle , 'dialog/fck_template.html' , 380, 450 ) ; break ; case 'Link' : oCommand = new FCKDialogCommand( 'Link' , FCKLang.DlgLnkWindowTitle , 'dialog/fck_link.html' , 400, 330, FCK.GetNamedCommandState, 'CreateLink' ) ; break ; + case 'Unlink' : oCommand = new FCKUnlinkCommand() ; break ; case 'Anchor' : oCommand = new FCKDialogCommand( 'Anchor' , FCKLang.DlgAnchorTitle , 'dialog/fck_anchor.html' , 370, 170 ) ; break ; case 'BulletedList' : oCommand = new FCKDialogCommand( 'BulletedList', FCKLang.BulletedListProp , 'dialog/fck_listprop.html' , 370, 170 ) ; break ; case 'NumberedList' : oCommand = new FCKDialogCommand( 'NumberedList', FCKLang.NumberedListProp , 'dialog/fck_listprop.html' , 370, 170 ) ; break ; @@ -49,7 +50,7 @@ case 'Flash' : oCommand = new FCKDialogCommand( 'Flash' , FCKLang.DlgFlashTitle , 'dialog/fck_flash.html' , 450, 400 ) ; break ; case 'SpecialChar' : oCommand = new FCKDialogCommand( 'SpecialChar', FCKLang.DlgSpecialCharTitle , 'dialog/fck_specialchar.html' , 400, 320 ) ; break ; case 'Smiley' : oCommand = new FCKDialogCommand( 'Smiley' , FCKLang.DlgSmileyTitle , 'dialog/fck_smiley.html' , FCKConfig.SmileyWindowWidth, FCKConfig.SmileyWindowHeight ) ; break ; - case 'Table' : oCommand = new FCKDialogCommand( 'Table' , FCKLang.DlgTableTitle , 'dialog/fck_table.html' , 400, 250 ) ; break ; + case 'Table' : oCommand = new FCKDialogCommand( 'Table' , FCKLang.DlgTableTitle , 'dialog/fck_table.html' , 450, 250 ) ; break ; case 'TableProp' : oCommand = new FCKDialogCommand( 'Table' , FCKLang.DlgTableTitle , 'dialog/fck_table.html?Parent', 400, 250 ) ; break ; case 'TableCellProp': oCommand = new FCKDialogCommand( 'TableCell' , FCKLang.DlgCellTitle , 'dialog/fck_tablecell.html' , 500, 250 ) ; break ; case 'UniversalKey' : oCommand = new FCKDialogCommand( 'UniversalKey', FCKLang.UniversalKeyboard , 'dialog/fck_universalkey.html', 415, 300 ) ; break ; @@ -93,6 +94,7 @@ case 'ImageButton' : oCommand = new FCKDialogCommand( 'ImageButton', FCKLang.ImageButton , 'dialog/fck_image.html?ImageButton', 450, 400 ) ; break ; case 'SpellCheck' : oCommand = new FCKSpellCheckCommand() ; break ; + case 'FitWindow' : oCommand = new FCKFitWindow() ; break ; case 'Undo' : oCommand = new FCKUndoCommand() ; break ; case 'Redo' : oCommand = new FCKRedoCommand() ; break ; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckconfig.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckconfig.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckconfig.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -19,12 +19,18 @@ var FCKConfig = FCK.Config = new Object() ; +/* + For the next major version (probably 3.0) we should move all this stuff to + another dedicated object and leave FCKConfig as a holder object for settings only). +*/ + // Editor Base Path if ( document.location.protocol == 'file:' ) { FCKConfig.BasePath = unescape( document.location.pathname.substr(1) ) ; FCKConfig.BasePath = FCKConfig.BasePath.replace( /\\/gi, '/' ) ; FCKConfig.BasePath = 'file://' + FCKConfig.BasePath.substring(0,FCKConfig.BasePath.lastIndexOf('/')+1) ; + FCKConfig.FullBasePath = FCKConfig.BasePath ; } else { @@ -87,10 +93,29 @@ } } -FCKConfig.LoadPageConfig = function() +function FCKConfig_LoadPageConfig() { - for ( var sKey in this.PageConfig ) - FCKConfig[ sKey ] = this.PageConfig[ sKey ] ; + var oPageConfig = FCKConfig.PageConfig ; + for ( var sKey in oPageConfig ) + FCKConfig[ sKey ] = oPageConfig[ sKey ] ; +} + +function FCKConfig_PreProcess() +{ + var oConfig = FCKConfig ; + + // Force debug mode if fckdebug=true in the QueryString (main page). + if ( oConfig.AllowQueryStringDebug && (/fckdebug=true/i).test( window.top.location.search ) ) + oConfig.Debug = true ; + + // Certifies that the "PluginsPath" configuration ends with a slash. + if ( !oConfig.PluginsPath.endsWith('/') ) + oConfig.PluginsPath += '/' ; + + // EditorAreaCSS accepts an array of paths or a single path (as string). + // In the last case, transform it in an array. + if ( typeof( oConfig.EditorAreaCSS ) == 'string' ) + oConfig.EditorAreaCSS = [ oConfig.EditorAreaCSS ] ; } // Define toolbar sets collection. @@ -102,7 +127,7 @@ FCKConfig.Plugins.Add = function( name, langs, path ) { - FCKConfig.Plugins.Items.addItem( [name, langs, path] ) ; + FCKConfig.Plugins.Items.AddItem( [name, langs, path] ) ; } // FCKConfig.ProtectedSource: object that holds a collection of Regular @@ -113,7 +138,7 @@ FCKConfig.ProtectedSource.Add = function( regexPattern ) { - this.RegexEntries.addItem( regexPattern ) ; + this.RegexEntries.AddItem( regexPattern ) ; } FCKConfig.ProtectedSource.Protect = function( html ) Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdebug.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdebug.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdebug.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -19,58 +19,59 @@ var FCKDebug = new Object() ; -if ( FCKConfig.Debug ) +FCKDebug.Output = function( message, color, noParse ) { - FCKDebug.Output = function( message, color, noParse ) + if ( ! FCKConfig.Debug ) return ; + + if ( !noParse && message != null && isNaN( message ) ) + message = message.replace(/
' ; - if ( !noParse && message != null && isNaN( message ) ) - message = message.replace(/ : ' + sVal.replace(/' ; } - catch ( e ) {} // Ignore errors - } - } - - FCKDebug.OutputObject = function( anyObject, color ) - { - var message ; - - if ( anyObject != null ) - { - message = 'Properties of: ' + anyObject + '
' ; - - for (var prop in anyObject) + catch (e) { - var sVal = anyObject[ prop ] ? anyObject[ prop ] + '' : '[null]' ; - try - { - message += '' + prop + ' : ' + sVal.replace(/' ; - } - catch (e) + try { message += '' + prop + ' : [' + typeof( anyObject[ prop ] ) + ']
' ; } + catch (e) + { + message += '' + prop + ' : [-error-]
' ; + } } + } - message += '
' ; - } else - message = 'OutputObject : Object is "null".' ; - - FCKDebug.Output( message, color, true ) ; - } -} -else -{ - FCKDebug.Output = function() {} - FCKDebug.OutputObject = function() {} + message += '
' ; + } else + message = 'OutputObject : Object is "null".' ; + + FCKDebug.Output( message, color, true ) ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog_gecko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog_gecko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog_gecko.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -32,11 +32,14 @@ if ( !parentWindow ) parentWindow = window ; + FCKFocusManager.Lock() ; + var oWindow = parentWindow.open( '', 'FCKeditorDialog_' + dialogName, sOption, true ) ; if ( !oWindow ) { alert( FCKLang.DialogBlocked ) ; + FCKFocusManager.Unlock() ; return ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckdialog_ie.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -22,9 +22,12 @@ if ( !parentWindow ) parentWindow = window ; - this.IsOpened = true ; + FCKFocusManager.Lock() ; - parentWindow.showModalDialog( pageUrl, dialogInfo, "dialogWidth:" + dialogWidth + "px;dialogHeight:" + dialogHeight + "px;help:no;scroll:no;status:no") ; + var oReturn = parentWindow.showModalDialog( pageUrl, dialogInfo, "dialogWidth:" + dialogWidth + "px;dialogHeight:" + dialogHeight + "px;help:no;scroll:no;status:no") ; - this.IsOpened = false ; + if ( !oReturn ) + alert( FCKLang.DialogBlocked ) ; + + FCKFocusManager.Unlock() ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcklanguagemanager.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcklanguagemanager.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcklanguagemanager.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -17,6 +17,63 @@ * File Authors: * Frederico Caldeira Knabben (fredck at fckeditor.net) */ +var FCKLanguageManager = FCK.Language = new Object() ; + +FCKLanguageManager.AvailableLanguages = +{ + 'ar' : 'Arabic', + 'bg' : 'Bulgarian', + 'bn' : 'Bengali/Bangla', + 'bs' : 'Bosnian', + 'ca' : 'Catalan', + 'cs' : 'Czech', + 'da' : 'Danish', + 'de' : 'German', + 'el' : 'Greek', + 'en' : 'English', + 'en-au' : 'English (Australia)', + 'en-ca' : 'English (Canadian)', + 'en-uk' : 'English (United Kingdom)', + 'eo' : 'Esperanto', + 'es' : 'Spanish', + 'et' : 'Estonian', + 'eu' : 'Basque', + 'fa' : 'Persian', + 'fi' : 'Finnish', + 'fo' : 'Faroese', + 'fr' : 'French', + 'gl' : 'Galician', + 'he' : 'Hebrew', + 'hi' : 'Hindi', + 'hr' : 'Croatian', + 'hu' : 'Hungarian', + 'it' : 'Italian', + 'ja' : 'Japanese', + 'km' : 'Khmer', + 'ko' : 'Korean', + 'lt' : 'Lithuanian', + 'lv' : 'Latvian', + 'mn' : 'Mongolian', + 'ms' : 'Malay', + 'nl' : 'Dutch', + 'no' : 'Norwegian', + 'pl' : 'Polish', + 'pt' : 'Portuguese (Portugal)', + 'pt-br' : 'Portuguese (Brazil)', + 'ro' : 'Romanian', + 'ru' : 'Russian', + 'sk' : 'Slovak', + 'sl' : 'Slovenian', + 'sr' : 'Serbian (Cyrillic)', + 'sr-latn' : 'Serbian (Latin)', + 'sv' : 'Swedish', + 'th' : 'Thai', + 'tr' : 'Turkish', + 'uk' : 'Ukrainian', + 'vi' : 'Vietnamese', + 'zh' : 'Chinese Traditional', + 'zh-cn' : 'Chinese Simplified' +} FCKLanguageManager.GetActiveLanguage = function() { @@ -55,19 +112,20 @@ return this.DefaultLanguage ; } -FCKLanguageManager.TranslateElements = function( targetDocument, tag, propertyToSet ) +FCKLanguageManager.TranslateElements = function( targetDocument, tag, propertyToSet, encode ) { var e = targetDocument.getElementsByTagName(tag) ; - + var sKey, s ; for ( var i = 0 ; i < e.length ; i++ ) { - var sKey = e[i].getAttribute( 'fckLang' ) ; - - if ( sKey ) + if ( sKey = e[i].getAttribute( 'fckLang' ) ) { - var s = FCKLang[ sKey ] ; - if ( s ) + if ( s = FCKLang[ sKey ] ) + { + if ( encode ) + s = FCKTools.HTMLEncode( s ) ; eval( 'e[i].' + propertyToSet + ' = s' ) ; + } } } } @@ -77,19 +135,17 @@ this.TranslateElements( targetDocument, 'INPUT', 'value' ) ; this.TranslateElements( targetDocument, 'SPAN', 'innerHTML' ) ; this.TranslateElements( targetDocument, 'LABEL', 'innerHTML' ) ; - this.TranslateElements( targetDocument, 'OPTION', 'innerHTML' ) ; + this.TranslateElements( targetDocument, 'OPTION', 'innerHTML', true ) ; } -if ( FCKLanguageManager.AvailableLanguages[ FCKConfig.DefaultLanguage ] ) - FCKLanguageManager.DefaultLanguage = FCKConfig.DefaultLanguage ; -else - FCKLanguageManager.DefaultLanguage = 'en' ; +FCKLanguageManager.Initialize = function() +{ + if ( this.AvailableLanguages[ FCKConfig.DefaultLanguage ] ) + this.DefaultLanguage = FCKConfig.DefaultLanguage ; + else + this.DefaultLanguage = 'en' ; -FCKLanguageManager.ActiveLanguage = new Object() ; -FCKLanguageManager.ActiveLanguage.Code = FCKLanguageManager.GetActiveLanguage() ; -FCKLanguageManager.ActiveLanguage.Name = FCKLanguageManager.AvailableLanguages[ FCKLanguageManager.ActiveLanguage.Code ] ; - -FCK.Language = FCKLanguageManager ; - -// Load the language file and start the editor. -LoadLanguageFile() ; + this.ActiveLanguage = new Object() ; + this.ActiveLanguage.Code = this.GetActiveLanguage() ; + this.ActiveLanguage.Name = this.AvailableLanguages[ this.ActiveLanguage.Code ] ; +} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcknamespace.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcknamespace.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcknamespace.js Wed Jul 12 07:45:05 2006 @@ -1,27 +1,27 @@ -???/* - * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben - * - * Licensed under the terms of the GNU Lesser General Public License: - * http://www.opensource.org/licenses/lgpl-license.php - * - * For further information visit: - * http://www.fckeditor.net/ - * - * "Support Open Source software. What about a donation today?" - * - * File Name: fcknamespace.js - * This file declares the namespace (object holder) where the common editor - * objects and classes are defined. - * The namespace is located in the page the editor is running on, so it is - * shared by all editor instances. - * - * File Authors: - * Frederico Caldeira Knabben (fredck at fckeditor.net) - */ - -var NS ; - -if ( !( NS = window.parent.__FCKeditorNS ) ) - NS = window.parent.__FCKeditorNS = new Object() ; - +???/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2006 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * "Support Open Source software. What about a donation today?" + * + * File Name: fcknamespace.js + * This file declares the namespace (object holder) where the common editor + * objects and classes are defined. + * The namespace is located in the page the editor is running on, so it is + * shared by all editor instances. + * + * File Authors: + * Frederico Caldeira Knabben (fredck at fckeditor.net) + */ + +var NS ; + +if ( !( NS = window.parent.__FCKeditorNS ) ) + NS = window.parent.__FCKeditorNS = new Object() ; + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckplugins.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckplugins.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckplugins.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -19,26 +19,24 @@ var FCKPlugins = FCK.Plugins = new Object() ; FCKPlugins.ItemsCount = 0 ; -FCKPlugins.Loaded = false ; FCKPlugins.Items = new Object() ; - -// Set the defined plugins scripts paths. -for ( var i = 0 ; i < FCKConfig.Plugins.Items.length ; i++ ) -{ - var oItem = FCKConfig.Plugins.Items[i] ; - FCKPlugins.Items[ oItem[0] ] = new FCKPlugin( oItem[0], oItem[1], oItem[2] ) ; - FCKPlugins.ItemsCount++ ; -} FCKPlugins.Load = function() { - // Load all items. - for ( var s in this.Items ) - this.Items[s].Load() ; - - // Mark as loaded. - this.Loaded = true ; - + var oItems = FCKPlugins.Items ; + + // build the plugins collection. + for ( var i = 0 ; i < FCKConfig.Plugins.Items.length ; i++ ) + { + var oItem = FCKConfig.Plugins.Items[i] ; + var oPlugin = oItems[ oItem[0] ] = new FCKPlugin( oItem[0], oItem[1], oItem[2] ) ; + FCKPlugins.ItemsCount++ ; + } + + // Load all items in the plugins collection. + for ( var s in oItems ) + oItems[s].Load() ; + // This is a self destroyable function (must be called once). FCKPlugins.Load = null ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckregexlib.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckregexlib.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckregexlib.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -56,7 +56,7 @@ FCKRegexLib.TableBorderClass = /\s*FCK__ShowTableBorders\s*/ ; // Validate element names. -FCKRegexLib.ElementName = /^[A-Za-z_:][\w.\-:]*$/ ; +FCKRegexLib.ElementName = /(^[A-Za-z_:][\w.\-:]*\w$)|(^[A-Za-z_]$)/ ; // Used in conjuction with the FCKConfig.ForceSimpleAmpersand configuration option. FCKRegexLib.ForceSimpleAmpersand = /___FCKAmp___/g ; @@ -96,3 +96,5 @@ FCKRegexLib.ProtectUrlsImgApo = /(]+)/gi ; + +FCKRegexLib.Html4DocType = /HTML 4\.0 Transitional/i ; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -17,6 +17,4 @@ * Frederico Caldeira Knabben (fredck at fckeditor.net) */ -var FCKSelection = new Object() ; - -FCK.Selection = FCKSelection ; +var FCKSelection = FCK.Selection = new Object() ; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection_gecko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection_gecko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection_gecko.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -33,7 +33,7 @@ if ( oSel && oSel.rangeCount == 1 ) { var oRange = oSel.getRangeAt(0) ; - if ( oRange.startContainer == oRange.endContainer && (oRange.endOffset - oRange.startOffset) == 1 ) + if ( oRange.startContainer == oRange.endContainer && (oRange.endOffset - oRange.startOffset) == 1 && oRange.startContainer.nodeType != Node.TEXT_NODE ) this._Type = 'Control' ; } // } @@ -72,7 +72,7 @@ FCKSelection.SelectNode = function( element ) { - FCK.Focus() ; +// FCK.Focus() ; var oRange = FCK.EditorDocument.createRange() ; oRange.selectNode( element ) ; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckselection_ie.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -53,17 +53,32 @@ { FCK.Focus() ; FCK.EditorDocument.selection.empty() ; - var oRange = FCK.EditorDocument.selection.createRange() ; - oRange.moveToElementText( node ) ; + + try + { + // Try to select the node as a control. + var oRange = FCK.EditorDocument.body.createControlRange() ; + oRange.addElement( node ) ; + } + catch(e) + { + // If failed, select it as a text range. + var oRange = FCK.EditorDocument.selection.createRange() ; + oRange.moveToElementText( node ) ; + } + oRange.select() ; } FCKSelection.Collapse = function( toStart ) { FCK.Focus() ; - var oRange = FCK.EditorDocument.selection.createRange() ; - oRange.collapse( toStart == null || toStart === true ) ; - oRange.select() ; + if ( this.GetType() == 'Text' ) + { + var oRange = FCK.EditorDocument.selection.createRange() ; + oRange.collapse( toStart == null || toStart === true ) ; + oRange.select() ; + } } // The "nodeTagName" parameter must be Upper Case. Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -103,7 +103,7 @@ oCell = oRow.cells[iIndex-1].cloneNode(false) ; if ( FCKBrowserInfo.IsGecko ) - oCell.innerHTML = FCKBrowserInfo.IsGecko ? GECKO_BOGUS : '' ; + oCell.innerHTML = GECKO_BOGUS ; // Get the cell that is placed in the new cell place. var oBaseCell = oRow.cells[iIndex] ; @@ -218,21 +218,40 @@ var iColSpan = isNaN( aCells[0].colSpan ) ? 1 : aCells[0].colSpan ; var sHtml = '' ; - - for ( var i = aCells.length - 1 ; i > 0 ; i-- ) - { - iColSpan += isNaN( aCells[i].colSpan ) ? 1 : aCells[i].colSpan ; - - // Append the HTML of each cell. - sHtml = aCells[i].innerHTML + sHtml ; - - // Delete the cell. - FCKTableHandler.DeleteCell( aCells[i] ) ; + var oCellsContents = FCK.EditorDocument.createDocumentFragment() ; + + for ( var i = aCells.length - 1 ; i >= 0 ; i-- ) + { + var eCell = aCells[i] ; + + // Move its contents to the document fragment. + for ( var c = eCell.childNodes.length - 1 ; c >= 0 ; c-- ) + { + var eChild = eCell.removeChild( eCell.childNodes[c] ) ; + + if ( ( eChild.hasAttribute && eChild.hasAttribute('_moz_editor_bogus_node') ) || ( eChild.getAttribute && eChild.getAttribute( 'type', 2 ) == '_moz' ) ) + continue ; + + oCellsContents.insertBefore( eChild, oCellsContents.firstChild ) ; + } + + if ( i > 0 ) + { + // Accumulate the colspan of the cell. + iColSpan += isNaN( eCell.colSpan ) ? 1 : eCell.colSpan ; + + // Delete the cell. + FCKTableHandler.DeleteCell( eCell ) ; + } } // Set the innerHTML of the remaining cell (the first one). aCells[0].colSpan = iColSpan ; - aCells[0].innerHTML += sHtml ; + + if ( FCKBrowserInfo.IsGecko && oCellsContents.childNodes.length == 0 ) + aCells[0].innerHTML = GECKO_BOGUS ; + else + aCells[0].appendChild( oCellsContents ) ; } FCKTableHandler.SplitCell = function() Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler_gecko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler_gecko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler_gecko.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -26,7 +26,7 @@ // If the selection is a text. if ( oSelection.rangeCount == 1 && oSelection.anchorNode.nodeType == 3 ) { - var oParent = FCKTools.GetElementAscensor( oSelection.anchorNode, 'TD' ) ; + var oParent = FCKTools.GetElementAscensor( oSelection.anchorNode, 'TD,TH' ) ; if ( oParent ) { @@ -38,9 +38,14 @@ for ( var i = 0 ; i < oSelection.rangeCount ; i++ ) { var oRange = oSelection.getRangeAt(i) ; - var oCell = oRange.startContainer.childNodes[ oRange.startOffset ] ; + var oCell ; - if ( oCell.tagName == 'TD' ) + if ( oRange.startContainer.tagName.Equals( 'TD', 'TH' ) ) + oCell = oRange.startContainer ; + else + oCell = oRange.startContainer.childNodes[ oRange.startOffset ] ; + + if ( oCell.tagName.Equals( 'TD', 'TH' ) ) aCells[aCells.length] = oCell ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktablehandler_ie.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -25,7 +25,7 @@ // var oParent = oRange.parentElement() ; var oParent = FCKSelection.GetParentElement() ; - if ( oParent && oParent.tagName == "TD" ) + if ( oParent && oParent.tagName.Equals( 'TD', 'TH' ) ) aCells[0] = oParent ; else { Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktoolbaritems.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktoolbaritems.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktoolbaritems.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -34,77 +34,78 @@ switch ( itemName ) { - case 'Source' : oItem = new FCKToolbarButton( 'Source' , FCKLang.Source, null, FCK_TOOLBARITEM_ICONTEXT, true, true ) ; break ; - case 'DocProps' : oItem = new FCKToolbarButton( 'DocProps' , FCKLang.DocProps ) ; break ; - case 'Templates' : oItem = new FCKToolbarButton( 'Templates' , FCKLang.Templates ) ; break ; - case 'Save' : oItem = new FCKToolbarButton( 'Save' , FCKLang.Save, null, null, true ) ; break ; - case 'NewPage' : oItem = new FCKToolbarButton( 'NewPage' , FCKLang.NewPage, null, null, true ) ; break ; - case 'Preview' : oItem = new FCKToolbarButton( 'Preview' , FCKLang.Preview, null, null, true ) ; break ; - case 'About' : oItem = new FCKToolbarButton( 'About' , FCKLang.About, null, null, true ) ; break ; + case 'Source' : oItem = new FCKToolbarButton( 'Source' , FCKLang.Source, null, FCK_TOOLBARITEM_ICONTEXT, true, true, 1 ) ; break ; + case 'DocProps' : oItem = new FCKToolbarButton( 'DocProps' , FCKLang.DocProps, null, null, null, null, 2 ) ; break ; + case 'Save' : oItem = new FCKToolbarButton( 'Save' , FCKLang.Save, null, null, true, null, 3 ) ; break ; + case 'NewPage' : oItem = new FCKToolbarButton( 'NewPage' , FCKLang.NewPage, null, null, true, null, 4 ) ; break ; + case 'Preview' : oItem = new FCKToolbarButton( 'Preview' , FCKLang.Preview, null, null, true, null, 5 ) ; break ; + case 'Templates' : oItem = new FCKToolbarButton( 'Templates' , FCKLang.Templates, null, null, null, null, 6 ) ; break ; + case 'About' : oItem = new FCKToolbarButton( 'About' , FCKLang.About, null, null, true, null, 47 ) ; break ; - case 'Cut' : oItem = new FCKToolbarButton( 'Cut' , FCKLang.Cut, null, null, false, true ) ; break ; - case 'Copy' : oItem = new FCKToolbarButton( 'Copy' , FCKLang.Copy, null, null, false, true ) ; break ; - case 'Paste' : oItem = new FCKToolbarButton( 'Paste' , FCKLang.Paste, null, null, false, true ) ; break ; - case 'PasteText' : oItem = new FCKToolbarButton( 'PasteText' , FCKLang.PasteText, null, null, false, true ) ; break ; - case 'PasteWord' : oItem = new FCKToolbarButton( 'PasteWord' , FCKLang.PasteWord, null, null, false, true ) ; break ; - case 'Print' : oItem = new FCKToolbarButton( 'Print' , FCKLang.Print, null, null, false, true ) ; break ; - case 'SpellCheck' : oItem = new FCKToolbarButton( 'SpellCheck', FCKLang.SpellCheck ) ; break ; - case 'Undo' : oItem = new FCKToolbarButton( 'Undo' , FCKLang.Undo, null, null, false, true ) ; break ; - case 'Redo' : oItem = new FCKToolbarButton( 'Redo' , FCKLang.Redo, null, null, false, true ) ; break ; - case 'SelectAll' : oItem = new FCKToolbarButton( 'SelectAll' , FCKLang.SelectAll ) ; break ; - case 'RemoveFormat' : oItem = new FCKToolbarButton( 'RemoveFormat', FCKLang.RemoveFormat, null, null, false, true ) ; break ; + case 'Cut' : oItem = new FCKToolbarButton( 'Cut' , FCKLang.Cut, null, null, false, true, 7 ) ; break ; + case 'Copy' : oItem = new FCKToolbarButton( 'Copy' , FCKLang.Copy, null, null, false, true, 8 ) ; break ; + case 'Paste' : oItem = new FCKToolbarButton( 'Paste' , FCKLang.Paste, null, null, false, true, 9 ) ; break ; + case 'PasteText' : oItem = new FCKToolbarButton( 'PasteText' , FCKLang.PasteText, null, null, false, true, 10 ) ; break ; + case 'PasteWord' : oItem = new FCKToolbarButton( 'PasteWord' , FCKLang.PasteWord, null, null, false, true, 11 ) ; break ; + case 'Print' : oItem = new FCKToolbarButton( 'Print' , FCKLang.Print, null, null, false, true, 12 ) ; break ; + case 'SpellCheck' : oItem = new FCKToolbarButton( 'SpellCheck', FCKLang.SpellCheck, null, null, null, null, 13 ) ; break ; + case 'Undo' : oItem = new FCKToolbarButton( 'Undo' , FCKLang.Undo, null, null, false, true, 14 ) ; break ; + case 'Redo' : oItem = new FCKToolbarButton( 'Redo' , FCKLang.Redo, null, null, false, true, 15 ) ; break ; + case 'SelectAll' : oItem = new FCKToolbarButton( 'SelectAll' , FCKLang.SelectAll, null, null, null, null, 18 ) ; break ; + case 'RemoveFormat' : oItem = new FCKToolbarButton( 'RemoveFormat', FCKLang.RemoveFormat, null, null, false, true, 19 ) ; break ; + case 'FitWindow' : oItem = new FCKToolbarButton( 'FitWindow' , FCKLang.FitWindow, null, null, true, true, 66 ) ; break ; - case 'Bold' : oItem = new FCKToolbarButton( 'Bold' , FCKLang.Bold, null, null, false, true ) ; break ; - case 'Italic' : oItem = new FCKToolbarButton( 'Italic' , FCKLang.Italic, null, null, false, true ) ; break ; - case 'Underline' : oItem = new FCKToolbarButton( 'Underline' , FCKLang.Underline, null, null, false, true ) ; break ; - case 'StrikeThrough' : oItem = new FCKToolbarButton( 'StrikeThrough' , FCKLang.StrikeThrough, null, null, false, true ) ; break ; - case 'Subscript' : oItem = new FCKToolbarButton( 'Subscript' , FCKLang.Subscript, null, null, false, true ) ; break ; - case 'Superscript' : oItem = new FCKToolbarButton( 'Superscript' , FCKLang.Superscript, null, null, false, true ) ; break ; + case 'Bold' : oItem = new FCKToolbarButton( 'Bold' , FCKLang.Bold, null, null, false, true, 20 ) ; break ; + case 'Italic' : oItem = new FCKToolbarButton( 'Italic' , FCKLang.Italic, null, null, false, true, 21 ) ; break ; + case 'Underline' : oItem = new FCKToolbarButton( 'Underline' , FCKLang.Underline, null, null, false, true, 22 ) ; break ; + case 'StrikeThrough' : oItem = new FCKToolbarButton( 'StrikeThrough' , FCKLang.StrikeThrough, null, null, false, true, 23 ) ; break ; + case 'Subscript' : oItem = new FCKToolbarButton( 'Subscript' , FCKLang.Subscript, null, null, false, true, 24 ) ; break ; + case 'Superscript' : oItem = new FCKToolbarButton( 'Superscript' , FCKLang.Superscript, null, null, false, true, 25 ) ; break ; - case 'OrderedList' : oItem = new FCKToolbarButton( 'InsertOrderedList' , FCKLang.NumberedListLbl, FCKLang.NumberedList, null, false, true ) ; break ; - case 'UnorderedList' : oItem = new FCKToolbarButton( 'InsertUnorderedList' , FCKLang.BulletedListLbl, FCKLang.BulletedList, null, false, true ) ; break ; - case 'Outdent' : oItem = new FCKToolbarButton( 'Outdent' , FCKLang.DecreaseIndent, null, null, false, true ) ; break ; - case 'Indent' : oItem = new FCKToolbarButton( 'Indent' , FCKLang.IncreaseIndent, null, null, false, true ) ; break ; + case 'OrderedList' : oItem = new FCKToolbarButton( 'InsertOrderedList' , FCKLang.NumberedListLbl, FCKLang.NumberedList, null, false, true, 26 ) ; break ; + case 'UnorderedList' : oItem = new FCKToolbarButton( 'InsertUnorderedList' , FCKLang.BulletedListLbl, FCKLang.BulletedList, null, false, true, 27 ) ; break ; + case 'Outdent' : oItem = new FCKToolbarButton( 'Outdent' , FCKLang.DecreaseIndent, null, null, false, true, 28 ) ; break ; + case 'Indent' : oItem = new FCKToolbarButton( 'Indent' , FCKLang.IncreaseIndent, null, null, false, true, 29 ) ; break ; - case 'Link' : oItem = new FCKToolbarButton( 'Link' , FCKLang.InsertLinkLbl, FCKLang.InsertLink, null, false, true ) ; break ; - case 'Unlink' : oItem = new FCKToolbarButton( 'Unlink' , FCKLang.RemoveLink, null, null, false, true ) ; break ; - case 'Anchor' : oItem = new FCKToolbarButton( 'Anchor' , FCKLang.Anchor ) ; break ; + case 'Link' : oItem = new FCKToolbarButton( 'Link' , FCKLang.InsertLinkLbl, FCKLang.InsertLink, null, false, true, 34 ) ; break ; + case 'Unlink' : oItem = new FCKToolbarButton( 'Unlink' , FCKLang.RemoveLink, null, null, false, true, 35 ) ; break ; + case 'Anchor' : oItem = new FCKToolbarButton( 'Anchor' , FCKLang.Anchor, null, null, null, null, 36 ) ; break ; - case 'Image' : oItem = new FCKToolbarButton( 'Image' , FCKLang.InsertImageLbl, FCKLang.InsertImage ) ; break ; - case 'Flash' : oItem = new FCKToolbarButton( 'Flash' , FCKLang.InsertFlashLbl, FCKLang.InsertFlash ) ; break ; - case 'Table' : oItem = new FCKToolbarButton( 'Table' , FCKLang.InsertTableLbl, FCKLang.InsertTable ) ; break ; - case 'SpecialChar' : oItem = new FCKToolbarButton( 'SpecialChar' , FCKLang.InsertSpecialCharLbl, FCKLang.InsertSpecialChar ) ; break ; - case 'Smiley' : oItem = new FCKToolbarButton( 'Smiley' , FCKLang.InsertSmileyLbl, FCKLang.InsertSmiley ) ; break ; - case 'PageBreak' : oItem = new FCKToolbarButton( 'PageBreak' , FCKLang.PageBreakLbl, FCKLang.PageBreak ) ; break ; - case 'UniversalKey' : oItem = new FCKToolbarButton( 'UniversalKey' , FCKLang.UniversalKeyboard ) ; break ; + case 'Image' : oItem = new FCKToolbarButton( 'Image' , FCKLang.InsertImageLbl, FCKLang.InsertImage, null, false, true, 37 ) ; break ; + case 'Flash' : oItem = new FCKToolbarButton( 'Flash' , FCKLang.InsertFlashLbl, FCKLang.InsertFlash, null, false, true, 38 ) ; break ; + case 'Table' : oItem = new FCKToolbarButton( 'Table' , FCKLang.InsertTableLbl, FCKLang.InsertTable, null, false, true, 39 ) ; break ; + case 'SpecialChar' : oItem = new FCKToolbarButton( 'SpecialChar' , FCKLang.InsertSpecialCharLbl, FCKLang.InsertSpecialChar, null, false, true, 42 ) ; break ; + case 'Smiley' : oItem = new FCKToolbarButton( 'Smiley' , FCKLang.InsertSmileyLbl, FCKLang.InsertSmiley, null, false, true, 41 ) ; break ; + case 'PageBreak' : oItem = new FCKToolbarButton( 'PageBreak' , FCKLang.PageBreakLbl, FCKLang.PageBreak, null, false, true, 43 ) ; break ; + case 'UniversalKey' : oItem = new FCKToolbarButton( 'UniversalKey' , FCKLang.UniversalKeyboard , null, null, false, true, 44) ; break ; - case 'Rule' : oItem = new FCKToolbarButton( 'InsertHorizontalRule', FCKLang.InsertLineLbl, FCKLang.InsertLine, null, false, true ) ; break ; + case 'Rule' : oItem = new FCKToolbarButton( 'InsertHorizontalRule', FCKLang.InsertLineLbl, FCKLang.InsertLine, null, false, true, 40 ) ; break ; - case 'JustifyLeft' : oItem = new FCKToolbarButton( 'JustifyLeft' , FCKLang.LeftJustify, null, null, false, true ) ; break ; - case 'JustifyCenter' : oItem = new FCKToolbarButton( 'JustifyCenter' , FCKLang.CenterJustify, null, null, false, true ) ; break ; - case 'JustifyRight' : oItem = new FCKToolbarButton( 'JustifyRight' , FCKLang.RightJustify, null, null, false, true ) ; break ; - case 'JustifyFull' : oItem = new FCKToolbarButton( 'JustifyFull' , FCKLang.BlockJustify, null, null, false, true ) ; break ; + case 'JustifyLeft' : oItem = new FCKToolbarButton( 'JustifyLeft' , FCKLang.LeftJustify, null, null, false, true, 30 ) ; break ; + case 'JustifyCenter' : oItem = new FCKToolbarButton( 'JustifyCenter' , FCKLang.CenterJustify, null, null, false, true, 31 ) ; break ; + case 'JustifyRight' : oItem = new FCKToolbarButton( 'JustifyRight' , FCKLang.RightJustify, null, null, false, true, 32 ) ; break ; + case 'JustifyFull' : oItem = new FCKToolbarButton( 'JustifyFull' , FCKLang.BlockJustify, null, null, false, true, 33 ) ; break ; case 'Style' : oItem = new FCKToolbarStyleCombo() ; break ; case 'FontName' : oItem = new FCKToolbarFontsCombo() ; break ; case 'FontSize' : oItem = new FCKToolbarFontSizeCombo() ; break ; case 'FontFormat' : oItem = new FCKToolbarFontFormatCombo() ; break ; - case 'TextColor' : oItem = new FCKToolbarPanelButton( 'TextColor', FCKLang.TextColor ) ; break ; - case 'BGColor' : oItem = new FCKToolbarPanelButton( 'BGColor' , FCKLang.BGColor ) ; break ; + case 'TextColor' : oItem = new FCKToolbarPanelButton( 'TextColor', FCKLang.TextColor, null, null, 45 ) ; break ; + case 'BGColor' : oItem = new FCKToolbarPanelButton( 'BGColor' , FCKLang.BGColor, null, null, 46 ) ; break ; - case 'Find' : oItem = new FCKToolbarButton( 'Find' , FCKLang.Find ) ; break ; - case 'Replace' : oItem = new FCKToolbarButton( 'Replace' , FCKLang.Replace ) ; break ; + case 'Find' : oItem = new FCKToolbarButton( 'Find' , FCKLang.Find, null, null, null, null, 16 ) ; break ; + case 'Replace' : oItem = new FCKToolbarButton( 'Replace' , FCKLang.Replace, null, null, null, null, 17 ) ; break ; - case 'Form' : oItem = new FCKToolbarButton( 'Form' , FCKLang.Form ) ; break ; - case 'Checkbox' : oItem = new FCKToolbarButton( 'Checkbox' , FCKLang.Checkbox ) ; break ; - case 'Radio' : oItem = new FCKToolbarButton( 'Radio' , FCKLang.RadioButton ) ; break ; - case 'TextField' : oItem = new FCKToolbarButton( 'TextField' , FCKLang.TextField ) ; break ; - case 'Textarea' : oItem = new FCKToolbarButton( 'Textarea' , FCKLang.Textarea ) ; break ; - case 'HiddenField' : oItem = new FCKToolbarButton( 'HiddenField' , FCKLang.HiddenField ) ; break ; - case 'Button' : oItem = new FCKToolbarButton( 'Button' , FCKLang.Button ) ; break ; - case 'Select' : oItem = new FCKToolbarButton( 'Select' , FCKLang.SelectionField ) ; break ; - case 'ImageButton' : oItem = new FCKToolbarButton( 'ImageButton' , FCKLang.ImageButton ) ; break ; + case 'Form' : oItem = new FCKToolbarButton( 'Form' , FCKLang.Form, null, null, null, null, 48 ) ; break ; + case 'Checkbox' : oItem = new FCKToolbarButton( 'Checkbox' , FCKLang.Checkbox, null, null, null, null, 49 ) ; break ; + case 'Radio' : oItem = new FCKToolbarButton( 'Radio' , FCKLang.RadioButton, null, null, null, null, 50 ) ; break ; + case 'TextField' : oItem = new FCKToolbarButton( 'TextField' , FCKLang.TextField, null, null, null, null, 51 ) ; break ; + case 'Textarea' : oItem = new FCKToolbarButton( 'Textarea' , FCKLang.Textarea, null, null, null, null, 52 ) ; break ; + case 'HiddenField' : oItem = new FCKToolbarButton( 'HiddenField' , FCKLang.HiddenField, null, null, null, null, 56 ) ; break ; + case 'Button' : oItem = new FCKToolbarButton( 'Button' , FCKLang.Button, null, null, null, null, 54 ) ; break ; + case 'Select' : oItem = new FCKToolbarButton( 'Select' , FCKLang.SelectionField, null, null, null, null, 53 ) ; break ; + case 'ImageButton' : oItem = new FCKToolbarButton( 'ImageButton' , FCKLang.ImageButton, null, null, null, null, 55 ) ; break ; default: alert( FCKLang.UnknownToolbarItem.replace( /%1/g, itemName ) ) ; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktoolbarset.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktoolbarset.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktoolbarset.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -18,62 +18,215 @@ * Frederico Caldeira Knabben (fredck at fckeditor.net) */ -var FCKToolbarSet = FCK.ToolbarSet = new Object() ; - -document.getElementById( 'ExpandHandle' ).title = FCKLang.ToolbarExpand ; -document.getElementById( 'CollapseHandle' ).title = FCKLang.ToolbarCollapse ; - -FCKToolbarSet.Toolbars = new Array() ; - -// Array of toolbat items that are active only on WYSIWYG mode. -FCKToolbarSet.ItemsWysiwygOnly = new Array() ; - -// Array of toolbar items that are sensitive to the cursor position. -FCKToolbarSet.ItemsContextSensitive = new Array() ; - -FCKToolbarSet.Expand = function() -{ - document.getElementById( 'Collapsed' ).style.display = 'none' ; - document.getElementById( 'Expanded' ).style.display = '' ; - - if ( ! FCKBrowserInfo.IsIE ) - { - // I had to use "setTimeout" because Gecko was not responding in a right - // way when calling window.onresize() directly. - window.setTimeout( "window.onresize()", 1 ) ; - } -} - -FCKToolbarSet.Collapse = function() -{ - document.getElementById( 'Collapsed' ).style.display = '' ; - document.getElementById( 'Expanded' ).style.display = 'none' ; - - if ( ! FCKBrowserInfo.IsIE ) - { - // I had to use "setTimeout" because Gecko was not responding in a right - // way when calling window.onresize() directly. - window.setTimeout( "window.onresize()", 1 ) ; - } -} - -FCKToolbarSet.Restart = function() -{ +function FCKToolbarSet_Create( overhideLocation ) +{ + var oToolbarSet ; + + var sLocation = overhideLocation || FCKConfig.ToolbarLocation ; + switch ( sLocation ) + { + case 'In' : + document.getElementById( 'xToolbarRow' ).style.display = '' ; + oToolbarSet = new FCKToolbarSet( document ) ; + break ; + +// case 'OutTop' : + // Not supported. + + default : + FCK.Events.AttachEvent( 'OnBlur', FCK_OnBlur ) ; + FCK.Events.AttachEvent( 'OnFocus', FCK_OnFocus ) ; + + var eToolbarTarget ; + + // Out:[TargetWindow]([TargetId]) + var oOutMatch = sLocation.match( /^Out:(.+)\((\w+)\)$/ ) ; + if ( oOutMatch ) + { + eToolbarTarget = eval( 'parent.' + oOutMatch[1] ).document.getElementById( oOutMatch[2] ) ; + } + else + { + // Out:[TargetId] + oOutMatch = sLocation.match( /^Out:(\w+)$/ ) ; + if ( oOutMatch ) + eToolbarTarget = parent.document.getElementById( oOutMatch[1] ) ; + } + + if ( !eToolbarTarget ) + { + alert( 'Invalid value for "ToolbarLocation"' ) ; + return this._Init( 'In' ) ; + } + + // If it is a shared toolbar, it may be already available in the target element. + if ( oToolbarSet = eToolbarTarget.__FCKToolbarSet ) + break ; + + // Create the IFRAME that will hold the toolbar inside the target element. + var eToolbarIFrame = eToolbarTarget.ownerDocument.createElement( 'IFRAME' ) ; + eToolbarIFrame.frameBorder = 0 ; + eToolbarIFrame.width = '100%' ; + eToolbarIFrame.height = '10' ; + eToolbarTarget.appendChild( eToolbarIFrame ) ; + eToolbarIFrame.unselectable = 'on' ; + + // Write the basic HTML for the toolbar (copy from the editor main page). + var eTargetDocument = eToolbarIFrame.contentWindow.document ; + eTargetDocument.open() ; + eTargetDocument.write( '' + document.getElementById( 'xToolbarSpace' ).innerHTML + '' ) ; + eTargetDocument.close() ; + + eTargetDocument.oncontextmenu = FCKTools.CancelEvent ; + + // Load external resources (must be done here, otherwise Firefox will not + // have the document DOM ready to be used right away. + FCKTools.AppendStyleSheet( eTargetDocument, FCKConfig.SkinPath + 'fck_editor.css' ) ; + + oToolbarSet = eToolbarTarget.__FCKToolbarSet = new FCKToolbarSet( eTargetDocument ) ; + oToolbarSet._IFrame = eToolbarIFrame ; + + if ( FCK.IECleanup ) + FCK.IECleanup.AddItem( eToolbarTarget, FCKToolbarSet_Target_Cleanup ) ; + } + + oToolbarSet.CurrentInstance = FCK ; + + FCK.AttachToOnSelectionChange( oToolbarSet.RefreshItemsState ) ; + + return oToolbarSet ; +} + +function FCK_OnBlur( editorInstance ) +{ + var eToolbarSet = editorInstance.ToolbarSet ; + + if ( eToolbarSet.CurrentInstance == editorInstance ) + { +// var eIFrame = eToolbarSet._IFrame ; +// if ( eIFrame.ownerDocument.activeElement != eIFrame ) + eToolbarSet.Disable() ; + } +} + +function FCK_OnFocus( editorInstance ) +{ + var oToolbarset = editorInstance.ToolbarSet ; + var oInstance = editorInstance || FCK ; + + // Unregister the toolbar window from the current instance. + oToolbarset.CurrentInstance.FocusManager.RemoveWindow( oToolbarset._IFrame.contentWindow ) ; + + // Set the new current instance. + oToolbarset.CurrentInstance = oInstance ; + + // Register the toolbar window in the current instance. + oInstance.FocusManager.AddWindow( oToolbarset._IFrame.contentWindow, true ) ; + + oToolbarset.Enable() ; +} + +function FCKToolbarSet_Cleanup() +{ + this._TargetElement = null ; + this._IFrame = null ; +} + +function FCKToolbarSet_Target_Cleanup() +{ + this.__FCKToolbarSet = null ; +} + +var FCKToolbarSet = function( targetDocument ) +{ + this._Document = targetDocument ; + + // Get the element that will hold the elements structure. + this._TargetElement = targetDocument.getElementById( 'xToolbar' ) ; + + // Setup the expand and collapse handlers. + var eExpandHandle = targetDocument.getElementById( 'xExpandHandle' ) ; + var eCollapseHandle = targetDocument.getElementById( 'xCollapseHandle' ) ; + + eExpandHandle.title = FCKLang.ToolbarExpand ; + eExpandHandle.onclick = FCKToolbarSet_Expand_OnClick ; + + eCollapseHandle.title = FCKLang.ToolbarCollapse ; + eCollapseHandle.onclick = FCKToolbarSet_Collapse_OnClick ; + + // Set the toolbar state at startup. if ( !FCKConfig.ToolbarCanCollapse || FCKConfig.ToolbarStartExpanded ) this.Expand() ; else this.Collapse() ; - - document.getElementById( 'CollapseHandle' ).style.display = FCKConfig.ToolbarCanCollapse ? '' : 'none' ; -} - -FCKToolbarSet.Load = function( toolbarSetName ) -{ - this.DOMElement = document.getElementById( 'eToolbar' ) ; + + // Enable/disable the collapse handler + eCollapseHandle.style.display = FCKConfig.ToolbarCanCollapse ? '' : 'none' ; + + if ( FCKConfig.ToolbarCanCollapse ) + eCollapseHandle.style.display = '' ; + else + targetDocument.getElementById( 'xTBLeftBorder' ).style.display = '' ; + + // Set the default properties. + this.Toolbars = new Array() ; + this.IsLoaded = false ; + + if ( FCK.IECleanup ) + FCK.IECleanup.AddItem( this, FCKToolbarSet_Cleanup ) ; +} + +function FCKToolbarSet_Expand_OnClick() +{ + FCK.ToolbarSet.Expand() ; +} + +function FCKToolbarSet_Collapse_OnClick() +{ + FCK.ToolbarSet.Collapse() ; +} + +FCKToolbarSet.prototype.Expand = function() +{ + this._ChangeVisibility( false ) ; +} + +FCKToolbarSet.prototype.Collapse = function() +{ + this._ChangeVisibility( true ) ; +} + +FCKToolbarSet.prototype._ChangeVisibility = function( collapse ) +{ + this._Document.getElementById( 'xCollapsed' ).style.display = collapse ? '' : 'none' ; + this._Document.getElementById( 'xExpanded' ).style.display = collapse ? 'none' : '' ; + + if ( FCKBrowserInfo.IsGecko ) + { + // I had to use "setTimeout" because Gecko was not responding in a right + // way when calling window.onresize() directly. + FCKTools.RunFunction( window.onresize ) ; + } +} + +FCKToolbarSet.prototype.Load = function( toolbarSetName ) +{ + this.Name = toolbarSetName ; + + this.Items = new Array() ; + + // Reset the array of toolbat items that are active only on WYSIWYG mode. + this.ItemsWysiwygOnly = new Array() ; + + // Reset the array of toolbar items that are sensitive to the cursor position. + this.ItemsContextSensitive = new Array() ; + + // Cleanup the target element. + this._TargetElement.innerHTML = '' ; var ToolbarSet = FCKConfig.ToolbarSets[toolbarSetName] ; - if (! ToolbarSet) + if ( !ToolbarSet ) { alert( FCKLang.UnknownToolbarSet.replace( /%1/g, toolbarSetName ) ) ; return ; @@ -109,58 +262,95 @@ { oToolbar.AddItem( oItem ) ; + this.Items.push( oItem ) ; + if ( !oItem.SourceView ) - this.ItemsWysiwygOnly[this.ItemsWysiwygOnly.length] = oItem ; + this.ItemsWysiwygOnly.push( oItem ) ; if ( oItem.ContextSensitive ) - this.ItemsContextSensitive[this.ItemsContextSensitive.length] = oItem ; + this.ItemsContextSensitive.push( oItem ) ; } } } - oToolbar.AddTerminator() ; + // oToolbar.AddTerminator() ; } + + oToolbar.Create( this._TargetElement ) ; this.Toolbars[ this.Toolbars.length ] = oToolbar ; } -} - -FCKToolbarSet.RefreshModeState = function() -{ + + FCKTools.DisableSelection( this._Document.getElementById( 'xCollapseHandle' ).parentNode ) ; + + if ( FCK.Status != FCK_STATUS_COMPLETE ) + FCK.Events.AttachEvent( 'OnStatusChange', this.RefreshModeState ) ; + else + this.RefreshModeState() ; + + this.IsLoaded = true ; + this.IsEnabled = true ; + + FCKTools.RunFunction( this.OnLoad ) ; +} + +FCKToolbarSet.prototype.Enable = function() +{ + if ( this.IsEnabled ) + return ; + + this.IsEnabled = true ; + + var aItems = this.Items ; + for ( var i = 0 ; i < aItems.length ; i++ ) + aItems[i].RefreshState() ; +} + +FCKToolbarSet.prototype.Disable = function() +{ + if ( !this.IsEnabled ) + return ; + + this.IsEnabled = false ; + + var aItems = this.Items ; + for ( var i = 0 ; i < aItems.length ; i++ ) + aItems[i].Disable() ; +} + +FCKToolbarSet.prototype.RefreshModeState = function( editorInstance ) +{ + if ( FCK.Status != FCK_STATUS_COMPLETE ) + return ; + + var oToolbarSet = editorInstance ? editorInstance.ToolbarSet : this ; + var aItems = oToolbarSet.ItemsWysiwygOnly ; + if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) { // Enable all buttons that are available on WYSIWYG mode only. - for ( var i = 0 ; i < FCKToolbarSet.ItemsWysiwygOnly.length ; i++ ) - FCKToolbarSet.ItemsWysiwygOnly[i].Enable() ; + for ( var i = 0 ; i < aItems.length ; i++ ) + aItems[i].Enable() ; // Refresh the buttons state. - FCKToolbarSet.RefreshItemsState() ; + oToolbarSet.RefreshItemsState( editorInstance ) ; } else { // Refresh the buttons state. - FCKToolbarSet.RefreshItemsState() ; + oToolbarSet.RefreshItemsState( editorInstance ) ; // Disable all buttons that are available on WYSIWYG mode only. - for ( var i = 0 ; i < FCKToolbarSet.ItemsWysiwygOnly.length ; i++ ) - FCKToolbarSet.ItemsWysiwygOnly[i].Disable() ; + for ( var i = 0 ; i < aItems.length ; i++ ) + aItems[i].Disable() ; } } -FCKToolbarSet.RefreshItemsState = function() -{ - - for ( var i = 0 ; i < FCKToolbarSet.ItemsContextSensitive.length ; i++ ) - FCKToolbarSet.ItemsContextSensitive[i].RefreshState() ; -/* - TODO: Delete this commented block on stable version. - for ( var i = 0 ; i < FCKToolbarSet.Toolbars.length ; i++ ) - { - var oToolbar = FCKToolbarSet.Toolbars[i] ; - for ( var j = 0 ; j < oToolbar.Items.length ; j++ ) - { - oToolbar.Items[j].RefreshState() ; - } - } -*/ -} +FCKToolbarSet.prototype.RefreshItemsState = function( editorInstance ) +{ + + var aItems = ( editorInstance ? editorInstance.ToolbarSet : this ).ItemsContextSensitive ; + + for ( var i = 0 ; i < aItems.length ; i++ ) + aItems[i].RefreshState() ; +} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -19,20 +19,21 @@ var FCKTools = new Object() ; -//** -// FCKTools.GetLinkedFieldValue: Gets the value of the hidden INPUT element -// that is associated to the editor. This element has its ID set to the -// editor's instance name so the user reffers to the instance name when getting -// the posted data. +/** + * Gets the value of the hidden INPUT element that is associated to the editor. + * This element has its ID set to the editor's instance name so the user refers + * to the instance name when getting the posted data. + */ FCKTools.GetLinkedFieldValue = function() { return FCK.LinkedField.value ; } -//** -// FCKTools.AttachToLinkedFieldFormSubmit: attaches a function call to the -// submit event of the linked field form. This function us generally used to -// update the linked field value before submitting the form. +/** + * Attachs a function call to the submit event of the linked field form. This + * function us generally used to update the linked field value before + * submitting the form. + */ FCKTools.AttachToLinkedFieldFormSubmit = function( functionPointer ) { // Gets the linked field form @@ -45,7 +46,7 @@ if ( FCKBrowserInfo.IsIE ) oForm.attachEvent( "onsubmit", functionPointer ) ; else - oForm.addEventListener( 'submit', functionPointer, true ) ; + oForm.addEventListener( 'submit', functionPointer, false ) ; //** // Attaches the functionPointer call to the submit method @@ -85,78 +86,24 @@ this.originalSubmit() ; } -//** -// FCKTools.AddSelectOption: Adds a option to a SELECT element. -FCKTools.AddSelectOption = function( targetDocument, selectElement, optionText, optionValue ) -{ - var oOption = targetDocument.createElement("OPTION") ; - - oOption.text = optionText ; - oOption.value = optionValue ; - - selectElement.options.add(oOption) ; - - return oOption ; -} -/* -FCKTools.RemoveAllSelectOptions = function( selectElement ) -{ - for ( var i = selectElement.options.length - 1 ; i >= 0 ; i-- ) - { - selectElement.options.remove(i) ; - } -} - -FCKTools.SelectNoCase = function( selectElement, value, defaultValue ) -{ - var sNoCaseValue = value.toString().toLowerCase() ; - - for ( var i = 0 ; i < selectElement.options.length ; i++ ) - { - if ( sNoCaseValue == selectElement.options[i].value.toLowerCase() ) - { - selectElement.selectedIndex = i ; - return ; - } - } - - if ( defaultValue != null ) FCKTools.SelectNoCase( selectElement, defaultValue ) ; -} -*/ -FCKTools.HTMLEncode = function( text ) -{ - if ( !text ) - return '' ; - - text = text.replace( /&/g, "&" ) ; - text = text.replace( /"/g, """ ) ; - text = text.replace( //g, ">" ) ; - text = text.replace( /'/g, "'" ) ; - - return text ; -} -/* -//** -// FCKTools.GetResultingArray: Gets a array from a string (where the elements -// are separated by a character), a fuction (that returns a array) or a array. -FCKTools.GetResultingArray = function( arraySource, separator ) -{ - switch ( typeof( arraySource ) ) - { - case "string" : - return arraySource.split( separator ) ; - case "function" : - return separator() ; - default : - if ( isArray( arraySource ) ) return arraySource ; - else return new Array() ; - } -} -*/ +// Get the window object where the element is placed in. +FCKTools.GetElementWindow = function( element ) +{ + return FCKTools.GetDocumentWindow( element.ownerDocument ) ; +} + +FCKTools.GetDocumentWindow = function( doc ) +{ + // With Safari, there is not way to retrieve the window from the document, so we must fix it. + if ( FCKBrowserInfo.IsSafari && !doc.parentWindow ) + FCKTools.FixDocumentParentWindow( window.top ) ; + + return doc.parentWindow || doc.defaultView ; +} + FCKTools.GetElementPosition = function( el, relativeWindow ) { -// Initializes the Coordinates object that will be returned by the function. + // Initializes the Coordinates object that will be returned by the function. var c = { X:0, Y:0 } ; var oWindow = relativeWindow || window ; @@ -164,8 +111,8 @@ // Loop throw the offset chain. while ( el ) { - c.X += el.offsetLeft ; - c.Y += el.offsetTop ; + c.X += el.offsetLeft - el.scrollLeft ; + c.Y += el.offsetTop - el.scrollTop ; if ( el.offsetParent == null ) { @@ -174,7 +121,11 @@ if ( oOwnerWindow != oWindow ) el = oOwnerWindow.frameElement ; else + { + c.X += el.scrollLeft ; + c.Y += el.scrollTop ; break ; + } } else el = el.offsetParent ; @@ -182,6 +133,89 @@ // Return the Coordinates object return c ; +} + +/* + This is a Safari specific function that fix the reference to the parent + window from the document object. +*/ +FCKTools.FixDocumentParentWindow = function( targetWindow ) +{ + targetWindow.document.parentWindow = targetWindow ; + + for ( var i = 0 ; i < targetWindow.frames.length ; i++ ) + FCKTools.FixDocumentParentWindow( targetWindow.frames[i] ) ; +} + +FCKTools.GetParentWindow = function( document ) +{ + return document.contentWindow ? document.contentWindow : document.parentWindow ; +} + +FCKTools.HTMLEncode = function( text ) +{ + if ( !text ) + return '' ; + + text = text.replace( /&/g, '&' ) ; + text = text.replace( //g, '>' ) ; + + return text ; +} + +/** + * Adds an option to a SELECT element. + */ +FCKTools.AddSelectOption = function( selectElement, optionText, optionValue ) +{ + var oOption = selectElement.ownerDocument.createElement( "OPTION" ) ; + + oOption.text = optionText ; + oOption.value = optionValue ; + + selectElement.options.add(oOption) ; + + return oOption ; +} + +FCKTools.RunFunction = function( func, thisObject, paramsArray, timerWindow ) +{ + if ( func ) + this.SetTimeout( func, 0, thisObject, paramsArray, timerWindow ) ; +} + +FCKTools.SetTimeout = function( func, milliseconds, thisObject, paramsArray, timerWindow ) +{ + return ( timerWindow || window ).setTimeout( + function() + { + if ( paramsArray ) + func.apply( thisObject, [].concat( paramsArray ) ) ; + else + func.apply( thisObject ) ; + }, + milliseconds ) ; +} + +FCKTools.SetInterval = function( func, milliseconds, thisObject, paramsArray, timerWindow ) +{ + return ( timerWindow || window ).setInterval( + function() + { + func.apply( thisObject, paramsArray || [] ) ; + }, + milliseconds ) ; +} + +FCKTools.ConvertStyleSizeToHtml = function( size ) +{ + return size.endsWith( '%' ) ? size : parseInt( size ) ; +} + +FCKTools.ConvertHtmlSizeToStyle = function( size ) +{ + return size.endsWith( '%' ) ? size : ( size + 'px' ) ; } // START iCM MODIFICATIONS @@ -204,125 +238,17 @@ } // END iCM MODIFICATIONS -FCKTools.Pause = function( miliseconds ) -{ - var oStart = new Date() ; - - while (true) - { - var oNow = new Date() ; - if ( miliseconds < oNow - oStart ) - return ; - } -} - -FCKTools.ConvertStyleSizeToHtml = function( size ) -{ - return size.endsWith( '%' ) ? size : parseInt( size ) ; -} - -FCKTools.ConvertHtmlSizeToStyle = function( size ) -{ - return size.endsWith( '%' ) ? size : ( size + 'px' ) ; -} - -// Get the window object where the element is placed in. -FCKTools.GetElementWindow = function( element ) -{ - var oDocument = element.ownerDocument || element.document ; - - // With Safari, there is not way to retrieve the window from the document, so we must fix it. - if ( FCKBrowserInfo.IsSafari && !oDocument.parentWindow ) - FCKTools._FixDocumentParentWindow( window.top ) ; - - return oDocument.parentWindow || oDocument.defaultView ; -} - -/* - This is a Safari specific function that fix the reference to the parent - window from the document object. -*/ -FCKTools._FixDocumentParentWindow = function( targetWindow ) -{ - targetWindow.document.parentWindow = targetWindow ; - - for ( var i = 0 ; i < targetWindow.frames.length ; i++ ) - FCKTools._FixDocumentParentWindow( targetWindow.frames[i] ) ; -} - -FCKTools.CancelEvent = function( e ) -{ - return false ; -} - -// START iCM MODIFICATIONS -/* -// Transfers the supplied attributes to the supplied node -FCKTools.SetElementAttributes = function( oElement, oAttributes ) -{ - for ( var i = 0; i < oAttributes.length; i++ ) - { - if ( oAttributes[i].specified ) // Needed for IE which always returns all attributes whether set or not - oElement.setAttribute( oAttributes[i].nodeName, oAttributes[i].nodeValue, 0 ) ; - } -} - -// Get immediate block node (P, H1, for example) for the supplied node - the supplied node may itself be a block node in which -// case it will be returned. If no block node found, returns null. -FCKTools.GetParentBlockNode = function( oNode ) -{ - if ( oNode.nodeName.toUpperCase() == "BODY" ) - return null ; - else if ( oNode.nodeType == 1 && FCKRegexLib.BlockElements.test(oNode.tagName) ) - return oNode ; - else - return FCKTools.GetParentBlockNode( oNode.parentNode ) ; -} - -// Run through any children of the supplied node. If there are none, or they only comprise -// empty text nodes and BR nodes, then the node is effectively empty. -// Sometimes (on Gecko) a seemingly empty node is coming back with several children that are solely -// empty text nodes and BRs e.g. the first item in an OL list, for example, when -// UseBROnCarriageReturn is set to false. -// Seems to be due to the use of the
(GECKO_BOGUS) as fillers both -// in fck_gecko_1.js when html is empty and in ENTER key handler ? If normal BR tags are -// used instead this doesn't seem to happen.... -FCKTools.NodeIsEmpty = function( oNode ) -{ - var oSibling = oNode.childNodes[0] ; - while ( oSibling ) - { - if ( ( oSibling.nodeType != 1 && oSibling.nodeType != 3 ) || ( oSibling.nodeType == 1 && oSibling.nodeName.toUpperCase() != "BR" ) || ( oSibling.nodeType == 3 && oSibling.nodeValue && oSibling.nodeValue.trim() != '' ) ) - return false ; +FCKTools.CreateEventListener = function( func, params ) +{ + var f = function() + { + var aAllParams = [] ; - oSibling = oSibling.nextSibling ; - } - - return true ; -} - -// Returns a document fragment that contains a copy of the specified range of nodes -FCKTools.GetDocumentFragment = function( oParentNode, oFromNode, oToNode, bIncludeFromNode, bIncludeToNode, bClone ) -{ - if ( typeof bIncludeFromNode == "undefined" ) bIncludeFromNode = true ; - if ( typeof bIncludeToNode == "undefined" ) bIncludeToNode = true ; - if ( typeof bClone == "undefined" ) bClone = true ; - - var oFragment = FCK.EditorDocument.createDocumentFragment() ; - - var oNode = oFromNode ; - while ( oNode && oNode != oToNode ) - { - if ( oNode != oFromNode || bIncludeFromNode ) - oFragment.appendChild( bClone ? oNode.cloneNode( true ) : oNode ) ; - - oNode = oNode.nextSibling ; - } - - if ( oNode && (oFromNode != oToNode && bIncludeToNode) ) - oFragment.appendChild( bClone ? oNode.cloneNode( true ) : oNode ) ; // Include To Node - - return oFragment ; -} -*/ -// END iCM MODIFICATIONS + for ( var i = 0 ; i < arguments.length ; i++ ) + aAllParams.push( arguments[i] ) ; + + func.apply( this, aAllParams.concat( params ) ) ; + } + + return f ; +} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools_gecko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools_gecko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools_gecko.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -18,7 +18,21 @@ */ // Constant for the Gecko Bogus Node. -var GECKO_BOGUS = '
' ; +var GECKO_BOGUS = FCKBrowserInfo.IsGecko ? '
' : '' ; + +FCKTools.CancelEvent = function( e ) +{ + if ( e ) + e.preventDefault() ; +} + +FCKTools.DisableSelection = function( element ) +{ + if ( FCKBrowserInfo.IsGecko ) + element.style.MozUserSelect = 'none' ; // Gecko only. + else + element.style.userSelect = 'none' ; // CSS3 (not supported yet). +} // Appends a CSS file to a document. FCKTools.AppendStyleSheet = function( documentElement, cssFileUrl ) @@ -91,10 +105,77 @@ return null ; } -FCKTools.DisableSelection = function( element ) -{ - element.style.MozUserSelect = 'none' ; // Gecko only. - // element.style.userSelect = 'none' ; // CSS3 (not supported yet). +FCKTools.GetScrollPosition = function( relativeWindow ) +{ + return { X : relativeWindow.pageXOffset, Y : relativeWindow.pageYOffset } ; +} + +FCKTools.AddEventListener = function( sourceObject, eventName, listener ) +{ + sourceObject.addEventListener( eventName, listener, false ) ; +} + +FCKTools.RemoveEventListener = function( sourceObject, eventName, listener ) +{ + sourceObject.removeEventListener( eventName, listener, false ) ; +} + +// Listeners attached with this function cannot be detached. +FCKTools.AddEventListenerEx = function( sourceObject, eventName, listener, paramsArray ) +{ + sourceObject.addEventListener( + eventName, + function( e ) + { + listener.apply( sourceObject, [ e ].concat( paramsArray || [] ) ) ; + }, + false + ) ; +} + +// Returns and object with the "Width" and "Height" properties. +FCKTools.GetViewPaneSize = function( win ) +{ + return { Width : win.innerWidth, Height : win.innerHeight } ; +} + +FCKTools.SaveStyles = function( element ) +{ + var oSavedStyles = new Object() ; + + if ( element.className.length > 0 ) + { + oSavedStyles.Class = element.className ; + element.className = '' ; + } + + var sInlineStyle = element.getAttribute( 'style' ) ; + + if ( sInlineStyle && sInlineStyle.length > 0 ) + { + oSavedStyles.Inline = sInlineStyle ; + element.setAttribute( 'style', '', 0 ) ; // 0 : Case Insensitive + } + + return oSavedStyles ; +} + +FCKTools.RestoreStyles = function( element, savedStyles ) +{ + element.className = savedStyles.Class || '' ; + + if ( savedStyles.Inline ) + element.setAttribute( 'style', savedStyles.Inline, 0 ) ; // 0 : Case Insensitive + else + element.removeAttribute( 'style', 0 ) ; +} + +FCKTools.RegisterDollarFunction = function( targetWindow ) +{ + targetWindow.$ = function( id ) + { + return this.document.getElementById( id ) ; + } ; } // START iCM Modifications Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fcktools_ie.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -17,10 +17,15 @@ * Frederico Caldeira Knabben (fredck at fckeditor.net) */ +FCKTools.CancelEvent = function( e ) +{ + return false ; +} + // Appends a CSS file to a document. FCKTools.AppendStyleSheet = function( documentElement, cssFileUrl ) { - return documentElement.createStyleSheet( cssFileUrl ) ; + return documentElement.createStyleSheet( cssFileUrl ).owningElement ; } // Removes all attributes and values from the element. @@ -95,4 +100,98 @@ e.unselectable = 'on' ; } } +} + +FCKTools.GetScrollPosition = function( relativeWindow ) +{ + var oDoc = relativeWindow.document ; + + // Try with the doc element. + var oPos = { X : oDoc.documentElement.scrollLeft, Y : oDoc.documentElement.scrollTop } ; + + if ( oPos.X > 0 || oPos.Y > 0 ) + return oPos ; + + // If no scroll, try with the body. + return { X : oDoc.body.scrollLeft, Y : oDoc.body.scrollTop } ; +} + +FCKTools.AddEventListener = function( sourceObject, eventName, listener ) +{ + sourceObject.attachEvent( 'on' + eventName, listener ) ; +} + +FCKTools.RemoveEventListener = function( sourceObject, eventName, listener ) +{ + sourceObject.detachEvent( 'on' + eventName, listener ) ; +} + +// Listeners attached with this function cannot be detached. +FCKTools.AddEventListenerEx = function( sourceObject, eventName, listener, paramsArray ) +{ + // Ok... this is a closures party, but is the only way to make it clean of memory leaks. + var o = new Object() ; + o.Source = sourceObject ; + o.Params = paramsArray || [] ; // Memory leak if we have DOM objects here. + o.Listener = function( ev ) + { + return listener.apply( o.Source, [ ev ].concat( o.Params ) ) ; + } + + if ( FCK.IECleanup ) + FCK.IECleanup.AddItem( null, function() { o.Source = null ; o.Params = null ; } ) ; + + sourceObject.attachEvent( 'on' + eventName, o.Listener ) ; + + sourceObject = null ; // Memory leak cleaner (because of the above closure). + paramsArray = null ; // Memory leak cleaner (because of the above closure). +} + +// Returns and object with the "Width" and "Height" properties. +FCKTools.GetViewPaneSize = function( win ) +{ + var oSizeSource ; + + var oDoc = win.document.documentElement ; + if ( oDoc && oDoc.clientWidth ) // IE6 Strict Mode + oSizeSource = oDoc ; + else + oSizeSource = top.document.body ; // Other IEs + + if ( oSizeSource ) + return { Width : oSizeSource.clientWidth, Height : oSizeSource.clientHeight } ; + else + return { Width : 0, Height : 0 } ; +} + +FCKTools.SaveStyles = function( element ) +{ + var oSavedStyles = new Object() ; + + if ( element.className.length > 0 ) + { + oSavedStyles.Class = element.className ; + element.className = '' ; + } + + var sInlineStyle = element.style.cssText ; + + if ( sInlineStyle.length > 0 ) + { + oSavedStyles.Inline = sInlineStyle ; + element.style.cssText = '' ; + } + + return oSavedStyles ; +} + +FCKTools.RestoreStyles = function( element, savedStyles ) +{ + element.className = savedStyles.Class || '' ; + element.style.cssText = savedStyles.Inline || '' ; +} + +FCKTools.RegisterDollarFunction = function( targetWindow ) +{ + targetWindow.$ = targetWindow.document.getElementById ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckundo_gecko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckundo_gecko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckundo_gecko.js Wed Jul 12 07:45:05 2006 @@ -1,4 +1,23 @@ -???var FCKUndo = new Object() ; - -FCKUndo.SaveUndoStep = function() +???/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2006 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * "Support Open Source software. What about a donation today?" + * + * File Name: fckundo_gecko.js + * Fake implementation to ignore calls on Gecko. + * + * File Authors: + * Frederico Caldeira Knabben (fredck at fckeditor.net) + */ + +var FCKUndo = new Object() ; + +FCKUndo.SaveUndoStep = function() {} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckundo_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckundo_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckundo_ie.js Wed Jul 12 07:45:05 2006 @@ -1,97 +1,119 @@ -???var FCKUndo = new Object() ; - -FCKUndo.SavedData = new Array() ; -FCKUndo.CurrentIndex = -1 ; -FCKUndo.TypesCount = FCKUndo.MaxTypes = 25 ; -FCKUndo.Typing = false ; - -FCKUndo.SaveUndoStep = function() -{ - // Shrink the array to the current level. - FCKUndo.SavedData = FCKUndo.SavedData.slice( 0, FCKUndo.CurrentIndex + 1 ) ; - - // Get the Actual HTML. - var sHtml = FCK.EditorDocument.body.innerHTML ; - - // Cancel operation if the new step is identical to the previous one. - if ( FCKUndo.CurrentIndex >= 0 && sHtml == FCKUndo.SavedData[ FCKUndo.CurrentIndex ][0] ) - return ; - - // If we reach the Maximun number of undo levels, we must remove the first - // entry of the list shifting all elements. - if ( FCKUndo.CurrentIndex + 1 >= FCKConfig.MaxUndoLevels ) - FCKUndo.SavedData.shift() ; - else - FCKUndo.CurrentIndex++ ; - - // Get the actual selection. - var sBookmark ; - if ( FCK.EditorDocument.selection.type == 'Text' ) - sBookmark = FCK.EditorDocument.selection.createRange().getBookmark() ; - - // Save the new level in front of the actual position. - FCKUndo.SavedData[ FCKUndo.CurrentIndex ] = [ sHtml, sBookmark ] ; - - FCK.Events.FireEvent( "OnSelectionChange" ) ; -} - -FCKUndo.CheckUndoState = function() -{ - return ( FCKUndo.Typing || FCKUndo.CurrentIndex > 0 ) ; -} - -FCKUndo.CheckRedoState = function() -{ - return ( !FCKUndo.Typing && FCKUndo.CurrentIndex < ( FCKUndo.SavedData.length - 1 ) ) ; -} - -FCKUndo.Undo = function() -{ - if ( FCKUndo.CheckUndoState() ) - { - // If it is the first step. - if ( FCKUndo.CurrentIndex == ( FCKUndo.SavedData.length - 1 ) ) - { - // Save the actual state for a possible "Redo" call. - FCKUndo.SaveUndoStep() ; - } - - // Go a step back. - FCKUndo._ApplyUndoLevel( --FCKUndo.CurrentIndex ) ; - - FCK.Events.FireEvent( "OnSelectionChange" ) ; - } -} - -FCKUndo.Redo = function() -{ - if ( FCKUndo.CheckRedoState() ) - { - // Go a step forward. - FCKUndo._ApplyUndoLevel( ++FCKUndo.CurrentIndex ) ; - - FCK.Events.FireEvent( "OnSelectionChange" ) ; - } -} - -FCKUndo._ApplyUndoLevel = function(level) -{ - var oData = FCKUndo.SavedData[ level ] ; - - if ( !oData ) - return ; - - // Update the editor contents with that step data. - FCK.SetInnerHtml( oData[0] ) ; -// FCK.EditorDocument.body.innerHTML = oData[0] ; - - if ( oData[1] ) - { - var oRange = FCK.EditorDocument.selection.createRange() ; - oRange.moveToBookmark( oData[1] ) ; - oRange.select() ; - } - - FCKUndo.TypesCount = 0 ; - FCKUndo.Typing = false ; +???/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2006 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * "Support Open Source software. What about a donation today?" + * + * File Name: fckundo_ie.js + * IE specific implementation for the Undo/Redo system. + * + * File Authors: + * Frederico Caldeira Knabben (fredck at fckeditor.net) + */ + +var FCKUndo = new Object() ; + +FCKUndo.SavedData = new Array() ; +FCKUndo.CurrentIndex = -1 ; +FCKUndo.TypesCount = FCKUndo.MaxTypes = 25 ; +FCKUndo.Typing = false ; + +FCKUndo.SaveUndoStep = function() +{ + if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ) + return ; + + // Shrink the array to the current level. + FCKUndo.SavedData = FCKUndo.SavedData.slice( 0, FCKUndo.CurrentIndex + 1 ) ; + + // Get the Actual HTML. + var sHtml = FCK.EditorDocument.body.innerHTML ; + + // Cancel operation if the new step is identical to the previous one. + if ( FCKUndo.CurrentIndex >= 0 && sHtml == FCKUndo.SavedData[ FCKUndo.CurrentIndex ][0] ) + return ; + + // If we reach the Maximun number of undo levels, we must remove the first + // entry of the list shifting all elements. + if ( FCKUndo.CurrentIndex + 1 >= FCKConfig.MaxUndoLevels ) + FCKUndo.SavedData.shift() ; + else + FCKUndo.CurrentIndex++ ; + + // Get the actual selection. + var sBookmark ; + if ( FCK.EditorDocument.selection.type == 'Text' ) + sBookmark = FCK.EditorDocument.selection.createRange().getBookmark() ; + + // Save the new level in front of the actual position. + FCKUndo.SavedData[ FCKUndo.CurrentIndex ] = [ sHtml, sBookmark ] ; + + FCK.Events.FireEvent( "OnSelectionChange" ) ; +} + +FCKUndo.CheckUndoState = function() +{ + return ( FCKUndo.Typing || FCKUndo.CurrentIndex > 0 ) ; +} + +FCKUndo.CheckRedoState = function() +{ + return ( !FCKUndo.Typing && FCKUndo.CurrentIndex < ( FCKUndo.SavedData.length - 1 ) ) ; +} + +FCKUndo.Undo = function() +{ + if ( FCKUndo.CheckUndoState() ) + { + // If it is the first step. + if ( FCKUndo.CurrentIndex == ( FCKUndo.SavedData.length - 1 ) ) + { + // Save the actual state for a possible "Redo" call. + FCKUndo.SaveUndoStep() ; + } + + // Go a step back. + FCKUndo._ApplyUndoLevel( --FCKUndo.CurrentIndex ) ; + + FCK.Events.FireEvent( "OnSelectionChange" ) ; + } +} + +FCKUndo.Redo = function() +{ + if ( FCKUndo.CheckRedoState() ) + { + // Go a step forward. + FCKUndo._ApplyUndoLevel( ++FCKUndo.CurrentIndex ) ; + + FCK.Events.FireEvent( "OnSelectionChange" ) ; + } +} + +FCKUndo._ApplyUndoLevel = function(level) +{ + var oData = FCKUndo.SavedData[ level ] ; + + if ( !oData ) + return ; + + // Update the editor contents with that step data. + FCK.SetInnerHtml( oData[0] ) ; +// FCK.EditorDocument.body.innerHTML = oData[0] ; + + if ( oData[1] ) + { + var oRange = FCK.EditorDocument.selection.createRange() ; + oRange.moveToBookmark( oData[1] ) ; + oRange.select() ; + } + + FCKUndo.TypesCount = 0 ; + FCKUndo.Typing = false ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckurlparams.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckurlparams.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckurlparams.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -23,6 +23,10 @@ FCKXHtml.GetXHTML = function( node, includeNode, format ) { + FCKXHtmlEntities.Initialize() ; + + this._CreateNode = FCKConfig.ForceStrongEm ? FCKXHtml_CreateNode_StrongEm : FCKXHtml_CreateNode_Normal ; + // Special blocks are blocks of content that remain untouched during the // process. It is used for SCRIPTs and STYLEs. FCKXHtml.SpecialBlocks = new Array() ; @@ -125,6 +129,9 @@ { // Element Node. case 1 : + + // Here we found an element that is not the real element, but a + // fake one (like the Flash placeholder image), so we must get the real one. if ( htmlNode.getAttribute('_fckfakelement') ) return FCKXHtml._AppendNode( xmlNode, FCK.GetRealElement( htmlNode ) ) ; @@ -132,6 +139,8 @@ if ( FCKBrowserInfo.IsGecko && htmlNode.hasAttribute('_moz_editor_bogus_node') ) return false ; + // This is for elements that are instrumental for FCKeditor and + // should be removed from the final HTML. if ( htmlNode.getAttribute('_fckdelete') ) return false ; @@ -170,7 +179,7 @@ if ( oTagProcessor ) { - oNode = oTagProcessor( oNode, htmlNode ) ; + oNode = oTagProcessor( oNode, htmlNode, xmlNode ) ; if ( !oNode ) break ; } else @@ -199,34 +208,29 @@ return true ; } -if ( FCKConfig.ForceStrongEm ) -{ - FCKXHtml._CreateNode = function( nodeName ) - { - switch ( nodeName ) - { - case 'b' : - nodeName = 'strong' ; - break ; - case 'i' : - nodeName = 'em' ; - break ; - } - return this.XML.createElement( nodeName ) ; - } -} -else -{ - FCKXHtml._CreateNode = function( nodeName ) - { - return this.XML.createElement( nodeName ) ; - } +function FCKXHtml_CreateNode_StrongEm( nodeName ) +{ + switch ( nodeName ) + { + case 'b' : + nodeName = 'strong' ; + break ; + case 'i' : + nodeName = 'em' ; + break ; + } + return this.XML.createElement( nodeName ) ; +} + +function FCKXHtml_CreateNode_Normal( nodeName ) +{ + return this.XML.createElement( nodeName ) ; } // Append an item to the SpecialBlocks array and returns the tag to be used. FCKXHtml._AppendSpecialItem = function( item ) { - return '___FCKsi___' + FCKXHtml.SpecialBlocks.addItem( item ) ; + return '___FCKsi___' + FCKXHtml.SpecialBlocks.AddItem( item ) ; } //if ( FCKConfig.ProcessHTMLEntities ) @@ -368,4 +372,27 @@ FCKXHtml._AppendChildNodes( node, htmlNode, false ) ; return node ; +} + +// Fix nested
    and
      . +FCKXHtml.TagProcessors['ol'] = FCKXHtml.TagProcessors['ul'] = function( node, htmlNode, targetNode ) +{ + if ( htmlNode.innerHTML.trim().length == 0 ) + return ; + + var ePSibling = targetNode.lastChild ; + + if ( ePSibling && ePSibling.nodeType == 3 ) + ePSibling = ePSibling.previousSibling ; + + if ( ePSibling && ePSibling.nodeName.toUpperCase() == 'LI' ) + { + htmlNode._fckxhtmljob = null ; + FCKXHtml._AppendNode( ePSibling, htmlNode ) ; + return ; + } + + FCKXHtml._AppendChildNodes( node, htmlNode ) ; + + return node ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml_gecko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml_gecko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml_gecko.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml_ie.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml_ie.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtml_ie.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtmlentities.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtmlentities.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/_source/internals/fckxhtmlentities.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -19,304 +19,310 @@ var FCKXHtmlEntities = new Object() ; -if ( FCKConfig.ProcessHTMLEntities ) +FCKXHtmlEntities.Initialize = function() { - FCKXHtmlEntities.Entities = { - // Latin-1 Entities - '??':'nbsp', - '??':'iexcl', - '??':'cent', - '??':'pound', - '??':'curren', - '??':'yen', - '??':'brvbar', - '??':'sect', - '??':'uml', - '??':'copy', - '??':'ordf', - '??':'laquo', - '??':'not', - '??':'shy', - '??':'reg', - '??':'macr', - '??':'deg', - '??':'plusmn', - '??':'sup2', - '??':'sup3', - '??':'acute', - '??':'micro', - '??':'para', - '??':'middot', - '??':'cedil', - '??':'sup1', - '??':'ordm', - '??':'raquo', - '??':'frac14', - '??':'frac12', - '??':'frac34', - '??':'iquest', - '??':'times', - '??':'divide', - - // Symbols and Greek Letters - - '??':'fnof', - '???':'bull', - '???':'hellip', - '???':'prime', - '???':'Prime', - '???':'oline', - '???':'frasl', - '???':'weierp', - '???':'image', - '???':'real', - '???':'trade', - '???':'alefsym', - '???':'larr', - '???':'uarr', - '???':'rarr', - '???':'darr', - '???':'harr', - '???':'crarr', - '???':'lArr', - '???':'uArr', - '???':'rArr', - '???':'dArr', - '???':'hArr', - '???':'forall', - '???':'part', - '???':'exist', - '?? ':'empty', - '???':'nabla', - '???':'isin', - '???':'notin', - '???':'ni', - '???':'prod', - '???':'sum', - '???':'minus', - '???':'lowast', - '???':'radic', - '???':'prop', - '???':'infin', - '???':'ang', - '???':'and', - '???':'or', - '???':'cap', - '???':'cup', - '???':'int', - '???':'there4', - '???':'sim', - '?? ':'cong', - '???':'asymp', - '???':'ne', - '???':'equiv', - '???':'le', - '???':'ge', - '???':'sub', - '???':'sup', - '???':'nsub', - '???':'sube', - '???':'supe', - '???':'oplus', - '???':'otimes', - '???':'perp', - '?? ':'sdot', - '???':'loz', - '???':'spades', - '???':'clubs', - '???':'hearts', - '???':'diams', - - // Other Special Characters - - '"':'quot', - // '&':'amp', // This entity is automatically handled by the XHTML parser. - // '<':'lt', // This entity is automatically handled by the XHTML parser. - // '>':'gt', // This entity is automatically handled by the XHTML parser. - '??':'circ', - '??':'tilde', - '???':'ensp', - '???':'emsp', - '???':'thinsp', - '???':'zwnj', - '???':'zwj', - '???':'lrm', - '???':'rlm', - '???':'ndash', - '???':'mdash', - '???':'lsquo', - '???':'rsquo', - '???':'sbquo', - '???':'ldquo', - '???':'rdquo', - '???':'bdquo', - '???':'dagger', - '???':'Dagger', - '???':'permil', - '???':'lsaquo', - '???':'rsaquo', - '???':'euro' - } ; - - FCKXHtmlEntities.Chars = '' ; - - // Process Base Entities. - for ( var e in FCKXHtmlEntities.Entities ) - FCKXHtmlEntities.Chars += e ; - - // Include Latin Letters Entities. - if ( FCKConfig.IncludeLatinEntities ) + if ( FCKXHtmlEntities.Entities ) + return ; + + if ( FCKConfig.ProcessHTMLEntities ) { - var oEntities = { - '??':'Agrave', - '??':'Aacute', - '??':'Acirc', - '??':'Atilde', - '??':'Auml', - '? ':'Aring', - '??':'AElig', - '??':'Ccedil', - '??':'Egrave', - '??':'Eacute', - '??':'Ecirc', - '??':'Euml', - '??':'Igrave', - '??':'Iacute', - '??':'Icirc', - '??':'Iuml', - '??':'ETH', - '??':'Ntilde', - '??':'Ograve', - '??':'Oacute', - '??':'Ocirc', - '??':'Otilde', - '??':'Ouml', - '??':'Oslash', - '??':'Ugrave', - '??':'Uacute', - '??':'Ucirc', - '??':'Uuml', - '??':'Yacute', - '??':'THORN', - '??':'szlig', - '??':'agrave', - '??':'aacute', - '??':'acirc', - '??':'atilde', - '??':'auml', - '??':'aring', - '??':'aelig', - '??':'ccedil', - '??':'egrave', - '??':'eacute', - '??':'ecirc', - '??':'euml', - '??':'igrave', - '??':'iacute', - '??':'icirc', - '??':'iuml', - '??':'eth', - '??':'ntilde', - '??':'ograve', - '??':'oacute', - '??':'ocirc', - '??':'otilde', - '??':'ouml', - '??':'oslash', - '??':'ugrave', - '??':'uacute', - '??':'ucirc', - '??':'uuml', - '??':'yacute', - '??':'thorn', - '??':'yuml', - '??':'OElig', - '??':'oelig', - '??':'Scaron', - '??':'scaron', - '??':'Yuml' - } ; - - for ( var e in oEntities ) + FCKXHtmlEntities.Entities = { + // Latin-1 Entities + '??':'nbsp', + '??':'iexcl', + '??':'cent', + '??':'pound', + '??':'curren', + '??':'yen', + '??':'brvbar', + '??':'sect', + '??':'uml', + '??':'copy', + '??':'ordf', + '??':'laquo', + '??':'not', + '??':'shy', + '??':'reg', + '??':'macr', + '??':'deg', + '??':'plusmn', + '??':'sup2', + '??':'sup3', + '??':'acute', + '??':'micro', + '??':'para', + '??':'middot', + '??':'cedil', + '??':'sup1', + '??':'ordm', + '??':'raquo', + '??':'frac14', + '??':'frac12', + '??':'frac34', + '??':'iquest', + '??':'times', + '??':'divide', + + // Symbols and Greek Letters + + '??':'fnof', + '???':'bull', + '???':'hellip', + '???':'prime', + '???':'Prime', + '???':'oline', + '???':'frasl', + '???':'weierp', + '???':'image', + '???':'real', + '???':'trade', + '???':'alefsym', + '???':'larr', + '???':'uarr', + '???':'rarr', + '???':'darr', + '???':'harr', + '???':'crarr', + '???':'lArr', + '???':'uArr', + '???':'rArr', + '???':'dArr', + '???':'hArr', + '???':'forall', + '???':'part', + '???':'exist', + '?? ':'empty', + '???':'nabla', + '???':'isin', + '???':'notin', + '???':'ni', + '???':'prod', + '???':'sum', + '???':'minus', + '???':'lowast', + '???':'radic', + '???':'prop', + '???':'infin', + '???':'ang', + '???':'and', + '???':'or', + '???':'cap', + '???':'cup', + '???':'int', + '???':'there4', + '???':'sim', + '?? ':'cong', + '???':'asymp', + '???':'ne', + '???':'equiv', + '???':'le', + '???':'ge', + '???':'sub', + '???':'sup', + '???':'nsub', + '???':'sube', + '???':'supe', + '???':'oplus', + '???':'otimes', + '???':'perp', + '?? ':'sdot', + '???':'loz', + '???':'spades', + '???':'clubs', + '???':'hearts', + '???':'diams', + + // Other Special Characters + + '"':'quot', + // '&':'amp', // This entity is automatically handled by the XHTML parser. + // '<':'lt', // This entity is automatically handled by the XHTML parser. + // '>':'gt', // This entity is automatically handled by the XHTML parser. + '??':'circ', + '??':'tilde', + '???':'ensp', + '???':'emsp', + '???':'thinsp', + '???':'zwnj', + '???':'zwj', + '???':'lrm', + '???':'rlm', + '???':'ndash', + '???':'mdash', + '???':'lsquo', + '???':'rsquo', + '???':'sbquo', + '???':'ldquo', + '???':'rdquo', + '???':'bdquo', + '???':'dagger', + '???':'Dagger', + '???':'permil', + '???':'lsaquo', + '???':'rsaquo', + '???':'euro' + } ; + + FCKXHtmlEntities.Chars = '' ; + + // Process Base Entities. + for ( var e in FCKXHtmlEntities.Entities ) + FCKXHtmlEntities.Chars += e ; + + // Include Latin Letters Entities. + if ( FCKConfig.IncludeLatinEntities ) { - FCKXHtmlEntities.Entities[ e ] = oEntities[ e ] ; - FCKXHtmlEntities.Chars += e ; + var oEntities = { + '??':'Agrave', + '??':'Aacute', + '??':'Acirc', + '??':'Atilde', + '??':'Auml', + '? ':'Aring', + '??':'AElig', + '??':'Ccedil', + '??':'Egrave', + '??':'Eacute', + '??':'Ecirc', + '??':'Euml', + '??':'Igrave', + '??':'Iacute', + '??':'Icirc', + '??':'Iuml', + '??':'ETH', + '??':'Ntilde', + '??':'Ograve', + '??':'Oacute', + '??':'Ocirc', + '??':'Otilde', + '??':'Ouml', + '??':'Oslash', + '??':'Ugrave', + '??':'Uacute', + '??':'Ucirc', + '??':'Uuml', + '??':'Yacute', + '??':'THORN', + '??':'szlig', + '??':'agrave', + '??':'aacute', + '??':'acirc', + '??':'atilde', + '??':'auml', + '??':'aring', + '??':'aelig', + '??':'ccedil', + '??':'egrave', + '??':'eacute', + '??':'ecirc', + '??':'euml', + '??':'igrave', + '??':'iacute', + '??':'icirc', + '??':'iuml', + '??':'eth', + '??':'ntilde', + '??':'ograve', + '??':'oacute', + '??':'ocirc', + '??':'otilde', + '??':'ouml', + '??':'oslash', + '??':'ugrave', + '??':'uacute', + '??':'ucirc', + '??':'uuml', + '??':'yacute', + '??':'thorn', + '??':'yuml', + '??':'OElig', + '??':'oelig', + '??':'Scaron', + '??':'scaron', + '??':'Yuml' + } ; + + for ( var e in oEntities ) + { + FCKXHtmlEntities.Entities[ e ] = oEntities[ e ] ; + FCKXHtmlEntities.Chars += e ; + } + + oEntities = null ; } - - oEntities = null ; + + // Include Greek Letters Entities. + if ( FCKConfig.IncludeGreekEntities ) + { + var oEntities = { + '??':'Alpha', + '??':'Beta', + '??':'Gamma', + '??':'Delta', + '??':'Epsilon', + '??':'Zeta', + '??':'Eta', + '??':'Theta', + '??':'Iota', + '??':'Kappa', + '??':'Lambda', + '??':'Mu', + '??':'Nu', + '??':'Xi', + '??':'Omicron', + '??':'Pi', + '??':'Rho', + '??':'Sigma', + '??':'Tau', + '??':'Upsilon', + '??':'Phi', + '??':'Chi', + '??':'Psi', + '??':'Omega', + '??':'alpha', + '??':'beta', + '??':'gamma', + '??':'delta', + '??':'epsilon', + '??':'zeta', + '??':'eta', + '??':'theta', + '??':'iota', + '??':'kappa', + '??':'lambda', + '??':'mu', + '??':'nu', + '??':'xi', + '??':'omicron', + '??':'pi', + '??':'rho', + '??':'sigmaf', + '??':'sigma', + '??':'tau', + '? ':'upsilon', + '??':'phi', + '??':'chi', + '??':'psi', + '??':'omega' + } ; + + for ( var e in oEntities ) + { + FCKXHtmlEntities.Entities[ e ] = oEntities[ e ] ; + FCKXHtmlEntities.Chars += e ; + } + + oEntities = null ; + } + + // Create and Compile the Regex used to separate the entities from the text. + FCKXHtmlEntities.EntitiesRegex = new RegExp('[' + FCKXHtmlEntities.Chars + ']|[^' + FCKXHtmlEntities.Chars + ']+','g') ; + // FCKXHtmlEntities.EntitiesRegex.compile( '[' + FCKXHtmlEntities.Chars + ']|[^' + FCKXHtmlEntities.Chars + ']+', 'g' ) ; } - - // Include Greek Letters Entities. - if ( FCKConfig.IncludeGreekEntities ) + else { - var oEntities = { - '??':'Alpha', - '??':'Beta', - '??':'Gamma', - '??':'Delta', - '??':'Epsilon', - '??':'Zeta', - '??':'Eta', - '??':'Theta', - '??':'Iota', - '??':'Kappa', - '??':'Lambda', - '??':'Mu', - '??':'Nu', - '??':'Xi', - '??':'Omicron', - '??':'Pi', - '??':'Rho', - '??':'Sigma', - '??':'Tau', - '??':'Upsilon', - '??':'Phi', - '??':'Chi', - '??':'Psi', - '??':'Omega', - '??':'alpha', - '??':'beta', - '??':'gamma', - '??':'delta', - '??':'epsilon', - '??':'zeta', - '??':'eta', - '??':'theta', - '??':'iota', - '??':'kappa', - '??':'lambda', - '??':'mu', - '??':'nu', - '??':'xi', - '??':'omicron', - '??':'pi', - '??':'rho', - '??':'sigmaf', - '??':'sigma', - '??':'tau', - '? ':'upsilon', - '??':'phi', - '??':'chi', - '??':'psi', - '??':'omega' - } ; - - for ( var e in oEntities ) - { - FCKXHtmlEntities.Entities[ e ] = oEntities[ e ] ; - FCKXHtmlEntities.Chars += e ; - } - - oEntities = null ; + // Even if we are not processing the entities, we must respect the  . + FCKXHtmlEntities.Entities = { '??':'nbsp' } ; + FCKXHtmlEntities.EntitiesRegex = /[??]|[^??]+/g ; } - - // Create and Compile the Regex used to separate the entities from the text. - FCKXHtmlEntities.EntitiesRegex = new RegExp('[' + FCKXHtmlEntities.Chars + ']|[^' + FCKXHtmlEntities.Chars + ']+','g') ; -// FCKXHtmlEntities.EntitiesRegex.compile( '[' + FCKXHtmlEntities.Chars + ']|[^' + FCKXHtmlEntities.Chars + ']+', 'g' ) ; -} -else -{ - // Even if we are not processing the entities, we must respect the  . - FCKXHtmlEntities.Entities = { '??':'nbsp' } ; - FCKXHtmlEntities.EntitiesRegex = /[??]|[^??]+/g ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/behaviors/showtableborders.htc ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/behaviors/showtableborders.htc (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/behaviors/showtableborders.htc Wed Jul 12 07:45:05 2006 @@ -4,8 +4,8 @@ Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_editorarea.css ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_editorarea.css (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_editorarea.css Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ /* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -22,26 +22,46 @@ * Frederico Caldeira Knabben (fredck at fckeditor.net) */ +/* + The "body" styles should match your editor web site, mainly regarding + background color and font family and size. +*/ + body +{ + background-color: #ffffff; + padding: 5px 5px 5px 5px; + margin: 0px; +} + +body, td { font-family: Arial, Verdana, Sans-Serif; font-size: 12px; - padding: 5px 5px 5px 5px; - margin: 0px; - border-style: none; - background-color: #ffffff; +} + +a +{ + color: #0000FF !important; /* For Firefox... mark as important, otherwise it becomes black */ } /* Just uncomment the following block if you want to avoid spaces between paragraphs. Remember to apply the same style in your output front end page. */ + /* P, UL, LI { margin-top: 0px; margin-bottom: 0px; } +*/ + +/* + The following are some sample styles used in the "Styles" toolbar command. + You should instead remove them, and include the styles used by the site + you are using the editor in. */ .Bold Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_internal.css ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_internal.css (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_internal.css Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ /* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -17,12 +17,20 @@ * Frederico Caldeira Knabben (fredck at fckeditor.net) */ -TABLE.FCK__ShowTableBorders, TABLE.FCK__ShowTableBorders TD, TABLE.FCK__ShowTableBorders TH +/* Fix to allow putting the caret at the end of the +content in Firefox if clicking below the content */ +html +{ + min-height:100%; +} + + +table.FCK__ShowTableBorders, table.FCK__ShowTableBorders td, table.FCK__ShowTableBorders th { border: #d3d3d3 1px solid; } -FORM +form { border: 1px dotted #FF0000; padding: 2px; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_showtableborders_gecko.css ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_showtableborders_gecko.css (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/css/fck_showtableborders_gecko.css Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ /* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -16,16 +16,23 @@ * File Authors: * Frederico Caldeira Knabben (fredck at fckeditor.net) */ -TABLE[border="0"], -TABLE[border="0"] > TR > TD, TABLE[border="0"] > TR > TH, -TABLE[border="0"] > TBODY > TR > TD, TABLE[border="0"] > TBODY > TR > TH, -TABLE[border="0"] > THEAD > TR > TD, TABLE[border="0"] > THEAD > TR > TH, -TABLE[border="0"] > TFOOT > TR > TD, TABLE[border="0"] > TFOOT > TR > TH, -TABLE:not([border]), -TABLE:not([border]) > TR > TD, TABLE:not([border]) > TR > TH, -TABLE:not([border]) > TBODY > TR > TD, TABLE:not([border]) > TBODY > TR > TH, -TABLE:not([border]) > THEAD > TR > TD, TABLE:not([border]) > THEAD > TR > TH, -TABLE:not([border]) > TFOOT > TR > TD, TABLE:not([border]) > TFOOT > TR > TH + +/* For tables with the "border" attribute set to "0" */ +table[border="0"], +table[border="0"] > tr > td, table[border="0"] > tr > th, +table[border="0"] > tbody > tr > td, table[border="0"] > tbody > tr > th, +table[border="0"] > thead > tr > td, table[border="0"] > thead > tr > th, +table[border="0"] > tfoot > tr > td, table[border="0"] > tfoot > tr > th { border: #d3d3d3 1px dotted ; } + +/* For tables with no "border" attribute set */ +table:not([border]), +table:not([border]) > tr > td, table:not([border]) > tr > th, +table:not([border]) > tbody > tr > td, table:not([border]) > tbody > tr > th, +table:not([border]) > thead > tr > td, table:not([border]) > thead > tr > th, +table:not([border]) > tfoot > tr > td, table:not([border]) > tfoot > tr > th +{ + border: #d3d3d3 1px dotted ; +} Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/fck_dialog_common.css ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/fck_dialog_common.css (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/fck_dialog_common.css Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ /* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/fck_dialog_common.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/fck_dialog_common.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/fck_dialog_common.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -115,8 +115,20 @@ // http://support.microsoft.com/default.aspx?scid=kb;en-us;831678 // by Simone Chiaretta. var oWindow = oEditor.window.open( url, 'FCKBrowseWindow', sOptions ) ; + if ( oWindow ) - oWindow.opener = window ; + { + // Detect Yahoo popup blocker. + try + { + var sTest = oWindow.name ; // Yahoo returns "something", but we can't access it, so detect that and avoid strange errors for the user. + oWindow.opener = window ; + } + catch(e) + { + alert( oEditor.FCKLang.BrowseServerBlocked ) ; + } + } else alert( oEditor.FCKLang.BrowseServerBlocked ) ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/moz-bindings.xml ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/moz-bindings.xml (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/common/moz-bindings.xml Wed Jul 12 07:45:05 2006 @@ -7,18 +7,20 @@ + = 48 && iCode <= 57 ) // Numbers || (iCode >= 37 && iCode <= 40) // Arrows - || iCode == 8 // Backspace - || iCode == 46 // Delete + || iCode == 8 // Backspace + || iCode == 46 // Delete ) ; return bAccepted ; - + ]]> + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_about.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_about.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_about.html Wed Jul 12 07:45:05 2006 @@ -1,7 +1,7 @@ - - - - - - - - - - - - - - - - -
      -   - - - - -
      -   -
      - -
      - + +function FindGecko() +{ + var bCase = document.getElementById('chkCase').checked ; + var bWord = document.getElementById('chkWord').checked ; + + // window.find( searchString, caseSensitive, backwards, wrapAround, wholeWord, searchInFrames, showDialog ) ; + if ( !oEditor.FCK.EditorWindow.find( document.getElementById('txtFind').value, bCase, false, false, bWord, false, false ) ) + alert( oEditor.FCKLang.DlgFindNotFoundMsg ) ; +} + + + + + + + + + + + + +
      +   + + + + +
      +   +
      + +
      + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_flash.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_flash.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_flash.html Wed Jul 12 07:45:05 2006 @@ -1,142 +1,142 @@ - - - - - Flash Properties - - - - - - - -
      - - - - - - - - - - -
      - - - - - - - - -
      URL -
      -
      -
      - - - - - - -
      - Width
      - -       		  - Height
      - -
      -
      - - - - -
      - - - - - - - -
      Preview
      -
      -
      -
      - - - - + + + + + Flash Properties + + + + + + + +
      + + + + + + + + + + +
      + + + + + + + + +
      URL +
      +
      +
      + + + + + + +
      + Width
      + +       		  + Height
      + +
      +
      + + + + +
      + + + + + + + +
      Preview
      +
      +
      +
      + + + + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_form.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_form.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_form.html Wed Jul 12 07:45:05 2006 @@ -1,7 +1,7 @@ - - - - - - - - - - - Lorem - ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas feugiat consequat - diam. Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis - vitae, nulla. Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis - aliquam, orci felis euismod neque, sed ornare massa mauris sed velit. Nulla - pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper nec, - enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, - ultrices a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, - augue in cursus faucibus, eros pede bibendum sem, in tempus tellus justo quis - ligula. Etiam eget tortor. Vestibulum rutrum, est ut placerat elementum, lectus - nisl aliquam velit, tempor aliquam eros nunc nonummy metus. In eros metus, - gravida a, gravida sed, lobortis id, turpis. Ut ultrices, ipsum at venenatis - fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris non enim. Nam - turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas elementum. - Nunc imperdiet gravida mauris. - - + + + + + + + + + + + + Lorem + ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas feugiat consequat + diam. Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis + vitae, nulla. Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis + aliquam, orci felis euismod neque, sed ornare massa mauris sed velit. Nulla + pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper nec, + enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, + ultrices a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, + augue in cursus faucibus, eros pede bibendum sem, in tempus tellus justo quis + ligula. Etiam eget tortor. Vestibulum rutrum, est ut placerat elementum, lectus + nisl aliquam velit, tempor aliquam eros nunc nonummy metus. In eros metus, + gravida a, gravida sed, lobortis id, turpis. Ut ultrices, ipsum at venenatis + fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris non enim. Nam + turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas elementum. + Nunc imperdiet gravida mauris. + + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_link.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_link.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_link.html Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ return true + case 'anchor': + sInnerHtml = sInnerHtml.replace( /^#/, '' ) ; + break; + + // url: try to get path + case 'url': + var oLinkPathRegEx = new RegExp("//?([^?\"']+)([?].*)?$"); + var asLinkPath = oLinkPathRegEx.exec( sUri ); + if (asLinkPath != null) + sInnerHtml = asLinkPath[1]; // use matched path + break; + + // mailto: try to get email address + case 'email': + sInnerHtml = GetE('txtEMailAddress').value + break; + } + + // built new anchor and add link text + oLink = oEditor.FCK.CreateElement( 'a' ) ; + } + + oEditor.FCKUndo.SaveUndoStep() ; + + oLink.href = sUri ; SetAttribute( oLink, '_fcksavedurl', sUri ) ; + + oLink.innerHTML = sInnerHtml ; // Set (or restore) the innerHTML // Target if( GetE('cmbTarget').value != 'popup' ) @@ -518,6 +552,9 @@ SetAttribute( oLink, 'style', GetE('txtAttStyle').value ) ; } + // Select the link. + oEditor.FCKSelection.SelectNode(oLink); + return true ; } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_listprop.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_listprop.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_listprop.html Wed Jul 12 07:45:05 2006 @@ -1,7 +1,7 @@ - - + + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_select.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_select.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_select.html Wed Jul 12 07:45:05 2006 @@ -1,7 +1,7 @@ - - - - Source - - - - - - - - - - -
      - - + + + + + Source + + + + + + + + + + +
      + + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_specialchar.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_specialchar.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_specialchar.html Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ - - - - Table Cell Properties - - - - + - - - - - + +
      - - - + + + +
      - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
      Width:   + + - -
      + + + - - - -
      + + + + - - - - - - - - - - - - - - - - - - - - - - - - - -
      + Width: +   
      Height:  pixels
        
      Word Wrap: 
        
      Horizontal Alignment: 
      Vertival Alignement: 
      -       		    - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Rows Span: 
      Columns Span: 
         
      Background Color:  
      Border Color:  
      -
      -
      - +
      + Height: +   pixels
      +   +  
      + Word Wrap: +  
      +   +  
      + Horizontal Alignment: +  
      + Vertical Alignment: +  
      +       		+     + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + Rows Span: +   + +
      + Columns Span: +   + +
      +   +   +  
      + Background Color: +   +   +
      + Border Color: +   +   +
      +
      +
      + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_template.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_template.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_template.html Wed Jul 12 07:45:05 2006 @@ -1,210 +1,210 @@ - - - - - - - - - - - - - - - - - - -
      - Please select the template to open in the editor
      - (the actual contents will be lost):       -
      -
      - - -
      -
      - - + + + + + + + + + + + + + + + + + + +
      + Please select the template to open in the editor
      + (the actual contents will be lost):       +
      +
      + + +
      +
      + + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_textarea.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_textarea.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/dialog/fck_textarea.html Wed Jul 12 07:45:05 2006 @@ -1,7 +1,7 @@ - - - - - FCKeditor Debug Window - - - - - - - - - - -
      - - - - - -
      FCKeditor Debug Window
      -
      - -
      - - + + + + + + + + + + +
      + + + + + +
      + FCKeditor Debug Window +
      +
      + +
      + + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckdialog.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckdialog.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckdialog.html Wed Jul 12 07:45:05 2006 @@ -1,6 +1,7 @@ + - - + @@ -39,6 +39,9 @@ function LoadInnerDialog() { + // The following value is set, so the editor can check that the dialog has been correctly opened. + window.setTimeout( function() { window.returnValue = true ; }, 100 ) ; + if ( window.onresize ) window.onresize() ; @@ -111,6 +114,9 @@ function Cancel() { + // All dialog windows will fire the "OnSelectionChange" event, not matter + // the Ok or Cancel button have being pressed. + window.dialogArguments.Editor.FCK.Events.FireEvent( 'OnSelectionChange' ) ; window.close() ; } @@ -259,6 +265,14 @@ } window.attachEvent( "onbeforeunload", Window_OnBeforeUnload ) ; } + +function Window_OnClose() +{ + window.dialogArguments.Editor.FCKFocusManager.Unlock() ; +} + +if ( window.addEventListener ) + window.addEventListener( 'unload', Window_OnClose, false ) ; Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckeditor.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckeditor.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckeditor.html Wed Jul 12 07:45:05 2006 @@ -1,6 +1,7 @@ + - - - - FCKeditor - - - - - - - - - - - - - - - - - -
      - - - - - - - - - -
      -
      - -
      - + + + FCKeditor + + + + + + + + + + + + + + + + + + +
      + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckeditor.original.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckeditor.original.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/fckeditor.original.html Wed Jul 12 07:45:05 2006 @@ -1,6 +1,7 @@ + - - - - FCKeditor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      - - - - - - - - - -
      -
      - -
      - + + + FCKeditor + + + + + + + + + + + + + + + + + + +
      + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/browser.css ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/browser.css (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/browser.css Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ /* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/browser.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/browser.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/browser.html Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ - - - FCKeditor - Connectors Tests - - - - - - - - - - -
      - - - - - - - - - - -
      Connector:
      -       		   Current Folder
      -       		   Resource Type
      -       		   Server Path
      -
      -
      - - - - - - - - - - -
      Get Folders   Get Folders and Files   Create Folder    -
      - File Upload
      - -
      -
      -
      - URL: -
      - -
      - + + + + + + + + + + +
      + + + + + + + + +
      + Connector:
      + +       		+     + Current Folder
      +       		+     + Resource Type
      + +
      +
      + + + + + + + + + + +
      + Get Folders +     + Get Folders and Files +     + Create Folder +     +
      + File Upload
      + + +
      +
      +
      + URL: +
      + +
      + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmactualfolder.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmactualfolder.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmactualfolder.html Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ - - - - - - + - - - -
      - + + + + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmresourcetype.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmresourcetype.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/frmresourcetype.html Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ - - + - - +
      - +
      - Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/js/common.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/js/common.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/js/common.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/js/fckxml.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/js/fckxml.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/filemanager/browser/default/js/fckxml.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/_getfontformat.html ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/_getfontformat.html (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/_getfontformat.html Wed Jul 12 07:45:05 2006 @@ -1,66 +1,66 @@ - - - - - - - - -
      + Upload a new file in this folder
      - +
      - +
        
      - - - -
      -

      FontFormats Localization

      -

      - IE has some limits when handling the "Font Format". It actually uses localized - strings to retrieve the current format value. This makes it very difficult to - make a system that works on every single computer in the world. -

      -

      - With FCKeditor, this problem impacts in the "Format" toolbar command that - doesn't reflects the format of the current cursor position. -

      -

      - There is only one way to make it work. We must localize FCKeditor using the - strings used by IE. In this way, we will have the expected behavior at least - when using FCKeditor in the same language as the browser. So, when localizing - FCKeditor, go to a computer with IE in the target language, open this page and - use the following string to the "FontFormats" value: -

      -
      - FontFormats : "", -
      -
      -
      -

       

      - 
       
      -
       
      -

       

      -

       

      -

       

      -

       

      -
       
      -
       
      -
      - - + + + + + + + + + + + + +
      +

      FontFormats Localization

      +

      + IE has some limits when handling the "Font Format". It actually uses localized + strings to retrieve the current format value. This makes it very difficult to + make a system that works on every single computer in the world. +

      +

      + With FCKeditor, this problem impacts in the "Format" toolbar command that + doesn't reflects the format of the current cursor position. +

      +

      + There is only one way to make it work. We must localize FCKeditor using the + strings used by IE. In this way, we will have the expected behavior at least + when using FCKeditor in the same language as the browser. So, when localizing + FCKeditor, go to a computer with IE in the target language, open this page and + use the following string to the "FontFormats" value: +

      +
      + FontFormats : "", +
      +
      +
      +

       

      + 
       
      +
       
      +

       

      +

       

      +

       

      +

       

      +
       
      +
       
      +
      + + Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/_translationstatus.txt ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/_translationstatus.txt (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/_translationstatus.txt Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ /* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -11,59 +11,60 @@ * "Support Open Source software. What about a donation today?" * * File Name: _translationstatus.txt - * Translation Status. - * A useful site with languages information: - * http://www.omniglot.com/ + * Translations Status. * * File Authors: * Frederico Caldeira Knabben (fredck at fckeditor.net) */ -ar.js Found: 375 Missing: 8 -bg.js Found: 380 Missing: 3 -bs.js Found: 232 Missing: 151 -ca.js Found: 375 Missing: 8 -cs.js Found: 377 Missing: 6 -da.js Found: 377 Missing: 6 -de.js Found: 382 Missing: 1 -el.js Found: 232 Missing: 151 -en-au.js Found: 375 Missing: 8 -en-uk.js Found: 375 Missing: 8 -eo.js Found: 352 Missing: 31 -es.js Found: 383 Missing: 0 -et.js Found: 232 Missing: 151 -eu.js Found: 383 Missing: 0 -fa.js Found: 358 Missing: 25 -fi.js Found: 383 Missing: 0 -fo.js Found: 358 Missing: 25 -fr.js Found: 378 Missing: 5 -gl.js Found: 383 Missing: 0 -he.js Found: 375 Missing: 8 -hi.js Found: 383 Missing: 0 -hr.js Found: 375 Missing: 8 -hu.js Found: 383 Missing: 0 -it.js Found: 383 Missing: 0 -ja.js Found: 383 Missing: 0 -ko.js Found: 375 Missing: 8 -lt.js Found: 375 Missing: 8 -lv.js Found: 377 Missing: 6 -mn.js Found: 232 Missing: 151 -ms.js Found: 358 Missing: 25 -nl.js Found: 382 Missing: 1 -no.js Found: 383 Missing: 0 -pl.js Found: 377 Missing: 6 -pt-br.js Found: 375 Missing: 8 -pt.js Found: 375 Missing: 8 -ro.js Found: 383 Missing: 0 -ru.js Found: 375 Missing: 8 -sk.js Found: 375 Missing: 8 -sl.js Found: 375 Missing: 8 -sr-latn.js Found: 375 Missing: 8 -sr.js Found: 375 Missing: 8 -sv.js Found: 375 Missing: 8 -th.js Found: 352 Missing: 31 -tr.js Found: 374 Missing: 9 -uk.js Found: 375 Missing: 8 -vi.js Found: 377 Missing: 6 -zh-cn.js Found: 375 Missing: 8 -zh.js Found: 383 Missing: 0 +ar.js Found: 388 Missing: 0 +bg.js Found: 380 Missing: 8 +bn.js Found: 388 Missing: 0 +bs.js Found: 232 Missing: 156 +ca.js Found: 387 Missing: 1 +cs.js Found: 388 Missing: 0 +da.js Found: 388 Missing: 0 +de.js Found: 388 Missing: 0 +el.js Found: 232 Missing: 156 +en-au.js Found: 388 Missing: 0 +en-ca.js Found: 388 Missing: 0 +en-uk.js Found: 388 Missing: 0 +eo.js Found: 352 Missing: 36 +es.js Found: 382 Missing: 6 +et.js Found: 388 Missing: 0 +eu.js Found: 388 Missing: 0 +fa.js Found: 358 Missing: 30 +fi.js Found: 388 Missing: 0 +fo.js Found: 358 Missing: 30 +fr.js Found: 383 Missing: 5 +gl.js Found: 388 Missing: 0 +he.js Found: 388 Missing: 0 +hi.js Found: 388 Missing: 0 +hr.js Found: 383 Missing: 5 +hu.js Found: 388 Missing: 0 +it.js Found: 388 Missing: 0 +ja.js Found: 388 Missing: 0 +km.js Found: 377 Missing: 11 +ko.js Found: 375 Missing: 13 +lt.js Found: 383 Missing: 5 +lv.js Found: 388 Missing: 0 +mn.js Found: 232 Missing: 156 +ms.js Found: 358 Missing: 30 +nl.js Found: 388 Missing: 0 +no.js Found: 388 Missing: 0 +pl.js Found: 388 Missing: 0 +pt-br.js Found: 383 Missing: 5 +pt.js Found: 375 Missing: 13 +ro.js Found: 388 Missing: 0 +ru.js Found: 383 Missing: 5 +sk.js Found: 383 Missing: 5 +sl.js Found: 380 Missing: 8 +sr-latn.js Found: 375 Missing: 13 +sr.js Found: 375 Missing: 13 +sv.js Found: 383 Missing: 5 +th.js Found: 352 Missing: 36 +tr.js Found: 374 Missing: 14 +uk.js Found: 375 Missing: 13 +vi.js Found: 388 Missing: 0 +zh-cn.js Found: 388 Missing: 0 +zh.js Found: 388 Missing: 0 Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ar.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ar.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ar.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -15,6 +15,7 @@ * * File Authors: * Abdul-Aziz Abdul-Kareem Al-Oraij (http://aziz.oraij.com) + * Abu Faisal (http://www.24at24.com) */ var FCKLang = @@ -82,14 +83,14 @@ BGColor : "?????? ??????????????", Source : "???????? ????? ??????", Find : "??????", -Replace : "??????????????", +Replace : "??????????????", SpellCheck : "?????????? ??? ????????", UniversalKeyboard : "???????? ????? ?????????? ??????????? ????", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING +PageBreakLbl : "?????? ????????????", +PageBreak : "?????????? ???????? ??????????", Form : "??? ??????", -Checkbox : "???????? ????????????", +Checkbox : "???????? ????????????", RadioButton : "???? ????????", TextField : "? ?????? ????", Textarea : "?????????? ????", @@ -98,8 +99,13 @@ SelectionField : "??????? ?? ? ??????????", ImageButton : "???? ????????", +FitWindow : "?????????? ????? ????? ??????", + // Context Menu EditLink : "?????????? ????????", +CellCM : "????????", +RowCM : "????", +ColumnCM : "??? ????", InsertRow : "?????????? ????", DeleteRows : "?????? ????????", InsertColumn : "?????????? ??? ????", @@ -108,7 +114,7 @@ DeleteCells : "?????? ??????????", MergeCells : "??? ?? ??????????", SplitCell : "????????? ????????", -TableDelete : "Delete Table", //MISSING +TableDelete : "?????? ????????????", CellProperties : "?????????? ????????????", TableProperties : "?????????? ????????????", ImageProperties : "?????????? ????????????", @@ -116,7 +122,7 @@ AnchorProp : "?????????? ?????????????? ????? ??????????", ButtonProp : "?????????? ???? ??????????", -CheckboxProp : "?????????? ???????? ????????????????", +CheckboxProp : "?????????? ???????? ????????????????", HiddenFieldProp : "?????????? ?????????? ??????????", RadioButtonProp : "?????????? ???? ????????????", ImageButtonProp : "?????????? ???? ????????????", @@ -128,7 +134,7 @@ FontFormats : "????????;? ????????;??????;?????????????? 1;?????????????? 2;?????????????? 3;?????????????? 4;?????????????? 5;?????????????? 6", // Alerts and Messages -ProcessingXHTML : "?????????? ???????????? ??????? ?? ????? ? ??????????????? XHTML. ???? ???????????? ????????????...", +ProcessingXHTML : "?????????? ???????????? ??????? ?? ????? ? ??????????????? XHTML. ???? ???????????? ????????????...", Done : "??? ", PasteWordConfirm : "???????? ???? ???????? ????? ?????? ???????? ? ???????? ? ?? ????????? ?? ????????. ???? ?????? ???????????? ?????? ???????????? ???? ??? ?????? ????????????", NotCompatiblePaste : "?????? ????? ?????? ?????????? ??? ???????? ? ?? ??????????Internet Explorer ?????????? 5.5 ??? ?? ??????. ???? ?????? ?????????? ?????? ?????????? ????????????", @@ -136,9 +142,9 @@ UnknownCommand : "??? ?? ?????? ? ???????? \"%1\"", NotImplemented : "??? ????? ????? ?????? ??????? ??", UnknownToolbarSet : "??? ????? ???? ? ?? ???????????? ?????? ????? ?????????????? \"%1\" ", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING +NoActiveX : "??????? ???? ? ?????????? ?????? ???? ???????? ?????? ? ? ???????? ????? ??????. ?????????? ???????? ??? ?????? ???????????? \"Run ActiveX controls and plug-ins\". ???? ?????????? ?????????? ???????????? ? ? ???????? ? ??????????", +BrowseServerBlocked : "??????? ???? ?????? ? ?????? ????? ????????. ???????? ?????? ???????????? ?????? ??? ???? ? ???????? ?????????????? ????? ?????????? ? ????????", +DialogBlocked : "??????? ???? ?????? ?????????? ???????????? . ???????? ???????? ? ?? ???? ? ?????? ?????????????? ????? ???????? ? ?????? .", // Dialogs DlgBtnOK : "? ????????", @@ -146,25 +152,25 @@ DlgBtnClose : "??????????", DlgBtnBrowseServer : "???????? ??????????? ", DlgAdvancedTag : "? ??????? ", -DlgOpOther : "<????????>", +DlgOpOther : "", DlgInfoTab : "? ??????? ????", DlgAlertUrl : "???????????? ?????????? ?????????? ????????????????", // General Dialogs Labels -DlgGenNotSet : "<???????? ??????????>", -DlgGenId : "Id", -DlgGenLangDir : "?????????? ????????", +DlgGenNotSet : "", +DlgGenId : "????????? ", +DlgGenLangDir : "?????????? ????????", DlgGenLangDirLtr : "???????????? ??????? ???? (LTR)", DlgGenLangDirRtl : "??????? ???? ???????????? (RTL)", DlgGenLangCode : "??? ?? ??????????", -DlgGenAccessKey : "? ?????????? ????????????????", +DlgGenAccessKey : "? ?????????? ????????????????", DlgGenName : "????????? ", DlgGenTabIndex : "??????????????", DlgGenLongDescr : "?????????? ?????????? ????? ????????", DlgGenClass : "???????? ??????????????", DlgGenTitle : "????? ???? ????????????", DlgGenContType : "?????? ????????? ????", -DlgGenLinkCharset : "????? ???? ????? ?????? ????? ????????????", +DlgGenLinkCharset : "????? ???? ????? ?????? ????? ??????????", DlgGenStyle : "??? ??", // Image Dialog @@ -175,9 +181,9 @@ DlgImgUpload : "??????", DlgImgAlt : "??????????", DlgImgWidth : "??????????", -DlgImgHeight : "????????????????", +DlgImgHeight : "????????????????", DlgImgLockRatio : "?????????? ????????? ", -DlgBtnResetSize : "?????????????? ????????? ????????????", +DlgBtnResetSize : "?????????????? ????????? ????????????", DlgImgBorder : "??? ?? ????????????", DlgImgHSpace : "?????????? ????????", DlgImgVSpace : "?????????? ??? ??????", @@ -192,7 +198,7 @@ DlgImgAlignTextTop : "???????? ????????", DlgImgAlignTop : "????????", DlgImgPreview : "? ??????????", -DlgImgAlertUrl : "?????????? ???????? ????? ?????? ???????? ???????? ???????? ?????? ????????????.", +DlgImgAlertUrl : "?????????? ???????? ????? ?????? ???????? ???????? ???????? ?????? ????????????.", DlgImgLinkTab : "????????????", // Flash Dialog @@ -206,7 +212,7 @@ DlgFlashScaleFit : "?????? ????? ", // Link Dialog -DlgLnkWindowTitle : "???????????? ??????????", +DlgLnkWindowTitle : "???????????? ??????????", DlgLnkInfoTab : "? ??????? ???? ????????????", DlgLnkTargetTab : "??????????", @@ -215,12 +221,12 @@ DlgLnkTypeAnchor : "? ?????? ???? ?????? ????? ????????", DlgLnkTypeEMail : "???????? ????????????????", DlgLnkProto : "????????????????????", -DlgLnkProtoOther : "<????????>", +DlgLnkProtoOther : "", DlgLnkURL : "????? ??????", DlgLnkAnchorSel : "???????? ??????? ?? ? ??????????", DlgLnkAnchorByName : "?????? ????? ??????????? ??", DlgLnkAnchorById : "?????? ?????????? ????????????", -DlgLnkNoAnchors : "<???? ???????? ??????? ???? ? ?????????? ???? ?????? ????? ????????>", +DlgLnkNoAnchors : "", DlgLnkEMail : "?????????? ???????? ????????????????", DlgLnkEMailSubject : "? ???????? ??????????????", DlgLnkEMailBody : "? ???????? ??????????????", @@ -228,8 +234,8 @@ DlgLnkBtnUpload : "???????????? ??????????? ", DlgLnkTarget : "??????????", -DlgLnkTargetFrame : "<????????>", -DlgLnkTargetPopup : "<?????????? ? ??????????>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "???????? ???????? (_blank)", DlgLnkTargetParent : "???????????? ?????????? (_parent)", DlgLnkTargetSelf : "?????? ???????????? (_self)", @@ -246,7 +252,7 @@ DlgLnkPopFullScrn : "? ???? ???????????? (IE)", DlgLnkPopDependent : "???????? (Netscape)", DlgLnkPopWidth : "??????????", -DlgLnkPopHeight : "????????????????", +DlgLnkPopHeight : "????????????????", DlgLnkPopLeft : "??????? ?????? ????????????", DlgLnkPopTop : "??????? ?????? ????????????", @@ -258,10 +264,10 @@ DlgColorTitle : "???????? ??????????", DlgColorBtnClear : "? ????", DlgColorHighlight : "??????????", -DlgColorSelected : "????????????", +DlgColorSelected : "????????????", // Smiley Dialog -DlgSmileyTitle : "?????????? ??????????? ???? ", +DlgSmileyTitle : "?????????? ??????????? ???? ", // Special Character Dialog DlgSpecialCharTitle : "?????????? ??? ??", @@ -279,18 +285,18 @@ DlgTableWidth : "??????????", DlgTableWidthPx : "????????", DlgTableWidthPc : "??????? ????", -DlgTableHeight : "????????????????", +DlgTableHeight : "????????????????", DlgTableCellSpace : "?????????? ??????????????", DlgTableCellPad : "????? ???????? ??????????????", DlgTableCaption : "??????????", -DlgTableSummary : "Summary", //MISSING +DlgTableSummary : "??????????????", // Table Cell Dialog DlgCellTitle : "?????????? ????????????", DlgCellWidth : "??????????", DlgCellWidthPx : "????????", DlgCellWidthPc : "??????? ????", -DlgCellHeight : "????????????????", +DlgCellHeight : "????????????????", DlgCellWordWrap : "???????????? ????????", DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "????? ", @@ -306,8 +312,8 @@ DlgCellVerAlignMiddle : "??????", DlgCellVerAlignBottom : "????????", DlgCellVerAlignBaseline : "?????? ??????????", -DlgCellRowSpan : "??? ???????? ????????????", -DlgCellCollSpan : "??? ???????? ????????? ????", +DlgCellRowSpan : "??? ???????? ????????????", +DlgCellCollSpan : "??? ???????? ????????? ????", DlgCellBackColor : "?????? ??????????????", DlgCellBorderColor : "?????? ????????????", DlgCellBtnSelect : "????????...", @@ -318,27 +324,26 @@ DlgFindNotFoundMsg : "??? ????? ???????????? ?????? ???????? ????? ??????.", // Replace Dialog -DlgReplaceTitle : "??????????????", +DlgReplaceTitle : "??????????????", DlgReplaceFindLbl : "?????????? ????:", -DlgReplaceReplaceLbl : "?????????????? ????:", +DlgReplaceReplaceLbl : "?????????????? ????:", DlgReplaceCaseChk : "? ?????????? ???????? ????????????", -DlgReplaceReplaceBtn : "??????????????", -DlgReplaceReplAllBtn : "?????????????? ????????", +DlgReplaceReplaceBtn : "??????????????", +DlgReplaceReplAllBtn : "?????????????? ????????", DlgReplaceWordChk : "????????? ?? ??????????? ?? ??????", // Paste Operations / Dialog -PasteErrorPaste : "?????????????????? ??????? ?????? ????? ???????? ???????? ??????????? ?? ??? ???? ?????????? ????????????????. ?????????? ??????????? ???????? ????? ?????????? ???????? ?????? (Ctrl+V).", -PasteErrorCut : "?????????????????? ??????? ?????? ????? ???????? ???????? ??????????? ?? ??? ???? ???????? ????????????????. ?????????? ??????????? ???????? ????? ?????????? ???????? ?????? (Ctrl+X).", -PasteErrorCopy : "?????????????????? ??????? ?????? ????? ???????? ???????? ??????????? ?? ??? ???? ?????????? ????????????????. ?????????? ??????????? ???????? ????? ?????????? ???????? ?????? (Ctrl+C).", +PasteErrorPaste : "?????????????????? ??????? ?????? ????? ???????? ???????? ??????????? ?? ??? ???? ?????????? ????????????????. ?????????? ??????????? ???????? ????? ?????????? ???????? ?????? (Ctrl+V).", +PasteErrorCut : "?????????????????? ??????? ?????? ????? ???????? ???????? ??????????? ?? ??? ???? ???????? ????????????????. ?????????? ??????????? ???????? ????? ?????????? ???????? ?????? (Ctrl+X).", +PasteErrorCopy : "?????????????????? ??????? ?????? ????? ???????? ???????? ??????????? ?? ??? ???? ?????????? ????????????????. ?????????? ??????????? ???????? ????? ?????????? ???????? ?????? (Ctrl+C).", PasteAsText : "?????? ?????? ????????", PasteFromWord : "?????? ? ?? ????????", -DlgPasteMsg2 : "???????? ???????? ?????????????? ??????????????? ???????? (Ctrl+V) ???? ???????? ????? ???????????? ??? ???????? ???? ? ????????.", +DlgPasteMsg2 : "???????? ???????? ?????????????? ??????????????? ???????? (Ctrl+V) ???? ???????? ????? ???????????? ??? ???????? ???? ? ????????.", DlgPasteIgnoreFont : "?????????? ?????????????? ????? ???? ????????????", DlgPasteRemoveStyles : "?????????? ?????????????? ????????? ????", DlgPasteCleanBox : "???????? ? ???????? ??????????????", - // Color Picker ColorAutomatic : "????????????", @@ -360,7 +365,7 @@ DlgSpellBtnReplace : "??????????", DlgSpellBtnReplaceAll : "?????????? ????????", DlgSpellBtnUndo : "??????????", -DlgSpellNoSuggestions : "- ???? ???????? ???????????????? -", +DlgSpellNoSuggestions : "- ???? ???????? ???????????????? -", DlgSpellProgress : "???????? ?????????????? ??? ????????????", DlgSpellNoMispell : "??? ????? ???? ?????????????? ??????? ????????: ??? ????? ???????????? ?????? ???? ?????????? ??? ??????????", DlgSpellNoChanges : "??? ????? ???? ?????????????? ??????? ????????: ??? ????? ?????????? ???? ????? ??", @@ -396,7 +401,7 @@ DlgSelectBtnModify : "??????????", DlgSelectBtnUp : "?????????? ??????????", DlgSelectBtnDown : "?????????? ??????????", -DlgSelectBtnSetValue : "???????????? ? ????????", +DlgSelectBtnSetValue : "???????????? ? ????????", DlgSelectBtnDelete : "??????????", // Textarea Dialog @@ -422,7 +427,7 @@ NumberedListProp : "?????????? ?????????????? ????????? ??", DlgLstType : "??????????", DlgLstTypeCircle : "??????????", -DlgLstTypeDisc : "Disc", //MISSING +DlgLstTypeDisc : "??????", DlgLstTypeSquare : "? ??????", DlgLstTypeNumbers : "????????? (1?? 2?? 3)??", DlgLstTypeLCase : "???????? ?????????? (a, b, c)??", @@ -437,7 +442,7 @@ DlgDocMetaTab : "????? ???????????? ??????????????", DlgDocPageTitle : "?????????? ????????????", -DlgDocLangDir : "?????????? ??????????", +DlgDocLangDir : "?????????? ??????????", DlgDocLangDirLTR : "???????????? ??????? ???? (LTR)", DlgDocLangDirRTL : "??????? ???? ???????????? (RTL)", DlgDocLangCode : "??? ?? ??????????", @@ -469,12 +474,13 @@ Templates : "??????????????", DlgTemplatesTitle : "?????????? ????? ????????", DlgTemplatesSelMsg : "???????? ???????????? ???????? ?????? ???????? ???? ????? ??????
      (??????? ?????????? ????? ???????? ????????????):", -DlgTemplatesLoading : "???????? ????? ???? ??????? ?? ???????????????? ???????????? ????????????????...", +DlgTemplatesLoading : "???????? ????? ???? ??????? ?? ???????????????? ???????????? ????????????????...", DlgTemplatesNoTpl : "(??? ????? ?????????? ???? ????????)", // About Dialog DlgAboutAboutTab : "????????", DlgAboutBrowserInfoTab : "? ??????? ???? ? ??????????", +DlgAboutLicenseTab : "??????????????", DlgAboutVersion : "??????????????", DlgAboutLicense : "? ???????? ???????? ?????????? GNU LGPL", DlgAboutInfo : "??? ?????? ? ?? ????? ??????? ???? ???????? ????????????" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/bg.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/bg.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/bg.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -98,8 +98,13 @@ SelectionField : "???????????? ???????? ?? ??????????", ImageButton : "??????????-??????????????????????", +FitWindow : "Maximize the editor size", //MISSING + // Context Menu EditLink : "???????????????????? ????????????", +CellCM : "Cell", //MISSING +RowCM : "Row", //MISSING +ColumnCM : "Column", //MISSING InsertRow : "???????????? ??????", DeleteRows : "???????????? ????????????????", InsertColumn : "???????????? ????????????", @@ -136,7 +141,7 @@ UnknownCommand : "?????????????????? ?????????????? \"%1\"", NotImplemented : "?????????????????? ???? ?? ????????????????????????????", UnknownToolbarSet : "?????????????? \"%1\" ???? ????????????????????", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING +NoActiveX : "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING @@ -146,12 +151,12 @@ DlgBtnClose : "??????????????", DlgBtnBrowseServer : "?????????????????? ??????????????", DlgAdvancedTag : "??????????????????????...", -DlgOpOther : "<??????????>", +DlgOpOther : "", DlgInfoTab : "????????????????????", DlgAlertUrl : "????????, ???????????????? ???????????? ?????? (URL)", // General Dialogs Labels -DlgGenNotSet : "<???? ?? ????????????????>", +DlgGenNotSet : "", DlgGenId : "??????????????????????????", DlgGenLangDir : "???????????? ???? ??????????", DlgGenLangDirLtr : "???? ???????? ???? ??????????", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "?????????? ?? ???????????????? ????????????????", DlgLnkTypeEMail : "??-????????", DlgLnkProto : "????????????????", -DlgLnkProtoOther : "<??????????>", +DlgLnkProtoOther : "", DlgLnkURL : "?????????? ?????? (URL)", DlgLnkAnchorSel : "???????????????? ??????????", DlgLnkAnchorByName : "???? ?????? ???? ??????????????", DlgLnkAnchorById : "???? ?????????????????????????? ???? ??????????????", -DlgLnkNoAnchors : "<???????? ?????????? ?? ?????????????? ????????????????>", +DlgLnkNoAnchors : "", DlgLnkEMail : "?????????? ???? ??-????????", DlgLnkEMailSubject : "???????? ???? ??????????????", DlgLnkEMailBody : "?????????? ???? ??????????????", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "?????????? ???? ??????????????", DlgLnkTarget : "??????", -DlgLnkTargetFrame : "<??????????>", -DlgLnkTargetPopup : "<?????????????? ????????????????>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "?????? ???????????????? (_blank)", DlgLnkTargetParent : "???????????????????? ???????????????? (_parent)", DlgLnkTargetSelf : "???????????????? ???????????????? (_self)", @@ -292,16 +297,16 @@ DlgCellWidthPc : "????????????????", DlgCellHeight : "????????????????", DlgCellWordWrap : "?????????????????? ???? ?????? ??????", -DlgCellWordWrapNotSet : "<???? ?? ??????????????????>", +DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "????", DlgCellWordWrapNo : "????", DlgCellHorAlign : "???????????????????????? ????????????????????????", -DlgCellHorAlignNotSet : "<???? ?? ??????????????????>", +DlgCellHorAlignNotSet : "", DlgCellHorAlignLeft : "????????", DlgCellHorAlignCenter : "????????????", DlgCellHorAlignRight: "??????????", DlgCellVerAlign : "???????????????????? ????????????????????????", -DlgCellVerAlignNotSet : "<???? ?? ??????????????????>", +DlgCellVerAlignNotSet : "", DlgCellVerAlignTop : "????????", DlgCellVerAlignMiddle : "???? ??????????????", DlgCellVerAlignBottom : "????????", @@ -338,7 +343,6 @@ DlgPasteIgnoreFont : "?????????????????? ???????????????????? ??????????????????", DlgPasteRemoveStyles : "???????????? ?????????????????? ??????????????????", DlgPasteCleanBox : "??????????????", - // Color Picker ColorAutomatic : "???? ????????????????????????", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "????", DlgAboutBrowserInfoTab : "???????????????????? ???? ????????????????", +DlgAboutLicenseTab : "License", //MISSING DlgAboutVersion : "????????????", DlgAboutLicense : "???????????? ???? ?????????????????? ???? GNU Lesser General Public License", DlgAboutInfo : "???? ???????????? ???????????????????? ????????????????" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/bs.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/bs.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/bs.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -83,7 +83,7 @@ Source : "HTML k??d", Find : "Na??i", Replace : "Zamjeni", -SpellCheck : "Check Spell", //MISSING +SpellCheck : "Check Spelling", //MISSING UniversalKeyboard : "Universal Keyboard", //MISSING PageBreakLbl : "Page Break", //MISSING PageBreak : "Insert Page Break", //MISSING @@ -98,8 +98,13 @@ SelectionField : "Selection Field", //MISSING ImageButton : "Image Button", //MISSING +FitWindow : "Maximize the editor size", //MISSING + // Context Menu EditLink : "Izmjeni link", +CellCM : "Cell", //MISSING +RowCM : "Row", //MISSING +ColumnCM : "Column", //MISSING InsertRow : "Ubaci red", DeleteRows : "Bri??i redove", InsertColumn : "Ubaci kolonu", @@ -136,7 +141,7 @@ UnknownCommand : "Nepoznata komanda \"%1\"", NotImplemented : "Komanda nije implementirana", UnknownToolbarSet : "Traka sa alatima \"%1\" ne postoji", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING +NoActiveX : "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING @@ -146,12 +151,12 @@ DlgBtnClose : "Zatvori", DlgBtnBrowseServer : "Browse Server", //MISSING DlgAdvancedTag : "Naprednije", -DlgOpOther : "<Other>", //MISSING +DlgOpOther : "", //MISSING DlgInfoTab : "Info", //MISSING DlgAlertUrl : "Please insert the URL", //MISSING // General Dialogs Labels -DlgGenNotSet : "<nije pode??eno>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "Smjer pisanja", DlgGenLangDirLtr : "S lijeva na desno (LTR)", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "Sidro na ovoj stranici", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "Protokol", -DlgLnkProtoOther : "<drugi>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "Izaberi sidro", DlgLnkAnchorByName : "Po nazivu sidra", DlgLnkAnchorById : "Po Id-u elementa", -DlgLnkNoAnchors : "<Nema dostupnih sidra na stranici>", +DlgLnkNoAnchors : "", DlgLnkEMail : "E-Mail Adresa", DlgLnkEMailSubject : "Subjekt poruke", DlgLnkEMailBody : "Poruka", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "??alji na server", DlgLnkTarget : "Prozor", -DlgLnkTargetFrame : "<frejm>", -DlgLnkTargetPopup : "<popup prozor>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Novi prozor (_blank)", DlgLnkTargetParent : "Glavni prozor (_parent)", DlgLnkTargetSelf : "Isti prozor (_self)", @@ -339,7 +344,6 @@ DlgPasteRemoveStyles : "Remove Styles definitions", //MISSING DlgPasteCleanBox : "Clean Up Box", //MISSING - // Color Picker ColorAutomatic : "Automatska", ColorMoreColors : "Vi??e boja...", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "About", //MISSING DlgAboutBrowserInfoTab : "Browser Info", //MISSING +DlgAboutLicenseTab : "License", //MISSING DlgAboutVersion : "verzija", DlgAboutLicense : "Licencirano pod uslovima GNU Lesser General Public License", DlgAboutInfo : "Za vi??e informacija posjetite" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ca.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ca.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ca.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -15,6 +15,7 @@ * * File Authors: * Jordi Cerdan (nan at myp.ad) + * Marc Folch (mcus21 at gmail.com) */ var FCKLang = @@ -22,285 +23,290 @@ // Language direction : "ltr" (left to right) or "rtl" (right to left). Dir : "ltr", -ToolbarCollapse : "Col??lapsar barra", -ToolbarExpand : "Expandir barra", +ToolbarCollapse : "Collapsa la barra", +ToolbarExpand : "Amplia la barra", // Toolbar Items and Context Menu -Save : "Guardar", -NewPage : "Nova P??gina", -Preview : "Vista Pr??via", -Cut : "Tallar", -Copy : "Copiar", -Paste : "Enganxar", -PasteText : "Enganxar com text planer", -PasteWord : "Enganxar des de Word", -Print : "Imprimir", -SelectAll : "Seleccionar tot", -RemoveFormat : "Eliminar Format", -InsertLinkLbl : "Enlla??", -InsertLink : "Afegir/Editar Enlla??", -RemoveLink : "Eliminar Enlla??", -Anchor : "Afegir/Editar ??ncora", +Save : "Desa", +NewPage : "Nova Pgina", +Preview : "Vista Prvia", +Cut : "Retalla", +Copy : "Copia", +Paste : "Enganxa", +PasteText : "Enganxa com a text no formatat", +PasteWord : "Enganxa des del Word", +Print : "Imprimeix", +SelectAll : "Selecciona-ho tot", +RemoveFormat : "Elimina Format", +InsertLinkLbl : "Enlla", +InsertLink : "Insereix/Edita enlla", +RemoveLink : "Elimina enlla", +Anchor : "Insereix/Edita ncora", InsertImageLbl : "Imatge", -InsertImage : "Afegir/Editar Imatge", +InsertImage : "Insereix/Edita imatge", InsertFlashLbl : "Flash", -InsertFlash : "Afegir/Editar Flash", +InsertFlash : "Insereix/Edita Flash", InsertTableLbl : "Taula", -InsertTable : "Afegir/Editar Taula", -InsertLineLbl : "L??nia", -InsertLine : "Afegir L??nia Horitzontal", -InsertSpecialCharLbl: "Car??cter Especial", -InsertSpecialChar : "Afegir Car??cter Especial", +InsertTable : "Insereix/Edita taula", +InsertLineLbl : "Lnia", +InsertLine : "Insereix lnia horitzontal", +InsertSpecialCharLbl: "Carcter Especial", +InsertSpecialChar : "Insereix carcter especial", InsertSmileyLbl : "Icona", -InsertSmiley : "Afegir Icona", -About : "Sobre FCKeditor", +InsertSmiley : "Insereix icona", +About : "Quant a FCKeditor", Bold : "Negreta", -Italic : "It??lica", +Italic : "Cursiva", Underline : "Subratllat", -StrikeThrough : "Tatxat", -Subscript : "Subscript", -Superscript : "Superscript", -LeftJustify : "Justificar Esquerra", -CenterJustify : "Justificar Centrat", -RightJustify : "Justificar Dreta", -BlockJustify : "Justificar Bloc", -DecreaseIndent : "Disminuir Indentaci??", -IncreaseIndent : "Augmentar Indentaci??", -Undo : "Desfer", -Redo : "Refer", -NumberedListLbl : "Llista Numerada", -NumberedList : "Afegir/Eliminar Llista Numerada", -BulletedListLbl : "Llista Marcada", -BulletedList : "Afegir/Eliminar Llista Marcada", -ShowTableBorders : "Mostrar Costats de Taules", -ShowDetails : "Mostrar Detalls", +StrikeThrough : "Barrat", +Subscript : "Subndex", +Superscript : "Superndex", +LeftJustify : "Aliniament esquerra", +CenterJustify : "Aliniament centrat", +RightJustify : "Aliniament dreta", +BlockJustify : "Justifica", +DecreaseIndent : "Sagna el text", +IncreaseIndent : "Treu el sagnat del text", +Undo : "Desfs", +Redo : "Refs", +NumberedListLbl : "Llista numerada", +NumberedList : "Aplica o elimina la llista numerada", +BulletedListLbl : "Llista de pics", +BulletedList : "Aplica o elimina la llista de pics", +ShowTableBorders : "Mostra les vores de les taules", +ShowDetails : "Mostra detalls", Style : "Estil", FontFormat : "Format", -Font : "Font", -FontSize : "Tamany", +Font : "Tipus de lletra", +FontSize : "Mida", TextColor : "Color de Text", BGColor : "Color de Fons", -Source : "Font", -Find : "Cercar", -Replace : "Rempla??ar", -SpellCheck : "Verificar sintaxi", +Source : "Codi font", +Find : "Cerca", +Replace : "Reemplaa", +SpellCheck : "Revisa l'ortografia", UniversalKeyboard : "Teclat universal", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING +PageBreakLbl : "Salt de pgina", +PageBreak : "Insereix salt de pgina", Form : "Formulari", -Checkbox : "Casella de verificaci??", -RadioButton : "Bot?? r??dio", +Checkbox : "Casella de verificaci", +RadioButton : "Bot d'opci", TextField : "Camp de text", -Textarea : "??rea de text", +Textarea : "rea de text", HiddenField : "Camp ocult", -Button : "bot??", -SelectionField : "Camp de selecci??", -ImageButton : "Bot?? imatge", +Button : "Bot", +SelectionField : "Camp de selecci", +ImageButton : "Bot d'imatge", + +FitWindow : "Maximiza la mida de l'editor", // Context Menu -EditLink : "Editar Enlla??", -InsertRow : "Afegir Fila", -DeleteRows : "Eliminar Files", -InsertColumn : "Afegir Columna", -DeleteColumns : "Eliminar Columnes", -InsertCell : "Afegir Cel??la", -DeleteCells : "Eliminar Cel??les", -MergeCells : "Fusionar Cel??les", -SplitCell : "Separar Cel??les", -TableDelete : "Delete Table", //MISSING -CellProperties : "Proprietats de Cel??la", -TableProperties : "Proprietats de Taula", -ImageProperties : "Proprietats d'Image", -FlashProperties : "Proprietats Flash", - -AnchorProp : "Proprietats d'??ncora", -ButtonProp : "Proprietats de bot??", -CheckboxProp : "Proprietats de casella de verificaci??", -HiddenFieldProp : "Proprietats de camp ocult", -RadioButtonProp : "Proprietats de bot?? r??dio", -ImageButtonProp : "Proprietats de bot?? imatge", -TextFieldProp : "Proprietats de camp de text", -SelectionFieldProp : "Proprietats de camp de selecci??", -TextareaProp : "Proprietats de camp de text", -FormProp : "Proprietats de formulari", - -FontFormats : "Normal;Formatejat;Adre??a;Cap??alera 1;Cap??alera 2;Cap??alera 3;Cap??alera 4;Cap??alera 5;Cap??alera 6", +EditLink : "Edita l'enlla", +CellCM : "Cella", +RowCM : "Fila", +ColumnCM : "Columna", +InsertRow : "Insereix una fila", +DeleteRows : "Suprimeix una fila", +InsertColumn : "Afegeix una columna", +DeleteColumns : "Suprimeix una columna", +InsertCell : "Insereix una cella", +DeleteCells : "Suprimeix les celles", +MergeCells : "Fusiona les celles", +SplitCell : "Separa les celles", +TableDelete : "Suprimeix la taula", +CellProperties : "Propietats de la cella", +TableProperties : "Propietats de la taula", +ImageProperties : "Propietats de la imatge", +FlashProperties : "Propietats del Flash", + +AnchorProp : "Propietats de l'ncora", +ButtonProp : "Propietats del bot", +CheckboxProp : "Propietats de la casella de verificaci", +HiddenFieldProp : "Propietats del camp ocult", +RadioButtonProp : "Propietats del bot d'opci", +ImageButtonProp : "Propietats del bot d'imatge", +TextFieldProp : "Propietats del camp de text", +SelectionFieldProp : "Propietats del camp de selecci", +TextareaProp : "Propietats de l'rea de text", +FormProp : "Propietats del formulari", + +FontFormats : "Normal;Formatejat;Adrea;Encapalament 1;Encapalament 2;Encapalament 3;Encapalament 4;Encapalament 5;Encapalament 6", // Alerts and Messages ProcessingXHTML : "Processant XHTML. Si us plau esperi...", Done : "Fet", PasteWordConfirm : "El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?", -NotCompatiblePaste : "Aquesta funci?? ??s disponible per a Internet Explorer versi?? 5.5 o superior. Voleu enganxar sense netejar?", -UnknownToolbarItem : "Element de la Barra d'eines desconegut \"%1\"", +NotCompatiblePaste : "Aquesta funci s disponible per a Internet Explorer versi 5.5 o superior. Voleu enganxar sense netejar?", +UnknownToolbarItem : "Element de la barra d'eines desconegut \"%1\"", UnknownCommand : "Nom de comanda desconegut \"%1\"", -NotImplemented : "M??tode no implementat", +NotImplemented : "Mtode no implementat", UnknownToolbarSet : "Conjunt de barra d'eines \"%1\" inexistent", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING +NoActiveX : "Les preferncies del navegador poden limitar algunes funcions d'aquest editor. Cal habilitar l'opci \"Executa controls ActiveX i plug-ins\". Poden sorgir errors i poden faltar algunes funcions.", +BrowseServerBlocked : "El visualitzador de recursos no s'ha pogut obrir. Assegura't de que els bloquejos de finestres emergents estan desactivats.", +DialogBlocked : "No ha estat possible obrir una finestra de dileg. Assegura't de que els bloquejos de finestres emergents estan desactivats.", // Dialogs -DlgBtnOK : "OK", -DlgBtnCancel : "Cancelar", -DlgBtnClose : "Tancar", +DlgBtnOK : "D'acord", +DlgBtnCancel : "Cancella", +DlgBtnClose : "Tanca", DlgBtnBrowseServer : "Veure servidor", -DlgAdvancedTag : "Avan??at", +DlgAdvancedTag : "Avanat", DlgOpOther : "Altres", DlgInfoTab : "Info", DlgAlertUrl : "Si us plau, afegiu la URL", // General Dialogs Labels -DlgGenNotSet : "<no definit>", +DlgGenNotSet : "", DlgGenId : "Id", -DlgGenLangDir : "Direcci?? Idioma", -DlgGenLangDirLtr : "Esquerra a Dreta (LTR)", -DlgGenLangDirRtl : "Dreta a Esquerra (RTL)", -DlgGenLangCode : "Codi de Llengua", -DlgGenAccessKey : "Clau d'acc??s", +DlgGenLangDir : "Direcci de l'idioma", +DlgGenLangDirLtr : "D'esquerra a dreta (LTR)", +DlgGenLangDirRtl : "De dreta a esquerra (RTL)", +DlgGenLangCode : "Codi d'idioma", +DlgGenAccessKey : "Clau d'accs", DlgGenName : "Nom", DlgGenTabIndex : "Index de Tab", -DlgGenLongDescr : "Descripci?? Llarga URL", -DlgGenClass : "Classes del Full d'Estils", -DlgGenTitle : "T??tol Consultiu", -DlgGenContType : "Tipus de Contingut Consultiu", -DlgGenLinkCharset : "Conjunt de Car??cters Font Enlla??at", +DlgGenLongDescr : "Descripci llarga de la URL", +DlgGenClass : "Classes del full d'estil", +DlgGenTitle : "Ttol consultiu", +DlgGenContType : "Tipus de contingut consultiu", +DlgGenLinkCharset : "Conjunt de carcters font enllaat", DlgGenStyle : "Estil", // Image Dialog -DlgImgTitle : "Proprietats d'Imatge", -DlgImgInfoTab : "Informaci?? d'Imatge", -DlgImgBtnUpload : "Enviar-la al servidor", +DlgImgTitle : "Propietats de la imatge", +DlgImgInfoTab : "Informaci de la imatge", +DlgImgBtnUpload : "Envia-la al servidor", DlgImgURL : "URL", -DlgImgUpload : "Pujar", -DlgImgAlt : "Text Alternatiu", +DlgImgUpload : "Puja", +DlgImgAlt : "Text alternatiu", DlgImgWidth : "Amplada", -DlgImgHeight : "Al??ada", -DlgImgLockRatio : "Bloquejar Proporcions", -DlgBtnResetSize : "Restaurar Tamany", -DlgImgBorder : "Costat", -DlgImgHSpace : "HSpace", -DlgImgVSpace : "VSpace", -DlgImgAlign : "Alineaci??", -DlgImgAlignLeft : "Left", +DlgImgHeight : "Alada", +DlgImgLockRatio : "Bloqueja les proporcions", +DlgBtnResetSize : "Restaura la mida", +DlgImgBorder : "Vora", +DlgImgHSpace : "Espaiat horit.", +DlgImgVSpace : "Espaiat vert.", +DlgImgAlign : "Alineaci", +DlgImgAlignLeft : "Ajusta a l'esquerra", DlgImgAlignAbsBottom: "Abs Bottom", DlgImgAlignAbsMiddle: "Abs Middle", DlgImgAlignBaseline : "Baseline", DlgImgAlignBottom : "Bottom", DlgImgAlignMiddle : "Middle", -DlgImgAlignRight : "Right", +DlgImgAlignRight : "Ajusta a la dreta", DlgImgAlignTextTop : "Text Top", DlgImgAlignTop : "Top", -DlgImgPreview : "Vista Pr??via", +DlgImgPreview : "Vista prvia", DlgImgAlertUrl : "Si us plau, escriviu la URL de la imatge", -DlgImgLinkTab : "Enlla??", +DlgImgLinkTab : "Enlla", // Flash Dialog -DlgFlashTitle : "Propietats Flash", -DlgFlashChkPlay : "Reproduci?? Autom??tica", +DlgFlashTitle : "Propietats del Flash", +DlgFlashChkPlay : "Reproduci automtica", DlgFlashChkLoop : "Bucle", -DlgFlashChkMenu : "Habilitar Menu Flash", +DlgFlashChkMenu : "Habilita men Flash", DlgFlashScale : "Escala", -DlgFlashScaleAll : "Mostrar tot", -DlgFlashScaleNoBorder : "Sense Costats", +DlgFlashScaleAll : "Mostra-ho tot", +DlgFlashScaleNoBorder : "Sense vores", DlgFlashScaleFit : "Mida exacta", // Link Dialog -DlgLnkWindowTitle : "Enlla??", -DlgLnkInfoTab : "Informaci?? d'Enlla??", -DlgLnkTargetTab : "Dest??", - -DlgLnkType : "Tipus de Link", +DlgLnkWindowTitle : "Enlla", +DlgLnkInfoTab : "Informaci de l'enlla", +DlgLnkTargetTab : "Dest", + +DlgLnkType : "Tipus d'enlla", DlgLnkTypeURL : "URL", -DlgLnkTypeAnchor : "??ncora en aquesta p??gina", +DlgLnkTypeAnchor : "ncora en aquesta pgina", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "Protocol", -DlgLnkProtoOther : "<altra>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", -DlgLnkAnchorSel : "Seleccionar una ??ncora", -DlgLnkAnchorByName : "Per nom d'??ncora", +DlgLnkAnchorSel : "Selecciona una ncora", +DlgLnkAnchorByName : "Per nom d'ncora", DlgLnkAnchorById : "Per Id d'element", -DlgLnkNoAnchors : "<No hi ha ??ncores disponibles en aquest document>", -DlgLnkEMail : "Adre??a d'E-Mail", -DlgLnkEMailSubject : "Subjecte del Missatge", -DlgLnkEMailBody : "Cos del Missatge", -DlgLnkUpload : "Pujar", -DlgLnkBtnUpload : "Enviar al Servidor", - -DlgLnkTarget : "Dest??", -DlgLnkTargetFrame : "<marc>", -DlgLnkTargetPopup : "<finestra popup>", -DlgLnkTargetBlank : "Nova Finestra (_blank)", -DlgLnkTargetParent : "Finestra Pare (_parent)", -DlgLnkTargetSelf : "Mateixa Finestra (_self)", +DlgLnkNoAnchors : "", +DlgLnkEMail : "Adrea d'E-Mail", +DlgLnkEMailSubject : "Assumpte del missatge", +DlgLnkEMailBody : "Cos del missatge", +DlgLnkUpload : "Puja", +DlgLnkBtnUpload : "Envia al servidor", + +DlgLnkTarget : "Dest", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", +DlgLnkTargetBlank : "Nova finestra (_blank)", +DlgLnkTargetParent : "Finestra pare (_parent)", +DlgLnkTargetSelf : "Mateixa finestra (_self)", DlgLnkTargetTop : "Finestra Major (_top)", -DlgLnkTargetFrameName : "Nom del marc de dest??", -DlgLnkPopWinName : "Nom Finestra Popup", -DlgLnkPopWinFeat : "Caracter??stiques Finestra Popup", +DlgLnkTargetFrameName : "Nom del marc de dest", +DlgLnkPopWinName : "Nom finestra popup", +DlgLnkPopWinFeat : "Caracterstiques finestra popup", DlgLnkPopResize : "Redimensionable", -DlgLnkPopLocation : "Barra d'Adre??a", -DlgLnkPopMenu : "Barra de Men??", -DlgLnkPopScroll : "Barres d'Scroll", -DlgLnkPopStatus : "Barra d'Estat", -DlgLnkPopToolbar : "Barra d'Eines", +DlgLnkPopLocation : "Barra d'adrea", +DlgLnkPopMenu : "Barra de men", +DlgLnkPopScroll : "Barres d'scroll", +DlgLnkPopStatus : "Barra d'estat", +DlgLnkPopToolbar : "Barra d'eines", DlgLnkPopFullScrn : "Pantalla completa (IE)", DlgLnkPopDependent : "Depenent (Netscape)", DlgLnkPopWidth : "Amplada", -DlgLnkPopHeight : "Al??ada", -DlgLnkPopLeft : "Posici?? Esquerra", -DlgLnkPopTop : "Posici?? Dalt", - -DlnLnkMsgNoUrl : "Si us plau, escrigui l'enlla?? URL", -DlnLnkMsgNoEMail : "Si us plau, escrigui l'adre??a e-mail", -DlnLnkMsgNoAnchor : "Si us plau, escrigui l'??ncora", +DlgLnkPopHeight : "Alada", +DlgLnkPopLeft : "Posici esquerra", +DlgLnkPopTop : "Posici dalt", + +DlnLnkMsgNoUrl : "Si us plau, escrigui l'enlla URL", +DlnLnkMsgNoEMail : "Si us plau, escrigui l'adrea e-mail", +DlnLnkMsgNoAnchor : "Si us plau, escrigui l'ncora", // Color Dialog -DlgColorTitle : "Seleccioni Color", -DlgColorBtnClear : "Netejar", -DlgColorHighlight : "Real??ar", -DlgColorSelected : "Seleccionat", +DlgColorTitle : "Selecciona el color", +DlgColorBtnClear : "Neteja", +DlgColorHighlight : "Reala", +DlgColorSelected : "Selecciona", // Smiley Dialog -DlgSmileyTitle : "Afegir una Icona", +DlgSmileyTitle : "Insereix una icona", // Special Character Dialog -DlgSpecialCharTitle : "Seleccioneu Car??cter Especial", +DlgSpecialCharTitle : "Selecciona el carcter especial", // Table Dialog -DlgTableTitle : "Proprietats de Taula", +DlgTableTitle : "Propietats de la taula", DlgTableRows : "Files", DlgTableColumns : "Columnes", -DlgTableBorder : "Tamany de Costat", -DlgTableAlign : "Alineaci??", +DlgTableBorder : "Tamany vora", +DlgTableAlign : "Alineaci", DlgTableAlignNotSet : "", DlgTableAlignLeft : "Esquerra", DlgTableAlignCenter : "Centre", DlgTableAlignRight : "Dreta", DlgTableWidth : "Amplada", -DlgTableWidthPx : "p??xels", +DlgTableWidthPx : "pxels", DlgTableWidthPc : "percentatge", -DlgTableHeight : "Al??ada", -DlgTableCellSpace : "Cell spacing", -DlgTableCellPad : "Cell padding", -DlgTableCaption : "Cap??alera", -DlgTableSummary : "Summary", //MISSING +DlgTableHeight : "Alada", +DlgTableCellSpace : "Espaiat de celles", +DlgTableCellPad : "Encoixinament de celles", +DlgTableCaption : "Ttol", +DlgTableSummary : "Resum", // Table Cell Dialog -DlgCellTitle : "Proprietats de Cel??la", +DlgCellTitle : "Propietats de la cella", DlgCellWidth : "Amplada", -DlgCellWidthPx : "p??xels", +DlgCellWidthPx : "pxels", DlgCellWidthPc : "percentatge", -DlgCellHeight : "Al??ada", -DlgCellWordWrap : "Word Wrap", +DlgCellHeight : "Alada", +DlgCellWordWrap : "Ajust de paraula", DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "Si", DlgCellWordWrapNo : "No", -DlgCellHorAlign : "Alineaci?? Horitzontal", +DlgCellHorAlign : "Alineaci horitzontal", DlgCellHorAlignNotSet : "", DlgCellHorAlignLeft : "Esquerra", DlgCellHorAlignCenter : "Centre", DlgCellHorAlignRight: "Dreta", -DlgCellVerAlign : "Alineaci?? Vertical", +DlgCellVerAlign : "Alineaci vertical", DlgCellVerAlignNotSet : "", DlgCellVerAlignTop : "Top", DlgCellVerAlignMiddle : "Middle", @@ -308,66 +314,65 @@ DlgCellVerAlignBaseline : "Baseline", DlgCellRowSpan : "Rows Span", DlgCellCollSpan : "Columns Span", -DlgCellBackColor : "Color de Fons", -DlgCellBorderColor : "Colr de Costat", -DlgCellBtnSelect : "Seleccioni...", +DlgCellBackColor : "Color de fons", +DlgCellBorderColor : "Color de la vora", +DlgCellBtnSelect : "Seleccioneu...", // Find Dialog -DlgFindTitle : "Cercar", -DlgFindFindBtn : "Cercar", -DlgFindNotFoundMsg : "El text especificat no ha estat trobat.", +DlgFindTitle : "Cerca", +DlgFindFindBtn : "Cerca", +DlgFindNotFoundMsg : "El text especificat no s'ha trobat.", // Replace Dialog -DlgReplaceTitle : "Rempla??ar", -DlgReplaceFindLbl : "Cercar:", -DlgReplaceReplaceLbl : "Rempla??ar per:", -DlgReplaceCaseChk : "Sensible a Maj??scules", -DlgReplaceReplaceBtn : "Rempla??ar", -DlgReplaceReplAllBtn : "Rempla??ar Tot", -DlgReplaceWordChk : "Cercar Paraula Completa", +DlgReplaceTitle : "Reemplaa", +DlgReplaceFindLbl : "Cerca:", +DlgReplaceReplaceLbl : "Remplaa amb:", +DlgReplaceCaseChk : "Sensible a majscules", +DlgReplaceReplaceBtn : "Reemplaa", +DlgReplaceReplAllBtn : "Reemplaa'ls tots", +DlgReplaceWordChk : "Cerca paraula completa", // Paste Operations / Dialog -PasteErrorPaste : "La seguretat del vostre navigador no permet executar autom??ticament les operacions d'enganxat. Si us plau, utilitzeu el teclat (Ctrl+V).", -PasteErrorCut : "La seguretat del vostre navigador no permet executar autom??ticament les operacions de tallar. Si us plau, utilitzeu el teclat (Ctrl+X).", -PasteErrorCopy : "La seguretat del vostre navigador no permet executar autom??ticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl+C).", - -PasteAsText : "Enganxar com Text Planer", -PasteFromWord : "Enganxar com Word", - -DlgPasteMsg2 : "Si us plau, enganxeu dins del seg??ent camp utilitzant el teclat (Ctrl+V) i premeu OK.", -DlgPasteIgnoreFont : "Ignorar definicions de font", -DlgPasteRemoveStyles : "Eliminar definicions d'estil", -DlgPasteCleanBox : "Netejar camp", - +PasteErrorPaste : "La seguretat del vostre navegador no permet executar automticament les operacions d'enganxat. Si us plau, utilitzeu el teclat (Ctrl+V).", +PasteErrorCut : "La seguretat del vostre navegador no permet executar automticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl+X).", +PasteErrorCopy : "La seguretat del vostre navegador no permet executar automticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl+C).", + +PasteAsText : "Enganxa com a text sense format", +PasteFromWord : "Enganxa com a Word", + +DlgPasteMsg2 : "Si us plau, enganxeu dins del segent camp utilitzant el teclat (Ctrl+V) i premeu OK.", +DlgPasteIgnoreFont : "Ignora definicions de font", +DlgPasteRemoveStyles : "Elimina definicions d'estil", +DlgPasteCleanBox : "Neteja camp", // Color Picker -ColorAutomatic : "Autom??tic", -ColorMoreColors : "M??s Colors...", +ColorAutomatic : "Automtic", +ColorMoreColors : "Ms colors...", // Document Properties -DocProps : "Proprietats de document", +DocProps : "Propietats del document", // Anchor Dialog -DlgAnchorTitle : "Proprietats d'??ncora", -DlgAnchorName : "Nom d'??ncora", -DlgAnchorErrorName : "Si us plau, escrigui el nom de l'ancora", +DlgAnchorTitle : "Propietats de l'ncora", +DlgAnchorName : "Nom de l'ncora", +DlgAnchorErrorName : "Si us plau, escriviu el nom de l'ancora", // Speller Pages Dialog -DlgSpellNotInDic : "No ??s al diccionari", -DlgSpellChangeTo : "Canviar a", -DlgSpellBtnIgnore : "Ignorar", -DlgSpellBtnIgnoreAll : "Ignorar tot", -DlgSpellBtnReplace : "Rempla??ar", -DlgSpellBtnReplaceAll : "Repla??ar tot", -DlgSpellBtnUndo : "Desfer", -DlgSpellNoSuggestions : "Cap suggesti??", -DlgSpellProgress : "Comprovaci?? de sintaxi en progr??s", -DlgSpellNoMispell : "Comprovaci?? de sintaxi completada", -DlgSpellNoChanges : "Comprovaci?? de sintaxi: cap paraulada canviada", -DlgSpellOneChange : "Comprovaci?? de sintaxi: una paraula canviada", -DlgSpellManyChanges : "Comprovaci?? de sintaxi %1 paraules canviades", - -IeSpellDownload : "Comprovaci?? de sintaxi no instal??lat. Voleu descarregar-ho ara?", +DlgSpellNotInDic : "No s al diccionari", +DlgSpellChangeTo : "Canvia a", +DlgSpellBtnIgnore : "Ignora", +DlgSpellBtnIgnoreAll : "Ignora-les totes", +DlgSpellBtnReplace : "Canvia", +DlgSpellBtnReplaceAll : "Canvia-les totes", +DlgSpellBtnUndo : "Desfs", +DlgSpellNoSuggestions : "Cap sugerncia", +DlgSpellProgress : "Comprovaci ortogrfica en progrs", +DlgSpellNoMispell : "Comprovaci ortogrfica completada", +DlgSpellNoChanges : "Comprovaci ortogrfica: cap paraulada canviada", +DlgSpellOneChange : "Comprovaci ortogrfica: una paraula canviada", +DlgSpellManyChanges : "Comprovaci ortogrfica %1 paraules canviades", + +IeSpellDownload : "Comprovaci ortogrfica no installada. Voleu descarregar-ho ara?", // Button Dialog DlgButtonText : "Text (Valor)", @@ -380,24 +385,24 @@ // Form Dialog DlgFormName : "Nom", -DlgFormAction : "Acci??", -DlgFormMethod : "M??tode", +DlgFormAction : "Acci", +DlgFormMethod : "Mtode", // Select Field Dialog DlgSelectName : "Nom", DlgSelectValue : "Valor", DlgSelectSize : "Tamany", -DlgSelectLines : "L??nies", -DlgSelectChkMulti : "Permetre m??ltiples seleccions", +DlgSelectLines : "Lnies", +DlgSelectChkMulti : "Permet mltiples seleccions", DlgSelectOpAvail : "Opcions disponibles", DlgSelectOpText : "Text", DlgSelectOpValue : "Valor", -DlgSelectBtnAdd : "Afegir", -DlgSelectBtnModify : "Modificar", +DlgSelectBtnAdd : "Afegeix", +DlgSelectBtnModify : "Modifica", DlgSelectBtnUp : "Amunt", DlgSelectBtnDown : "Avall", -DlgSelectBtnSetValue : "Seleccionar per defecte", -DlgSelectBtnDelete : "Esborrar", +DlgSelectBtnSetValue : "Selecciona per defecte", +DlgSelectBtnDelete : "Elimina", // Textarea Dialog DlgTextareaName : "Nom", @@ -407,28 +412,28 @@ // Text Field Dialog DlgTextName : "Nom", DlgTextValue : "Valor", -DlgTextCharWidth : "Amplada de car??cter", -DlgTextMaxChars : "M??xim de car??cters", +DlgTextCharWidth : "Amplada de carcter", +DlgTextMaxChars : "Mxim de carcters", DlgTextType : "Tipus", DlgTextTypeText : "Text", -DlgTextTypePass : "Contrassenya", +DlgTextTypePass : "Contrasenya", // Hidden Field Dialog DlgHiddenName : "Nom", DlgHiddenValue : "Valor", // Bulleted List Dialog -BulletedListProp : "Proprietats de llista marcada", -NumberedListProp : "Proprietats de llista numerada", +BulletedListProp : "Propietats de llista marcada", +NumberedListProp : "Propietats de llista numerada", DlgLstType : "Tipus", DlgLstTypeCircle : "Cercle", DlgLstTypeDisc : "Disc", //MISSING DlgLstTypeSquare : "Quadrat", -DlgLstTypeNumbers : "N??meros (1, 2, 3)", -DlgLstTypeLCase : "Lletres min??scules (a, b, c)", -DlgLstTypeUCase : "Lletres maj??scules (A, B, C)", -DlgLstTypeSRoman : "N??meros romans min??scules (i, ii, iii)", -DlgLstTypeLRoman : "N??meros romans maj??scules (I, II, III)", +DlgLstTypeNumbers : "Nmeros (1, 2, 3)", +DlgLstTypeLCase : "Lletres minscules (a, b, c)", +DlgLstTypeUCase : "Lletres majscules (A, B, C)", +DlgLstTypeSRoman : "Nmeros romans minscules (i, ii, iii)", +DlgLstTypeLRoman : "Nmeros romans majscules (I, II, III)", // Document Properties Dialog DlgDocGeneralTab : "General", @@ -436,46 +441,47 @@ DlgDocColorsTab : "Colors i marges", DlgDocMetaTab : "Dades Meta", -DlgDocPageTitle : "T??tol de la p??gina", -DlgDocLangDir : "Direcci?? llenguatge", +DlgDocPageTitle : "Ttol de la pgina", +DlgDocLangDir : "Direcci llenguatge", DlgDocLangDirLTR : "Esquerra a dreta (LTR)", DlgDocLangDirRTL : "Dreta a esquerra (RTL)", DlgDocLangCode : "Codi de llenguatge", -DlgDocCharSet : "Codificaci?? de conjunt de car??cters", -DlgDocCharSetOther : "Altra codificaci?? de conjunt de car??cters", - -DlgDocDocType : "Cap??alera de tipus de document", -DlgDocDocTypeOther : "Altra Cap??alera de tipus de document", +DlgDocCharSet : "Codificaci de conjunt de carcters", +DlgDocCharSetOther : "Altra codificaci de conjunt de carcters", + +DlgDocDocType : "Capalera de tipus de document", +DlgDocDocTypeOther : "Altra Capalera de tipus de document", DlgDocIncXHTML : "Incloure declaracions XHTML", DlgDocBgColor : "Color de fons", DlgDocBgImage : "URL de la imatge de fons", DlgDocBgNoScroll : "Fons fixe", DlgDocCText : "Text", -DlgDocCLink : "Enlla??", -DlgDocCVisited : "Enlla?? visitat", -DlgDocCActive : "Enlla?? actiu", -DlgDocMargins : "Marges de p??gina", +DlgDocCLink : "Enlla", +DlgDocCVisited : "Enlla visitat", +DlgDocCActive : "Enlla actiu", +DlgDocMargins : "Marges de pgina", DlgDocMaTop : "Cap", DlgDocMaLeft : "Esquerra", DlgDocMaRight : "Dreta", DlgDocMaBottom : "Peu", -DlgDocMeIndex : "Mots clau per a indexaci?? (separats per coma)", -DlgDocMeDescr : "Descripci?? del document", +DlgDocMeIndex : "Mots clau per a indexaci (separats per coma)", +DlgDocMeDescr : "Descripci del document", DlgDocMeAuthor : "Autor", DlgDocMeCopy : "Copyright", -DlgDocPreview : "Vista pr??via", +DlgDocPreview : "Vista prvia", // Templates Dialog Templates : "Plantilles", -DlgTemplatesTitle : "Contingut Plantilles", -DlgTemplatesSelMsg : "Si us plau, seleccioneu la plantilla per obrir en l'editor
      (el contingut actual no ser?? enregistrat):", -DlgTemplatesLoading : "Carregant la llista de plantilles. Si us plau, esperi...", +DlgTemplatesTitle : "Contingut plantilles", +DlgTemplatesSelMsg : "Si us plau, seleccioneu la plantilla per obrir en l'editor
      (el contingut actual no ser enregistrat):", +DlgTemplatesLoading : "Carregant la llista de plantilles. Si us plau, espereu...", DlgTemplatesNoTpl : "(No hi ha plantilles definides)", // About Dialog -DlgAboutAboutTab : "Sobre", -DlgAboutBrowserInfoTab : "Informaci?? del navigador", -DlgAboutVersion : "versi??", -DlgAboutLicense : "Sota els termes de la Llic??ncia GNU Lesser General Public License", -DlgAboutInfo : "Per a m??s informaci?? aneu a" +DlgAboutAboutTab : "Quant a", +DlgAboutBrowserInfoTab : "Informaci del navegador", +DlgAboutLicenseTab : "Llicncia", +DlgAboutVersion : "versi", +DlgAboutLicense : "Segons els termes de la Llicncia GNU Lesser General Public License", +DlgAboutInfo : "Per a ms informaci aneu a" } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/cs.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/cs.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/cs.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -87,8 +87,8 @@ Replace : "Nahradit", SpellCheck : "Zkontrolovat pravopis", UniversalKeyboard : "Univerz??ln?? kl??vesnice", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING +PageBreakLbl : "Konec str??nky", +PageBreak : "Vlo??it konec str??nky", Form : "Formul????", Checkbox : "Za??krt??vac?? pol????ko", @@ -100,8 +100,13 @@ SelectionField : "Seznam", ImageButton : "Obr??zkov?? tla????tko", +FitWindow : "Maximalizovat velikost editoru", + // Context Menu EditLink : "Zm??nit odkaz", +CellCM : "Bu??ka", +RowCM : "????dek", +ColumnCM : "Sloupec", InsertRow : "Vlo??it ????dek", DeleteRows : "Smazat ????dek", InsertColumn : "Vlo??it sloupec", @@ -110,7 +115,7 @@ DeleteCells : "Smazat bu??ky", MergeCells : "Slou??it bu??ky", SplitCell : "Rozd??lit bu??ku", -TableDelete : "Delete Table", //MISSING +TableDelete : "Smazat tabulku", CellProperties : "Vlastnosti bu??ky", TableProperties : "Vlastnosti tabulky", ImageProperties : "Vlastnosti obr??zku", @@ -138,9 +143,9 @@ UnknownCommand : "Nezn??m?? p????kaz \"%1\"", NotImplemented : "P????kaz nen?? implementov??n", UnknownToolbarSet : "Panel n??stroj?? \"%1\" neexistuje", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING +NoActiveX : "Nastaven?? bezpe??nosti Va??eho prohl????e??e omezuje funk??nost n??kter??ch jeho mo??nost??. Je t??eba zapnout volbu \"Spou??t??t ovl??d??ac?? prvky ActiveX a moduly plug-in\", jinak nebude mo??n?? vyu????vat v??echny dosputn?? schopnosti editoru.", +BrowseServerBlocked : "Pr??zkumn??k zdroj?? nelze otev????t. Prov????te, zda nem??te aktivov??no blokov??n?? popup oken.", +DialogBlocked : "Nelze otev????t dialogov?? okno. Prov????te, zda nem??te aktivov??no blokov??n?? popup oken.", // Dialogs DlgBtnOK : "OK", @@ -148,12 +153,12 @@ DlgBtnClose : "Zav????t", DlgBtnBrowseServer : "Vybrat na serveru", DlgAdvancedTag : "Roz??????en??", -DlgOpOther : "<Ostatn??>", +DlgOpOther : "", DlgInfoTab : "Info", DlgAlertUrl : "Pros??m vlo??te URL", // General Dialogs Labels -DlgGenNotSet : "<nenastaveno>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "Orientace jazyka", DlgGenLangDirLtr : "Zleva do prava (LTR)", @@ -217,12 +222,12 @@ DlgLnkTypeAnchor : "Kotva v t??to str??nce", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "Protokol", -DlgLnkProtoOther : "<jin??>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "Vybrat kotvu", DlgLnkAnchorByName : "Podle jm??na kotvy", DlgLnkAnchorById : "Podle Id objektu", -DlgLnkNoAnchors : "<Ve str??nce ????dn?? kotva nen?? definov??na>", +DlgLnkNoAnchors : "", DlgLnkEMail : "E-Mailov?? adresa", DlgLnkEMailSubject : "P??edm??t zpr??vy", DlgLnkEMailBody : "T??lo zpr??vy", @@ -230,8 +235,8 @@ DlgLnkBtnUpload : "Odeslat na Server", DlgLnkTarget : "C??l", -DlgLnkTargetFrame : "<r??mec>", -DlgLnkTargetPopup : "<vyskakovac?? okno>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Nov?? okno (_blank)", DlgLnkTargetParent : "Rodi??ovsk?? okno (_parent)", DlgLnkTargetSelf : "Stejn?? okno (_self)", @@ -285,7 +290,7 @@ DlgTableCellSpace : "Vzd??lenost bun??k", DlgTableCellPad : "Odsazen?? obsahu", DlgTableCaption : "Popis", -DlgTableSummary : "Summary", //MISSING +DlgTableSummary : "Souhrn", // Table Cell Dialog DlgCellTitle : "Vlastnosti bu??ky", @@ -341,7 +346,6 @@ DlgPasteRemoveStyles : "Odstranit styly", DlgPasteCleanBox : "Vy??istit", - // Color Picker ColorAutomatic : "Automaticky", ColorMoreColors : "V??ce barev...", @@ -477,6 +481,7 @@ // About Dialog DlgAboutAboutTab : "O aplikaci", DlgAboutBrowserInfoTab : "Informace o prohl????e??i", +DlgAboutLicenseTab : "Licence", DlgAboutVersion : "verze", DlgAboutLicense : "Licencov??no pod GNU Lesser General Public License", DlgAboutInfo : "V??ce informac?? z??sk??te na" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/da.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/da.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/da.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -16,6 +16,7 @@ * File Authors: * J??rgen Nordstr??m (jn at FirstWeb.dk) * Jesper Michelsen (jm at i-deVision.dk) + * Bo Brandt (bbr at dynamicweb.dk) */ var FCKLang = @@ -23,8 +24,8 @@ // Language direction : "ltr" (left to right) or "rtl" (right to left). Dir : "ltr", -ToolbarCollapse : "Sammenfold V??rkt??jskasse", -ToolbarExpand : "Udvid V??rkt??jskasse", +ToolbarCollapse : "Skjul v??rkt??jslinier", +ToolbarExpand : "Vis v??rkt??jslinier", // Toolbar Items and Context Menu Save : "Gem", @@ -33,27 +34,27 @@ Cut : "Klip", Copy : "Kopier", Paste : "Inds??t", -PasteText : "Inds??t som ren tekst", +PasteText : "Inds??t som ikke-formateret tekst", PasteWord : "Inds??t fra Word", Print : "Udskriv", SelectAll : "V??lg alt", -RemoveFormat : "Slet formatering", -InsertLinkLbl : "Link", -InsertLink : "Inds??t/Rediger Link", -RemoveLink : "Slet Link", -Anchor : "Insert/Rediger Anker", -InsertImageLbl : "Inds??t Billed", -InsertImage : "Inds??t/Rediger Billed", +RemoveFormat : "Fjern formatering", +InsertLinkLbl : "Hyperlink", +InsertLink : "Inds??t/rediger hyperlink", +RemoveLink : "Fjern hyperlink", +Anchor : "Inds??t/rediger bogm??rke", +InsertImageLbl : "Inds??t billede", +InsertImage : "Inds??t/rediger billede", InsertFlashLbl : "Flash", InsertFlash : "Inds??t/rediger Flash", InsertTableLbl : "Table", -InsertTable : "Inds??t/Rediger Tabel", +InsertTable : "Inds??t/rediger tabel", InsertLineLbl : "Linie", -InsertLine : "Inds??t horisontal Linie", -InsertSpecialCharLbl: "Special Karakter", -InsertSpecialChar : "Inds??t Special Karakter", +InsertLine : "Inds??t vandret linie", +InsertSpecialCharLbl: "Symbol", +InsertSpecialChar : "Inds??t symbol", InsertSmileyLbl : "Smiley", -InsertSmiley : "Inds??t Smiley", +InsertSmiley : "Inds??t smiley", About : "Om FCKeditor", Bold : "Fed", Italic : "Kursiv", @@ -68,12 +69,12 @@ DecreaseIndent : "Formindsk indrykning", IncreaseIndent : "For??g indrykning", Undo : "Fortryd", -Redo : "Anuller fortryd", -NumberedListLbl : "Tal opstilling", -NumberedList : "Inds??t/Slet Tal opstilling", -BulletedListLbl : "Punkttegn opstilling", -BulletedList : "Inds??t/Slet Punkttegn opstilling", -ShowTableBorders : "Vis tabel kanter", +Redo : "Annuller fortryd", +NumberedListLbl : "Talopstilling", +NumberedList : "Inds??t/fjern talopstilling", +BulletedListLbl : "Punktopstilling", +BulletedList : "Inds??t/fjern punktopstilling", +ShowTableBorders : "Vis tabelkanter", ShowDetails : "Vis detaljer", Style : "Typografi", FontFormat : "Formatering", @@ -85,82 +86,87 @@ Find : "S??g", Replace : "Erstat", SpellCheck : "Stavekontrol", -UniversalKeyboard : "Universalt Tastatur", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING - -Form : "Inds??t Form", -Checkbox : "Inds??t Afkrydsningsboks", -RadioButton : "Inds??t Radioknap", -TextField : "Inds??t Tekstfelt", -Textarea : "Inds??t Tekstboks", -HiddenField : "Inds??t Skjultfelt", -Button : "Inds??t Knap", -SelectionField : "Inds??t Valgfelt", -ImageButton : "Inds??t Billedknap", +UniversalKeyboard : "Universaltastatur", +PageBreakLbl : "Sidskift", +PageBreak : "Inds??t sideskift", + +Form : "Inds??t formular", +Checkbox : "Inds??t afkrydsningsfelt", +RadioButton : "Inds??t alternativknap", +TextField : "Inds??t tekstfelt", +Textarea : "Inds??t tekstboks", +HiddenField : "Inds??t skjult felt", +Button : "Inds??t knap", +SelectionField : "Inds??t liste", +ImageButton : "Inds??t billedknap", + +FitWindow : "Maksimer editor vinduet", // Context Menu -EditLink : "Rediger link", +EditLink : "Rediger hyperlink", +CellCM : "Celle", +RowCM : "R??kke", +ColumnCM : "Kolonne", InsertRow : "Inds??t r??kke", -DeleteRows : "Slet r??kker", +DeleteRows : "Slet r??kke", InsertColumn : "Inds??t kolonne", -DeleteColumns : "Slet kolonner", +DeleteColumns : "Slet kolonne", InsertCell : "Inds??t celle", DeleteCells : "Slet celle", MergeCells : "Flet celler", -SplitCell : "Opdel celler", -TableDelete : "Delete Table", //MISSING -CellProperties : "Celle egenskaber", -TableProperties : "Tabel egenskaber", -ImageProperties : "Billed egenskaber", -FlashProperties : "Flash egenskaber", - -AnchorProp : "Anker egenskaber", -ButtonProp : "Knap egenskaber", -CheckboxProp : "Afkrydsningsboks egenskaber", -HiddenFieldProp : "Skjultfelt egenskaber", -RadioButtonProp : "Radioknap egenskaber", -ImageButtonProp : "Billedknap egenskaber", -TextFieldProp : "Tekstfelt egenskaber", -SelectionFieldProp : "Valgfelt egenskaber", -TextareaProp : "Tekstboks egenskaber", -FormProp : "Form egenskaber", - -FontFormats : "Normal;Formateret;Adresse;Overskrift 1;Overskrift 2;Overskrift 3;Overskrift 4;Overskrift 5;Overskrift 6", +SplitCell : "Opdel celle", +TableDelete : "Slet tabel", +CellProperties : "Egenskaber for celle", +TableProperties : "Egenskaber for tabel", +ImageProperties : "Egenskaber for billede", +FlashProperties : "Egenskaber for Flash", + +AnchorProp : "Egenskaber for bogm??rke", +ButtonProp : "Egenskaber for knap", +CheckboxProp : "Egenskaber for afkrydsningsfelt", +HiddenFieldProp : "Egenskaber for skjult felt", +RadioButtonProp : "Egenskaber for alternativknap", +ImageButtonProp : "Egenskaber for billedknap", +TextFieldProp : "Egenskaber for tekstfelt", +SelectionFieldProp : "Egenskaber for liste", +TextareaProp : "Egenskaber for tekstboks", +FormProp : "Egenskaber for formular", + +FontFormats : "Normal;Formateret;Adresse;Overskrift 1;Overskrift 2;Overskrift 3;Overskrift 4;Overskrift 5;Overskrift 6;Normal (DIV)", // Alerts and Messages -ProcessingXHTML : "Behandler XHTML. Vent venligst...", +ProcessingXHTML : "Behandler XHTML...", Done : "F??rdig", -PasteWordConfirm : "Den tekst du fors??ger at inds??tte ser ud til at komme fra Word. Vil du rense teksten f??r den inds??ttes ?", -NotCompatiblePaste : "Denne kommando er tilg??ndelig i Internet Explorer 5.5 og senere. Vil du inds??tte teksten uden at rense den ?", -UnknownToolbarItem : "Ukendt v??rkt??jslinje objekt \"%1\"", -UnknownCommand : "Ukendt kommando navn \"%1\"", -NotImplemented : "Kommandoen er ikke implementeret", -UnknownToolbarSet : "V??rkt??jslinjen \"%1\" eksisterer ikke", -NoActiveX : "Din browsers sikkerhedsindstillinger kan begr??nse nogle af editorens muligheder. Du skal sl?? \"K??r ActiveX-objekter og plug-ins\" til. Du vil m??ske opleve fejl og manglende muligheder.", -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING +PasteWordConfirm : "Den tekst du fors??ger at inds??tte ser ud til at komme fra Word.
      Vil du rense teksten f??r den inds??ttes?", +NotCompatiblePaste : "Denne kommando er tilg??ndelig i Internet Explorer 5.5 eller senere.
      Vil du inds??tte teksten uden at rense den ?", +UnknownToolbarItem : "Ukendt v??rkt??jslinjeobjekt \"%1\"!", +UnknownCommand : "Ukendt kommandonavn \"%1\"!", +NotImplemented : "Kommandoen er ikke implementeret!", +UnknownToolbarSet : "V??rkt??jslinjen \"%1\" eksisterer ikke!", +NoActiveX : "Din browsers sikkerhedsindstillinger begr??nser nogle af editorens muligheder.
      Sl?? \"K??r ActiveX-objekter og plug-ins\" til, ellers vil du opleve fejl og manglende muligheder.", +BrowseServerBlocked : "Browseren kunne ikke ??bne de n??dvendige ressourcer!
      Sl?? pop-up blokering fra.", +DialogBlocked : "Dialogvinduet kunne ikke ??bnes!
      Sl?? pop-up blokering fra.", // Dialogs DlgBtnOK : "OK", -DlgBtnCancel : "Anuller", +DlgBtnCancel : "Annuller", DlgBtnClose : "Luk", -DlgBtnBrowseServer : "Gennemse Server", +DlgBtnBrowseServer : "Gennemse...", DlgAdvancedTag : "Avanceret", -DlgOpOther : "<Andet>", -DlgInfoTab : "Info", +DlgOpOther : "", +DlgInfoTab : "Generelt", DlgAlertUrl : "Indtast URL", // General Dialogs Labels -DlgGenNotSet : "<ikke sat>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "Tekstretning", -DlgGenLangDirLtr : "Venstre mod h??jre (LTR)", -DlgGenLangDirRtl : "H??jre mod venstre (RTL)", -DlgGenLangCode : "Sprog kode", -DlgGenAccessKey : "Adgangsn??gle", +DlgGenLangDirLtr : "Fra venstre mod h??jre (LTR)", +DlgGenLangDirRtl : "Fra h??jre mod venstre (RTL)", +DlgGenLangCode : "Sprogkode", +DlgGenAccessKey : "Genvejstast", DlgGenName : "Navn", -DlgGenTabIndex : "Tabulator Indeks", +DlgGenTabIndex : "Tabulator indeks", DlgGenLongDescr : "Udvidet beskrivelse", DlgGenClass : "Typografiark", DlgGenTitle : "Titel", @@ -169,9 +175,9 @@ DlgGenStyle : "Typografi", // Image Dialog -DlgImgTitle : "Billed egenskaber", -DlgImgInfoTab : "Billed info", -DlgImgBtnUpload : "Send til serveren", +DlgImgTitle : "Egenskaber for billede", +DlgImgInfoTab : "Generelt", +DlgImgBtnUpload : "Upload", DlgImgURL : "URL", DlgImgUpload : "Upload", DlgImgAlt : "Alternativ tekst", @@ -180,24 +186,24 @@ DlgImgLockRatio : "L??s st??rrelsesforhold", DlgBtnResetSize : "Nulstil st??rrelse", DlgImgBorder : "Ramme", -DlgImgHSpace : "HMargin", -DlgImgVSpace : "VMargin", +DlgImgHSpace : "HMargen", +DlgImgVSpace : "VMargen", DlgImgAlign : "Justering", DlgImgAlignLeft : "Venstre", -DlgImgAlignAbsBottom: "Abs bund", -DlgImgAlignAbsMiddle: "Abs Midte", -DlgImgAlignBaseline : "Bundlinje", -DlgImgAlignBottom : "Bund", -DlgImgAlignMiddle : "Midte", +DlgImgAlignAbsBottom: "Absolut nederst", +DlgImgAlignAbsMiddle: "Absolut centreret", +DlgImgAlignBaseline : "Grundlinje", +DlgImgAlignBottom : "Nederst", +DlgImgAlignMiddle : "Centreret", DlgImgAlignRight : "H??jre", -DlgImgAlignTextTop : "Tekst top", -DlgImgAlignTop : "Top", +DlgImgAlignTextTop : "Toppen af teksten", +DlgImgAlignTop : "??verst", DlgImgPreview : "Vis eksempel", DlgImgAlertUrl : "Indtast stien til billedet", -DlgImgLinkTab : "Link", +DlgImgLinkTab : "Hyperlink", // Flash Dialog -DlgFlashTitle : "Flash egenskaber", +DlgFlashTitle : "Egenskaber for Flash", DlgFlashChkPlay : "Automatisk afspilning", DlgFlashChkLoop : "Gentagelse", DlgFlashChkMenu : "Vis Flash menu", @@ -207,73 +213,73 @@ DlgFlashScaleFit : "Tilpas st??rrelse", // Link Dialog -DlgLnkWindowTitle : "Link", -DlgLnkInfoTab : "Link info", +DlgLnkWindowTitle : "Egenskaber for hyperlink", +DlgLnkInfoTab : "Generelt", DlgLnkTargetTab : "M??l", -DlgLnkType : "Link type", +DlgLnkType : "Hyperlink type", DlgLnkTypeURL : "URL", -DlgLnkTypeAnchor : "Anker p?? denne side", -DlgLnkTypeEMail : "Email", +DlgLnkTypeAnchor : "Bogm??rke p?? denne side", +DlgLnkTypeEMail : "E-mail", DlgLnkProto : "Protokol", -DlgLnkProtoOther : "<anden>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "V??lg et anker", DlgLnkAnchorByName : "Efter anker navn", DlgLnkAnchorById : "Efter element Id", -DlgLnkNoAnchors : "<Der er ingen ankre tilg??ngelige i dette dokument>", -DlgLnkEMail : "Email Adresse", +DlgLnkNoAnchors : "", +DlgLnkEMail : "E-mailadresse", DlgLnkEMailSubject : "Emne", -DlgLnkEMailBody : "Besked", +DlgLnkEMailBody : "Br??dtekst", DlgLnkUpload : "Upload", -DlgLnkBtnUpload : "Send til serveren", +DlgLnkBtnUpload : "Upload", DlgLnkTarget : "M??l", -DlgLnkTargetFrame : "<ramme>", -DlgLnkTargetPopup : "<popup vindue>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Nyt vindue (_blank)", -DlgLnkTargetParent : "Overliggende vindue (_parent)", +DlgLnkTargetParent : "Overordnet ramme (_parent)", DlgLnkTargetSelf : "Samme vindue (_self)", -DlgLnkTargetTop : "??verste vindue (_top)", -DlgLnkTargetFrameName : "Visnings vinduets navn", -DlgLnkPopWinName : "Popup vinduets navn", -DlgLnkPopWinFeat : "Popup vinduets egenskaber", +DlgLnkTargetTop : "Hele vinduet (_top)", +DlgLnkTargetFrameName : "Destinationsvinduets navn", +DlgLnkPopWinName : "Pop-up vinduets navn", +DlgLnkPopWinFeat : "Egenskaber for pop-up", DlgLnkPopResize : "Skalering", -DlgLnkPopLocation : "Lokationslinje", +DlgLnkPopLocation : "Adresselinje", DlgLnkPopMenu : "Menulinje", DlgLnkPopScroll : "Scrollbars", DlgLnkPopStatus : "Statuslinje", DlgLnkPopToolbar : "V??rkt??jslinje", DlgLnkPopFullScrn : "Fuld sk??rm (IE)", -DlgLnkPopDependent : "Afh??ngig (Netscape)", +DlgLnkPopDependent : "Koblet/dependent (Netscape)", DlgLnkPopWidth : "Bredde", DlgLnkPopHeight : "H??jde", DlgLnkPopLeft : "Position fra venstre", DlgLnkPopTop : "Position fra toppen", -DlnLnkMsgNoUrl : "Indtast link URL", -DlnLnkMsgNoEMail : "Indtast e-mail addressen", -DlnLnkMsgNoAnchor : "V??lg Anker", +DlnLnkMsgNoUrl : "Indtast hyperlink URL!", +DlnLnkMsgNoEMail : "Indtast e-mailaddresse!", +DlnLnkMsgNoAnchor : "V??lg bogm??rke!", // Color Dialog DlgColorTitle : "V??lg farve", -DlgColorBtnClear : "Slet alt", -DlgColorHighlight : "Marker", -DlgColorSelected : "valgt", +DlgColorBtnClear : "Nulstil", +DlgColorHighlight : "Markeret", +DlgColorSelected : "Valgt", // Smiley Dialog -DlgSmileyTitle : "Ins??t en smiley", +DlgSmileyTitle : "V??lg smiley", // Special Character Dialog -DlgSpecialCharTitle : "V??lg specialkarakter", +DlgSpecialCharTitle : "V??lg symbol", // Table Dialog -DlgTableTitle : "Tabel egenskaber", +DlgTableTitle : "Egenskaber for tabel", DlgTableRows : "R??kker", DlgTableColumns : "Kolonner", -DlgTableBorder : "Ramme st??rrelse", +DlgTableBorder : "Rammebredde", DlgTableAlign : "Justering", -DlgTableAlignNotSet : "", +DlgTableAlignNotSet : "", DlgTableAlignLeft : "Venstrestillet", DlgTableAlignCenter : "Centreret", DlgTableAlignRight : "H??jrestillet", @@ -281,46 +287,46 @@ DlgTableWidthPx : "pixels", DlgTableWidthPc : "procent", DlgTableHeight : "H??jde", -DlgTableCellSpace : "Afstand mellem celler", -DlgTableCellPad : "Celle margin", +DlgTableCellSpace : "Celleafstand", +DlgTableCellPad : "Cellemargen", DlgTableCaption : "Titel", -DlgTableSummary : "Summary", //MISSING +DlgTableSummary : "Resume", // Table Cell Dialog -DlgCellTitle : "Celle egenskaber", +DlgCellTitle : "Egenskaber for celle", DlgCellWidth : "Bredde", DlgCellWidthPx : "pixels", DlgCellWidthPc : "procent", DlgCellHeight : "H??jde", DlgCellWordWrap : "Orddeling", -DlgCellWordWrapNotSet : "", +DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "Ja", DlgCellWordWrapNo : "Nej", -DlgCellHorAlign : "Horisontal justering", -DlgCellHorAlignNotSet : "", +DlgCellHorAlign : "Vandret justering", +DlgCellHorAlignNotSet : "", DlgCellHorAlignLeft : "Venstrestillet", DlgCellHorAlignCenter : "Centreret", DlgCellHorAlignRight: "H??jrestillet", -DlgCellVerAlign : "Vertikal Justering", -DlgCellVerAlignNotSet : "", -DlgCellVerAlignTop : "Top", -DlgCellVerAlignMiddle : "Midte", -DlgCellVerAlignBottom : "Bund", -DlgCellVerAlignBaseline : "Bundlinje", -DlgCellRowSpan : "Antal r??kker cellen sp??nder over", -DlgCellCollSpan : "Antal kolonner cellen sp??nder over", +DlgCellVerAlign : "Lodret justering", +DlgCellVerAlignNotSet : "", +DlgCellVerAlignTop : "??verst", +DlgCellVerAlignMiddle : "Centreret", +DlgCellVerAlignBottom : "Nederst", +DlgCellVerAlignBaseline : "Grundlinje", +DlgCellRowSpan : "H??jde i antal r??kker", +DlgCellCollSpan : "Bredde i antal kolonner", DlgCellBackColor : "Baggrundsfarve", -DlgCellBorderColor : "rammefarve", +DlgCellBorderColor : "Rammefarve", DlgCellBtnSelect : "V??lg...", // Find Dialog DlgFindTitle : "Find", DlgFindFindBtn : "Find", -DlgFindNotFoundMsg : "Den angivne tekst blev ikke fundet", +DlgFindNotFoundMsg : "S??geteksten blev ikke fundet!", // Replace Dialog DlgReplaceTitle : "Erstat", -DlgReplaceFindLbl : "Find:", +DlgReplaceFindLbl : "S??g efter:", DlgReplaceReplaceLbl : "Erstat med:", DlgReplaceCaseChk : "Forskel p?? store og sm?? bogstaver", DlgReplaceReplaceBtn : "Erstat", @@ -328,50 +334,49 @@ DlgReplaceWordChk : "Kun hele ord", // Paste Operations / Dialog -PasteErrorPaste : "Din browsers sikkerhedsindstillinger tillader ikke editoren at inds??tte tekst automatisk. Brug i stedet tastaturet til at inds??tte teksten (Ctrl+V).", -PasteErrorCut : "Din browsers sikkerhedsindstillinger tillader ikke editoren at klippe tekst automatisk. Brug i stedet tastaturet til at klippe teksten (Ctrl+X).", -PasteErrorCopy : "Din browsers sikkerhedsindstillinger tillader ikke editoren at kopiere tekst automatisk. Brug i stedet tastaturet til at kopiere teksten (Ctrl+V).", - -PasteAsText : "Inds??t som ren tekst", +PasteErrorPaste : "Din browsers sikkerhedsindstillinger tillader ikke editoren at inds??tte tekst automatisk!
      Brug i stedet tastaturet til at inds??tte teksten (Ctrl+V).", +PasteErrorCut : "Din browsers sikkerhedsindstillinger tillader ikke editoren at klippe tekst automatisk!
      Brug i stedet tastaturet til at klippe teksten (Ctrl+X).", +PasteErrorCopy : "Din browsers sikkerhedsindstillinger tillader ikke editoren at kopiere tekst automatisk!
      Brug i stedet tastaturet til at kopiere teksten (Ctrl+C).", + +PasteAsText : "Inds??t som ikke-formateret tekst", PasteFromWord : "Inds??t fra Word", -DlgPasteMsg2 : "Inds??t i boksen herunder (Ctrl+V) og klik OK.", +DlgPasteMsg2 : "Inds??t i feltet herunder (Ctrl+V) og klik OK.", DlgPasteIgnoreFont : "Ignorer font definitioner", -DlgPasteRemoveStyles : "Fjern typografi definitioner", +DlgPasteRemoveStyles : "Ignorer typografi", DlgPasteCleanBox : "Slet indhold", - // Color Picker ColorAutomatic : "Automatisk", ColorMoreColors : "Flere farver...", // Document Properties -DocProps : "Dokument egenskaber", +DocProps : "Egenskaber for dokument", // Anchor Dialog -DlgAnchorTitle : "Anker egenskaber", -DlgAnchorName : "Anker navn", -DlgAnchorErrorName : "Indtast Anker navn", +DlgAnchorTitle : "Egenskaber for bogm??rke", +DlgAnchorName : "Bogm??rke navn", +DlgAnchorErrorName : "Indtast bogm??rke navn!", // Speller Pages Dialog -DlgSpellNotInDic : "Findes ikke i ordbogen", -DlgSpellChangeTo : "??ndre til", -DlgSpellBtnIgnore : "Ignorere", -DlgSpellBtnIgnoreAll : "Ignorere alle", -DlgSpellBtnReplace : "Udskift", -DlgSpellBtnReplaceAll : "Udskift alle", +DlgSpellNotInDic : "Ikke i ordbogen", +DlgSpellChangeTo : "Forslag", +DlgSpellBtnIgnore : "Ignorer", +DlgSpellBtnIgnoreAll : "Ignorer alle", +DlgSpellBtnReplace : "Erstat", +DlgSpellBtnReplaceAll : "Erstat alle", DlgSpellBtnUndo : "Tilbage", -DlgSpellNoSuggestions : "- Intet forslag -", +DlgSpellNoSuggestions : "- ingen forslag -", DlgSpellProgress : "Stavekontrolen arbejder...", DlgSpellNoMispell : "Stavekontrol f??rdig: Ingen fejl fundet", DlgSpellNoChanges : "Stavekontrol f??rdig: Ingen ord ??ndret", DlgSpellOneChange : "Stavekontrol f??rdig: Et ord ??ndret", DlgSpellManyChanges : "Stavekontrol f??rdig: %1 ord ??ndret", -IeSpellDownload : "Stavekontrol ikke installeret. Vil du hente den nu?", +IeSpellDownload : "Stavekontrol ikke installeret.
      Vil du hente den nu?", // Button Dialog -DlgButtonText : "Tekst (V??rdi)", +DlgButtonText : "Tekst", DlgButtonType : "Type", // Checkbox and Radio Button Dialogs @@ -390,77 +395,77 @@ DlgSelectSize : "St??rrelse", DlgSelectLines : "linier", DlgSelectChkMulti : "Tillad flere valg", -DlgSelectOpAvail : "Valgmulighedder", +DlgSelectOpAvail : "Valgmuligheder", DlgSelectOpText : "Tekst", DlgSelectOpValue : "V??rdi", DlgSelectBtnAdd : "Tilf??j", -DlgSelectBtnModify : "??ndre", +DlgSelectBtnModify : "Rediger", DlgSelectBtnUp : "Op", DlgSelectBtnDown : "Ned", -DlgSelectBtnSetValue : "S??t som udvalgt", +DlgSelectBtnSetValue : "S??t som valgt", DlgSelectBtnDelete : "Slet", // Textarea Dialog DlgTextareaName : "Navn", -DlgTextareaCols : "Kolonne", -DlgTextareaRows : "R??kke", +DlgTextareaCols : "Kolonner", +DlgTextareaRows : "R??kker", // Text Field Dialog DlgTextName : "Navn", DlgTextValue : "V??rdi", -DlgTextCharWidth : "Synligt antal bogstaver", -DlgTextMaxChars : "Maximum antal bogstaver", +DlgTextCharWidth : "Bredde (tegn)", +DlgTextMaxChars : "Max antal tegn", DlgTextType : "Type", DlgTextTypeText : "Tekst", -DlgTextTypePass : "Kodeord", +DlgTextTypePass : "Adgangskode", // Hidden Field Dialog DlgHiddenName : "Navn", DlgHiddenValue : "V??rdi", // Bulleted List Dialog -BulletedListProp : "Punkttegnopstilling egenskaber", -NumberedListProp : "Talopstilling egenskaber", +BulletedListProp : "Egenskaber for punktopstilling", +NumberedListProp : "Egenskaber for talopstilling", DlgLstType : "Type", DlgLstTypeCircle : "Cirkel", -DlgLstTypeDisc : "Flade", +DlgLstTypeDisc : "Udfyldt cirkel", DlgLstTypeSquare : "Firkant", DlgLstTypeNumbers : "Nummereret (1, 2, 3)", DlgLstTypeLCase : "Sm?? bogstaver (a, b, c)", DlgLstTypeUCase : "Store bogstaver (A, B, C)", -DlgLstTypeSRoman : "Sm?? Romertal (i, ii, iii)", -DlgLstTypeLRoman : "Store Romertal (I, II, III)", +DlgLstTypeSRoman : "Sm?? romertal (i, ii, iii)", +DlgLstTypeLRoman : "Store romertal (I, II, III)", // Document Properties Dialog DlgDocGeneralTab : "Generelt", DlgDocBackTab : "Baggrund", -DlgDocColorsTab : "Farver og Margin", -DlgDocMetaTab : "Meta Information", - -DlgDocPageTitle : "Side Titel", +DlgDocColorsTab : "Farver og margen", +DlgDocMetaTab : "Metadata", + +DlgDocPageTitle : "Sidetitel", DlgDocLangDir : "Sprog", -DlgDocLangDirLTR : "Venstre Til H??jre (LTR)", -DlgDocLangDirRTL : "H??jre Til Venstre (RTL)", +DlgDocLangDirLTR : "Fra venstre mod h??jre (LTR)", +DlgDocLangDirRTL : "Fra h??jre mod venstre (RTL)", DlgDocLangCode : "Landekode", -DlgDocCharSet : "Karakter s??t kode", -DlgDocCharSetOther : "Anden karakter s??t kode", - -DlgDocDocType : "Dokument type kategori", -DlgDocDocTypeOther : "Anden dokument type kategori", +DlgDocCharSet : "Tegns??t kode", +DlgDocCharSetOther : "Anden tegns??t kode", + +DlgDocDocType : "Dokumenttype kategori", +DlgDocDocTypeOther : "Anden dokumenttype kategori", DlgDocIncXHTML : "Inkludere XHTML deklartion", DlgDocBgColor : "Baggrundsfarve", -DlgDocBgImage : "Baggrundsbilled URL", -DlgDocBgNoScroll : "Ikke scrollbar baggrund", +DlgDocBgImage : "Baggrundsbillede URL", +DlgDocBgNoScroll : "Fastl??st baggrund", DlgDocCText : "Tekst", -DlgDocCLink : "Link", -DlgDocCVisited : "Bes??gt link", -DlgDocCActive : "Aktivt link", -DlgDocMargins : "Side margin", -DlgDocMaTop : "Top", +DlgDocCLink : "Hyperlink", +DlgDocCVisited : "Bes??gt hyperlink", +DlgDocCActive : "Aktivt hyperlink", +DlgDocMargins : "Sidemargen", +DlgDocMaTop : "??verst", DlgDocMaLeft : "Venstre", DlgDocMaRight : "H??jre", -DlgDocMaBottom : "Bund", -DlgDocMeIndex : "Dokument index n??gleord (komma sepereret)", +DlgDocMaBottom : "Nederst", +DlgDocMeIndex : "Dokument index n??gleord (kommasepareret)", DlgDocMeDescr : "Dokument beskrivelse", DlgDocMeAuthor : "Forfatter", DlgDocMeCopy : "Copyright", @@ -469,13 +474,14 @@ // Templates Dialog Templates : "Skabeloner", DlgTemplatesTitle : "Indholdsskabeloner", -DlgTemplatesSelMsg : "V??lg den skabelon, som skal ??bnes i editoren
      (Nuv??rende indhold vil blive overskrevet):", -DlgTemplatesLoading : "Henter liste over skabeloner. Vent venligst...", -DlgTemplatesNoTpl : "(Der er ikke defineret nogen skabelon)", +DlgTemplatesSelMsg : "V??lg den skabelon, som skal ??bnes i editoren.
      (Nuv??rende indhold vil blive overskrevet!):", +DlgTemplatesLoading : "Henter liste over skabeloner...", +DlgTemplatesNoTpl : "(Der er ikke defineret nogen skabelon!)", // About Dialog -DlgAboutAboutTab : "About", -DlgAboutBrowserInfoTab : "Browser Info", +DlgAboutAboutTab : "Om", +DlgAboutBrowserInfoTab : "Generelt", +DlgAboutLicenseTab : "Licens", DlgAboutVersion : "version", DlgAboutLicense : "Licens under vilk??r for GNU Lesser General Public License", DlgAboutInfo : "For yderlig information g?? til" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/de.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/de.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/de.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -23,8 +23,8 @@ // Language direction : "ltr" (left to right) or "rtl" (right to left). Dir : "ltr", -ToolbarCollapse : "Toolbar einklappen", -ToolbarExpand : "Toolbar ausklappen", +ToolbarCollapse : "Symbolleiste einklappen", +ToolbarExpand : "Symbolleiste ausklappen", // Toolbar Items and Context Menu Save : "Speichern", @@ -34,7 +34,7 @@ Copy : "Kopieren", Paste : "Einf??gen", PasteText : "aus Textdatei einf??gen", -PasteWord : "aus Word einf??gen", +PasteWord : "aus MS-Word einf??gen", Print : "Drucken", SelectAll : "Alles ausw??hlen", RemoveFormat : "Formatierungen entfernen", @@ -77,7 +77,7 @@ ShowDetails : "Zeige Details", Style : "Style", FontFormat : "Format", -Font : "Font", +Font : "Schriftart", FontSize : "Size", TextColor : "Textfarbe", BGColor : "Hintergrundfarbe", @@ -99,8 +99,13 @@ SelectionField : "Auswahlfeld", ImageButton : "Bildbutton", +FitWindow : "Editor maximieren", + // Context Menu EditLink : "Link editieren", +CellCM : "Zelle", +RowCM : "Zeile", +ColumnCM : "Spalte", InsertRow : "Zeile einf??gen", DeleteRows : "Zeile entfernen", InsertColumn : "Spalte einf??gen", @@ -119,11 +124,11 @@ ButtonProp : "Button Eigenschaften", CheckboxProp : "Checkbox Eigenschaften", HiddenFieldProp : "Verstecktes Feld Eigenschaften", -RadioButtonProp : "Radiobutton Eigenschaften", +RadioButtonProp : "Optionsfeld Eigenschaften", ImageButtonProp : "Bildbutton Eigenschaften", -TextFieldProp : "Textfeld einzeilig Eigenschaften", +TextFieldProp : "Textfeld (einzeilig) Eigenschaften", SelectionFieldProp : "Auswahlfeld Eigenschaften", -TextareaProp : "Textfeld mehrzeilig Eigenschaften", +TextareaProp : "Textfeld (mehrzeilig) Eigenschaften", FormProp : "Formular Eigenschaften", FontFormats : "Normal;Formatiert;Addresse;??berschrift 1;??berschrift 2;??berschrift 3;??berschrift 4;??berschrift 5;??berschrift 6", @@ -131,13 +136,13 @@ // Alerts and Messages ProcessingXHTML : "Bearbeite XHTML. Bitte warten...", Done : "Fertig", -PasteWordConfirm : "Der Text, den Sie einf??gen M??chten, scheint aus Word kopiert zu sein. M??chten Sie ihn zuvor bereinigen lassen?", +PasteWordConfirm : "Der Text, den Sie einf??gen m??chten, scheint aus MS-Word kopiert zu sein. M??chten Sie ihn zuvor bereinigen lassen?", NotCompatiblePaste : "Diese Funktion steht nur im Internet Explorer ab Version 5.5 zur Verf??gung. M??chten Sie den Text unbereinigt einf??gen?", UnknownToolbarItem : "Unbekanntes Men??leisten-Objekt \"%1\"", UnknownCommand : "Unbekannter Befehl \"%1\"", NotImplemented : "Befehl nicht implementiert", UnknownToolbarSet : "Men??leiste \"%1\" existiert nicht", -NoActiveX : "Die Sicherheitseinstellungen Ihres Browsers beschr??nken evtl. einige Funktionen des Editors. Aktivieren Sie \"ActiveX-Steuerelemente und Plugins ausf??hren\" in den Sicherheitseinstellungen, um diese Funktionen nutzen zu k??nnen", +NoActiveX : "Die Sicherheitseinstellungen Ihres Browsers beschr??nken evtl. einige Funktionen des Editors. Aktivieren Sie die Option \"ActiveX-Steuerelemente und Plugins ausf??hren\" in den Sicherheitseinstellungen, um diese Funktionen nutzen zu k??nnen", BrowseServerBlocked : "Ein Auswahlfenster konnte nicht ge??ffnet werden. Stellen Sie sicher, das alle Popup-Blocker ausgeschaltet sind.", DialogBlocked : "Das Dialog-Fenster konnte nicht ge??ffnet werden. Stellen Sie sicher, das alle Popup-Blocker ausgeschaltet sind.", @@ -147,12 +152,12 @@ DlgBtnClose : "Schlie??en", DlgBtnBrowseServer : "Server durchsuchen", DlgAdvancedTag : "Erweitert", -DlgOpOther : "<andere>", +DlgOpOther : "", DlgInfoTab : "Info", DlgAlertUrl : "Bitte tragen Sie die URL ein", // General Dialogs Labels -DlgGenNotSet : "< nichts >", +DlgGenNotSet : "< nichts >", DlgGenId : "ID", DlgGenLangDir : "Schreibrichtung", DlgGenLangDirLtr : "Links nach Rechts (LTR)", @@ -180,8 +185,8 @@ DlgImgLockRatio : "Gr????enverh??ltniss beibehalten", DlgBtnResetSize : "Gr????e zur??cksetzen", DlgImgBorder : "Rahmen", -DlgImgHSpace : "H-Freiraum", -DlgImgVSpace : "V-Freiraum", +DlgImgHSpace : "H-Abstand", +DlgImgVSpace : "V-Abstand", DlgImgAlign : "Ausrichtung", DlgImgAlignLeft : "Links", DlgImgAlignAbsBottom: "Abs Unten", @@ -200,7 +205,7 @@ DlgFlashTitle : "Flash Eigenschaften", DlgFlashChkPlay : "autom. Abspielen", DlgFlashChkLoop : "Endlosschleife", -DlgFlashChkMenu : "Aktiviere Flash Men??", +DlgFlashChkMenu : "Flash-Men?? aktivieren", DlgFlashScale : "Skalierung", DlgFlashScaleAll : "Alles anzeigen", DlgFlashScaleNoBorder : "ohne Rand", @@ -216,12 +221,12 @@ DlgLnkTypeAnchor : "Anker in dieser Seite", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "Protokoll", -DlgLnkProtoOther : "<anderes>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "Anker ausw??hlen", DlgLnkAnchorByName : "nach Anker Name", DlgLnkAnchorById : "nach Element Id", -DlgLnkNoAnchors : "<keine Anker im Dokument vorhanden>", +DlgLnkNoAnchors : "", DlgLnkEMail : "E-Mail Addresse", DlgLnkEMailSubject : "Betreffzeile", DlgLnkEMailBody : "Nachrichtentext", @@ -229,20 +234,20 @@ DlgLnkBtnUpload : "Zum Server senden", DlgLnkTarget : "Zielseite", -DlgLnkTargetFrame : "<Frame>", -DlgLnkTargetPopup : "<Pop-up Fenster>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Neues Fenster (_blank)", DlgLnkTargetParent : "Oberes Fenster (_parent)", DlgLnkTargetSelf : "Gleiches Fenster (_self)", DlgLnkTargetTop : "Oberstes Fenster (_top)", -DlgLnkTargetFrameName : "Ziel-Frame Name", +DlgLnkTargetFrameName : "Ziel-Fenster Name", DlgLnkPopWinName : "Pop-up Fenster Name", DlgLnkPopWinFeat : "Pop-up Fenster Eigenschaften", DlgLnkPopResize : "Vergr????erbar", DlgLnkPopLocation : "Adress-Leiste", DlgLnkPopMenu : "Men??-Leiste", -DlgLnkPopScroll : "Scroll-Leisten", -DlgLnkPopStatus : "Status-Leiste", +DlgLnkPopScroll : "Rollbalken", +DlgLnkPopStatus : "Statusleiste", DlgLnkPopToolbar : "Werkzeugleiste", DlgLnkPopFullScrn : "Vollbild (IE)", DlgLnkPopDependent : "Abh??ngig (Netscape)", @@ -293,20 +298,20 @@ DlgCellWidthPc : "%", DlgCellHeight : "H??he", DlgCellWordWrap : "Umbruch", -DlgCellWordWrapNotSet : "<nichts>", +DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "Ja", DlgCellWordWrapNo : "Nein", DlgCellHorAlign : "Horizontale Ausrichtung", -DlgCellHorAlignNotSet : "<nichts>", +DlgCellHorAlignNotSet : "", DlgCellHorAlignLeft : "Links", DlgCellHorAlignCenter : "Zentriert", DlgCellHorAlignRight: "Rechts", DlgCellVerAlign : "Vertikale Ausrichtung", -DlgCellVerAlignNotSet : "<nichts>", +DlgCellVerAlignNotSet : "", DlgCellVerAlignTop : "Oben", DlgCellVerAlignMiddle : "Mitte", DlgCellVerAlignBottom : "Unten", -DlgCellVerAlignBaseline : "Baseline", +DlgCellVerAlignBaseline : "Grundlinie", DlgCellRowSpan : "Zeilen zusammenfassen", DlgCellCollSpan : "Spalten zusammenfassen", DlgCellBackColor : "Hintergrundfarbe", @@ -316,7 +321,7 @@ // Find Dialog DlgFindTitle : "Finden", DlgFindFindBtn : "Finden", -DlgFindNotFoundMsg : "Der Suchtext wurde nicht gefunden.", +DlgFindNotFoundMsg : "Der gesuchte Text wurde nicht gefunden.", // Replace Dialog DlgReplaceTitle : "Ersetzen", @@ -339,7 +344,6 @@ DlgPasteIgnoreFont : "Ignoriere Schriftart-Definitionen", DlgPasteRemoveStyles : "Entferne Style-Definitionen", DlgPasteCleanBox : "Inhalt aufr??umen", - // Color Picker ColorAutomatic : "Automatisch", @@ -422,8 +426,8 @@ BulletedListProp : "Listen-Eigenschaften", NumberedListProp : "Nummerierte Listen-Eigenschaften", DlgLstType : "Typ", -DlgLstTypeCircle : "Kreis", -DlgLstTypeDisc : "Disc", //MISSING +DlgLstTypeCircle : "Ring", +DlgLstTypeDisc : "Kreis", DlgLstTypeSquare : "Quadrat", DlgLstTypeNumbers : "Nummern (1, 2, 3)", DlgLstTypeLCase : "Kleinbuchstaben (a, b, c)", @@ -450,7 +454,7 @@ DlgDocIncXHTML : "Beziehe XHTML Deklarationen ein", DlgDocBgColor : "Hintergrundfarbe", DlgDocBgImage : "Hintergrundbild URL", -DlgDocBgNoScroll : "Nicht-Scrollender Hintergrund", +DlgDocBgNoScroll : "feststehender Hintergrund", DlgDocCText : "Text", DlgDocCLink : "Link", DlgDocCVisited : "Besuchter Link", @@ -460,7 +464,7 @@ DlgDocMaLeft : "Links", DlgDocMaRight : "Rechts", DlgDocMaBottom : "Unten", -DlgDocMeIndex : "Schl??sselw??rter (Komma-getrennt)", +DlgDocMeIndex : "Schl??sselw??rter (durch Komma getrennt)", DlgDocMeDescr : "Dokument-Beschreibung", DlgDocMeAuthor : "Autor", DlgDocMeCopy : "Copyright", @@ -476,6 +480,7 @@ // About Dialog DlgAboutAboutTab : "??ber", DlgAboutBrowserInfoTab : "Browser-Info", +DlgAboutLicenseTab : "Lizenz", DlgAboutVersion : "Version", DlgAboutLicense : "Lizensiert unter den Richtlinien der GNU Lesser General Public License", DlgAboutInfo : "F??r weitere Informationen siehe" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/el.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/el.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/el.js Wed Jul 12 07:45:05 2006 @@ -1,481 +1,486 @@ -???/* - * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben - * - * Licensed under the terms of the GNU Lesser General Public License: - * http://www.opensource.org/licenses/lgpl-license.php - * - * For further information visit: - * http://www.fckeditor.net/ - * - * "Support Open Source software. What about a donation today?" - * - * File Name: el.js - * Greek language file. - * - * File Authors: - * Spyros Barbatos (sbarbatos{at}users.sourceforge.net) - */ - -var FCKLang = -{ -// Language direction : "ltr" (left to right) or "rtl" (right to left). -Dir : "ltr", - -ToolbarCollapse : "??????????? ???? ???????????? ??????????????????", -ToolbarExpand : "???????????????? ???????????? ??????????????????", - -// Toolbar Items and Context Menu -Save : "??????????????? ????", -NewPage : "?????? ????????????", -Preview : "??????????????????????????", -Cut : "??????????????", -Copy : "??????????????????", -Paste : "????????????????????", -PasteText : "???????????????????? (???????? ??????????????)", -PasteWord : "???????????????????? ?????? ???? Word", -Print : "????????????????", -SelectAll : "?????????????? ????????", -RemoveFormat : "???????????????? ????????????????????????", -InsertLinkLbl : "?????????????????? (Link)", -InsertLink : "????????????????/???????????????? ??? ????????????? (Link)", -RemoveLink : "???????????????? ??? ????????????? (Link)", -Anchor : "Insert/Edit Anchor", //MISSING -InsertImageLbl : "????????????", -InsertImage : "????????????????/???????????????? ??????????????", -InsertFlashLbl : "Flash", //MISSING -InsertFlash : "Insert/Edit Flash", //MISSING -InsertTableLbl : "??????????????", -InsertTable : "????????????????/???????????????? ????????????", -InsertLineLbl : "????????????", -InsertLine : "???????????????? ???????????????????? ??????????????", -InsertSpecialCharLbl: "???????????? ??????????????", -InsertSpecialChar : "???????????????? ?????????????? ??? ??????????? ", -InsertSmileyLbl : "Smiley", -InsertSmiley : "???????????????? Smiley", -About : "???????? ????? FCKeditor", -Bold : "????????????", -Italic : "????????????", -Underline : "??????????????????????", -StrikeThrough : "??????????????????????", -Subscript : "??????????????", -Superscript : "??????????????", -LeftJustify : "???????????????? ????????????????", -CenterJustify : "???????????????? ?????? ????????????", -RightJustify : "???????????????? ??????????", -BlockJustify : "???????????? ???????????????? (Block)", -DecreaseIndent : "???????????? ????????????", -IncreaseIndent : "???????????? ????????????", -Undo : "Undo", -Redo : "Redo", -NumberedListLbl : "?????????? ???? ????????????????", -NumberedList : "????????????????/???????????????? ???????????? ???? ????????????????", -BulletedListLbl : "?????????? ???? Bullets", -BulletedList : "????????????????/???????????????? ???????????? ???? Bullets", -ShowTableBorders : "?????????????? ?????????? ????????????", -ShowDetails : "?????????????? ????????????????????????", -Style : "Style", -FontFormat : "?????????? ????????????????????????????", -Font : "??????????????????????????", -FontSize : "??????????????", -TextColor : "?????????? ??????????????????", -BGColor : "?????????? ????????????????? ", -Source : "HTML ??????????????", -Find : "??????????????????", -Replace : "??????????????????????????", -SpellCheck : "Check Spell", //MISSING -UniversalKeyboard : "Universal Keyboard", //MISSING -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING - -Form : "Form", //MISSING -Checkbox : "Checkbox", //MISSING -RadioButton : "Radio Button", //MISSING -TextField : "Text Field", //MISSING -Textarea : "Textarea", //MISSING -HiddenField : "Hidden Field", //MISSING -Button : "Button", //MISSING -SelectionField : "Selection Field", //MISSING -ImageButton : "Image Button", //MISSING - -// Context Menu -EditLink : "???????????????? ??? ????????????? (Link)", -InsertRow : "???????????????? ??????????????", -DeleteRows : "???????????????? ??????????????", -InsertColumn : "???????????????? ??????????????", -DeleteColumns : "???????????????? ??????????????", -InsertCell : "???????????????? ????????????", -DeleteCells : "???????????????? ????????????", -MergeCells : "?????????????????? ????????????", -SplitCell : "?????????????????????? ????????????", -TableDelete : "Delete Table", //MISSING -CellProperties : "?????????????????? ????????????", -TableProperties : "?????????????????? ????????????", -ImageProperties : "?????????????????? ??????????????", -FlashProperties : "Flash Properties", //MISSING - -AnchorProp : "Anchor Properties", //MISSING -ButtonProp : "Button Properties", //MISSING -CheckboxProp : "Checkbox Properties", //MISSING -HiddenFieldProp : "Hidden Field Properties", //MISSING -RadioButtonProp : "Radio Button Properties", //MISSING -ImageButtonProp : "Image Button Properties", //MISSING -TextFieldProp : "Text Field Properties", //MISSING -SelectionFieldProp : "Selection Field Properties", //MISSING -TextareaProp : "Textarea Properties", //MISSING -FormProp : "Form Properties", //MISSING - -FontFormats : "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6", - -// Alerts and Messages -ProcessingXHTML : "?????????????????????? XHTML. ???????????????? ????????????????????...", -Done : "????????????", -PasteWordConfirm : "???? ?????????????? ????? ???????????? ???? ??????????????????????, ???????????????? ?????? ???????????????????? ?????? ???? Word. ???????????? ???? ???????????????????? ???????? ????????????????????;", -NotCompatiblePaste : "??? ???? ?? ?????????????? ?????????? ?????????????????? ???????? Internet Explorer ???????????? 5.5+. ???????????? ???? ?????????? ?? ???????????????????? ?????????? ??????????????????;", -UnknownToolbarItem : "?????????????? ?????????????????????? ?????? ???????????? ?????????????????? \"%1\"", -UnknownCommand : "?????????????? ???????????? \"%1\"", -NotImplemented : "?? ???????????? ?????? ???????? ??????????????????????????", -UnknownToolbarSet : "?? ?????????? ?????????????????? \"%1\" ?????? ? ????????????", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING - -// Dialogs -DlgBtnOK : "OK", -DlgBtnCancel : "??????????????", -DlgBtnClose : "????????????????", -DlgBtnBrowseServer : "Browse Server", //MISSING -DlgAdvancedTag : "?????? ??????????????????????? ??", -DlgOpOther : "<Other>", //MISSING -DlgInfoTab : "Info", //MISSING -DlgAlertUrl : "Please insert the URL", //MISSING - -// General Dialogs Labels -DlgGenNotSet : "<??????????>", -DlgGenId : "Id", -DlgGenLangDir : "????????????? ?????? ??????????????? ", -DlgGenLangDirLtr : "???????????????? ???????? ?????????? (LTR)", -DlgGenLangDirRtl : "?????????? ???????? ???????????????? (RTL)", -DlgGenLangCode : "?????????????? ??????????????", -DlgGenAccessKey : "??? ??????????? ???? (Access Key)", -DlgGenName : "Name", -DlgGenTabIndex : "Tab Index", -DlgGenLongDescr : "Long Description URL", -DlgGenClass : "Stylesheet Classes", -DlgGenTitle : "Advisory Title", -DlgGenContType : "Advisory Content Type", -DlgGenLinkCharset : "Linked Resource Charset", -DlgGenStyle : "Style", - -// Image Dialog -DlgImgTitle : "?????????????????? ??????????????", -DlgImgInfoTab : "?????????????????????? ??????????????", -DlgImgBtnUpload : "???????????????? ???????? ????????????????????", -DlgImgURL : "URL", -DlgImgUpload : "????????????????", -DlgImgAlt : "?????????????????????? ?????????????? (ALT)", -DlgImgWidth : "????????????", -DlgImgHeight : "????????", -DlgImgLockRatio : "???????????????? ??????????????????", -DlgBtnResetSize : "?????????????????? ?????????????? ????????????? ??", -DlgImgBorder : "??????????????????", -DlgImgHSpace : "???????????????????? ?????????? (HSpace)", -DlgImgVSpace : "?????????????? ?????????? (VSpace)", -DlgImgAlign : "??? ??? ???????????????? (Align)", -DlgImgAlignLeft : "????????????????", -DlgImgAlignAbsBottom: "????????? ???? ???????? (Abs Bottom)", -DlgImgAlignAbsMiddle: "????????? ???? ?????? ???????? (Abs Middle)", -DlgImgAlignBaseline : "???????????? ?????????? (Baseline)", -DlgImgAlignBottom : "???????? (Bottom)", -DlgImgAlignMiddle : "???????? (Middle)", -DlgImgAlignRight : "?????????? (Right)", -DlgImgAlignTextTop : "??????? ???? ??????????????? (Text Top)", -DlgImgAlignTop : "???????? (Top)", -DlgImgPreview : "??????????????????????????", -DlgImgAlertUrl : "???????????????? ?????? ?????????????????? (URL) ?????? ??????????????", -DlgImgLinkTab : "Link", //MISSING - -// Flash Dialog -DlgFlashTitle : "Flash Properties", //MISSING -DlgFlashChkPlay : "Auto Play", //MISSING -DlgFlashChkLoop : "Loop", //MISSING -DlgFlashChkMenu : "Enable Flash Menu", //MISSING -DlgFlashScale : "Scale", //MISSING -DlgFlashScaleAll : "Show all", //MISSING -DlgFlashScaleNoBorder : "No Border", //MISSING -DlgFlashScaleFit : "Exact Fit", //MISSING - -// Link Dialog -DlgLnkWindowTitle : "?????????????????????????? (Link)", -DlgLnkInfoTab : "Link", -DlgLnkTargetTab : "??????????? ???? ???????????? (Target)", - -DlgLnkType : "?????????? ??????????? ????????????? (Link)", -DlgLnkTypeURL : "URL", -DlgLnkTypeAnchor : "Anchor in this page", -DlgLnkTypeEMail : "E-Mail", -DlgLnkProto : "Protocol", -DlgLnkProtoOther : "<????????>", -DlgLnkURL : "URL", -DlgLnkAnchorSel : "???????????????? ?????? Anchor", -DlgLnkAnchorByName : "?????????? ????? ???????????????? (Name)????? Anchor", -DlgLnkAnchorById : "?????????? ????? Element Id", -DlgLnkNoAnchors : "<?????? ? ??????????? ?? Anchors ?????? ??????????????>", -DlgLnkEMail : "??????????? ?????? ???????????????????????? ??????? ??????????????? ", -DlgLnkEMailSubject : "???????? ??????????????????", -DlgLnkEMailBody : "?????????????? ??????????????????", -DlgLnkUpload : "????????????????", -DlgLnkBtnUpload : "???????????????? ???????? ????????????????????", - -DlgLnkTarget : "??????????? ???? ???????????? (Target)", -DlgLnkTargetFrame : "<frame>", -DlgLnkTargetPopup : "<popup window>", -DlgLnkTargetBlank : "?????? ??????????? ???? (_blank)", -DlgLnkTargetParent : "???????????? ??????????? ???? (_parent)", -DlgLnkTargetSelf : "???????? ??????????? ???? (_self)", -DlgLnkTargetTop : "?????????????? ??????????? ???? (_top)", -DlgLnkTargetFrameName : "Target Frame Name", //MISSING -DlgLnkPopWinName : "?????????? Popup Window", -DlgLnkPopWinFeat : "???????????????? Popup Window", -DlgLnkPopResize : "???? ???????????? ????????????? ??", -DlgLnkPopLocation : "?????????? ????????????????????", -DlgLnkPopMenu : "?????????? Menu", -DlgLnkPopScroll : "???????????? ??????????????", -DlgLnkPopStatus : "?????????? Status", -DlgLnkPopToolbar : "?????????? ??????????????????", -DlgLnkPopFullScrn : "???????????????? ?? ?????????? (IE)", -DlgLnkPopDependent : "Dependent (Netscape)", -DlgLnkPopWidth : "????????????", -DlgLnkPopHeight : "????????", -DlgLnkPopLeft : "?????????????????? ?????????????????? ??????????", -DlgLnkPopTop : "?????????????????? ???????? ??????????", - -DlnLnkMsgNoUrl : "???????????????? ?????? ?????????????????? (URL) ????? ? ????????? ????????????? (Link)", -DlnLnkMsgNoEMail : "???????????????? ?????? ??????????? ?????? ???????????????????????? ??????? ??????????????? ", -DlnLnkMsgNoAnchor : "???????????????? ?????? Anchor", - -// Color Dialog -DlgColorTitle : "?????????????? ????????????????", -DlgColorBtnClear : "????????????????????", -DlgColorHighlight : "??????????????????????????", -DlgColorSelected : "????????????????????", - -// Smiley Dialog -DlgSmileyTitle : "???????????????? ?????? Smiley", - -// Special Character Dialog -DlgSpecialCharTitle : "???????????????? ?????? ???????????? ??????????????", - -// Table Dialog -DlgTableTitle : "?????????????????? ????????????", -DlgTableRows : "??????????????", -DlgTableColumns : "??????????????", -DlgTableBorder : "?????????????? ??????????????????? ", -DlgTableAlign : "????????????????", -DlgTableAlignNotSet : "", -DlgTableAlignLeft : "????????????????", -DlgTableAlignCenter : "????????????", -DlgTableAlignRight : "??????????", -DlgTableWidth : "????????????", -DlgTableWidthPx : "pixels", -DlgTableWidthPc : "\%", -DlgTableHeight : "????????", -DlgTableCellSpace : "Cell spacing", -DlgTableCellPad : "Cell padding", -DlgTableCaption : "????????????????????", -DlgTableSummary : "Summary", //MISSING - -// Table Cell Dialog -DlgCellTitle : "?????????????????? ????????????", -DlgCellWidth : "????????????", -DlgCellWidthPx : "pixels", -DlgCellWidthPc : "\%", -DlgCellHeight : "????????", -DlgCellWordWrap : "???? ???????????? ??????????????", -DlgCellWordWrapNotSet : "", -DlgCellWordWrapYes : "??????", -DlgCellWordWrapNo : "??????", -DlgCellHorAlign : "?????????????????? ????????????????", -DlgCellHorAlignNotSet : "", -DlgCellHorAlignLeft : "????????????????", -DlgCellHorAlignCenter : "????????????", -DlgCellHorAlignRight: "??????????", -DlgCellVerAlign : "???????????? ????????????????", -DlgCellVerAlignNotSet : "", -DlgCellVerAlignTop : "???????? (Top)", -DlgCellVerAlignMiddle : "???????? (Middle)", -DlgCellVerAlignBottom : "???????? (Bottom)", -DlgCellVerAlignBaseline : "???????????? ?????????? (Baseline)", -DlgCellRowSpan : "?????????????? ?????????????? (Rows Span)", -DlgCellCollSpan : "?????????????? ?????????????? (Columns Span)", -DlgCellBackColor : "?????????? ????????????????? ", -DlgCellBorderColor : "?????????? ??????????????????? ", -DlgCellBtnSelect : "??????????????...", - -// Find Dialog -DlgFindTitle : "??????????????????", -DlgFindFindBtn : "??????????????????", -DlgFindNotFoundMsg : "???? ?????????????? ?????? ??????????????.", - -// Replace Dialog -DlgReplaceTitle : "??????????????????????????", -DlgReplaceFindLbl : "??????????????????:", -DlgReplaceReplaceLbl : "?????????????????????????? ????:", -DlgReplaceCaseChk : "?????????????? ??????????/??????????????????", -DlgReplaceReplaceBtn : "??????????????????????????", -DlgReplaceReplAllBtn : "?????????????????????????? ????????", -DlgReplaceWordChk : "???????????? ??????????? ?? ??????????", - -// Paste Operations / Dialog -PasteErrorPaste : "???? ??? ?????????????? ?????????????????? ????? ??? ???????????????????? ?????? ?????? ????????????????? ?? ?????? ???????????????????? ?????????????? ??????????????????????. ?????????????????????????????? ???? ???????????????????????? (Ctrl+V).", -PasteErrorCut : "???? ??? ?????????????? ?????????????????? ????? ??? ???????????????????? ?????? ?????? ????????????????? ?? ?????? ???????????????????? ?????????????? ????????????????. ?????????????????????????????? ???? ???????????????????????? (Ctrl+X).", -PasteErrorCopy : "???? ??? ?????????????? ?????????????????? ????? ??? ???????????????????? ?????? ?????? ????????????????? ?? ?????? ???????????????????? ?????????????? ????????????????????. ?????????????????????????????? ???? ???????????????????????? (Ctrl+C).", - -PasteAsText : "???????????????????? ???? ???????? ??????????????", -PasteFromWord : "???????????????????? ?????? ???? Word", - -DlgPasteMsg2 : "Please paste inside the following box using the keyboard (Ctrl+V) and hit OK.", //MISSING -DlgPasteIgnoreFont : "Ignore Font Face definitions", //MISSING -DlgPasteRemoveStyles : "Remove Styles definitions", //MISSING -DlgPasteCleanBox : "Clean Up Box", //MISSING - - -// Color Picker -ColorAutomatic : "??? ????????????", -ColorMoreColors : "?????????????????????? ??????????????...", - -// Document Properties -DocProps : "Document Properties", //MISSING - -// Anchor Dialog -DlgAnchorTitle : "Anchor Properties", //MISSING -DlgAnchorName : "Anchor Name", //MISSING -DlgAnchorErrorName : "Please type the anchor name", //MISSING - -// Speller Pages Dialog -DlgSpellNotInDic : "Not in dictionary", //MISSING -DlgSpellChangeTo : "Change to", //MISSING -DlgSpellBtnIgnore : "Ignore", //MISSING -DlgSpellBtnIgnoreAll : "Ignore All", //MISSING -DlgSpellBtnReplace : "Replace", //MISSING -DlgSpellBtnReplaceAll : "Replace All", //MISSING -DlgSpellBtnUndo : "Undo", //MISSING -DlgSpellNoSuggestions : "- No suggestions -", //MISSING -DlgSpellProgress : "Spell check in progress...", //MISSING -DlgSpellNoMispell : "Spell check complete: No misspellings found", //MISSING -DlgSpellNoChanges : "Spell check complete: No words changed", //MISSING -DlgSpellOneChange : "Spell check complete: One word changed", //MISSING -DlgSpellManyChanges : "Spell check complete: %1 words changed", //MISSING - -IeSpellDownload : "Spell checker not installed. Do you want to download it now?", //MISSING - -// Button Dialog -DlgButtonText : "Text (Value)", //MISSING -DlgButtonType : "Type", //MISSING - -// Checkbox and Radio Button Dialogs -DlgCheckboxName : "Name", //MISSING -DlgCheckboxValue : "Value", //MISSING -DlgCheckboxSelected : "Selected", //MISSING - -// Form Dialog -DlgFormName : "Name", //MISSING -DlgFormAction : "Action", //MISSING -DlgFormMethod : "Method", //MISSING - -// Select Field Dialog -DlgSelectName : "Name", //MISSING -DlgSelectValue : "Value", //MISSING -DlgSelectSize : "Size", //MISSING -DlgSelectLines : "lines", //MISSING -DlgSelectChkMulti : "Allow multiple selections", //MISSING -DlgSelectOpAvail : "Available Options", //MISSING -DlgSelectOpText : "Text", //MISSING -DlgSelectOpValue : "Value", //MISSING -DlgSelectBtnAdd : "Add", //MISSING -DlgSelectBtnModify : "Modify", //MISSING -DlgSelectBtnUp : "Up", //MISSING -DlgSelectBtnDown : "Down", //MISSING -DlgSelectBtnSetValue : "Set as selected value", //MISSING -DlgSelectBtnDelete : "Delete", //MISSING - -// Textarea Dialog -DlgTextareaName : "Name", //MISSING -DlgTextareaCols : "Columns", //MISSING -DlgTextareaRows : "Rows", //MISSING - -// Text Field Dialog -DlgTextName : "Name", //MISSING -DlgTextValue : "Value", //MISSING -DlgTextCharWidth : "Character Width", //MISSING -DlgTextMaxChars : "Maximum Characters", //MISSING -DlgTextType : "Type", //MISSING -DlgTextTypeText : "Text", //MISSING -DlgTextTypePass : "Password", //MISSING - -// Hidden Field Dialog -DlgHiddenName : "Name", //MISSING -DlgHiddenValue : "Value", //MISSING - -// Bulleted List Dialog -BulletedListProp : "Bulleted List Properties", //MISSING -NumberedListProp : "Numbered List Properties", //MISSING -DlgLstType : "Type", //MISSING -DlgLstTypeCircle : "Circle", //MISSING -DlgLstTypeDisc : "Disc", //MISSING -DlgLstTypeSquare : "Square", //MISSING -DlgLstTypeNumbers : "Numbers (1, 2, 3)", //MISSING -DlgLstTypeLCase : "Lowercase Letters (a, b, c)", //MISSING -DlgLstTypeUCase : "Uppercase Letters (A, B, C)", //MISSING -DlgLstTypeSRoman : "Small Roman Numerals (i, ii, iii)", //MISSING -DlgLstTypeLRoman : "Large Roman Numerals (I, II, III)", //MISSING - -// Document Properties Dialog -DlgDocGeneralTab : "General", //MISSING -DlgDocBackTab : "Background", //MISSING -DlgDocColorsTab : "Colors and Margins", //MISSING -DlgDocMetaTab : "Meta Data", //MISSING - -DlgDocPageTitle : "Page Title", //MISSING -DlgDocLangDir : "Language Direction", //MISSING -DlgDocLangDirLTR : "Left to Right (LTR)", //MISSING -DlgDocLangDirRTL : "Right to Left (RTL)", //MISSING -DlgDocLangCode : "Language Code", //MISSING -DlgDocCharSet : "Character Set Encoding", //MISSING -DlgDocCharSetOther : "Other Character Set Encoding", //MISSING - -DlgDocDocType : "Document Type Heading", //MISSING -DlgDocDocTypeOther : "Other Document Type Heading", //MISSING -DlgDocIncXHTML : "Include XHTML Declarations", //MISSING -DlgDocBgColor : "Background Color", //MISSING -DlgDocBgImage : "Background Image URL", //MISSING -DlgDocBgNoScroll : "Nonscrolling Background", //MISSING -DlgDocCText : "Text", //MISSING -DlgDocCLink : "Link", //MISSING -DlgDocCVisited : "Visited Link", //MISSING -DlgDocCActive : "Active Link", //MISSING -DlgDocMargins : "Page Margins", //MISSING -DlgDocMaTop : "Top", //MISSING -DlgDocMaLeft : "Left", //MISSING -DlgDocMaRight : "Right", //MISSING -DlgDocMaBottom : "Bottom", //MISSING -DlgDocMeIndex : "Document Indexing Keywords (comma separated)", //MISSING -DlgDocMeDescr : "Document Description", //MISSING -DlgDocMeAuthor : "Author", //MISSING -DlgDocMeCopy : "Copyright", //MISSING -DlgDocPreview : "Preview", //MISSING - -// Templates Dialog -Templates : "Templates", //MISSING -DlgTemplatesTitle : "Content Templates", //MISSING -DlgTemplatesSelMsg : "Please select the template to open in the editor
      (the actual contents will be lost):", //MISSING -DlgTemplatesLoading : "Loading templates list. Please wait...", //MISSING -DlgTemplatesNoTpl : "(No templates defined)", //MISSING - -// About Dialog -DlgAboutAboutTab : "About", //MISSING -DlgAboutBrowserInfoTab : "Browser Info", //MISSING -DlgAboutVersion : "????????????", -DlgAboutLicense : "?????????? ???????????? ? ???? ????? ?? ??????? ?? ?????? GNU Lesser General Public License", -DlgAboutInfo : "?????? ???????????????????????? ??????????????????????" +???/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2006 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * "Support Open Source software. What about a donation today?" + * + * File Name: el.js + * Greek language file. + * + * File Authors: + * Spyros Barbatos (sbarbatos{at}users.sourceforge.net) + */ + +var FCKLang = +{ +// Language direction : "ltr" (left to right) or "rtl" (right to left). +Dir : "ltr", + +ToolbarCollapse : "??????????? ???? ???????????? ??????????????????", +ToolbarExpand : "???????????????? ???????????? ??????????????????", + +// Toolbar Items and Context Menu +Save : "??????????????? ????", +NewPage : "?????? ????????????", +Preview : "??????????????????????????", +Cut : "??????????????", +Copy : "??????????????????", +Paste : "????????????????????", +PasteText : "???????????????????? (???????? ??????????????)", +PasteWord : "???????????????????? ?????? ???? Word", +Print : "????????????????", +SelectAll : "?????????????? ????????", +RemoveFormat : "???????????????? ????????????????????????", +InsertLinkLbl : "?????????????????? (Link)", +InsertLink : "????????????????/???????????????? ??? ????????????? (Link)", +RemoveLink : "???????????????? ??? ????????????? (Link)", +Anchor : "Insert/Edit Anchor", //MISSING +InsertImageLbl : "????????????", +InsertImage : "????????????????/???????????????? ??????????????", +InsertFlashLbl : "Flash", //MISSING +InsertFlash : "Insert/Edit Flash", //MISSING +InsertTableLbl : "??????????????", +InsertTable : "????????????????/???????????????? ????????????", +InsertLineLbl : "????????????", +InsertLine : "???????????????? ???????????????????? ??????????????", +InsertSpecialCharLbl: "???????????? ??????????????", +InsertSpecialChar : "???????????????? ?????????????? ??? ??????????? ", +InsertSmileyLbl : "Smiley", +InsertSmiley : "???????????????? Smiley", +About : "???????? ????? FCKeditor", +Bold : "????????????", +Italic : "????????????", +Underline : "??????????????????????", +StrikeThrough : "??????????????????????", +Subscript : "??????????????", +Superscript : "??????????????", +LeftJustify : "???????????????? ????????????????", +CenterJustify : "???????????????? ?????? ????????????", +RightJustify : "???????????????? ??????????", +BlockJustify : "???????????? ???????????????? (Block)", +DecreaseIndent : "???????????? ????????????", +IncreaseIndent : "???????????? ????????????", +Undo : "Undo", +Redo : "Redo", +NumberedListLbl : "?????????? ???? ????????????????", +NumberedList : "????????????????/???????????????? ???????????? ???? ????????????????", +BulletedListLbl : "?????????? ???? Bullets", +BulletedList : "????????????????/???????????????? ???????????? ???? Bullets", +ShowTableBorders : "?????????????? ?????????? ????????????", +ShowDetails : "?????????????? ????????????????????????", +Style : "Style", +FontFormat : "?????????? ????????????????????????????", +Font : "??????????????????????????", +FontSize : "??????????????", +TextColor : "?????????? ??????????????????", +BGColor : "?????????? ????????????????? ", +Source : "HTML ??????????????", +Find : "??????????????????", +Replace : "??????????????????????????", +SpellCheck : "Check Spelling", //MISSING +UniversalKeyboard : "Universal Keyboard", //MISSING +PageBreakLbl : "Page Break", //MISSING +PageBreak : "Insert Page Break", //MISSING + +Form : "Form", //MISSING +Checkbox : "Checkbox", //MISSING +RadioButton : "Radio Button", //MISSING +TextField : "Text Field", //MISSING +Textarea : "Textarea", //MISSING +HiddenField : "Hidden Field", //MISSING +Button : "Button", //MISSING +SelectionField : "Selection Field", //MISSING +ImageButton : "Image Button", //MISSING + +FitWindow : "Maximize the editor size", //MISSING + +// Context Menu +EditLink : "???????????????? ??? ????????????? (Link)", +CellCM : "Cell", //MISSING +RowCM : "Row", //MISSING +ColumnCM : "Column", //MISSING +InsertRow : "???????????????? ??????????????", +DeleteRows : "???????????????? ??????????????", +InsertColumn : "???????????????? ??????????????", +DeleteColumns : "???????????????? ??????????????", +InsertCell : "???????????????? ????????????", +DeleteCells : "???????????????? ????????????", +MergeCells : "?????????????????? ????????????", +SplitCell : "?????????????????????? ????????????", +TableDelete : "Delete Table", //MISSING +CellProperties : "?????????????????? ????????????", +TableProperties : "?????????????????? ????????????", +ImageProperties : "?????????????????? ??????????????", +FlashProperties : "Flash Properties", //MISSING + +AnchorProp : "Anchor Properties", //MISSING +ButtonProp : "Button Properties", //MISSING +CheckboxProp : "Checkbox Properties", //MISSING +HiddenFieldProp : "Hidden Field Properties", //MISSING +RadioButtonProp : "Radio Button Properties", //MISSING +ImageButtonProp : "Image Button Properties", //MISSING +TextFieldProp : "Text Field Properties", //MISSING +SelectionFieldProp : "Selection Field Properties", //MISSING +TextareaProp : "Textarea Properties", //MISSING +FormProp : "Form Properties", //MISSING + +FontFormats : "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6", + +// Alerts and Messages +ProcessingXHTML : "?????????????????????? XHTML. ???????????????? ????????????????????...", +Done : "????????????", +PasteWordConfirm : "???? ?????????????? ????? ???????????? ???? ??????????????????????, ???????????????? ?????? ???????????????????? ?????? ???? Word. ???????????? ???? ???????????????????? ???????? ????????????????????;", +NotCompatiblePaste : "??? ???? ?? ?????????????? ?????????? ?????????????????? ???????? Internet Explorer ???????????? 5.5+. ???????????? ???? ?????????? ?? ???????????????????? ?????????? ??????????????????;", +UnknownToolbarItem : "?????????????? ?????????????????????? ?????? ???????????? ?????????????????? \"%1\"", +UnknownCommand : "?????????????? ???????????? \"%1\"", +NotImplemented : "?? ???????????? ?????? ???????? ??????????????????????????", +UnknownToolbarSet : "?? ?????????? ?????????????????? \"%1\" ?????? ? ????????????", +NoActiveX : "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING +BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING +DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING + +// Dialogs +DlgBtnOK : "OK", +DlgBtnCancel : "??????????????", +DlgBtnClose : "????????????????", +DlgBtnBrowseServer : "Browse Server", //MISSING +DlgAdvancedTag : "?????? ??????????????????????? ??", +DlgOpOther : "", //MISSING +DlgInfoTab : "Info", //MISSING +DlgAlertUrl : "Please insert the URL", //MISSING + +// General Dialogs Labels +DlgGenNotSet : "", +DlgGenId : "Id", +DlgGenLangDir : "????????????? ?????? ??????????????? ", +DlgGenLangDirLtr : "???????????????? ???????? ?????????? (LTR)", +DlgGenLangDirRtl : "?????????? ???????? ???????????????? (RTL)", +DlgGenLangCode : "?????????????? ??????????????", +DlgGenAccessKey : "??? ??????????? ???? (Access Key)", +DlgGenName : "Name", +DlgGenTabIndex : "Tab Index", +DlgGenLongDescr : "Long Description URL", +DlgGenClass : "Stylesheet Classes", +DlgGenTitle : "Advisory Title", +DlgGenContType : "Advisory Content Type", +DlgGenLinkCharset : "Linked Resource Charset", +DlgGenStyle : "Style", + +// Image Dialog +DlgImgTitle : "?????????????????? ??????????????", +DlgImgInfoTab : "?????????????????????? ??????????????", +DlgImgBtnUpload : "???????????????? ???????? ????????????????????", +DlgImgURL : "URL", +DlgImgUpload : "????????????????", +DlgImgAlt : "?????????????????????? ?????????????? (ALT)", +DlgImgWidth : "????????????", +DlgImgHeight : "????????", +DlgImgLockRatio : "???????????????? ??????????????????", +DlgBtnResetSize : "?????????????????? ?????????????? ????????????? ??", +DlgImgBorder : "??????????????????", +DlgImgHSpace : "???????????????????? ?????????? (HSpace)", +DlgImgVSpace : "?????????????? ?????????? (VSpace)", +DlgImgAlign : "??? ??? ???????????????? (Align)", +DlgImgAlignLeft : "????????????????", +DlgImgAlignAbsBottom: "????????? ???? ???????? (Abs Bottom)", +DlgImgAlignAbsMiddle: "????????? ???? ?????? ???????? (Abs Middle)", +DlgImgAlignBaseline : "???????????? ?????????? (Baseline)", +DlgImgAlignBottom : "???????? (Bottom)", +DlgImgAlignMiddle : "???????? (Middle)", +DlgImgAlignRight : "?????????? (Right)", +DlgImgAlignTextTop : "??????? ???? ??????????????? (Text Top)", +DlgImgAlignTop : "???????? (Top)", +DlgImgPreview : "??????????????????????????", +DlgImgAlertUrl : "???????????????? ?????? ?????????????????? (URL) ?????? ??????????????", +DlgImgLinkTab : "Link", //MISSING + +// Flash Dialog +DlgFlashTitle : "Flash Properties", //MISSING +DlgFlashChkPlay : "Auto Play", //MISSING +DlgFlashChkLoop : "Loop", //MISSING +DlgFlashChkMenu : "Enable Flash Menu", //MISSING +DlgFlashScale : "Scale", //MISSING +DlgFlashScaleAll : "Show all", //MISSING +DlgFlashScaleNoBorder : "No Border", //MISSING +DlgFlashScaleFit : "Exact Fit", //MISSING + +// Link Dialog +DlgLnkWindowTitle : "?????????????????????????? (Link)", +DlgLnkInfoTab : "Link", +DlgLnkTargetTab : "??????????? ???? ???????????? (Target)", + +DlgLnkType : "?????????? ??????????? ????????????? (Link)", +DlgLnkTypeURL : "URL", +DlgLnkTypeAnchor : "Anchor in this page", +DlgLnkTypeEMail : "E-Mail", +DlgLnkProto : "Protocol", +DlgLnkProtoOther : "", +DlgLnkURL : "URL", +DlgLnkAnchorSel : "???????????????? ?????? Anchor", +DlgLnkAnchorByName : "?????????? ????? ???????????????? (Name)????? Anchor", +DlgLnkAnchorById : "?????????? ????? Element Id", +DlgLnkNoAnchors : "", +DlgLnkEMail : "??????????? ?????? ???????????????????????? ??????? ??????????????? ", +DlgLnkEMailSubject : "???????? ??????????????????", +DlgLnkEMailBody : "?????????????? ??????????????????", +DlgLnkUpload : "????????????????", +DlgLnkBtnUpload : "???????????????? ???????? ????????????????????", + +DlgLnkTarget : "??????????? ???? ???????????? (Target)", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", +DlgLnkTargetBlank : "?????? ??????????? ???? (_blank)", +DlgLnkTargetParent : "???????????? ??????????? ???? (_parent)", +DlgLnkTargetSelf : "???????? ??????????? ???? (_self)", +DlgLnkTargetTop : "?????????????? ??????????? ???? (_top)", +DlgLnkTargetFrameName : "Target Frame Name", //MISSING +DlgLnkPopWinName : "?????????? Popup Window", +DlgLnkPopWinFeat : "???????????????? Popup Window", +DlgLnkPopResize : "???? ???????????? ????????????? ??", +DlgLnkPopLocation : "?????????? ????????????????????", +DlgLnkPopMenu : "?????????? Menu", +DlgLnkPopScroll : "???????????? ??????????????", +DlgLnkPopStatus : "?????????? Status", +DlgLnkPopToolbar : "?????????? ??????????????????", +DlgLnkPopFullScrn : "???????????????? ?? ?????????? (IE)", +DlgLnkPopDependent : "Dependent (Netscape)", +DlgLnkPopWidth : "????????????", +DlgLnkPopHeight : "????????", +DlgLnkPopLeft : "?????????????????? ?????????????????? ??????????", +DlgLnkPopTop : "?????????????????? ???????? ??????????", + +DlnLnkMsgNoUrl : "???????????????? ?????? ?????????????????? (URL) ????? ? ????????? ????????????? (Link)", +DlnLnkMsgNoEMail : "???????????????? ?????? ??????????? ?????? ???????????????????????? ??????? ??????????????? ", +DlnLnkMsgNoAnchor : "???????????????? ?????? Anchor", + +// Color Dialog +DlgColorTitle : "?????????????? ????????????????", +DlgColorBtnClear : "????????????????????", +DlgColorHighlight : "??????????????????????????", +DlgColorSelected : "????????????????????", + +// Smiley Dialog +DlgSmileyTitle : "???????????????? ?????? Smiley", + +// Special Character Dialog +DlgSpecialCharTitle : "???????????????? ?????? ???????????? ??????????????", + +// Table Dialog +DlgTableTitle : "?????????????????? ????????????", +DlgTableRows : "??????????????", +DlgTableColumns : "??????????????", +DlgTableBorder : "?????????????? ??????????????????? ", +DlgTableAlign : "????????????????", +DlgTableAlignNotSet : "", +DlgTableAlignLeft : "????????????????", +DlgTableAlignCenter : "????????????", +DlgTableAlignRight : "??????????", +DlgTableWidth : "????????????", +DlgTableWidthPx : "pixels", +DlgTableWidthPc : "\%", +DlgTableHeight : "????????", +DlgTableCellSpace : "Cell spacing", +DlgTableCellPad : "Cell padding", +DlgTableCaption : "????????????????????", +DlgTableSummary : "Summary", //MISSING + +// Table Cell Dialog +DlgCellTitle : "?????????????????? ????????????", +DlgCellWidth : "????????????", +DlgCellWidthPx : "pixels", +DlgCellWidthPc : "\%", +DlgCellHeight : "????????", +DlgCellWordWrap : "???? ???????????? ??????????????", +DlgCellWordWrapNotSet : "", +DlgCellWordWrapYes : "??????", +DlgCellWordWrapNo : "??????", +DlgCellHorAlign : "?????????????????? ????????????????", +DlgCellHorAlignNotSet : "", +DlgCellHorAlignLeft : "????????????????", +DlgCellHorAlignCenter : "????????????", +DlgCellHorAlignRight: "??????????", +DlgCellVerAlign : "???????????? ????????????????", +DlgCellVerAlignNotSet : "", +DlgCellVerAlignTop : "???????? (Top)", +DlgCellVerAlignMiddle : "???????? (Middle)", +DlgCellVerAlignBottom : "???????? (Bottom)", +DlgCellVerAlignBaseline : "???????????? ?????????? (Baseline)", +DlgCellRowSpan : "?????????????? ?????????????? (Rows Span)", +DlgCellCollSpan : "?????????????? ?????????????? (Columns Span)", +DlgCellBackColor : "?????????? ????????????????? ", +DlgCellBorderColor : "?????????? ??????????????????? ", +DlgCellBtnSelect : "??????????????...", + +// Find Dialog +DlgFindTitle : "??????????????????", +DlgFindFindBtn : "??????????????????", +DlgFindNotFoundMsg : "???? ?????????????? ?????? ??????????????.", + +// Replace Dialog +DlgReplaceTitle : "??????????????????????????", +DlgReplaceFindLbl : "??????????????????:", +DlgReplaceReplaceLbl : "?????????????????????????? ????:", +DlgReplaceCaseChk : "?????????????? ??????????/??????????????????", +DlgReplaceReplaceBtn : "??????????????????????????", +DlgReplaceReplAllBtn : "?????????????????????????? ????????", +DlgReplaceWordChk : "???????????? ??????????? ?? ??????????", + +// Paste Operations / Dialog +PasteErrorPaste : "???? ??? ?????????????? ?????????????????? ????? ??? ???????????????????? ?????? ?????? ????????????????? ?? ?????? ???????????????????? ?????????????? ??????????????????????. ?????????????????????????????? ???? ???????????????????????? (Ctrl+V).", +PasteErrorCut : "???? ??? ?????????????? ?????????????????? ????? ??? ???????????????????? ?????? ?????? ????????????????? ?? ?????? ???????????????????? ?????????????? ????????????????. ?????????????????????????????? ???? ???????????????????????? (Ctrl+X).", +PasteErrorCopy : "???? ??? ?????????????? ?????????????????? ????? ??? ???????????????????? ?????? ?????? ????????????????? ?? ?????? ???????????????????? ?????????????? ????????????????????. ?????????????????????????????? ???? ???????????????????????? (Ctrl+C).", + +PasteAsText : "???????????????????? ???? ???????? ??????????????", +PasteFromWord : "???????????????????? ?????? ???? Word", + +DlgPasteMsg2 : "Please paste inside the following box using the keyboard (Ctrl+V) and hit OK.", //MISSING +DlgPasteIgnoreFont : "Ignore Font Face definitions", //MISSING +DlgPasteRemoveStyles : "Remove Styles definitions", //MISSING +DlgPasteCleanBox : "Clean Up Box", //MISSING + +// Color Picker +ColorAutomatic : "??? ????????????", +ColorMoreColors : "?????????????????????? ??????????????...", + +// Document Properties +DocProps : "Document Properties", //MISSING + +// Anchor Dialog +DlgAnchorTitle : "Anchor Properties", //MISSING +DlgAnchorName : "Anchor Name", //MISSING +DlgAnchorErrorName : "Please type the anchor name", //MISSING + +// Speller Pages Dialog +DlgSpellNotInDic : "Not in dictionary", //MISSING +DlgSpellChangeTo : "Change to", //MISSING +DlgSpellBtnIgnore : "Ignore", //MISSING +DlgSpellBtnIgnoreAll : "Ignore All", //MISSING +DlgSpellBtnReplace : "Replace", //MISSING +DlgSpellBtnReplaceAll : "Replace All", //MISSING +DlgSpellBtnUndo : "Undo", //MISSING +DlgSpellNoSuggestions : "- No suggestions -", //MISSING +DlgSpellProgress : "Spell check in progress...", //MISSING +DlgSpellNoMispell : "Spell check complete: No misspellings found", //MISSING +DlgSpellNoChanges : "Spell check complete: No words changed", //MISSING +DlgSpellOneChange : "Spell check complete: One word changed", //MISSING +DlgSpellManyChanges : "Spell check complete: %1 words changed", //MISSING + +IeSpellDownload : "Spell checker not installed. Do you want to download it now?", //MISSING + +// Button Dialog +DlgButtonText : "Text (Value)", //MISSING +DlgButtonType : "Type", //MISSING + +// Checkbox and Radio Button Dialogs +DlgCheckboxName : "Name", //MISSING +DlgCheckboxValue : "Value", //MISSING +DlgCheckboxSelected : "Selected", //MISSING + +// Form Dialog +DlgFormName : "Name", //MISSING +DlgFormAction : "Action", //MISSING +DlgFormMethod : "Method", //MISSING + +// Select Field Dialog +DlgSelectName : "Name", //MISSING +DlgSelectValue : "Value", //MISSING +DlgSelectSize : "Size", //MISSING +DlgSelectLines : "lines", //MISSING +DlgSelectChkMulti : "Allow multiple selections", //MISSING +DlgSelectOpAvail : "Available Options", //MISSING +DlgSelectOpText : "Text", //MISSING +DlgSelectOpValue : "Value", //MISSING +DlgSelectBtnAdd : "Add", //MISSING +DlgSelectBtnModify : "Modify", //MISSING +DlgSelectBtnUp : "Up", //MISSING +DlgSelectBtnDown : "Down", //MISSING +DlgSelectBtnSetValue : "Set as selected value", //MISSING +DlgSelectBtnDelete : "Delete", //MISSING + +// Textarea Dialog +DlgTextareaName : "Name", //MISSING +DlgTextareaCols : "Columns", //MISSING +DlgTextareaRows : "Rows", //MISSING + +// Text Field Dialog +DlgTextName : "Name", //MISSING +DlgTextValue : "Value", //MISSING +DlgTextCharWidth : "Character Width", //MISSING +DlgTextMaxChars : "Maximum Characters", //MISSING +DlgTextType : "Type", //MISSING +DlgTextTypeText : "Text", //MISSING +DlgTextTypePass : "Password", //MISSING + +// Hidden Field Dialog +DlgHiddenName : "Name", //MISSING +DlgHiddenValue : "Value", //MISSING + +// Bulleted List Dialog +BulletedListProp : "Bulleted List Properties", //MISSING +NumberedListProp : "Numbered List Properties", //MISSING +DlgLstType : "Type", //MISSING +DlgLstTypeCircle : "Circle", //MISSING +DlgLstTypeDisc : "Disc", //MISSING +DlgLstTypeSquare : "Square", //MISSING +DlgLstTypeNumbers : "Numbers (1, 2, 3)", //MISSING +DlgLstTypeLCase : "Lowercase Letters (a, b, c)", //MISSING +DlgLstTypeUCase : "Uppercase Letters (A, B, C)", //MISSING +DlgLstTypeSRoman : "Small Roman Numerals (i, ii, iii)", //MISSING +DlgLstTypeLRoman : "Large Roman Numerals (I, II, III)", //MISSING + +// Document Properties Dialog +DlgDocGeneralTab : "General", //MISSING +DlgDocBackTab : "Background", //MISSING +DlgDocColorsTab : "Colors and Margins", //MISSING +DlgDocMetaTab : "Meta Data", //MISSING + +DlgDocPageTitle : "Page Title", //MISSING +DlgDocLangDir : "Language Direction", //MISSING +DlgDocLangDirLTR : "Left to Right (LTR)", //MISSING +DlgDocLangDirRTL : "Right to Left (RTL)", //MISSING +DlgDocLangCode : "Language Code", //MISSING +DlgDocCharSet : "Character Set Encoding", //MISSING +DlgDocCharSetOther : "Other Character Set Encoding", //MISSING + +DlgDocDocType : "Document Type Heading", //MISSING +DlgDocDocTypeOther : "Other Document Type Heading", //MISSING +DlgDocIncXHTML : "Include XHTML Declarations", //MISSING +DlgDocBgColor : "Background Color", //MISSING +DlgDocBgImage : "Background Image URL", //MISSING +DlgDocBgNoScroll : "Nonscrolling Background", //MISSING +DlgDocCText : "Text", //MISSING +DlgDocCLink : "Link", //MISSING +DlgDocCVisited : "Visited Link", //MISSING +DlgDocCActive : "Active Link", //MISSING +DlgDocMargins : "Page Margins", //MISSING +DlgDocMaTop : "Top", //MISSING +DlgDocMaLeft : "Left", //MISSING +DlgDocMaRight : "Right", //MISSING +DlgDocMaBottom : "Bottom", //MISSING +DlgDocMeIndex : "Document Indexing Keywords (comma separated)", //MISSING +DlgDocMeDescr : "Document Description", //MISSING +DlgDocMeAuthor : "Author", //MISSING +DlgDocMeCopy : "Copyright", //MISSING +DlgDocPreview : "Preview", //MISSING + +// Templates Dialog +Templates : "Templates", //MISSING +DlgTemplatesTitle : "Content Templates", //MISSING +DlgTemplatesSelMsg : "Please select the template to open in the editor
      (the actual contents will be lost):", //MISSING +DlgTemplatesLoading : "Loading templates list. Please wait...", //MISSING +DlgTemplatesNoTpl : "(No templates defined)", //MISSING + +// About Dialog +DlgAboutAboutTab : "About", //MISSING +DlgAboutBrowserInfoTab : "Browser Info", //MISSING +DlgAboutLicenseTab : "License", //MISSING +DlgAboutVersion : "????????????", +DlgAboutLicense : "?????????? ???????????? ? ???? ????? ?? ??????? ?? ?????? GNU Lesser General Public License", +DlgAboutInfo : "?????? ???????????????????????? ??????????????????????" } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en-au.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en-au.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en-au.js Wed Jul 12 07:45:05 2006 @@ -1,482 +1,487 @@ -???/* - * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben - * - * Licensed under the terms of the GNU Lesser General Public License: - * http://www.opensource.org/licenses/lgpl-license.php - * - * For further information visit: - * http://www.fckeditor.net/ - * - * "Support Open Source software. What about a donation today?" - * - * File Name: en-au.js - * English (Australia) language file. - * - * File Authors: - * Frederico Caldeira Knabben (fredck at fckeditor.net) - * Christopher Dawes (fckeditor at dawes.id.au) - */ - -var FCKLang = -{ -// Language direction : "ltr" (left to right) or "rtl" (right to left). -Dir : "ltr", - -ToolbarCollapse : "Collapse Toolbar", -ToolbarExpand : "Expand Toolbar", - -// Toolbar Items and Context Menu -Save : "Save", -NewPage : "New Page", -Preview : "Preview", -Cut : "Cut", -Copy : "Copy", -Paste : "Paste", -PasteText : "Paste as plain text", -PasteWord : "Paste from Word", -Print : "Print", -SelectAll : "Select All", -RemoveFormat : "Remove Format", -InsertLinkLbl : "Link", -InsertLink : "Insert/Edit Link", -RemoveLink : "Remove Link", -Anchor : "Insert/Edit Anchor", -InsertImageLbl : "Image", -InsertImage : "Insert/Edit Image", -InsertFlashLbl : "Flash", -InsertFlash : "Insert/Edit Flash", -InsertTableLbl : "Table", -InsertTable : "Insert/Edit Table", -InsertLineLbl : "Line", -InsertLine : "Insert Horizontal Line", -InsertSpecialCharLbl: "Special Char", -InsertSpecialChar : "Insert Special Character", -InsertSmileyLbl : "Smiley", -InsertSmiley : "Insert Smiley", -About : "About FCKeditor", -Bold : "Bold", -Italic : "Italic", -Underline : "Underline", -StrikeThrough : "Strike Through", -Subscript : "Subscript", -Superscript : "Superscript", -LeftJustify : "Left Justify", -CenterJustify : "Center Justify", -RightJustify : "Right Justify", -BlockJustify : "Block Justify", -DecreaseIndent : "Decrease Indent", -IncreaseIndent : "Increase Indent", -Undo : "Undo", -Redo : "Redo", -NumberedListLbl : "Numbered List", -NumberedList : "Insert/Remove Numbered List", -BulletedListLbl : "Bulleted List", -BulletedList : "Insert/Remove Bulleted List", -ShowTableBorders : "Show Table Borders", -ShowDetails : "Show Details", -Style : "Style", -FontFormat : "Format", -Font : "Font", -FontSize : "Size", -TextColor : "Text Color", -BGColor : "Background Color", -Source : "Source", -Find : "Find", -Replace : "Replace", -SpellCheck : "Check Spell", -UniversalKeyboard : "Universal Keyboard", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING - -Form : "Form", -Checkbox : "Checkbox", -RadioButton : "Radio Button", -TextField : "Text Field", -Textarea : "Textarea", -HiddenField : "Hidden Field", -Button : "Button", -SelectionField : "Selection Field", -ImageButton : "Image Button", - -// Context Menu -EditLink : "Edit Link", -InsertRow : "Insert Row", -DeleteRows : "Delete Rows", -InsertColumn : "Insert Column", -DeleteColumns : "Delete Columns", -InsertCell : "Insert Cell", -DeleteCells : "Delete Cells", -MergeCells : "Merge Cells", -SplitCell : "Split Cell", -TableDelete : "Delete Table", //MISSING -CellProperties : "Cell Properties", -TableProperties : "Table Properties", -ImageProperties : "Image Properties", -FlashProperties : "Flash Properties", - -AnchorProp : "Anchor Properties", -ButtonProp : "Button Properties", -CheckboxProp : "Checkbox Properties", -HiddenFieldProp : "Hidden Field Properties", -RadioButtonProp : "Radio Button Properties", -ImageButtonProp : "Image Button Properties", -TextFieldProp : "Text Field Properties", -SelectionFieldProp : "Selection Field Properties", -TextareaProp : "Textarea Properties", -FormProp : "Form Properties", - -FontFormats : "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Paragraph (DIV)", - -// Alerts and Messages -ProcessingXHTML : "Processing XHTML. Please wait...", -Done : "Done", -PasteWordConfirm : "The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?", -NotCompatiblePaste : "This command is available for Internet Explorer version 5.5 or more. Do you want to paste without cleaning?", -UnknownToolbarItem : "Unknown toolbar item \"%1\"", -UnknownCommand : "Unknown command name \"%1\"", -NotImplemented : "Command not implemented", -UnknownToolbarSet : "Toolbar set \"%1\" doesn't exist", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING - -// Dialogs -DlgBtnOK : "OK", -DlgBtnCancel : "Cancel", -DlgBtnClose : "Close", -DlgBtnBrowseServer : "Browse Server", -DlgAdvancedTag : "Advanced", -DlgOpOther : "<Other>", -DlgInfoTab : "Info", -DlgAlertUrl : "Please insert the URL", - -// General Dialogs Labels -DlgGenNotSet : "<not set>", -DlgGenId : "Id", -DlgGenLangDir : "Language Direction", -DlgGenLangDirLtr : "Left to Right (LTR)", -DlgGenLangDirRtl : "Right to Left (RTL)", -DlgGenLangCode : "Language Code", -DlgGenAccessKey : "Access Key", -DlgGenName : "Name", -DlgGenTabIndex : "Tab Index", -DlgGenLongDescr : "Long Description URL", -DlgGenClass : "Stylesheet Classes", -DlgGenTitle : "Advisory Title", -DlgGenContType : "Advisory Content Type", -DlgGenLinkCharset : "Linked Resource Charset", -DlgGenStyle : "Style", - -// Image Dialog -DlgImgTitle : "Image Properties", -DlgImgInfoTab : "Image Info", -DlgImgBtnUpload : "Send it to the Server", -DlgImgURL : "URL", -DlgImgUpload : "Upload", -DlgImgAlt : "Alternative Text", -DlgImgWidth : "Width", -DlgImgHeight : "Height", -DlgImgLockRatio : "Lock Ratio", -DlgBtnResetSize : "Reset Size", -DlgImgBorder : "Border", -DlgImgHSpace : "HSpace", -DlgImgVSpace : "VSpace", -DlgImgAlign : "Align", -DlgImgAlignLeft : "Left", -DlgImgAlignAbsBottom: "Abs Bottom", -DlgImgAlignAbsMiddle: "Abs Middle", -DlgImgAlignBaseline : "Baseline", -DlgImgAlignBottom : "Bottom", -DlgImgAlignMiddle : "Middle", -DlgImgAlignRight : "Right", -DlgImgAlignTextTop : "Text Top", -DlgImgAlignTop : "Top", -DlgImgPreview : "Preview", -DlgImgAlertUrl : "Please type the image URL", -DlgImgLinkTab : "Link", - -// Flash Dialog -DlgFlashTitle : "Flash Properties", -DlgFlashChkPlay : "Auto Play", -DlgFlashChkLoop : "Loop", -DlgFlashChkMenu : "Enable Flash Menu", -DlgFlashScale : "Scale", -DlgFlashScaleAll : "Show all", -DlgFlashScaleNoBorder : "No Border", -DlgFlashScaleFit : "Exact Fit", - -// Link Dialog -DlgLnkWindowTitle : "Link", -DlgLnkInfoTab : "Link Info", -DlgLnkTargetTab : "Target", - -DlgLnkType : "Link Type", -DlgLnkTypeURL : "URL", -DlgLnkTypeAnchor : "Anchor in this page", -DlgLnkTypeEMail : "E-Mail", -DlgLnkProto : "Protocol", -DlgLnkProtoOther : "<other>", -DlgLnkURL : "URL", -DlgLnkAnchorSel : "Select an Anchor", -DlgLnkAnchorByName : "By Anchor Name", -DlgLnkAnchorById : "By Element Id", -DlgLnkNoAnchors : "<No anchors available in the document>", -DlgLnkEMail : "E-Mail Address", -DlgLnkEMailSubject : "Message Subject", -DlgLnkEMailBody : "Message Body", -DlgLnkUpload : "Upload", -DlgLnkBtnUpload : "Send it to the Server", - -DlgLnkTarget : "Target", -DlgLnkTargetFrame : "<frame>", -DlgLnkTargetPopup : "<popup window>", -DlgLnkTargetBlank : "New Window (_blank)", -DlgLnkTargetParent : "Parent Window (_parent)", -DlgLnkTargetSelf : "Same Window (_self)", -DlgLnkTargetTop : "Topmost Window (_top)", -DlgLnkTargetFrameName : "Target Frame Name", -DlgLnkPopWinName : "Popup Window Name", -DlgLnkPopWinFeat : "Popup Window Features", -DlgLnkPopResize : "Resizable", -DlgLnkPopLocation : "Location Bar", -DlgLnkPopMenu : "Menu Bar", -DlgLnkPopScroll : "Scroll Bars", -DlgLnkPopStatus : "Status Bar", -DlgLnkPopToolbar : "Toolbar", -DlgLnkPopFullScrn : "Full Screen (IE)", -DlgLnkPopDependent : "Dependent (Netscape)", -DlgLnkPopWidth : "Width", -DlgLnkPopHeight : "Height", -DlgLnkPopLeft : "Left Position", -DlgLnkPopTop : "Top Position", - -DlnLnkMsgNoUrl : "Please type the link URL", -DlnLnkMsgNoEMail : "Please type the e-mail address", -DlnLnkMsgNoAnchor : "Please select an anchor", - -// Color Dialog -DlgColorTitle : "Select Color", -DlgColorBtnClear : "Clear", -DlgColorHighlight : "Highlight", -DlgColorSelected : "Selected", - -// Smiley Dialog -DlgSmileyTitle : "Insert a Smiley", - -// Special Character Dialog -DlgSpecialCharTitle : "Select Special Character", - -// Table Dialog -DlgTableTitle : "Table Properties", -DlgTableRows : "Rows", -DlgTableColumns : "Columns", -DlgTableBorder : "Border size", -DlgTableAlign : "Alignment", -DlgTableAlignNotSet : "", -DlgTableAlignLeft : "Left", -DlgTableAlignCenter : "Centre", -DlgTableAlignRight : "Right", -DlgTableWidth : "Width", -DlgTableWidthPx : "pixels", -DlgTableWidthPc : "percent", -DlgTableHeight : "Height", -DlgTableCellSpace : "Cell spacing", -DlgTableCellPad : "Cell padding", -DlgTableCaption : "Caption", -DlgTableSummary : "Summary", //MISSING - -// Table Cell Dialog -DlgCellTitle : "Cell Properties", -DlgCellWidth : "Width", -DlgCellWidthPx : "pixels", -DlgCellWidthPc : "percent", -DlgCellHeight : "Height", -DlgCellWordWrap : "Word Wrap", -DlgCellWordWrapNotSet : "<Not set>", -DlgCellWordWrapYes : "Yes", -DlgCellWordWrapNo : "No", -DlgCellHorAlign : "Horizontal Alignment", -DlgCellHorAlignNotSet : "<Not set>", -DlgCellHorAlignLeft : "Left", -DlgCellHorAlignCenter : "Centre", -DlgCellHorAlignRight: "Right", -DlgCellVerAlign : "Vertical Alignment", -DlgCellVerAlignNotSet : "<Not set>", -DlgCellVerAlignTop : "Top", -DlgCellVerAlignMiddle : "Middle", -DlgCellVerAlignBottom : "Bottom", -DlgCellVerAlignBaseline : "Baseline", -DlgCellRowSpan : "Rows Span", -DlgCellCollSpan : "Columns Span", -DlgCellBackColor : "Background Color", -DlgCellBorderColor : "Border Color", -DlgCellBtnSelect : "Select...", - -// Find Dialog -DlgFindTitle : "Find", -DlgFindFindBtn : "Find", -DlgFindNotFoundMsg : "The specified text was not found.", - -// Replace Dialog -DlgReplaceTitle : "Replace", -DlgReplaceFindLbl : "Find what:", -DlgReplaceReplaceLbl : "Replace with:", -DlgReplaceCaseChk : "Match case", -DlgReplaceReplaceBtn : "Replace", -DlgReplaceReplAllBtn : "Replace All", -DlgReplaceWordChk : "Match whole word", - -// Paste Operations / Dialog -PasteErrorPaste : "Your browser security settings don't permit the editor to automaticaly execute pasting operations. Please use the keyboard for that (Ctrl+V).", -PasteErrorCut : "Your browser security settings don't permit the editor to automaticaly execute cutting operations. Please use the keyboard for that (Ctrl+X).", -PasteErrorCopy : "Your browser security settings don't permit the editor to automaticaly execute copying operations. Please use the keyboard for that (Ctrl+C).", - -PasteAsText : "Paste as Plain Text", -PasteFromWord : "Paste from Word", - -DlgPasteMsg2 : "Please paste inside the following box using the keyboard (Ctrl+V) and hit OK.", -DlgPasteIgnoreFont : "Ignore Font Face definitions", -DlgPasteRemoveStyles : "Remove Styles definitions", -DlgPasteCleanBox : "Clean Up Box", - - -// Color Picker -ColorAutomatic : "Automatic", -ColorMoreColors : "More Colors...", - -// Document Properties -DocProps : "Document Properties", - -// Anchor Dialog -DlgAnchorTitle : "Anchor Properties", -DlgAnchorName : "Anchor Name", -DlgAnchorErrorName : "Please type the anchor name", - -// Speller Pages Dialog -DlgSpellNotInDic : "Not in dictionary", -DlgSpellChangeTo : "Change to", -DlgSpellBtnIgnore : "Ignore", -DlgSpellBtnIgnoreAll : "Ignore All", -DlgSpellBtnReplace : "Replace", -DlgSpellBtnReplaceAll : "Replace All", -DlgSpellBtnUndo : "Undo", -DlgSpellNoSuggestions : "- No suggestions -", -DlgSpellProgress : "Spell check in progress...", -DlgSpellNoMispell : "Spell check complete: No misspellings found", -DlgSpellNoChanges : "Spell check complete: No words changed", -DlgSpellOneChange : "Spell check complete: One word changed", -DlgSpellManyChanges : "Spell check complete: %1 words changed", - -IeSpellDownload : "Spell checker not installed. Do you want to download it now?", - -// Button Dialog -DlgButtonText : "Text (Value)", -DlgButtonType : "Type", - -// Checkbox and Radio Button Dialogs -DlgCheckboxName : "Name", -DlgCheckboxValue : "Value", -DlgCheckboxSelected : "Selected", - -// Form Dialog -DlgFormName : "Name", -DlgFormAction : "Action", -DlgFormMethod : "Method", - -// Select Field Dialog -DlgSelectName : "Name", -DlgSelectValue : "Value", -DlgSelectSize : "Size", -DlgSelectLines : "lines", -DlgSelectChkMulti : "Allow multiple selections", -DlgSelectOpAvail : "Available Options", -DlgSelectOpText : "Text", -DlgSelectOpValue : "Value", -DlgSelectBtnAdd : "Add", -DlgSelectBtnModify : "Modify", -DlgSelectBtnUp : "Up", -DlgSelectBtnDown : "Down", -DlgSelectBtnSetValue : "Set as selected value", -DlgSelectBtnDelete : "Delete", - -// Textarea Dialog -DlgTextareaName : "Name", -DlgTextareaCols : "Columns", -DlgTextareaRows : "Rows", - -// Text Field Dialog -DlgTextName : "Name", -DlgTextValue : "Value", -DlgTextCharWidth : "Character Width", -DlgTextMaxChars : "Maximum Characters", -DlgTextType : "Type", -DlgTextTypeText : "Text", -DlgTextTypePass : "Password", - -// Hidden Field Dialog -DlgHiddenName : "Name", -DlgHiddenValue : "Value", - -// Bulleted List Dialog -BulletedListProp : "Bulleted List Properties", -NumberedListProp : "Numbered List Properties", -DlgLstType : "Type", -DlgLstTypeCircle : "Circle", -DlgLstTypeDisc : "Disc", //MISSING -DlgLstTypeSquare : "Square", -DlgLstTypeNumbers : "Numbers (1, 2, 3)", -DlgLstTypeLCase : "Lowercase Letters (a, b, c)", -DlgLstTypeUCase : "Uppercase Letters (A, B, C)", -DlgLstTypeSRoman : "Small Roman Numerals (i, ii, iii)", -DlgLstTypeLRoman : "Large Roman Numerals (I, II, III)", - -// Document Properties Dialog -DlgDocGeneralTab : "General", -DlgDocBackTab : "Background", -DlgDocColorsTab : "Colors and Margins", -DlgDocMetaTab : "Meta Data", - -DlgDocPageTitle : "Page Title", -DlgDocLangDir : "Language Direction", -DlgDocLangDirLTR : "Left to Right (LTR)", -DlgDocLangDirRTL : "Right to Left (RTL)", -DlgDocLangCode : "Language Code", -DlgDocCharSet : "Character Set Encoding", -DlgDocCharSetOther : "Other Character Set Encoding", - -DlgDocDocType : "Document Type Heading", -DlgDocDocTypeOther : "Other Document Type Heading", -DlgDocIncXHTML : "Include XHTML Declarations", -DlgDocBgColor : "Background Color", -DlgDocBgImage : "Background Image URL", -DlgDocBgNoScroll : "Nonscrolling Background", -DlgDocCText : "Text", -DlgDocCLink : "Link", -DlgDocCVisited : "Visited Link", -DlgDocCActive : "Active Link", -DlgDocMargins : "Page Margins", -DlgDocMaTop : "Top", -DlgDocMaLeft : "Left", -DlgDocMaRight : "Right", -DlgDocMaBottom : "Bottom", -DlgDocMeIndex : "Document Indexing Keywords (comma separated)", -DlgDocMeDescr : "Document Description", -DlgDocMeAuthor : "Author", -DlgDocMeCopy : "Copyright", -DlgDocPreview : "Preview", - -// Templates Dialog -Templates : "Templates", -DlgTemplatesTitle : "Content Templates", -DlgTemplatesSelMsg : "Please select the template to open in the editor
      (the actual contents will be lost):", -DlgTemplatesLoading : "Loading templates list. Please wait...", -DlgTemplatesNoTpl : "(No templates defined)", - -// About Dialog -DlgAboutAboutTab : "About", -DlgAboutBrowserInfoTab : "Browser Info", -DlgAboutVersion : "version", -DlgAboutLicense : "Licensed under the terms of the GNU Lesser General Public License", -DlgAboutInfo : "For further information go to" +???/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2006 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * "Support Open Source software. What about a donation today?" + * + * File Name: en-au.js + * English (Australia) language file. + * + * File Authors: + * Frederico Caldeira Knabben (fredck at fckeditor.net) + * Christopher Dawes (fckeditor at dawes.id.au) + */ + +var FCKLang = +{ +// Language direction : "ltr" (left to right) or "rtl" (right to left). +Dir : "ltr", + +ToolbarCollapse : "Collapse Toolbar", +ToolbarExpand : "Expand Toolbar", + +// Toolbar Items and Context Menu +Save : "Save", +NewPage : "New Page", +Preview : "Preview", +Cut : "Cut", +Copy : "Copy", +Paste : "Paste", +PasteText : "Paste as plain text", +PasteWord : "Paste from Word", +Print : "Print", +SelectAll : "Select All", +RemoveFormat : "Remove Format", +InsertLinkLbl : "Link", +InsertLink : "Insert/Edit Link", +RemoveLink : "Remove Link", +Anchor : "Insert/Edit Anchor", +InsertImageLbl : "Image", +InsertImage : "Insert/Edit Image", +InsertFlashLbl : "Flash", +InsertFlash : "Insert/Edit Flash", +InsertTableLbl : "Table", +InsertTable : "Insert/Edit Table", +InsertLineLbl : "Line", +InsertLine : "Insert Horizontal Line", +InsertSpecialCharLbl: "Special Character", +InsertSpecialChar : "Insert Special Character", +InsertSmileyLbl : "Smiley", +InsertSmiley : "Insert Smiley", +About : "About FCKeditor", +Bold : "Bold", +Italic : "Italic", +Underline : "Underline", +StrikeThrough : "Strike Through", +Subscript : "Subscript", +Superscript : "Superscript", +LeftJustify : "Left Justify", +CenterJustify : "Centre Justify", +RightJustify : "Right Justify", +BlockJustify : "Block Justify", +DecreaseIndent : "Decrease Indent", +IncreaseIndent : "Increase Indent", +Undo : "Undo", +Redo : "Redo", +NumberedListLbl : "Numbered List", +NumberedList : "Insert/Remove Numbered List", +BulletedListLbl : "Bulleted List", +BulletedList : "Insert/Remove Bulleted List", +ShowTableBorders : "Show Table Borders", +ShowDetails : "Show Details", +Style : "Style", +FontFormat : "Format", +Font : "Font", +FontSize : "Size", +TextColor : "Text Colour", +BGColor : "Background Colour", +Source : "Source", +Find : "Find", +Replace : "Replace", +SpellCheck : "Check Spelling", +UniversalKeyboard : "Universal Keyboard", +PageBreakLbl : "Page Break", +PageBreak : "Insert Page Break", + +Form : "Form", +Checkbox : "Checkbox", +RadioButton : "Radio Button", +TextField : "Text Field", +Textarea : "Textarea", +HiddenField : "Hidden Field", +Button : "Button", +SelectionField : "Selection Field", +ImageButton : "Image Button", + +FitWindow : "Maximize the editor size", + +// Context Menu +EditLink : "Edit Link", +CellCM : "Cell", +RowCM : "Row", +ColumnCM : "Column", +InsertRow : "Insert Row", +DeleteRows : "Delete Rows", +InsertColumn : "Insert Column", +DeleteColumns : "Delete Columns", +InsertCell : "Insert Cell", +DeleteCells : "Delete Cells", +MergeCells : "Merge Cells", +SplitCell : "Split Cell", +TableDelete : "Delete Table", +CellProperties : "Cell Properties", +TableProperties : "Table Properties", +ImageProperties : "Image Properties", +FlashProperties : "Flash Properties", + +AnchorProp : "Anchor Properties", +ButtonProp : "Button Properties", +CheckboxProp : "Checkbox Properties", +HiddenFieldProp : "Hidden Field Properties", +RadioButtonProp : "Radio Button Properties", +ImageButtonProp : "Image Button Properties", +TextFieldProp : "Text Field Properties", +SelectionFieldProp : "Selection Field Properties", +TextareaProp : "Textarea Properties", +FormProp : "Form Properties", + +FontFormats : "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Normal (DIV)", + +// Alerts and Messages +ProcessingXHTML : "Processing XHTML. Please wait...", +Done : "Done", +PasteWordConfirm : "The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?", +NotCompatiblePaste : "This command is available for Internet Explorer version 5.5 or more. Do you want to paste without cleaning?", +UnknownToolbarItem : "Unknown toolbar item \"%1\"", +UnknownCommand : "Unknown command name \"%1\"", +NotImplemented : "Command not implemented", +UnknownToolbarSet : "Toolbar set \"%1\" doesn't exist", +NoActiveX : "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", +BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", +DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", + +// Dialogs +DlgBtnOK : "OK", +DlgBtnCancel : "Cancel", +DlgBtnClose : "Close", +DlgBtnBrowseServer : "Browse Server", +DlgAdvancedTag : "Advanced", +DlgOpOther : "", +DlgInfoTab : "Info", +DlgAlertUrl : "Please insert the URL", + +// General Dialogs Labels +DlgGenNotSet : "", +DlgGenId : "Id", +DlgGenLangDir : "Language Direction", +DlgGenLangDirLtr : "Left to Right (LTR)", +DlgGenLangDirRtl : "Right to Left (RTL)", +DlgGenLangCode : "Language Code", +DlgGenAccessKey : "Access Key", +DlgGenName : "Name", +DlgGenTabIndex : "Tab Index", +DlgGenLongDescr : "Long Description URL", +DlgGenClass : "Stylesheet Classes", +DlgGenTitle : "Advisory Title", +DlgGenContType : "Advisory Content Type", +DlgGenLinkCharset : "Linked Resource Charset", +DlgGenStyle : "Style", + +// Image Dialog +DlgImgTitle : "Image Properties", +DlgImgInfoTab : "Image Info", +DlgImgBtnUpload : "Send it to the Server", +DlgImgURL : "URL", +DlgImgUpload : "Upload", +DlgImgAlt : "Alternative Text", +DlgImgWidth : "Width", +DlgImgHeight : "Height", +DlgImgLockRatio : "Lock Ratio", +DlgBtnResetSize : "Reset Size", +DlgImgBorder : "Border", +DlgImgHSpace : "HSpace", +DlgImgVSpace : "VSpace", +DlgImgAlign : "Align", +DlgImgAlignLeft : "Left", +DlgImgAlignAbsBottom: "Abs Bottom", +DlgImgAlignAbsMiddle: "Abs Middle", +DlgImgAlignBaseline : "Baseline", +DlgImgAlignBottom : "Bottom", +DlgImgAlignMiddle : "Middle", +DlgImgAlignRight : "Right", +DlgImgAlignTextTop : "Text Top", +DlgImgAlignTop : "Top", +DlgImgPreview : "Preview", +DlgImgAlertUrl : "Please type the image URL", +DlgImgLinkTab : "Link", + +// Flash Dialog +DlgFlashTitle : "Flash Properties", +DlgFlashChkPlay : "Auto Play", +DlgFlashChkLoop : "Loop", +DlgFlashChkMenu : "Enable Flash Menu", +DlgFlashScale : "Scale", +DlgFlashScaleAll : "Show all", +DlgFlashScaleNoBorder : "No Border", +DlgFlashScaleFit : "Exact Fit", + +// Link Dialog +DlgLnkWindowTitle : "Link", +DlgLnkInfoTab : "Link Info", +DlgLnkTargetTab : "Target", + +DlgLnkType : "Link Type", +DlgLnkTypeURL : "URL", +DlgLnkTypeAnchor : "Anchor in this page", +DlgLnkTypeEMail : "E-Mail", +DlgLnkProto : "Protocol", +DlgLnkProtoOther : "", +DlgLnkURL : "URL", +DlgLnkAnchorSel : "Select an Anchor", +DlgLnkAnchorByName : "By Anchor Name", +DlgLnkAnchorById : "By Element Id", +DlgLnkNoAnchors : "", +DlgLnkEMail : "E-Mail Address", +DlgLnkEMailSubject : "Message Subject", +DlgLnkEMailBody : "Message Body", +DlgLnkUpload : "Upload", +DlgLnkBtnUpload : "Send it to the Server", + +DlgLnkTarget : "Target", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", +DlgLnkTargetBlank : "New Window (_blank)", +DlgLnkTargetParent : "Parent Window (_parent)", +DlgLnkTargetSelf : "Same Window (_self)", +DlgLnkTargetTop : "Topmost Window (_top)", +DlgLnkTargetFrameName : "Target Frame Name", +DlgLnkPopWinName : "Popup Window Name", +DlgLnkPopWinFeat : "Popup Window Features", +DlgLnkPopResize : "Resizable", +DlgLnkPopLocation : "Location Bar", +DlgLnkPopMenu : "Menu Bar", +DlgLnkPopScroll : "Scroll Bars", +DlgLnkPopStatus : "Status Bar", +DlgLnkPopToolbar : "Toolbar", +DlgLnkPopFullScrn : "Full Screen (IE)", +DlgLnkPopDependent : "Dependent (Netscape)", +DlgLnkPopWidth : "Width", +DlgLnkPopHeight : "Height", +DlgLnkPopLeft : "Left Position", +DlgLnkPopTop : "Top Position", + +DlnLnkMsgNoUrl : "Please type the link URL", +DlnLnkMsgNoEMail : "Please type the e-mail address", +DlnLnkMsgNoAnchor : "Please select an anchor", + +// Color Dialog +DlgColorTitle : "Select Colour", +DlgColorBtnClear : "Clear", +DlgColorHighlight : "Highlight", +DlgColorSelected : "Selected", + +// Smiley Dialog +DlgSmileyTitle : "Insert a Smiley", + +// Special Character Dialog +DlgSpecialCharTitle : "Select Special Character", + +// Table Dialog +DlgTableTitle : "Table Properties", +DlgTableRows : "Rows", +DlgTableColumns : "Columns", +DlgTableBorder : "Border size", +DlgTableAlign : "Alignment", +DlgTableAlignNotSet : "", +DlgTableAlignLeft : "Left", +DlgTableAlignCenter : "Centre", +DlgTableAlignRight : "Right", +DlgTableWidth : "Width", +DlgTableWidthPx : "pixels", +DlgTableWidthPc : "percent", +DlgTableHeight : "Height", +DlgTableCellSpace : "Cell spacing", +DlgTableCellPad : "Cell padding", +DlgTableCaption : "Caption", +DlgTableSummary : "Summary", + +// Table Cell Dialog +DlgCellTitle : "Cell Properties", +DlgCellWidth : "Width", +DlgCellWidthPx : "pixels", +DlgCellWidthPc : "percent", +DlgCellHeight : "Height", +DlgCellWordWrap : "Word Wrap", +DlgCellWordWrapNotSet : "", +DlgCellWordWrapYes : "Yes", +DlgCellWordWrapNo : "No", +DlgCellHorAlign : "Horizontal Alignment", +DlgCellHorAlignNotSet : "", +DlgCellHorAlignLeft : "Left", +DlgCellHorAlignCenter : "Centre", +DlgCellHorAlignRight: "Right", +DlgCellVerAlign : "Vertical Alignment", +DlgCellVerAlignNotSet : "", +DlgCellVerAlignTop : "Top", +DlgCellVerAlignMiddle : "Middle", +DlgCellVerAlignBottom : "Bottom", +DlgCellVerAlignBaseline : "Baseline", +DlgCellRowSpan : "Rows Span", +DlgCellCollSpan : "Columns Span", +DlgCellBackColor : "Background Colour", +DlgCellBorderColor : "Border Colour", +DlgCellBtnSelect : "Select...", + +// Find Dialog +DlgFindTitle : "Find", +DlgFindFindBtn : "Find", +DlgFindNotFoundMsg : "The specified text was not found.", + +// Replace Dialog +DlgReplaceTitle : "Replace", +DlgReplaceFindLbl : "Find what:", +DlgReplaceReplaceLbl : "Replace with:", +DlgReplaceCaseChk : "Match case", +DlgReplaceReplaceBtn : "Replace", +DlgReplaceReplAllBtn : "Replace All", +DlgReplaceWordChk : "Match whole word", + +// Paste Operations / Dialog +PasteErrorPaste : "Your browser security settings don't permit the editor to automatically execute pasting operations. Please use the keyboard for that (Ctrl+V).", +PasteErrorCut : "Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl+X).", +PasteErrorCopy : "Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl+C).", + +PasteAsText : "Paste as Plain Text", +PasteFromWord : "Paste from Word", + +DlgPasteMsg2 : "Please paste inside the following box using the keyboard (Ctrl+V) and hit OK.", +DlgPasteIgnoreFont : "Ignore Font Face definitions", +DlgPasteRemoveStyles : "Remove Styles definitions", +DlgPasteCleanBox : "Clean Up Box", + +// Color Picker +ColorAutomatic : "Automatic", +ColorMoreColors : "More Colours...", + +// Document Properties +DocProps : "Document Properties", + +// Anchor Dialog +DlgAnchorTitle : "Anchor Properties", +DlgAnchorName : "Anchor Name", +DlgAnchorErrorName : "Please type the anchor name", + +// Speller Pages Dialog +DlgSpellNotInDic : "Not in dictionary", +DlgSpellChangeTo : "Change to", +DlgSpellBtnIgnore : "Ignore", +DlgSpellBtnIgnoreAll : "Ignore All", +DlgSpellBtnReplace : "Replace", +DlgSpellBtnReplaceAll : "Replace All", +DlgSpellBtnUndo : "Undo", +DlgSpellNoSuggestions : "- No suggestions -", +DlgSpellProgress : "Spell check in progress...", +DlgSpellNoMispell : "Spell check complete: No misspellings found", +DlgSpellNoChanges : "Spell check complete: No words changed", +DlgSpellOneChange : "Spell check complete: One word changed", +DlgSpellManyChanges : "Spell check complete: %1 words changed", + +IeSpellDownload : "Spell checker not installed. Do you want to download it now?", + +// Button Dialog +DlgButtonText : "Text (Value)", +DlgButtonType : "Type", + +// Checkbox and Radio Button Dialogs +DlgCheckboxName : "Name", +DlgCheckboxValue : "Value", +DlgCheckboxSelected : "Selected", + +// Form Dialog +DlgFormName : "Name", +DlgFormAction : "Action", +DlgFormMethod : "Method", + +// Select Field Dialog +DlgSelectName : "Name", +DlgSelectValue : "Value", +DlgSelectSize : "Size", +DlgSelectLines : "lines", +DlgSelectChkMulti : "Allow multiple selections", +DlgSelectOpAvail : "Available Options", +DlgSelectOpText : "Text", +DlgSelectOpValue : "Value", +DlgSelectBtnAdd : "Add", +DlgSelectBtnModify : "Modify", +DlgSelectBtnUp : "Up", +DlgSelectBtnDown : "Down", +DlgSelectBtnSetValue : "Set as selected value", +DlgSelectBtnDelete : "Delete", + +// Textarea Dialog +DlgTextareaName : "Name", +DlgTextareaCols : "Columns", +DlgTextareaRows : "Rows", + +// Text Field Dialog +DlgTextName : "Name", +DlgTextValue : "Value", +DlgTextCharWidth : "Character Width", +DlgTextMaxChars : "Maximum Characters", +DlgTextType : "Type", +DlgTextTypeText : "Text", +DlgTextTypePass : "Password", + +// Hidden Field Dialog +DlgHiddenName : "Name", +DlgHiddenValue : "Value", + +// Bulleted List Dialog +BulletedListProp : "Bulleted List Properties", +NumberedListProp : "Numbered List Properties", +DlgLstType : "Type", +DlgLstTypeCircle : "Circle", +DlgLstTypeDisc : "Disc", +DlgLstTypeSquare : "Square", +DlgLstTypeNumbers : "Numbers (1, 2, 3)", +DlgLstTypeLCase : "Lowercase Letters (a, b, c)", +DlgLstTypeUCase : "Uppercase Letters (A, B, C)", +DlgLstTypeSRoman : "Small Roman Numerals (i, ii, iii)", +DlgLstTypeLRoman : "Large Roman Numerals (I, II, III)", + +// Document Properties Dialog +DlgDocGeneralTab : "General", +DlgDocBackTab : "Background", +DlgDocColorsTab : "Colours and Margins", +DlgDocMetaTab : "Meta Data", + +DlgDocPageTitle : "Page Title", +DlgDocLangDir : "Language Direction", +DlgDocLangDirLTR : "Left to Right (LTR)", +DlgDocLangDirRTL : "Right to Left (RTL)", +DlgDocLangCode : "Language Code", +DlgDocCharSet : "Character Set Encoding", +DlgDocCharSetOther : "Other Character Set Encoding", + +DlgDocDocType : "Document Type Heading", +DlgDocDocTypeOther : "Other Document Type Heading", +DlgDocIncXHTML : "Include XHTML Declarations", +DlgDocBgColor : "Background Colour", +DlgDocBgImage : "Background Image URL", +DlgDocBgNoScroll : "Nonscrolling Background", +DlgDocCText : "Text", +DlgDocCLink : "Link", +DlgDocCVisited : "Visited Link", +DlgDocCActive : "Active Link", +DlgDocMargins : "Page Margins", +DlgDocMaTop : "Top", +DlgDocMaLeft : "Left", +DlgDocMaRight : "Right", +DlgDocMaBottom : "Bottom", +DlgDocMeIndex : "Document Indexing Keywords (comma separated)", +DlgDocMeDescr : "Document Description", +DlgDocMeAuthor : "Author", +DlgDocMeCopy : "Copyright", +DlgDocPreview : "Preview", + +// Templates Dialog +Templates : "Templates", +DlgTemplatesTitle : "Content Templates", +DlgTemplatesSelMsg : "Please select the template to open in the editor
      (the actual contents will be lost):", +DlgTemplatesLoading : "Loading templates list. Please wait...", +DlgTemplatesNoTpl : "(No templates defined)", + +// About Dialog +DlgAboutAboutTab : "About", +DlgAboutBrowserInfoTab : "Browser Info", +DlgAboutLicenseTab : "License", +DlgAboutVersion : "version", +DlgAboutLicense : "Licensed under the terms of the GNU Lesser General Public License", +DlgAboutInfo : "For further information go to" } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en-uk.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en-uk.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en-uk.js Wed Jul 12 07:45:05 2006 @@ -1,482 +1,487 @@ -???/* - * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben - * - * Licensed under the terms of the GNU Lesser General Public License: - * http://www.opensource.org/licenses/lgpl-license.php - * - * For further information visit: - * http://www.fckeditor.net/ - * - * "Support Open Source software. What about a donation today?" - * - * File Name: en-uk.js - * English (United Kingdom) language file. - * - * File Authors: - * Frederico Caldeira Knabben (fredck at fckeditor.net) - * Christopher Dawes (fckeditor at dawes.id.au) - */ - -var FCKLang = -{ -// Language direction : "ltr" (left to right) or "rtl" (right to left). -Dir : "ltr", - -ToolbarCollapse : "Collapse Toolbar", -ToolbarExpand : "Expand Toolbar", - -// Toolbar Items and Context Menu -Save : "Save", -NewPage : "New Page", -Preview : "Preview", -Cut : "Cut", -Copy : "Copy", -Paste : "Paste", -PasteText : "Paste as plain text", -PasteWord : "Paste from Word", -Print : "Print", -SelectAll : "Select All", -RemoveFormat : "Remove Format", -InsertLinkLbl : "Link", -InsertLink : "Insert/Edit Link", -RemoveLink : "Remove Link", -Anchor : "Insert/Edit Anchor", -InsertImageLbl : "Image", -InsertImage : "Insert/Edit Image", -InsertFlashLbl : "Flash", -InsertFlash : "Insert/Edit Flash", -InsertTableLbl : "Table", -InsertTable : "Insert/Edit Table", -InsertLineLbl : "Line", -InsertLine : "Insert Horizontal Line", -InsertSpecialCharLbl: "Special Char", -InsertSpecialChar : "Insert Special Character", -InsertSmileyLbl : "Smiley", -InsertSmiley : "Insert Smiley", -About : "About FCKeditor", -Bold : "Bold", -Italic : "Italic", -Underline : "Underline", -StrikeThrough : "Strike Through", -Subscript : "Subscript", -Superscript : "Superscript", -LeftJustify : "Left Justify", -CenterJustify : "Center Justify", -RightJustify : "Right Justify", -BlockJustify : "Block Justify", -DecreaseIndent : "Decrease Indent", -IncreaseIndent : "Increase Indent", -Undo : "Undo", -Redo : "Redo", -NumberedListLbl : "Numbered List", -NumberedList : "Insert/Remove Numbered List", -BulletedListLbl : "Bulleted List", -BulletedList : "Insert/Remove Bulleted List", -ShowTableBorders : "Show Table Borders", -ShowDetails : "Show Details", -Style : "Style", -FontFormat : "Format", -Font : "Font", -FontSize : "Size", -TextColor : "Text Color", -BGColor : "Background Color", -Source : "Source", -Find : "Find", -Replace : "Replace", -SpellCheck : "Check Spell", -UniversalKeyboard : "Universal Keyboard", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING - -Form : "Form", -Checkbox : "Checkbox", -RadioButton : "Radio Button", -TextField : "Text Field", -Textarea : "Textarea", -HiddenField : "Hidden Field", -Button : "Button", -SelectionField : "Selection Field", -ImageButton : "Image Button", - -// Context Menu -EditLink : "Edit Link", -InsertRow : "Insert Row", -DeleteRows : "Delete Rows", -InsertColumn : "Insert Column", -DeleteColumns : "Delete Columns", -InsertCell : "Insert Cell", -DeleteCells : "Delete Cells", -MergeCells : "Merge Cells", -SplitCell : "Split Cell", -TableDelete : "Delete Table", //MISSING -CellProperties : "Cell Properties", -TableProperties : "Table Properties", -ImageProperties : "Image Properties", -FlashProperties : "Flash Properties", - -AnchorProp : "Anchor Properties", -ButtonProp : "Button Properties", -CheckboxProp : "Checkbox Properties", -HiddenFieldProp : "Hidden Field Properties", -RadioButtonProp : "Radio Button Properties", -ImageButtonProp : "Image Button Properties", -TextFieldProp : "Text Field Properties", -SelectionFieldProp : "Selection Field Properties", -TextareaProp : "Textarea Properties", -FormProp : "Form Properties", - -FontFormats : "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Paragraph (DIV)", - -// Alerts and Messages -ProcessingXHTML : "Processing XHTML. Please wait...", -Done : "Done", -PasteWordConfirm : "The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?", -NotCompatiblePaste : "This command is available for Internet Explorer version 5.5 or more. Do you want to paste without cleaning?", -UnknownToolbarItem : "Unknown toolbar item \"%1\"", -UnknownCommand : "Unknown command name \"%1\"", -NotImplemented : "Command not implemented", -UnknownToolbarSet : "Toolbar set \"%1\" doesn't exist", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING - -// Dialogs -DlgBtnOK : "OK", -DlgBtnCancel : "Cancel", -DlgBtnClose : "Close", -DlgBtnBrowseServer : "Browse Server", -DlgAdvancedTag : "Advanced", -DlgOpOther : "<Other>", -DlgInfoTab : "Info", -DlgAlertUrl : "Please insert the URL", - -// General Dialogs Labels -DlgGenNotSet : "<not set>", -DlgGenId : "Id", -DlgGenLangDir : "Language Direction", -DlgGenLangDirLtr : "Left to Right (LTR)", -DlgGenLangDirRtl : "Right to Left (RTL)", -DlgGenLangCode : "Language Code", -DlgGenAccessKey : "Access Key", -DlgGenName : "Name", -DlgGenTabIndex : "Tab Index", -DlgGenLongDescr : "Long Description URL", -DlgGenClass : "Stylesheet Classes", -DlgGenTitle : "Advisory Title", -DlgGenContType : "Advisory Content Type", -DlgGenLinkCharset : "Linked Resource Charset", -DlgGenStyle : "Style", - -// Image Dialog -DlgImgTitle : "Image Properties", -DlgImgInfoTab : "Image Info", -DlgImgBtnUpload : "Send it to the Server", -DlgImgURL : "URL", -DlgImgUpload : "Upload", -DlgImgAlt : "Alternative Text", -DlgImgWidth : "Width", -DlgImgHeight : "Height", -DlgImgLockRatio : "Lock Ratio", -DlgBtnResetSize : "Reset Size", -DlgImgBorder : "Border", -DlgImgHSpace : "HSpace", -DlgImgVSpace : "VSpace", -DlgImgAlign : "Align", -DlgImgAlignLeft : "Left", -DlgImgAlignAbsBottom: "Abs Bottom", -DlgImgAlignAbsMiddle: "Abs Middle", -DlgImgAlignBaseline : "Baseline", -DlgImgAlignBottom : "Bottom", -DlgImgAlignMiddle : "Middle", -DlgImgAlignRight : "Right", -DlgImgAlignTextTop : "Text Top", -DlgImgAlignTop : "Top", -DlgImgPreview : "Preview", -DlgImgAlertUrl : "Please type the image URL", -DlgImgLinkTab : "Link", - -// Flash Dialog -DlgFlashTitle : "Flash Properties", -DlgFlashChkPlay : "Auto Play", -DlgFlashChkLoop : "Loop", -DlgFlashChkMenu : "Enable Flash Menu", -DlgFlashScale : "Scale", -DlgFlashScaleAll : "Show all", -DlgFlashScaleNoBorder : "No Border", -DlgFlashScaleFit : "Exact Fit", - -// Link Dialog -DlgLnkWindowTitle : "Link", -DlgLnkInfoTab : "Link Info", -DlgLnkTargetTab : "Target", - -DlgLnkType : "Link Type", -DlgLnkTypeURL : "URL", -DlgLnkTypeAnchor : "Anchor in this page", -DlgLnkTypeEMail : "E-Mail", -DlgLnkProto : "Protocol", -DlgLnkProtoOther : "<other>", -DlgLnkURL : "URL", -DlgLnkAnchorSel : "Select an Anchor", -DlgLnkAnchorByName : "By Anchor Name", -DlgLnkAnchorById : "By Element Id", -DlgLnkNoAnchors : "<No anchors available in the document>", -DlgLnkEMail : "E-Mail Address", -DlgLnkEMailSubject : "Message Subject", -DlgLnkEMailBody : "Message Body", -DlgLnkUpload : "Upload", -DlgLnkBtnUpload : "Send it to the Server", - -DlgLnkTarget : "Target", -DlgLnkTargetFrame : "<frame>", -DlgLnkTargetPopup : "<popup window>", -DlgLnkTargetBlank : "New Window (_blank)", -DlgLnkTargetParent : "Parent Window (_parent)", -DlgLnkTargetSelf : "Same Window (_self)", -DlgLnkTargetTop : "Topmost Window (_top)", -DlgLnkTargetFrameName : "Target Frame Name", -DlgLnkPopWinName : "Popup Window Name", -DlgLnkPopWinFeat : "Popup Window Features", -DlgLnkPopResize : "Resizable", -DlgLnkPopLocation : "Location Bar", -DlgLnkPopMenu : "Menu Bar", -DlgLnkPopScroll : "Scroll Bars", -DlgLnkPopStatus : "Status Bar", -DlgLnkPopToolbar : "Toolbar", -DlgLnkPopFullScrn : "Full Screen (IE)", -DlgLnkPopDependent : "Dependent (Netscape)", -DlgLnkPopWidth : "Width", -DlgLnkPopHeight : "Height", -DlgLnkPopLeft : "Left Position", -DlgLnkPopTop : "Top Position", - -DlnLnkMsgNoUrl : "Please type the link URL", -DlnLnkMsgNoEMail : "Please type the e-mail address", -DlnLnkMsgNoAnchor : "Please select an anchor", - -// Color Dialog -DlgColorTitle : "Select Color", -DlgColorBtnClear : "Clear", -DlgColorHighlight : "Highlight", -DlgColorSelected : "Selected", - -// Smiley Dialog -DlgSmileyTitle : "Insert a Smiley", - -// Special Character Dialog -DlgSpecialCharTitle : "Select Special Character", - -// Table Dialog -DlgTableTitle : "Table Properties", -DlgTableRows : "Rows", -DlgTableColumns : "Columns", -DlgTableBorder : "Border size", -DlgTableAlign : "Alignment", -DlgTableAlignNotSet : "", -DlgTableAlignLeft : "Left", -DlgTableAlignCenter : "Centre", -DlgTableAlignRight : "Right", -DlgTableWidth : "Width", -DlgTableWidthPx : "pixels", -DlgTableWidthPc : "percent", -DlgTableHeight : "Height", -DlgTableCellSpace : "Cell spacing", -DlgTableCellPad : "Cell padding", -DlgTableCaption : "Caption", -DlgTableSummary : "Summary", //MISSING - -// Table Cell Dialog -DlgCellTitle : "Cell Properties", -DlgCellWidth : "Width", -DlgCellWidthPx : "pixels", -DlgCellWidthPc : "percent", -DlgCellHeight : "Height", -DlgCellWordWrap : "Word Wrap", -DlgCellWordWrapNotSet : "<Not set>", -DlgCellWordWrapYes : "Yes", -DlgCellWordWrapNo : "No", -DlgCellHorAlign : "Horizontal Alignment", -DlgCellHorAlignNotSet : "<Not set>", -DlgCellHorAlignLeft : "Left", -DlgCellHorAlignCenter : "Centre", -DlgCellHorAlignRight: "Right", -DlgCellVerAlign : "Vertical Alignment", -DlgCellVerAlignNotSet : "<Not set>", -DlgCellVerAlignTop : "Top", -DlgCellVerAlignMiddle : "Middle", -DlgCellVerAlignBottom : "Bottom", -DlgCellVerAlignBaseline : "Baseline", -DlgCellRowSpan : "Rows Span", -DlgCellCollSpan : "Columns Span", -DlgCellBackColor : "Background Color", -DlgCellBorderColor : "Border Color", -DlgCellBtnSelect : "Select...", - -// Find Dialog -DlgFindTitle : "Find", -DlgFindFindBtn : "Find", -DlgFindNotFoundMsg : "The specified text was not found.", - -// Replace Dialog -DlgReplaceTitle : "Replace", -DlgReplaceFindLbl : "Find what:", -DlgReplaceReplaceLbl : "Replace with:", -DlgReplaceCaseChk : "Match case", -DlgReplaceReplaceBtn : "Replace", -DlgReplaceReplAllBtn : "Replace All", -DlgReplaceWordChk : "Match whole word", - -// Paste Operations / Dialog -PasteErrorPaste : "Your browser security settings don't permit the editor to automaticaly execute pasting operations. Please use the keyboard for that (Ctrl+V).", -PasteErrorCut : "Your browser security settings don't permit the editor to automaticaly execute cutting operations. Please use the keyboard for that (Ctrl+X).", -PasteErrorCopy : "Your browser security settings don't permit the editor to automaticaly execute copying operations. Please use the keyboard for that (Ctrl+C).", - -PasteAsText : "Paste as Plain Text", -PasteFromWord : "Paste from Word", - -DlgPasteMsg2 : "Please paste inside the following box using the keyboard (Ctrl+V) and hit OK.", -DlgPasteIgnoreFont : "Ignore Font Face definitions", -DlgPasteRemoveStyles : "Remove Styles definitions", -DlgPasteCleanBox : "Clean Up Box", - - -// Color Picker -ColorAutomatic : "Automatic", -ColorMoreColors : "More Colors...", - -// Document Properties -DocProps : "Document Properties", - -// Anchor Dialog -DlgAnchorTitle : "Anchor Properties", -DlgAnchorName : "Anchor Name", -DlgAnchorErrorName : "Please type the anchor name", - -// Speller Pages Dialog -DlgSpellNotInDic : "Not in dictionary", -DlgSpellChangeTo : "Change to", -DlgSpellBtnIgnore : "Ignore", -DlgSpellBtnIgnoreAll : "Ignore All", -DlgSpellBtnReplace : "Replace", -DlgSpellBtnReplaceAll : "Replace All", -DlgSpellBtnUndo : "Undo", -DlgSpellNoSuggestions : "- No suggestions -", -DlgSpellProgress : "Spell check in progress...", -DlgSpellNoMispell : "Spell check complete: No misspellings found", -DlgSpellNoChanges : "Spell check complete: No words changed", -DlgSpellOneChange : "Spell check complete: One word changed", -DlgSpellManyChanges : "Spell check complete: %1 words changed", - -IeSpellDownload : "Spell checker not installed. Do you want to download it now?", - -// Button Dialog -DlgButtonText : "Text (Value)", -DlgButtonType : "Type", - -// Checkbox and Radio Button Dialogs -DlgCheckboxName : "Name", -DlgCheckboxValue : "Value", -DlgCheckboxSelected : "Selected", - -// Form Dialog -DlgFormName : "Name", -DlgFormAction : "Action", -DlgFormMethod : "Method", - -// Select Field Dialog -DlgSelectName : "Name", -DlgSelectValue : "Value", -DlgSelectSize : "Size", -DlgSelectLines : "lines", -DlgSelectChkMulti : "Allow multiple selections", -DlgSelectOpAvail : "Available Options", -DlgSelectOpText : "Text", -DlgSelectOpValue : "Value", -DlgSelectBtnAdd : "Add", -DlgSelectBtnModify : "Modify", -DlgSelectBtnUp : "Up", -DlgSelectBtnDown : "Down", -DlgSelectBtnSetValue : "Set as selected value", -DlgSelectBtnDelete : "Delete", - -// Textarea Dialog -DlgTextareaName : "Name", -DlgTextareaCols : "Columns", -DlgTextareaRows : "Rows", - -// Text Field Dialog -DlgTextName : "Name", -DlgTextValue : "Value", -DlgTextCharWidth : "Character Width", -DlgTextMaxChars : "Maximum Characters", -DlgTextType : "Type", -DlgTextTypeText : "Text", -DlgTextTypePass : "Password", - -// Hidden Field Dialog -DlgHiddenName : "Name", -DlgHiddenValue : "Value", - -// Bulleted List Dialog -BulletedListProp : "Bulleted List Properties", -NumberedListProp : "Numbered List Properties", -DlgLstType : "Type", -DlgLstTypeCircle : "Circle", -DlgLstTypeDisc : "Disc", //MISSING -DlgLstTypeSquare : "Square", -DlgLstTypeNumbers : "Numbers (1, 2, 3)", -DlgLstTypeLCase : "Lowercase Letters (a, b, c)", -DlgLstTypeUCase : "Uppercase Letters (A, B, C)", -DlgLstTypeSRoman : "Small Roman Numerals (i, ii, iii)", -DlgLstTypeLRoman : "Large Roman Numerals (I, II, III)", - -// Document Properties Dialog -DlgDocGeneralTab : "General", -DlgDocBackTab : "Background", -DlgDocColorsTab : "Colors and Margins", -DlgDocMetaTab : "Meta Data", - -DlgDocPageTitle : "Page Title", -DlgDocLangDir : "Language Direction", -DlgDocLangDirLTR : "Left to Right (LTR)", -DlgDocLangDirRTL : "Right to Left (RTL)", -DlgDocLangCode : "Language Code", -DlgDocCharSet : "Character Set Encoding", -DlgDocCharSetOther : "Other Character Set Encoding", - -DlgDocDocType : "Document Type Heading", -DlgDocDocTypeOther : "Other Document Type Heading", -DlgDocIncXHTML : "Include XHTML Declarations", -DlgDocBgColor : "Background Color", -DlgDocBgImage : "Background Image URL", -DlgDocBgNoScroll : "Nonscrolling Background", -DlgDocCText : "Text", -DlgDocCLink : "Link", -DlgDocCVisited : "Visited Link", -DlgDocCActive : "Active Link", -DlgDocMargins : "Page Margins", -DlgDocMaTop : "Top", -DlgDocMaLeft : "Left", -DlgDocMaRight : "Right", -DlgDocMaBottom : "Bottom", -DlgDocMeIndex : "Document Indexing Keywords (comma separated)", -DlgDocMeDescr : "Document Description", -DlgDocMeAuthor : "Author", -DlgDocMeCopy : "Copyright", -DlgDocPreview : "Preview", - -// Templates Dialog -Templates : "Templates", -DlgTemplatesTitle : "Content Templates", -DlgTemplatesSelMsg : "Please select the template to open in the editor
      (the actual contents will be lost):", -DlgTemplatesLoading : "Loading templates list. Please wait...", -DlgTemplatesNoTpl : "(No templates defined)", - -// About Dialog -DlgAboutAboutTab : "About", -DlgAboutBrowserInfoTab : "Browser Info", -DlgAboutVersion : "version", -DlgAboutLicense : "Licensed under the terms of the GNU Lesser General Public License", -DlgAboutInfo : "For further information go to" +???/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2006 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * "Support Open Source software. What about a donation today?" + * + * File Name: en-uk.js + * English (United Kingdom) language file. + * + * File Authors: + * Frederico Caldeira Knabben (fredck at fckeditor.net) + * Christopher Dawes (fckeditor at dawes.id.au) + */ + +var FCKLang = +{ +// Language direction : "ltr" (left to right) or "rtl" (right to left). +Dir : "ltr", + +ToolbarCollapse : "Collapse Toolbar", +ToolbarExpand : "Expand Toolbar", + +// Toolbar Items and Context Menu +Save : "Save", +NewPage : "New Page", +Preview : "Preview", +Cut : "Cut", +Copy : "Copy", +Paste : "Paste", +PasteText : "Paste as plain text", +PasteWord : "Paste from Word", +Print : "Print", +SelectAll : "Select All", +RemoveFormat : "Remove Format", +InsertLinkLbl : "Link", +InsertLink : "Insert/Edit Link", +RemoveLink : "Remove Link", +Anchor : "Insert/Edit Anchor", +InsertImageLbl : "Image", +InsertImage : "Insert/Edit Image", +InsertFlashLbl : "Flash", +InsertFlash : "Insert/Edit Flash", +InsertTableLbl : "Table", +InsertTable : "Insert/Edit Table", +InsertLineLbl : "Line", +InsertLine : "Insert Horizontal Line", +InsertSpecialCharLbl: "Special Character", +InsertSpecialChar : "Insert Special Character", +InsertSmileyLbl : "Smiley", +InsertSmiley : "Insert Smiley", +About : "About FCKeditor", +Bold : "Bold", +Italic : "Italic", +Underline : "Underline", +StrikeThrough : "Strike Through", +Subscript : "Subscript", +Superscript : "Superscript", +LeftJustify : "Left Justify", +CenterJustify : "Centre Justify", +RightJustify : "Right Justify", +BlockJustify : "Block Justify", +DecreaseIndent : "Decrease Indent", +IncreaseIndent : "Increase Indent", +Undo : "Undo", +Redo : "Redo", +NumberedListLbl : "Numbered List", +NumberedList : "Insert/Remove Numbered List", +BulletedListLbl : "Bulleted List", +BulletedList : "Insert/Remove Bulleted List", +ShowTableBorders : "Show Table Borders", +ShowDetails : "Show Details", +Style : "Style", +FontFormat : "Format", +Font : "Font", +FontSize : "Size", +TextColor : "Text Colour", +BGColor : "Background Colour", +Source : "Source", +Find : "Find", +Replace : "Replace", +SpellCheck : "Check Spelling", +UniversalKeyboard : "Universal Keyboard", +PageBreakLbl : "Page Break", +PageBreak : "Insert Page Break", + +Form : "Form", +Checkbox : "Checkbox", +RadioButton : "Radio Button", +TextField : "Text Field", +Textarea : "Textarea", +HiddenField : "Hidden Field", +Button : "Button", +SelectionField : "Selection Field", +ImageButton : "Image Button", + +FitWindow : "Maximize the editor size", + +// Context Menu +EditLink : "Edit Link", +CellCM : "Cell", +RowCM : "Row", +ColumnCM : "Column", +InsertRow : "Insert Row", +DeleteRows : "Delete Rows", +InsertColumn : "Insert Column", +DeleteColumns : "Delete Columns", +InsertCell : "Insert Cell", +DeleteCells : "Delete Cells", +MergeCells : "Merge Cells", +SplitCell : "Split Cell", +TableDelete : "Delete Table", +CellProperties : "Cell Properties", +TableProperties : "Table Properties", +ImageProperties : "Image Properties", +FlashProperties : "Flash Properties", + +AnchorProp : "Anchor Properties", +ButtonProp : "Button Properties", +CheckboxProp : "Checkbox Properties", +HiddenFieldProp : "Hidden Field Properties", +RadioButtonProp : "Radio Button Properties", +ImageButtonProp : "Image Button Properties", +TextFieldProp : "Text Field Properties", +SelectionFieldProp : "Selection Field Properties", +TextareaProp : "Textarea Properties", +FormProp : "Form Properties", + +FontFormats : "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Normal (DIV)", + +// Alerts and Messages +ProcessingXHTML : "Processing XHTML. Please wait...", +Done : "Done", +PasteWordConfirm : "The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?", +NotCompatiblePaste : "This command is available for Internet Explorer version 5.5 or more. Do you want to paste without cleaning?", +UnknownToolbarItem : "Unknown toolbar item \"%1\"", +UnknownCommand : "Unknown command name \"%1\"", +NotImplemented : "Command not implemented", +UnknownToolbarSet : "Toolbar set \"%1\" doesn't exist", +NoActiveX : "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", +BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", +DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", + +// Dialogs +DlgBtnOK : "OK", +DlgBtnCancel : "Cancel", +DlgBtnClose : "Close", +DlgBtnBrowseServer : "Browse Server", +DlgAdvancedTag : "Advanced", +DlgOpOther : "", +DlgInfoTab : "Info", +DlgAlertUrl : "Please insert the URL", + +// General Dialogs Labels +DlgGenNotSet : "", +DlgGenId : "Id", +DlgGenLangDir : "Language Direction", +DlgGenLangDirLtr : "Left to Right (LTR)", +DlgGenLangDirRtl : "Right to Left (RTL)", +DlgGenLangCode : "Language Code", +DlgGenAccessKey : "Access Key", +DlgGenName : "Name", +DlgGenTabIndex : "Tab Index", +DlgGenLongDescr : "Long Description URL", +DlgGenClass : "Stylesheet Classes", +DlgGenTitle : "Advisory Title", +DlgGenContType : "Advisory Content Type", +DlgGenLinkCharset : "Linked Resource Charset", +DlgGenStyle : "Style", + +// Image Dialog +DlgImgTitle : "Image Properties", +DlgImgInfoTab : "Image Info", +DlgImgBtnUpload : "Send it to the Server", +DlgImgURL : "URL", +DlgImgUpload : "Upload", +DlgImgAlt : "Alternative Text", +DlgImgWidth : "Width", +DlgImgHeight : "Height", +DlgImgLockRatio : "Lock Ratio", +DlgBtnResetSize : "Reset Size", +DlgImgBorder : "Border", +DlgImgHSpace : "HSpace", +DlgImgVSpace : "VSpace", +DlgImgAlign : "Align", +DlgImgAlignLeft : "Left", +DlgImgAlignAbsBottom: "Abs Bottom", +DlgImgAlignAbsMiddle: "Abs Middle", +DlgImgAlignBaseline : "Baseline", +DlgImgAlignBottom : "Bottom", +DlgImgAlignMiddle : "Middle", +DlgImgAlignRight : "Right", +DlgImgAlignTextTop : "Text Top", +DlgImgAlignTop : "Top", +DlgImgPreview : "Preview", +DlgImgAlertUrl : "Please type the image URL", +DlgImgLinkTab : "Link", + +// Flash Dialog +DlgFlashTitle : "Flash Properties", +DlgFlashChkPlay : "Auto Play", +DlgFlashChkLoop : "Loop", +DlgFlashChkMenu : "Enable Flash Menu", +DlgFlashScale : "Scale", +DlgFlashScaleAll : "Show all", +DlgFlashScaleNoBorder : "No Border", +DlgFlashScaleFit : "Exact Fit", + +// Link Dialog +DlgLnkWindowTitle : "Link", +DlgLnkInfoTab : "Link Info", +DlgLnkTargetTab : "Target", + +DlgLnkType : "Link Type", +DlgLnkTypeURL : "URL", +DlgLnkTypeAnchor : "Anchor in this page", +DlgLnkTypeEMail : "E-Mail", +DlgLnkProto : "Protocol", +DlgLnkProtoOther : "", +DlgLnkURL : "URL", +DlgLnkAnchorSel : "Select an Anchor", +DlgLnkAnchorByName : "By Anchor Name", +DlgLnkAnchorById : "By Element Id", +DlgLnkNoAnchors : "", +DlgLnkEMail : "E-Mail Address", +DlgLnkEMailSubject : "Message Subject", +DlgLnkEMailBody : "Message Body", +DlgLnkUpload : "Upload", +DlgLnkBtnUpload : "Send it to the Server", + +DlgLnkTarget : "Target", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", +DlgLnkTargetBlank : "New Window (_blank)", +DlgLnkTargetParent : "Parent Window (_parent)", +DlgLnkTargetSelf : "Same Window (_self)", +DlgLnkTargetTop : "Topmost Window (_top)", +DlgLnkTargetFrameName : "Target Frame Name", +DlgLnkPopWinName : "Popup Window Name", +DlgLnkPopWinFeat : "Popup Window Features", +DlgLnkPopResize : "Resizable", +DlgLnkPopLocation : "Location Bar", +DlgLnkPopMenu : "Menu Bar", +DlgLnkPopScroll : "Scroll Bars", +DlgLnkPopStatus : "Status Bar", +DlgLnkPopToolbar : "Toolbar", +DlgLnkPopFullScrn : "Full Screen (IE)", +DlgLnkPopDependent : "Dependent (Netscape)", +DlgLnkPopWidth : "Width", +DlgLnkPopHeight : "Height", +DlgLnkPopLeft : "Left Position", +DlgLnkPopTop : "Top Position", + +DlnLnkMsgNoUrl : "Please type the link URL", +DlnLnkMsgNoEMail : "Please type the e-mail address", +DlnLnkMsgNoAnchor : "Please select an anchor", + +// Color Dialog +DlgColorTitle : "Select Colour", +DlgColorBtnClear : "Clear", +DlgColorHighlight : "Highlight", +DlgColorSelected : "Selected", + +// Smiley Dialog +DlgSmileyTitle : "Insert a Smiley", + +// Special Character Dialog +DlgSpecialCharTitle : "Select Special Character", + +// Table Dialog +DlgTableTitle : "Table Properties", +DlgTableRows : "Rows", +DlgTableColumns : "Columns", +DlgTableBorder : "Border size", +DlgTableAlign : "Alignment", +DlgTableAlignNotSet : "", +DlgTableAlignLeft : "Left", +DlgTableAlignCenter : "Centre", +DlgTableAlignRight : "Right", +DlgTableWidth : "Width", +DlgTableWidthPx : "pixels", +DlgTableWidthPc : "percent", +DlgTableHeight : "Height", +DlgTableCellSpace : "Cell spacing", +DlgTableCellPad : "Cell padding", +DlgTableCaption : "Caption", +DlgTableSummary : "Summary", + +// Table Cell Dialog +DlgCellTitle : "Cell Properties", +DlgCellWidth : "Width", +DlgCellWidthPx : "pixels", +DlgCellWidthPc : "percent", +DlgCellHeight : "Height", +DlgCellWordWrap : "Word Wrap", +DlgCellWordWrapNotSet : "", +DlgCellWordWrapYes : "Yes", +DlgCellWordWrapNo : "No", +DlgCellHorAlign : "Horizontal Alignment", +DlgCellHorAlignNotSet : "", +DlgCellHorAlignLeft : "Left", +DlgCellHorAlignCenter : "Centre", +DlgCellHorAlignRight: "Right", +DlgCellVerAlign : "Vertical Alignment", +DlgCellVerAlignNotSet : "", +DlgCellVerAlignTop : "Top", +DlgCellVerAlignMiddle : "Middle", +DlgCellVerAlignBottom : "Bottom", +DlgCellVerAlignBaseline : "Baseline", +DlgCellRowSpan : "Rows Span", +DlgCellCollSpan : "Columns Span", +DlgCellBackColor : "Background Colour", +DlgCellBorderColor : "Border Colour", +DlgCellBtnSelect : "Select...", + +// Find Dialog +DlgFindTitle : "Find", +DlgFindFindBtn : "Find", +DlgFindNotFoundMsg : "The specified text was not found.", + +// Replace Dialog +DlgReplaceTitle : "Replace", +DlgReplaceFindLbl : "Find what:", +DlgReplaceReplaceLbl : "Replace with:", +DlgReplaceCaseChk : "Match case", +DlgReplaceReplaceBtn : "Replace", +DlgReplaceReplAllBtn : "Replace All", +DlgReplaceWordChk : "Match whole word", + +// Paste Operations / Dialog +PasteErrorPaste : "Your browser security settings don't permit the editor to automatically execute pasting operations. Please use the keyboard for that (Ctrl+V).", +PasteErrorCut : "Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl+X).", +PasteErrorCopy : "Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl+C).", + +PasteAsText : "Paste as Plain Text", +PasteFromWord : "Paste from Word", + +DlgPasteMsg2 : "Please paste inside the following box using the keyboard (Ctrl+V) and hit OK.", +DlgPasteIgnoreFont : "Ignore Font Face definitions", +DlgPasteRemoveStyles : "Remove Styles definitions", +DlgPasteCleanBox : "Clean Up Box", + +// Color Picker +ColorAutomatic : "Automatic", +ColorMoreColors : "More Colours...", + +// Document Properties +DocProps : "Document Properties", + +// Anchor Dialog +DlgAnchorTitle : "Anchor Properties", +DlgAnchorName : "Anchor Name", +DlgAnchorErrorName : "Please type the anchor name", + +// Speller Pages Dialog +DlgSpellNotInDic : "Not in dictionary", +DlgSpellChangeTo : "Change to", +DlgSpellBtnIgnore : "Ignore", +DlgSpellBtnIgnoreAll : "Ignore All", +DlgSpellBtnReplace : "Replace", +DlgSpellBtnReplaceAll : "Replace All", +DlgSpellBtnUndo : "Undo", +DlgSpellNoSuggestions : "- No suggestions -", +DlgSpellProgress : "Spell check in progress...", +DlgSpellNoMispell : "Spell check complete: No misspellings found", +DlgSpellNoChanges : "Spell check complete: No words changed", +DlgSpellOneChange : "Spell check complete: One word changed", +DlgSpellManyChanges : "Spell check complete: %1 words changed", + +IeSpellDownload : "Spell checker not installed. Do you want to download it now?", + +// Button Dialog +DlgButtonText : "Text (Value)", +DlgButtonType : "Type", + +// Checkbox and Radio Button Dialogs +DlgCheckboxName : "Name", +DlgCheckboxValue : "Value", +DlgCheckboxSelected : "Selected", + +// Form Dialog +DlgFormName : "Name", +DlgFormAction : "Action", +DlgFormMethod : "Method", + +// Select Field Dialog +DlgSelectName : "Name", +DlgSelectValue : "Value", +DlgSelectSize : "Size", +DlgSelectLines : "lines", +DlgSelectChkMulti : "Allow multiple selections", +DlgSelectOpAvail : "Available Options", +DlgSelectOpText : "Text", +DlgSelectOpValue : "Value", +DlgSelectBtnAdd : "Add", +DlgSelectBtnModify : "Modify", +DlgSelectBtnUp : "Up", +DlgSelectBtnDown : "Down", +DlgSelectBtnSetValue : "Set as selected value", +DlgSelectBtnDelete : "Delete", + +// Textarea Dialog +DlgTextareaName : "Name", +DlgTextareaCols : "Columns", +DlgTextareaRows : "Rows", + +// Text Field Dialog +DlgTextName : "Name", +DlgTextValue : "Value", +DlgTextCharWidth : "Character Width", +DlgTextMaxChars : "Maximum Characters", +DlgTextType : "Type", +DlgTextTypeText : "Text", +DlgTextTypePass : "Password", + +// Hidden Field Dialog +DlgHiddenName : "Name", +DlgHiddenValue : "Value", + +// Bulleted List Dialog +BulletedListProp : "Bulleted List Properties", +NumberedListProp : "Numbered List Properties", +DlgLstType : "Type", +DlgLstTypeCircle : "Circle", +DlgLstTypeDisc : "Disc", +DlgLstTypeSquare : "Square", +DlgLstTypeNumbers : "Numbers (1, 2, 3)", +DlgLstTypeLCase : "Lowercase Letters (a, b, c)", +DlgLstTypeUCase : "Uppercase Letters (A, B, C)", +DlgLstTypeSRoman : "Small Roman Numerals (i, ii, iii)", +DlgLstTypeLRoman : "Large Roman Numerals (I, II, III)", + +// Document Properties Dialog +DlgDocGeneralTab : "General", +DlgDocBackTab : "Background", +DlgDocColorsTab : "Colours and Margins", +DlgDocMetaTab : "Meta Data", + +DlgDocPageTitle : "Page Title", +DlgDocLangDir : "Language Direction", +DlgDocLangDirLTR : "Left to Right (LTR)", +DlgDocLangDirRTL : "Right to Left (RTL)", +DlgDocLangCode : "Language Code", +DlgDocCharSet : "Character Set Encoding", +DlgDocCharSetOther : "Other Character Set Encoding", + +DlgDocDocType : "Document Type Heading", +DlgDocDocTypeOther : "Other Document Type Heading", +DlgDocIncXHTML : "Include XHTML Declarations", +DlgDocBgColor : "Background Colour", +DlgDocBgImage : "Background Image URL", +DlgDocBgNoScroll : "Nonscrolling Background", +DlgDocCText : "Text", +DlgDocCLink : "Link", +DlgDocCVisited : "Visited Link", +DlgDocCActive : "Active Link", +DlgDocMargins : "Page Margins", +DlgDocMaTop : "Top", +DlgDocMaLeft : "Left", +DlgDocMaRight : "Right", +DlgDocMaBottom : "Bottom", +DlgDocMeIndex : "Document Indexing Keywords (comma separated)", +DlgDocMeDescr : "Document Description", +DlgDocMeAuthor : "Author", +DlgDocMeCopy : "Copyright", +DlgDocPreview : "Preview", + +// Templates Dialog +Templates : "Templates", +DlgTemplatesTitle : "Content Templates", +DlgTemplatesSelMsg : "Please select the template to open in the editor
      (the actual contents will be lost):", +DlgTemplatesLoading : "Loading templates list. Please wait...", +DlgTemplatesNoTpl : "(No templates defined)", + +// About Dialog +DlgAboutAboutTab : "About", +DlgAboutBrowserInfoTab : "Browser Info", +DlgAboutLicenseTab : "License", +DlgAboutVersion : "version", +DlgAboutLicense : "Licensed under the terms of the GNU Lesser General Public License", +DlgAboutInfo : "For further information go to" } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/en.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -49,7 +49,7 @@ InsertTable : "Insert/Edit Table", InsertLineLbl : "Line", InsertLine : "Insert Horizontal Line", -InsertSpecialCharLbl: "Special Char", +InsertSpecialCharLbl: "Special Character", InsertSpecialChar : "Insert Special Character", InsertSmileyLbl : "Smiley", InsertSmiley : "Insert Smiley", @@ -83,7 +83,7 @@ Source : "Source", Find : "Find", Replace : "Replace", -SpellCheck : "Check Spell", +SpellCheck : "Check Spelling", UniversalKeyboard : "Universal Keyboard", PageBreakLbl : "Page Break", PageBreak : "Insert Page Break", @@ -98,8 +98,13 @@ SelectionField : "Selection Field", ImageButton : "Image Button", +FitWindow : "Maximize the editor size", + // Context Menu EditLink : "Edit Link", +CellCM : "Cell", +RowCM : "Row", +ColumnCM : "Column", InsertRow : "Insert Row", DeleteRows : "Delete Rows", InsertColumn : "Insert Column", @@ -136,7 +141,7 @@ UnknownCommand : "Unknown command name \"%1\"", NotImplemented : "Command not implemented", UnknownToolbarSet : "Toolbar set \"%1\" doesn't exist", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", +NoActiveX : "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", @@ -146,12 +151,12 @@ DlgBtnClose : "Close", DlgBtnBrowseServer : "Browse Server", DlgAdvancedTag : "Advanced", -DlgOpOther : "<Other>", +DlgOpOther : "", DlgInfoTab : "Info", DlgAlertUrl : "Please insert the URL", // General Dialogs Labels -DlgGenNotSet : "<not set>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "Language Direction", DlgGenLangDirLtr : "Left to Right (LTR)", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "Anchor in this page", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "Protocol", -DlgLnkProtoOther : "<other>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "Select an Anchor", DlgLnkAnchorByName : "By Anchor Name", DlgLnkAnchorById : "By Element Id", -DlgLnkNoAnchors : "<No anchors available in the document>", +DlgLnkNoAnchors : "", DlgLnkEMail : "E-Mail Address", DlgLnkEMailSubject : "Message Subject", DlgLnkEMailBody : "Message Body", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "Send it to the Server", DlgLnkTarget : "Target", -DlgLnkTargetFrame : "<frame>", -DlgLnkTargetPopup : "<popup window>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "New Window (_blank)", DlgLnkTargetParent : "Parent Window (_parent)", DlgLnkTargetSelf : "Same Window (_self)", @@ -292,16 +297,16 @@ DlgCellWidthPc : "percent", DlgCellHeight : "Height", DlgCellWordWrap : "Word Wrap", -DlgCellWordWrapNotSet : "<Not set>", +DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "Yes", DlgCellWordWrapNo : "No", DlgCellHorAlign : "Horizontal Alignment", -DlgCellHorAlignNotSet : "<Not set>", +DlgCellHorAlignNotSet : "", DlgCellHorAlignLeft : "Left", DlgCellHorAlignCenter : "Center", DlgCellHorAlignRight: "Right", DlgCellVerAlign : "Vertical Alignment", -DlgCellVerAlignNotSet : "<Not set>", +DlgCellVerAlignNotSet : "", DlgCellVerAlignTop : "Top", DlgCellVerAlignMiddle : "Middle", DlgCellVerAlignBottom : "Bottom", @@ -338,7 +343,6 @@ DlgPasteIgnoreFont : "Ignore Font Face definitions", DlgPasteRemoveStyles : "Remove Styles definitions", DlgPasteCleanBox : "Clean Up Box", - // Color Picker ColorAutomatic : "Automatic", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "About", DlgAboutBrowserInfoTab : "Browser Info", +DlgAboutLicenseTab : "License", DlgAboutVersion : "version", DlgAboutLicense : "Licensed under the terms of the GNU Lesser General Public License", DlgAboutInfo : "For further information go to" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/eo.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/eo.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/eo.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -98,8 +98,13 @@ SelectionField : "Elekta Kampo", ImageButton : "Bildbutono", +FitWindow : "Maximize the editor size", //MISSING + // Context Menu EditLink : "Modifier Ligilon", +CellCM : "Cell", //MISSING +RowCM : "Row", //MISSING +ColumnCM : "Column", //MISSING InsertRow : "Enmeti Linion", DeleteRows : "Forigi Liniojn", InsertColumn : "Enmeti Kolumnon", @@ -136,7 +141,7 @@ UnknownCommand : "Komandonomo nekonata \"%1\"", NotImplemented : "Komando ne ankora?? realigita", UnknownToolbarSet : "La ilobreto \"%1\" ne ekzistas", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING +NoActiveX : "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING @@ -146,12 +151,12 @@ DlgBtnClose : "Fermi", DlgBtnBrowseServer : "Foliumi en la Servilo", DlgAdvancedTag : "Speciala", -DlgOpOther : "<Alia>", +DlgOpOther : "", DlgInfoTab : "Info", //MISSING DlgAlertUrl : "Please insert the URL", //MISSING // General Dialogs Labels -DlgGenNotSet : "<Defa??lta>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "Skribdirekto", DlgGenLangDirLtr : "De maldekstro dekstren (LTR)", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "Ankri en tiu ??i pa??o", DlgLnkTypeEMail : "Retpo??to", DlgLnkProto : "Protokolo", -DlgLnkProtoOther : "<alia>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "Elekti Ankron", DlgLnkAnchorByName : "Per Ankronomo", DlgLnkAnchorById : "Per Elementidentigilo", -DlgLnkNoAnchors : "<Ne disponeblas ankroj en la dokumento>", +DlgLnkNoAnchors : "", DlgLnkEMail : "Retadreso", DlgLnkEMailSubject : "Temlinio", DlgLnkEMailBody : "Mesa??a korpo", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "Sendi al Servilo", DlgLnkTarget : "Celo", -DlgLnkTargetFrame : "<kadro>", -DlgLnkTargetPopup : "<??prucfenestro>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Nova Fenestro (_blank)", DlgLnkTargetParent : "Gepatra Fenestro (_parent)", DlgLnkTargetSelf : "Sama Fenestro (_self)", @@ -339,7 +344,6 @@ DlgPasteRemoveStyles : "Remove Styles definitions", //MISSING DlgPasteCleanBox : "Clean Up Box", //MISSING - // Color Picker ColorAutomatic : "A??tomata", ColorMoreColors : "Pli da Koloroj...", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "Pri", DlgAboutBrowserInfoTab : "Informoj pri TTT-legilo", +DlgAboutLicenseTab : "License", //MISSING DlgAboutVersion : "versio", DlgAboutLicense : "Disdonata la?? la GNU Lesser General Public License", DlgAboutInfo : "Por pli da informoj, vizitu" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/es.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/es.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/es.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -98,8 +98,13 @@ SelectionField : "Campo de Selecci??n", ImageButton : "Bot??n Imagen", +FitWindow : "Maximize the editor size", //MISSING + // Context Menu EditLink : "Editar V??nculo", +CellCM : "Cell", //MISSING +RowCM : "Row", //MISSING +ColumnCM : "Column", //MISSING InsertRow : "Insertar Fila", DeleteRows : "Eliminar Filas", InsertColumn : "Insertar Columna", @@ -146,12 +151,12 @@ DlgBtnClose : "Cerrar", DlgBtnBrowseServer : "Ver Servidor", DlgAdvancedTag : "Avanzado", -DlgOpOther : "<Otro>", +DlgOpOther : "", DlgInfoTab : "Informaci??n", DlgAlertUrl : "Inserte el URL", // General Dialogs Labels -DlgGenNotSet : "<No definido>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "Orientaci??n de idioma", DlgGenLangDirLtr : "Izquierda a Derecha (LTR)", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "Referencia en esta p??gina", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "Protocolo", -DlgLnkProtoOther : "<otro>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "Seleccionar una referencia", DlgLnkAnchorByName : "Por Nombre de Referencia", DlgLnkAnchorById : "Por ID de elemento", -DlgLnkNoAnchors : "<No hay referencias disponibles en el documento>", +DlgLnkNoAnchors : "", DlgLnkEMail : "Direcci??n de E-Mail", DlgLnkEMailSubject : "T??tulo del Mensaje", DlgLnkEMailBody : "Cuerpo del Mensaje", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "Enviar al Servidor", DlgLnkTarget : "Destino", -DlgLnkTargetFrame : "<marco>", -DlgLnkTargetPopup : "<ventana emergente>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Nueva Ventana(_blank)", DlgLnkTargetParent : "Ventana Padre (_parent)", DlgLnkTargetSelf : "Misma Ventana (_self)", @@ -337,8 +342,7 @@ DlgPasteMsg2 : "Por favor pegue dentro del cuadro utilizando el teclado (Ctrl+V); luego presione OK.", DlgPasteIgnoreFont : "Ignorar definiciones de fuentes", DlgPasteRemoveStyles : "Remover definiciones de estilo", -DlgPasteCleanBox : "Clean Up Box", - +DlgPasteCleanBox : "Clean Up Box", //MISSING // Color Picker ColorAutomatic : "Autom??tico", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "Acerca de", DlgAboutBrowserInfoTab : "Informaci??n de Navegador", +DlgAboutLicenseTab : "License", //MISSING DlgAboutVersion : "versi??n", DlgAboutLicense : "Licenciado bajo los t??rminos de GNU Lesser General Public License", DlgAboutInfo : "Para mayor informaci??n por favor dirigirse a" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/et.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/et.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/et.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -15,6 +15,7 @@ * * File Authors: * Kristjan Kivikangur (kristjan at ttrk.ee) + * Gustav Kaskema */ var FCKLang = @@ -40,24 +41,24 @@ InsertLinkLbl : "Link", InsertLink : "Sisesta/Muuda link", RemoveLink : "Eemalda link", -Anchor : "Insert/Edit Anchor", //MISSING +Anchor : "Sisesta/Muuda ankur", InsertImageLbl : "Pilt", InsertImage : "Sisesta/Muuda pilt", -InsertFlashLbl : "Flash", //MISSING -InsertFlash : "Insert/Edit Flash", //MISSING +InsertFlashLbl : "Flash", +InsertFlash : "Sisesta/Muuda flash", InsertTableLbl : "Tabel", InsertTable : "Sisesta/Muuda tabel", InsertLineLbl : "Joon", InsertLine : "Sisesta horisontaaljoon", InsertSpecialCharLbl: "Erim??rgid", InsertSpecialChar : "Sisesta erim??rk", -InsertSmileyLbl : "Smiley", -InsertSmiley : "Sisesta Smiley", -About : "FCKeditor kohta", -Bold : "Paks", -Italic : "Kursiiv", -Underline : "Allajoonitud", -StrikeThrough : "L??bijoonitud", +InsertSmileyLbl : "Emotikon", +InsertSmiley : "Sisesta emotikon", +About : "FCKeditor teave", +Bold : "Rasvane kiri", +Italic : "Kursiiv kiri", +Underline : "Allajoonitud kiri", +StrikeThrough : "L??bijoonitud kiri", Subscript : "Allindeks", Superscript : "??laindeks", LeftJustify : "Vasakjoondus", @@ -67,39 +68,44 @@ DecreaseIndent : "V??henda taanet", IncreaseIndent : "Suurenda taanet", Undo : "V??ta tagasi", -Redo : "Tee uuesti", +Redo : "Korda toimingut", NumberedListLbl : "Nummerdatud loetelu", NumberedList : "Sisesta/Eemalda nummerdatud loetelu", -BulletedListLbl : "T??pitud loetelu", -BulletedList : "Sisesta/Eemalda t??pitud loetelu", -ShowTableBorders : "N??ita tabeli jooni", +BulletedListLbl : "Punktiseeritud loetelu", +BulletedList : "Sisesta/Eemalda punktiseeritud loetelu", +ShowTableBorders : "N??ita tabeli jooni", ShowDetails : "N??ita ??ksikasju", Style : "Laad", FontFormat : "Vorming", -Font : "Font", +Font : "Kiri", FontSize : "Suurus", TextColor : "Teksti v??rv", BGColor : "Tausta v??rv", Source : "L??htekood", Find : "Otsi", Replace : "Asenda", -SpellCheck : "Check Spell", //MISSING -UniversalKeyboard : "Universal Keyboard", //MISSING -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING - -Form : "Form", //MISSING -Checkbox : "Checkbox", //MISSING -RadioButton : "Radio Button", //MISSING -TextField : "Text Field", //MISSING -Textarea : "Textarea", //MISSING -HiddenField : "Hidden Field", //MISSING -Button : "Button", //MISSING -SelectionField : "Selection Field", //MISSING -ImageButton : "Image Button", //MISSING +SpellCheck : "Kontrolli ??igekirja", +UniversalKeyboard : "Universaalne klaviatuur", +PageBreakLbl : "Lehepiir", +PageBreak : "Sisesta lehevahetus koht", + +Form : "Vorm", +Checkbox : "M??rkeruut", +RadioButton : "Raadionupp", +TextField : "Tekstilahter", +Textarea : "Tekstiala", +HiddenField : "Varjatud lahter", +Button : "Nupp", +SelectionField : "Valiklahter", +ImageButton : "Piltnupp", + +FitWindow : "Maksimeeri redaktori m????tmed", // Context Menu EditLink : "Muuda linki", +CellCM : "Lahter", +RowCM : "Rida", +ColumnCM : "Veerg", InsertRow : "Lisa rida", DeleteRows : "Eemalda ridu", InsertColumn : "Lisa veerg", @@ -108,22 +114,22 @@ DeleteCells : "Eemalda lahtrid", MergeCells : "??henda lahtrid", SplitCell : "Lahuta lahtrid", -TableDelete : "Delete Table", //MISSING +TableDelete : "Kustuta tabel", CellProperties : "Lahtri atribuudid", TableProperties : "Tabeli atribuudid", ImageProperties : "Pildi atribuudid", -FlashProperties : "Flash Properties", //MISSING - -AnchorProp : "Anchor Properties", //MISSING -ButtonProp : "Button Properties", //MISSING -CheckboxProp : "Checkbox Properties", //MISSING -HiddenFieldProp : "Hidden Field Properties", //MISSING -RadioButtonProp : "Radio Button Properties", //MISSING -ImageButtonProp : "Image Button Properties", //MISSING -TextFieldProp : "Text Field Properties", //MISSING -SelectionFieldProp : "Selection Field Properties", //MISSING -TextareaProp : "Textarea Properties", //MISSING -FormProp : "Form Properties", //MISSING +FlashProperties : "Flash omadused", + +AnchorProp : "Ankru omadused", +ButtonProp : "Nupu omadused", +CheckboxProp : "M??rkeruudu omadused", +HiddenFieldProp : "Varjatud lahtri omadused", +RadioButtonProp : "Raadionupu omadused", +ImageButtonProp : "Piltnupu omadused", +TextFieldProp : "Tekstilahtri omadused", +SelectionFieldProp : "Valiklahtri omadused", +TextareaProp : "Tekstiala omadused", +FormProp : "Vormi omadused", FontFormats : "Tavaline;Vormindatud;Aadress;Pealkiri 1;Pealkiri 2;Pealkiri 3;Pealkiri 4;Pealkiri 5;Pealkiri 6", @@ -131,27 +137,27 @@ ProcessingXHTML : "T????tlen XHTML. Palun oota...", Done : "Tehtud", PasteWordConfirm : "Tekst, mida soovid lisada paistab p??rinevat Wordist. Kas soovid seda enne kleepimist puhastada?", -NotCompatiblePaste : "See k??sk on saadaval ainult Internet Explorer versioon 5.5 v??i rohkem puhul. Kas soovid kleepida ilma puhastamata?", +NotCompatiblePaste : "See k??sk on saadaval ainult Internet Explorer versioon 5.5 v??i uuema puhul. Kas soovid kleepida ilma puhastamata?", UnknownToolbarItem : "Tundmatu t????riistariba ??ksus \"%1\"", UnknownCommand : "Tundmatu k??sunimi \"%1\"", NotImplemented : "K??sku ei t??idetud", UnknownToolbarSet : "T????riistariba \"%1\" ei eksisteeri", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING +NoActiveX : "Sinu interneti sirvija turvalisuse seaded v??ivad limiteerida m??ningaid tekstirdaktori kasutus v??imalusi. Sa peaksid v??imaldama valiku \"Run ActiveX controls and plug-ins\" oma sirvija seadetes. Muidu v??id sa t??heldada vigu tekstiredaktori t????s ja m??rgata puuduvaid funktsioone.", +BrowseServerBlocked : "Ressursside sirvija avamine eba??nnestus. V??imalda pop-up akende avanemine.", +DialogBlocked : "Ei olenud v??imalik avada dialoogi akent. V??imalda pop-up akende avanemine.", // Dialogs DlgBtnOK : "OK", DlgBtnCancel : "Loobu", -DlgBtnClose : "Sule", -DlgBtnBrowseServer : "Browse Server", //MISSING +DlgBtnClose : "Sulge", +DlgBtnBrowseServer : "Sirvi serverit", DlgAdvancedTag : "T??psemalt", -DlgOpOther : "<Other>", //MISSING -DlgInfoTab : "Info", //MISSING -DlgAlertUrl : "Please insert the URL", //MISSING +DlgOpOther : "", +DlgInfoTab : "Info", +DlgAlertUrl : "Palun sisesta URL", // General Dialogs Labels -DlgGenNotSet : "<m????ramata>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "Keele suund", DlgGenLangDirLtr : "Vasakult paremale (LTR)", @@ -159,18 +165,18 @@ DlgGenLangCode : "Keele kood", DlgGenAccessKey : "Juurdep????su v??ti", DlgGenName : "Nimi", -DlgGenTabIndex : "Tab Index", +DlgGenTabIndex : "Tab indeks", DlgGenLongDescr : "Pikk kirjeldus URL", DlgGenClass : "Stiilistiku klassid", -DlgGenTitle : "Advisory Title", -DlgGenContType : "Advisory Content Type", -DlgGenLinkCharset : "Linked Resource Charset", +DlgGenTitle : "Juhendav tiitel", +DlgGenContType : "Juhendava sisu t????p", +DlgGenLinkCharset : "Lingitud ressurssi m??rgistik", DlgGenStyle : "Laad", // Image Dialog DlgImgTitle : "Pildi atribuudid", DlgImgInfoTab : "Pildi info", -DlgImgBtnUpload : "Saada serverile", +DlgImgBtnUpload : "Saada serverissee", DlgImgURL : "URL", DlgImgUpload : "Lae ??les", DlgImgAlt : "Alternatiivne tekst", @@ -179,8 +185,8 @@ DlgImgLockRatio : "Lukusta kuvasuhe", DlgBtnResetSize : "L??htesta suurus", DlgImgBorder : "Joon", -DlgImgHSpace : "HSpace", -DlgImgVSpace : "VSpace", +DlgImgHSpace : "H. vaheruum", +DlgImgVSpace : "V. vaheruum", DlgImgAlign : "Joondus", DlgImgAlignLeft : "Vasak", DlgImgAlignAbsBottom: "Abs alla", @@ -189,21 +195,21 @@ DlgImgAlignBottom : "Alla", DlgImgAlignMiddle : "Keskele", DlgImgAlignRight : "Paremale", -DlgImgAlignTextTop : "Teksti ??les", +DlgImgAlignTextTop : "Tekstit ??les", DlgImgAlignTop : "??les", DlgImgPreview : "Eelvaade", DlgImgAlertUrl : "Palun kirjuta pildi URL", -DlgImgLinkTab : "Link", //MISSING +DlgImgLinkTab : "Link", // Flash Dialog -DlgFlashTitle : "Flash Properties", //MISSING -DlgFlashChkPlay : "Auto Play", //MISSING -DlgFlashChkLoop : "Loop", //MISSING -DlgFlashChkMenu : "Enable Flash Menu", //MISSING -DlgFlashScale : "Scale", //MISSING -DlgFlashScaleAll : "Show all", //MISSING -DlgFlashScaleNoBorder : "No Border", //MISSING -DlgFlashScaleFit : "Exact Fit", //MISSING +DlgFlashTitle : "Flash omadused", +DlgFlashChkPlay : "Automaatne start ", +DlgFlashChkLoop : "Korduv", +DlgFlashChkMenu : "V??imalda flash men????", +DlgFlashScale : "Mastaap", +DlgFlashScaleAll : "N??ita k??ike", +DlgFlashScaleNoBorder : "????rist ei ole", +DlgFlashScaleFit : "T??pne sobivus", // Link Dialog DlgLnkWindowTitle : "Link", @@ -213,28 +219,28 @@ DlgLnkType : "Lingi t????p", DlgLnkTypeURL : "URL", DlgLnkTypeAnchor : "Ankur sellel lehel", -DlgLnkTypeEMail : "E-Post", +DlgLnkTypeEMail : "E-post", DlgLnkProto : "Protokoll", -DlgLnkProtoOther : "<muu>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "Vali ankur", DlgLnkAnchorByName : "Ankru nime j??rgi", -DlgLnkAnchorById : "Elemendi Id j??rgi", -DlgLnkNoAnchors : "<Selles dokumendis ei ole ankruid>", -DlgLnkEMail : "E-Posti aadress", +DlgLnkAnchorById : "Elemendi id j??rgi", +DlgLnkNoAnchors : "", +DlgLnkEMail : "E-posti aadress", DlgLnkEMailSubject : "S??numi teema", DlgLnkEMailBody : "S??numi tekst", DlgLnkUpload : "Lae ??les", -DlgLnkBtnUpload : "Saada serverile", +DlgLnkBtnUpload : "Saada serverisse", DlgLnkTarget : "Sihtkoht", -DlgLnkTargetFrame : "<raam>", -DlgLnkTargetPopup : "<h??pikaken>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Uus aken (_blank)", DlgLnkTargetParent : "Vanem aken (_parent)", DlgLnkTargetSelf : "Sama aken (_self)", DlgLnkTargetTop : "Pealmine aken (_top)", -DlgLnkTargetFrameName : "Target Frame Name", //MISSING +DlgLnkTargetFrameName : "Sihtm??rk raami nimi", DlgLnkPopWinName : "H??pikakna nimi", DlgLnkPopWinFeat : "H??pikakna omadused", DlgLnkPopResize : "Suurendatav", @@ -261,7 +267,7 @@ DlgColorSelected : "Valitud", // Smiley Dialog -DlgSmileyTitle : "Sisesta Smiley", +DlgSmileyTitle : "Sisesta emotikon", // Special Character Dialog DlgSpecialCharTitle : "Vali erim??rk", @@ -282,8 +288,8 @@ DlgTableHeight : "K??rgus", DlgTableCellSpace : "Lahtri vahe", DlgTableCellPad : "Lahtri t??idis", -DlgTableCaption : "Seletiitel", -DlgTableSummary : "Summary", //MISSING +DlgTableCaption : "Tabeli tiitel", +DlgTableSummary : "Kokkuv??te", // Table Cell Dialog DlgCellTitle : "Lahtri atribuudid", @@ -291,7 +297,7 @@ DlgCellWidthPx : "pikslit", DlgCellWidthPc : "protsenti", DlgCellHeight : "K??rgus", -DlgCellWordWrap : "Murra ridu", +DlgCellWordWrap : "S??na ??lekanne", DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "Jah", DlgCellWordWrapNo : "Ei", @@ -321,160 +327,160 @@ DlgReplaceTitle : "Asenda", DlgReplaceFindLbl : "Leia mida:", DlgReplaceReplaceLbl : "Asenda millega:", -DlgReplaceCaseChk : "Erista suurt??hti", +DlgReplaceCaseChk : "Erista suur- ja v??iket??hti", DlgReplaceReplaceBtn : "Asenda", DlgReplaceReplAllBtn : "Asenda k??ik", -DlgReplaceWordChk : "Otsi terveid s??nu", +DlgReplaceWordChk : "Otsi terviklike s??nu", // Paste Operations / Dialog -PasteErrorPaste : "Sinu brauseri turvaseaded ei luba redaktoril automaatselt kleepida. Palun kasutage selleks klaviatuuri (Ctrl+V).", -PasteErrorCut : "Sinu brauseri turvaseaded ei luba redaktoril automaatselt l??igata. Palun kasutage selleks klaviatuuri (Ctrl+X).", -PasteErrorCopy : "Sinu brauseri turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri (Ctrl+C).", +PasteErrorPaste : "Sinu interneti sirvija turvaseaded ei luba redaktoril automaatselt kleepida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl+V).", +PasteErrorCut : "Sinu interneti sirvija turvaseaded ei luba redaktoril automaatselt l??igata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl+X).", +PasteErrorCopy : "Sinu interneti sirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl+C).", PasteAsText : "Kleebi tavalise tekstina", PasteFromWord : "Kleebi Wordist", -DlgPasteMsg2 : "Please paste inside the following box using the keyboard (Ctrl+V) and hit OK.", //MISSING -DlgPasteIgnoreFont : "Ignore Font Face definitions", //MISSING -DlgPasteRemoveStyles : "Remove Styles definitions", //MISSING -DlgPasteCleanBox : "Clean Up Box", //MISSING - +DlgPasteMsg2 : "Palun kleebi j??rgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (Ctrl+V) ja vajuta seej??rel OK.", +DlgPasteIgnoreFont : "Ignoreeri kirja definitsioone", +DlgPasteRemoveStyles : "Eemalda stiilide definitsioonid", +DlgPasteCleanBox : "Puhasta ??ra kast", // Color Picker ColorAutomatic : "Automaatne", ColorMoreColors : "Rohkem v??rve...", // Document Properties -DocProps : "Document Properties", //MISSING +DocProps : "Dokumendi omadused", // Anchor Dialog -DlgAnchorTitle : "Anchor Properties", //MISSING -DlgAnchorName : "Anchor Name", //MISSING -DlgAnchorErrorName : "Please type the anchor name", //MISSING +DlgAnchorTitle : "Ankru omadused", +DlgAnchorName : "Ankru nimi", +DlgAnchorErrorName : "Palun sisest ankru nimi", // Speller Pages Dialog -DlgSpellNotInDic : "Not in dictionary", //MISSING -DlgSpellChangeTo : "Change to", //MISSING -DlgSpellBtnIgnore : "Ignore", //MISSING -DlgSpellBtnIgnoreAll : "Ignore All", //MISSING -DlgSpellBtnReplace : "Replace", //MISSING -DlgSpellBtnReplaceAll : "Replace All", //MISSING -DlgSpellBtnUndo : "Undo", //MISSING -DlgSpellNoSuggestions : "- No suggestions -", //MISSING -DlgSpellProgress : "Spell check in progress...", //MISSING -DlgSpellNoMispell : "Spell check complete: No misspellings found", //MISSING -DlgSpellNoChanges : "Spell check complete: No words changed", //MISSING -DlgSpellOneChange : "Spell check complete: One word changed", //MISSING -DlgSpellManyChanges : "Spell check complete: %1 words changed", //MISSING - -IeSpellDownload : "Spell checker not installed. Do you want to download it now?", //MISSING +DlgSpellNotInDic : "Puudub s??nastikust", +DlgSpellChangeTo : "Muuda", +DlgSpellBtnIgnore : "Ignoreeri", +DlgSpellBtnIgnoreAll : "Ignoreeri k??iki", +DlgSpellBtnReplace : "Asenda", +DlgSpellBtnReplaceAll : "Asenda k??ik", +DlgSpellBtnUndo : "V??ta tagasi", +DlgSpellNoSuggestions : "- Soovitused puuduvad -", +DlgSpellProgress : "Toimub ??igekirja kontroll...", +DlgSpellNoMispell : "??igekirja kontroll sooritatud: ??igekirjuvigu ei leitud", +DlgSpellNoChanges : "??igekirja kontroll sooritatud: ??htegi s??na ei muudetud", +DlgSpellOneChange : "??igekirja kontroll sooritatud: ??ks s??na muudeti", +DlgSpellManyChanges : "??igekirja kontroll sooritatud: %1 s??na muudetud", + +IeSpellDownload : "??igekirja kontrollija ei ole installeeritud. Soovid sa selle alla laadida?", // Button Dialog -DlgButtonText : "Text (Value)", //MISSING -DlgButtonType : "Type", //MISSING +DlgButtonText : "Tekst (v????rtus)", +DlgButtonType : "T????p", // Checkbox and Radio Button Dialogs -DlgCheckboxName : "Name", //MISSING -DlgCheckboxValue : "Value", //MISSING -DlgCheckboxSelected : "Selected", //MISSING +DlgCheckboxName : "Nimi", +DlgCheckboxValue : "V????rtus", +DlgCheckboxSelected : "Valitud", // Form Dialog -DlgFormName : "Name", //MISSING -DlgFormAction : "Action", //MISSING -DlgFormMethod : "Method", //MISSING +DlgFormName : "Nimi", +DlgFormAction : "Toiming", +DlgFormMethod : "Meetod", // Select Field Dialog -DlgSelectName : "Name", //MISSING -DlgSelectValue : "Value", //MISSING -DlgSelectSize : "Size", //MISSING -DlgSelectLines : "lines", //MISSING -DlgSelectChkMulti : "Allow multiple selections", //MISSING -DlgSelectOpAvail : "Available Options", //MISSING -DlgSelectOpText : "Text", //MISSING -DlgSelectOpValue : "Value", //MISSING -DlgSelectBtnAdd : "Add", //MISSING -DlgSelectBtnModify : "Modify", //MISSING -DlgSelectBtnUp : "Up", //MISSING -DlgSelectBtnDown : "Down", //MISSING -DlgSelectBtnSetValue : "Set as selected value", //MISSING -DlgSelectBtnDelete : "Delete", //MISSING +DlgSelectName : "Nimi", +DlgSelectValue : "V????rtus", +DlgSelectSize : "Suurus", +DlgSelectLines : "ridu", +DlgSelectChkMulti : "V??imalda mitu valikut", +DlgSelectOpAvail : "V??imalikud valikud", +DlgSelectOpText : "Tekst", +DlgSelectOpValue : "V????rtus", +DlgSelectBtnAdd : "Lisa", +DlgSelectBtnModify : "Muuda", +DlgSelectBtnUp : "??les", +DlgSelectBtnDown : "Alla", +DlgSelectBtnSetValue : "Sea valitud olekuna", +DlgSelectBtnDelete : "Kustuta", // Textarea Dialog -DlgTextareaName : "Name", //MISSING -DlgTextareaCols : "Columns", //MISSING -DlgTextareaRows : "Rows", //MISSING +DlgTextareaName : "Nimi", +DlgTextareaCols : "Veerge", +DlgTextareaRows : "Ridu", // Text Field Dialog -DlgTextName : "Name", //MISSING -DlgTextValue : "Value", //MISSING -DlgTextCharWidth : "Character Width", //MISSING -DlgTextMaxChars : "Maximum Characters", //MISSING -DlgTextType : "Type", //MISSING -DlgTextTypeText : "Text", //MISSING -DlgTextTypePass : "Password", //MISSING +DlgTextName : "Nimi", +DlgTextValue : "V????rtus", +DlgTextCharWidth : "Laius (t??hem??rkides)", +DlgTextMaxChars : "Maksimaalselt t??hem??rke", +DlgTextType : "T????p", +DlgTextTypeText : "Tekst", +DlgTextTypePass : "Parool", // Hidden Field Dialog -DlgHiddenName : "Name", //MISSING -DlgHiddenValue : "Value", //MISSING +DlgHiddenName : "Nimi", +DlgHiddenValue : "V????rtus", // Bulleted List Dialog -BulletedListProp : "Bulleted List Properties", //MISSING -NumberedListProp : "Numbered List Properties", //MISSING -DlgLstType : "Type", //MISSING -DlgLstTypeCircle : "Circle", //MISSING -DlgLstTypeDisc : "Disc", //MISSING -DlgLstTypeSquare : "Square", //MISSING -DlgLstTypeNumbers : "Numbers (1, 2, 3)", //MISSING -DlgLstTypeLCase : "Lowercase Letters (a, b, c)", //MISSING -DlgLstTypeUCase : "Uppercase Letters (A, B, C)", //MISSING -DlgLstTypeSRoman : "Small Roman Numerals (i, ii, iii)", //MISSING -DlgLstTypeLRoman : "Large Roman Numerals (I, II, III)", //MISSING +BulletedListProp : "T??pitud loetelu omadused", +NumberedListProp : "Nummerdatud loetelu omadused", +DlgLstType : "T????p", +DlgLstTypeCircle : "Ring", +DlgLstTypeDisc : "Ketas", +DlgLstTypeSquare : "Ruut", +DlgLstTypeNumbers : "Numbrid (1, 2, 3)", +DlgLstTypeLCase : "V??iket??hed (a, b, c)", +DlgLstTypeUCase : "Suurt??hed (A, B, C)", +DlgLstTypeSRoman : "V??iksed Rooma numbrid (i, ii, iii)", +DlgLstTypeLRoman : "Suured Rooma numbrid (I, II, III)", // Document Properties Dialog -DlgDocGeneralTab : "General", //MISSING -DlgDocBackTab : "Background", //MISSING -DlgDocColorsTab : "Colors and Margins", //MISSING -DlgDocMetaTab : "Meta Data", //MISSING - -DlgDocPageTitle : "Page Title", //MISSING -DlgDocLangDir : "Language Direction", //MISSING -DlgDocLangDirLTR : "Left to Right (LTR)", //MISSING -DlgDocLangDirRTL : "Right to Left (RTL)", //MISSING -DlgDocLangCode : "Language Code", //MISSING -DlgDocCharSet : "Character Set Encoding", //MISSING -DlgDocCharSetOther : "Other Character Set Encoding", //MISSING - -DlgDocDocType : "Document Type Heading", //MISSING -DlgDocDocTypeOther : "Other Document Type Heading", //MISSING -DlgDocIncXHTML : "Include XHTML Declarations", //MISSING -DlgDocBgColor : "Background Color", //MISSING -DlgDocBgImage : "Background Image URL", //MISSING -DlgDocBgNoScroll : "Nonscrolling Background", //MISSING -DlgDocCText : "Text", //MISSING -DlgDocCLink : "Link", //MISSING -DlgDocCVisited : "Visited Link", //MISSING -DlgDocCActive : "Active Link", //MISSING -DlgDocMargins : "Page Margins", //MISSING -DlgDocMaTop : "Top", //MISSING -DlgDocMaLeft : "Left", //MISSING -DlgDocMaRight : "Right", //MISSING -DlgDocMaBottom : "Bottom", //MISSING -DlgDocMeIndex : "Document Indexing Keywords (comma separated)", //MISSING -DlgDocMeDescr : "Document Description", //MISSING -DlgDocMeAuthor : "Author", //MISSING -DlgDocMeCopy : "Copyright", //MISSING -DlgDocPreview : "Preview", //MISSING +DlgDocGeneralTab : "??ldine", +DlgDocBackTab : "Taust", +DlgDocColorsTab : "V??rvid ja veerised", +DlgDocMetaTab : "Meta andmed", + +DlgDocPageTitle : "Lehek??lje tiitel", +DlgDocLangDir : "Kirja suund", +DlgDocLangDirLTR : "Vasakult paremale (LTR)", +DlgDocLangDirRTL : "Paremalt vasakule (RTL)", +DlgDocLangCode : "Keele kood", +DlgDocCharSet : "M??rgistiku kodeering", +DlgDocCharSetOther : "??lej????nud m??rgistike kodeeringud", + +DlgDocDocType : "Dokumendi t????pp??is", +DlgDocDocTypeOther : "Teised dokumendi t????pp??ised", +DlgDocIncXHTML : "Arva kaasa XHTML deklaratsioonid", +DlgDocBgColor : "Taustav??rv", +DlgDocBgImage : "Taustapildi URL", +DlgDocBgNoScroll : "Mittekeritav tagataust", +DlgDocCText : "Tekst", +DlgDocCLink : "Link", +DlgDocCVisited : "K??lastatud link", +DlgDocCActive : "Aktiivne link", +DlgDocMargins : "Lehek??lje ????rised", +DlgDocMaTop : "??laserv", +DlgDocMaLeft : "Vasakserv", +DlgDocMaRight : "Paremserv", +DlgDocMaBottom : "Alaserv", +DlgDocMeIndex : "Dokumendi v??tmes??nad (eraldatud komadega)", +DlgDocMeDescr : "Dokumendi kirjeldus", +DlgDocMeAuthor : "Autor", +DlgDocMeCopy : "Autori??igus", +DlgDocPreview : "Eelvaade", // Templates Dialog -Templates : "Templates", //MISSING -DlgTemplatesTitle : "Content Templates", //MISSING -DlgTemplatesSelMsg : "Please select the template to open in the editor
      (the actual contents will be lost):", //MISSING -DlgTemplatesLoading : "Loading templates list. Please wait...", //MISSING -DlgTemplatesNoTpl : "(No templates defined)", //MISSING +Templates : "??abloon", +DlgTemplatesTitle : "Sisu ??abloonid", +DlgTemplatesSelMsg : "Palun vali ??abloon, et avada see redaktoris
      (praegune sisu l??heb kaotsi):", +DlgTemplatesLoading : "Laen ??abloonide nimekirja. Palun oota...", +DlgTemplatesNoTpl : "(??htegi ??ablooni ei ole defineeritud)", // About Dialog -DlgAboutAboutTab : "About", //MISSING -DlgAboutBrowserInfoTab : "Browser Info", //MISSING +DlgAboutAboutTab : "Teave", +DlgAboutBrowserInfoTab : "Interneti sirvija info", +DlgAboutLicenseTab : "Litsents", DlgAboutVersion : "versioon", DlgAboutLicense : "Litsenseeritud GNU Lesser General Public License litsentsiga", DlgAboutInfo : "T??psema info saamiseks mine" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/eu.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/eu.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/eu.js Wed Jul 12 07:45:05 2006 @@ -1,482 +1,487 @@ -???/* - * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben - * - * Licensed under the terms of the GNU Lesser General Public License: - * http://www.opensource.org/licenses/lgpl-license.php - * - * For further information visit: - * http://www.fckeditor.net/ - * - * "Support Open Source software. What about a donation today?" - * - * File Name: eu.js - * Basque language file. - * Euskara hizkuntza fitxategia. - * - * File Authors: - * Ibon Igartua (Librezale.org) - */ - -var FCKLang = -{ -// Language direction : "ltr" (left to right) or "rtl" (right to left). -Dir : "ltr", - -ToolbarCollapse : "Estutu Tresna Barra", -ToolbarExpand : "Hedatu Tresna Barra", - -// Toolbar Items and Context Menu -Save : "Gorde", -NewPage : "Orrialde Berria", -Preview : "Aurrebista", -Cut : "Ebaki", -Copy : "Kopiatu", -Paste : "Itsatsi", -PasteText : "Itsatsi testu bezala", -PasteWord : "Itsatsi Word-etik", -Print : "Inprimatu", -SelectAll : "Hautatu dena", -RemoveFormat : "Kendu Formatoa", -InsertLinkLbl : "Esteka", -InsertLink : "Txertatu/Editatu Esteka", -RemoveLink : "Kendu Esteka", -Anchor : "Aingura", -InsertImageLbl : "Irudia", -InsertImage : "Txertatu/Editatu Irudia", -InsertFlashLbl : "Flasha", -InsertFlash : "Txertatu/Editatu Flasha", -InsertTableLbl : "Taula", -InsertTable : "Txertatu/Editatu Taula", -InsertLineLbl : "Lerroa", -InsertLine : "Txertatu Marra Horizontala", -InsertSpecialCharLbl: "Karaktere Berezia", -InsertSpecialChar : "Txertatu Karaktere Berezia", -InsertSmileyLbl : "Aurpegierak", -InsertSmiley : "Txertatu Aurpegierak", -About : "FCKeditor-ri buruz", -Bold : "Lodia", -Italic : "Etzana", -Underline : "Azpimarratu", -StrikeThrough : "Marratua", -Subscript : "Azpi-indize", -Superscript : "Goi-indize", -LeftJustify : "Lerrokatu Ezkerrean", -CenterJustify : "Lerrokatu Erdian", -RightJustify : "Lerrokatu Eskuman", -BlockJustify : "Justifikatu", -DecreaseIndent : "Txikitu Koska", -IncreaseIndent : "Handitu Koska", -Undo : "Desegin", -Redo : "Berregin", -NumberedListLbl : "Zenbakidun Zerrenda", -NumberedList : "Txertatu/Kendu Zenbakidun zerrenda", -BulletedListLbl : "Buletdun Zerrenda", -BulletedList : "Txertatu/Kendu Buletdun zerrenda", -ShowTableBorders : "Erakutsi Taularen Ertzak", -ShowDetails : "Erakutsi Xehetasunak", -Style : "Estiloa", -FontFormat : "Formatoa", -Font : "Letra-tipoa", -FontSize : "Tamaina", -TextColor : "Testu Kolorea", -BGColor : "Atzeko kolorea", -Source : "HTML Iturburua", -Find : "Bilatu", -Replace : "Ordezkatu", -SpellCheck : "Ortografia", -UniversalKeyboard : "Teklatu Unibertsala", -PageBreakLbl : "Orrialde-jauzia", -PageBreak : "Txertatu Orrialde-jauzia", - -Form : "Formularioa", -Checkbox : "Kontrol-laukia", -RadioButton : "Aukera-botoia", -TextField : "Testu Eremua", -Textarea : "Testu-area", -HiddenField : "Ezkutuko Eremua", -Button : "Botoia", -SelectionField : "Hautespen Eremua", -ImageButton : "Irudi Botoia", - -// Context Menu -EditLink : "Aldatu Esteka", -InsertRow : "Txertatu Errenkada", -DeleteRows : "Ezabatu Errenkadak", -InsertColumn : "Txertatu Zutabea", -DeleteColumns : "Ezabatu Zutabeak", -InsertCell : "Txertatu Gelaxka", -DeleteCells : "Kendu Gelaxkak", -MergeCells : "Batu Gelaxkak", -SplitCell : "Zatitu Gelaxka", -TableDelete : "Ezabatu Taula", -CellProperties : "Gelaxkaren Ezaugarriak", -TableProperties : "Taularen Ezaugarriak", -ImageProperties : "Irudiaren Ezaugarriak", -FlashProperties : "Flasharen Ezaugarriak", - -AnchorProp : "Ainguraren Ezaugarriak", -ButtonProp : "Botoiaren Ezaugarriak", -CheckboxProp : "Kontrol-laukiko Ezaugarriak", -HiddenFieldProp : "Ezkutuko Eremuaren Ezaugarriak", -RadioButtonProp : "Aukera-botoiaren Ezaugarriak", -ImageButtonProp : "Irudi Botoiaren Ezaugarriak", -TextFieldProp : "Testu Eremuaren Ezaugarriak", -SelectionFieldProp : "Hautespen Eremuaren Ezaugarriak", -TextareaProp : "Testu-arearen Ezaugarriak", -FormProp : "Formularioaren Ezaugarriak", - -FontFormats : "Arrunta;Formateatua;Helbidea;Izenburua 1;Izenburua 2;Izenburua 3;Izenburua 4;Izenburua 5;Izenburua 6;Paragrafoa (DIV)", - -// Alerts and Messages -ProcessingXHTML : "XHTML Prozesatzen. Itxaron mesedez...", -Done : "Eginda", -PasteWordConfirm : "Itsatsi nahi duzun textua Wordetik hartua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?", -NotCompatiblePaste : "Komando hau Internet Explorer 5.5 bertsiorako edo ondorengoentzako erabilgarria dago. Garbitu gabe itsatsi nahi duzu?", -UnknownToolbarItem : "Ataza barrako elementu ezezaguna \"%1\"", -UnknownCommand : "Komando izen ezezaguna \"%1\"", -NotImplemented : "Komando ez inplementatua", -UnknownToolbarSet : "Ataza barra \"%1\" taldea ez da existitzen", -NoActiveX : "Zure nabigatzailearen segustasun hobespenak editore honen zenbait ezaugarri mugatu ditzake. \"ActiveX kontrolak eta plug-inak\" aktibatu beharko zenituzke, bestela erroreak eta ezaugarrietan mugak egon daitezke.", -BrowseServerBlocked : "Baliabideen arakatzailea ezin da ireki. Ziurtatu popup blokeatzaileak desgaituta dituzula.", -DialogBlocked : "Ezin da elkarrizketa-leihoa ireki. Ziurtatu popup blokeatzaileak desgaituta dituzula.", - -// Dialogs -DlgBtnOK : "Ados", -DlgBtnCancel : "Utzi", -DlgBtnClose : "Itxi", -DlgBtnBrowseServer : "Zerbitzaria arakatu", -DlgAdvancedTag : "Aurreratua", -DlgOpOther : "<Bestelakoak>", -DlgInfoTab : "Informazioa", -DlgAlertUrl : "Mesedez URLa idatzi ezazu", - -// General Dialogs Labels -DlgGenNotSet : "<Ezarri gabe>", -DlgGenId : "Id", -DlgGenLangDir : "Hizkuntzaren Norabidea", -DlgGenLangDirLtr : "Ezkerretik Eskumara(LTR)", -DlgGenLangDirRtl : "Eskumatik Ezkerrera (RTL)", -DlgGenLangCode : "Hizkuntza Kodea", -DlgGenAccessKey : "Sarbide-gakoa", -DlgGenName : "Izena", -DlgGenTabIndex : "Tabulazio Indizea", -DlgGenLongDescr : "URL Deskribapen Luzea", -DlgGenClass : "Estilo-orriko Klaseak", -DlgGenTitle : "Izenburua", -DlgGenContType : "Eduki Mota (Content Type)", -DlgGenLinkCharset : "Estekatutako Karaktere Multzoa", -DlgGenStyle : "Estiloa", - -// Image Dialog -DlgImgTitle : "Irudi Ezaugarriak", -DlgImgInfoTab : "Irudi informazioa", -DlgImgBtnUpload : "Zerbitzarira bidalia", -DlgImgURL : "URL", -DlgImgUpload : "Gora Kargatu", -DlgImgAlt : "Textu Alternatiboa", -DlgImgWidth : "Zabalera", -DlgImgHeight : "Altuera", -DlgImgLockRatio : "Erlazioa Blokeatu", -DlgBtnResetSize : "Tamaina Berrezarri", -DlgImgBorder : "Ertza", -DlgImgHSpace : "HSpace", -DlgImgVSpace : "VSpace", -DlgImgAlign : "Lerrokatu", -DlgImgAlignLeft : "Ezkerrera", -DlgImgAlignAbsBottom: "Abs Behean", -DlgImgAlignAbsMiddle: "Abs Erdian", -DlgImgAlignBaseline : "Oinan", -DlgImgAlignBottom : "Behean", -DlgImgAlignMiddle : "Erdian", -DlgImgAlignRight : "Eskuman", -DlgImgAlignTextTop : "Testua Goian", -DlgImgAlignTop : "Goian", -DlgImgPreview : "Aurrebista", -DlgImgAlertUrl : "Mesedez Irudiaren URLa idatzi", -DlgImgLinkTab : "Esteka", - -// Flash Dialog -DlgFlashTitle : "Flasharen Ezaugarriak", -DlgFlashChkPlay : "Automatikoki Erreproduzitu", -DlgFlashChkLoop : "Begizta", -DlgFlashChkMenu : "Flasharen Menua Gaitu", -DlgFlashScale : "Eskalatu", -DlgFlashScaleAll : "Dena erakutsi", -DlgFlashScaleNoBorder : "Ertzarik gabe", -DlgFlashScaleFit : "Doitu", - -// Link Dialog -DlgLnkWindowTitle : "Esteka", -DlgLnkInfoTab : "Estekaren Informazioa", -DlgLnkTargetTab : "Helburua", - -DlgLnkType : "Esteka Mota", -DlgLnkTypeURL : "URL", -DlgLnkTypeAnchor : "Aingura horrialde honentan", -DlgLnkTypeEMail : "ePosta", -DlgLnkProto : "Protokoloa", -DlgLnkProtoOther : "<Beste batzuk>", -DlgLnkURL : "URL", -DlgLnkAnchorSel : "Aingura bat hautatu", -DlgLnkAnchorByName : "Aingura izenagatik", -DlgLnkAnchorById : "Elementuaren ID-gatik", -DlgLnkNoAnchors : "<Ez daude aingurak eskuragarri dokumentuan>", -DlgLnkEMail : "ePosta Helbidea", -DlgLnkEMailSubject : "Mezuaren Gaia", -DlgLnkEMailBody : "Mezuaren Gorputza", -DlgLnkUpload : "Gora kargatu", -DlgLnkBtnUpload : "Zerbitzarira bidali", - -DlgLnkTarget : "Target (Helburua)", -DlgLnkTargetFrame : "<marko>", -DlgLnkTargetPopup : "<popup lehioa>", -DlgLnkTargetBlank : "Lehio Berria (_blank)", -DlgLnkTargetParent : "Lehio Gurasoa (_parent)", -DlgLnkTargetSelf : "Lehio Berdina (_self)", -DlgLnkTargetTop : "Goiko Lehioa (_top)", -DlgLnkTargetFrameName : "Marko Helburuaren Izena", -DlgLnkPopWinName : "Popup Lehioaren Izena", -DlgLnkPopWinFeat : "Popup Lehioaren Ezaugarriak", -DlgLnkPopResize : "Tamaina Aldakorra", -DlgLnkPopLocation : "Kokaleku Barra", -DlgLnkPopMenu : "Menu Barra", -DlgLnkPopScroll : "Korritze Barrak", -DlgLnkPopStatus : "Egoera Barra", -DlgLnkPopToolbar : "Tresna Barra", -DlgLnkPopFullScrn : "Pantaila Osoa (IE)", -DlgLnkPopDependent : "Menpekoa (Netscape)", -DlgLnkPopWidth : "Zabalera", -DlgLnkPopHeight : "Altuera", -DlgLnkPopLeft : "Ezkerreko Posizioa", -DlgLnkPopTop : "Goiko Posizioa", - -DlnLnkMsgNoUrl : "Mesedez URL esteka idatzi", -DlnLnkMsgNoEMail : "Mesedez ePosta helbidea idatzi", -DlnLnkMsgNoAnchor : "Mesedez aingura bat aukeratu", - -// Color Dialog -DlgColorTitle : "Kolore Aukeraketa", -DlgColorBtnClear : "Garbitu", -DlgColorHighlight : "Nabarmendu", -DlgColorSelected : "Aukeratuta", - -// Smiley Dialog -DlgSmileyTitle : "Aurpegiera Sartu", - -// Special Character Dialog -DlgSpecialCharTitle : "Karaktere Berezia Aukeratu", - -// Table Dialog -DlgTableTitle : "Taularen Ezaugarriak", -DlgTableRows : "Lerroak", -DlgTableColumns : "Zutabeak", -DlgTableBorder : "Ertzaren Zabalera", -DlgTableAlign : "Lerrokatu", -DlgTableAlignNotSet : "", -DlgTableAlignLeft : "Ezkerrean", -DlgTableAlignCenter : "Erdian", -DlgTableAlignRight : "Eskuman", -DlgTableWidth : "Zabalera", -DlgTableWidthPx : "pixel", -DlgTableWidthPc : "ehuneko", -DlgTableHeight : "Altuera", -DlgTableCellSpace : "Gelaxka arteko tartea", -DlgTableCellPad : "Gelaxken betegarria", -DlgTableCaption : "Epigrafea", -DlgTableSummary : "Laburpena", - -// Table Cell Dialog -DlgCellTitle : "Gelaxken Ezaugarriak", -DlgCellWidth : "Zabalera", -DlgCellWidthPx : "pixel", -DlgCellWidthPc : "ehuneko", -DlgCellHeight : "Altuera", -DlgCellWordWrap : "Itzulbira", -DlgCellWordWrapNotSet : "<Ezarri gabe>", -DlgCellWordWrapYes : "Bai", -DlgCellWordWrapNo : "Ez", -DlgCellHorAlign : "Horizontal Alignment", -DlgCellHorAlignNotSet : "<Ezarri gabe>", -DlgCellHorAlignLeft : "Ezkerrean", -DlgCellHorAlignCenter : "Erdian", -DlgCellHorAlignRight: "Eskuman", -DlgCellVerAlign : "Lerrokatu Bertikalki", -DlgCellVerAlignNotSet : "<Ezarri gabe>", -DlgCellVerAlignTop : "Goian", -DlgCellVerAlignMiddle : "Erdian", -DlgCellVerAlignBottom : "Behean", -DlgCellVerAlignBaseline : "Oinan", -DlgCellRowSpan : "Lerroak Hedatu", -DlgCellCollSpan : "Zutabeak Hedatu", -DlgCellBackColor : "Atzeko Kolorea", -DlgCellBorderColor : "Ertzako Kolorea", -DlgCellBtnSelect : "Aukertau...", - -// Find Dialog -DlgFindTitle : "Bilaketa", -DlgFindFindBtn : "Bilatu", -DlgFindNotFoundMsg : "Idatzitako testua ez da topatu.", - -// Replace Dialog -DlgReplaceTitle : "Ordeztu", -DlgReplaceFindLbl : "Zer bilatu:", -DlgReplaceReplaceLbl : "Zerekin ordeztu:", -DlgReplaceCaseChk : "Maiuskula/minuskula", -DlgReplaceReplaceBtn : "Ordeztu", -DlgReplaceReplAllBtn : "Ordeztu Guztiak", -DlgReplaceWordChk : "Esaldi osoa bilatu", - -// Paste Operations / Dialog -PasteErrorPaste : "Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki itsastea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl+V).", -PasteErrorCut : "Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki moztea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl+X).", -PasteErrorCopy : "Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki kopiatzea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl+C).", - -PasteAsText : "Testu Arrunta bezala Itsatsi", -PasteFromWord : "Word-etik itsatsi", - -DlgPasteMsg2 : "Mesedez teklatua erabilita (Ctrl+V) ondorego eremuan testua itsatsi eta OK sakatu.", -DlgPasteIgnoreFont : "Letra Motaren definizioa ezikusi", -DlgPasteRemoveStyles : "Estilo definizioak kendu", -DlgPasteCleanBox : "Testu-eremua Garbitu", - - -// Color Picker -ColorAutomatic : "Automatikoa", -ColorMoreColors : "Kolore gehiago...", - -// Document Properties -DocProps : "Dokumentuaren Ezarpenak", - -// Anchor Dialog -DlgAnchorTitle : "Ainguraren Ezaugarriak", -DlgAnchorName : "Ainguraren Izena", -DlgAnchorErrorName : "Idatzi ainguraren izena", - -// Speller Pages Dialog -DlgSpellNotInDic : "Ez dago hiztegian", -DlgSpellChangeTo : "Honekin ordezkatu", -DlgSpellBtnIgnore : "Ezikusi", -DlgSpellBtnIgnoreAll : "Denak Ezikusi", -DlgSpellBtnReplace : "Ordezkatu", -DlgSpellBtnReplaceAll : "Denak Ordezkatu", -DlgSpellBtnUndo : "Desegin", -DlgSpellNoSuggestions : "- Iradokizunik ez -", -DlgSpellProgress : "Zuzenketa ortografikoa martxan...", -DlgSpellNoMispell : "Zuzenketa ortografikoa bukatuta: Akatsik ez", -DlgSpellNoChanges : "Zuzenketa ortografikoa bukatuta: Ez da ezer aldatu", -DlgSpellOneChange : "Zuzenketa ortografikoa bukatuta: Hitz bat aldatu da", -DlgSpellManyChanges : "Zuzenketa ortografikoa bukatuta: %1 hitz aldatu dira", - -IeSpellDownload : "Zuzentzaile ortografikoa ez dago instalatuta. Deskargatu nahi duzu?", - -// Button Dialog -DlgButtonText : "Testua (Balorea)", -DlgButtonType : "Mota", - -// Checkbox and Radio Button Dialogs -DlgCheckboxName : "Izena", -DlgCheckboxValue : "Balorea", -DlgCheckboxSelected : "Hautatuta", - -// Form Dialog -DlgFormName : "Izena", -DlgFormAction : "Ekintza", -DlgFormMethod : "Method", - -// Select Field Dialog -DlgSelectName : "Izena", -DlgSelectValue : "Balorea", -DlgSelectSize : "Tamaina", -DlgSelectLines : "lerro kopurura", -DlgSelectChkMulti : "Hautaketa anitzak baimendu", -DlgSelectOpAvail : "Aukera Eskuragarriak", -DlgSelectOpText : "Testua", -DlgSelectOpValue : "Balorea", -DlgSelectBtnAdd : "Gehitu", -DlgSelectBtnModify : "Aldatu", -DlgSelectBtnUp : "Gora", -DlgSelectBtnDown : "Behera", -DlgSelectBtnSetValue : "Aukeratutako balorea ezarri", -DlgSelectBtnDelete : "Ezabatu", - -// Textarea Dialog -DlgTextareaName : "Izena", -DlgTextareaCols : "Zutabeak", -DlgTextareaRows : "Lerroak", - -// Text Field Dialog -DlgTextName : "Izena", -DlgTextValue : "Balorea", -DlgTextCharWidth : "Zabalera", -DlgTextMaxChars : "Zenbat karaktere gehienez", -DlgTextType : "Mota", -DlgTextTypeText : "Testua", -DlgTextTypePass : "Pasahitza", - -// Hidden Field Dialog -DlgHiddenName : "Izena", -DlgHiddenValue : "Balorea", - -// Bulleted List Dialog -BulletedListProp : "Buletdun Zerrendaren Ezarpenak", -NumberedListProp : "Zenbakidun Zerrendaren Ezarpenak", -DlgLstType : "Mota", -DlgLstTypeCircle : "Zirkulua", -DlgLstTypeDisc : "Diskoa", -DlgLstTypeSquare : "Karratua", -DlgLstTypeNumbers : "Zenbakiak (1, 2, 3)", -DlgLstTypeLCase : "Letra xeheak (a, b, c)", -DlgLstTypeUCase : "Letra larriak (A, B, C)", -DlgLstTypeSRoman : "Erromatar zenbaki zeheak (i, ii, iii)", -DlgLstTypeLRoman : "Erromatar zenbaki larriak (I, II, III)", - -// Document Properties Dialog -DlgDocGeneralTab : "Orokorra", -DlgDocBackTab : "Atzekaldea", -DlgDocColorsTab : "Koloreak eta Marjinak", -DlgDocMetaTab : "Meta Informazioa", - -DlgDocPageTitle : "Orriaren Izenburua", -DlgDocLangDir : "Hizkuntzaren Norabidea", -DlgDocLangDirLTR : "Ezkerretik eskumara (LTR)", -DlgDocLangDirRTL : "Eskumatik ezkerrera (RTL)", -DlgDocLangCode : "Hizkuntzaren Kodea", -DlgDocCharSet : "Karaktere Multzoaren Kodeketa", -DlgDocCharSetOther : "Beste Karaktere Multzoaren Kodeketa", - -DlgDocDocType : "Document Type Goiburua", -DlgDocDocTypeOther : "Beste Document Type Goiburua", -DlgDocIncXHTML : "XHTML Ezarpenak", -DlgDocBgColor : "Atzeko Kolorea", -DlgDocBgImage : "Atzeko Irudiaren URL-a", -DlgDocBgNoScroll : "Korritze gabeko Atzekaldea", -DlgDocCText : "Testua", -DlgDocCLink : "Estekak", -DlgDocCVisited : "Bisitatutako Estekak", -DlgDocCActive : "Esteka Aktiboa", -DlgDocMargins : "Orrialdearen marjinak", -DlgDocMaTop : "Goian", -DlgDocMaLeft : "Ezkerrean", -DlgDocMaRight : "Eskuman", -DlgDocMaBottom : "Behean", -DlgDocMeIndex : "Dokumentuaren Gako-hitzak (komarekin bananduta)", -DlgDocMeDescr : "Dokumentuaren Deskribapena", -DlgDocMeAuthor : "Egilea", -DlgDocMeCopy : "Copyright", -DlgDocPreview : "Aurrebista", - -// Templates Dialog -Templates : "Txantiloiak", -DlgTemplatesTitle : "Eduki Txantiloiak", -DlgTemplatesSelMsg : "Mesedez txantiloia aukeratu editorean kargatzeko
      (orain dauden edukiak galduko dira):", -DlgTemplatesLoading : "Txantiloiak kargatzen. Itxaron mesedez...", -DlgTemplatesNoTpl : "(Ez dago definitutako txantiloirik)", - -// About Dialog -DlgAboutAboutTab : "Honi buruz", -DlgAboutBrowserInfoTab : "Nabigatzailearen Informazioa", -DlgAboutVersion : "bertsioa", -DlgAboutLicense : "GNU Lesser General Public License Lizentziapean", -DlgAboutInfo : "Informazio gehiago eskuratzeko hona joan" +???/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2006 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * "Support Open Source software. What about a donation today?" + * + * File Name: eu.js + * Basque language file. + * Euskara hizkuntza fitxategia. + * + * File Authors: + * Ibon Igartua (Librezale.org) + */ + +var FCKLang = +{ +// Language direction : "ltr" (left to right) or "rtl" (right to left). +Dir : "ltr", + +ToolbarCollapse : "Estutu Tresna Barra", +ToolbarExpand : "Hedatu Tresna Barra", + +// Toolbar Items and Context Menu +Save : "Gorde", +NewPage : "Orrialde Berria", +Preview : "Aurrebista", +Cut : "Ebaki", +Copy : "Kopiatu", +Paste : "Itsatsi", +PasteText : "Itsatsi testu bezala", +PasteWord : "Itsatsi Word-etik", +Print : "Inprimatu", +SelectAll : "Hautatu dena", +RemoveFormat : "Kendu Formatoa", +InsertLinkLbl : "Esteka", +InsertLink : "Txertatu/Editatu Esteka", +RemoveLink : "Kendu Esteka", +Anchor : "Aingura", +InsertImageLbl : "Irudia", +InsertImage : "Txertatu/Editatu Irudia", +InsertFlashLbl : "Flasha", +InsertFlash : "Txertatu/Editatu Flasha", +InsertTableLbl : "Taula", +InsertTable : "Txertatu/Editatu Taula", +InsertLineLbl : "Lerroa", +InsertLine : "Txertatu Marra Horizontala", +InsertSpecialCharLbl: "Karaktere Berezia", +InsertSpecialChar : "Txertatu Karaktere Berezia", +InsertSmileyLbl : "Aurpegierak", +InsertSmiley : "Txertatu Aurpegierak", +About : "FCKeditor-ri buruz", +Bold : "Lodia", +Italic : "Etzana", +Underline : "Azpimarratu", +StrikeThrough : "Marratua", +Subscript : "Azpi-indize", +Superscript : "Goi-indize", +LeftJustify : "Lerrokatu Ezkerrean", +CenterJustify : "Lerrokatu Erdian", +RightJustify : "Lerrokatu Eskuman", +BlockJustify : "Justifikatu", +DecreaseIndent : "Txikitu Koska", +IncreaseIndent : "Handitu Koska", +Undo : "Desegin", +Redo : "Berregin", +NumberedListLbl : "Zenbakidun Zerrenda", +NumberedList : "Txertatu/Kendu Zenbakidun zerrenda", +BulletedListLbl : "Buletdun Zerrenda", +BulletedList : "Txertatu/Kendu Buletdun zerrenda", +ShowTableBorders : "Erakutsi Taularen Ertzak", +ShowDetails : "Erakutsi Xehetasunak", +Style : "Estiloa", +FontFormat : "Formatoa", +Font : "Letra-tipoa", +FontSize : "Tamaina", +TextColor : "Testu Kolorea", +BGColor : "Atzeko kolorea", +Source : "HTML Iturburua", +Find : "Bilatu", +Replace : "Ordezkatu", +SpellCheck : "Ortografia", +UniversalKeyboard : "Teklatu Unibertsala", +PageBreakLbl : "Orrialde-jauzia", +PageBreak : "Txertatu Orrialde-jauzia", + +Form : "Formularioa", +Checkbox : "Kontrol-laukia", +RadioButton : "Aukera-botoia", +TextField : "Testu Eremua", +Textarea : "Testu-area", +HiddenField : "Ezkutuko Eremua", +Button : "Botoia", +SelectionField : "Hautespen Eremua", +ImageButton : "Irudi Botoia", + +FitWindow : "Maximizatu editorearen tamaina", + +// Context Menu +EditLink : "Aldatu Esteka", +CellCM : "Gelaxka", +RowCM : "Errenkada", +ColumnCM : "Zutabea", +InsertRow : "Txertatu Errenkada", +DeleteRows : "Ezabatu Errenkadak", +InsertColumn : "Txertatu Zutabea", +DeleteColumns : "Ezabatu Zutabeak", +InsertCell : "Txertatu Gelaxka", +DeleteCells : "Kendu Gelaxkak", +MergeCells : "Batu Gelaxkak", +SplitCell : "Zatitu Gelaxka", +TableDelete : "Ezabatu Taula", +CellProperties : "Gelaxkaren Ezaugarriak", +TableProperties : "Taularen Ezaugarriak", +ImageProperties : "Irudiaren Ezaugarriak", +FlashProperties : "Flasharen Ezaugarriak", + +AnchorProp : "Ainguraren Ezaugarriak", +ButtonProp : "Botoiaren Ezaugarriak", +CheckboxProp : "Kontrol-laukiko Ezaugarriak", +HiddenFieldProp : "Ezkutuko Eremuaren Ezaugarriak", +RadioButtonProp : "Aukera-botoiaren Ezaugarriak", +ImageButtonProp : "Irudi Botoiaren Ezaugarriak", +TextFieldProp : "Testu Eremuaren Ezaugarriak", +SelectionFieldProp : "Hautespen Eremuaren Ezaugarriak", +TextareaProp : "Testu-arearen Ezaugarriak", +FormProp : "Formularioaren Ezaugarriak", + +FontFormats : "Arrunta;Formateatua;Helbidea;Izenburua 1;Izenburua 2;Izenburua 3;Izenburua 4;Izenburua 5;Izenburua 6;Paragrafoa (DIV)", + +// Alerts and Messages +ProcessingXHTML : "XHTML Prozesatzen. Itxaron mesedez...", +Done : "Eginda", +PasteWordConfirm : "Itsatsi nahi duzun textua Wordetik hartua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?", +NotCompatiblePaste : "Komando hau Internet Explorer 5.5 bertsiorako edo ondorengoentzako erabilgarria dago. Garbitu gabe itsatsi nahi duzu?", +UnknownToolbarItem : "Ataza barrako elementu ezezaguna \"%1\"", +UnknownCommand : "Komando izen ezezaguna \"%1\"", +NotImplemented : "Komando ez inplementatua", +UnknownToolbarSet : "Ataza barra \"%1\" taldea ez da existitzen", +NoActiveX : "Zure nabigatzailearen segustasun hobespenak editore honen zenbait ezaugarri mugatu ditzake. \"ActiveX kontrolak eta plug-inak\" aktibatu beharko zenituzke, bestela erroreak eta ezaugarrietan mugak egon daitezke.", +BrowseServerBlocked : "Baliabideen arakatzailea ezin da ireki. Ziurtatu popup blokeatzaileak desgaituta dituzula.", +DialogBlocked : "Ezin da elkarrizketa-leihoa ireki. Ziurtatu popup blokeatzaileak desgaituta dituzula.", + +// Dialogs +DlgBtnOK : "Ados", +DlgBtnCancel : "Utzi", +DlgBtnClose : "Itxi", +DlgBtnBrowseServer : "Zerbitzaria arakatu", +DlgAdvancedTag : "Aurreratua", +DlgOpOther : "", +DlgInfoTab : "Informazioa", +DlgAlertUrl : "Mesedez URLa idatzi ezazu", + +// General Dialogs Labels +DlgGenNotSet : "", +DlgGenId : "Id", +DlgGenLangDir : "Hizkuntzaren Norabidea", +DlgGenLangDirLtr : "Ezkerretik Eskumara(LTR)", +DlgGenLangDirRtl : "Eskumatik Ezkerrera (RTL)", +DlgGenLangCode : "Hizkuntza Kodea", +DlgGenAccessKey : "Sarbide-gakoa", +DlgGenName : "Izena", +DlgGenTabIndex : "Tabulazio Indizea", +DlgGenLongDescr : "URL Deskribapen Luzea", +DlgGenClass : "Estilo-orriko Klaseak", +DlgGenTitle : "Izenburua", +DlgGenContType : "Eduki Mota (Content Type)", +DlgGenLinkCharset : "Estekatutako Karaktere Multzoa", +DlgGenStyle : "Estiloa", + +// Image Dialog +DlgImgTitle : "Irudi Ezaugarriak", +DlgImgInfoTab : "Irudi informazioa", +DlgImgBtnUpload : "Zerbitzarira bidalia", +DlgImgURL : "URL", +DlgImgUpload : "Gora Kargatu", +DlgImgAlt : "Textu Alternatiboa", +DlgImgWidth : "Zabalera", +DlgImgHeight : "Altuera", +DlgImgLockRatio : "Erlazioa Blokeatu", +DlgBtnResetSize : "Tamaina Berrezarri", +DlgImgBorder : "Ertza", +DlgImgHSpace : "HSpace", +DlgImgVSpace : "VSpace", +DlgImgAlign : "Lerrokatu", +DlgImgAlignLeft : "Ezkerrera", +DlgImgAlignAbsBottom: "Abs Behean", +DlgImgAlignAbsMiddle: "Abs Erdian", +DlgImgAlignBaseline : "Oinan", +DlgImgAlignBottom : "Behean", +DlgImgAlignMiddle : "Erdian", +DlgImgAlignRight : "Eskuman", +DlgImgAlignTextTop : "Testua Goian", +DlgImgAlignTop : "Goian", +DlgImgPreview : "Aurrebista", +DlgImgAlertUrl : "Mesedez Irudiaren URLa idatzi", +DlgImgLinkTab : "Esteka", + +// Flash Dialog +DlgFlashTitle : "Flasharen Ezaugarriak", +DlgFlashChkPlay : "Automatikoki Erreproduzitu", +DlgFlashChkLoop : "Begizta", +DlgFlashChkMenu : "Flasharen Menua Gaitu", +DlgFlashScale : "Eskalatu", +DlgFlashScaleAll : "Dena erakutsi", +DlgFlashScaleNoBorder : "Ertzarik gabe", +DlgFlashScaleFit : "Doitu", + +// Link Dialog +DlgLnkWindowTitle : "Esteka", +DlgLnkInfoTab : "Estekaren Informazioa", +DlgLnkTargetTab : "Helburua", + +DlgLnkType : "Esteka Mota", +DlgLnkTypeURL : "URL", +DlgLnkTypeAnchor : "Aingura horrialde honentan", +DlgLnkTypeEMail : "ePosta", +DlgLnkProto : "Protokoloa", +DlgLnkProtoOther : "", +DlgLnkURL : "URL", +DlgLnkAnchorSel : "Aingura bat hautatu", +DlgLnkAnchorByName : "Aingura izenagatik", +DlgLnkAnchorById : "Elementuaren ID-gatik", +DlgLnkNoAnchors : "", +DlgLnkEMail : "ePosta Helbidea", +DlgLnkEMailSubject : "Mezuaren Gaia", +DlgLnkEMailBody : "Mezuaren Gorputza", +DlgLnkUpload : "Gora kargatu", +DlgLnkBtnUpload : "Zerbitzarira bidali", + +DlgLnkTarget : "Target (Helburua)", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", +DlgLnkTargetBlank : "Lehio Berria (_blank)", +DlgLnkTargetParent : "Lehio Gurasoa (_parent)", +DlgLnkTargetSelf : "Lehio Berdina (_self)", +DlgLnkTargetTop : "Goiko Lehioa (_top)", +DlgLnkTargetFrameName : "Marko Helburuaren Izena", +DlgLnkPopWinName : "Popup Lehioaren Izena", +DlgLnkPopWinFeat : "Popup Lehioaren Ezaugarriak", +DlgLnkPopResize : "Tamaina Aldakorra", +DlgLnkPopLocation : "Kokaleku Barra", +DlgLnkPopMenu : "Menu Barra", +DlgLnkPopScroll : "Korritze Barrak", +DlgLnkPopStatus : "Egoera Barra", +DlgLnkPopToolbar : "Tresna Barra", +DlgLnkPopFullScrn : "Pantaila Osoa (IE)", +DlgLnkPopDependent : "Menpekoa (Netscape)", +DlgLnkPopWidth : "Zabalera", +DlgLnkPopHeight : "Altuera", +DlgLnkPopLeft : "Ezkerreko Posizioa", +DlgLnkPopTop : "Goiko Posizioa", + +DlnLnkMsgNoUrl : "Mesedez URL esteka idatzi", +DlnLnkMsgNoEMail : "Mesedez ePosta helbidea idatzi", +DlnLnkMsgNoAnchor : "Mesedez aingura bat aukeratu", + +// Color Dialog +DlgColorTitle : "Kolore Aukeraketa", +DlgColorBtnClear : "Garbitu", +DlgColorHighlight : "Nabarmendu", +DlgColorSelected : "Aukeratuta", + +// Smiley Dialog +DlgSmileyTitle : "Aurpegiera Sartu", + +// Special Character Dialog +DlgSpecialCharTitle : "Karaktere Berezia Aukeratu", + +// Table Dialog +DlgTableTitle : "Taularen Ezaugarriak", +DlgTableRows : "Lerroak", +DlgTableColumns : "Zutabeak", +DlgTableBorder : "Ertzaren Zabalera", +DlgTableAlign : "Lerrokatu", +DlgTableAlignNotSet : "", +DlgTableAlignLeft : "Ezkerrean", +DlgTableAlignCenter : "Erdian", +DlgTableAlignRight : "Eskuman", +DlgTableWidth : "Zabalera", +DlgTableWidthPx : "pixel", +DlgTableWidthPc : "ehuneko", +DlgTableHeight : "Altuera", +DlgTableCellSpace : "Gelaxka arteko tartea", +DlgTableCellPad : "Gelaxken betegarria", +DlgTableCaption : "Epigrafea", +DlgTableSummary : "Laburpena", + +// Table Cell Dialog +DlgCellTitle : "Gelaxken Ezaugarriak", +DlgCellWidth : "Zabalera", +DlgCellWidthPx : "pixel", +DlgCellWidthPc : "ehuneko", +DlgCellHeight : "Altuera", +DlgCellWordWrap : "Itzulbira", +DlgCellWordWrapNotSet : "", +DlgCellWordWrapYes : "Bai", +DlgCellWordWrapNo : "Ez", +DlgCellHorAlign : "Horizontal Alignment", +DlgCellHorAlignNotSet : "", +DlgCellHorAlignLeft : "Ezkerrean", +DlgCellHorAlignCenter : "Erdian", +DlgCellHorAlignRight: "Eskuman", +DlgCellVerAlign : "Lerrokatu Bertikalki", +DlgCellVerAlignNotSet : "", +DlgCellVerAlignTop : "Goian", +DlgCellVerAlignMiddle : "Erdian", +DlgCellVerAlignBottom : "Behean", +DlgCellVerAlignBaseline : "Oinan", +DlgCellRowSpan : "Lerroak Hedatu", +DlgCellCollSpan : "Zutabeak Hedatu", +DlgCellBackColor : "Atzeko Kolorea", +DlgCellBorderColor : "Ertzako Kolorea", +DlgCellBtnSelect : "Aukertau...", + +// Find Dialog +DlgFindTitle : "Bilaketa", +DlgFindFindBtn : "Bilatu", +DlgFindNotFoundMsg : "Idatzitako testua ez da topatu.", + +// Replace Dialog +DlgReplaceTitle : "Ordeztu", +DlgReplaceFindLbl : "Zer bilatu:", +DlgReplaceReplaceLbl : "Zerekin ordeztu:", +DlgReplaceCaseChk : "Maiuskula/minuskula", +DlgReplaceReplaceBtn : "Ordeztu", +DlgReplaceReplAllBtn : "Ordeztu Guztiak", +DlgReplaceWordChk : "Esaldi osoa bilatu", + +// Paste Operations / Dialog +PasteErrorPaste : "Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki itsastea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl+V).", +PasteErrorCut : "Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki moztea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl+X).", +PasteErrorCopy : "Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki kopiatzea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl+C).", + +PasteAsText : "Testu Arrunta bezala Itsatsi", +PasteFromWord : "Word-etik itsatsi", + +DlgPasteMsg2 : "Mesedez teklatua erabilita (Ctrl+V) ondorego eremuan testua itsatsi eta OK sakatu.", +DlgPasteIgnoreFont : "Letra Motaren definizioa ezikusi", +DlgPasteRemoveStyles : "Estilo definizioak kendu", +DlgPasteCleanBox : "Testu-eremua Garbitu", + +// Color Picker +ColorAutomatic : "Automatikoa", +ColorMoreColors : "Kolore gehiago...", + +// Document Properties +DocProps : "Dokumentuaren Ezarpenak", + +// Anchor Dialog +DlgAnchorTitle : "Ainguraren Ezaugarriak", +DlgAnchorName : "Ainguraren Izena", +DlgAnchorErrorName : "Idatzi ainguraren izena", + +// Speller Pages Dialog +DlgSpellNotInDic : "Ez dago hiztegian", +DlgSpellChangeTo : "Honekin ordezkatu", +DlgSpellBtnIgnore : "Ezikusi", +DlgSpellBtnIgnoreAll : "Denak Ezikusi", +DlgSpellBtnReplace : "Ordezkatu", +DlgSpellBtnReplaceAll : "Denak Ordezkatu", +DlgSpellBtnUndo : "Desegin", +DlgSpellNoSuggestions : "- Iradokizunik ez -", +DlgSpellProgress : "Zuzenketa ortografikoa martxan...", +DlgSpellNoMispell : "Zuzenketa ortografikoa bukatuta: Akatsik ez", +DlgSpellNoChanges : "Zuzenketa ortografikoa bukatuta: Ez da ezer aldatu", +DlgSpellOneChange : "Zuzenketa ortografikoa bukatuta: Hitz bat aldatu da", +DlgSpellManyChanges : "Zuzenketa ortografikoa bukatuta: %1 hitz aldatu dira", + +IeSpellDownload : "Zuzentzaile ortografikoa ez dago instalatuta. Deskargatu nahi duzu?", + +// Button Dialog +DlgButtonText : "Testua (Balorea)", +DlgButtonType : "Mota", + +// Checkbox and Radio Button Dialogs +DlgCheckboxName : "Izena", +DlgCheckboxValue : "Balorea", +DlgCheckboxSelected : "Hautatuta", + +// Form Dialog +DlgFormName : "Izena", +DlgFormAction : "Ekintza", +DlgFormMethod : "Method", + +// Select Field Dialog +DlgSelectName : "Izena", +DlgSelectValue : "Balorea", +DlgSelectSize : "Tamaina", +DlgSelectLines : "lerro kopurura", +DlgSelectChkMulti : "Hautaketa anitzak baimendu", +DlgSelectOpAvail : "Aukera Eskuragarriak", +DlgSelectOpText : "Testua", +DlgSelectOpValue : "Balorea", +DlgSelectBtnAdd : "Gehitu", +DlgSelectBtnModify : "Aldatu", +DlgSelectBtnUp : "Gora", +DlgSelectBtnDown : "Behera", +DlgSelectBtnSetValue : "Aukeratutako balorea ezarri", +DlgSelectBtnDelete : "Ezabatu", + +// Textarea Dialog +DlgTextareaName : "Izena", +DlgTextareaCols : "Zutabeak", +DlgTextareaRows : "Lerroak", + +// Text Field Dialog +DlgTextName : "Izena", +DlgTextValue : "Balorea", +DlgTextCharWidth : "Zabalera", +DlgTextMaxChars : "Zenbat karaktere gehienez", +DlgTextType : "Mota", +DlgTextTypeText : "Testua", +DlgTextTypePass : "Pasahitza", + +// Hidden Field Dialog +DlgHiddenName : "Izena", +DlgHiddenValue : "Balorea", + +// Bulleted List Dialog +BulletedListProp : "Buletdun Zerrendaren Ezarpenak", +NumberedListProp : "Zenbakidun Zerrendaren Ezarpenak", +DlgLstType : "Mota", +DlgLstTypeCircle : "Zirkulua", +DlgLstTypeDisc : "Diskoa", +DlgLstTypeSquare : "Karratua", +DlgLstTypeNumbers : "Zenbakiak (1, 2, 3)", +DlgLstTypeLCase : "Letra xeheak (a, b, c)", +DlgLstTypeUCase : "Letra larriak (A, B, C)", +DlgLstTypeSRoman : "Erromatar zenbaki zeheak (i, ii, iii)", +DlgLstTypeLRoman : "Erromatar zenbaki larriak (I, II, III)", + +// Document Properties Dialog +DlgDocGeneralTab : "Orokorra", +DlgDocBackTab : "Atzekaldea", +DlgDocColorsTab : "Koloreak eta Marjinak", +DlgDocMetaTab : "Meta Informazioa", + +DlgDocPageTitle : "Orriaren Izenburua", +DlgDocLangDir : "Hizkuntzaren Norabidea", +DlgDocLangDirLTR : "Ezkerretik eskumara (LTR)", +DlgDocLangDirRTL : "Eskumatik ezkerrera (RTL)", +DlgDocLangCode : "Hizkuntzaren Kodea", +DlgDocCharSet : "Karaktere Multzoaren Kodeketa", +DlgDocCharSetOther : "Beste Karaktere Multzoaren Kodeketa", + +DlgDocDocType : "Document Type Goiburua", +DlgDocDocTypeOther : "Beste Document Type Goiburua", +DlgDocIncXHTML : "XHTML Ezarpenak", +DlgDocBgColor : "Atzeko Kolorea", +DlgDocBgImage : "Atzeko Irudiaren URL-a", +DlgDocBgNoScroll : "Korritze gabeko Atzekaldea", +DlgDocCText : "Testua", +DlgDocCLink : "Estekak", +DlgDocCVisited : "Bisitatutako Estekak", +DlgDocCActive : "Esteka Aktiboa", +DlgDocMargins : "Orrialdearen marjinak", +DlgDocMaTop : "Goian", +DlgDocMaLeft : "Ezkerrean", +DlgDocMaRight : "Eskuman", +DlgDocMaBottom : "Behean", +DlgDocMeIndex : "Dokumentuaren Gako-hitzak (komarekin bananduta)", +DlgDocMeDescr : "Dokumentuaren Deskribapena", +DlgDocMeAuthor : "Egilea", +DlgDocMeCopy : "Copyright", +DlgDocPreview : "Aurrebista", + +// Templates Dialog +Templates : "Txantiloiak", +DlgTemplatesTitle : "Eduki Txantiloiak", +DlgTemplatesSelMsg : "Mesedez txantiloia aukeratu editorean kargatzeko
      (orain dauden edukiak galduko dira):", +DlgTemplatesLoading : "Txantiloiak kargatzen. Itxaron mesedez...", +DlgTemplatesNoTpl : "(Ez dago definitutako txantiloirik)", + +// About Dialog +DlgAboutAboutTab : "Honi buruz", +DlgAboutBrowserInfoTab : "Nabigatzailearen Informazioa", +DlgAboutLicenseTab : "Lizentzia", +DlgAboutVersion : "bertsioa", +DlgAboutLicense : "GNU Lesser General Public License Lizentziapean", +DlgAboutInfo : "Informazio gehiago eskuratzeko hona joan" } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fa.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fa.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fa.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -98,8 +98,13 @@ SelectionField : "???????? ??????????????", ImageButton : "????? ?? ????????????", +FitWindow : "Maximize the editor size", //MISSING + // Context Menu EditLink : "???????????? ????????", +CellCM : "Cell", //MISSING +RowCM : "Row", //MISSING +ColumnCM : "Column", //MISSING InsertRow : "?????? ??????", DeleteRows : "?????? ??????????", InsertColumn : "?????? ????????", @@ -136,7 +141,7 @@ UnknownCommand : "????? ?????????? ???????????????? \"%1\"", NotImplemented : "?????????? ???????? ??????", UnknownToolbarSet : "? ??? ?????? ? ?????????????? \"%1\" ???????? ??????????", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING +NoActiveX : "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING @@ -146,12 +151,12 @@ DlgBtnClose : "????????", DlgBtnBrowseServer : "?????????? ??? ?????? ????????", DlgAdvancedTag : "??????????????", -DlgOpOther : "<????????>", +DlgOpOther : "", DlgInfoTab : "Info", //MISSING DlgAlertUrl : "Please insert the URL", //MISSING // General Dialogs Labels -DlgGenNotSet : "<???????? ????????>", +DlgGenNotSet : "", DlgGenId : "????", DlgGenLangDir : "?????? ??? ???? ????????", DlgGenLangDirLtr : "???? ???? ???????? (LTR)", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "?????????? ???? ???????? ????????", DlgLnkTypeEMail : "?????? ????????????????????", DlgLnkProto : "????????????", -DlgLnkProtoOther : "<????????>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "???? ?????????? ???????????? ????????", DlgLnkAnchorByName : "???? ????? ??????????", DlgLnkAnchorById : "???? ???? ????? ????", -DlgLnkNoAnchors : "<???? ?????? ?????? ???????????? ? ???????? ????????>", +DlgLnkNoAnchors : "", DlgLnkEMail : "???????? ?????? ????????????????????", DlgLnkEMailSubject : "? ???????? ??????? ", DlgLnkEMailBody : "? ???? ??????? ", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "???? ???????? ?????????? ????", DlgLnkTarget : "? ??????", -DlgLnkTargetFrame : "<??????? >", -DlgLnkTargetPopup : "<?????????? ??????????>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "?????????? ???????? (_blank)", DlgLnkTargetParent : "?????????? ???????? (_parent)", DlgLnkTargetSelf : "??? ???? ?????????? (_self)", @@ -292,16 +297,16 @@ DlgCellWidthPc : "????????", DlgCellHeight : "??????????", DlgCellWordWrap : "?????????? ????? ????", -DlgCellWordWrapNotSet : "<???????? ????????>", +DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "??????", DlgCellWordWrapNo : "??????", DlgCellHorAlign : "???????? ????????", -DlgCellHorAlignNotSet : "<???????? ????????>", +DlgCellHorAlignNotSet : "", DlgCellHorAlignLeft : "????", DlgCellHorAlignCenter : "??????", DlgCellHorAlignRight: "????????", DlgCellVerAlign : "???????? ??? ??????", -DlgCellVerAlignNotSet : "<???????? ????????>", +DlgCellVerAlignNotSet : "", DlgCellVerAlignTop : "????????", DlgCellVerAlignMiddle : "? ??????", DlgCellVerAlignBottom : "??????????", @@ -338,7 +343,6 @@ DlgPasteIgnoreFont : "Ignore Font Face definitions", //MISSING DlgPasteRemoveStyles : "Remove Styles definitions", //MISSING DlgPasteCleanBox : "Clean Up Box", //MISSING - // Color Picker ColorAutomatic : "????????????", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "????????????", DlgAboutBrowserInfoTab : "?????????????? ? ??????????", +DlgAboutLicenseTab : "License", //MISSING DlgAboutVersion : "??????????", DlgAboutLicense : "???????????? ?????? ??????????????? ?? GNU Lesser General Public License", DlgAboutInfo : "???????? ?????????????? ?????????? ???? ???????? ?????? ??????????" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fi.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fi.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fi.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -98,8 +98,13 @@ SelectionField : "Valintakentt??", ImageButton : "Kuvapainike", +FitWindow : "Suurenna editori koko ikkunaan", + // Context Menu EditLink : "Muokkaa linkki??", +CellCM : "Solu", +RowCM : "Rivi", +ColumnCM : "Sarake", InsertRow : "Lis???? rivi", DeleteRows : "Poista rivit", InsertColumn : "Lis???? sarake", @@ -151,7 +156,7 @@ DlgAlertUrl : "Lis???? URL", // General Dialogs Labels -DlgGenNotSet : "<ei asetettu>", +DlgGenNotSet : "", DlgGenId : "Tunniste", DlgGenLangDir : "Kielen suunta", DlgGenLangDirLtr : "Vasemmalta oikealle (LTR)", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "Ankkuri t??ss?? sivussa", DlgLnkTypeEMail : "S??hk??posti", DlgLnkProto : "Protokolla", -DlgLnkProtoOther : "<muu>", +DlgLnkProtoOther : "", DlgLnkURL : "Osoite", DlgLnkAnchorSel : "Valitse ankkuri", DlgLnkAnchorByName : "Ankkurin nimen mukaan", DlgLnkAnchorById : "Ankkurin ID:n mukaan", -DlgLnkNoAnchors : "<Ei ankkureita t??ss?? dokumentissa>", +DlgLnkNoAnchors : "", DlgLnkEMail : "S??hk??postiosoite", DlgLnkEMailSubject : "Aihe", DlgLnkEMailBody : "Viesti", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "L??het?? palvelimelle", DlgLnkTarget : "Kohde", -DlgLnkTargetFrame : "<kehys>", -DlgLnkTargetPopup : "<popup ikkuna>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Uusi ikkuna (_blank)", DlgLnkTargetParent : "Emoikkuna (_parent)", DlgLnkTargetSelf : "Sama ikkuna (_self)", @@ -339,7 +344,6 @@ DlgPasteRemoveStyles : "Poista tyylim????ritykset", DlgPasteCleanBox : "Tyhjenn??", - // Color Picker ColorAutomatic : "Automaattinen", ColorMoreColors : "Lis???? v??rej??...", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "Editorista", DlgAboutBrowserInfoTab : "Selaimen tiedot", +DlgAboutLicenseTab : "Lisenssi", DlgAboutVersion : "versio", DlgAboutLicense : "Lisenssi: GNU Lesser General Public License", DlgAboutInfo : "Lis???? tietoa osoitteesta" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fo.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fo.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fo.js Wed Jul 12 07:45:05 2006 @@ -1,482 +1,487 @@ -???/* - * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben - * - * Licensed under the terms of the GNU Lesser General Public License: - * http://www.opensource.org/licenses/lgpl-license.php - * - * For further information visit: - * http://www.fckeditor.net/ - * - * "Support Open Source software. What about a donation today?" - * - * File Name: fo.js - * Faroese language file. - * - * File Authors: - * S??min Lassaberg - * Helgi Arnthorsson - */ - -var FCKLang = -{ -// Language direction : "ltr" (left to right) or "rtl" (right to left). -Dir : "ltr", - -ToolbarCollapse : "Goym ambo??alistan", -ToolbarExpand : "V??s ambo??alistan", - -// Toolbar Items and Context Menu -Save : "Geim", -NewPage : "N??ggj s????a", -Preview : "V??s d??mi", -Cut : "Klipp", -Copy : "Avrita", -Paste : "Set inn", -PasteText : "Set inn sum reinan tekst", -PasteWord : "Set inn fr?? Word", -Print : "Prenta", -SelectAll : "Markera alt", -RemoveFormat : "Sletta sni??geving", -InsertLinkLbl : "Leinkja", -InsertLink : "Seta inn/Broyta Leinkju", -RemoveLink : "Sletta Leinkju", -Anchor : "Seta inn/Broyta sta??setingarmerki", -InsertImageLbl : "Seta inn mynd", -InsertImage : "Seta inn/Broyta mynd", -InsertFlashLbl : "Flash", //MISSING -InsertFlash : "Insert/Edit Flash", //MISSING -InsertTableLbl : "Talva", -InsertTable : "Seta inn/Broyta talvu", -InsertLineLbl : "Linja", -InsertLine : "Seta inn vatnr??tta linju", -InsertSpecialCharLbl: "Serlig tekn", -InsertSpecialChar : "Seta inn serligt tekn", -InsertSmileyLbl : "Smiley", -InsertSmiley : "Seta inn Smiley", -About : "Um FCKeditor", -Bold : "Feit", -Italic : "Sk??stilla??", -Underline : "Undirstrika??", -StrikeThrough : "Strika?? yvir", -Subscript : "L??kka?? skrift", -Superscript : "H??kka?? skrift", -LeftJustify : "Vinstristilla??", -CenterJustify : "Mi??stilla??", -RightJustify : "H??gristilla??", -BlockJustify : "Beinir tekstkantar", -DecreaseIndent : "??kja innrykk", -IncreaseIndent : "Minka innrykk", -Undo : "Angra", -Redo : "Broyt aftur ?? upprunamynd", -NumberedListLbl : "Talsettur listi", -NumberedList : "Seta inn/Sletta talsettan lista", -BulletedListLbl : "Punktsettur listi", -BulletedList : "Seta inn/Sletta punktsettan lista", -ShowTableBorders : "V??sa talvukantar ", -ShowDetails : "V??sa detaljur", -Style : "Tekstsni??", -FontFormat : "Sni??geving", -Font : "Skrift", -FontSize : "Skriftst??dd", -TextColor : "Tekstlitur", -BGColor : "Litur aftanfyri", -Source : "Kelda", -Find : "Leita", -Replace : "Set ?? sta??in", -SpellCheck : "Stavseting", -UniversalKeyboard : "Universalt Tastatur", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING - -Form : "Seta inn Form", -Checkbox : "Seta inn Avmerkingarboks", -RadioButton : "Seta inn Radioknap", -TextField : "Seta inn Tekstteig", -Textarea : "Seta inn Tekst??ki", -HiddenField : "Seta inn GoymdanTeig", -Button : "Seta inn knapp", -SelectionField : "Seta inn Valteig", -ImageButton : "Seta inn Myndaknapp", - -// Context Menu -EditLink : "Broyt leinkju", -InsertRow : "Seta inn rekkju", -DeleteRows : "Sletta rekkjur", -InsertColumn : "Seta inn s??jlur", -DeleteColumns : "Sletta s??jlur", -InsertCell : "Seta inn sellu", -DeleteCells : "Sletta sellu", -MergeCells : "Fl??tta sellur", -SplitCell : "Deila sellur", -TableDelete : "Delete Table", //MISSING -CellProperties : "Eginleikar fyri sellu", -TableProperties : "Eginleikar fyri talvu", -ImageProperties : "Eginleikar fyri mynd", -FlashProperties : "Flash Properties", //MISSING - -AnchorProp : "Eginleikar fyri sta??setingarpunkt", -ButtonProp : "Eginleikar fyri knapp", -CheckboxProp : "Eginleikar fyri avmerkingarboks", -HiddenFieldProp : "Eginleikar fyri goymdan teig", -RadioButtonProp : "Eginleikar fyri radioknapp", -ImageButtonProp : "Eginleikar fyri myndaknapp", -TextFieldProp : "Eginleikar fyri Tekstateig", -SelectionFieldProp : "Eginleikar fyri Valteig", -TextareaProp : "Eginleikar fyri Teksta??ki", -FormProp : "Eginleikar fyri form", - -FontFormats : "Normalt;Sni??gevi??;Adressa;Yvirskrift 1;Yvirskrift 2;Yvirskrift 3;Yvirskrift 4;Yvirskrift 5;Yvirskrift 6", - -// Alerts and Messages -ProcessingXHTML : "Vi??gerir XHTML. B????a...", -Done : "Li??ugt", -PasteWordConfirm : "Teksturin, t?? roynir at seta inn, s??nist at vera fr?? Word. Vilt t?? reinsa tekstin, ????renn hann ver??ur settur inn?", -NotCompatiblePaste : "Hesin ordri er t??kur ?? Internet Explorer 5.5 og n??ggjari. Vilt t?? seta tekstin inn, uttan at reinsa hann?", -UnknownToolbarItem : "??kendur lutur ?? ambo??alinju \"%1\"", -UnknownCommand : "Kenni ikki ordra \"%1\"", -NotImplemented : "Ordrin er ikki gj??rdur virkin", -UnknownToolbarSet : "Ambo??alinjan \"%1\" finst ikki", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING - -// Dialogs -DlgBtnOK : "OK", -DlgBtnCancel : "Angra", -DlgBtnClose : "Lukka", -DlgBtnBrowseServer : "Hyggja ?? servara", -DlgAdvancedTag : "??tv????ka", -DlgOpOther : "<Anna??>", -DlgInfoTab : "Info", //MISSING -DlgAlertUrl : "Please insert the URL", //MISSING - -// General Dialogs Labels -DlgGenNotSet : "<ikki sett>", -DlgGenId : "Id", -DlgGenLangDir : "Tekstak??s", -DlgGenLangDirLtr : "Vinstri m??ti h??gri (LTR)", -DlgGenLangDirRtl : "H??gri m??ti vinstri (RTL)", -DlgGenLangCode : "M??lkoda", -DlgGenAccessKey : "Atgongdslykil", -DlgGenName : "Navn", -DlgGenTabIndex : "Tabulator Indeks", -DlgGenLongDescr : "v????ka fr??grei??ing", -DlgGenClass : "Typografiark", -DlgGenTitle : "Heiti", -DlgGenContType : "Innihaldsslag", -DlgGenLinkCharset : "Teknset", -DlgGenStyle : "Prentlist", - -// Image Dialog -DlgImgTitle : "Mynd eginleikar", -DlgImgInfoTab : "Mynd info", -DlgImgBtnUpload : "Send til serveren", -DlgImgURL : "URL", -DlgImgUpload : "Upload", -DlgImgAlt : "Annar tekstur", -DlgImgWidth : "Breidd", -DlgImgHeight : "H??dd", -DlgImgLockRatio : "L??s st??ddarlutfall", -DlgBtnResetSize : "Nulstilla st??dd", -DlgImgBorder : "Ramma", -DlgImgHSpace : "HMargin", -DlgImgVSpace : "VMargin", -DlgImgAlign : "Justering", -DlgImgAlignLeft : "Vinstra", -DlgImgAlignAbsBottom: "Abs botnur", -DlgImgAlignAbsMiddle: "Abs Mi??ja", -DlgImgAlignBaseline : "Botnlinja", -DlgImgAlignBottom : "Botnur", -DlgImgAlignMiddle : "Mi??ja", -DlgImgAlignRight : "H??gra", -DlgImgAlignTextTop : "Tekstur ovast", -DlgImgAlignTop : "Ovast", -DlgImgPreview : "V??s d??mi", -DlgImgAlertUrl : "Sl?? inn sl????ina til myndina", -DlgImgLinkTab : "Leinkja", - -// Flash Dialog -DlgFlashTitle : "Flash Properties", //MISSING -DlgFlashChkPlay : "Auto Play", //MISSING -DlgFlashChkLoop : "Loop", //MISSING -DlgFlashChkMenu : "Enable Flash Menu", //MISSING -DlgFlashScale : "Scale", //MISSING -DlgFlashScaleAll : "Show all", //MISSING -DlgFlashScaleNoBorder : "No Border", //MISSING -DlgFlashScaleFit : "Exact Fit", //MISSING - -// Link Dialog -DlgLnkWindowTitle : "Leinkja", -DlgLnkInfoTab : "Leinkju info", -DlgLnkTargetTab : "M??l", - -DlgLnkType : "Leinkju slag", -DlgLnkTypeURL : "URL", -DlgLnkTypeAnchor : "Akker ?? hesari s????uni", -DlgLnkTypeEMail : "Teldupostur", -DlgLnkProto : "Protokoll", -DlgLnkProtoOther : "<onnur>", -DlgLnkURL : "URL", -DlgLnkAnchorSel : "VEl eitt akker", -DlgLnkAnchorByName : "Eftir akker navni", -DlgLnkAnchorById : "Eftir element Id", -DlgLnkNoAnchors : "<Ta?? eru ongi akker t??k ?? hesum dokumentinum;", -DlgLnkEMail : "Teldupost Adresse", -DlgLnkEMailSubject : "Evni", -DlgLnkEMailBody : "Bo??", -DlgLnkUpload : "Upload", -DlgLnkBtnUpload : "Send til servaran", - -DlgLnkTarget : "M??l", -DlgLnkTargetFrame : "<ramma>", -DlgLnkTargetPopup : "<popup vindeyga>", -DlgLnkTargetBlank : "Nytt vindeyga (_blank)", -DlgLnkTargetParent : "Oman?? liggjandi vindeyga (_parent)", -DlgLnkTargetSelf : "Sama vindeyga (_self)", -DlgLnkTargetTop : "ovasta vindeyga (_top)", -DlgLnkTargetFrameName : "v??sa vindeygas navn", -DlgLnkPopWinName : "Popup vindeygas navn", -DlgLnkPopWinFeat : "Popup vindeygas eginleikar", -DlgLnkPopResize : "Skalering", -DlgLnkPopLocation : "Lokationslinja", -DlgLnkPopMenu : "Menulinja", -DlgLnkPopScroll : "Scrollbars", -DlgLnkPopStatus : "Statuslinja", -DlgLnkPopToolbar : "V??rkt??jslinja", -DlgLnkPopFullScrn : "Fullur skermur (IE)", -DlgLnkPopDependent : "Bundin (Netscape)", -DlgLnkPopWidth : "Breidd", -DlgLnkPopHeight : "H??dd", -DlgLnkPopLeft : "Positi??n fr?? vinstru", -DlgLnkPopTop : "Positi??n fr?? toppinum", - -DlnLnkMsgNoUrl : "Inntasta leinkju URL", -DlnLnkMsgNoEMail : "Inntasta teldupost addressuna", -DlnLnkMsgNoAnchor : "Vel akker", - -// Color Dialog -DlgColorTitle : "vel farvu", -DlgColorBtnClear : "sletta alt", -DlgColorHighlight : "Markera", -DlgColorSelected : "valt", - -// Smiley Dialog -DlgSmileyTitle : "Innset ein smiley", - -// Special Character Dialog -DlgSpecialCharTitle : "vel specialkarakter", - -// Table Dialog -DlgTableTitle : "Tabel eginleikar", -DlgTableRows : "Rekkjur", -DlgTableColumns : "Kolonnur", -DlgTableBorder : "Rammu st??dd", -DlgTableAlign : "Justering", -DlgTableAlignNotSet : "", -DlgTableAlignLeft : "Vinstrastilla", -DlgTableAlignCenter : "Mi??seta", -DlgTableAlignRight : "H??grastilla", -DlgTableWidth : "Breidd", -DlgTableWidthPx : "pixels", -DlgTableWidthPc : "prosent", -DlgTableHeight : "H??dd", -DlgTableCellSpace : "Fjarst????a millum sellur", -DlgTableCellPad : "Sellu breddi", -DlgTableCaption : "Heiti", -DlgTableSummary : "Summary", //MISSING - -// Table Cell Dialog -DlgCellTitle : "Sellu eginleikar", -DlgCellWidth : "Breidd", -DlgCellWidthPx : "pixels", -DlgCellWidthPc : "prosent", -DlgCellHeight : "H??dd", -DlgCellWordWrap : "Or??b??ti", -DlgCellWordWrapNotSet : "", -DlgCellWordWrapYes : "Ja", -DlgCellWordWrapNo : "Nej", -DlgCellHorAlign : "Horisontal justering", -DlgCellHorAlignNotSet : "", -DlgCellHorAlignLeft : "Vinstrastilla", -DlgCellHorAlignCenter : "Mi??sett", -DlgCellHorAlignRight: "H??grastilla", -DlgCellVerAlign : "Lodr??tt Justering", -DlgCellVerAlignNotSet : "", -DlgCellVerAlignTop : "Ovast", -DlgCellVerAlignMiddle : "Mi??ja", -DlgCellVerAlignBottom : "Ni??ast", -DlgCellVerAlignBaseline : "Botnlinja", -DlgCellRowSpan : "Tal av rekkjum sellan spennur yvir", -DlgCellCollSpan : "Tal av talr????um sellan spennur yvir", -DlgCellBackColor : "Bakgrundsfarva", -DlgCellBorderColor : "rammufarva", -DlgCellBtnSelect : "Vel...", - -// Find Dialog -DlgFindTitle : "Finn", -DlgFindFindBtn : "Finn", -DlgFindNotFoundMsg : "Teksturin bleiv ikki funnin", - -// Replace Dialog -DlgReplaceTitle : "Set ?? sta??in", -DlgReplaceFindLbl : "Finn:", -DlgReplaceReplaceLbl : "Set ?? sta??in vi??:", -DlgReplaceCaseChk : "Munur ?? st??rum og sm????um stavum", -DlgReplaceReplaceBtn : "Set ?? sta??in", -DlgReplaceReplAllBtn : "Skift alt ??t", -DlgReplaceWordChk : "Bert heil or??", - -// Paste Operations / Dialog -PasteErrorPaste : "Leitarans trygdarinstillingar loyva ikki editorinum at innseta tekstin automatiskt. Br??ka knappabor??i?? til at innseta tekstin (Ctrl+V).", -PasteErrorCut : "Leitarans trygdarinstillingar loyva ikki editorinum at klippa tekstin automatiskt. Br??ka ?? sta??in knappabor??i?? til at klippa tekstin (Ctrl+X).", -PasteErrorCopy : "Leitarans trygdarinstillingar loyva ikki editorinum at avrita tekstin automatiskt. Br??ka ?? sta??in knappabor??i?? til at avrita tekstin (Ctrl+V).", - -PasteAsText : "Seta inn som reinur tekstur", -PasteFromWord : "Seta inn fra Word", - -DlgPasteMsg2 : "Please paste inside the following box using the keyboard (Ctrl+V) and hit OK.", //MISSING -DlgPasteIgnoreFont : "Ignore Font Face definitions", //MISSING -DlgPasteRemoveStyles : "Remove Styles definitions", //MISSING -DlgPasteCleanBox : "Clean Up Box", //MISSING - - -// Color Picker -ColorAutomatic : "Automatisk", -ColorMoreColors : "Fleiri farvur...", - -// Document Properties -DocProps : "Dokument eginleikar", - -// Anchor Dialog -DlgAnchorTitle : "Akker eginleikar", -DlgAnchorName : "Akker navn", -DlgAnchorErrorName : "Sl?? innn akker navn", - -// Speller Pages Dialog -DlgSpellNotInDic : "Finnst ikki ?? or??ab??kini", -DlgSpellChangeTo : "broyta til", -DlgSpellBtnIgnore : "Ignorera", -DlgSpellBtnIgnoreAll : "Ignorera alt", -DlgSpellBtnReplace : "Skift ??t", -DlgSpellBtnReplaceAll : "Skift ??t alt", -DlgSpellBtnUndo : "Aftur", -DlgSpellNoSuggestions : "- Einki uppskot -", -DlgSpellProgress : "Stavarin arbei??ir...", -DlgSpellNoMispell : "Stavarain li??ugur: Eingin feilur funnin", -DlgSpellNoChanges : "Stavarain li??ugur: Einki or?? broytt", -DlgSpellOneChange : "Stavarain li??ugur: Eitt or?? broytt", -DlgSpellManyChanges : "Stavarain li??ugur: %1 or?? broytt", - -IeSpellDownload : "Stavarin ikki lagdur inn. vilt t?? heinta hann n???", - -// Button Dialog -DlgButtonText : "Tekstur (Vir??i)", -DlgButtonType : "Slag", - -// Checkbox and Radio Button Dialogs -DlgCheckboxName : "Navn", -DlgCheckboxValue : "Vir??i", -DlgCheckboxSelected : "Valgt", - -// Form Dialog -DlgFormName : "Navn", -DlgFormAction : "Ger??", -DlgFormMethod : "H??ttur", - -// Select Field Dialog -DlgSelectName : "Navn", -DlgSelectValue : "Vir??i", -DlgSelectSize : "St??dd", -DlgSelectLines : "linjir", -DlgSelectChkMulti : "Loyv fleiri valm??guleikar", -DlgSelectOpAvail : "valm??guleikar", -DlgSelectOpText : "Tekstur", -DlgSelectOpValue : "Vir??i", -DlgSelectBtnAdd : "Legg afturat", -DlgSelectBtnModify : "Broyt", -DlgSelectBtnUp : "Upp", -DlgSelectBtnDown : "Ni??ur", -DlgSelectBtnSetValue : "Set sum ??tvald", -DlgSelectBtnDelete : "Sletta", - -// Textarea Dialog -DlgTextareaName : "Navn", -DlgTextareaCols : "talr????", -DlgTextareaRows : "Rekkja", - -// Text Field Dialog -DlgTextName : "Navn", -DlgTextValue : "Vir??i", -DlgTextCharWidth : "Sj??nligt tal av b??kstavum", -DlgTextMaxChars : "H??gst loyvda tal av b??kstavum", -DlgTextType : "Slag", -DlgTextTypeText : "Tekstur", -DlgTextTypePass : "Koduor??", - -// Hidden Field Dialog -DlgHiddenName : "Navn", -DlgHiddenValue : "Vir??i", - -// Bulleted List Dialog -BulletedListProp : "Punktteknsuppsetingar eginleikar", -NumberedListProp : "Taluppsetingar eginleikar", -DlgLstType : "Slag", -DlgLstTypeCircle : "Sirkul", -DlgLstTypeDisc : "Disc", //MISSING -DlgLstTypeSquare : "F??rakantur", -DlgLstTypeNumbers : "Talmerkt (1, 2, 3)", -DlgLstTypeLCase : "Sm??ir b??kstavir (a, b, c)", -DlgLstTypeUCase : "St??rir b??kstavir (A, B, C)", -DlgLstTypeSRoman : "Sm?? r??marat??l (i, ii, iii)", -DlgLstTypeLRoman : "St??r r??marat??l (I, II, III)", - -// Document Properties Dialog -DlgDocGeneralTab : "Generelt", -DlgDocBackTab : "Bakgrund", -DlgDocColorsTab : "Farva og Breddin", -DlgDocMetaTab : "Meta Information", - -DlgDocPageTitle : "S????u heiti", -DlgDocLangDir : "M??l", -DlgDocLangDirLTR : "Fr?? vinstru m??ti h??gru (LTR)", -DlgDocLangDirRTL : "Fr?? h??gru m??ti vinstru (RTL)", -DlgDocLangCode : "Landakoda", -DlgDocCharSet : "Karakter set kodu", -DlgDocCharSetOther : "Annar karakter set kodu", - -DlgDocDocType : "Dokument slag kategori", -DlgDocDocTypeOther : "Anna?? dokument slag kategori", -DlgDocIncXHTML : "Inkludere XHTML deklartion", -DlgDocBgColor : "Bakgrundsfarva", -DlgDocBgImage : "Bakgrundsmynd URL", -DlgDocBgNoScroll : "Ikki scrollbar bakgrund", -DlgDocCText : "Tekstur", -DlgDocCLink : "Leinkja", -DlgDocCVisited : "Vitja leinkja", -DlgDocCActive : "Aktiv leinkja", -DlgDocMargins : "S????u breddi", -DlgDocMaTop : "Ovast", -DlgDocMaLeft : "Vinstra", -DlgDocMaRight : "H??gra", -DlgDocMaBottom : "Ni??ast", -DlgDocMeIndex : "Dokument index lyklaor?? (komma sundurskilt)", -DlgDocMeDescr : "Dokument l??sing", -DlgDocMeAuthor : "H??vundur", -DlgDocMeCopy : "Copyright", -DlgDocPreview : "V??s", - -// Templates Dialog -Templates : "Frymlar", -DlgTemplatesTitle : "Innihaldsfrymlar", -DlgTemplatesSelMsg : "Vel tann frymilin, sum skal opnast ?? editorinum
      (Ta?? ver??ur skriva ??tyvir n??verandi innihald):", -DlgTemplatesLoading : "Heintar lista yvir frymlar. Vinarliga b????a...", -DlgTemplatesNoTpl : "(Ongin frymil er valdur)", - -// About Dialog -DlgAboutAboutTab : "Um", -DlgAboutBrowserInfoTab : "Browsara uppl??singar", -DlgAboutVersion : "versi??n", -DlgAboutLicense : "Loyvi undir treytum fyri GNU Lesser General Public License", -DlgAboutInfo : "Fleiri uppl??singar, far til" +???/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2006 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * "Support Open Source software. What about a donation today?" + * + * File Name: fo.js + * Faroese language file. + * + * File Authors: + * S??min Lassaberg + * Helgi Arnthorsson + */ + +var FCKLang = +{ +// Language direction : "ltr" (left to right) or "rtl" (right to left). +Dir : "ltr", + +ToolbarCollapse : "Goym ambo??alistan", +ToolbarExpand : "V??s ambo??alistan", + +// Toolbar Items and Context Menu +Save : "Geim", +NewPage : "N??ggj s????a", +Preview : "V??s d??mi", +Cut : "Klipp", +Copy : "Avrita", +Paste : "Set inn", +PasteText : "Set inn sum reinan tekst", +PasteWord : "Set inn fr?? Word", +Print : "Prenta", +SelectAll : "Markera alt", +RemoveFormat : "Sletta sni??geving", +InsertLinkLbl : "Leinkja", +InsertLink : "Seta inn/Broyta Leinkju", +RemoveLink : "Sletta Leinkju", +Anchor : "Seta inn/Broyta sta??setingarmerki", +InsertImageLbl : "Seta inn mynd", +InsertImage : "Seta inn/Broyta mynd", +InsertFlashLbl : "Flash", //MISSING +InsertFlash : "Insert/Edit Flash", //MISSING +InsertTableLbl : "Talva", +InsertTable : "Seta inn/Broyta talvu", +InsertLineLbl : "Linja", +InsertLine : "Seta inn vatnr??tta linju", +InsertSpecialCharLbl: "Serlig tekn", +InsertSpecialChar : "Seta inn serligt tekn", +InsertSmileyLbl : "Smiley", +InsertSmiley : "Seta inn Smiley", +About : "Um FCKeditor", +Bold : "Feit", +Italic : "Sk??stilla??", +Underline : "Undirstrika??", +StrikeThrough : "Strika?? yvir", +Subscript : "L??kka?? skrift", +Superscript : "H??kka?? skrift", +LeftJustify : "Vinstristilla??", +CenterJustify : "Mi??stilla??", +RightJustify : "H??gristilla??", +BlockJustify : "Beinir tekstkantar", +DecreaseIndent : "??kja innrykk", +IncreaseIndent : "Minka innrykk", +Undo : "Angra", +Redo : "Broyt aftur ?? upprunamynd", +NumberedListLbl : "Talsettur listi", +NumberedList : "Seta inn/Sletta talsettan lista", +BulletedListLbl : "Punktsettur listi", +BulletedList : "Seta inn/Sletta punktsettan lista", +ShowTableBorders : "V??sa talvukantar ", +ShowDetails : "V??sa detaljur", +Style : "Tekstsni??", +FontFormat : "Sni??geving", +Font : "Skrift", +FontSize : "Skriftst??dd", +TextColor : "Tekstlitur", +BGColor : "Litur aftanfyri", +Source : "Kelda", +Find : "Leita", +Replace : "Set ?? sta??in", +SpellCheck : "Stavseting", +UniversalKeyboard : "Universalt Tastatur", +PageBreakLbl : "Page Break", //MISSING +PageBreak : "Insert Page Break", //MISSING + +Form : "Seta inn Form", +Checkbox : "Seta inn Avmerkingarboks", +RadioButton : "Seta inn Radioknap", +TextField : "Seta inn Tekstteig", +Textarea : "Seta inn Tekst??ki", +HiddenField : "Seta inn GoymdanTeig", +Button : "Seta inn knapp", +SelectionField : "Seta inn Valteig", +ImageButton : "Seta inn Myndaknapp", + +FitWindow : "Maximize the editor size", //MISSING + +// Context Menu +EditLink : "Broyt leinkju", +CellCM : "Cell", //MISSING +RowCM : "Row", //MISSING +ColumnCM : "Column", //MISSING +InsertRow : "Seta inn rekkju", +DeleteRows : "Sletta rekkjur", +InsertColumn : "Seta inn s??jlur", +DeleteColumns : "Sletta s??jlur", +InsertCell : "Seta inn sellu", +DeleteCells : "Sletta sellu", +MergeCells : "Fl??tta sellur", +SplitCell : "Deila sellur", +TableDelete : "Delete Table", //MISSING +CellProperties : "Eginleikar fyri sellu", +TableProperties : "Eginleikar fyri talvu", +ImageProperties : "Eginleikar fyri mynd", +FlashProperties : "Flash Properties", //MISSING + +AnchorProp : "Eginleikar fyri sta??setingarpunkt", +ButtonProp : "Eginleikar fyri knapp", +CheckboxProp : "Eginleikar fyri avmerkingarboks", +HiddenFieldProp : "Eginleikar fyri goymdan teig", +RadioButtonProp : "Eginleikar fyri radioknapp", +ImageButtonProp : "Eginleikar fyri myndaknapp", +TextFieldProp : "Eginleikar fyri Tekstateig", +SelectionFieldProp : "Eginleikar fyri Valteig", +TextareaProp : "Eginleikar fyri Teksta??ki", +FormProp : "Eginleikar fyri form", + +FontFormats : "Normalt;Sni??gevi??;Adressa;Yvirskrift 1;Yvirskrift 2;Yvirskrift 3;Yvirskrift 4;Yvirskrift 5;Yvirskrift 6", + +// Alerts and Messages +ProcessingXHTML : "Vi??gerir XHTML. B????a...", +Done : "Li??ugt", +PasteWordConfirm : "Teksturin, t?? roynir at seta inn, s??nist at vera fr?? Word. Vilt t?? reinsa tekstin, ????renn hann ver??ur settur inn?", +NotCompatiblePaste : "Hesin ordri er t??kur ?? Internet Explorer 5.5 og n??ggjari. Vilt t?? seta tekstin inn, uttan at reinsa hann?", +UnknownToolbarItem : "??kendur lutur ?? ambo??alinju \"%1\"", +UnknownCommand : "Kenni ikki ordra \"%1\"", +NotImplemented : "Ordrin er ikki gj??rdur virkin", +UnknownToolbarSet : "Ambo??alinjan \"%1\" finst ikki", +NoActiveX : "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING +BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING +DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING + +// Dialogs +DlgBtnOK : "OK", +DlgBtnCancel : "Angra", +DlgBtnClose : "Lukka", +DlgBtnBrowseServer : "Hyggja ?? servara", +DlgAdvancedTag : "??tv????ka", +DlgOpOther : "", +DlgInfoTab : "Info", //MISSING +DlgAlertUrl : "Please insert the URL", //MISSING + +// General Dialogs Labels +DlgGenNotSet : "", +DlgGenId : "Id", +DlgGenLangDir : "Tekstak??s", +DlgGenLangDirLtr : "Vinstri m??ti h??gri (LTR)", +DlgGenLangDirRtl : "H??gri m??ti vinstri (RTL)", +DlgGenLangCode : "M??lkoda", +DlgGenAccessKey : "Atgongdslykil", +DlgGenName : "Navn", +DlgGenTabIndex : "Tabulator Indeks", +DlgGenLongDescr : "v????ka fr??grei??ing", +DlgGenClass : "Typografiark", +DlgGenTitle : "Heiti", +DlgGenContType : "Innihaldsslag", +DlgGenLinkCharset : "Teknset", +DlgGenStyle : "Prentlist", + +// Image Dialog +DlgImgTitle : "Mynd eginleikar", +DlgImgInfoTab : "Mynd info", +DlgImgBtnUpload : "Send til serveren", +DlgImgURL : "URL", +DlgImgUpload : "Upload", +DlgImgAlt : "Annar tekstur", +DlgImgWidth : "Breidd", +DlgImgHeight : "H??dd", +DlgImgLockRatio : "L??s st??ddarlutfall", +DlgBtnResetSize : "Nulstilla st??dd", +DlgImgBorder : "Ramma", +DlgImgHSpace : "HMargin", +DlgImgVSpace : "VMargin", +DlgImgAlign : "Justering", +DlgImgAlignLeft : "Vinstra", +DlgImgAlignAbsBottom: "Abs botnur", +DlgImgAlignAbsMiddle: "Abs Mi??ja", +DlgImgAlignBaseline : "Botnlinja", +DlgImgAlignBottom : "Botnur", +DlgImgAlignMiddle : "Mi??ja", +DlgImgAlignRight : "H??gra", +DlgImgAlignTextTop : "Tekstur ovast", +DlgImgAlignTop : "Ovast", +DlgImgPreview : "V??s d??mi", +DlgImgAlertUrl : "Sl?? inn sl????ina til myndina", +DlgImgLinkTab : "Leinkja", + +// Flash Dialog +DlgFlashTitle : "Flash Properties", //MISSING +DlgFlashChkPlay : "Auto Play", //MISSING +DlgFlashChkLoop : "Loop", //MISSING +DlgFlashChkMenu : "Enable Flash Menu", //MISSING +DlgFlashScale : "Scale", //MISSING +DlgFlashScaleAll : "Show all", //MISSING +DlgFlashScaleNoBorder : "No Border", //MISSING +DlgFlashScaleFit : "Exact Fit", //MISSING + +// Link Dialog +DlgLnkWindowTitle : "Leinkja", +DlgLnkInfoTab : "Leinkju info", +DlgLnkTargetTab : "M??l", + +DlgLnkType : "Leinkju slag", +DlgLnkTypeURL : "URL", +DlgLnkTypeAnchor : "Akker ?? hesari s????uni", +DlgLnkTypeEMail : "Teldupostur", +DlgLnkProto : "Protokoll", +DlgLnkProtoOther : "", +DlgLnkURL : "URL", +DlgLnkAnchorSel : "VEl eitt akker", +DlgLnkAnchorByName : "Eftir akker navni", +DlgLnkAnchorById : "Eftir element Id", +DlgLnkNoAnchors : "", +DlgLnkTargetPopup : "", +DlgLnkTargetBlank : "Nytt vindeyga (_blank)", +DlgLnkTargetParent : "Oman?? liggjandi vindeyga (_parent)", +DlgLnkTargetSelf : "Sama vindeyga (_self)", +DlgLnkTargetTop : "ovasta vindeyga (_top)", +DlgLnkTargetFrameName : "v??sa vindeygas navn", +DlgLnkPopWinName : "Popup vindeygas navn", +DlgLnkPopWinFeat : "Popup vindeygas eginleikar", +DlgLnkPopResize : "Skalering", +DlgLnkPopLocation : "Lokationslinja", +DlgLnkPopMenu : "Menulinja", +DlgLnkPopScroll : "Scrollbars", +DlgLnkPopStatus : "Statuslinja", +DlgLnkPopToolbar : "V??rkt??jslinja", +DlgLnkPopFullScrn : "Fullur skermur (IE)", +DlgLnkPopDependent : "Bundin (Netscape)", +DlgLnkPopWidth : "Breidd", +DlgLnkPopHeight : "H??dd", +DlgLnkPopLeft : "Positi??n fr?? vinstru", +DlgLnkPopTop : "Positi??n fr?? toppinum", + +DlnLnkMsgNoUrl : "Inntasta leinkju URL", +DlnLnkMsgNoEMail : "Inntasta teldupost addressuna", +DlnLnkMsgNoAnchor : "Vel akker", + +// Color Dialog +DlgColorTitle : "vel farvu", +DlgColorBtnClear : "sletta alt", +DlgColorHighlight : "Markera", +DlgColorSelected : "valt", + +// Smiley Dialog +DlgSmileyTitle : "Innset ein smiley", + +// Special Character Dialog +DlgSpecialCharTitle : "vel specialkarakter", + +// Table Dialog +DlgTableTitle : "Tabel eginleikar", +DlgTableRows : "Rekkjur", +DlgTableColumns : "Kolonnur", +DlgTableBorder : "Rammu st??dd", +DlgTableAlign : "Justering", +DlgTableAlignNotSet : "", +DlgTableAlignLeft : "Vinstrastilla", +DlgTableAlignCenter : "Mi??seta", +DlgTableAlignRight : "H??grastilla", +DlgTableWidth : "Breidd", +DlgTableWidthPx : "pixels", +DlgTableWidthPc : "prosent", +DlgTableHeight : "H??dd", +DlgTableCellSpace : "Fjarst????a millum sellur", +DlgTableCellPad : "Sellu breddi", +DlgTableCaption : "Heiti", +DlgTableSummary : "Summary", //MISSING + +// Table Cell Dialog +DlgCellTitle : "Sellu eginleikar", +DlgCellWidth : "Breidd", +DlgCellWidthPx : "pixels", +DlgCellWidthPc : "prosent", +DlgCellHeight : "H??dd", +DlgCellWordWrap : "Or??b??ti", +DlgCellWordWrapNotSet : "", +DlgCellWordWrapYes : "Ja", +DlgCellWordWrapNo : "Nej", +DlgCellHorAlign : "Horisontal justering", +DlgCellHorAlignNotSet : "", +DlgCellHorAlignLeft : "Vinstrastilla", +DlgCellHorAlignCenter : "Mi??sett", +DlgCellHorAlignRight: "H??grastilla", +DlgCellVerAlign : "Lodr??tt Justering", +DlgCellVerAlignNotSet : "", +DlgCellVerAlignTop : "Ovast", +DlgCellVerAlignMiddle : "Mi??ja", +DlgCellVerAlignBottom : "Ni??ast", +DlgCellVerAlignBaseline : "Botnlinja", +DlgCellRowSpan : "Tal av rekkjum sellan spennur yvir", +DlgCellCollSpan : "Tal av talr????um sellan spennur yvir", +DlgCellBackColor : "Bakgrundsfarva", +DlgCellBorderColor : "rammufarva", +DlgCellBtnSelect : "Vel...", + +// Find Dialog +DlgFindTitle : "Finn", +DlgFindFindBtn : "Finn", +DlgFindNotFoundMsg : "Teksturin bleiv ikki funnin", + +// Replace Dialog +DlgReplaceTitle : "Set ?? sta??in", +DlgReplaceFindLbl : "Finn:", +DlgReplaceReplaceLbl : "Set ?? sta??in vi??:", +DlgReplaceCaseChk : "Munur ?? st??rum og sm????um stavum", +DlgReplaceReplaceBtn : "Set ?? sta??in", +DlgReplaceReplAllBtn : "Skift alt ??t", +DlgReplaceWordChk : "Bert heil or??", + +// Paste Operations / Dialog +PasteErrorPaste : "Leitarans trygdarinstillingar loyva ikki editorinum at innseta tekstin automatiskt. Br??ka knappabor??i?? til at innseta tekstin (Ctrl+V).", +PasteErrorCut : "Leitarans trygdarinstillingar loyva ikki editorinum at klippa tekstin automatiskt. Br??ka ?? sta??in knappabor??i?? til at klippa tekstin (Ctrl+X).", +PasteErrorCopy : "Leitarans trygdarinstillingar loyva ikki editorinum at avrita tekstin automatiskt. Br??ka ?? sta??in knappabor??i?? til at avrita tekstin (Ctrl+V).", + +PasteAsText : "Seta inn som reinur tekstur", +PasteFromWord : "Seta inn fra Word", + +DlgPasteMsg2 : "Please paste inside the following box using the keyboard (Ctrl+V) and hit OK.", //MISSING +DlgPasteIgnoreFont : "Ignore Font Face definitions", //MISSING +DlgPasteRemoveStyles : "Remove Styles definitions", //MISSING +DlgPasteCleanBox : "Clean Up Box", //MISSING + +// Color Picker +ColorAutomatic : "Automatisk", +ColorMoreColors : "Fleiri farvur...", + +// Document Properties +DocProps : "Dokument eginleikar", + +// Anchor Dialog +DlgAnchorTitle : "Akker eginleikar", +DlgAnchorName : "Akker navn", +DlgAnchorErrorName : "Sl?? innn akker navn", + +// Speller Pages Dialog +DlgSpellNotInDic : "Finnst ikki ?? or??ab??kini", +DlgSpellChangeTo : "broyta til", +DlgSpellBtnIgnore : "Ignorera", +DlgSpellBtnIgnoreAll : "Ignorera alt", +DlgSpellBtnReplace : "Skift ??t", +DlgSpellBtnReplaceAll : "Skift ??t alt", +DlgSpellBtnUndo : "Aftur", +DlgSpellNoSuggestions : "- Einki uppskot -", +DlgSpellProgress : "Stavarin arbei??ir...", +DlgSpellNoMispell : "Stavarain li??ugur: Eingin feilur funnin", +DlgSpellNoChanges : "Stavarain li??ugur: Einki or?? broytt", +DlgSpellOneChange : "Stavarain li??ugur: Eitt or?? broytt", +DlgSpellManyChanges : "Stavarain li??ugur: %1 or?? broytt", + +IeSpellDownload : "Stavarin ikki lagdur inn. vilt t?? heinta hann n???", + +// Button Dialog +DlgButtonText : "Tekstur (Vir??i)", +DlgButtonType : "Slag", + +// Checkbox and Radio Button Dialogs +DlgCheckboxName : "Navn", +DlgCheckboxValue : "Vir??i", +DlgCheckboxSelected : "Valgt", + +// Form Dialog +DlgFormName : "Navn", +DlgFormAction : "Ger??", +DlgFormMethod : "H??ttur", + +// Select Field Dialog +DlgSelectName : "Navn", +DlgSelectValue : "Vir??i", +DlgSelectSize : "St??dd", +DlgSelectLines : "linjir", +DlgSelectChkMulti : "Loyv fleiri valm??guleikar", +DlgSelectOpAvail : "valm??guleikar", +DlgSelectOpText : "Tekstur", +DlgSelectOpValue : "Vir??i", +DlgSelectBtnAdd : "Legg afturat", +DlgSelectBtnModify : "Broyt", +DlgSelectBtnUp : "Upp", +DlgSelectBtnDown : "Ni??ur", +DlgSelectBtnSetValue : "Set sum ??tvald", +DlgSelectBtnDelete : "Sletta", + +// Textarea Dialog +DlgTextareaName : "Navn", +DlgTextareaCols : "talr????", +DlgTextareaRows : "Rekkja", + +// Text Field Dialog +DlgTextName : "Navn", +DlgTextValue : "Vir??i", +DlgTextCharWidth : "Sj??nligt tal av b??kstavum", +DlgTextMaxChars : "H??gst loyvda tal av b??kstavum", +DlgTextType : "Slag", +DlgTextTypeText : "Tekstur", +DlgTextTypePass : "Koduor??", + +// Hidden Field Dialog +DlgHiddenName : "Navn", +DlgHiddenValue : "Vir??i", + +// Bulleted List Dialog +BulletedListProp : "Punktteknsuppsetingar eginleikar", +NumberedListProp : "Taluppsetingar eginleikar", +DlgLstType : "Slag", +DlgLstTypeCircle : "Sirkul", +DlgLstTypeDisc : "Disc", //MISSING +DlgLstTypeSquare : "F??rakantur", +DlgLstTypeNumbers : "Talmerkt (1, 2, 3)", +DlgLstTypeLCase : "Sm??ir b??kstavir (a, b, c)", +DlgLstTypeUCase : "St??rir b??kstavir (A, B, C)", +DlgLstTypeSRoman : "Sm?? r??marat??l (i, ii, iii)", +DlgLstTypeLRoman : "St??r r??marat??l (I, II, III)", + +// Document Properties Dialog +DlgDocGeneralTab : "Generelt", +DlgDocBackTab : "Bakgrund", +DlgDocColorsTab : "Farva og Breddin", +DlgDocMetaTab : "Meta Information", + +DlgDocPageTitle : "S????u heiti", +DlgDocLangDir : "M??l", +DlgDocLangDirLTR : "Fr?? vinstru m??ti h??gru (LTR)", +DlgDocLangDirRTL : "Fr?? h??gru m??ti vinstru (RTL)", +DlgDocLangCode : "Landakoda", +DlgDocCharSet : "Karakter set kodu", +DlgDocCharSetOther : "Annar karakter set kodu", + +DlgDocDocType : "Dokument slag kategori", +DlgDocDocTypeOther : "Anna?? dokument slag kategori", +DlgDocIncXHTML : "Inkludere XHTML deklartion", +DlgDocBgColor : "Bakgrundsfarva", +DlgDocBgImage : "Bakgrundsmynd URL", +DlgDocBgNoScroll : "Ikki scrollbar bakgrund", +DlgDocCText : "Tekstur", +DlgDocCLink : "Leinkja", +DlgDocCVisited : "Vitja leinkja", +DlgDocCActive : "Aktiv leinkja", +DlgDocMargins : "S????u breddi", +DlgDocMaTop : "Ovast", +DlgDocMaLeft : "Vinstra", +DlgDocMaRight : "H??gra", +DlgDocMaBottom : "Ni??ast", +DlgDocMeIndex : "Dokument index lyklaor?? (komma sundurskilt)", +DlgDocMeDescr : "Dokument l??sing", +DlgDocMeAuthor : "H??vundur", +DlgDocMeCopy : "Copyright", +DlgDocPreview : "V??s", + +// Templates Dialog +Templates : "Frymlar", +DlgTemplatesTitle : "Innihaldsfrymlar", +DlgTemplatesSelMsg : "Vel tann frymilin, sum skal opnast ?? editorinum
      (Ta?? ver??ur skriva ??tyvir n??verandi innihald):", +DlgTemplatesLoading : "Heintar lista yvir frymlar. Vinarliga b????a...", +DlgTemplatesNoTpl : "(Ongin frymil er valdur)", + +// About Dialog +DlgAboutAboutTab : "Um", +DlgAboutBrowserInfoTab : "Browsara uppl??singar", +DlgAboutLicenseTab : "License", //MISSING +DlgAboutVersion : "versi??n", +DlgAboutLicense : "Loyvi undir treytum fyri GNU Lesser General Public License", +DlgAboutInfo : "Fleiri uppl??singar, far til" } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fr.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fr.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/fr.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -27,7 +27,7 @@ // Toolbar Items and Context Menu Save : "Enregistrer", -NewPage : "Nouvelle Page", +NewPage : "Nouvelle page", Preview : "Pr??visualisation", Cut : "Couper", Copy : "Copier", @@ -36,23 +36,23 @@ PasteWord : "Coller de Word", Print : "Imprimer", SelectAll : "Tout s??lectionner", -RemoveFormat : "Supprimer Format", +RemoveFormat : "Supprimer le format", InsertLinkLbl : "Lien", -InsertLink : "Ins??rer/Modifier Lien", -RemoveLink : "Supprimer Lien", -Anchor : "Ins??rer/Modifier Ancre", +InsertLink : "Ins??rer/modifier le lien", +RemoveLink : "Supprimer le lien", +Anchor : "Ins??rer/modifier l'ancre", InsertImageLbl : "Image", -InsertImage : "Ins??rer/Modifier Image", +InsertImage : "Ins??rer/modifier l'image", InsertFlashLbl : "Animation Flash", -InsertFlash : "Ins??rer/Modifier Animation Flash", +InsertFlash : "Ins??rer/modifier l'animation Flash", InsertTableLbl : "Tableau", -InsertTable : "Ins??rer/Modifier Tableau", +InsertTable : "Ins??rer/modifier le tableau", InsertLineLbl : "S??parateur", -InsertLine : "Ins??rer S??parateur", -InsertSpecialCharLbl: "Caract??re Sp??cial", -InsertSpecialChar : "Ins??rer Caract??re Sp??cial", +InsertLine : "Ins??rer un s??parateur", +InsertSpecialCharLbl: "Caract??res sp??ciaux", +InsertSpecialChar : "Ins??rer un caract??re sp??cial", InsertSmileyLbl : "Smiley", -InsertSmiley : "Ins??rer Smiley", +InsertSmiley : "Ins??rer un Smiley", About : "A propos de FCKeditor", Bold : "Gras", Italic : "Italique", @@ -60,72 +60,77 @@ StrikeThrough : "Barr??", Subscript : "Indice", Superscript : "Exposant", -LeftJustify : "Align?? ?? Gauche", +LeftJustify : "Align?? ?? gauche", CenterJustify : "Centr??", RightJustify : "Align?? ?? Droite", -BlockJustify : "Texte Justifi??", -DecreaseIndent : "Diminuer le Retrait", -IncreaseIndent : "Augmenter le Retrait", +BlockJustify : "Texte justifi??", +DecreaseIndent : "Diminuer le retrait", +IncreaseIndent : "Augmenter le retrait", Undo : "Annuler", Redo : "Refaire", -NumberedListLbl : "Liste Num??rot??e", -NumberedList : "Ins??rer/Supprimer Liste Num??rot??e", +NumberedListLbl : "Liste num??rot??e", +NumberedList : "Ins??rer/supprimer la liste num??rot??e", BulletedListLbl : "Liste ?? puces", -BulletedList : "Ins??rer/Supprimer Liste ?? puces", -ShowTableBorders : "Afficher Bordures de Tableau", -ShowDetails : "Afficher Caract??res Invisibles", +BulletedList : "Ins??rer/supprimer la liste ?? puces", +ShowTableBorders : "Afficher les bordures du tableau", +ShowDetails : "Afficher les caract??res invisibles", Style : "Style", FontFormat : "Format", Font : "Police", FontSize : "Taille", -TextColor : "Couleur de Caract??re", -BGColor : "Couleur de Fond", +TextColor : "Couleur de caract??re", +BGColor : "Couleur de fond", Source : "Source", Find : "Chercher", Replace : "Remplacer", SpellCheck : "Orthographe", -UniversalKeyboard : "Clavier Universel", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING +UniversalKeyboard : "Clavier universel", +PageBreakLbl : "Saut de page", +PageBreak : "Ins??rer un saut de page", Form : "Formulaire", Checkbox : "Case ?? cocher", -RadioButton : "Bouton Radio", -TextField : "Champ Texte", -Textarea : "Zone Texte", +RadioButton : "Bouton radio", +TextField : "Champ texte", +Textarea : "Zone de texte", HiddenField : "Champ cach??", Button : "Bouton", -SelectionField : "Liste/Menu", -ImageButton : "Bouton Image", +SelectionField : "Liste/menu", +ImageButton : "Bouton image", + +FitWindow : "Maximize the editor size", //MISSING // Context Menu -EditLink : "Modifier Lien", -InsertRow : "Ins??rer une Ligne", -DeleteRows : "Supprimer des Lignes", -InsertColumn : "Ins??rer une Colonne", -DeleteColumns : "Supprimer des Colonnes", -InsertCell : "Ins??rer une Cellule", -DeleteCells : "Supprimer des Cellules", -MergeCells : "Fusionner les Cellules", -SplitCell : "Scinder les Cellules", -TableDelete : "Delete Table", //MISSING -CellProperties : "Propri??t??s de Cellule", -TableProperties : "Propri??t??s de Tableau", -ImageProperties : "Propri??t??s d'Image", -FlashProperties : "Propri??t??s d'Animation Flash", - -AnchorProp : "Propri??t??s d'Ancre", -ButtonProp : "Propri??t??s de Bouton", -CheckboxProp : "Propri??t??s de Case ?? Cocher", -HiddenFieldProp : "Propri??t??s de Champ Cach??", -RadioButtonProp : "Propri??t??s de Bouton Radio", -ImageButtonProp : "Propri??t??s de Bouton Image", -TextFieldProp : "Propri??t??s de Champ Texte", -SelectionFieldProp : "Propri??t??s de Liste/Menu", -TextareaProp : "Propri??t??s de Zone Texte", -FormProp : "Propri??t??s de Formulaire", - -FontFormats : "Normal;Formatted;Address;Titre 1;Titre 2;Titre 3;Titre 4;Titre 5;Titre 6", +EditLink : "Modifier le lien", +CellCM : "Cell", //MISSING +RowCM : "Row", //MISSING +ColumnCM : "Column", //MISSING +InsertRow : "Ins??rer une ligne", +DeleteRows : "Supprimer des lignes", +InsertColumn : "Ins??rer une colonne", +DeleteColumns : "Supprimer des colonnes", +InsertCell : "Ins??rer une cellule", +DeleteCells : "Supprimer des cellules", +MergeCells : "Fusionner les cellules", +SplitCell : "Scinder les cellules", +TableDelete : "Supprimer le tableau", +CellProperties : "Propri??t??s de cellule", +TableProperties : "Propri??t??s du tableau", +ImageProperties : "Propri??t??s de l'image", +FlashProperties : "Propri??t??s de l'animation Flash", + +AnchorProp : "Propri??t??s de l'ancre", +ButtonProp : "Propri??t??s du bouton", +CheckboxProp : "Propri??t??s de la case ?? cocher", +HiddenFieldProp : "Propri??t??s du champ cach??", +RadioButtonProp : "Propri??t??s du bouton radio", +ImageButtonProp : "Propri??t??s du bouton image", +TextFieldProp : "Propri??t??s du champ texte", +SelectionFieldProp : "Propri??t??s de la liste/du menu", +TextareaProp : "Propri??t??s de la zone de texte", +FormProp : "Propri??t??s du formulaire", + +FontFormats : "Normal;Format??;Adresse;Titre 1;Titre 2;Titre 3;Titre 4;Titre 5;Titre 6", // Alerts and Messages ProcessingXHTML : "Calcul XHTML. Veuillez patienter...", @@ -137,50 +142,50 @@ NotImplemented : "Commande non encore ??crite", UnknownToolbarSet : "La barre d'outils \"%1\" n'existe pas", NoActiveX : "Les param??tres de s??curit?? de votre navigateur peuvent limiter quelques fonctionnalit??s de l'??diteur. Veuillez activer l'option \"Ex??cuter les contr??les ActiveX et les plug-ins\". Il se peut que vous rencontriez des erreurs et remarquiez quelques limitations.", -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING +BrowseServerBlocked : "Le navigateur n'a pas pu ??tre ouvert. Assurez-vous que les bloqueurs de popups soient d??sactiv??s.", +DialogBlocked : "La fen??tre de dialogue n'a pas pu s'ouvrir. Assurez-vous que les bloqueurs de popups soient d??sactiv??s.", // Dialogs DlgBtnOK : "OK", DlgBtnCancel : "Annuler", DlgBtnClose : "Fermer", -DlgBtnBrowseServer : "Parcourir le Serveur", +DlgBtnBrowseServer : "Parcourir le serveur", DlgAdvancedTag : "Avanc??", -DlgOpOther : "<Autre>", +DlgOpOther : "", DlgInfoTab : "Info", DlgAlertUrl : "Veuillez saisir l'URL", // General Dialogs Labels -DlgGenNotSet : "<Par D??faut>", +DlgGenNotSet : "", DlgGenId : "Id", -DlgGenLangDir : "Sens d'Ecriture", -DlgGenLangDirLtr : "Gauche vers Droite (LTR)", -DlgGenLangDirRtl : "Droite vers Gauche (RTL)", -DlgGenLangCode : "Code Langue", -DlgGenAccessKey : "Equivalent Clavier", +DlgGenLangDir : "Sens d'??criture", +DlgGenLangDirLtr : "De la gauche vers la droite (LTR)", +DlgGenLangDirRtl : "De la roite vers la gauche (RTL)", +DlgGenLangCode : "Code langue", +DlgGenAccessKey : "Equivalent clavier", DlgGenName : "Nom", -DlgGenTabIndex : "Ordre de Tabulation", -DlgGenLongDescr : "URL de Description Longue", -DlgGenClass : "Classes de Feuilles de Style", -DlgGenTitle : "Titre Indicatif", -DlgGenContType : "Type de Contenu Indicatif", -DlgGenLinkCharset : "Encodage de Caract??re de la cible", +DlgGenTabIndex : "Ordre de tabulation", +DlgGenLongDescr : "URL de description longue", +DlgGenClass : "Classes de feuilles de style", +DlgGenTitle : "Titre indicatif", +DlgGenContType : "Type de contenu indicatif", +DlgGenLinkCharset : "Encodage de caract??re de la cible", DlgGenStyle : "Style", // Image Dialog -DlgImgTitle : "Propri??t??s d'Image", -DlgImgInfoTab : "Informations sur l'Image", -DlgImgBtnUpload : "Envoyer au Serveur", +DlgImgTitle : "Propri??t??s de l'image", +DlgImgInfoTab : "Informations sur l'image", +DlgImgBtnUpload : "Envoyer sur le serveur", DlgImgURL : "URL", -DlgImgUpload : "Upload", -DlgImgAlt : "Texte de Remplacement", +DlgImgUpload : "T??l??charger", +DlgImgAlt : "Texte de remplacement", DlgImgWidth : "Largeur", DlgImgHeight : "Hauteur", -DlgImgLockRatio : "Garder proportions", -DlgBtnResetSize : "Taille Originale", +DlgImgLockRatio : "Garder les proportions", +DlgBtnResetSize : "Taille originale", DlgImgBorder : "Bordure", -DlgImgHSpace : "HSpace", -DlgImgVSpace : "VSpace", +DlgImgHSpace : "Espacement horizontal", +DlgImgVSpace : "Espacement vertical", DlgImgAlign : "Alignement", DlgImgAlignLeft : "Gauche", DlgImgAlignAbsBottom: "Abs Bas", @@ -196,59 +201,59 @@ DlgImgLinkTab : "Lien", // Flash Dialog -DlgFlashTitle : "Propri??t??s d'animation Flash", +DlgFlashTitle : "Propri??t??s de l'animation Flash", DlgFlashChkPlay : "Lecture automatique", DlgFlashChkLoop : "Boucle", -DlgFlashChkMenu : "Activer menu Flash", +DlgFlashChkMenu : "Activer le menu Flash", DlgFlashScale : "Affichage", -DlgFlashScaleAll : "Par d??fault (tout montrer)", -DlgFlashScaleNoBorder : "Sans Bordure", -DlgFlashScaleFit : "Ajuster aux Dimensions", +DlgFlashScaleAll : "Par d??faut (tout montrer)", +DlgFlashScaleNoBorder : "Sans bordure", +DlgFlashScaleFit : "Ajuster aux dimensions", // Link Dialog -DlgLnkWindowTitle : "Propri??t??s de Lien", -DlgLnkInfoTab : "Informations sur le Lien", +DlgLnkWindowTitle : "Propri??t??s du lien", +DlgLnkInfoTab : "Informations sur le lien", DlgLnkTargetTab : "Destination", -DlgLnkType : "Type de Lien", +DlgLnkType : "Type de lien", DlgLnkTypeURL : "URL", DlgLnkTypeAnchor : "Ancre dans cette page", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "Protocole", -DlgLnkProtoOther : "<autre>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", -DlgLnkAnchorSel : "S??lectionner une Ancre", -DlgLnkAnchorByName : "Par Nom d'Ancre", -DlgLnkAnchorById : "Par Id d'El??ment", -DlgLnkNoAnchors : "<Pas d'ancre disponible dans le document>", +DlgLnkAnchorSel : "S??lectionner une ancre", +DlgLnkAnchorByName : "Par nom d'ancre", +DlgLnkAnchorById : "Par Id d'??l??ment", +DlgLnkNoAnchors : "", DlgLnkEMail : "Adresse E-Mail", -DlgLnkEMailSubject : "Sujet du Message", -DlgLnkEMailBody : "Corps du Message", -DlgLnkUpload : "Upload", -DlgLnkBtnUpload : "Envoyer au Serveur", +DlgLnkEMailSubject : "Sujet du message", +DlgLnkEMailBody : "Corps du message", +DlgLnkUpload : "T??l??charger", +DlgLnkBtnUpload : "Envoyer sur le serveur", DlgLnkTarget : "Destination", -DlgLnkTargetFrame : "<cadre>", -DlgLnkTargetPopup : "<fen??tre popup>", -DlgLnkTargetBlank : "Nouvelle Fen??tre (_blank)", -DlgLnkTargetParent : "Fen??tre M??re (_parent)", -DlgLnkTargetSelf : "M??me Fen??tre (_self)", -DlgLnkTargetTop : "Fen??tre Sup??rieure (_top)", -DlgLnkTargetFrameName : "Nom du Cadre de Destination", -DlgLnkPopWinName : "Nom de la Fen??tre Popup", -DlgLnkPopWinFeat : "Caract??ristiques de la Fen??tre Popup", -DlgLnkPopResize : "Taille Modifiable", -DlgLnkPopLocation : "Barre d'Adresses", -DlgLnkPopMenu : "Barre de Menu", -DlgLnkPopScroll : "Barres de D??filement", -DlgLnkPopStatus : "Barre d'Etat", -DlgLnkPopToolbar : "Barre d'Outils", -DlgLnkPopFullScrn : "Plein Ecran (IE)", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", +DlgLnkTargetBlank : "Nouvelle fen??tre (_blank)", +DlgLnkTargetParent : "Fen??tre m??re (_parent)", +DlgLnkTargetSelf : "M??me fen??tre (_self)", +DlgLnkTargetTop : "Fen??tre sup??rieure (_top)", +DlgLnkTargetFrameName : "Nom du cadre de destination", +DlgLnkPopWinName : "Nom de la fen??tre popup", +DlgLnkPopWinFeat : "Caract??ristiques de la fen??tre popup", +DlgLnkPopResize : "Taille modifiable", +DlgLnkPopLocation : "Barre d'adresses", +DlgLnkPopMenu : "Barre de menu", +DlgLnkPopScroll : "Barres de d??filement", +DlgLnkPopStatus : "Barre d'??tat", +DlgLnkPopToolbar : "Barre d'outils", +DlgLnkPopFullScrn : "Plein ??cran (IE)", DlgLnkPopDependent : "D??pendante (Netscape)", DlgLnkPopWidth : "Largeur", DlgLnkPopHeight : "Hauteur", -DlgLnkPopLeft : "Position Gauche", -DlgLnkPopTop : "Position Haut", +DlgLnkPopLeft : "Position ?? partir de la gauche", +DlgLnkPopTop : "Position ?? partir du haut", DlnLnkMsgNoUrl : "Veuillez saisir l'URL", DlnLnkMsgNoEMail : "Veuillez saisir l'adresse e-mail", @@ -257,22 +262,22 @@ // Color Dialog DlgColorTitle : "S??lectionner", DlgColorBtnClear : "Effacer", -DlgColorHighlight : "Highlight", +DlgColorHighlight : "Mettre en exergue", DlgColorSelected : "S??lectionn??", // Smiley Dialog -DlgSmileyTitle : "Ins??rer Smiley", +DlgSmileyTitle : "Ins??rer un Smiley", // Special Character Dialog -DlgSpecialCharTitle : "Ins??rer Caract??re Sp??cial", +DlgSpecialCharTitle : "Ins??rer un caract??re sp??cial", // Table Dialog -DlgTableTitle : "Propri??t??s de Tableau", +DlgTableTitle : "Propri??t??s du tableau", DlgTableRows : "Lignes", DlgTableColumns : "Colonnes", DlgTableBorder : "Bordure", DlgTableAlign : "Alignement", -DlgTableAlignNotSet : "", +DlgTableAlignNotSet : "", DlgTableAlignLeft : "Gauche", DlgTableAlignCenter : "Centr??", DlgTableAlignRight : "Droite", @@ -286,28 +291,28 @@ DlgTableSummary : "R??sum??", // Table Cell Dialog -DlgCellTitle : "Propri??t??s de cellule", +DlgCellTitle : "Propri??t??s de la cellule", DlgCellWidth : "Largeur", DlgCellWidthPx : "pixels", DlgCellWidthPc : "pourcentage", DlgCellHeight : "Hauteur", DlgCellWordWrap : "Retour ?? la ligne", -DlgCellWordWrapNotSet : "", +DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "Oui", DlgCellWordWrapNo : "Non", -DlgCellHorAlign : "Alignement Horizontal", -DlgCellHorAlignNotSet : "", +DlgCellHorAlign : "Alignement horizontal", +DlgCellHorAlignNotSet : "", DlgCellHorAlignLeft : "Gauche", DlgCellHorAlignCenter : "Centr??", DlgCellHorAlignRight: "Droite", -DlgCellVerAlign : "Alignement Vertical", -DlgCellVerAlignNotSet : "", +DlgCellVerAlign : "Alignement vertical", +DlgCellVerAlignNotSet : "", DlgCellVerAlignTop : "Haut", DlgCellVerAlignMiddle : "Milieu", DlgCellVerAlignBottom : "Bas", DlgCellVerAlignBaseline : "Bas du texte", -DlgCellRowSpan : "Lignes Fusionn??es", -DlgCellCollSpan : "Colonnes Fusionn??es", +DlgCellRowSpan : "Lignes fusionn??es", +DlgCellCollSpan : "Colonnes fusionn??es", DlgCellBackColor : "Fond", DlgCellBorderColor : "Bordure", DlgCellBtnSelect : "Choisir...", @@ -335,30 +340,29 @@ PasteFromWord : "Coller ?? partir de Word", DlgPasteMsg2 : "Veuillez coller dans la zone ci-dessous en utilisant le clavier (Ctrl+V) et cliquez sur OK.", -DlgPasteIgnoreFont : "Ignorer les Polices de Caract??res", -DlgPasteRemoveStyles : "Supprimer les Styles", +DlgPasteIgnoreFont : "Ignorer les polices de caract??res", +DlgPasteRemoveStyles : "Supprimer les styles", DlgPasteCleanBox : "Effacer le contenu", - // Color Picker ColorAutomatic : "Automatique", -ColorMoreColors : "Plus de Couleurs...", +ColorMoreColors : "Plus de couleurs...", // Document Properties -DocProps : "Propri??t??s du Document", +DocProps : "Propri??t??s du document", // Anchor Dialog -DlgAnchorTitle : "Propri??t??s de l'Ancre", -DlgAnchorName : "Nom de l'Ancre", +DlgAnchorTitle : "Propri??t??s de l'ancre", +DlgAnchorName : "Nom de l'ancre", DlgAnchorErrorName : "Veuillez saisir le nom de l'ancre", // Speller Pages Dialog DlgSpellNotInDic : "Pas dans le dictionnaire", DlgSpellChangeTo : "Changer en", DlgSpellBtnIgnore : "Ignorer", -DlgSpellBtnIgnoreAll : "Ignorer Tout", +DlgSpellBtnIgnoreAll : "Ignorer tout", DlgSpellBtnReplace : "Remplacer", -DlgSpellBtnReplaceAll : "Remplacer Tout", +DlgSpellBtnReplaceAll : "Remplacer tout", DlgSpellBtnUndo : "Annuler", DlgSpellNoSuggestions : "- Aucune suggestion -", DlgSpellProgress : "V??rification d'orthographe en cours...", @@ -370,7 +374,7 @@ IeSpellDownload : "Le Correcteur n'est pas install??. Souhaitez-vous le t??l??charger maintenant?", // Button Dialog -DlgButtonText : "Texte (Valeur)", +DlgButtonText : "Texte (valeur)", DlgButtonType : "Type", // Checkbox and Radio Button Dialogs @@ -389,7 +393,7 @@ DlgSelectSize : "Taille", DlgSelectLines : "lignes", DlgSelectChkMulti : "S??lection multiple", -DlgSelectOpAvail : "Options Disponibles", +DlgSelectOpAvail : "Options disponibles", DlgSelectOpText : "Texte", DlgSelectOpValue : "Valeur", DlgSelectBtnAdd : "Ajouter", @@ -407,59 +411,59 @@ // Text Field Dialog DlgTextName : "Nom", DlgTextValue : "Valeur", -DlgTextCharWidth : "Largeur en Caract??res", -DlgTextMaxChars : "Nombre Maximum de Caract??res", +DlgTextCharWidth : "Largeur en caract??res", +DlgTextMaxChars : "Nombre maximum de caract??res", DlgTextType : "Type", DlgTextTypeText : "Texte", -DlgTextTypePass : "Mot de Passe", +DlgTextTypePass : "Mot de passe", // Hidden Field Dialog DlgHiddenName : "Nom", DlgHiddenValue : "Valeur", // Bulleted List Dialog -BulletedListProp : "Propri??t??s de Liste ?? puces", -NumberedListProp : "Propri??t??s de Num??rot??e", +BulletedListProp : "Propri??t??s de liste ?? puces", +NumberedListProp : "Propri??t??s de num??rot??e", DlgLstType : "Type", DlgLstTypeCircle : "Cercle", DlgLstTypeDisc : "Disque", DlgLstTypeSquare : "Carr??", DlgLstTypeNumbers : "Nombres (1, 2, 3)", -DlgLstTypeLCase : "Lettres Minuscules (a, b, c)", -DlgLstTypeUCase : "Lettres Majuscules (A, B, C)", -DlgLstTypeSRoman : "Chiffres Romains Minuscules (i, ii, iii)", -DlgLstTypeLRoman : "Chiffres Romains Majuscules (I, II, III)", +DlgLstTypeLCase : "Lettres minuscules (a, b, c)", +DlgLstTypeUCase : "Lettres majuscules (A, B, C)", +DlgLstTypeSRoman : "Chiffres romains minuscules (i, ii, iii)", +DlgLstTypeLRoman : "Chiffres romains majuscules (I, II, III)", // Document Properties Dialog DlgDocGeneralTab : "G??n??ral", DlgDocBackTab : "Fond", -DlgDocColorsTab : "Couleurs et Marges", +DlgDocColorsTab : "Couleurs et marges", DlgDocMetaTab : "M??tadonn??es", -DlgDocPageTitle : "Titre de la Page", -DlgDocLangDir : "Sens d'Ecriture", -DlgDocLangDirLTR : "Gauche vers Droite (LTR)", -DlgDocLangDirRTL : "Droite vers Gauche (RTL)", -DlgDocLangCode : "Code Langue", -DlgDocCharSet : "Encodage de Caract??re", -DlgDocCharSetOther : "Autre Encodage de Caract??re", - -DlgDocDocType : "Type de Document", -DlgDocDocTypeOther : "Autre Type de Document", +DlgDocPageTitle : "Titre de la page", +DlgDocLangDir : "Sens d'??criture", +DlgDocLangDirLTR : "De la gauche vers la droite (LTR)", +DlgDocLangDirRTL : "De la droite vers la gauche (RTL)", +DlgDocLangCode : "Code langue", +DlgDocCharSet : "Encodage de caract??re", +DlgDocCharSetOther : "Autre encodage de caract??re", + +DlgDocDocType : "Type de document", +DlgDocDocTypeOther : "Autre type de document", DlgDocIncXHTML : "Inclure les d??clarations XHTML", -DlgDocBgColor : "Couleur de Fond", -DlgDocBgImage : "Image de Fond", +DlgDocBgColor : "Couleur de fond", +DlgDocBgImage : "Image de fond", DlgDocBgNoScroll : "Image fixe sans d??filement", DlgDocCText : "Texte", DlgDocCLink : "Lien", -DlgDocCVisited : "Lien Visit??", -DlgDocCActive : "Lien Activ??", +DlgDocCVisited : "Lien visit??", +DlgDocCActive : "Lien activ??", DlgDocMargins : "Marges", DlgDocMaTop : "Haut", DlgDocMaLeft : "Gauche", DlgDocMaRight : "Droite", DlgDocMaBottom : "Bas", -DlgDocMeIndex : "Mots Cl??s (s??par??s par des virgules)", +DlgDocMeIndex : "Mots-cl??s (s??par??s par des virgules)", DlgDocMeDescr : "Description", DlgDocMeAuthor : "Auteur", DlgDocMeCopy : "Copyright", @@ -467,7 +471,7 @@ // Templates Dialog Templates : "Mod??les", -DlgTemplatesTitle : "Mod??les de Contenu", +DlgTemplatesTitle : "Mod??les de contenu", DlgTemplatesSelMsg : "Veuillez s??lectionner le mod??le ?? ouvrir dans l'??diteur
      (le contenu actuel sera remplac??):", DlgTemplatesLoading : "Chargement de la liste des mod??les. Veuillez patienter...", DlgTemplatesNoTpl : "(Aucun mod??le disponible)", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "A propos de", DlgAboutBrowserInfoTab : "Navigateur", +DlgAboutLicenseTab : "License", //MISSING DlgAboutVersion : "version", DlgAboutLicense : "License selon les termes de GNU Lesser General Public License", DlgAboutInfo : "Pour plus d'informations, aller ??" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/gl.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/gl.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/gl.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -98,8 +98,13 @@ SelectionField : "Campo de Selecci??n", ImageButton : "Bot??n de Imaxe", +FitWindow : "Maximizar o tama??o do editor", + // Context Menu EditLink : "Editar Ligaz??n", +CellCM : "Cela", +RowCM : "Fila", +ColumnCM : "Columna", InsertRow : "Inserir Fila", DeleteRows : "Borrar Filas", InsertColumn : "Inserir Columna", @@ -146,12 +151,12 @@ DlgBtnClose : "Pechar", DlgBtnBrowseServer : "Navegar no Servidor", DlgAdvancedTag : "Advanzado", -DlgOpOther : "<Outro>", +DlgOpOther : "", DlgInfoTab : "Info", DlgAlertUrl : "Por favor, insira a URL", // General Dialogs Labels -DlgGenNotSet : "<non definido>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "Orientaci??n do Idioma", DlgGenLangDirLtr : "Esquerda a Dereita (LTR)", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "Referencia nesta p??xina", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "Protocolo", -DlgLnkProtoOther : "<outro>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "Seleccionar unha Referencia", DlgLnkAnchorByName : "Por Nome de Referencia", DlgLnkAnchorById : "Por Element Id", -DlgLnkNoAnchors : "<Non hai referencias disponibles no documento>", +DlgLnkNoAnchors : "", DlgLnkEMail : "Enderezo de E-Mail", DlgLnkEMailSubject : "Asunto do Mensaxe", DlgLnkEMailBody : "Corpo do Mensaxe", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "Enviar ?? servidor", DlgLnkTarget : "Destino", -DlgLnkTargetFrame : "<frame>", -DlgLnkTargetPopup : "<Xanela Emerxente>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Nova Xanela (_blank)", DlgLnkTargetParent : "Xanela Pai (_parent)", DlgLnkTargetSelf : "Mesma Xanela (_self)", @@ -292,16 +297,16 @@ DlgCellWidthPc : "percent", DlgCellHeight : "Altura", DlgCellWordWrap : "Axustar Li??as", -DlgCellWordWrapNotSet : "<Non Definido>", +DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "Si", DlgCellWordWrapNo : "Non", DlgCellHorAlign : "Ali??amento Horizontal", -DlgCellHorAlignNotSet : "<Non definido>", +DlgCellHorAlignNotSet : "", DlgCellHorAlignLeft : "Esquerda", DlgCellHorAlignCenter : "Centro", DlgCellHorAlignRight: "Dereita", DlgCellVerAlign : "Ali??amento Vertical", -DlgCellVerAlignNotSet : "<Non definido>", +DlgCellVerAlignNotSet : "", DlgCellVerAlignTop : "Arriba", DlgCellVerAlignMiddle : "Medio", DlgCellVerAlignBottom : "Abaixo", @@ -338,7 +343,6 @@ DlgPasteIgnoreFont : "Ignorar as definici??ns de Tipograf??a", DlgPasteRemoveStyles : "Eliminar as definici??ns de Estilos", DlgPasteCleanBox : "Limpar o Cadro", - // Color Picker ColorAutomatic : "Autom??tico", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "Acerca de", DlgAboutBrowserInfoTab : "Informaci??n do Navegador", +DlgAboutLicenseTab : "Licencia", DlgAboutVersion : "versi??n", DlgAboutLicense : "Licencia concedida baixo os termos da GNU Lesser General Public License", DlgAboutInfo : "Para m??is informaci??n visitar:" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/he.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/he.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/he.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -34,7 +34,7 @@ Copy : "??????????", Paste : "??????????", PasteText : "?????????? ?????????? ????????", -PasteWord : "?????????? ??-Word", +PasteWord : "?????????? ??-????????", Print : "??????????", SelectAll : "?????????? ??????", RemoveFormat : "???????? ????????????", @@ -86,8 +86,8 @@ Replace : "??????????", SpellCheck : "?????????? ????????", UniversalKeyboard : "?????????? ????????????????????", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING +PageBreakLbl : "?????????? ????", +PageBreak : "???????? ?????????? ????", Form : "????????", Checkbox : "???????? ??????????", @@ -99,8 +99,13 @@ SelectionField : "?????? ??????????", ImageButton : "?????????? ??????????", +FitWindow : "???????? ???? ???????? ??????????", + // Context Menu EditLink : "?????????? ??????????", +CellCM : "????", +RowCM : "????????", +ColumnCM : "??????????", InsertRow : "?????????? ????????", DeleteRows : "?????????? ??????????", InsertColumn : "?????????? ??????????", @@ -109,7 +114,7 @@ DeleteCells : "?????????? ????????", MergeCells : "?????????? ????????", SplitCell : "?????????? ????????", -TableDelete : "Delete Table", //MISSING +TableDelete : "?????? ????????", CellProperties : "???????????? ??????", TableProperties : "???????????? ??????????", ImageProperties : "???????????? ????????????", @@ -131,15 +136,15 @@ // Alerts and Messages ProcessingXHTML : "???????? XHTML, ???? ????????????...", Done : "???????????? ????????????", -PasteWordConfirm : "???????? ?????????? ???????????????? ???????????? ?????????? ?????????? Word. ?????? ???????????? ?????????? ???????? ?????? ?????????????", -NotCompatiblePaste : "?????????? ???? ?????????? ???????????? Internet Explorer ???????????? 5.5 ??????????. ?????? ???????????? ???????????? ?????? ?????????????", +PasteWordConfirm : "???????? ?????????? ???????????????? ???????????? ?????????? ?????????? ????????. ?????? ???????????? ?????????? ???????? ?????? ?????????????", +NotCompatiblePaste : "?????????? ???? ?????????? ???????????? ?????????????? ???????????????? ???????????? 5.5 ??????????. ?????? ???????????? ???????????? ?????? ?????????????", UnknownToolbarItem : "???????? ???? ???????? ?????????? ?????????? \"%1\"", UnknownCommand : "???? ?????????? ???? ???????? \"%1\"", NotImplemented : "???????????? ???? ????????????", UnknownToolbarSet : "???????? ???????? ?????????? \"%1\" ???? ??????????", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING +NoActiveX : "???????????? ?????????? ???? ???????????? ???????????? ?????????? ???? ???????????????? ????????????.???? ?????????? ???? ?????????????? \"?????? ?????????? ???????????? ??????????????\". ???????? ?????????? ???????????? ?????????????? ???? ???????????????? ????????????.", +BrowseServerBlocked : "???? ???????? ???????? ???????????? ????????????.?????? ???????? ?????????? ???????????? ?????????????? ???? ????????.", +DialogBlocked : "???? ?????? ???????? ?????????? ???????? ????????????. ?????? ???????? ?????????? ???????????? ???????????? ???? ????????.", // Dialogs DlgBtnOK : "??????????", @@ -147,12 +152,12 @@ DlgBtnClose : "??????????", DlgBtnBrowseServer : "???????? ????????", DlgAdvancedTag : "???????????????? ??????????????", -DlgOpOther : "<??????>", +DlgOpOther : "", DlgInfoTab : "????????", DlgAlertUrl : "?????? ?????? URL", // General Dialogs Labels -DlgGenNotSet : "<???? ????????>", +DlgGenNotSet : "", DlgGenId : "?????????? (Id)", DlgGenLangDir : "?????????? ??????", DlgGenLangDirLtr : "???????? ?????????? (LTR)", @@ -216,12 +221,12 @@ DlgLnkTypeAnchor : "???????? ?????????? ????", DlgLnkTypeEMail : "??????''??", DlgLnkProto : "????????????????", -DlgLnkProtoOther : "<??????>", +DlgLnkProtoOther : "", DlgLnkURL : "?????????? (URL)", DlgLnkAnchorSel : "?????????? ????????", DlgLnkAnchorByName : "????''?? ???? ??????????", DlgLnkAnchorById : "????''?? ?????????? (Id) ??????????", -DlgLnkNoAnchors : "<?????? ???????????? ???????????? ??????>", +DlgLnkNoAnchors : "", DlgLnkEMail : "?????????? ????????''??", DlgLnkEMailSubject : "???????? ????????????", DlgLnkEMailBody : "?????? ????????????", @@ -229,13 +234,13 @@ DlgLnkBtnUpload : "?????????? ????????", DlgLnkTarget : "????????", -DlgLnkTargetFrame : "<frame>", -DlgLnkTargetPopup : "<???????? ????????>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "???????? ?????? (_blank)", DlgLnkTargetParent : "???????? ?????? (_parent)", DlgLnkTargetSelf : "?????????? ?????????? (_self)", DlgLnkTargetTop : "???????? ???????? (_top)", -DlgLnkTargetFrameName : "???? frame ????????", +DlgLnkTargetFrameName : "???? ?????????? ????????", DlgLnkPopWinName : "???? ?????????? ??????????", DlgLnkPopWinFeat : "???????????? ?????????? ??????????", DlgLnkPopResize : "?????? ???????? ???????? ????????????", @@ -284,7 +289,7 @@ DlgTableCellSpace : "?????????? ????", DlgTableCellPad : "?????????? ????", DlgTableCaption : "??????????", -DlgTableSummary : "Summary", //MISSING +DlgTableSummary : "??????????", // Table Cell Dialog DlgCellTitle : "???????????? ????", @@ -333,13 +338,12 @@ PasteErrorCopy : "???????????? ???????????? ???????????? ?????? ???? ?????????????? ?????????? ???????? ???????????? ?????????? ??????????????????. ???? ???????????? ???????????? ?????? ???? (Ctrl+C).", PasteAsText : "?????????? ?????????? ????????", -PasteFromWord : "?????????? ??-Word", - -DlgPasteMsg2 : "Please paste inside the following box using the keyboard (Ctrl+V) and hit OK.", +PasteFromWord : "?????????? ??-????????", + +DlgPasteMsg2 : "?????? ???????? ???????? ???????????? ?????????????? (Ctrl+V) ???????? ???? ??????????.", DlgPasteIgnoreFont : "?????????? ?????????????? ?????? ????????", DlgPasteRemoveStyles : "?????? ???????????? ??????????", -DlgPasteCleanBox : "?????????? ??????????", - +DlgPasteCleanBox : "?????????? ??????????", // Color Picker ColorAutomatic : "??????????????", @@ -360,7 +364,7 @@ DlgSpellBtnIgnoreAll : "?????????? ????????", DlgSpellBtnReplace : "????????", DlgSpellBtnReplaceAll : "???????? ??????", -DlgSpellBtnUndo : "Undo", +DlgSpellBtnUndo : "????????", DlgSpellNoSuggestions : "- ?????? ?????????? -", DlgSpellProgress : "???????????? ???????? ???????????? ....", DlgSpellNoMispell : "???????????? ???????? ??????????????: ???? ?????????? ???????????? ????????", @@ -423,7 +427,7 @@ NumberedListProp : "?????????????? ?????????? ??????????????", DlgLstType : "??????", DlgLstTypeCircle : "??????????", -DlgLstTypeDisc : "Disc", //MISSING +DlgLstTypeDisc : "????????", DlgLstTypeSquare : "??????????", DlgLstTypeNumbers : "???????????? (1, 2, 3)", DlgLstTypeLCase : "???????????? ?????????? (a, b, c)", @@ -476,6 +480,7 @@ // About Dialog DlgAboutAboutTab : "??????????", DlgAboutBrowserInfoTab : "?????????? ??????????", +DlgAboutLicenseTab : "??????????", DlgAboutVersion : "??????????", DlgAboutLicense : "???????????? ?????? ???????? GNU Lesser General Public License", DlgAboutInfo : "???????? ???????? ???????? ?????????? ??????:" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hi.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hi.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hi.js Wed Jul 12 07:45:05 2006 @@ -1,481 +1,486 @@ -???/* - * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben - * - * Licensed under the terms of the GNU Lesser General Public License: - * http://www.opensource.org/licenses/lgpl-license.php - * - * For further information visit: - * http://www.fckeditor.net/ - * - * "Support Open Source software. What about a donation today?" - * - * File Name: hi.js - * Hindi language file. - * - * File Authors: - * Utkarshraj Atmaram (utcursch at gmail.com) - */ - -var FCKLang = -{ -// Language direction : "ltr" (left to right) or "rtl" (right to left). -Dir : "ltr", - -ToolbarCollapse : "?????????????????? ????????????????????????", -ToolbarExpand : "?????????????????? ?????? ????????????????????? ????????????", - -// Toolbar Items and Context Menu -Save : "?????????", -NewPage : "????????? ?????????", -Preview : "????????????????????????", -Cut : "??????", -Copy : "????????????", -Paste : "???????????????", -PasteText : "??????????????? (???????????? ????? ???????????????)", -PasteWord : "??????????????? (???????????? ??????)", -Print : "?????????????????????", -SelectAll : "?????? ????? ????? ????????? ????????????", -RemoveFormat : "????????????????????? ??????????????????", -InsertLinkLbl : "????????????", -InsertLink : "???????????? ?????????????????????/??????????????????", -RemoveLink : "???????????? ??????????????????", -Anchor : "???????????? ?????????????????????/??????????????????", -InsertImageLbl : "??????????????????", -InsertImage : "?????????????????? ?????????????????????/??????????????????", -InsertFlashLbl : "???????????????", -InsertFlash : "??????????????? ?????????????????????/??????????????????", -InsertTableLbl : "????????????", -InsertTable : "???????????? ?????????????????????/??????????????????", -InsertLineLbl : "????????????", -InsertLine : "?????????????????????????????? ???????????? ????????????????????? ????????????", -InsertSpecialCharLbl: "??????????????? ???????? ????????????", -InsertSpecialChar : "??????????????? ???????? ???????????? ????????????????????? ????????????", -InsertSmileyLbl : "?????????????????????", -InsertSmiley : "????????????????????? ????????????????????? ????????????", -About : "FCKeditor ?????? ???????????? ?????????", -Bold : "???????????????", -Italic : "??????????????????", -Underline : "?????????????????????", -StrikeThrough : "???????????????????????? ????????????", -Subscript : "?? ???????????????", -Superscript : "?? ???????????????", -LeftJustify : "??????????????? ?????????", -CenterJustify : "????????? ?????????", -RightJustify : "??????????????? ?????????", -BlockJustify : "??????????????? ????????????????????????", -DecreaseIndent : "?????????????? ????????? ?????? ????????????", -IncreaseIndent : "?????????????? ????????? ??????????????????", -Undo : "?? ????????????", -Redo : "????????????", -NumberedListLbl : "?? ???????????? ????????????", -NumberedList : "?? ???????????? ???????????? ?????????????????????/??????????????????", -BulletedListLbl : "??????????? ??? ????????????", -BulletedList : "??????????? ??? ???????????? ?????????????????????/??????????????????", -ShowTableBorders : "???????????? ??????????????????????????? ?????????????????????", -ShowDetails : "?????????????????? ?????????????????????", -Style : "??????????????????", -FontFormat : "?????????????????????", -Font : "???????????????", -FontSize : "????????????", -TextColor : "????????????????????? ?????????", -BGColor : "???????????????????????????????????? ?????????", -Source : "???????????????", -Find : "???????????????", -Replace : "?????????????????????", -SpellCheck : "?????????????????? (????????????????????????) ????????????", -UniversalKeyboard : "??????????????????????????? ?????????????????????", -PageBreakLbl : "????????? ???????????????", -PageBreak : "????????? ??????????????? ???????????????????????? ????????????", - -Form : "???????????????", -Checkbox : "????? ??? ???????????????", -RadioButton : "??????????????? ?????????", -TextField : "????????????????????? ???????????????", -Textarea : "????????????????????? ???????????????", -HiddenField : "??????????????? ???????????????", -Button : "?????????", -SelectionField : "??????????????? ???????????????", -ImageButton : "?????????????????? ?????????", - -// Context Menu -EditLink : "???????????? ??????????????????", -InsertRow : "?????????????????? ????????????????????? ????????????", -DeleteRows : "??????????????????????????? ??????????????? ????????????", -InsertColumn : "???????????? ????????????????????? ????????????", -DeleteColumns : "???????????? ??????????????? ????????????", -InsertCell : "????? ??? ????????????????????? ????????????", -DeleteCells : "????? ??? ??????????????? ????????????", -MergeCells : "????? ??? ?????????????????????", -SplitCell : "????? ??? ?? ?????? ????????????", -TableDelete : "???????????? ??????????????? ????????????", -CellProperties : "????? ??? ??????????????????????????????", -TableProperties : "???????????? ??????????????????????????????", -ImageProperties : "?????????????????? ??????????????????????????????", -FlashProperties : "??????????????? ??????????????????????????????", - -AnchorProp : "???????????? ??????????????????????????????", -ButtonProp : "????????? ??????????????????????????????", -CheckboxProp : "????? ??? ??????????????? ??????????????????????????????", -HiddenFieldProp : "??????????????? ??????????????? ??????????????????????????????", -RadioButtonProp : "??????????????? ????????? ??????????????????????????????", -ImageButtonProp : "?????????????????? ????????? ??????????????????????????????", -TextFieldProp : "????????????????????? ??????????????? ??????????????????????????????", -SelectionFieldProp : "??????????????? ??????????????? ??????????????????????????????", -TextareaProp : "????????????????????? ??????????????? ??????????????????????????????", -FormProp : "??????????????? ??????????????????????????????", - -FontFormats : "??????????????????;??????????????????????? ???;?????????;?????????????????? 1;?????????????????? 2;?????????????????? 3;?????????????????? 4;?????????????????? 5;?????????????????? 6;?????????????????? (DIV)", - -// Alerts and Messages -ProcessingXHTML : "XHTML ????????????????? ??? ?????? ????????? ????????? ????????? ???????????????...", -Done : "???????????? ?????????", -PasteWordConfirm : "?????? ?????? ????????????????????? ??????????????? ???????????? ??????????????? ?????????, ?????? ???????????? ?????? ???????????? ???????????? ????????? ?????? ????????? ????????? ???????????? ??????????????? ???????????? ?????? ???????????? ?????? ????????? ????????? ???????????? ??????????????????????", -NotCompatiblePaste : "?????? ??????????????? ???????????????????? ??? ?????????????????????????????????(Internet Explorer) 5.5 ?????? ???????????? ????????? ?????? ??????????????? ?????? ????????? ?????? ?????????????????? ????????? ???????????? ?????? ???????????? ????????? ????????? ??????????????? ???????????? ??????????????????????", -UnknownToolbarItem : "?? ???????????? ?????????????????? ???????????? \"%1\"", -UnknownCommand : "?? ???????????? ?????????????????? \"%1\"", -NotImplemented : "?????????????????? ?????????????????????????? ????????? ???????????? ???????????? ????????? ??????", -UnknownToolbarSet : "?????????????????? ????? ??? \"%1\" ?????????????????? ???????????? ??????", -NoActiveX : "???????????? ???????????????????????? ?????? ????????????????????? ??????????????????????????? ??????????????? ?????? ???????????? ?????????????????? ?????? ??????????????? ????????? ???????????? ???????????? ????????????????????? \"Run ActiveX controls and plug-ins\" ?????????????????? ?????? ??????????????? ????????????. ???????????? ?????????????????? ?????? ???????????? ????????????????????? ?????? ?? ???????????? ?????? ???????????? ?????????", -BrowseServerBlocked : "??????????????????????????? ???????????????????????? ???????????? ???????????? ?????? ???????????? ????????????????????? ????????? ????????????-?? ?????? ??????????????????????????? ?????? ?????????????????? ???????????????", -DialogBlocked : "??????????????? ?????????????????? ???????????? ???????????? ?????? ???????????? ????????????????????? ????????? ????????????-?? ?????? ??????????????????????????? ?????? ?????????????????? ???????????????", - -// Dialogs -DlgBtnOK : "????????? ??????", -DlgBtnCancel : "???????????? ????????????", -DlgBtnClose : "???????????? ????????????", -DlgBtnBrowseServer : "??????????????? ?????????????????? ????????????", -DlgAdvancedTag : "??????????????????????????????", -DlgOpOther : "", -DlgInfoTab : "???????????????", -DlgAlertUrl : "URL ????????????????????? ????????????", - -// General Dialogs Labels -DlgGenNotSet : "", -DlgGenId : "Id", -DlgGenLangDir : "???????????? ??????????????? ?????? ????????????", -DlgGenLangDirLtr : "??????????????? ?????? ??????????????? (LTR)", -DlgGenLangDirRtl : "??????????????? ?????? ??????????????? (RTL)", -DlgGenLangCode : "???????????? ?????????", -DlgGenAccessKey : "?????????????? ??? ??????", -DlgGenName : "?????????", -DlgGenTabIndex : "????????? ?????????????? ?????????", -DlgGenLongDescr : "?? ????????? ??????????????? ?????? ????????? URL", -DlgGenClass : "??????????????????-????????? ???????????????", -DlgGenTitle : "????????????????????? ??????????????????", -DlgGenContType : "????????????????????? ?????????????? ????????? ??????????????????", -DlgGenLinkCharset : "???????????? ????????????????????? ???????? ???????????? ????? ???", -DlgGenStyle : "??????????????????", - -// Image Dialog -DlgImgTitle : "?????????????????? ??????????????????????????????", -DlgImgInfoTab : "?????????????????? ?????? ?????????????????????", -DlgImgBtnUpload : "????????? ??????????????? ?????? ???????????????", -DlgImgURL : "URL", -DlgImgUpload : "?? ????????????", -DlgImgAlt : "???????????????????????? ?????????????????????", -DlgImgWidth : "???????????????", -DlgImgHeight : "???????????????", -DlgImgLockRatio : "????????? ?? ???????????????", -DlgBtnResetSize : "??????????? ??? ????????????", -DlgImgBorder : "??????????????????", -DlgImgHSpace : "?????????????????????????????? ???????????????", -DlgImgVSpace : "????????????????????? ???????????????", -DlgImgAlign : "???????????????", -DlgImgAlignLeft : "???????????????", -DlgImgAlignAbsBottom: "Abs ????????????", -DlgImgAlignAbsMiddle: "Abs ?????????", -DlgImgAlignBaseline : "????????? ????????????", -DlgImgAlignBottom : "????????????", -DlgImgAlignMiddle : "????????????", -DlgImgAlignRight : "???????????????", -DlgImgAlignTextTop : "????????????????????? ?????????", -DlgImgAlignTop : "?????????", -DlgImgPreview : "????????????????????????", -DlgImgAlertUrl : "?????????????????? ?????? URL ???????????? ???????????? ", -DlgImgLinkTab : "????????????", - -// Flash Dialog -DlgFlashTitle : "??????????????? ??????????????????????????????", -DlgFlashChkPlay : "????????? ????????????", -DlgFlashChkLoop : "?????????", -DlgFlashChkMenu : "??????????????? ????? ???????????? ?????? ?????????????????? ????????????", -DlgFlashScale : "???????????????", -DlgFlashScaleAll : "????????? ?????????????????????", -DlgFlashScaleNoBorder : "????????? ?????????????????? ????????????", -DlgFlashScaleFit : "????????????????????? ?????????", - -// Link Dialog -DlgLnkWindowTitle : "????????????", -DlgLnkInfoTab : "???????????? ", -DlgLnkTargetTab : "?????????????????????", - -DlgLnkType : "???????????? ??????????????????", -DlgLnkTypeURL : "URL", -DlgLnkTypeAnchor : "?????? ????????? ?????? ????????????", -DlgLnkTypeEMail : "???-?????????", -DlgLnkProto : "???????????????????????????", -DlgLnkProtoOther : "", -DlgLnkURL : "URL", -DlgLnkAnchorSel : "???????????? ???????????????", -DlgLnkAnchorByName : "???????????? ????????? ??????", -DlgLnkAnchorById : "?????????????? ????????? Id ??????", -DlgLnkNoAnchors : "", -DlgLnkEMail : "???-????????? ?????????", -DlgLnkEMailSubject : "??????????????? ????????????", -DlgLnkEMailBody : "???????????????", -DlgLnkUpload : "?? ????????????", -DlgLnkBtnUpload : "????????? ??????????????? ?????? ???????????????", - -DlgLnkTarget : "?????????????????????", -DlgLnkTargetFrame : "", -DlgLnkTargetPopup : "", -DlgLnkTargetBlank : "????????? ?????????????????? (_blank)", -DlgLnkTargetParent : "????????? ?????????????????? (_parent)", -DlgLnkTargetSelf : "????????? ?????????????????? (_self)", -DlgLnkTargetTop : "??????????????? ?????????????????? (_top)", -DlgLnkTargetFrameName : "????????????????????? ??????????????? ?????? ?????????", -DlgLnkPopWinName : "?????????-?? ??? ?????????????????? ?????? ?????????", -DlgLnkPopWinFeat : "?????????-?? ??? ?????????????????? ??????????????????", -DlgLnkPopResize : "???????????? ???????????? ?????? ???????????? ??????", -DlgLnkPopLocation : "?????????????????? ?????????", -DlgLnkPopMenu : "????? ???????????? ?????????", -DlgLnkPopScroll : "????????????????????? ?????????", -DlgLnkPopStatus : "?????????????????? ?????????", -DlgLnkPopToolbar : "????????? ?????????", -DlgLnkPopFullScrn : "????????? ????????????????????? (IE)", -DlgLnkPopDependent : "??????????????????????? ????????? (Netscape)", -DlgLnkPopWidth : "???????????????", -DlgLnkPopHeight : "???????????????", -DlgLnkPopLeft : "??????????????? ?????????", -DlgLnkPopTop : "??????????????? ?????????", - -DlnLnkMsgNoUrl : "???????????? URL ???????????? ????????????", -DlnLnkMsgNoEMail : "???-????????? ????????? ???????????? ????????????", -DlnLnkMsgNoAnchor : "???????????? ???????????????", - -// Color Dialog -DlgColorTitle : "????????? ???????????????", -DlgColorBtnClear : "????????? ????????????", -DlgColorHighlight : "?????????????????????", -DlgColorSelected : "????? ????? ??????????? ???", - -// Smiley Dialog -DlgSmileyTitle : "????????????????????? ????????????????????? ????????????", - -// Special Character Dialog -DlgSpecialCharTitle : "??????????????? ???????? ???????????? ???????????????", - -// Table Dialog -DlgTableTitle : "???????????? ??????????????????????????????", -DlgTableRows : "???????????????????????????", -DlgTableColumns : "????????????", -DlgTableBorder : "?????????????????? ????????????", -DlgTableAlign : "??????????????????????? ?????????", -DlgTableAlignNotSet : "", -DlgTableAlignLeft : "???????????????", -DlgTableAlignCenter : "????????? ?????????", -DlgTableAlignRight : "???????????????", -DlgTableWidth : "???????????????", -DlgTableWidthPx : "????????????????? ???", -DlgTableWidthPc : "?????????????????????", -DlgTableHeight : "???????????????", -DlgTableCellSpace : "????? ??? ?? ?????????", -DlgTableCellPad : "????? ??? ??????????????????", -DlgTableCaption : "??????????????????", -DlgTableSummary : "??????????????????", - -// Table Cell Dialog -DlgCellTitle : "????? ??? ??????????????????????????????", -DlgCellWidth : "???????????????", -DlgCellWidthPx : "????????????????? ???", -DlgCellWidthPc : "?????????????????????", -DlgCellHeight : "???????????????", -DlgCellWordWrap : "???????????? ?????????", -DlgCellWordWrapNotSet : "", -DlgCellWordWrapYes : "?????????", -DlgCellWordWrapNo : "????????????", -DlgCellHorAlign : "?????????????????????????????? ??????????????????????? ?????????", -DlgCellHorAlignNotSet : "", -DlgCellHorAlignLeft : "???????????????", -DlgCellHorAlignCenter : "????????? ?????????", -DlgCellHorAlignRight: "???????????????", -DlgCellVerAlign : "????????????????????? ??????????????????????? ?????????", -DlgCellVerAlignNotSet : "", -DlgCellVerAlignTop : "?????????", -DlgCellVerAlignMiddle : "????????????", -DlgCellVerAlignBottom : "????????????", -DlgCellVerAlignBaseline : "?????????????????????", -DlgCellRowSpan : "?????????????????? ???????????????", -DlgCellCollSpan : "???????????? ???????????????", -DlgCellBackColor : "???????????????????????????????????? ?????????", -DlgCellBorderColor : "?????????????????? ?????? ?????????", -DlgCellBtnSelect : "???????????????...", - -// Find Dialog -DlgFindTitle : "???????????????", -DlgFindFindBtn : "???????????????", -DlgFindNotFoundMsg : "???????????? ?????????????????? ???????????? ????????? ????????????????????? ???????????? ????????????", - -// Replace Dialog -DlgReplaceTitle : "?????????????????????", -DlgReplaceFindLbl : "?????? ???????????????:", -DlgReplaceReplaceLbl : "???????????? ????????????????????? ????????????:", -DlgReplaceCaseChk : "????????? ?????????????????????", -DlgReplaceReplaceBtn : "?????????????????????", -DlgReplaceReplAllBtn : "????????? ????????????????????? ????????????", -DlgReplaceWordChk : "???????????? ???????????? ?????????????????????", - -// Paste Operations / Dialog -PasteErrorPaste : "???????????? ???????????????????????? ?????? ????????????????????? ????? ????????????????????? ?????? ??????????????? ???????????? ?????? ?? ??????????????? ???????????? ?????????????????? ?????? ????????? (Ctrl+V) ?????? ?????????????????? ???????????????", -PasteErrorCut : "???????????? ????????????????????? ?????? ????????????????????? ????? ????????????????????? ?????? ?????? ???????????? ?????? ?? ??????????????? ???????????? ?????????????????? ?????? ????????? (Ctrl+X) ?????? ?????????????????? ???????????????", -PasteErrorCopy : "???????????? ???????????????????????? ?????? ????????????????????? ????? ????????????????????? ?????? ???????????? ???????????? ?????? ?? ??????????????? ???????????? ?????????????????? ?????? ????????? (Ctrl+C) ?????? ?????????????????? ???????????????", - -PasteAsText : "??????????????? (???????????? ????? ???????????????)", -PasteFromWord : "??????????????? (???????????? ??????)", - -DlgPasteMsg2 : "Ctrl+V ?????? ?????????????????? ???????????? ??????????????? ???????????? ?????? ????????? ?????? ????????????.", -DlgPasteIgnoreFont : "??????????????? ????????????????????? ?????????????????????", -DlgPasteRemoveStyles : "?????????????????? ????????????????????? ?????????????????????", -DlgPasteCleanBox : "??????????????? ????????? ????????????", - - -// Color Picker -ColorAutomatic : "????????????????????????", -ColorMoreColors : "?????? ?????????...", - -// Document Properties -DocProps : "??????????????????????? ????????? ??????????????????????????????", - -// Anchor Dialog -DlgAnchorTitle : "???????????? ??????????????????????????????", -DlgAnchorName : "???????????? ?????? ?????????", -DlgAnchorErrorName : "???????????? ?????? ????????? ???????????? ????????????", - -// Speller Pages Dialog -DlgSpellNotInDic : "????????????????????? ????????? ????????????", -DlgSpellChangeTo : "??????????????? ???????????????", -DlgSpellBtnIgnore : "??????????????????", -DlgSpellBtnIgnoreAll : "????????? ?????????????????? ????????????", -DlgSpellBtnReplace : "?????????????????????", -DlgSpellBtnReplaceAll : "????????? ????????????????????? ????????????", -DlgSpellBtnUndo : "?? ????????????", -DlgSpellNoSuggestions : "- ????????? ??????????????? ???????????? -", -DlgSpellProgress : "?????????????????? ?????? ???????????? (??????????? ???-????? ???) ???????????? ??????...", -DlgSpellNoMispell : "?????????????????? ?????? ???????????? : ????????? ????????? ?????????????????? (??????????? ????????????) ???????????? ????????? ??????", -DlgSpellNoChanges : "?????????????????? ?????? ???????????? :????????? ???????????? ???????????? ???????????? ?????????", -DlgSpellOneChange : "?????????????????? ?????? ???????????? : ?????? ???????????? ???????????? ?????????", -DlgSpellManyChanges : "?????????????????? ?????? ???????????? : %1 ???????????? ???????????? ?????????", - -IeSpellDownload : "??????????? ???-????? ?????? ???????????????????????? ???????????? ???????????? ????????? ????????? ???????????? ?????? ????????? ???????????????????????? ???????????? ??????????????????????", - -// Button Dialog -DlgButtonText : "????????????????????? (??????????????????)", -DlgButtonType : "??????????????????", - -// Checkbox and Radio Button Dialogs -DlgCheckboxName : "?????????", -DlgCheckboxValue : "??????????????????", -DlgCheckboxSelected : "????? ????? ??????????? ???", - -// Form Dialog -DlgFormName : "?????????", -DlgFormAction : "???????????????", -DlgFormMethod : "???????????????", - -// Select Field Dialog -DlgSelectName : "?????????", -DlgSelectValue : "??????????????????", -DlgSelectSize : "????????????", -DlgSelectLines : "???????????????????????????", -DlgSelectChkMulti : "?????? ?????? ?????????????????? ?????????????????? ??????????????? ?????????", -DlgSelectOpAvail : "?????????????????? ??????????????????", -DlgSelectOpText : "?????????????????????", -DlgSelectOpValue : "??????????????????", -DlgSelectBtnAdd : "???????????????", -DlgSelectBtnModify : "???????????????", -DlgSelectBtnUp : "?????????", -DlgSelectBtnDown : "????????????", -DlgSelectBtnSetValue : "???????????? ?????? ?????????????????? ????? ??? ????????????", -DlgSelectBtnDelete : "???????????????", - -// Textarea Dialog -DlgTextareaName : "?????????", -DlgTextareaCols : "????????????", -DlgTextareaRows : "???????????????????????????", - -// Text Field Dialog -DlgTextName : "?????????", -DlgTextValue : "??????????????????", -DlgTextCharWidth : "???????? ???????????? ?????? ???????????????", -DlgTextMaxChars : "?? ??????????????? ???????? ????????????", -DlgTextType : "????????????", -DlgTextTypeText : "?????????????????????", -DlgTextTypePass : "????????????????????????", - -// Hidden Field Dialog -DlgHiddenName : "?????????", -DlgHiddenValue : "??????????????????", - -// Bulleted List Dialog -BulletedListProp : "??????????? ??? ???????????? ??????????????????????????????", -NumberedListProp : "?? ???????????? ???????????? ??????????????????????????????", -DlgLstType : "??????????????????", -DlgLstTypeCircle : "?????????", -DlgLstTypeDisc : "???????????????", -DlgLstTypeSquare : "???????????????", -DlgLstTypeNumbers : "?? ?????? (1, 2, 3)", -DlgLstTypeLCase : "???????????? ?? ???????????? (a, b, c)", -DlgLstTypeUCase : "????????? ?? ???????????? (A, B, C)", -DlgLstTypeSRoman : "???????????? ???????????? ?? ?????? (i, ii, iii)", -DlgLstTypeLRoman : "????????? ???????????? ?? ?????? (I, II, III)", - -// Document Properties Dialog -DlgDocGeneralTab : "??????", -DlgDocBackTab : "????????????????????????????????????", -DlgDocColorsTab : "????????? ?????? ?????????????????????", -DlgDocMetaTab : "????? ??????????????????", - -DlgDocPageTitle : "????????? ??????????????????", -DlgDocLangDir : "???????????? ??????????????? ?????? ????????????", -DlgDocLangDirLTR : "??????????????? ?????? ??????????????? (LTR)", -DlgDocLangDirRTL : "??????????????? ?????? ??????????????? (RTL)", -DlgDocLangCode : "???????????? ?????????", -DlgDocCharSet : "????????????????????? ????? ??? ???????????????????????????", -DlgDocCharSetOther : "?? ????????? ????????????????????? ????? ??? ???????????????????????????", - -DlgDocDocType : "??????????????????????? ????????? ?????????????????? ??????????????????", -DlgDocDocTypeOther : "?? ????????? ??????????????????????? ????????? ?????????????????? ??????????????????", -DlgDocIncXHTML : "XHTML ??????????????? ???????????????????????? ????????????", -DlgDocBgColor : "???????????????????????????????????? ?????????", -DlgDocBgImage : "???????????????????????????????????? ?????????????????? URL", -DlgDocBgNoScroll : "????????????????????? ??? ???????????? ???????????? ????????????????????????????????????", -DlgDocCText : "?????????????????????", -DlgDocCLink : "????????????", -DlgDocCVisited : "??????????????? ???????????? ????????? ????????????", -DlgDocCActive : "?????????????????? ????????????", -DlgDocMargins : "????????? ?????????????????????", -DlgDocMaTop : "?????????", -DlgDocMaLeft : "???????????????", -DlgDocMaRight : "???????????????", -DlgDocMaBottom : "????????????", -DlgDocMeIndex : "??????????????????????? ????????? ???????????????????????? ??????????????????????????? (?? ???????????????????????? ?????? ?? ?????? ????????????)", -DlgDocMeDescr : "??????????????????????? ????????? ???????? ???????????????", -DlgDocMeAuthor : "????????????", -DlgDocMeCopy : "????????????????????????", -DlgDocPreview : "????????????????????????", - -// Templates Dialog -Templates : "????? ?????????????????????", -DlgTemplatesTitle : "???????????????????????? ????? ?????????????????????", -DlgTemplatesSelMsg : "??????????????? ????????? ????????? ???????????? ???????????? ????? ????????????????????? ???????????????(????????????????????? ?????????????? ????????? ????????? ???????????? ???????????????):", -DlgTemplatesLoading : "????? ????????????????????? ???????????? ????????? ?????? ?????? ????????? ????????? ????????? ???????????????...", -DlgTemplatesNoTpl : "(????????? ????? ????????????????????? ?????????????????? ???????????? ???????????? ????????? ??????)", - -// About Dialog -DlgAboutAboutTab : "FCKEditor ?????? ???????????? ?????????", -DlgAboutBrowserInfoTab : "????????????????????? ?????? ???????????? ?????????", -DlgAboutVersion : "???????????????", -DlgAboutLicense : "????????????????????? :GNU LGPL", -DlgAboutInfo : "?? ????????? ????????????????????? ?????? ???????????? ???????????? ???????????????:" +???/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2006 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * "Support Open Source software. What about a donation today?" + * + * File Name: hi.js + * Hindi language file. + * + * File Authors: + * Utkarshraj Atmaram (utcursch at gmail.com) + */ + +var FCKLang = +{ +// Language direction : "ltr" (left to right) or "rtl" (right to left). +Dir : "ltr", + +ToolbarCollapse : "?????????????????? ????????????????????????", +ToolbarExpand : "?????????????????? ?????? ????????????????????? ????????????", + +// Toolbar Items and Context Menu +Save : "?????????", +NewPage : "????????? ?????????", +Preview : "????????????????????????", +Cut : "??????", +Copy : "????????????", +Paste : "???????????????", +PasteText : "??????????????? (???????????? ????? ???????????????)", +PasteWord : "??????????????? (???????????? ??????)", +Print : "?????????????????????", +SelectAll : "?????? ????? ????? ????????? ????????????", +RemoveFormat : "????????????????????? ??????????????????", +InsertLinkLbl : "????????????", +InsertLink : "???????????? ?????????????????????/??????????????????", +RemoveLink : "???????????? ??????????????????", +Anchor : "???????????? ?????????????????????/??????????????????", +InsertImageLbl : "??????????????????", +InsertImage : "?????????????????? ?????????????????????/??????????????????", +InsertFlashLbl : "???????????????", +InsertFlash : "??????????????? ?????????????????????/??????????????????", +InsertTableLbl : "????????????", +InsertTable : "???????????? ?????????????????????/??????????????????", +InsertLineLbl : "????????????", +InsertLine : "?????????????????????????????? ???????????? ????????????????????? ????????????", +InsertSpecialCharLbl: "??????????????? ???????? ????????????", +InsertSpecialChar : "??????????????? ???????? ???????????? ????????????????????? ????????????", +InsertSmileyLbl : "?????????????????????", +InsertSmiley : "????????????????????? ????????????????????? ????????????", +About : "FCKeditor ?????? ???????????? ?????????", +Bold : "???????????????", +Italic : "??????????????????", +Underline : "?????????????????????", +StrikeThrough : "???????????????????????? ????????????", +Subscript : "?? ???????????????", +Superscript : "?? ???????????????", +LeftJustify : "??????????????? ?????????", +CenterJustify : "????????? ?????????", +RightJustify : "??????????????? ?????????", +BlockJustify : "??????????????? ????????????????????????", +DecreaseIndent : "?????????????? ????????? ?????? ????????????", +IncreaseIndent : "?????????????? ????????? ??????????????????", +Undo : "?? ????????????", +Redo : "????????????", +NumberedListLbl : "?? ???????????? ????????????", +NumberedList : "?? ???????????? ???????????? ?????????????????????/??????????????????", +BulletedListLbl : "??????????? ??? ????????????", +BulletedList : "??????????? ??? ???????????? ?????????????????????/??????????????????", +ShowTableBorders : "???????????? ??????????????????????????? ?????????????????????", +ShowDetails : "?????????????????? ?????????????????????", +Style : "??????????????????", +FontFormat : "?????????????????????", +Font : "???????????????", +FontSize : "????????????", +TextColor : "????????????????????? ?????????", +BGColor : "???????????????????????????????????? ?????????", +Source : "???????????????", +Find : "???????????????", +Replace : "?????????????????????", +SpellCheck : "?????????????????? (????????????????????????) ????????????", +UniversalKeyboard : "??????????????????????????? ?????????????????????", +PageBreakLbl : "????????? ???????????????", +PageBreak : "????????? ??????????????? ???????????????????????? ????????????", + +Form : "???????????????", +Checkbox : "????? ??? ???????????????", +RadioButton : "??????????????? ?????????", +TextField : "????????????????????? ???????????????", +Textarea : "????????????????????? ???????????????", +HiddenField : "??????????????? ???????????????", +Button : "?????????", +SelectionField : "??????????????? ???????????????", +ImageButton : "?????????????????? ?????????", + +FitWindow : "??????????????? ???????????? ?????? ????????? ???????????? ?????? ??????????????????", + +// Context Menu +EditLink : "???????????? ??????????????????", +CellCM : "????????????", +RowCM : "??????????????????", +ColumnCM : "????????????", +InsertRow : "?????????????????? ????????????????????? ????????????", +DeleteRows : "??????????????????????????? ??????????????? ????????????", +InsertColumn : "???????????? ????????????????????? ????????????", +DeleteColumns : "???????????? ??????????????? ????????????", +InsertCell : "????? ??? ????????????????????? ????????????", +DeleteCells : "????? ??? ??????????????? ????????????", +MergeCells : "????? ??? ?????????????????????", +SplitCell : "????? ??? ?? ?????? ????????????", +TableDelete : "???????????? ??????????????? ????????????", +CellProperties : "????? ??? ??????????????????????????????", +TableProperties : "???????????? ??????????????????????????????", +ImageProperties : "?????????????????? ??????????????????????????????", +FlashProperties : "??????????????? ??????????????????????????????", + +AnchorProp : "???????????? ??????????????????????????????", +ButtonProp : "????????? ??????????????????????????????", +CheckboxProp : "????? ??? ??????????????? ??????????????????????????????", +HiddenFieldProp : "??????????????? ??????????????? ??????????????????????????????", +RadioButtonProp : "??????????????? ????????? ??????????????????????????????", +ImageButtonProp : "?????????????????? ????????? ??????????????????????????????", +TextFieldProp : "????????????????????? ??????????????? ??????????????????????????????", +SelectionFieldProp : "??????????????? ??????????????? ??????????????????????????????", +TextareaProp : "????????????????????? ??????????????? ??????????????????????????????", +FormProp : "??????????????? ??????????????????????????????", + +FontFormats : "??????????????????;??????????????????????? ???;?????????;?????????????????? 1;?????????????????? 2;?????????????????? 3;?????????????????? 4;?????????????????? 5;?????????????????? 6;?????????????????? (DIV)", + +// Alerts and Messages +ProcessingXHTML : "XHTML ????????????????? ??? ?????? ????????? ????????? ????????? ???????????????...", +Done : "???????????? ?????????", +PasteWordConfirm : "?????? ?????? ????????????????????? ??????????????? ???????????? ??????????????? ?????????, ?????? ???????????? ?????? ???????????? ???????????? ????????? ?????? ????????? ????????? ???????????? ??????????????? ???????????? ?????? ???????????? ?????? ????????? ????????? ???????????? ??????????????????????", +NotCompatiblePaste : "?????? ??????????????? ???????????????????? ??? ?????????????????????????????????(Internet Explorer) 5.5 ?????? ???????????? ????????? ?????? ??????????????? ?????? ????????? ?????? ?????????????????? ????????? ???????????? ?????? ???????????? ????????? ????????? ??????????????? ???????????? ??????????????????????", +UnknownToolbarItem : "?? ???????????? ?????????????????? ???????????? \"%1\"", +UnknownCommand : "?? ???????????? ?????????????????? \"%1\"", +NotImplemented : "?????????????????? ?????????????????????????? ????????? ???????????? ???????????? ????????? ??????", +UnknownToolbarSet : "?????????????????? ????? ??? \"%1\" ?????????????????? ???????????? ??????", +NoActiveX : "???????????? ???????????????????????? ?????? ????????????????????? ??????????????????????????? ??????????????? ?????? ???????????? ?????????????????? ?????? ??????????????? ????????? ???????????? ???????????? ????????????????????? \"Run ActiveX controls and plug-ins\" ?????????????????? ?????? ??????????????? ????????????. ???????????? ?????????????????? ?????? ???????????? ????????????????????? ?????? ?? ???????????? ?????? ???????????? ?????????", +BrowseServerBlocked : "??????????????????????????? ???????????????????????? ???????????? ???????????? ?????? ???????????? ????????????????????? ????????? ????????????-?? ?????? ??????????????????????????? ?????? ?????????????????? ???????????????", +DialogBlocked : "??????????????? ?????????????????? ???????????? ???????????? ?????? ???????????? ????????????????????? ????????? ????????????-?? ?????? ??????????????????????????? ?????? ?????????????????? ???????????????", + +// Dialogs +DlgBtnOK : "????????? ??????", +DlgBtnCancel : "???????????? ????????????", +DlgBtnClose : "???????????? ????????????", +DlgBtnBrowseServer : "??????????????? ?????????????????? ????????????", +DlgAdvancedTag : "??????????????????????????????", +DlgOpOther : "", +DlgInfoTab : "???????????????", +DlgAlertUrl : "URL ????????????????????? ????????????", + +// General Dialogs Labels +DlgGenNotSet : "", +DlgGenId : "Id", +DlgGenLangDir : "???????????? ??????????????? ?????? ????????????", +DlgGenLangDirLtr : "??????????????? ?????? ??????????????? (LTR)", +DlgGenLangDirRtl : "??????????????? ?????? ??????????????? (RTL)", +DlgGenLangCode : "???????????? ?????????", +DlgGenAccessKey : "?????????????? ??? ??????", +DlgGenName : "?????????", +DlgGenTabIndex : "????????? ?????????????? ?????????", +DlgGenLongDescr : "?? ????????? ??????????????? ?????? ????????? URL", +DlgGenClass : "??????????????????-????????? ???????????????", +DlgGenTitle : "????????????????????? ??????????????????", +DlgGenContType : "????????????????????? ?????????????? ????????? ??????????????????", +DlgGenLinkCharset : "???????????? ????????????????????? ???????? ???????????? ????? ???", +DlgGenStyle : "??????????????????", + +// Image Dialog +DlgImgTitle : "?????????????????? ??????????????????????????????", +DlgImgInfoTab : "?????????????????? ?????? ?????????????????????", +DlgImgBtnUpload : "????????? ??????????????? ?????? ???????????????", +DlgImgURL : "URL", +DlgImgUpload : "?? ????????????", +DlgImgAlt : "???????????????????????? ?????????????????????", +DlgImgWidth : "???????????????", +DlgImgHeight : "???????????????", +DlgImgLockRatio : "????????? ?? ???????????????", +DlgBtnResetSize : "??????????? ??? ????????????", +DlgImgBorder : "??????????????????", +DlgImgHSpace : "?????????????????????????????? ???????????????", +DlgImgVSpace : "????????????????????? ???????????????", +DlgImgAlign : "???????????????", +DlgImgAlignLeft : "???????????????", +DlgImgAlignAbsBottom: "Abs ????????????", +DlgImgAlignAbsMiddle: "Abs ?????????", +DlgImgAlignBaseline : "????????? ????????????", +DlgImgAlignBottom : "????????????", +DlgImgAlignMiddle : "????????????", +DlgImgAlignRight : "???????????????", +DlgImgAlignTextTop : "????????????????????? ?????????", +DlgImgAlignTop : "?????????", +DlgImgPreview : "????????????????????????", +DlgImgAlertUrl : "?????????????????? ?????? URL ???????????? ???????????? ", +DlgImgLinkTab : "????????????", + +// Flash Dialog +DlgFlashTitle : "??????????????? ??????????????????????????????", +DlgFlashChkPlay : "????????? ????????????", +DlgFlashChkLoop : "?????????", +DlgFlashChkMenu : "??????????????? ????? ???????????? ?????? ?????????????????? ????????????", +DlgFlashScale : "???????????????", +DlgFlashScaleAll : "????????? ?????????????????????", +DlgFlashScaleNoBorder : "????????? ?????????????????? ????????????", +DlgFlashScaleFit : "????????????????????? ?????????", + +// Link Dialog +DlgLnkWindowTitle : "????????????", +DlgLnkInfoTab : "???????????? ", +DlgLnkTargetTab : "?????????????????????", + +DlgLnkType : "???????????? ??????????????????", +DlgLnkTypeURL : "URL", +DlgLnkTypeAnchor : "?????? ????????? ?????? ????????????", +DlgLnkTypeEMail : "???-?????????", +DlgLnkProto : "???????????????????????????", +DlgLnkProtoOther : "", +DlgLnkURL : "URL", +DlgLnkAnchorSel : "???????????? ???????????????", +DlgLnkAnchorByName : "???????????? ????????? ??????", +DlgLnkAnchorById : "?????????????? ????????? Id ??????", +DlgLnkNoAnchors : "", +DlgLnkEMail : "???-????????? ?????????", +DlgLnkEMailSubject : "??????????????? ????????????", +DlgLnkEMailBody : "???????????????", +DlgLnkUpload : "?? ????????????", +DlgLnkBtnUpload : "????????? ??????????????? ?????? ???????????????", + +DlgLnkTarget : "?????????????????????", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", +DlgLnkTargetBlank : "????????? ?????????????????? (_blank)", +DlgLnkTargetParent : "????????? ?????????????????? (_parent)", +DlgLnkTargetSelf : "????????? ?????????????????? (_self)", +DlgLnkTargetTop : "??????????????? ?????????????????? (_top)", +DlgLnkTargetFrameName : "????????????????????? ??????????????? ?????? ?????????", +DlgLnkPopWinName : "?????????-?? ??? ?????????????????? ?????? ?????????", +DlgLnkPopWinFeat : "?????????-?? ??? ?????????????????? ??????????????????", +DlgLnkPopResize : "???????????? ???????????? ?????? ???????????? ??????", +DlgLnkPopLocation : "?????????????????? ?????????", +DlgLnkPopMenu : "????? ???????????? ?????????", +DlgLnkPopScroll : "????????????????????? ?????????", +DlgLnkPopStatus : "?????????????????? ?????????", +DlgLnkPopToolbar : "????????? ?????????", +DlgLnkPopFullScrn : "????????? ????????????????????? (IE)", +DlgLnkPopDependent : "??????????????????????? ????????? (Netscape)", +DlgLnkPopWidth : "???????????????", +DlgLnkPopHeight : "???????????????", +DlgLnkPopLeft : "??????????????? ?????????", +DlgLnkPopTop : "??????????????? ?????????", + +DlnLnkMsgNoUrl : "???????????? URL ???????????? ????????????", +DlnLnkMsgNoEMail : "???-????????? ????????? ???????????? ????????????", +DlnLnkMsgNoAnchor : "???????????? ???????????????", + +// Color Dialog +DlgColorTitle : "????????? ???????????????", +DlgColorBtnClear : "????????? ????????????", +DlgColorHighlight : "?????????????????????", +DlgColorSelected : "????? ????? ??????????? ???", + +// Smiley Dialog +DlgSmileyTitle : "????????????????????? ????????????????????? ????????????", + +// Special Character Dialog +DlgSpecialCharTitle : "??????????????? ???????? ???????????? ???????????????", + +// Table Dialog +DlgTableTitle : "???????????? ??????????????????????????????", +DlgTableRows : "???????????????????????????", +DlgTableColumns : "????????????", +DlgTableBorder : "?????????????????? ????????????", +DlgTableAlign : "??????????????????????? ?????????", +DlgTableAlignNotSet : "", +DlgTableAlignLeft : "???????????????", +DlgTableAlignCenter : "????????? ?????????", +DlgTableAlignRight : "???????????????", +DlgTableWidth : "???????????????", +DlgTableWidthPx : "????????????????? ???", +DlgTableWidthPc : "?????????????????????", +DlgTableHeight : "???????????????", +DlgTableCellSpace : "????? ??? ?? ?????????", +DlgTableCellPad : "????? ??? ??????????????????", +DlgTableCaption : "??????????????????", +DlgTableSummary : "??????????????????", + +// Table Cell Dialog +DlgCellTitle : "????? ??? ??????????????????????????????", +DlgCellWidth : "???????????????", +DlgCellWidthPx : "????????????????? ???", +DlgCellWidthPc : "?????????????????????", +DlgCellHeight : "???????????????", +DlgCellWordWrap : "???????????? ?????????", +DlgCellWordWrapNotSet : "", +DlgCellWordWrapYes : "?????????", +DlgCellWordWrapNo : "????????????", +DlgCellHorAlign : "?????????????????????????????? ??????????????????????? ?????????", +DlgCellHorAlignNotSet : "", +DlgCellHorAlignLeft : "???????????????", +DlgCellHorAlignCenter : "????????? ?????????", +DlgCellHorAlignRight: "???????????????", +DlgCellVerAlign : "????????????????????? ??????????????????????? ?????????", +DlgCellVerAlignNotSet : "", +DlgCellVerAlignTop : "?????????", +DlgCellVerAlignMiddle : "????????????", +DlgCellVerAlignBottom : "????????????", +DlgCellVerAlignBaseline : "?????????????????????", +DlgCellRowSpan : "?????????????????? ???????????????", +DlgCellCollSpan : "???????????? ???????????????", +DlgCellBackColor : "???????????????????????????????????? ?????????", +DlgCellBorderColor : "?????????????????? ?????? ?????????", +DlgCellBtnSelect : "???????????????...", + +// Find Dialog +DlgFindTitle : "???????????????", +DlgFindFindBtn : "???????????????", +DlgFindNotFoundMsg : "???????????? ?????????????????? ???????????? ????????? ????????????????????? ???????????? ????????????", + +// Replace Dialog +DlgReplaceTitle : "?????????????????????", +DlgReplaceFindLbl : "?????? ???????????????:", +DlgReplaceReplaceLbl : "???????????? ????????????????????? ????????????:", +DlgReplaceCaseChk : "????????? ?????????????????????", +DlgReplaceReplaceBtn : "?????????????????????", +DlgReplaceReplAllBtn : "????????? ????????????????????? ????????????", +DlgReplaceWordChk : "???????????? ???????????? ?????????????????????", + +// Paste Operations / Dialog +PasteErrorPaste : "???????????? ???????????????????????? ?????? ????????????????????? ????? ????????????????????? ?????? ??????????????? ???????????? ?????? ?? ??????????????? ???????????? ?????????????????? ?????? ????????? (Ctrl+V) ?????? ?????????????????? ???????????????", +PasteErrorCut : "???????????? ????????????????????? ?????? ????????????????????? ????? ????????????????????? ?????? ?????? ???????????? ?????? ?? ??????????????? ???????????? ?????????????????? ?????? ????????? (Ctrl+X) ?????? ?????????????????? ???????????????", +PasteErrorCopy : "???????????? ???????????????????????? ?????? ????????????????????? ????? ????????????????????? ?????? ???????????? ???????????? ?????? ?? ??????????????? ???????????? ?????????????????? ?????? ????????? (Ctrl+C) ?????? ?????????????????? ???????????????", + +PasteAsText : "??????????????? (???????????? ????? ???????????????)", +PasteFromWord : "??????????????? (???????????? ??????)", + +DlgPasteMsg2 : "Ctrl+V ?????? ?????????????????? ???????????? ??????????????? ???????????? ?????? ????????? ?????? ????????????.", +DlgPasteIgnoreFont : "??????????????? ????????????????????? ?????????????????????", +DlgPasteRemoveStyles : "?????????????????? ????????????????????? ?????????????????????", +DlgPasteCleanBox : "??????????????? ????????? ????????????", + +// Color Picker +ColorAutomatic : "????????????????????????", +ColorMoreColors : "?????? ?????????...", + +// Document Properties +DocProps : "??????????????????????? ????????? ??????????????????????????????", + +// Anchor Dialog +DlgAnchorTitle : "???????????? ??????????????????????????????", +DlgAnchorName : "???????????? ?????? ?????????", +DlgAnchorErrorName : "???????????? ?????? ????????? ???????????? ????????????", + +// Speller Pages Dialog +DlgSpellNotInDic : "????????????????????? ????????? ????????????", +DlgSpellChangeTo : "??????????????? ???????????????", +DlgSpellBtnIgnore : "??????????????????", +DlgSpellBtnIgnoreAll : "????????? ?????????????????? ????????????", +DlgSpellBtnReplace : "?????????????????????", +DlgSpellBtnReplaceAll : "????????? ????????????????????? ????????????", +DlgSpellBtnUndo : "?? ????????????", +DlgSpellNoSuggestions : "- ????????? ??????????????? ???????????? -", +DlgSpellProgress : "?????????????????? ?????? ???????????? (??????????? ???-????? ???) ???????????? ??????...", +DlgSpellNoMispell : "?????????????????? ?????? ???????????? : ????????? ????????? ?????????????????? (??????????? ????????????) ???????????? ????????? ??????", +DlgSpellNoChanges : "?????????????????? ?????? ???????????? :????????? ???????????? ???????????? ???????????? ?????????", +DlgSpellOneChange : "?????????????????? ?????? ???????????? : ?????? ???????????? ???????????? ?????????", +DlgSpellManyChanges : "?????????????????? ?????? ???????????? : %1 ???????????? ???????????? ?????????", + +IeSpellDownload : "??????????? ???-????? ?????? ???????????????????????? ???????????? ???????????? ????????? ????????? ???????????? ?????? ????????? ???????????????????????? ???????????? ??????????????????????", + +// Button Dialog +DlgButtonText : "????????????????????? (??????????????????)", +DlgButtonType : "??????????????????", + +// Checkbox and Radio Button Dialogs +DlgCheckboxName : "?????????", +DlgCheckboxValue : "??????????????????", +DlgCheckboxSelected : "????? ????? ??????????? ???", + +// Form Dialog +DlgFormName : "?????????", +DlgFormAction : "???????????????", +DlgFormMethod : "???????????????", + +// Select Field Dialog +DlgSelectName : "?????????", +DlgSelectValue : "??????????????????", +DlgSelectSize : "????????????", +DlgSelectLines : "???????????????????????????", +DlgSelectChkMulti : "?????? ?????? ?????????????????? ?????????????????? ??????????????? ?????????", +DlgSelectOpAvail : "?????????????????? ??????????????????", +DlgSelectOpText : "?????????????????????", +DlgSelectOpValue : "??????????????????", +DlgSelectBtnAdd : "???????????????", +DlgSelectBtnModify : "???????????????", +DlgSelectBtnUp : "?????????", +DlgSelectBtnDown : "????????????", +DlgSelectBtnSetValue : "???????????? ?????? ?????????????????? ????? ??? ????????????", +DlgSelectBtnDelete : "???????????????", + +// Textarea Dialog +DlgTextareaName : "?????????", +DlgTextareaCols : "????????????", +DlgTextareaRows : "???????????????????????????", + +// Text Field Dialog +DlgTextName : "?????????", +DlgTextValue : "??????????????????", +DlgTextCharWidth : "???????? ???????????? ?????? ???????????????", +DlgTextMaxChars : "?? ??????????????? ???????? ????????????", +DlgTextType : "????????????", +DlgTextTypeText : "?????????????????????", +DlgTextTypePass : "????????????????????????", + +// Hidden Field Dialog +DlgHiddenName : "?????????", +DlgHiddenValue : "??????????????????", + +// Bulleted List Dialog +BulletedListProp : "??????????? ??? ???????????? ??????????????????????????????", +NumberedListProp : "?? ???????????? ???????????? ??????????????????????????????", +DlgLstType : "??????????????????", +DlgLstTypeCircle : "?????????", +DlgLstTypeDisc : "???????????????", +DlgLstTypeSquare : "???????????????", +DlgLstTypeNumbers : "?? ?????? (1, 2, 3)", +DlgLstTypeLCase : "???????????? ?? ???????????? (a, b, c)", +DlgLstTypeUCase : "????????? ?? ???????????? (A, B, C)", +DlgLstTypeSRoman : "???????????? ???????????? ?? ?????? (i, ii, iii)", +DlgLstTypeLRoman : "????????? ???????????? ?? ?????? (I, II, III)", + +// Document Properties Dialog +DlgDocGeneralTab : "??????", +DlgDocBackTab : "????????????????????????????????????", +DlgDocColorsTab : "????????? ?????? ?????????????????????", +DlgDocMetaTab : "????? ??????????????????", + +DlgDocPageTitle : "????????? ??????????????????", +DlgDocLangDir : "???????????? ??????????????? ?????? ????????????", +DlgDocLangDirLTR : "??????????????? ?????? ??????????????? (LTR)", +DlgDocLangDirRTL : "??????????????? ?????? ??????????????? (RTL)", +DlgDocLangCode : "???????????? ?????????", +DlgDocCharSet : "????????????????????? ????? ??? ???????????????????????????", +DlgDocCharSetOther : "?? ????????? ????????????????????? ????? ??? ???????????????????????????", + +DlgDocDocType : "??????????????????????? ????????? ?????????????????? ??????????????????", +DlgDocDocTypeOther : "?? ????????? ??????????????????????? ????????? ?????????????????? ??????????????????", +DlgDocIncXHTML : "XHTML ??????????????? ???????????????????????? ????????????", +DlgDocBgColor : "???????????????????????????????????? ?????????", +DlgDocBgImage : "???????????????????????????????????? ?????????????????? URL", +DlgDocBgNoScroll : "????????????????????? ??? ???????????? ???????????? ????????????????????????????????????", +DlgDocCText : "?????????????????????", +DlgDocCLink : "????????????", +DlgDocCVisited : "??????????????? ???????????? ????????? ????????????", +DlgDocCActive : "?????????????????? ????????????", +DlgDocMargins : "????????? ?????????????????????", +DlgDocMaTop : "?????????", +DlgDocMaLeft : "???????????????", +DlgDocMaRight : "???????????????", +DlgDocMaBottom : "????????????", +DlgDocMeIndex : "??????????????????????? ????????? ???????????????????????? ??????????????????????????? (?? ???????????????????????? ?????? ?? ?????? ????????????)", +DlgDocMeDescr : "??????????????????????? ????????? ???????? ???????????????", +DlgDocMeAuthor : "????????????", +DlgDocMeCopy : "????????????????????????", +DlgDocPreview : "????????????????????????", + +// Templates Dialog +Templates : "????? ?????????????????????", +DlgTemplatesTitle : "???????????????????????? ????? ?????????????????????", +DlgTemplatesSelMsg : "??????????????? ????????? ????????? ???????????? ???????????? ????? ????????????????????? ???????????????(????????????????????? ?????????????? ????????? ????????? ???????????? ???????????????):", +DlgTemplatesLoading : "????? ????????????????????? ???????????? ????????? ?????? ?????? ????????? ????????? ????????? ???????????????...", +DlgTemplatesNoTpl : "(????????? ????? ????????????????????? ?????????????????? ???????????? ???????????? ????????? ??????)", + +// About Dialog +DlgAboutAboutTab : "FCKEditor ?????? ???????????? ?????????", +DlgAboutBrowserInfoTab : "????????????????????? ?????? ???????????? ?????????", +DlgAboutLicenseTab : "????????????????????????", +DlgAboutVersion : "???????????????", +DlgAboutLicense : "????????????????????? :GNU LGPL", +DlgAboutInfo : "?? ????????? ????????????????????? ?????? ???????????? ???????????? ???????????????:" } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hr.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hr.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hr.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -80,13 +80,13 @@ FontSize : "Veli??ina", TextColor : "Boja teksta", BGColor : "Boja pozadine", -Source : "Kôd", +Source : "K??d", Find : "Prona??i", Replace : "Zamijeni", SpellCheck : "Provjeri pravopis", UniversalKeyboard : "Univerzalna tipkovnica", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING +PageBreakLbl : "Prijelom stranice", +PageBreak : "Ubaci prijelom stranice", Form : "Form", Checkbox : "Checkbox", @@ -98,8 +98,13 @@ SelectionField : "Selection Field", ImageButton : "Image Button", +FitWindow : "Maximize the editor size", //MISSING + // Context Menu EditLink : "Promijeni link", +CellCM : "Cell", //MISSING +RowCM : "Row", //MISSING +ColumnCM : "Column", //MISSING InsertRow : "Ubaci red", DeleteRows : "Izbri??i redove", InsertColumn : "Ubaci kolonu", @@ -108,7 +113,7 @@ DeleteCells : "Izbri??i ??elije", MergeCells : "Spoji ??elije", SplitCell : "Razdvoji ??elije", -TableDelete : "Delete Table", //MISSING +TableDelete : "Izbri??i tablicu", CellProperties : "Svojstva ??elije", TableProperties : "Svojstva tablice", ImageProperties : "Svojstva slike", @@ -136,9 +141,9 @@ UnknownCommand : "Nepoznata naredba \"%1\"", NotImplemented : "Naredba nije implementirana", UnknownToolbarSet : "Traka s alatima \"%1\" ne postoji", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING +NoActiveX : "Va??e postavke pretra??iva??a mogle bi ograni??iti neke od mogu??nosti editora. Morate uklju??iti opciju \"Run ActiveX controls and plug-ins\" u postavkama. Ukoliko to ne u??inite, mogu??e su razliite gre??ke tijekom rada.", +BrowseServerBlocked : "Pretraiva?? nije mogu??e otvoriti. Provjerite da li je uklju??eno blokiranje pop-up prozora.", +DialogBlocked : "Nije mogu??e otvoriti novi prozor. Provjerite da li je uklju??eno blokiranje pop-up prozora.", // Dialogs DlgBtnOK : "OK", @@ -146,17 +151,17 @@ DlgBtnClose : "Zatvori", DlgBtnBrowseServer : "Pretra??i server", DlgAdvancedTag : "Napredno", -DlgOpOther : "<Drugo>", +DlgOpOther : "", DlgInfoTab : "Info", DlgAlertUrl : "Molimo unesite URL", // General Dialogs Labels -DlgGenNotSet : "<nije postavljeno>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "Smjer jezika", DlgGenLangDirLtr : "S lijeva na desno (LTR)", DlgGenLangDirRtl : "S desna na lijevo (RTL)", -DlgGenLangCode : "Kôd jezika", +DlgGenLangCode : "K??d jezika", DlgGenAccessKey : "Pristupna tipka", DlgGenName : "Naziv", DlgGenTabIndex : "Tab Indeks", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "Sidro na ovoj stranici", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "Protokol", -DlgLnkProtoOther : "<drugo>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "Odaberi sidro", DlgLnkAnchorByName : "Po nazivu sidra", DlgLnkAnchorById : "Po Id elementa", -DlgLnkNoAnchors : "<Nema dostupnih sidra>", +DlgLnkNoAnchors : "", DlgLnkEMail : "E-Mail adresa", DlgLnkEMailSubject : "Naslov", DlgLnkEMailBody : "Sadr??aj poruke", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "Po??alji na server", DlgLnkTarget : "Meta", -DlgLnkTargetFrame : "<okvir>", -DlgLnkTargetPopup : "<popup prozor>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Novi prozor (_blank)", DlgLnkTargetParent : "Roditeljski prozor (_parent)", DlgLnkTargetSelf : "Isti prozor (_self)", @@ -272,7 +277,7 @@ DlgTableColumns : "Kolona", DlgTableBorder : "Veli??ina okvira", DlgTableAlign : "Poravnanje", -DlgTableAlignNotSet : "<nije postavljeno>", +DlgTableAlignNotSet : "", DlgTableAlignLeft : "Lijevo", DlgTableAlignCenter : "Sredi??nje", DlgTableAlignRight : "Desno", @@ -283,7 +288,7 @@ DlgTableCellSpace : "Prostornost ??elija", DlgTableCellPad : "Razmak ??elija", DlgTableCaption : "Naslov", -DlgTableSummary : "Summary", //MISSING +DlgTableSummary : "Sa??etak", // Table Cell Dialog DlgCellTitle : "Svojstva ??elije", @@ -292,16 +297,16 @@ DlgCellWidthPc : "postotaka", DlgCellHeight : "Visina", DlgCellWordWrap : "Word Wrap", -DlgCellWordWrapNotSet : "<nije postavljeno>", +DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "Da", DlgCellWordWrapNo : "Ne", DlgCellHorAlign : "Vodoravno poravnanje", -DlgCellHorAlignNotSet : "<nije postavljeno>", +DlgCellHorAlignNotSet : "", DlgCellHorAlignLeft : "Lijevo", DlgCellHorAlignCenter : "Sredi??nje", DlgCellHorAlignRight: "Desno", DlgCellVerAlign : "Okomito poravnanje", -DlgCellVerAlignNotSet : "<nije postavljeno>", +DlgCellVerAlignNotSet : "", DlgCellVerAlignTop : "Gornje", DlgCellVerAlignMiddle : "Sredni??nje", DlgCellVerAlignBottom : "Donje", @@ -338,7 +343,6 @@ DlgPasteIgnoreFont : "Zanemari definiciju vrste fonta", DlgPasteRemoveStyles : "Ukloni definicije stilova", DlgPasteCleanBox : "O??isti okvir", - // Color Picker ColorAutomatic : "Automatski", @@ -422,7 +426,7 @@ NumberedListProp : "Svojstva broj??ane liste", DlgLstType : "Vrsta", DlgLstTypeCircle : "Krug", -DlgLstTypeDisc : "Disc", //MISSING +DlgLstTypeDisc : "Disk", DlgLstTypeSquare : "Kvadrat", DlgLstTypeNumbers : "Brojevi (1, 2, 3)", DlgLstTypeLCase : "Mala slova (a, b, c)", @@ -440,7 +444,7 @@ DlgDocLangDir : "Smjer jezika", DlgDocLangDirLTR : "S lijeva na desno", DlgDocLangDirRTL : "S desna na lijevo", -DlgDocLangCode : "Kôd jezika", +DlgDocLangCode : "K??d jezika", DlgDocCharSet : "Enkodiranje znakova", DlgDocCharSetOther : "Ostalo enkodiranje znakova", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "O FCKEditoru", DlgAboutBrowserInfoTab : "Podaci o pretra??iva??u", +DlgAboutLicenseTab : "License", //MISSING DlgAboutVersion : "ina??ica", DlgAboutLicense : "Licencirano pod uvjetima GNU Lesser General Public License", DlgAboutInfo : "Za vi??e informacija posjetite" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hu.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hu.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/hu.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -15,6 +15,7 @@ * * File Authors: * Varga Zsolt (meridian at netteszt.hu) + * G??za Sz??cs (flextor at flextor.hu) */ var FCKLang = @@ -22,21 +23,21 @@ // Language direction : "ltr" (left to right) or "rtl" (right to left). Dir : "ltr", -ToolbarCollapse : "Egyszer?? eszk??zt??r", -ToolbarExpand : "B??v??tett eszk??zt??r", +ToolbarCollapse : "Eszk??zt??r elrejt??se", +ToolbarExpand : "Eszk??zt??r megjelen??t??se", // Toolbar Items and Context Menu Save : "Ment??s", NewPage : "??j oldal", -Preview : "El??n??zet", +Preview : "El??n??zet", Cut : "Kiv??g??s", Copy : "M??sol??s", Paste : "Beilleszt??s", -PasteText : "Beilleszt??s form??zatlan sz??vegk??nt", -PasteWord : "Beilleszt??s Wordb??l", +PasteText : "Beilleszt??s form??z??s n??lk??l", +PasteWord : "Beilleszt??s Word-b??l", Print : "Nyomtat??s", -SelectAll : "Minden kijel??l??se", -RemoveFormat : "Form??z??s t??rl??se", +SelectAll : "Mindent kijel??l", +RemoveFormat : "Form??z??s elt??vol??t??sa", InsertLinkLbl : "Hivatkoz??s", InsertLink : "Hivatkoz??s beilleszt??se/m??dos??t??sa", RemoveLink : "Hivatkoz??s t??rl??se", @@ -55,11 +56,11 @@ InsertSmiley : "Hangulatjelek beilleszt??se", About : "FCKeditor n??vjegy", Bold : "F??lk??v??r", -Italic : "D??lt", +Italic : "D??lt", Underline : "Al??h??zott", StrikeThrough : "??th??zott", Subscript : "Als?? index", -Superscript : "Fels?? index", +Superscript : "Fels?? index", LeftJustify : "Balra", CenterJustify : "K??z??pre", RightJustify : "Jobbra", @@ -76,15 +77,15 @@ ShowDetails : "R??szletek mutat??sa", Style : "St??lus", FontFormat : "Form??tum", -Font : "Bet??tipus", +Font : "Bet??t??pus", FontSize : "M??ret", -TextColor : "Bet??sz??n", +TextColor : "Bet??sz??n", BGColor : "H??tt??rsz??n", Source : "Forr??sk??d", Find : "Keres??s", Replace : "Csere", -SpellCheck : "Helyes??r??sellen??rz??s", -UniversalKeyboard : "??ltal??nos billenty??zet", +SpellCheck : "Helyes??r??s-ellen??rz??s", +UniversalKeyboard : "Univerz??lis billenty??zet", PageBreakLbl : "Oldalt??r??s", PageBreak : "Oldalt??r??s beilleszt??se", @@ -95,83 +96,88 @@ Textarea : "Sz??vegter??let", HiddenField : "Rejtettmez??", Button : "Gomb", -SelectionField : "V??laszt??mez??", +SelectionField : "Leg??rd??l?? lista", ImageButton : "K??pgomb", + +FitWindow : "Maximaliz??l??s", // Context Menu EditLink : "Hivatkoz??s m??dos??t??sa", +CellCM : "Cella", +RowCM : "Sor", +ColumnCM : "Oszlop", InsertRow : "Sor besz??r??sa", -DeleteRows : "Sor(ok) t??rl??se", +DeleteRows : "Sorok t??rl??se", InsertColumn : "Oszlop besz??r??sa", -DeleteColumns : "Oszlop(ok) t??rl??se", +DeleteColumns : "Oszlopok t??rl??se", InsertCell : "Cella besz??r??sa", DeleteCells : "Cell??k t??rl??se", MergeCells : "Cell??k egyes??t??se", -SplitCell : "Cell??k sz??tv??laszt??sa", +SplitCell : "Cella sz??tv??laszt??sa", TableDelete : "T??bl??zat t??rl??se", -CellProperties : "Cell??k tulajdons??ga", -TableProperties : "T??bl??zat tulajdons??ga", -ImageProperties : "K??p tulajdons??ga", -FlashProperties : "Flash tulajdons??ga", - -AnchorProp : "Horgony(ok) tulajdons??ga(i)", -ButtonProp : "Gomb(ok) tulajdons??ga(i) ", -CheckboxProp : "Jel??l??n??gyzet(ek) tulajdons??ga(i)", -HiddenFieldProp : "Rejtettmez??(k) tulajdons??ga(i)", -RadioButtonProp : "V??laszt??gomb(ok) tulajdons??ga(i)", -ImageButtonProp : "K??pgomb(ok) tulajdons??ga(i)", -TextFieldProp : "Sz??vegmez??(k) tulajdons??ga(i)", -SelectionFieldProp : "V??laszt??mez??(k) tulajdons??ga(i)", -TextareaProp : "Sz??vegter??let(ek) tulajdons??ga(i)", -FormProp : "??rlap(ok) tulajdons??ga(i)", +CellProperties : "Cella tulajdons??gai", +TableProperties : "T??bl??zat tulajdons??gai", +ImageProperties : "K??p tulajdons??gai", +FlashProperties : "Flash tulajdons??gai", + +AnchorProp : "Horgony tulajdons??gai", +ButtonProp : "Gomb tulajdons??gai", +CheckboxProp : "Jel??l??n??gyzet tulajdons??gai", +HiddenFieldProp : "Rejtett mez?? tulajdons??gai", +RadioButtonProp : "V??laszt??gomb tulajdons??gai", +ImageButtonProp : "K??pgomb tulajdons??gai", +TextFieldProp : "Sz??vegmez?? tulajdons??gai", +SelectionFieldProp : "Leg??rd??l?? lista tulajdons??gai", +TextareaProp : "Sz??vegter??let tulajdons??gai", +FormProp : "??rlap tulajdons??gai", FontFormats : "Norm??l;Form??zott;C??msor;Fejl??c 1;Fejl??c 2;Fejl??c 3;Fejl??c 4;Fejl??c 5;Fejl??c 6;Bekezd??s (DIV)", // Alerts and Messages ProcessingXHTML : "XHTML feldolgoz??sa. K??rem v??rjon...", Done : "K??sz", -PasteWordConfirm : "A sz??veg amit be szeretn??l illeszteni ??gy n??z ki Word-b??l van m??solva. Do you want to clean it before pasting?", -NotCompatiblePaste : "Ez a parancs csak Internet Explorer 5.5 verzi??t??l haszn??lhat?? (Firefox rulez). Do you want to paste without cleaning?", +PasteWordConfirm : "A beilleszteni k??v??nt sz??veg Word-b??l van m??solva. El k??v??nja t??vol??tani a form??z??st a beilleszt??s el??tt?", +NotCompatiblePaste : "Ez a parancs csak Internet Explorer 5.5 verzi??t??l haszn??lhat??. Megpr??b??lja beilleszteni a sz??veget az eredeti form??z??ssal?", UnknownToolbarItem : "Ismeretlen eszk??zt??r elem \"%1\"", UnknownCommand : "Ismeretlen parancs \"%1\"", -NotImplemented : "A parancs nincs be??gyazva", -UnknownToolbarSet : "Eszk??zk??szlet be??ll??t??s \"%1\" nem l??tezik", -NoActiveX : "A b??ng??sz??d biztons??gi be??ll??t??sai limit??lj??k a szerkeszt?? lehet??s??geit. Enged??lyezned kell ezt az opci??t: \"Run ActiveX controls and plug-ins\". Kitapasztalhatod a hib??kat ??s feljegyezheted a hi??nyz?? k??pess??geket.", -BrowseServerBlocked : "Nem lehet megnyitni a f??jlb??ng??sz??t. Bizonyosodj meg r??la, hogy a popup albakok enged??lyezve vannak.", -DialogBlocked : "Nem tudom megnyitni a p??rbesz??dablakot. Bizonyosodj meg r??la, hogy a popup ablakok enged??lyezve vannak.", +NotImplemented : "A parancs nem hajthat?? v??gre", +UnknownToolbarSet : "Az eszk??zk??szlet \"%1\" nem l??tezik", +NoActiveX : "A b??ng??sz?? biztons??gi be??ll??t??sai korl??tozz??k a szerkeszt?? lehet??s??geit. Enged??lyezni kell ezt az opci??t: \"Run ActiveX controls and plug-ins\". Ett??l f??ggetlen??l el??fordulhatnak hiba??zenetek ill. bizonyos funkci??k hi??nyozhatnak.", +BrowseServerBlocked : "Nem lehet megnyitni a f??jlb??ng??sz??t. Bizonyosodjon meg r??la, hogy a felbukkan?? ablakok enged??lyezve vannak.", +DialogBlocked : "Nem lehet megnyitni a p??rbesz??dablakot. Bizonyosodjon meg r??la, hogy a felbukkan?? ablakok enged??lyezve vannak.", // Dialogs -DlgBtnOK : "OK", +DlgBtnOK : "Rendben", DlgBtnCancel : "M??gsem", DlgBtnClose : "Bez??r??s", -DlgBtnBrowseServer : "Szerver tall??z??sa", -DlgAdvancedTag : "Halad??", +DlgBtnBrowseServer : "B??ng??sz??s a szerveren", +DlgAdvancedTag : "Tov??bbi opci??k", DlgOpOther : "Egy??b", -DlgInfoTab : "Inform??ci??", -DlgAlertUrl : "Illeszd be a hivatkoz??st", +DlgInfoTab : "Alaptulajdons??gok", +DlgAlertUrl : "Illessze be a webc??met", // General Dialogs Labels -DlgGenNotSet : "<nincs be??ll??tva>", +DlgGenNotSet : "", DlgGenId : "Azonos??t??", -DlgGenLangDir : "Nyelv ??tmutat??", +DlgGenLangDir : "??r??s ir??nya", DlgGenLangDirLtr : "Balr??l jobbra", DlgGenLangDirRtl : "Jobbr??l balra", -DlgGenLangCode : "Nyelv k??d", -DlgGenAccessKey : "El??r??si kulcs", +DlgGenLangCode : "Nyelv k??dja", +DlgGenAccessKey : "Billenty??kombin??ci??", DlgGenName : "N??v", DlgGenTabIndex : "Tabul??tor index", -DlgGenLongDescr : "Hossz?? URL", +DlgGenLongDescr : "R??szletes le??r??s webc??me", DlgGenClass : "St??lusk??szlet", -DlgGenTitle : "Advisory Title", -DlgGenContType : "Advisory Content Type", -DlgGenLinkCharset : "Hivatkozott k??dlap k??szlet", +DlgGenTitle : "S??g??cimke", +DlgGenContType : "S??g?? tartalomt??pusa", +DlgGenLinkCharset : "Hivatkozott tartalom k??dlapja", DlgGenStyle : "St??lus", // Image Dialog -DlgImgTitle : "K??p tulajdons??ga", -DlgImgInfoTab : "K??p inform??ci??", -DlgImgBtnUpload : "K??ld??s a szervernek", -DlgImgURL : "URL", +DlgImgTitle : "K??p tulajdons??gai", +DlgImgInfoTab : "Alaptulajdons??gok", +DlgImgBtnUpload : "K??ld??s a szerverre", +DlgImgURL : "Hivatkoz??s", DlgImgUpload : "Felt??lt??s", DlgImgAlt : "Bubor??k sz??veg", DlgImgWidth : "Sz??less??g", @@ -185,18 +191,18 @@ DlgImgAlignLeft : "Bal", DlgImgAlignAbsBottom: "Legalj??ra", DlgImgAlignAbsMiddle: "K??zep??re", -DlgImgAlignBaseline : "Baseline", +DlgImgAlignBaseline : "Alapvonalhoz", DlgImgAlignBottom : "Alj??ra", DlgImgAlignMiddle : "K??z??pre", DlgImgAlignRight : "Jobbra", -DlgImgAlignTextTop : "Sz??veg tetj??re", +DlgImgAlignTextTop : "Sz??veg tetej??re", DlgImgAlignTop : "Tetej??re", -DlgImgPreview : "El??n??zet", -DlgImgAlertUrl : "T??ltse ki a k??p URL-??t", +DlgImgPreview : "El??n??zet", +DlgImgAlertUrl : "T??ltse ki a k??p webc??m??t", DlgImgLinkTab : "Hivatkoz??s", // Flash Dialog -DlgFlashTitle : "Flash tulajdons??ga", +DlgFlashTitle : "Flash tulajdons??gai", DlgFlashChkPlay : "Automata lej??tsz??s", DlgFlashChkLoop : "Folyamatosan", DlgFlashChkMenu : "Flash men?? enged??lyez??se", @@ -206,59 +212,59 @@ DlgFlashScaleFit : "Teljes kit??lt??s", // Link Dialog -DlgLnkWindowTitle : "Hivatkoz??s", -DlgLnkInfoTab : "Hivatkoz??s inform??ci??", -DlgLnkTargetTab : "C??l", - -DlgLnkType : "Hivatkoz??s tipusa", -DlgLnkTypeURL : "URL", +DlgLnkWindowTitle : "Hivatkoz??s tulajdons??gai", +DlgLnkInfoTab : "Alaptulajdons??gok", +DlgLnkTargetTab : "Megjelen??t??s", + +DlgLnkType : "Hivatkoz??s t??pusa", +DlgLnkTypeURL : "Webc??m", DlgLnkTypeAnchor : "Horgony az oldalon", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "Protokoll", -DlgLnkProtoOther : "<m??s>", -DlgLnkURL : "URL", +DlgLnkProtoOther : "", +DlgLnkURL : "Webc??m", DlgLnkAnchorSel : "Horgony v??laszt??sa", DlgLnkAnchorByName : "Horgony n??v szerint", -DlgLnkAnchorById : "Azonos??t?? szerint el??sorban ", -DlgLnkNoAnchors : "<Nincs horgony a dokumentumban>", +DlgLnkAnchorById : "Azonos??t?? szerint", +DlgLnkNoAnchors : "", DlgLnkEMail : "E-Mail c??m", DlgLnkEMailSubject : "??zenet t??rgya", DlgLnkEMailBody : "??zenet", DlgLnkUpload : "Felt??lt??s", -DlgLnkBtnUpload : "K??ld??s a szerverhez", - -DlgLnkTarget : "C??l", -DlgLnkTargetFrame : "<keret>", -DlgLnkTargetPopup : "<felugr?? ablak>", -DlgLnkTargetBlank : "??j ablak (_blank)", -DlgLnkTargetParent : "Sz??l?? ablak (_parent)", -DlgLnkTargetSelf : "Azonos ablak (_self)", -DlgLnkTargetTop : "Legfels?? ablak (_top)", -DlgLnkTargetFrameName : "C??l frame neve", +DlgLnkBtnUpload : "K??ld??s a szerverre", + +DlgLnkTarget : "Tartalom megjelen??t??se", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", +DlgLnkTargetBlank : "??j ablakban (_blank)", +DlgLnkTargetParent : "Sz??l?? ablakban (_parent)", +DlgLnkTargetSelf : "Azonos ablakban (_self)", +DlgLnkTargetTop : "Legfels?? ablakban (_top)", +DlgLnkTargetFrameName : "Keret neve", DlgLnkPopWinName : "Felugr?? ablak neve", -DlgLnkPopWinFeat : "Felugr?? ablak jellemz??i", -DlgLnkPopResize : "M??retezhet??", -DlgLnkPopLocation : "Location Bar", +DlgLnkPopWinFeat : "Felugr?? ablak jellemz??i", +DlgLnkPopResize : "M??retezhet??", +DlgLnkPopLocation : "C??msor", DlgLnkPopMenu : "Men?? sor", -DlgLnkPopScroll : "G??rd??t??s??v", +DlgLnkPopScroll : "G??rd??t??s??v", DlgLnkPopStatus : "??llapotsor", DlgLnkPopToolbar : "Eszk??zt??r", -DlgLnkPopFullScrn : "Teljes k??perny?? (IE)", -DlgLnkPopDependent : "Netscape saj??toss??g", +DlgLnkPopFullScrn : "Teljes k??perny?? (csak IE)", +DlgLnkPopDependent : "Sz??l??h??z kapcsolt (csak Netscape)", DlgLnkPopWidth : "Sz??less??g", DlgLnkPopHeight : "Magass??g", DlgLnkPopLeft : "Bal poz??ci??", -DlgLnkPopTop : "Fels?? poz??ci??", - -DlnLnkMsgNoUrl : "Adja meg a hivatkoz??s URL-??t", -DlnLnkMsgNoEMail : "Adja meg az e-mail c??met", +DlgLnkPopTop : "Fels?? poz??ci??", + +DlnLnkMsgNoUrl : "Adja meg a hivatkoz??s webc??m??t", +DlnLnkMsgNoEMail : "Adja meg az E-Mail c??met", DlnLnkMsgNoAnchor : "V??lasszon egy horgonyt", // Color Dialog -DlgColorTitle : "Szinv??laszt??s", +DlgColorTitle : "Sz??nv??laszt??s", DlgColorBtnClear : "T??rl??s", -DlgColorHighlight : "Vil??gos r??sz", -DlgColorSelected : "V??lasztott", +DlgColorHighlight : "El??n??zet", +DlgColorSelected : "Kiv??lasztott", // Smiley Dialog DlgSmileyTitle : "Hangulatjel besz??r??sa", @@ -273,35 +279,35 @@ DlgTableBorder : "Szeg??lym??ret", DlgTableAlign : "Igaz??t??s", DlgTableAlignNotSet : "", -DlgTableAlignLeft : "Bal", -DlgTableAlignCenter : "K??z??p", -DlgTableAlignRight : "Jobb", +DlgTableAlignLeft : "Balra", +DlgTableAlignCenter : "K??z??pre", +DlgTableAlignRight : "Jobbra", DlgTableWidth : "Sz??less??g", -DlgTableWidthPx : "k??ppontok", +DlgTableWidthPx : "k??ppont", DlgTableWidthPc : "sz??zal??k", DlgTableHeight : "Magass??g", -DlgTableCellSpace : "Cell spacing", -DlgTableCellPad : "Cell padding", +DlgTableCellSpace : "Cella t??rk??z", +DlgTableCellPad : "Cella bels?? marg??", DlgTableCaption : "Felirat", -DlgTableSummary : "??sszegz??s", +DlgTableSummary : "Le??r??s", // Table Cell Dialog DlgCellTitle : "Cella tulajdons??gai", DlgCellWidth : "Sz??less??g", -DlgCellWidthPx : "k??ppontok", +DlgCellWidthPx : "k??ppont", DlgCellWidthPc : "sz??zal??k", -DlgCellHeight : "Height", +DlgCellHeight : "Magass??g", DlgCellWordWrap : "Sort??r??s", -DlgCellWordWrapNotSet : "<Nincs be??ll??tva>", +DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "Igen", DlgCellWordWrapNo : "Nem", -DlgCellHorAlign : "V??zszintes igaz??t??s", -DlgCellHorAlignNotSet : "<Nincs be??ll??tva>", -DlgCellHorAlignLeft : "Bal", -DlgCellHorAlignCenter : "K??z??p", -DlgCellHorAlignRight: "Jobb", -DlgCellVerAlign : "F??gg??leges igaz??t??s", -DlgCellVerAlignNotSet : "<Nincs be??ll??tva>", +DlgCellHorAlign : "V??zsz. igaz??t??s", +DlgCellHorAlignNotSet : "", +DlgCellHorAlignLeft : "Balra", +DlgCellHorAlignCenter : "K??z??pre", +DlgCellHorAlignRight: "Jobbra", +DlgCellVerAlign : "F??gg. igaz??t??s", +DlgCellVerAlignNotSet : "", DlgCellVerAlignTop : "Tetej??re", DlgCellVerAlignMiddle : "K??z??pre", DlgCellVerAlignBottom : "Alj??ra", @@ -319,55 +325,54 @@ // Replace Dialog DlgReplaceTitle : "Csere", -DlgReplaceFindLbl : "Keresend??:", -DlgReplaceReplaceLbl : "Cser??lend??:", -DlgReplaceCaseChk : "Tal??latok", +DlgReplaceFindLbl : "Keresett sz??veg:", +DlgReplaceReplaceLbl : "Csere erre:", +DlgReplaceCaseChk : "kis- ??s nagybet?? megk??l??nb??ztet??se", DlgReplaceReplaceBtn : "Csere", -DlgReplaceReplAllBtn : "??sszes cser??je", -DlgReplaceWordChk : "Eg??sz dokumentumban", +DlgReplaceReplAllBtn : "Az ??sszes cser??je", +DlgReplaceWordChk : "csak ha ez a teljes sz??", // Paste Operations / Dialog -PasteErrorPaste : "A b??ng??sz?? biztons??gi be??ll??t??sai nem enged??lyezik a szerkeszt??nek, hogy v??grehatjsa a beilleszt??s m??veletet.Haszn??lja az al??bbi billenty??zetkombin??ci??t (Ctrl+V).", -PasteErrorCut : "A b??ng??sz?? biztons??gi be??ll??t??sai nem enged??lyezik a szerkeszt??nek, hogy v??grehatjsa a kiv??g??s m??veletet.Haszn??lja az al??bbi billenty??zetkombin??ci??t (Ctrl+X).", -PasteErrorCopy : "A b??ng??sz?? biztons??gi be??ll??t??sai nem enged??lyezik a szerkeszt??nek, hogy v??grehatjsa a m??sol??s m??veletet.Haszn??lja az al??bbi billenty??zetkombin??ci??t (Ctrl+X).", +PasteErrorPaste : "A b??ng??sz?? biztons??gi be??ll??t??sai nem enged??lyezik a szerkeszt??nek, hogy v??grehajtsa a beilleszt??s m??veletet. Haszn??lja az al??bbi billenty??kombin??ci??t (Ctrl+V).", +PasteErrorCut : "A b??ng??sz?? biztons??gi be??ll??t??sai nem enged??lyezik a szerkeszt??nek, hogy v??grehajtsa a kiv??g??s m??veletet. Haszn??lja az al??bbi billenty??kombin??ci??t (Ctrl+X).", +PasteErrorCopy : "A b??ng??sz?? biztons??gi be??ll??t??sai nem enged??lyezik a szerkeszt??nek, hogy v??grehajtsa a m??sol??s m??veletet. Haszn??lja az al??bbi billenty??kombin??ci??t (Ctrl+X).", PasteAsText : "Beilleszt??s form??zatlan sz??vegk??nt", -PasteFromWord : "Beilleszt??s Wordb??l", - -DlgPasteMsg2 : "M??sold be az al??bbi mez??be a k??vetkez?? billenty??k haszn??lat??val (Ctrl+V) ??s nyomj OK.", +PasteFromWord : "Beilleszt??s Word-b??l", + +DlgPasteMsg2 : "M??solja be az al??bbi mez??be a Ctrl+V billenty??k lenyom??s??val, majd nyomjon Rendben-t.", DlgPasteIgnoreFont : "Bet?? form??z??sok megsz??ntet??se", -DlgPasteRemoveStyles : "St??luslapok elt??vol??t??sa", -DlgPasteCleanBox : "Mez?? tartalm??nak t??rl??se", - +DlgPasteRemoveStyles : "St??lusok elt??vol??t??sa", +DlgPasteCleanBox : "T??rl??s", // Color Picker ColorAutomatic : "Automatikus", -ColorMoreColors : "T??bb sz??n...", +ColorMoreColors : "Tov??bbi sz??nek...", // Document Properties -DocProps : "Dokumentum tulajdons??ga", +DocProps : "Dokumentum tulajdons??gai", // Anchor Dialog -DlgAnchorTitle : "Horgony tulajdons??ga", +DlgAnchorTitle : "Horgony tulajdons??gai", DlgAnchorName : "Horgony neve", DlgAnchorErrorName : "K??rem adja meg a horgony nev??t", // Speller Pages Dialog -DlgSpellNotInDic : "Nincs a k??nyvt??rban", -DlgSpellChangeTo : "??tv??lt??s", +DlgSpellNotInDic : "Nincs a sz??t??rban", +DlgSpellChangeTo : "M??dos??t??s", DlgSpellBtnIgnore : "Kihagyja", -DlgSpellBtnIgnoreAll : "??sszeset kihagyja", +DlgSpellBtnIgnoreAll : "Mindet kihagyja", DlgSpellBtnReplace : "Csere", DlgSpellBtnReplaceAll : "??sszes cser??je", DlgSpellBtnUndo : "Visszavon??s", -DlgSpellNoSuggestions : "Nincs feltev??s", -DlgSpellProgress : "Helyes??r??sellen??rz??s folyamatban...", -DlgSpellNoMispell : "Helyes??r??sellen??rz??s k??sz: Nem tal??ltam hib??t", -DlgSpellNoChanges : "Helyes??r??sellen??rz??s k??sz: Nincs v??ltoztatott sz??", -DlgSpellOneChange : "Helyes??r??sellen??rz??s k??sz: Egy sz?? cser??lve", -DlgSpellManyChanges : "Helyes??r??sellen??rz??s k??sz: %1 sz?? cser??lve", - -IeSpellDownload : "A helyes??r??sellen??rz?? nincs telep??tve. Szeretn?? let??lteni most?", +DlgSpellNoSuggestions : "Nincs javaslat", +DlgSpellProgress : "Helyes??r??s-ellen??rz??s folyamatban...", +DlgSpellNoMispell : "Helyes??r??s-ellen??rz??s k??sz: Nem tal??ltam hib??t", +DlgSpellNoChanges : "Helyes??r??s-ellen??rz??s k??sz: Nincs v??ltoztatott sz??", +DlgSpellOneChange : "Helyes??r??s-ellen??rz??s k??sz: Egy sz?? cser??lve", +DlgSpellManyChanges : "Helyes??r??s-ellen??rz??s k??sz: %1 sz?? cser??lve", + +IeSpellDownload : "A helyes??r??s-ellen??rz?? nincs telep??tve. Szeretn?? let??lteni most?", // Button Dialog DlgButtonText : "Sz??veg (??rt??k)", @@ -376,39 +381,39 @@ // Checkbox and Radio Button Dialogs DlgCheckboxName : "N??v", DlgCheckboxValue : "??rt??k", -DlgCheckboxSelected : "V??lasztott", +DlgCheckboxSelected : "Kiv??lasztott", // Form Dialog DlgFormName : "N??v", -DlgFormAction : "Esem??ny", -DlgFormMethod : "Met??dus", +DlgFormAction : "Adatfeldolgoz??st v??gz?? hivatkoz??s", +DlgFormMethod : "Adatk??ld??s m??dja", // Select Field Dialog DlgSelectName : "N??v", DlgSelectValue : "??rt??k", DlgSelectSize : "M??ret", -DlgSelectLines : "sorok", -DlgSelectChkMulti : "Engedi a t??bbsz??r??s kiv??laszt??st", +DlgSelectLines : "sor", +DlgSelectChkMulti : "t??bb sor is kiv??laszthat??", DlgSelectOpAvail : "El??rhet?? opci??k", DlgSelectOpText : "Sz??veg", DlgSelectOpValue : "??rt??k", -DlgSelectBtnAdd : "B??v??t", +DlgSelectBtnAdd : "Hozz??ad", DlgSelectBtnModify : "M??dos??t", DlgSelectBtnUp : "Fel", DlgSelectBtnDown : "Le", -DlgSelectBtnSetValue : "Be??ll??tja a kiv??lasztott ??rt??ket", +DlgSelectBtnSetValue : "Legyen az alap??rtelmezett ??rt??k", DlgSelectBtnDelete : "T??r??l", // Textarea Dialog DlgTextareaName : "N??v", -DlgTextareaCols : "Oszlopok", -DlgTextareaRows : "Sorok", +DlgTextareaCols : "Karakterek sz??ma egy sorban", +DlgTextareaRows : "Sorok sz??ma", // Text Field Dialog DlgTextName : "N??v", DlgTextValue : "??rt??k", -DlgTextCharWidth : "Karakter sz??less??g", -DlgTextMaxChars : "Maximum karakterek", +DlgTextCharWidth : "Megjelen??tett karakterek sz??ma", +DlgTextMaxChars : "Maxim??lis karaktersz??m", DlgTextType : "T??pus", DlgTextTypeText : "Sz??veg", DlgTextTypePass : "Jelsz??", @@ -420,13 +425,13 @@ // Bulleted List Dialog BulletedListProp : "Felsorol??s tulajdons??gai", NumberedListProp : "Sz??moz??s tulajdons??gai", -DlgLstType : "T??pus", -DlgLstTypeCircle : "Ciklus", +DlgLstType : "Form??tum", +DlgLstTypeCircle : "K??r", DlgLstTypeDisc : "Lemez", DlgLstTypeSquare : "N??gyzet", DlgLstTypeNumbers : "Sz??mok (1, 2, 3)", -DlgLstTypeLCase : "Kisbet??s (a, b, c)", -DlgLstTypeUCase : "Nagybet??s (a, b, c)", +DlgLstTypeLCase : "Kisbet??k (a, b, c)", +DlgLstTypeUCase : "Nagybet??k (A, B, C)", DlgLstTypeSRoman : "Kis r??mai sz??mok (i, ii, iii)", DlgLstTypeLRoman : "Nagy r??mai sz??mok (I, II, III)", @@ -437,16 +442,16 @@ DlgDocMetaTab : "Meta adatok", DlgDocPageTitle : "Oldalc??m", -DlgDocLangDir : "Nyelv utas??t??s", -DlgDocLangDirLTR : "Balr??l jobbra (LTR)", -DlgDocLangDirRTL : "Jobbr??l balra (RTL)", +DlgDocLangDir : "??r??s ir??nya", +DlgDocLangDirLTR : "Balr??l jobbra", +DlgDocLangDirRTL : "Jobbr??l balra", DlgDocLangCode : "Nyelv k??d", DlgDocCharSet : "Karakterk??dol??s", DlgDocCharSetOther : "M??s karakterk??dol??s", -DlgDocDocType : "Dokumentum c??msor t??pus", -DlgDocDocTypeOther : "M??s dokumentum c??msor t??pus", -DlgDocIncXHTML : "XHTML elemeket tartalmaz", +DlgDocDocType : "Dokumentum t??pus fejl??c", +DlgDocDocTypeOther : "M??s dokumentum t??pus fejl??c", +DlgDocIncXHTML : "XHTML deklar??ci??k beilleszt??se", DlgDocBgColor : "H??tt??rsz??n", DlgDocBgImage : "H??tt??rk??p c??m", DlgDocBgNoScroll : "Nem g??rd??thet?? h??tt??r", @@ -458,7 +463,7 @@ DlgDocMaTop : "Fels??", DlgDocMaLeft : "Bal", DlgDocMaRight : "Jobb", -DlgDocMaBottom : "Fel??l", +DlgDocMaBottom : "Als??", DlgDocMeIndex : "Dokumentum keres??szavak (vessz??vel elv??lasztva)", DlgDocMeDescr : "Dokumentum le??r??s", DlgDocMeAuthor : "Szerz??", @@ -468,14 +473,15 @@ // Templates Dialog Templates : "Sablonok", DlgTemplatesTitle : "El??rhet?? sablonok", -DlgTemplatesSelMsg : "V??laszd ki melyik sablon ny??ljon meg a szerkeszt??ben
      (a jelenlegi tartalom elveszik):", +DlgTemplatesSelMsg : "V??lassza ki melyik sablon ny??ljon meg a szerkeszt??ben
      (a jelenlegi tartalom elveszik):", DlgTemplatesLoading : "Sablon lista bet??lt??se. Kis t??relmet...", DlgTemplatesNoTpl : "(Nincs sablon megadva)", // About Dialog -DlgAboutAboutTab : "About", +DlgAboutAboutTab : "N??vjegy", DlgAboutBrowserInfoTab : "B??ng??sz?? inform??ci??", +DlgAboutLicenseTab : "Licensz", DlgAboutVersion : "verzi??", DlgAboutLicense : "GNU Lesser General Public License szabadalom al?? tartozik", -DlgAboutInfo : "Tov??bbi inform??ci??k??rt menjen" +DlgAboutInfo : "Tov??bbi inform??ci??k??rt l??togasson el ide:" } Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/it.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/it.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/it.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -22,7 +22,7 @@ // Language direction : "ltr" (left to right) or "rtl" (right to left). Dir : "ltr", -ToolbarCollapse : "Nasconti la barra degli strumenti", +ToolbarCollapse : "Nascondi la barra degli strumenti", ToolbarExpand : "Mostra la barra degli strumenti", // Toolbar Items and Context Menu @@ -84,7 +84,7 @@ Find : "Trova", Replace : "Sostituisci", SpellCheck : "Correttore ortografico", -UniversalKeyboard : "Tastiera univerale", +UniversalKeyboard : "Tastiera universale", PageBreakLbl : "Interruzione di pagina", PageBreak : "Inserisci interruzione di pagina", @@ -98,8 +98,13 @@ SelectionField : "Menu di selezione", ImageButton : "Bottone immagine", +FitWindow : "Massimizza l'area dell'editor", + // Context Menu EditLink : "Modifica collegamento", +CellCM : "Cella", +RowCM : "Riga", +ColumnCM : "Colonna", InsertRow : "Inserisci riga", DeleteRows : "Elimina righe", InsertColumn : "Inserisci colonna", @@ -134,7 +139,7 @@ NotCompatiblePaste : "Questa funzione ?? disponibile solo per Internet Explorer 5.5 o superiore. Desideri incollare il testo senza pulirlo?", UnknownToolbarItem : "Elemento della barra strumenti sconosciuto \"%1\"", UnknownCommand : "Comando sconosciuto \"%1\"", -NotImplemented : "Commando non implementato", +NotImplemented : "Comando non implementato", UnknownToolbarSet : "La barra di strumenti \"%1\" non esiste", NoActiveX : "Le impostazioni di sicurezza del tuo browser potrebbero limitare alcune funzionalit?? dell'editor. Devi abilitare l'opzione \"Esegui controlli e plug-in ActiveX\". Potresti avere errori e notare funzionalit?? mancanti.", BrowseServerBlocked : "Non ?? possibile aprire la finestra di espolorazione risorse. Verifica che tutti i blocca popup siano bloccati.", @@ -146,18 +151,18 @@ DlgBtnClose : "Chiudi", DlgBtnBrowseServer : "Cerca sul server", DlgAdvancedTag : "Avanzate", -DlgOpOther : "<Altro>", +DlgOpOther : "", DlgInfoTab : "Info", DlgAlertUrl : "Devi inserire l'URL", // General Dialogs Labels -DlgGenNotSet : "<non impostato>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "Direzione scrittura", DlgGenLangDirLtr : "Da Sinistra a Destra (LTR)", DlgGenLangDirRtl : "Da Destra a Sinistra (RTL)", DlgGenLangCode : "Codice Lingua", -DlgGenAccessKey : "Scorciatoria
      da tastiera", +DlgGenAccessKey : "Scorciatoia
      da tastiera", DlgGenName : "Nome", DlgGenTabIndex : "Ordine di tabulazione", DlgGenLongDescr : "URL descrizione estesa", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "Ancora nella pagina", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "Protocollo", -DlgLnkProtoOther : "<altro>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "Scegli Ancora", DlgLnkAnchorByName : "Per Nome", DlgLnkAnchorById : "Per id elemento", -DlgLnkNoAnchors : "<Nessuna ancora disponibile nel documento>", +DlgLnkNoAnchors : "", DlgLnkEMail : "Indirizzo E-Mail", DlgLnkEMailSubject : "Oggetto del messaggio", DlgLnkEMailBody : "Corpo del messaggio", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "Invia al Server", DlgLnkTarget : "Destinazione", -DlgLnkTargetFrame : "<riquadro>", -DlgLnkTargetPopup : "<finestra popup>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Nuova finestra (_blank)", DlgLnkTargetParent : "Finestra padre (_parent)", DlgLnkTargetSelf : "Stessa finestra (_self)", @@ -272,7 +277,7 @@ DlgTableColumns : "Colonne", DlgTableBorder : "Dimensione bordo", DlgTableAlign : "Allineamento", -DlgTableAlignNotSet : "<non impostato>", +DlgTableAlignNotSet : "", DlgTableAlignLeft : "Sinistra", DlgTableAlignCenter : "Centrato", DlgTableAlignRight : "Destra", @@ -286,22 +291,22 @@ DlgTableSummary : "Indice", // Table Cell Dialog -DlgCellTitle : "Propriet cella", +DlgCellTitle : "Propriet?? cella", DlgCellWidth : "Larghezza", DlgCellWidthPx : "pixel", DlgCellWidthPc : "percento", DlgCellHeight : "Altezza", DlgCellWordWrap : "A capo automatico", -DlgCellWordWrapNotSet : "<non impostato>", +DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "Si", DlgCellWordWrapNo : "No", DlgCellHorAlign : "Allineamento orizzontale", -DlgCellHorAlignNotSet : "<non impostato>", +DlgCellHorAlignNotSet : "", DlgCellHorAlignLeft : "Sinistra", DlgCellHorAlignCenter : "Centrato", DlgCellHorAlignRight: "Destra", DlgCellVerAlign : "Allineamento verticale", -DlgCellVerAlignNotSet : "<non impostato>", +DlgCellVerAlignNotSet : "", DlgCellVerAlignTop : "In Alto", DlgCellVerAlignMiddle : "Centrato", DlgCellVerAlignBottom : "In Basso", @@ -315,7 +320,7 @@ // Find Dialog DlgFindTitle : "Trova", DlgFindFindBtn : "Trova", -DlgFindNotFoundMsg : "L'elemento cercato non stato trovato.", +DlgFindNotFoundMsg : "L'elemento cercato non ?? stato trovato.", // Replace Dialog DlgReplaceTitle : "Sostituisci", @@ -338,7 +343,6 @@ DlgPasteIgnoreFont : "Ignora le definizioni di Font", DlgPasteRemoveStyles : "Rimuovi le definizioni di Stile", DlgPasteCleanBox : "Svuota area di testo", - // Color Picker ColorAutomatic : "Automatico", @@ -468,13 +472,14 @@ // Templates Dialog Templates : "Modelli", DlgTemplatesTitle : "Contenuto dei modelli", -DlgTemplatesSelMsg : "Seleziona il modello da aprire nell'editor
      (il contenuto attuale verr?? eliminato):", +DlgTemplatesSelMsg : "Seleziona il modello da aprire nell'editor
      (il contenuto attuale verr?? eliminato):", DlgTemplatesLoading : "Caricamento modelli in corso. Attendere prego...", DlgTemplatesNoTpl : "(Nessun modello definito)", // About Dialog DlgAboutAboutTab : "Informazioni", DlgAboutBrowserInfoTab : "Informazioni Browser", +DlgAboutLicenseTab : "Licenza", DlgAboutVersion : "versione", DlgAboutLicense : "Rilasciato sotto la licensa GNU Lesser General Public License", DlgAboutInfo : "Localizzazione in Italiano realizzata da Simone Chiaretta
      www.piyosailing.com

      Per maggiori informazioni visitare" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ja.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ja.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ja.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -98,8 +98,13 @@ SelectionField : "?????????????????????", ImageButton : "???????????????", +FitWindow : "??????????????????????????????????????????", + // Context Menu EditLink : "???????????????", +CellCM : "??????", +RowCM : "???", +ColumnCM : "?????????", InsertRow : "??????? ?", DeleteRows : "?????????", InsertColumn : "??????? ?", @@ -146,12 +151,12 @@ DlgBtnClose : "?????????", DlgBtnBrowseServer : "???????????????????????????", DlgAdvancedTag : "???????????????", -DlgOpOther : "<?????????>", +DlgOpOther : "", DlgInfoTab : "?? ???", DlgAlertUrl : "URL??????? ???????????????????", // General Dialogs Labels -DlgGenNotSet : "<??????>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "?????????????????????", DlgGenLangDirLtr : "???????????? (LTR)", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "??????????????????????????????", DlgLnkTypeEMail : "E-Mail", DlgLnkProto : "???????????????", -DlgLnkProtoOther : "<?????????>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "?????????????????????", DlgLnkAnchorByName : "???????????????", DlgLnkAnchorById : "???????????????ID", -DlgLnkNoAnchors : "<??????????????????????????????????????????????????????????????????????????????>", +DlgLnkNoAnchors : "", DlgLnkEMail : "E-Mail ????????????", DlgLnkEMailSubject : "??????", DlgLnkEMailBody : "??????", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "?????????????????????", DlgLnkTarget : "???????????????", -DlgLnkTargetFrame : "<????????????>", -DlgLnkTargetPopup : "<?????????????????????????????????>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "???????????????????????? (_blank)", DlgLnkTargetParent : "?????????????????? (_parent)", DlgLnkTargetSelf : "????????????????????? (_self)", @@ -292,16 +297,16 @@ DlgCellWidthPc : "???????????????", DlgCellHeight : "??????", DlgCellWordWrap : "????????????", -DlgCellWordWrapNotSet : "<??????>", +DlgCellWordWrapNotSet : "", DlgCellWordWrapYes : "Yes", DlgCellWordWrapNo : "No", DlgCellHorAlign : "??????????????????", -DlgCellHorAlignNotSet : "<??????>", +DlgCellHorAlignNotSet : "", DlgCellHorAlignLeft : "???", DlgCellHorAlignCenter : "??????", DlgCellHorAlignRight: "???", DlgCellVerAlign : "??????????????????", -DlgCellVerAlignNotSet : "<??????>", +DlgCellVerAlignNotSet : "", DlgCellVerAlignTop : "???", DlgCellVerAlignMiddle : "??????", DlgCellVerAlignBottom : "???", @@ -338,7 +343,6 @@ DlgPasteIgnoreFont : "Font?????????Face???????????????????????????", DlgPasteRemoveStyles : "???????????????????????????????????????", DlgPasteCleanBox : "? ??????????????????????", - // Color Picker ColorAutomatic : "??????", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "????????????????? ???", DlgAboutBrowserInfoTab : "?????????????? ???", +DlgAboutLicenseTab : "???????????????", DlgAboutVersion : "???????????????", DlgAboutLicense : "Licensed under the terms of the GNU Lesser General Public License", DlgAboutInfo : "????????????????? ??????????????????" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ko.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ko.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/ko.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -99,8 +99,13 @@ SelectionField : "????????????", ImageButton : "???????????????", +FitWindow : "Maximize the editor size", //MISSING + // Context Menu EditLink : "?????? ??????", +CellCM : "Cell", //MISSING +RowCM : "Row", //MISSING +ColumnCM : "Column", //MISSING InsertRow : "????????? ????? ", DeleteRows : "????????? ??????", InsertColumn : "????????? ????? ", @@ -137,7 +142,7 @@ UnknownCommand : "???????????? ???????? ??????. : \"%1\"", NotImplemented : "????????? ???????????? ???????????????.", UnknownToolbarSet : "?????? ????????? ????????????. : \"%1\"", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING +NoActiveX : "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING @@ -147,12 +152,12 @@ DlgBtnClose : "??????", DlgBtnBrowseServer : "?????? ??????", DlgAdvancedTag : "?????????", -DlgOpOther : "<??????>", +DlgOpOther : "", DlgInfoTab : "??????", DlgAlertUrl : "URL??? ?? ???????????????", // General Dialogs Labels -DlgGenNotSet : "<???????????? ??????>", +DlgGenNotSet : "", DlgGenId : "ID", DlgGenLangDir : "?????? ??????", DlgGenLangDirLtr : "???????????? ????????? (LTR)", @@ -216,12 +221,12 @@ DlgLnkTypeAnchor : "?? ??????", DlgLnkTypeEMail : "?????????", DlgLnkProto : "????????????", -DlgLnkProtoOther : "<??????>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "?? ?????? ??????", DlgLnkAnchorByName : "?? ?????? ??????", DlgLnkAnchorById : "?? ?????? ID", -DlgLnkNoAnchors : "<????????? ?? ????????? ????????????.>", +DlgLnkNoAnchors : "", DlgLnkEMail : "????????? ??????", DlgLnkEMailSubject : "??????", DlgLnkEMailBody : "??????", @@ -229,8 +234,8 @@ DlgLnkBtnUpload : "????????? ??????", DlgLnkTarget : "??????", -DlgLnkTargetFrame : "<?????????>", -DlgLnkTargetPopup : "<????? ???>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "??? ??? (_blank)", DlgLnkTargetParent : "?????? ??? (_parent)", DlgLnkTargetSelf : "?????? ??? (_self)", @@ -340,7 +345,6 @@ DlgPasteRemoveStyles : "????????? ?????? ??????", DlgPasteCleanBox : "????????? ??????", - // Color Picker ColorAutomatic : "????????????", ColorMoreColors : "????????????...", @@ -476,6 +480,7 @@ // About Dialog DlgAboutAboutTab : "About", DlgAboutBrowserInfoTab : "???????????? ??????", +DlgAboutLicenseTab : "License", //MISSING DlgAboutVersion : "??????", DlgAboutLicense : "Licensed under the terms of the GNU Lesser General Public License", DlgAboutInfo : "For further information go to" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/lt.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/lt.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/lt.js Wed Jul 12 07:45:05 2006 @@ -1,6 +1,6 @@ ???/* * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * Copyright (C) 2003-2006 Frederico Caldeira Knabben * * Licensed under the terms of the GNU Lesser General Public License: * http://www.opensource.org/licenses/lgpl-license.php @@ -85,8 +85,8 @@ Replace : "Pakeisti", SpellCheck : "Ra??ybos tikrinimas", UniversalKeyboard : "Universali klaviat??ra", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING +PageBreakLbl : "Puslapi?? skirtukas", +PageBreak : "??terpti puslapi?? skirtuk? ", Form : "Forma", Checkbox : "??ymimasis langelis", @@ -98,8 +98,13 @@ SelectionField : "Atrankos laukas", ImageButton : "Vaizdinis mygtukas", +FitWindow : "Maximize the editor size", //MISSING + // Context Menu EditLink : "Taisyti nuorod? ", +CellCM : "Cell", //MISSING +RowCM : "Row", //MISSING +ColumnCM : "Column", //MISSING InsertRow : "??terpti eilut??", DeleteRows : "??alinti eilutes", InsertColumn : "??terpti stulpel??", @@ -108,7 +113,7 @@ DeleteCells : "??alinti langelius", MergeCells : "Sujungti langelius", SplitCell : "Skaidyti langelius", -TableDelete : "Delete Table", //MISSING +TableDelete : "??alinti lentel??", CellProperties : "Langelio savyb??s", TableProperties : "Lentel??s savyb??s", ImageProperties : "Vaizdo savyb??s", @@ -136,9 +141,9 @@ UnknownCommand : "Ne??inomas komandos vardas \"%1\"", NotImplemented : "Komanda n??ra ??gyvendinta", UnknownToolbarSet : "Mygtuk?? juostos rinkinys \"%1\" neegzistuoja", -NoActiveX : "You browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.", //MISSING -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING +NoActiveX : "J??s?? nar??ykl??s saugumo nuostatos gali riboti kai kurias redaktoriaus savybes. J??s turite aktyvuoti opcij? \"Run ActiveX controls and plug-ins\". Kitu atveju Jums bus prane??ama apie klaidas ir tr??kstamas savybes.", +BrowseServerBlocked : "Ne??manoma atidaryti naujo nar??ykl??s lango. ??sitikinkite, kad i??kylan??i?? lang?? blokavimo programos neveiksnios.", +DialogBlocked : "Ne??manoma atidaryti dialogo lango. ??sitikinkite, kad i??kylan??i?? lang?? blokavimo programos neveiksnios.", // Dialogs DlgBtnOK : "OK", @@ -146,12 +151,12 @@ DlgBtnClose : "U??daryti", DlgBtnBrowseServer : "Nar??yti po server??", DlgAdvancedTag : "Papildomas", -DlgOpOther : "<Kita>", +DlgOpOther : "", DlgInfoTab : "Informacija", DlgAlertUrl : "Pra??ome ??ra??yti URL", // General Dialogs Labels -DlgGenNotSet : "<n??ra nustatyta>", +DlgGenNotSet : "", DlgGenId : "Id", DlgGenLangDir : "Teksto kryptis", DlgGenLangDirLtr : "I?? kair??s ?? de??in?? (LTR)", @@ -215,12 +220,12 @@ DlgLnkTypeAnchor : "??ym?? ??iame puslapyje", DlgLnkTypeEMail : "El.pa??tas", DlgLnkProto : "Protokolas", -DlgLnkProtoOther : "<kitas>", +DlgLnkProtoOther : "", DlgLnkURL : "URL", DlgLnkAnchorSel : "Pasirinkite ??ym??", DlgLnkAnchorByName : "Pagal ??ym??s vard? ", DlgLnkAnchorById : "Pagal ??ym??s Id", -DlgLnkNoAnchors : "<??iame dokumente ??ymi?? n??ra>", +DlgLnkNoAnchors : "", DlgLnkEMail : "El.pa??to adresas", DlgLnkEMailSubject : "??inut??s tema", DlgLnkEMailBody : "??inut??s turinys", @@ -228,8 +233,8 @@ DlgLnkBtnUpload : "Si??sti ?? server??", DlgLnkTarget : "Paskirties vieta", -DlgLnkTargetFrame : "<kadras>", -DlgLnkTargetPopup : "<i??skleid??iamas langas>", +DlgLnkTargetFrame : "", +DlgLnkTargetPopup : "", DlgLnkTargetBlank : "Naujas langas (_blank)", DlgLnkTargetParent : "Pirminis langas (_parent)", DlgLnkTargetSelf : "Tas pats langas (_self)", @@ -283,7 +288,7 @@ DlgTableCellSpace : "Tarpas tarp langeli??", DlgTableCellPad : "Trapas nuo langelio r??mo iki teksto", DlgTableCaption : "Antra??t??", -DlgTableSummary : "Summary", //MISSING +DlgTableSummary : "Santrauka", // Table Cell Dialog DlgCellTitle : "Langelio savyb??s", @@ -339,7 +344,6 @@ DlgPasteRemoveStyles : "Pa??alinti stili?? nustatymus", DlgPasteCleanBox : "Trinti ??vedimo lauk? ", - // Color Picker ColorAutomatic : "Automatinis", ColorMoreColors : "Daugiau spalv??...", @@ -422,7 +426,7 @@ NumberedListProp : "Numeruoto s? ra??o savyb??s", DlgLstType : "Tipas", DlgLstTypeCircle : "Apskritimas", -DlgLstTypeDisc : "Disc", //MISSING +DlgLstTypeDisc : "Diskas", DlgLstTypeSquare : "Kvadratas", DlgLstTypeNumbers : "Skai??iai (1, 2, 3)", DlgLstTypeLCase : "Ma??osios raid??s (a, b, c)", @@ -475,6 +479,7 @@ // About Dialog DlgAboutAboutTab : "Apie", DlgAboutBrowserInfoTab : "Nar??ykl??s informacija", +DlgAboutLicenseTab : "License", //MISSING DlgAboutVersion : "versija", DlgAboutLicense : "Licencijuota pagal GNU ma??esn??s atsakomyb??s pagrindin??s vie??os licencijos s? lygas", DlgAboutInfo : "Papildom? informacij? galima gauti" Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/lv.js ============================================================================== --- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/lv.js (original) +++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/editor/lang/lv.js Wed Jul 12 07:45:05 2006 @@ -1,481 +1,487 @@ -???/* - * FCKeditor - The text editor for internet - * Copyright (C) 2003-2005 Frederico Caldeira Knabben - * - * Licensed under the terms of the GNU Lesser General Public License: - * http://www.opensource.org/licenses/lgpl-license.php - * - * For further information visit: - * http://www.fckeditor.net/ - * - * "Support Open Source software. What about a donation today?" - * - * File Name: lv.js - * Latvian language file. - * - * File Authors: - * J??nis K??avi???? (janis at 4id.lv) - */ - -var FCKLang = -{ -// Language direction : "ltr" (left to right) or "rtl" (right to left). -Dir : "ltr", - -ToolbarCollapse : "Samazin??t r??ku joslu", -ToolbarExpand : "Papla??in??t r??ku joslu", - -// Toolbar Items and Context Menu -Save : "Saglab??t", -NewPage : "Jauna lapa", -Preview : "P??rskat??t", -Cut : "Izgriezt", -Copy : "Kop??t", -Paste : "Ievietot", -PasteText : "Ievietot k?? vienk??r??u tekstu", -PasteWord : "Ievietot no Worda", -Print : "Druk??t", -SelectAll : "Iez??m??t visu", -RemoveFormat : "No??emt stilus", -InsertLinkLbl : "Hipersaite", -InsertLink : "Ievietot/Labot Hipersaiti", -RemoveLink : "No??emt Hipersaiti", -Anchor : "Ievietot/Labot iez??mi", -InsertImageLbl : "Att??ls", -InsertImage : "Ievietot/Labot Att??lu", -InsertFlashLbl : "Flash", -InsertFlash : "Ievietot/Labot Flash", -InsertTableLbl : "Tabula", -InsertTable : "Ievietot/Labot Tabulu", -InsertLineLbl : "Atdal??t??jsv??tra", -InsertLine : "Ievietot horizont??lu Atdal??t??jsv??tru", -InsertSpecialCharLbl: "??pa??s simbols", -InsertSpecialChar : "Ievietot ??pa??u simbolu", -InsertSmileyLbl : "Smaidi??i", -InsertSmiley : "Ievietot Smaidi??u", -About : "??sum?? par FCKeditor'u", -Bold : "Treknu ??riftu", -Italic : "Sl??prakst??", -Underline : "Apak??sv??tra", -StrikeThrough : "P??rsv??trots", -Subscript : "Zemrakst??", -Superscript : "Aug??rakst??", -LeftJustify : "Nol??dzin??t pa kreisi", -CenterJustify : "Nol??dzin??t pret centru", -RightJustify : "Nol??dzin??t pa labi", -BlockJustify : "Nol??dzin??t malas", -DecreaseIndent : "Samazin??t atk??pi", -IncreaseIndent : "Palielin??t atk??pi", -Undo : "Atcelt", -Redo : "Atk??rtot", -NumberedListLbl : "Numur??ts saraksts", -NumberedList : "Ievietot/No??emt Numur??to sarakstu", -BulletedListLbl : "Izcelts saraksts", -BulletedList : "Ievietot/No??emt Izceltu sarakstu", -ShowTableBorders : "Par??d??t Tabulas robe??as", -ShowDetails : "Par??d??t s??k??ku info", -Style : "Stils", -FontFormat : "Form??ts", -Font : "??rifts", -FontSize : "Izm??rs", -TextColor : "Teksta kr??sa", -BGColor : "Fona kr??sa", -Source : "HTML kods", -Find : "Mekl??t", -Replace : "Nomain??t", -SpellCheck : "Pareizrakst??bas p??rbaude", -UniversalKeyboard : "Univers??la Klaviat??ra", -PageBreakLbl : "Page Break", //MISSING -PageBreak : "Insert Page Break", //MISSING - -Form : "Forma", -Checkbox : "Atz??m????anas kast??te", -RadioButton : "Izv??les poga", -TextField : "Teksta rinda", -Textarea : "Teksta laukums", -HiddenField : "Pasl??pta teksta rinda", -Button : "Poga", -SelectionField : "Iez??m????anas lauks", -ImageButton : "Att??lpoga", - -// Context Menu -EditLink : "Labot hipersaiti", -InsertRow : "Ievietot rindu", -DeleteRows : "Dz??st rindas", -InsertColumn : "Ievietot kolonnu", -DeleteColumns : "Dz??st kolonnas", -InsertCell : "Ievietot r??ti??u", -DeleteCells : "Dz??st r??ti??as", -MergeCells : "Apvienot r??ti??as", -SplitCell : "Sadal??t r??ti??u", -TableDelete : "Delete Table", //MISSING -CellProperties : "R??ti??as ??pa????bas", -TableProperties : "Tabulas ??pa????bas", -ImageProperties : "Att??la ??pa????bas", -FlashProperties : "Flash ??pa????bas", - -AnchorProp : "Iez??mes ??pa????bas", -ButtonProp : "Pogas ??pa????bas", -CheckboxProp : "Atz??m????anas kast??tes ??pa????bas", -HiddenFieldProp : "Pasl??pt??s teksta rindas ??pa????bas", -RadioButtonProp : "Izv??les poga ??pa????bas", -ImageButtonProp : "Att??lpogas ??pa????bas", -TextFieldProp : "Teksta rindas ??pa????bas", -SelectionFieldProp : "Iez??m????anas lauka ??pa????bas", -TextareaProp : "Teksta laukuma ??pa????bas", -FormProp : "Formas ??pa????bas", - -FontFormats : "Norm??ls teksts;Format??ts teksts;Adrese;Virsraksts 1;Virsraksts 2;Virsraksts 3;Virsraksts 4;Virsraksts 5;Virsraksts 6;Rindkopa (DIV)", - -// Alerts and Messages -ProcessingXHTML : "Tiek apstr??d??ts XHTML. L??dzu uzgaidiet...", -Done : "Dar??ts", -PasteWordConfirm : "Teksta fragments, kas tiek ievietots, izskat??s, ka b??tu sagatavots Word'??. Vai v??laties to apstr??d??t pirms ievieto??anas?", -NotCompatiblePaste : "???? darb??ba ir pieejama Internet Explorer'??, kas jaun??ks par 5.5 versiju. Vai v??laties ievietot bez apstr??des?", -UnknownToolbarItem : "Nezin??ms r??ku joslas objekts \"%1\"", -UnknownCommand : "Nezin??mas darb??bas nosaukums \"%1\"", -NotImplemented : "Darb??ba netika paveikta", -UnknownToolbarSet : "R??ku joslas komplekts \"%1\" neeksist??", -NoActiveX : "Interneta p??rl??kprogrammas dro????bas uzst??d??jumi var??tu ietekm??t da??as no editora ??pa????b??m. J??b??t aktiviz??tai sada??ai \"Run ActiveX controls and plug-ins\". Sav??d??k ir iesp??jamas k????das darb??b?? un k????du pazi??ojumu par??d????an??s.", -BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.", //MISSING -DialogBlocked : "It was not possible to open the dialog window. Make sure all popup blockers are disabled.", //MISSING - -// Dialogs -DlgBtnOK : "Dar??ts!", -DlgBtnCancel : "Atcelt", -DlgBtnClose : "Aizv??rt", -DlgBtnBrowseServer : "Skat??t servera saturu", -DlgAdvancedTag : "Vied??k", -DlgOpOther : "<Cits>", -DlgInfoTab : "Inform??cija", -DlgAlertUrl : "L??dzum ievietojiet Hipersaiti", - -// General Dialogs Labels -DlgGenNotSet : "<nav iestat??ts>", -DlgGenId : "Id", -DlgGenLangDir : "Valodas las????anas virziens", -DlgGenLangDirLtr : "No kreis??s uz labo (LTR)", -DlgGenLangDirRtl : "No lab??s uz kreiso (RTL)", -DlgGenLangCode : "Valodas kods", -DlgGenAccessKey : "Pieejas kods", -DlgGenName : "Nosaukums", -DlgGenTabIndex : "Tab Index", -DlgGenLongDescr : "Gara apraksta Hipersaite", -DlgGenClass : "Stilu saraksta klases", -DlgGenTitle : "Konsultat??vs virsraksts", -DlgGenContType : "Konsultat??vs Satura tips", -DlgGenLinkCharset : "Pievienot?? resursa Charset parametrs", -DlgGenStyle : "Stils", - -// Image Dialog -DlgImgTitle : "Att??la ??pa????bas", -DlgImgInfoTab : "Inform??cija par att??lu", -DlgImgBtnUpload : "Nos??t??t serverim", -DlgImgURL : "URL", -DlgImgUpload : "Aug??upiel??d??t", -DlgImgAlt : "Alternat??vais teksts", -DlgImgWidth : "Platums", -DlgImgHeight : "Augstums", -DlgImgLockRatio : "Nemain??ga Augstuma/Platuma attiec??ba", -DlgBtnResetSize : "Atjaunot s??kotn??jo izm??ru", -DlgImgBorder : "R??mis", -DlgImgHSpace : "Horizont??l?? telpa", -DlgImgVSpace : "Vertik??l?? telpa", -DlgImgAlign : "Nol??dzin??t", -DlgImgAlignLeft : "Pa kreisi", -DlgImgAlignAbsBottom: "Absol??ti apak????", -DlgImgAlignAbsMiddle: "Absol??ti vertik??li centr??ts", -DlgImgAlignBaseline : "Pamatrind??", -DlgImgAlignBottom : "Apak????", -DlgImgAlignMiddle : "Vertik??li centr??ts", -DlgImgAlignRight : "Pa labi", -DlgImgAlignTextTop : "Teksta aug????", -DlgImgAlignTop : "Aug????", -DlgImgPreview : "P??rskats", -DlgImgAlertUrl : "L??dzu nor??d??t att??la hipersaiti", -DlgImgLinkTab : "Hipersaite", - -// Flash Dialog -DlgFlashTitle : "Flash ??pa????bas", -DlgFlashChkPlay : "Autom??tiska atska??o??ana", -DlgFlashChkLoop : "Nep??rtraukti", -DlgFlashChkMenu : "At??aut Flash izv??lni", -DlgFlashScale : "Main??t izm??ru", -DlgFlashScaleAll : "R??d??t visu", -DlgFlashScaleNoBorder : "Bez r??mja", -DlgFlashScaleFit : "Exact Fit", - -// Link Dialog -DlgLnkWindowTitle : "Hipersaite", -DlgLnkInfoTab : "Hipersaites inform??cija", -DlgLnkTargetTab : "M??r??is", - -DlgLnkType : "Hipersaites tips", -DlgLnkTypeURL : "URL", -DlgLnkTypeAnchor : "Iez??me ??aj?? lap??", -DlgLnkTypeEMail : "E-pasts", -DlgLnkProto : "Protokols", -DlgLnkProtoOther : "<cits>", -DlgLnkURL : "URL", -DlgLnkAnchorSel : "Izv??l??ties iez??mi", -DlgLnkAnchorByName : "P??c iez??mes nosaukuma", -DlgLnkAnchorById : "P??c elementa ID", -DlgLnkNoAnchors : "<??aj?? dokument?? nav iez??mju>", -DlgLnkEMail : "E-pasta adrese", -DlgLnkEMailSubject : "Zi??as t??ma", -DlgLnkEMailBody : "Zi??as saturs", -DlgLnkUpload : "Aug??upiel??d??t", -DlgLnkBtnUpload : "Nos??t??t serverim", - -DlgLnkTarget : "M??r??is", -DlgLnkTargetFrame : "<freims>", -DlgLnkTargetPopup : "<uzleco???? log??>", -DlgLnkTargetBlank : "Jaun?? log?? (_blank)", -DlgLnkTargetParent : "Eso??aj?? log?? (_parent)", -DlgLnkTargetSelf : "Taj?? pa???? log?? (_self)", -DlgLnkTargetTop : "Visredzam??kaj?? log?? (_top)", -DlgLnkTargetFrameName : "M??r??a freima nosaukums", -DlgLnkPopWinName : "Izleco???? loga nosaukums", -DlgLnkPopWinFeat : "Izleco???? loga nosaukums ??pa????bas", -DlgLnkPopResize : "Ar main??mu izm??ru", -DlgLnkPopLocation : "Atra??an??s vietas josla", -DlgLnkPopMenu : "Izv??lnes josla", -DlgLnkPopScroll : "Ritjoslas", -DlgLnkPopStatus : "Statusa josla", -DlgLnkPopToolbar : "R??ku josla", -DlgLnkPopFullScrn : "Piln?? ekr??n?? (IE)", -DlgLnkPopDependent : "Atkar??gs (Netscape)", -DlgLnkPopWidth : "Platums", -DlgLnkPopHeight : "Augstums", -DlgLnkPopLeft : "Kreis?? koordin??te", -DlgLnkPopTop : "Aug????j?? koordin??te", - -DlnLnkMsgNoUrl : "L??dzu nor??di hipersaiti", -DlnLnkMsgNoEMail : "L??dzu nor??di e-pasta adresi", -DlnLnkMsgNoAnchor : "L??dzu nor??di iez??mi", - -// Color Dialog -DlgColorTitle : "Izv??lies kr??su", -DlgColorBtnClear : "Dz??st", -DlgColorHighlight : "Izcelt", -DlgColorSelected : "Iez??m??tais", - -// Smiley Dialog -DlgSmileyTitle : "Ievietot Smaidi??u", - -// Special Character Dialog -DlgSpecialCharTitle : "Ievietot ??pa??u simbolu", - -// Table Dialog -DlgTableTitle : "Tabulas ??pa????bas", -DlgTableRows : "Rindas", -DlgTableColumns : "Kolonnas", -DlgTableBorder : "R??mja izm??rs", -DlgTableAlign : "Novietojums", -DlgTableAlignNotSet : "