fixes #101: working on rebranding, trying to make it as generic as po…

…ssible so it will benefit everybody. code and file cleanup
tsolucio · Apr 5, 2014 · 4b5b788 · 4b5b788
1 parent 73cc64b
commit 4b5b788
Show file tree

Hide file tree

Showing 78 changed files with 103 additions and 154 deletions.
diff --git a/Smarty/templates/ComposeEmail.tpl b/Smarty/templates/ComposeEmail.tpl
@@ -17,7 +17,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset={$APP.LBL_CHARSET}">
 <title>{$MOD.TITLE_COMPOSE_MAIL}</title>
-<link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	
+<link REL="SHORTCUT ICON" HREF="themes/images/favicon.ico">	
 <style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
 <script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>

diff --git a/Smarty/templates/EmailDetailView.tpl b/Smarty/templates/EmailDetailView.tpl
@@ -15,7 +15,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset={$APP.LBL_CHARSET}">
 <title>{$MOD.TITLE_VTIGERCRM_MAIL}</title>
-<link REL="SHORTCUT ICON" HREF="themes/images/vtigercrm_icon.ico">	
+<link REL="SHORTCUT ICON" HREF="themes/images/favicon.ico">	
 <style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 <script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>

diff --git a/Smarty/templates/Header.tpl b/Smarty/templates/Header.tpl
@@ -13,7 +13,7 @@
 <html>
 <head>
 	<title>{$USER} - {$MODULE_NAME|@getTranslatedString:$MODULE_NAME} - {$APP.LBL_BROWSER_TITLE}</title>
-	<link REL="SHORTCUT ICON" HREF="themes/images/vtigercrm_icon.ico">
+	<link REL="SHORTCUT ICON" HREF="themes/images/favicon.ico">
 	<style type="text/css">@import url("themes/{$THEME}/style.css?v={$VERSION}");</style>
 	<link rel="stylesheet" type="text/css" media="all" href="jscalendar/calendar-win2k-cold-1.css">
 {* vtlib customization: Inclusion of custom javascript and css as registered *}
@@ -626,14 +626,6 @@ function getFormValidate(divValidate)
 </div>
 
 <div id="status" style="position:absolute;display:none;left:850px;top:95px;height:27px;white-space:nowrap;"><img src="{'status.gif'|@vtiger_imageurl:$THEME}"></div>
-<script>
-function openwin()
-{ldelim}
-            window.open("index.php?module=Users&action=about_us","aboutwin","height=520,width=515,top=200,left=300")
-{rdelim}
-
-</script>
-
 
 <div id="tracker" style="display:none;position:absolute;z-index:100000001;" class="layerPopup">
 

diff --git a/Smarty/templates/Login.tpl b/Smarty/templates/Login.tpl
@@ -51,9 +51,9 @@
 				</form>
 			</div>
 			<div class="importantLinks">
-			<a href='javascript:mypopup()'>{$APP.LNK_READ_LICENSE}</a>
+			<a href='copyright.html' target='_blank'>{$APP.LNK_READ_LICENSE}</a>
 			|
-			<a href='http://www.vtiger.com/products/crm/privacy_policy.html' target='_blank'>{$APP.LNK_PRIVACY_POLICY}</a>
+			<a href='http://corebos.org/page/privacy-policy' target='_blank'>{$APP.LNK_PRIVACY_POLICY}</a>
 			|
 			&copy; 2004- {php} echo date('Y'); {/php}
 			</div>

diff --git a/Smarty/templates/LoginHeader.tpl b/Smarty/templates/LoginHeader.tpl
@@ -14,7 +14,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset={$LBL_CHARSET}">
 <title>{$APP.LBL_BROWSER_TITLE}</title>
 <style type="text/css">@import url("include/style.css");</style>
-<script language="JavaScript" type="text/javascript" src="include/js/popup.js"></script>
 <script type="text/javascript" language="JavaScript">
 function set_focus() {ldelim}
 	if (document.DetailView.user_name.value != '') {ldelim}

