From fb0aac1e5c7cdbc0368b6ec61e290d5b7d706304 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 8 Apr 2014 10:44:17 -0400 Subject: [PATCH] ProfileBuilder - general updates for 4.5 --- css/crm.designer.css | 2 +- js/crm.designerapp.js | 2 +- js/view/crm.designer.js | 78 +++++++++++----------- js/view/crm.profile-selector.js | 43 +++++------- templates/CRM/UF/Form/Preview.tpl | 8 +-- templates/CRM/UF/Page/ProfileTemplates.tpl | 6 +- 6 files changed, 61 insertions(+), 78 deletions(-) diff --git a/css/crm.designer.css b/css/crm.designer.css index 1b997689c7..1196c45fb4 100644 --- a/css/crm.designer.css +++ b/css/crm.designer.css @@ -244,6 +244,6 @@ button#crm-designer-add-custom-set { } /* Hide annoying 'preview' message */ -.crm-profile-selector-preview-pane > div.messages.status.info { +.crm-profile-selector-preview-pane div.profile-preview-msg { display: none; } diff --git a/js/crm.designerapp.js b/js/crm.designerapp.js index 2b049a0c0f..d0a0c1aa33 100644 --- a/js/crm.designerapp.js +++ b/js/crm.designerapp.js @@ -16,7 +16,7 @@ * @see CRM-12188 */ CRM.designerApp.clearPreviewArea = function () { - $('.crm-profile-selector-preview-pane > .crm-form-block').each(function () { + $('.crm-profile-selector-preview-pane > .crm-container-snippet').each(function () { var parent = $(this).parent(); CRM.designerApp.DetachedProfiles.push({ parent: parent, diff --git a/js/view/crm.designer.js b/js/view/crm.designer.js index dba7d32b29..c9e6a1e2c4 100644 --- a/js/view/crm.designer.js +++ b/js/view/crm.designer.js @@ -61,9 +61,10 @@ var designerDialog = this; designerDialog.$el.dialog({ autoOpen: true, // note: affects accordion height - title: 'Edit Profile', + title: ts('Edit Profile'), + modal: true, width: '75%', - height: 600, + height: parseInt($(window).height() *.8, 10), minWidth: 500, minHeight: 600, // to allow dropping in big whitespace, coordinate with min-height of .crm-designer-fields open: function() { @@ -83,7 +84,7 @@ // Initialize new dialog if we are not re-opening unsaved changes if (designerDialog.undoState === false) { designerDialog.designerRegion && designerDialog.designerRegion.close && designerDialog.designerRegion.close(); - designerDialog.$el.block({message: 'Loading...', theme: true}); + designerDialog.$el.block(); designerDialog.options.findCreateUfGroupModel({ onLoad: function(ufGroupModel) { designerDialog.model = ufGroupModel; @@ -109,10 +110,10 @@ designerDialog.undoAlert && designerDialog.undoAlert.close && designerDialog.undoAlert.close(); if (designerDialog.isUfUnsaved) { designerDialog.undoAlert = CRM.alert('

' + ts('Your changes to "%1" have not been saved.', {1: designerDialog.model.get('title')}) + '

