Merge pull request #4124 from tohojo/adv-search-fix

[civicrm-core.git] / templates / CRM / Case / Page / DashboardSelector.tpl

diff --git a/templates/CRM/Case/Page/DashboardSelector.tpl b/templates/CRM/Case/Page/DashboardSelector.tpl
index 9991549c0faf32753f0500894fa0ea731e7f4500..6b3631190d92e664b285db960444dd4619b2f64c 100644 (file)
--- a/templates/CRM/Case/Page/DashboardSelector.tpl
+++ b/templates/CRM/Case/Page/DashboardSelector.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -63,13 +63,13 @@
     {if $list eq 'upcoming'}
        <td class="crm-case-case_scheduled_activity">
      {if $row.case_upcoming_activity_viewable}
-        <a href="#" onclick="{$list}viewActivity({$row.case_scheduled_activity_id}, {$row.contact_id}, '{$list}'); return false;" title="{ts}View this activity.{/ts}">{$row.case_scheduled_activity_type}</a>
+        <a class="crm-popup {$row.activity_status}" href="{crmURL p='civicrm/case/activity/view' h=0 q="cid="}{$row.contact_id}&aid={$row.case_scheduled_activity_id}" title="{ts}View activity{/ts}">{$row.case_scheduled_activity_type}</a>
      {else}
         {$row.case_scheduled_activity_type}
      {/if}
        &nbsp;&nbsp;
      {if $row.case_upcoming_activity_editable}
-       <a href="{crmURL p="civicrm/case/activity" q="reset=1&cid=`$row.contact_id`&caseid=`$row.case_id`&action=update&id=`$row.case_scheduled_activity_id`"}" title="{ts}Edit this activity.{/ts}"><span class="icon edit-icon"></span></a>
+       <a class="action-item crm-hover-button" href="{crmURL p="civicrm/case/activity" q="reset=1&cid=`$row.contact_id`&caseid=`$row.case_id`&action=update&id=`$row.case_scheduled_activity_id`"}" title="{ts}Edit activity{/ts}"><span class="icon edit-icon"></span></a>
      {/if}
      <br />
      {$row.case_scheduled_activity_date|crmDate}
@@ -78,11 +78,11 @@
     {elseif $list eq 'recent'}
        <td class="crm-case-case_recent_activity">
    {if $row.case_recent_activity_viewable}
-       <a href="#" onclick="{$list}viewActivity({$row.case_recent_activity_id}, {$row.contact_id}, '{$list}'); return false;" title="{ts}View this activity.{/ts}">{$row.case_recent_activity_type}</a>
+       <a class="crm-popup" href="{crmURL p='civicrm/case/activity/view' h=0 q="cid="}{$row.contact_id}&aid={$row.case_recent_activity_id}" title="{ts}View activity{/ts}">{$row.case_recent_activity_type}</a>
     {else}
        {$row.case_recent_activity_type}
     {/if}
-    {if $row.case_recent_activity_editable and $row.case_recent_activity_type_name != 'Inbound Email' && $row.case_recent_activity_type_name != 'Email'}&nbsp;&nbsp;<a href="{crmURL p="civicrm/case/activity" q="reset=1&cid=`$row.contact_id`&caseid=`$row.case_id`&action=update&id=`$row.case_recent_activity_id`"}" title="{ts}Edit this activity.{/ts}"><span class="icon edit-icon"></span></a>
+    {if $row.case_recent_activity_editable and $row.case_recent_activity_type_name != 'Inbound Email' && $row.case_recent_activity_type_name != 'Email'}&nbsp;&nbsp;<a href="{crmURL p="civicrm/case/activity" q="reset=1&cid=`$row.contact_id`&caseid=`$row.case_id`&action=update&id=`$row.case_recent_activity_id`"}" title="{ts}Edit activity{/ts}"><span class="icon edit-icon"></span></a>
     {/if}<br />
           {$row.case_recent_activity_date|crmDate}
    </td>
@@ -111,11 +111,6 @@
 
 </table>
 
-{*include activity view js file*}
-{include file="CRM/common/activityView.tpl" list=$list}
-<div id="view-activity-{$list}">
-    <div id="activity-content-{$list}"></div>
-</div>
 {/strip}
 
 {* Build case details*}
@@ -132,7 +127,7 @@ function {/literal}{$context}{$list}{literal}CaseDetails( caseId, contactId, typ
                   cj( '#'+ context + '-' + type +'-casedetails-' + caseId ).html( data );
                       },
             error   : function( XMLHttpRequest, textStatus, errorThrown ) {
-                        console.error( 'Error: '+ textStatus );
+                        CRM.console('error', 'Error: ', textStatus);
                       }
          });
 }