From: Coleman Watts Date: Sat, 4 Apr 2015 01:22:05 +0000 (-0400) Subject: Cleanup location of summary-specific js X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a72ae0749bd3828318a38f763beea7b567b5f213;p=civicrm-core.git Cleanup location of summary-specific js --- diff --git a/js/Common.js b/js/Common.js index b94f803fe2..1b08d777f7 100644 --- a/js/Common.js +++ b/js/Common.js @@ -879,63 +879,6 @@ CRM.strings = CRM.strings || {}; } }; - /** - * Function to make multiselect boxes behave as fields in small screens - */ - function advmultiselectResize() { - var amswidth = $("#crm-container form:has(table.advmultiselect)").width(); - if (amswidth < 700) { - $("form table.advmultiselect td").css('display', 'block'); - } - else { - $("form table.advmultiselect td").css('display', 'table-cell'); - } - var contactwidth = $('#crm-container #mainTabContainer').width(); - if (contactwidth < 600) { - $('#crm-container #mainTabContainer').addClass('narrowpage'); - $('#crm-container #mainTabContainer.narrowpage #contactTopBar td').each(function (index) { - if (index > 1) { - if (index % 2 === 0) { - $(this).parent().after(''); - } - var item = $(this); - $(this).parent().next().append(item); - } - }); - } - else { - $('#crm-container #mainTabContainer.narrowpage').removeClass('narrowpage'); - $('#crm-container #mainTabContainer #contactTopBar tr.narrowadded td').each(function () { - var nitem = $(this); - var parent = $(this).parent(); - $(this).parent().prev().append(nitem); - if (parent.children().size() === 0) { - parent.remove(); - } - }); - $('#crm-container #mainTabContainer.narrowpage #contactTopBar tr.added').detach(); - } - var cformwidth = $('#crm-container #Contact .contact_basic_information-section').width(); - - if (cformwidth < 720) { - $('#crm-container .contact_basic_information-section').addClass('narrowform'); - $('#crm-container .contact_basic_information-section table.form-layout-compressed td .helpicon').parent().addClass('hashelpicon'); - if (cformwidth < 480) { - $('#crm-container .contact_basic_information-section').addClass('xnarrowform'); - } - else { - $('#crm-container .contact_basic_information-section.xnarrowform').removeClass('xnarrowform'); - } - } - else { - $('#crm-container .contact_basic_information-section.narrowform').removeClass('narrowform'); - $('#crm-container .contact_basic_information-section.xnarrowform').removeClass('xnarrowform'); - } - } - - advmultiselectResize(); - $(window).resize(advmultiselectResize); - $.fn.crmtooltip = function () { $(document) .on('mouseover', 'a.crm-summary-link:not(.crm-processed)', function (e) { diff --git a/templates/CRM/Contact/Page/View/Summary.js b/templates/CRM/Contact/Page/View/Summary.js index f38bf305b5..6021ee449c 100644 --- a/templates/CRM/Contact/Page/View/Summary.js +++ b/templates/CRM/Contact/Page/View/Summary.js @@ -346,5 +346,55 @@ reloadBlock(data.reloadBlocks.join(',')); } }); + + /** + * Make contact summary fit in small screens + */ + function onResize() { + var contactwidth = $('#crm-container #mainTabContainer').width(); + if (contactwidth < 600) { + $('#crm-container #mainTabContainer').addClass('narrowpage'); + $('#crm-container #mainTabContainer.narrowpage #contactTopBar td').each(function (index) { + if (index > 1) { + if (index % 2 === 0) { + $(this).parent().after(''); + } + var item = $(this); + $(this).parent().next().append(item); + } + }); + } + else { + $('#crm-container #mainTabContainer.narrowpage').removeClass('narrowpage'); + $('#crm-container #mainTabContainer #contactTopBar tr.narrowadded td').each(function () { + var nitem = $(this); + var parent = $(this).parent(); + $(this).parent().prev().append(nitem); + if (parent.children().size() === 0) { + parent.remove(); + } + }); + $('#crm-container #mainTabContainer.narrowpage #contactTopBar tr.added').detach(); + } + var cformwidth = $('#crm-container #Contact .contact_basic_information-section').width(); + + if (cformwidth < 720) { + $('#crm-container .contact_basic_information-section').addClass('narrowform'); + $('#crm-container .contact_basic_information-section table.form-layout-compressed td .helpicon').parent().addClass('hashelpicon'); + if (cformwidth < 480) { + $('#crm-container .contact_basic_information-section').addClass('xnarrowform'); + } + else { + $('#crm-container .contact_basic_information-section.xnarrowform').removeClass('xnarrowform'); + } + } + else { + $('#crm-container .contact_basic_information-section.narrowform').removeClass('narrowform'); + $('#crm-container .contact_basic_information-section.xnarrowform').removeClass('xnarrowform'); + } + } + + onResize(); + $(window).resize(onResize); }); })(CRM.$, CRM._);