diff --git a/Smarty/templates/MergeFields.tpl b/Smarty/templates/MergeFields.tpl
@@ -14,7 +14,7 @@
 <html>
 <head>
 	<title>{$APP.$MODULE_NAME} - {$APP.LBL_BROWSER_TITLE}</title>
-	<link REL="SHORTCUT ICON" HREF="themes/images/vtigercrm_icon.ico">	
+	<link REL="SHORTCUT ICON" HREF="themes/images/favicon.ico">	
 	<style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 	<!-- ActivityReminder customization for callback -->
 	{literal}

diff --git a/Smarty/templates/Popup.tpl b/Smarty/templates/Popup.tpl
@@ -112,7 +112,7 @@ function set_focus() {ldelim}
 	                            <td class="moduleName" width="80%" style="padding-left:10px;">{$MODULE|@getTranslatedString:$MODULE}</td>
 							{/if}
                     {/if}
-					<td  width=30% nowrap class="componentName" align=right>{$APP.VTIGER}</td>
+					<td  width=30% nowrap class="componentName" align=right>{'APP_NAME'|@getTranslatedString}</td>
 				</tr>
 			</table>
 			<div id="status" style="position:absolute;display:none;right:135px;top:15px;height:27px;white-space:nowrap;"><img src="{'status.gif'|@vtiger_imageurl:$THEME}"></div>

diff --git a/Smarty/templates/PrintEmail.tpl b/Smarty/templates/PrintEmail.tpl
@@ -16,7 +16,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset={$APP.LBL_CHARSET}">
 <title>{$MOD.TITLE_VTIGERCRM_MAIL}</title>
-<link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	
+<link REL="SHORTCUT ICON" HREF="themes/images/favicon.ico">	
 <style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 	<body  onLoad=window.print()>
 		<table>

diff --git a/Smarty/templates/RolePopup.tpl b/Smarty/templates/RolePopup.tpl
@@ -51,7 +51,7 @@
 				<table width="100%" border="0" cellpadding="0" cellspacing="0">
 				<tr>
 					<td class="moduleName" width="80%" style="padding-left:10px;">{$CMOD.LBL_ASSIGN_ROLE}</td>
-					<td  width=30% nowrap class="componentName" align=right>{$APP.VTIGER}</td>
+					<td  width=30% nowrap class="componentName" align=right>{'APP_NAME'|@getTranslatedString}</td>
 				</tr>
 			</table>
 			</td>

diff --git a/Smarty/templates/ShowAuditTrail.tpl b/Smarty/templates/ShowAuditTrail.tpl
@@ -23,7 +23,7 @@
 			<table width="100%" border="0" cellpadding="0" cellspacing="0">
 				<tr>
 					<td class="moduleName" width="80%" style="padding-left:10px;">{$MOD.LBL_AUDIT_TRAIL}</td>
-					<td  width=30% nowrap class="componentName" align=right>{$APP.VTIGER}</td>
+					<td  width=30% nowrap class="componentName" align=right>{'APP_NAME'|@getTranslatedString}</td>
 				</tr>
 			</table>
 		</td>

diff --git a/Smarty/templates/modules/Bookmarklet/Bookmarklet.tpl b/Smarty/templates/modules/Bookmarklet/Bookmarklet.tpl
@@ -12,7 +12,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<title>Vtiger Bookmarklet</title>
+<title>{'APP_NAME'|getTranslatedString:$MODULE} Bookmarklet</title>
 <script type="text/javascript" src="modules/Emails/GmailBookmarklet.js"></script>
 <style type="text/css">
 {literal}