' + ts('Restore unsaved changes') + '', ts('Unsaved Changes'), 'alert', {expires: 60000}); - $('.ui-notify-message a.crm-undo').click(function() { + $('.ui-notify-message a.crm-undo').click(function(e) { + e.preventDefault(); designerDialog.undoState = true; designerDialog.$el.dialog('open'); - return false; }); } // CRM-12188 @@ -206,7 +207,8 @@ this.$('.crm-designer-save').removeAttr('style').prop('disabled', false); } }, - doSave: function(event) { + doSave: function(e) { + e.preentDefault(); var ufGroupModel = this.model; if (ufGroupModel.getRel('ufFieldCollection').hasDuplicates()) { CRM.alert(ts('Please correct errors before saving.'), '', 'alert'); @@ -240,9 +242,9 @@ } } }); - return false; }, - doPreview: function(event) { + doPreview: function(e) { + e.preventDefault(); this.previewMode = !this.previewMode; if (!this.previewMode) { $('.crm-designer-preview-canvas').html(''); @@ -258,25 +260,20 @@ $dialog.block({message: 'Loading...', theme: true}); // CRM-12188 CRM.designerApp.clearPreviewArea(); - $.ajax({ - url: CRM.url("civicrm/ajax/inline"), - type: 'POST', - data: { - 'qfKey': CRM.profilePreviewKey, - 'class_name': 'CRM_UF_Form_Inline_Preview', - 'snippet': 1, - 'ufData': JSON.stringify({ - ufGroup: this.model.toStrictJSON(), - ufFieldCollection: this.model.getRel('ufFieldCollection').toSortedJSON() - }) - } + $.post(CRM.url("civicrm/ajax/inline"), { + 'qfKey': CRM.profilePreviewKey, + 'class_name': 'CRM_UF_Form_Inline_Preview', + 'snippet': 1, + 'ufData': JSON.stringify({ + ufGroup: this.model.toStrictJSON(), + ufFieldCollection: this.model.getRel('ufFieldCollection').toSortedJSON() + }) }).done(function(data) { $dialog.unblock(); $('.crm-designer-canvas > *, .crm-designer-palette-region').hide(); - $('.crm-designer-preview-canvas').html(data).show(); + $('.crm-designer-preview-canvas').html(data).show().trigger('crmLoad').find(':input').prop('readOnly', true); $('.crm-designer-preview span').html(ts('Edit')); }); - return false; } }); @@ -403,8 +400,10 @@ var div = this.$('.crm-designer-palette-tree').closest('.crm-container').height(); this.$('.crm-designer-palette-tree').css({height: div - pos.top}); }, - doSearch: function(event) { - $('.crm-designer-palette-tree').jstree("search", $(event.target).val()); + doSearch: function(e) { + var str = $(e.target).val(); + this.$('.crm-designer-palette-clear-search').css('visibility', str ? 'visible' : 'hidden'); + this.$('.crm-designer-palette-tree').jstree("search", str); }, doSetPaletteEntity: function(event) { this.selectedContactType = $('.crm-contact-types :selected').val(); @@ -424,10 +423,11 @@ paletteFieldModel.addToUFCollection(this.model.getRel('ufFieldCollection')); event.stopPropagation(); }, - doNewCustomFieldDialog: function(event) { + doNewCustomFieldDialog: function(e) { + e.preventDefault(); var paletteView = this; - var entityKey = $(event.currentTarget).closest('.crm-designer-palette-section').attr('data-entity'); - var sectionKey = $(event.currentTarget).closest('.crm-designer-palette-section').attr('data-section'); + var entityKey = $(e.currentTarget).closest('.crm-designer-palette-section').attr('data-entity'); + var sectionKey = $(e.currentTarget).closest('.crm-designer-palette-section').attr('data-section'); var ufEntityModel = paletteView.model.getRel('ufEntityCollection').getByName(entityKey); var sections = ufEntityModel.getSections(); var url = CRM.url('civicrm/admin/custom/group/field/add', { @@ -438,9 +438,9 @@ CRM.loadForm(url).on('crmFormSuccess', function(e, data) { paletteView.doRefresh('custom_' + data.id); }); - return false; }, - doNewCustomSetDialog: function(event) { + doNewCustomSetDialog: function(e) { + e.preventDefault(); var paletteView = this; var url = CRM.url('civicrm/admin/custom/group', 'action=add&reset=1'); // Create custom field set and automatically go to next step (create fields) after save button is clicked. @@ -450,7 +450,6 @@ data.customField && ($(this).data('civiCrmSnippet').options.crmForm.refreshAction = ['next_new']); paletteView.doRefresh(data.customField ? 'custom_' + data.id : null); }); - return false; }, doRefresh: function(fieldToAdd) { var ufGroupModel = this.model; @@ -467,9 +466,9 @@ CRM.alert(ts('Failed to retrieve schema'), ts('Error'), 'error'); }); }, - clearSearch: function(event) { + clearSearch: function(e) { + e.preventDefault(); $('.crm-designer-palette-search input').val('').keyup(); - return false; }, toggleActive: function(ufFieldModel, ufFieldCollection, options) { var paletteFieldCollection = this.model.getRel('paletteFieldCollection'); @@ -479,11 +478,11 @@ this.$('[data-plm-cid='+paletteFieldModel.cid+']').toggleClass('disabled', !isAddable); } }, - toggleAll: function(event) { + toggleAll: function(e) { if ($('.crm-designer-palette-search input').val() == '') { - $('.crm-designer-palette-tree').jstree($(event.target).attr('rel')); + $('.crm-designer-palette-tree').jstree($(e.target).attr('rel')); } - return false; + e.preventDefault(); }, getOpenTreeNodes: function() { var paletteView = this; @@ -661,7 +660,8 @@ } } }, - doEditCustomField: function() { + doEditCustomField: function(e) { + e.preventDefault(); var url = CRM.url('civicrm/admin/custom/group/field/update', { action: 'update', reset: 1, @@ -676,17 +676,15 @@ var buttons = {}; buttons[$link.text()] = function() { var form2 = CRM.loadForm($link.attr('href'), { - openInline: 'a.action-item:not([href="#"])', dialog: { width: '60%', height: '70%' } }); - } + }; $(this).dialog('option', 'buttons', buttons); } - }) - return false; + }); }, onChangeIsDuplicate: function(model, value, options) { this.$el.toggleClass('crm-designer-duplicate', value); diff --git a/js/view/crm.profile-selector.js b/js/view/crm.profile-selector.js index 6521f19572..f36c8f2313 100644 --- a/js/view/crm.profile-selector.js +++ b/js/view/crm.profile-selector.js @@ -43,7 +43,10 @@ 'change .crm-profile-selector-select select': 'onChangeUfGroupId', 'click .crm-profile-selector-edit': 'doEdit', 'click .crm-profile-selector-copy': 'doCopy', - 'click .crm-profile-selector-create': 'doCreate' + 'click .crm-profile-selector-create': 'doCreate', + // prevent interaction with preview form + 'click .crm-profile-selector-preview-pane': false, + 'crmLoad .crm-profile-selector-preview-pane': 'disableForm' }, /** @var Marionette.View which specifically builds on jQuery-UI's dialog */ activeDialog: null, @@ -79,32 +82,17 @@ }, doPreview: function() { var $pane = this.$('.crm-profile-selector-preview-pane'); - if (!this.hasUfGroupId()) { $pane.html($('#profile_selector_empty_preview_template').html()); - return; + } else { + CRM.loadPage(CRM.url("civicrm/ajax/inline", {class_name: 'CRM_UF_Form_Inline_PreviewById', id: this.getUfGroupId()}), {target: $pane}); } - - $pane.block({message: ts('Loading...'), theme: true}); - $.ajax({ - url: CRM.url("civicrm/ajax/inline"), - type: 'GET', - data: { - class_name: 'CRM_UF_Form_Inline_PreviewById', - id: this.getUfGroupId(), - snippet: 4 - } - }).done(function(data) { - $pane - .unblock() - .html(data) - .click(function() { - return false; // disable buttons - }); - }); - return false; }, - doEdit: function() { + disableForm: function() { + this.$(':input', '.crm-profile-selector-preview-pane').prop('readOnly', true); + }, + doEdit: function(e) { + e.preventDefault(); var profileSelectorView = this; var designerDialog = new CRM.Designer.DesignerDialog({ findCreateUfGroupModel: function(options) { @@ -123,9 +111,9 @@ }); CRM.designerApp.vent.on('ufSaved', this.onSave, this); this.setDialog(designerDialog); - return false; }, - doCopy: function() { + doCopy: function(e) { + e.preventDefault(); // This is largely the same as doEdit, but we ultimately pass in a deepCopy of the ufGroupModel. var profileSelectorView = this; var designerDialog = new CRM.Designer.DesignerDialog({ @@ -145,9 +133,9 @@ }); CRM.designerApp.vent.on('ufSaved', this.onSave, this); this.setDialog(designerDialog); - return false; }, - doCreate: function() { + doCreate: function(e) { + e.preventDefault(); var profileSelectorView = this; var designerDialog = new CRM.Designer.DesignerDialog({ findCreateUfGroupModel: function(options) { @@ -159,7 +147,6 @@ }); CRM.designerApp.vent.on('ufSaved', this.onSave, this); this.setDialog(designerDialog); - return false; }, onSave: function() { CRM.designerApp.vent.off('ufSaved', this.onSave, this); diff --git a/templates/CRM/UF/Form/Preview.tpl b/templates/CRM/UF/Form/Preview.tpl index 5ac9cedced..c24e344faa 100644 --- a/templates/CRM/UF/Form/Preview.tpl +++ b/templates/CRM/UF/Form/Preview.tpl @@ -23,14 +23,12 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{capture assign=infoTitle}{ts}Preview Mode{/ts}{/capture} -{assign var="infoType" value="info"} {if $previewField} - {capture assign=infoMessage}{ts}Profile Field Preview{/ts}{/capture} + {capture assign=infoTitle}{ts}Profile Field Preview{/ts}{/capture} {else} - {capture assign=infoMessage}{ts}Profile Preview{/ts}{/capture} + {capture assign=infoTitle}{ts}Profile Preview{/ts}{/capture} {/if} -{include file="CRM/common/info.tpl"} +{include file="CRM/common/info.tpl" infoType="no-popup profile-preview-msg" infoMessage=" "}
{if ! empty( $fields )} diff --git a/templates/CRM/UF/Page/ProfileTemplates.tpl b/templates/CRM/UF/Page/ProfileTemplates.tpl index 6bb4968da4..06a0f782fb 100644 --- a/templates/CRM/UF/Page/ProfileTemplates.tpl +++ b/templates/CRM/UF/Page/ProfileTemplates.tpl @@ -27,7 +27,7 @@
{ts}Contact Type{/ts}: - @@ -35,8 +35,8 @@
- - X + +
{ts}Open All{/ts}  |  {ts}Close All{/ts} -- 2.25.1