CRM-12337 - Navigation.tpl - Fix joomla, markup error

diff --git a/templates/CRM/common/Navigation.tpl b/templates/CRM/common/Navigation.tpl
index 92a065355330e0e132d0441ecc70471fe851ad04..5e981612df3c3d18e45c392c876f097eadef4ce1 100644 (file)
--- a/templates/CRM/common/Navigation.tpl
+++ b/templates/CRM/common/Navigation.tpl
@@ -37,7 +37,7 @@
           </div>
         </form>
         <ul>
-          <li><label class="crm-quickSearchField"><input type="radio" checked="" data-tablename="cc" checked="checked" value="" name="quickSearchField">{ts}Name/Email{/ts}</label></li>
+          <li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" checked="checked" value="" name="quickSearchField">{ts}Name/Email{/ts}</label></li>
           <li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="contact_id" name="quickSearchField">{ts}CiviCRM ID{/ts}</label></li>
           <li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="external_identifier" name="quickSearchField">{ts}External ID{/ts}</label></li>
           <li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="first_name" name="quickSearchField">{ts}First Name{/ts}</label></li>
@@ -140,8 +140,7 @@
       $('div#toolbar-box div.m').html(menuMarkup);
     }
     else {
-      // Fixme
-      $("#menu-container").show().css({'padding-bottom': '10px'});
+      $("#crm-nav-menu-container").html(menuMarkup).css({'padding-bottom': '10px'});
     }
 
     $('#civicrm-menu').ready(function() {

diff --git a/templates/CRM/common/joomla.tpl b/templates/CRM/common/joomla.tpl
index a197613d47207f31bd4a675951c8dc77646d634d..a6c635f46107b60723ce860d5b7b19124b22aa6d 100644 (file)
--- a/templates/CRM/common/joomla.tpl
+++ b/templates/CRM/common/joomla.tpl
@@ -29,7 +29,8 @@
 
 <div id="crm-container" class="crm-container{if $urlIsPublic} crm-public{/if}" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
 
-{* Only include joomla.css in administrator (backend). Page layout style ids and classes conflict with typical front-end css and break the page layout. *}
+{* Joomla-only container to hold the civicrm menu *}
+<div id="crm-nav-menu-container"></div>
 {crmNavigationMenu is_default=1}
 
 {* include wysiwyg related files*}