Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-04-22-25-32

[civicrm-core.git] / templates / CRM / Event / Form / ManageEvent / Conference.tpl

diff --git a/templates/CRM/Event/Form/ManageEvent/Conference.tpl b/templates/CRM/Event/Form/ManageEvent/Conference.tpl
index 249d965abc5a266e81409a2c9f023e81787dc8cb..c82bb8cbf02996b81f64af8b07229cfd0a0d5c05 100644 (file)
--- a/templates/CRM/Event/Form/ManageEvent/Conference.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Conference.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.                                    |
  |                                                                    |
@@ -35,19 +35,19 @@
        </tr>
     </table>
 
-    <div id="parent_event_name">
-      <table id="parent_event_name" class="form-layout">
+    <div>
+      <table id="parent_event_name_wrapper" class="form-layout">
           <tr class="crm-event-conference-form-block-parent_event_name">
-             <td class="label">{$form.parent_event_name.label}</td>
+             <td class="label">{$form.parent_event_id.label}</td>
              <td>
-                 {$form.parent_event_name.html|crmAddClass:huge}
+                 {$form.parent_event_id.html|crmAddClass:huge}
              </td>
           </tr>
       </table>
     </div>
 
-    <div id="conference_slot_id">
-      <table id="conference_slot_id" class="form-layout">
+    <div>
+      <table id="conference_slot_id_wrapper" class="form-layout">
           <tr class="crm-event-conference-form-block-slot_label_id">
              <td class="label">{$form.slot_label_id.label}</td>
              <td>{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='slot_label_id' id=$id}{/if}{$form.slot_label_id.html|crmAddClass:big}
@@ -59,25 +59,3 @@
         {include file="CRM/common/formButtons.tpl" location="bottom"}
     </div>
 </div>
-
-{include file="CRM/common/formNavigate.tpl"}
-
-{literal}
-<script type="text/javascript">
-var eventUrl = "{/literal}{crmURL p='civicrm/ajax/event' h=0}{literal}";
-
-cj('input#parent_event_name').autocomplete(
-    eventUrl,
-    {
-        width : 280,
-        selectFirst : false,
-        matchContains: true,
-    }
-).result( function(event, data, formatted)
-    {
-        cj( "input#parent_event_name" ).val( data[0] );
-        cj( "input[name=parent_event_id]" ).val( data[1] );
-    }
-).bind( 'click', function( ) { cj( "input#parent_event_name" ).val(''); });
-</script>
-{/literal}