@@ -94,7 +94,7 @@ ul.searchResult li a:hover {
 <body onload="init();" class="small">
 	<div id="__vtigerBookMarkletDiv__">
 		<div>
-		<img src="themes/images/vtigerlogo.jpg" alt="vtiger CRM" title="vtiger CRM" border="0" style="width: 80px; height: 30px"
+		<img src="themes/images/logo_mail.jpg" alt="{'APP_NAME'|getTranslatedString:$MODULE}" title="{'APP_NAME'|getTranslatedString:$MODULE}" border="0" style="width: 80px; height: 30px"
 		</div>
 								
 		<table width="99%" cellspacing="0" cellpadding="5" border="0" class="tableHeading">

diff --git a/config.template.php b/config.template.php
@@ -27,10 +27,10 @@
 $CHAT_DISPLAY = 'true'; 
 $USE_RTE = 'true';
 
-// url for customer portal (Example: http://vtiger.com/portal)
-$PORTAL_URL = 'http://vtiger.com/customerportal';
+// url for customer portal (Example: http://your_support_domain.tld/portal)
+$PORTAL_URL = 'http://your_support_domain.tld/customerportal';
 
-// helpdesk support email id and support name (Example: 'support@vtiger.com' and 'vtiger support')
+// helpdesk support email id and support name (Example: 'support@your_support_domain.tld' and 'your-support name')
 $HELPDESK_SUPPORT_EMAIL_ID = '_USER_SUPPORT_EMAIL_';
 $HELPDESK_SUPPORT_NAME = 'your-support name';
 $HELPDESK_SUPPORT_EMAIL_REPLY_ID = $HELPDESK_SUPPORT_EMAIL_ID;

diff --git a/include/images/AppStore.png b/include/images/AppStore.png
diff --git a/include/images/AppStoreQRCode.png b/include/images/AppStoreQRCode.png
diff --git a/include/images/ExchangeConnector.png b/include/images/ExchangeConnector.png
diff --git a/include/images/GooglePlay.png b/include/images/GooglePlay.png
diff --git a/include/images/GooglePlayQRCode.png b/include/images/GooglePlayQRCode.png
diff --git a/include/images/OutlookPlugin.png b/include/images/OutlookPlugin.png
diff --git a/include/images/vtigercrm_icon.ico b/include/images/vtigercrm_icon.ico
diff --git a/include/install/images/app_logo.png b/include/install/images/app_logo.png
diff --git a/include/install/images/logobackempty.gif b/include/install/images/logobackempty.gif
diff --git a/include/install/images/vtigercrm5.gif b/include/install/images/vtigercrm5.gif
diff --git a/include/install/language/en_us.lang.php b/include/install/language/en_us.lang.php
@@ -26,16 +26,16 @@
 );
 
 $installationStrings = array(
-	'LBL_VTIGER_CRM_5' => 'vtiger CRM 5',
+	'APP_NAME' => 'coreBOS',
 	'LBL_CONFIG_WIZARD' => 'Configuration Wizard',
 	'LBL_WELCOME' => 'Welcome',
 	'LBL_WELCOME_CONFIG_WIZARD' => 'Welcome to Configuration Wizard',
-	'LBL_ABOUT_CONFIG_WIZARD' => 'This configuration wizard helps you install vtigerCRM ',
-	'LBL_ABOUT_VTIGER' => 'vtiger CRM is a community-driven, fully open source, CRM software project. <br><br>
-							The aim of the project is to provide the best and most open CRM solution with the lowest total cost of ownership to small and medium enterprises.<br><br> 
-							The product is widely used throughout the world, with over a thousand downloads a day. <br><br>
-							vtiger CRM has an active community of developers and users, with contributors from many different countries.<br> <br>
-							It is available in many languages, with a strong partner network in dozens of countries.',
+	'LBL_ABOUT_CONFIG_WIZARD' => 'This configuration wizard helps you install coreBOS ',
+	'LBL_ABOUT_VTIGER' => 'coreBOS is a community-driven, fully open source, Business empowering software project. <br><br>
+							The aim of the project is to provide a powerful software environment for your company to grow upon with the lowest total cost of ownership for small and medium enterprises.<br><br> 
+							The product is widely used throughout the world. <br><br>
+							coreBOS has an active community of developers and users, with contributors from many different countries.<br> <br>
+							It is available in many languages.',
 	'LBL_INSTALL' => 'Install',
 	'LBL_MIGRATE' => 'Migrate',
 	'ERR_RESTRICTED_FILE_ACCESS' => 'Sorry! Attempt to access restricted file',
@@ -57,7 +57,7 @@
 	'MSG_CONFIG_FILE_CREATED' => 'Configuration file (config.inc.php) was successfully created',
 	'LBL_FINISH' => 'Finish',
 	'LBL_CONFIG_COMPLETED' => 'Configuration Completed',
-	'LBL_PHP_VERSION_GT_5' => 'PHP version >= 5.2',
+	'LBL_PHP_VERSION_GT_5' => 'PHP version >= 5.3',
 	'LBL_YES' => 'Yes',
 	'LBL_NO' => 'No',
 	'LBL_NOT_CONFIGURED' => 'Not Configured',
@@ -72,7 +72,7 @@
 	'LBL_NOT_RECOMMENDED' => 'Not Recommended',
 	'LBL_PHP_DIRECTIVES_HAVE_RECOMMENDED_VALUES' => 'Your PHP directives have the Recommended values',
 	'MSG_PROVIDE_READ_WRITE_ACCESS_TO_PROCEED' => 'Provide Read/Write access to the files and directories listed to Proceed',
-	'WARNING_PHP_DIRECTIVES_NOT_RECOMMENDED_STILL_WANT_TO_PROCEED' => 'Some of the PHP Settings do not meet the recommended values. This might affect some of the features of vtiger CRM. Are you sure, you want to proceed?',
+	'WARNING_PHP_DIRECTIVES_NOT_RECOMMENDED_STILL_WANT_TO_PROCEED' => 'Some of the PHP Settings do not meet the recommended values. This might affect some of the features of coreBOS. Are you sure, you want to proceed?',
 	'LBL_CHANGE' => 'Change',
 	'LBL_DATABASE_INFORMATION' => 'Database Information',
 	'LBL_CRM_CONFIGURATION' => 'CRM Configuration',
@@ -98,7 +98,7 @@
 	'LBL_MISSING_REQUIRED_FIELDS' => 'Missing required fields',
 	'ERR_ADMIN_EMAIL_INVALID' => 'The email id in the admin email field is invalid',
 	'ERR_STANDARDUSER_EMAIL_INVALID' => 'The email id in the standard user email field is invalid',
-	'WARNING_LOCALHOST_IN_SITE_URL' => 'Specify the exact host name instead of \"localhost\" in Site URL field, otherwise you will experience some issues while working with vtiger plug-ins. Do you wish to Continue?',
+	'WARNING_LOCALHOST_IN_SITE_URL' => 'Specify the exact host name instead of \"localhost\" in Site URL field, otherwise you will experience some issues while working with coreBOS plug-ins. Do you wish to Continue?',
 	'LBL_DATABASE_CONFIGURATION' => 'Database Configuration',
 	'LBL_ENABLED' => 'Enabled',
 	'LBL_NOT_ENABLED' => 'Not Enabled',
@@ -127,16 +127,15 @@
 	'LBL_LOGIN_USING_ADMIN' => 'Please log in using the "admin" user name and the password you entered in step 3/4',
 	'LBL_SET_OUTGOING_EMAIL_SERVER' => 'Do not forget to set the outgoing email server (setup accessible from Settings-&gt;Outgoing Server)',
 	'LBL_RENAME_HTACCESS_FILE' => 'Rename htaccess.txt file to .htaccess to control public file access',
-	'MSG_HTACCESS_DETAILS' => 'This .htaccess file will work if "<b>AllowOverride All</b>" is set on Apache server configuration file (httpd.conf) for the DocumentRoot or for the current vtiger path.<br>
+	'MSG_HTACCESS_DETAILS' => 'This .htaccess file will work if "<b>AllowOverride All</b>" is set on Apache server configuration file (httpd.conf) for the DocumentRoot or for the current coreBOS path.<br>
 				   				If this AllowOverride is set as None ie., "<b>AllowOverride None</b>" then .htaccess file will not take into effect.<br>
 				   				If AllowOverride is None then add the following configuration in the apache server configuration file (httpd.conf) <br>
-				   				<b>&lt;Directory "C:/Program Files/vtigercrm/apache/htdocs/vtigerCRM"&gt;<br>Options -Indexes<br>&lt;/Directory&gt;</b><br>
+				   				<b>&lt;Directory "C:/Program Files/corebos/apache/htdocs/coreBOS"&gt;<br>Options -Indexes<br>&lt;/Directory&gt;</b><br>
 				   				So that without .htaccess file we can restrict the directory listing',
 	'LBL_YOU_ARE_IMPORTANT' => 'You are very important to us!',
 	'LBL_PRIDE_BEING_ASSOCIATED' => 'We take pride in being associated with you',
-	'LBL_TALK_TO_US_AT_FORUMS' => 'Talk to us at <a href="http://forums.vtiger.com" target="_blank">forums</a>',
-	'LBL_DISCUSS_WITH_US_AT_BLOGS' => 'Discuss with us at <a href="http://blogs.vtiger.com" target="_blank">blogs</a>',
-	'LBL_WE_AIM_TO_BE_BEST' => 'We aim to be - simply the best',
+	'LBL_TALK_TO_US_AT_FORUMS' => 'Talk to us in our <a href="https://plus.google.com/communities/109845486286232591652" target="_blank">Google+ Community</a> or <a href="http://www.linkedin.com/groups/coreBOS-7479130?trk=my_groups-b-grp-v" target="_blank">LinkedIn Group</a>',
+	'LBL_WE_AIM_TO_BE_BEST' => 'We aim to help you do your business',
 	'LBL_SPACE_FOR_YOU' => 'Come on over, there is space for you too!',	
 	'LBL_NO_OPTIONAL_MODULES_FOUND' => 'No Optional Modules found',
 	'LBL_PREVIOUS_INSTALLATION_INFORMATION' => 'Previous Installation Information',
@@ -169,7 +168,7 @@
 	'LBL_DATABASE_CHECK' => 'Database Check',
 	'MSG_TABLES_IN_INNODB' => 'Required tables were detected to be in proper Engine type (InnoDB)',
 	'MSG_CLOSE_WINDOW_TO_PROCEED' => 'You can close this window and proceed further with migration',
-	'LBL_RECOMMENDATION_FOR_PROPERLY_WORKING_CRM' => 'For proper functionality of vtiger CRM, we recommend the following',
+	'LBL_RECOMMENDATION_FOR_PROPERLY_WORKING_CRM' => 'For proper functionality of coreBOS, we recommend the following',
 	'LBL_TABLES_SHOULD_BE_INNODB' => 'Tables to have InnoDB engine type',
 	'QUESTION_WHAT_IS_INNODB' => 'What is InnoDB',
 	'LBL_TABLES_CHARSET_TO_BE_UTF8' => 'To get complete UTF-8 support, tables should have default charset UTF8',
@@ -207,7 +206,7 @@
 	'MSG_DATABASE_COPY_SUCCEDED' => 'Database copy was successfully created.<br />Click Next &#187; to proceed',
 	'MSG_SUCCESSFULLY_FIXED_TABLE_TYPES' => 'Successfully changed tables to InnoDB engine',
 	'LBL_MIGRATION' => 'Migration',
-	'LBL_SOURCE_VERSION_NOT_SET' => 'Source Version is not set. Please check vtigerversion.php and continue the Patch Process',
+	'LBL_SOURCE_VERSION_NOT_SET' => 'Source Version is not set. Please check corebosversion.php and continue the Patch Process',
 	'LBL_GOING_TO_APPLY_DB_CHANGES' => 'Going to apply the Database Changes',
 	'LBL_DATABASE_CHANGES' => 'Database changes',
 	'LBL_STARTS' => 'Starts',

diff --git a/include/install/resources/utils.php b/include/install/resources/utils.php
@@ -779,10 +779,10 @@ function getConfigFileContents() {
 \$CHAT_DISPLAY = 'true';
 \$USE_RTE = 'true';
 
-// url for customer portal (Example: http://vtiger.com/portal)
-\$PORTAL_URL = 'http://vtiger.com/customerportal';
+// url for customer portal (Example: http://your_support_domain.tld/portal)
+\$PORTAL_URL = 'http://your_support_domain.tld/customerportal';
 
-// helpdesk support email id and support name (Example: 'support@vtiger.com' and 'vtiger support')
+// helpdesk support email id and support name (Example: 'support@your_support_domain.tld' and 'your-support name')
 \$HELPDESK_SUPPORT_EMAIL_ID = '{$this->adminEmail}';
 \$HELPDESK_SUPPORT_NAME = 'your-support name';
 \$HELPDESK_SUPPORT_EMAIL_REPLY_ID = \$HELPDESK_SUPPORT_EMAIL_ID;

diff --git a/include/js/popup.js b/include/js/popup.js
diff --git a/include/language/en_us.lang.php b/include/language/en_us.lang.php
@@ -21,6 +21,7 @@
  ********************************************************************************/
 $app_strings = array (
 'LBL_BROWSER_TITLE' => 'coreBOS',
+'APP_NAME' => 'coreBOS',
 'LBL_MY_ACCOUNT' => 'My Organization',
 'LBL_MY_PREFERENCES' => 'My Preferences',
 'LBL_ADMIN' => 'Admin',
@@ -603,7 +604,6 @@
 'LBL_CPY_MAILING_ADDRESS' => 'Copy Mailing Address',
 'LBL_CPY_OTHER_ADDRESS' => 'Copy Other Address',
 'LBL_PERMISSION' => 'You are not permitted to execute this Operation',
-'VTIGER' => 'coreBOS',
 'LBL_DIRECT_AMOUNT_DISCOUNT' => 'Direct Amount Discount',
 'LBL_NO_DISCOUNT_FOR_THIS_PRODUCT' => 'No Discount for this Product',
 'LBL_NO_DISCOUNT_FOR_THIS_LINE_ITEM'=> 'No Discount for this line item',

diff --git a/index.php b/index.php
@@ -814,22 +814,10 @@ function LogOut(e)
 
 	{
 		echo $copyrightstatement;
-		// Status tracking
-		$statimage = '';
-		if($currentModule == 'Users' && empty($current_user->id)) {
-			global $disable_stats_tracking;
-			if(isset($disable_stats_tracking) && !empty($disable_stats_tracking)) {
-				$statimage = "";
-			} else {
-				$statimage = "<img src='http://stats.vtiger.com/stats.php?uid=$application_unique_key&v=$vtiger_current_version&type=U' 
-				alt='|' title='' border=0 width='1px' height='1px'>";
-			}
-		}
 		// END
-		echo "<script language = 'JavaScript' type='text/javascript' src = 'include/js/popup.js'></script>";
 		echo "<br><br><br><table border=0 cellspacing=0 cellpadding=5 width=100% class=settingsSelectedUI >";
-		echo "<tr><td class=small align=left><span style='color: rgb(153, 153, 153);'>Powered by vtiger CRM <span id='_vtiger_product_version_'>$vtiger_current_version</span></span></td>";
-		echo "<td class=small align=right><span>&copy; 2004-".date('Y')." <a href='http://www.vtiger.com' target='_blank'>vtiger.com</a> | <a href='javascript:mypopup()'>".$app_strings['LNK_READ_LICENSE']."</a> | <a href='http://www.vtiger.com/products/crm/privacy_policy.html' target='_blank'>".getTranslatedString('LNK_PRIVACY_POLICY')."</a></span> $statimage</td></tr></table>";
+		echo "<tr><td class=small align=left><span style='color: rgb(153, 153, 153);'>Powered by ".getTranslatedString('APP_NAME')." <span id='_vtiger_product_version_'>$vtiger_current_version</span></span></td>";
+		echo "<td class=small align=right><span>&copy; 2004-".date('Y')." <a href='$coreBOS_app_url' target='_blank'>$coreBOS_app_name</a> | <a href='copyright.html' target='_blank'>".$app_strings['LNK_READ_LICENSE']."</a> | <a href='http://corebos.org/page/privacy-policy' target='_blank'>".getTranslatedString('LNK_PRIVACY_POLICY')."</a></span></td></tr></table>";
 
 	//	echo "<table align='center'><tr><td align='center'>";
 		// Under the Sugar Public License referenced above, you are required to leave in all copyright statements