Commit 7903ba35 authored by RoSk0's avatar RoSk0

Many small changes, mostly description changes.

parent 13f0f3d5
......@@ -47,7 +47,7 @@ class CRMCoreActivityUITestCase extends DrupalWebTestCase {
$this->drupalPost('crm-core/contact/add/household', $household_contact, t('Save Contact'));
$this->drupalGet('crm-core/contact/1/activity');
$this->assertText(t('This contact has no activity, add an activity above.'), t('No activities avaiable for newly created contact.'));
$this->assertText(t('There are no activities available.'), t('No activities avaiable for newly created contact.'));
$this->assertLink(t('Add activity'));
$this->drupalGet('crm-core/contact/1/activity/add');
......@@ -113,7 +113,7 @@ class CRMCoreActivityUITestCase extends DrupalWebTestCase {
// Assert there is no activities left.
$this->drupalGet('crm-core/contact/1/activity');
$this->assertText(t('This contact has no activity, add an activity above.'), t('No activities listed.'));
$this->assertText(t('There are no activities available.'), t('No activities listed.'));
}
/**
......
......@@ -21,7 +21,7 @@ function crm_core_activity_ui_views_default_views() {
/* Display: Master */
$handler = $view->new_display('default', 'Master', 'default');
$handler->display->display_options['title'] = 'Select activity type to create';
$handler->display->display_options['title'] = 'Add CRM Core contact activity';
$handler->display->display_options['use_more_always'] = FALSE;
$handler->display->display_options['access']['type'] = 'none';
$handler->display->display_options['cache']['type'] = 'none';
......@@ -120,13 +120,15 @@ function crm_core_activity_ui_views_default_views() {
$handler->display->display_options['empty']['area']['id'] = 'area';
$handler->display->display_options['empty']['area']['table'] = 'views';
$handler->display->display_options['empty']['area']['field'] = 'area';
$handler->display->display_options['empty']['area']['content'] = 'This contact has no activity, add an activity above.';
$handler->display->display_options['empty']['area']['empty'] = TRUE;
$handler->display->display_options['empty']['area']['content'] = 'There are no activities available. <a href="/crm-core/contact/!1/activity/add">Add one now</a>.';
$handler->display->display_options['empty']['area']['format'] = 'filtered_html';
$handler->display->display_options['empty']['area']['tokenize'] = TRUE;
/* Relationship: Entity Reference: Referenced Entity */
$handler->display->display_options['relationships']['field_activity_participants_target_id']['id'] = 'field_activity_participants_target_id';
$handler->display->display_options['relationships']['field_activity_participants_target_id']['table'] = 'field_data_field_activity_participants';
$handler->display->display_options['relationships']['field_activity_participants_target_id']['field'] = 'field_activity_participants_target_id';
/* Field: CRM Activity: Activity ID */
/* Field: CRM activity: Activity ID */
$handler->display->display_options['fields']['activity_id']['id'] = 'activity_id';
$handler->display->display_options['fields']['activity_id']['table'] = 'crm_core_activity';
$handler->display->display_options['fields']['activity_id']['field'] = 'activity_id';
......@@ -180,14 +182,14 @@ function crm_core_activity_ui_views_default_views() {
'multiple_from' => '',
'multiple_to' => '',
);
/* Field: CRM Activity: Title */
/* Field: CRM activity: Title */
$handler->display->display_options['fields']['title']['id'] = 'title';
$handler->display->display_options['fields']['title']['table'] = 'crm_core_activity';
$handler->display->display_options['fields']['title']['field'] = 'title';
$handler->display->display_options['fields']['title']['alter']['make_link'] = TRUE;
$handler->display->display_options['fields']['title']['alter']['path'] = 'crm-core/contact/[contact_id]/activity/[activity_id]';
$handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
/* Field: CRM Activity: Label */
/* Field: CRM activity: Label */
$handler->display->display_options['fields']['label']['id'] = 'label';
$handler->display->display_options['fields']['label']['table'] = 'crm_core_activity_type';
$handler->display->display_options['fields']['label']['field'] = 'label';
......@@ -207,7 +209,7 @@ function crm_core_activity_ui_views_default_views() {
$handler->display->display_options['arguments']['field_activity_participants_target_id']['summary']['number_of_records'] = '0';
$handler->display->display_options['arguments']['field_activity_participants_target_id']['summary']['format'] = 'default_summary';
$handler->display->display_options['arguments']['field_activity_participants_target_id']['summary_options']['items_per_page'] = '25';
/* Filter criterion: CRM Activity: Type */
/* Filter criterion: CRM activity: Type */
$handler->display->display_options['filters']['type']['id'] = 'type';
$handler->display->display_options['filters']['type']['table'] = 'crm_core_activity';
$handler->display->display_options['filters']['type']['field'] = 'type';
......
......@@ -17,11 +17,6 @@ dependencies[] = field_ui
dependencies[] = views
; Field dependencies
dependencies[] = image
dependencies[] = addressfield
dependencies[] = email
dependencies[] = link
dependencies[] = cck_phone
dependencies[] = field_group
dependencies[] = name
......
......@@ -12,8 +12,8 @@ function crm_core_contact_ui_form_wrapper($contact) {
* Show a list of contact types that can be added into the CRM.
*/
function crm_core_contact_ui_add_page() {
drupal_set_title(t('Add CRM Core contact'));
$item = menu_get_item();
$types = crm_core_contact_types(TRUE);
$content = array();
foreach ($types as $type) {
......
......@@ -84,8 +84,10 @@ function crm_core_contact_ui_views_default_views() {
$handler->display->display_options['empty']['area']['id'] = 'area';
$handler->display->display_options['empty']['area']['table'] = 'views';
$handler->display->display_options['empty']['area']['field'] = 'area';
$handler->display->display_options['empty']['area']['content'] = 'There are no contacts in the CRM. Add one by clicking above.';
$handler->display->display_options['empty']['area']['empty'] = TRUE;
$handler->display->display_options['empty']['area']['content'] = 'There are no contacts available. <a href="/crm-core/contacts/add">Add one now</a>.';
$handler->display->display_options['empty']['area']['format'] = 'filtered_html';
$handler->display->display_options['empty']['area']['tokenize'] = TRUE;
/* Field: CRM Contact: Contact ID */
$handler->display->display_options['fields']['contact_id']['id'] = 'contact_id';
$handler->display->display_options['fields']['contact_id']['table'] = 'crm_core_contact';
......
......@@ -151,7 +151,7 @@ function crm_core_relationship_form_after_build(&$form, &$form_state) {
* Entity object of crm_core_contact type.
*/
function crm_core_relationship_ui_add_relationship($crm_core_contact) {
drupal_set_title(t('Select relationship type to create'));
drupal_set_title(t('Add CRM Core contact relationship'));
module_load_include('inc', 'crm_core_relationship_ui');
......
......@@ -40,7 +40,7 @@ function crm_core_report_menu() {
* Provides a listing of all reports registered for CRM Core
*/
$items['crm-core/reports'] = array(
'title' => 'CRM Core Reports',
'title' => 'Reports',
'page callback' => 'crm_core_report_list',
'access arguments' => array('view crm report index'),
'type' => MENU_LOCAL_TASK,
......
......@@ -4,6 +4,7 @@
* Provides a listing of all reports registered for CRM Core
*/
function crm_core_report_list(){
drupal_set_title(t('Reports'));
$reports = hook_crm_core_report_register();
return empty($reports)
? t('There are no reports to display at this time.') : theme('crm_core_report_index', array('reports' => $reports));
......
......@@ -44,7 +44,7 @@ function crm_core_ui_menu() {
$items['admin/config/crm-core/settings'] = array(
'title' => 'CRM Core Settings',
'description' => 'CRM Core Settings page',
'description' => 'Configure the appearance of CRM Core and presets for interacting with contacts.',
'page callback' => 'drupal_get_form',
'page arguments' => array('crm_core_ui_admin_config_form'),
'access arguments' => array('administer crm-core settings'),
......@@ -239,7 +239,7 @@ function crm_core_ui_get_menus() {
return array(
'crm-core-menu' => array(
'menu_name' => 'crm-core-menu',
'title' => $t('CRM Core Menu'),
'title' => $t('CRM Core'),
'description' => $t('Provides access to various features and functions within CRM Core.'),
),
'crm-core-admin-menu' => array(
......
......@@ -97,10 +97,12 @@ function crm_core_ui_admin_config_form($form, &$form_state) {
),
),
);
$links_description = 'When checked, this allows you to use the CRM Core menu as the primary links for the site,' .
' when viewing a page in CRM Core.';
$form['theme']['crm_core_theme_settings']['crm_core_theme_replace_links'] = array(
'#type' => 'checkbox',
'#title' => t('Replace primary links with the CRM Core menu?'),
'#description' => t('When checked, the primary links for your site will be overridden with links from the CRM Core menu.'),
'#description' => t($links_description),
'#default_value' => variable_get('crm_core_theme_replace_links', FALSE),
'#weight' => 1,
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment