-- CRM-13747 CiviCase label and title simplification to increase adaptability

----------------------------------------
* CRM-13747: CiviCase label and title simplification to increase adaptability
  http://issues.civicrm.org/jira/browse/CRM-13747

diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl
index a6be1ecd5637aba5f3d6d7078c845a52ad683d5d..1b4c0a191a3f7d7b3ec75c7f19828738003e0745 100644 (file)
--- a/templates/CRM/Case/Form/CaseView.tpl
+++ b/templates/CRM/Case/Form/CaseView.tpl
@@ -46,7 +46,7 @@
 
   {else}
 
-<h3>{ts}Case Summary{/ts}</h3>
+<h3>{ts}Summary{/ts}</h3>
 <table class="report">
   {if $multiClient}
     <tr class="crm-case-caseview-client">
@@ -119,7 +119,7 @@
   <td>{$form.activity_type_id.label}<br />{$form.activity_type_id.html}&nbsp;<input type="button" accesskey="N" value="{ts}Go{/ts}" name="new_activity" onclick="checkSelection( this );"/></td>
   {if $hasAccessToAllCases}
     <td>
-      <span class="crm-button"><div class="icon print-icon"></div><input type="button"  value="{ts}Print Case Report{/ts}" name="case_report_all" onclick="printCaseReport( );"/></span>
+      <span class="crm-button"><div class="icon print-icon"></div><input type="button"  value="{ts}Print Report{/ts}" name="case_report_all" onclick="printCaseReport( );"/></span>
     </td>
   </tr>
   <tr>
@@ -142,7 +142,7 @@
 
   {if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))}
     <tr class="crm-case-caseview-form-block-change_client_id">
-      <td colspan='2'><a href="#" onClick='cj("#change_client").toggle( ); return false;'>{ts}Assign to Another Client{/ts}</a>
+      <td colspan='2'><a href="#" onClick='cj("#change_client").toggle( ); return false;'>{ts}Assign to Another Contact{/ts}</a>
           <span id='change_client' class='hide-block'>
             {$form.change_client_id.html|crmAddClass:twenty}&nbsp;{$form._qf_CaseView_next_edit_client.html}
           </span>
@@ -160,7 +160,7 @@
 
 <div class="crm-accordion-wrapper collapsed crm-case-roles-block">
   <div class="crm-accordion-header">
-    {ts}Case Roles{/ts}
+    {ts}Roles{/ts}
   </div><!-- /.crm-accordion-header -->
   <div class="crm-accordion-body">
 
@@ -902,7 +902,7 @@ function addTags() {
 
 <div class="crm-accordion-wrapper crm-case_activities-accordion  crm-case-activities-block">
   <div class="crm-accordion-header">
-    {ts}Case Activities{/ts}
+    {ts}Activities{/ts}
   </div>
   <div id="activities" class="crm-accordion-body">
     <div id="view-activity">

diff --git a/templates/CRM/Case/Page/DashBoard.tpl b/templates/CRM/Case/Page/DashBoard.tpl
index 009160ebc7c0d94b72cca92c418fe13486b1e158..cded426b762b2e55c5096d8b04d5a650da383af8 100644 (file)
--- a/templates/CRM/Case/Page/DashBoard.tpl
+++ b/templates/CRM/Case/Page/DashBoard.tpl
@@ -55,7 +55,7 @@
 
 <h3>
 {if $myCases}
-  {ts}Summary of Case Involvement{/ts}
+  {ts}Summary of Involvement{/ts}
 {else}
   {ts}Summary of All Cases{/ts}
 {/if}

diff --git a/templates/CRM/Case/Page/DashboardSelector.tpl b/templates/CRM/Case/Page/DashboardSelector.tpl
index fa56a5981b4b3bbfe12d7229bd4aaf9af28c396e..c303690be635a2cf2393ea2fed046478b434de7c 100644 (file)
--- a/templates/CRM/Case/Page/DashboardSelector.tpl
+++ b/templates/CRM/Case/Page/DashboardSelector.tpl
@@ -28,12 +28,12 @@
 <table class="caseSelector">
   <tr class="columnheader">
     <th></th>
-    <th>{ts}Client{/ts}</th>
+    <th>{ts}Contact{/ts}</th>
     <th>{ts}Subject{/ts}</th>
     <th>{ts}Status{/ts}</th>
     <th>{ts}Type{/ts}</th>
     <th>{ts}My Role{/ts}</th>
-    <th>{ts}Case Manager{/ts}</th>
+    <th>{ts}Manager{/ts}</th>
     <th>{if $list EQ 'upcoming'}{ts}Next Sched.{/ts}{elseif $list EQ 'recent'}{ts}Most Recent{/ts}{/if}</th>
     <th></th>
   </tr>

diff --git a/templates/CRM/Dashlet/Page/CaseDashboard.tpl b/templates/CRM/Dashlet/Page/CaseDashboard.tpl
index abf4c3ce0e0767efe3c7eb86ed1ba18011a5c637..52c5257b634adc507071b98fc1c94cf2cea134c1 100644 (file)
--- a/templates/CRM/Dashlet/Page/CaseDashboard.tpl
+++ b/templates/CRM/Dashlet/Page/CaseDashboard.tpl
@@ -58,7 +58,7 @@
   </table>
 </div>
 
-<h3>{ts}Summary of Case Involvement{/ts}</h3>
+<h3>{ts}Summary of Involvement{/ts}</h3>
 
 <table class="report">
   <tr class="columnheader">

diff --git a/tests/phpunit/WebTest/Case/CaseDashboardTest.php b/tests/phpunit/WebTest/Case/CaseDashboardTest.php
index 7f6f7ab00a5d6437cbf757c5590dc3ffc65e9408..dce579ae6f62af3aba6eae7ff07dbb271b7c2a68 100644 (file)
--- a/tests/phpunit/WebTest/Case/CaseDashboardTest.php
+++ b/tests/phpunit/WebTest/Case/CaseDashboardTest.php
@@ -50,7 +50,7 @@ class WebTest_Case_CaseDashboardTest extends CiviSeleniumTestCase {
     // Should default to My Cases
     $this->assertTrue($this->isChecked("name=allupcoming value=0"), 'Case dashboard should default to My Cases.');
     // The header text of the table changes too
-    $this->assertElementContainsText('crm-container', "Summary of Case Involvement");
+    $this->assertElementContainsText('crm-container', "Summary of Involvement");
 
     $this->clickLink("name=allupcoming value=1", "css=a.button");