From 817807abb2afeac08e5cde5faea4d0a8c1da841a Mon Sep 17 00:00:00 2001 From: lynndanzig Date: Sun, 6 Oct 2013 16:12:06 +0100 Subject: [PATCH] CRM-13497 - Move rows and cols --- xml/schema/Batch/Batch.xml | 5 +- xml/schema/Campaign/Campaign.xml | 2 +- xml/schema/Campaign/Survey.xml | 15 ++--- xml/schema/Case/Case.xml | 5 +- xml/schema/Contact/ContactType.xml | 5 +- xml/schema/Contact/Group.xml | 5 +- xml/schema/Contribute/Contribution.xml | 5 +- xml/schema/Contribute/ContributionPage.xml | 35 +++++------- xml/schema/Core/CustomGroup.xml | 12 ++-- xml/schema/Core/Domain.xml | 10 ++-- xml/schema/Core/Job.xml | 5 +- xml/schema/Core/Note.xml | 5 +- xml/schema/Core/OptionValue.xml | 5 +- xml/schema/Core/Preferences.xml | 5 +- xml/schema/Core/UFGroup.xml | 15 ++--- xml/schema/Event/Event.xml | 65 +++++++++------------- xml/schema/Event/EventPage.xml | 35 +++++------- xml/schema/Grant/Grant.xml | 5 +- xml/schema/Mailing/Component.xml | 14 ++--- xml/schema/Member/MembershipType.xml | 15 ++--- xml/schema/Price/PriceField.xml | 10 ++-- xml/schema/Price/PriceSet.xml | 10 ++-- xml/schema/Report/Instance.xml | 10 ++-- xml/schema/SMS/History.xml | 5 +- 24 files changed, 122 insertions(+), 181 deletions(-) diff --git a/xml/schema/Batch/Batch.xml b/xml/schema/Batch/Batch.xml index 9e744925a7..85523e8186 100644 --- a/xml/schema/Batch/Batch.xml +++ b/xml/schema/Batch/Batch.xml @@ -54,10 +54,9 @@ true TextArea + 4 + 80 - - 4 - 80 3.3 diff --git a/xml/schema/Campaign/Campaign.xml b/xml/schema/Campaign/Campaign.xml index 5a1c89d166..a5c6ab0a3f 100644 --- a/xml/schema/Campaign/Campaign.xml +++ b/xml/schema/Campaign/Campaign.xml @@ -54,8 +54,8 @@ TextArea 8 + 60 - 60 Full description of Campaign. 3.3 diff --git a/xml/schema/Campaign/Survey.xml b/xml/schema/Campaign/Survey.xml index 092757c89e..0068aabefa 100644 --- a/xml/schema/Campaign/Survey.xml +++ b/xml/schema/Campaign/Survey.xml @@ -68,10 +68,9 @@ Recontact intervals for each status. TextArea + 20 + 80 - - 20 - 80 3.3 @@ -81,10 +80,9 @@ Script instructions for volunteers to use for the survey. TextArea + 20 + 80 - - 20 - 80 3.3 @@ -202,10 +200,9 @@ text TextArea + 8 + 60 - - 8 - 60 true text and html allowed. displayed above result on success page 4.2 diff --git a/xml/schema/Case/Case.xml b/xml/schema/Case/Case.xml index 57695fc2ba..0227e20664 100644 --- a/xml/schema/Case/Case.xml +++ b/xml/schema/Case/Case.xml @@ -134,10 +134,9 @@ text TextArea + 8 + 60 - - 8 - 60 Details about the meeting (agenda, notes, etc). 1.8 diff --git a/xml/schema/Contact/ContactType.xml b/xml/schema/Contact/ContactType.xml index 4b6a113abc..79582abbf2 100644 --- a/xml/schema/Contact/ContactType.xml +++ b/xml/schema/Contact/ContactType.xml @@ -43,10 +43,9 @@ text TextArea + 2 + 60 - - 2 - 60 localized Optional verbose description of the type. true 3.1 diff --git a/xml/schema/Contact/Group.xml b/xml/schema/Contact/Group.xml index 2235c773ed..4f425fe53a 100644 --- a/xml/schema/Contact/Group.xml +++ b/xml/schema/Contact/Group.xml @@ -42,10 +42,9 @@ Group Description TextArea + 2 + 60 - - 2 - 60 Optional verbose description of the group. 1.1 diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml index 54bee24fbd..902ddf529d 100644 --- a/xml/schema/Contribute/Contribution.xml +++ b/xml/schema/Contribute/Contribution.xml @@ -270,10 +270,9 @@ Note and/or Comment. TextArea + 4 + 80 - - 4 - 80 true /Note|Comment/i // diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml index 89cbe86883..eede149bf4 100644 --- a/xml/schema/Contribute/ContributionPage.xml +++ b/xml/schema/Contribute/ContributionPage.xml @@ -31,10 +31,9 @@ text TextArea + 6 + 50 - - 6 - 50 true Text and html allowed. Displayed below title. 1.3 @@ -226,10 +225,9 @@ text TextArea + 8 + 60 - - 8 - 60 true text and html allowed. displayed above result on success page 1.3 @@ -240,10 +238,9 @@ text TextArea + 8 + 60 - - 8 - 60 true Text and html allowed. displayed at the bottom of the success page. Common usage is to include link(s) to other pages such as tell-a-friend, etc. 1.3 @@ -261,10 +258,9 @@ text TextArea + 2 + 50 - - 2 - 50 true This text field is shown when is_for_organization is checked. For example - I am contributing on behalf on an organization. 2.1 @@ -310,10 +306,9 @@ text TextArea + 6 + 50 - - 6 - 50 true text to include above standard receipt info on receipt email. emails are text-only, so do not allow html for now 1.3 @@ -329,10 +324,9 @@ text TextArea + 6 + 50 - - 6 - 50 true Text and html allowed. Displayed at the bottom of the first page of the contribution wizard. 1.4 @@ -363,10 +357,9 @@ text TextArea + 2 + 50 - - 2 - 50 true text for honor block. 1.5 diff --git a/xml/schema/Core/CustomGroup.xml b/xml/schema/Core/CustomGroup.xml index 4d814336d0..3ccd747fad 100644 --- a/xml/schema/Core/CustomGroup.xml +++ b/xml/schema/Core/CustomGroup.xml @@ -86,11 +86,10 @@ Description and/or help text to display before fields in form. TextArea + 4 + 80 - - 4 - 80 - 1.1 + 1.1 help_post @@ -99,10 +98,9 @@ Description and/or help text to display after fields in form. TextArea + 4 + 80 - - 4 - 80 1.1 diff --git a/xml/schema/Core/Domain.xml b/xml/schema/Core/Domain.xml index 98f7c1811b..0c835ac605 100644 --- a/xml/schema/Core/Domain.xml +++ b/xml/schema/Core/Domain.xml @@ -83,10 +83,9 @@ Backend configuration. TextArea + 20 + 80 - - 20 - 80 1.6 @@ -127,10 +126,9 @@ Locale specific string overrides TextArea + 20 + 80 - - 20 - 80 3.2 diff --git a/xml/schema/Core/Job.xml b/xml/schema/Core/Job.xml index 004b759d79..71561a5cbd 100644 --- a/xml/schema/Core/Job.xml +++ b/xml/schema/Core/Job.xml @@ -89,10 +89,9 @@ List of parameters to the command. TextArea + 4 + 60 - - 4 - 60 4.1 diff --git a/xml/schema/Core/Note.xml b/xml/schema/Core/Note.xml index 5768336ec5..9b6e0dba35 100644 --- a/xml/schema/Core/Note.xml +++ b/xml/schema/Core/Note.xml @@ -50,10 +50,9 @@ Note and/or Comment. TextArea + 4 + 60 - - 4 - 60 true /Note|Comment/i // diff --git a/xml/schema/Core/OptionValue.xml b/xml/schema/Core/OptionValue.xml index 6decd72370..d6a1347fbe 100644 --- a/xml/schema/Core/OptionValue.xml +++ b/xml/schema/Core/OptionValue.xml @@ -98,10 +98,9 @@ text TextArea + 8 + 60 - - 8 - 60 true Optional description. 1.5 diff --git a/xml/schema/Core/Preferences.xml b/xml/schema/Core/Preferences.xml index 26aff6e65b..22e3b055f9 100644 --- a/xml/schema/Core/Preferences.xml +++ b/xml/schema/Core/Preferences.xml @@ -183,10 +183,9 @@ Smtp Backend configuration. TextArea + 20 + 80 - - 20 - 80 2.2 diff --git a/xml/schema/Core/UFGroup.xml b/xml/schema/Core/UFGroup.xml index a854bdbc2d..19db8bf789 100644 --- a/xml/schema/Core/UFGroup.xml +++ b/xml/schema/Core/UFGroup.xml @@ -55,10 +55,9 @@ Profile Description TextArea + 2 + 60 - - 2 - 60 Optional verbose description of the profile. 4.4 @@ -77,10 +76,9 @@ Description and/or help text to display before fields in form. TextArea + 4 + 80 - - 4 - 80 1.2 @@ -90,10 +88,9 @@ Description and/or help text to display after fields in form. TextArea + 4 + 80 - - 4 - 80 1.2 diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml index f2caa9a1d6..6be7c1b901 100644 --- a/xml/schema/Event/Event.xml +++ b/xml/schema/Event/Event.xml @@ -36,10 +36,9 @@ Event Summary TextArea + 4 + 60 - - 4 - 60 true Brief summary of event. Text and html allowed. Displayed on Event Registration form and can be used on other CMS pages which need an event summary. 1.7 @@ -51,10 +50,9 @@ Event Description TextArea + 8 + 60 - - 8 - 60 true Full description of event. Text and html allowed. Displayed on built-in Event Information screens. 1.7 @@ -161,10 +159,9 @@ Event Information TextArea + 4 + 60 - - 4 - 60 true Message to display on Event Information page and INSTEAD OF Event Registration form if maximum participants are signed up. Can include email address/info about getting on a waiting list, etc. Text and html allowed. 1.7 @@ -263,10 +260,9 @@ varchar TextArea + 6 + 50 - - 6 - 50 255 Receipt Text for off-line event participation 2.0 @@ -287,10 +283,9 @@ text TextArea + 6 + 50 - - 6 - 50 Introductory Message true Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form. @@ -302,10 +297,9 @@ text TextArea + 6 + 50 - - 6 - 50 true Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form. 1.7 @@ -325,10 +319,9 @@ text TextArea + 6 + 50 - - 6 - 50 Confirm Text true Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form. @@ -340,10 +333,9 @@ Footer Text TextArea + 6 + 50 - - 6 - 50 true Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form. 1.7 @@ -362,10 +354,9 @@ Confirmation Email Text TextArea + 4 + 50 - - 4 - 50 true text to include above standard event info on confirmation email. emails are text-only, so do not allow html for now 1.7 @@ -430,10 +421,9 @@ text TextArea + 6 + 50 - - 6 - 50 ThankYou Text true ThankYou Text. @@ -445,10 +435,9 @@ Footer Text TextArea + 6 + 50 - - 6 - 50 true Footer message. 1.7 @@ -549,10 +538,9 @@ text TextArea + 4 + 60 - - 4 - 60 true Text to display when the event is full, but participants can signup for a waitlist. 3.0 @@ -562,10 +550,9 @@ text TextArea + 4 + 60 - - 4 - 60 true Text to display when the approval is required to complete registration for an event. 3.0 diff --git a/xml/schema/Event/EventPage.xml b/xml/schema/Event/EventPage.xml index 482028aef5..e653f2b1fd 100644 --- a/xml/schema/Event/EventPage.xml +++ b/xml/schema/Event/EventPage.xml @@ -35,10 +35,9 @@ text TextArea + 6 + 50 - - 6 - 50 Introductory Message true Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form. @@ -50,10 +49,9 @@ text TextArea + 6 + 50 - - 6 - 50 true Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form. 1.7 @@ -73,10 +71,9 @@ text TextArea + 6 + 50 - - 6 - 50 Confirm Text true Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form. @@ -88,10 +85,9 @@ Footer Text TextArea + 6 + 50 - - 6 - 50 true Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form. 1.7 @@ -110,10 +106,9 @@ Confirmation Email Text TextArea + 4 + 50 - - 4 - 50 true text to include above standard event info on confirmation email. emails are text-only, so do not allow html for now 1.7 @@ -176,10 +171,9 @@ text TextArea + 6 + 50 - - 6 - 50 ThankYou Text true ThankYou Text. @@ -191,10 +185,9 @@ Footer Text TextArea + 6 + 50 - - 6 - 50 true Footer message. 1.7 diff --git a/xml/schema/Grant/Grant.xml b/xml/schema/Grant/Grant.xml index 35db234ea7..273b5054f8 100644 --- a/xml/schema/Grant/Grant.xml +++ b/xml/schema/Grant/Grant.xml @@ -154,10 +154,9 @@ Grant rationale. TextArea + 4 + 60 - - 4 - 60 true 1.8 diff --git a/xml/schema/Mailing/Component.xml b/xml/schema/Mailing/Component.xml index 958e930b13..f3084ad590 100644 --- a/xml/schema/Mailing/Component.xml +++ b/xml/schema/Mailing/Component.xml @@ -38,22 +38,20 @@ Body of the component in html format. TextArea + 8 + 80 - - 8 - 80 - + body_text text Body of the component in text format. TextArea + 8 + 80 - - 8 - 80 - + is_default boolean diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml index 2b7aa8a150..2493b6fd47 100644 --- a/xml/schema/Member/MembershipType.xml +++ b/xml/schema/Member/MembershipType.xml @@ -47,10 +47,9 @@ varchar TextArea + 6 + 50 - - 6 - 50 255 true Description of Membership Type @@ -189,10 +188,9 @@ varchar TextArea + 6 + 50 - - 6 - 50 255 Receipt Text for membership signup 2.0 @@ -202,10 +200,9 @@ varchar TextArea + 6 + 50 - - 6 - 50 255 Receipt Text for membership renewal 2.0 diff --git a/xml/schema/Price/PriceField.xml b/xml/schema/Price/PriceField.xml index afafadffd3..a1af3bf18a 100644 --- a/xml/schema/Price/PriceField.xml +++ b/xml/schema/Price/PriceField.xml @@ -75,10 +75,9 @@ Description and/or help text to display before this field. TextArea + 4 + 80 - - 4 - 80 1.8 @@ -88,10 +87,9 @@ Description and/or help text to display after this field. TextArea + 4 + 80 - - 4 - 80 1.8 diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml index d02c472621..894b212fa2 100644 --- a/xml/schema/Price/PriceSet.xml +++ b/xml/schema/Price/PriceSet.xml @@ -66,10 +66,9 @@ Description and/or help text to display before fields in form. TextArea + 4 + 80 - - 4 - 80 1.8 @@ -79,10 +78,9 @@ Description and/or help text to display after fields in form. TextArea + 4 + 80 - - 4 - 80 1.8 diff --git a/xml/schema/Report/Instance.xml b/xml/schema/Report/Instance.xml index f33b657b97..24dcb9fecb 100644 --- a/xml/schema/Report/Instance.xml +++ b/xml/schema/Report/Instance.xml @@ -132,10 +132,9 @@ comma-separated list of email addresses to send the report to TextArea + 4 + 60 - - 4 - 60 2.2 @@ -145,10 +144,9 @@ comma-separated list of email addresses to send the report to TextArea + 4 + 60 - - 4 - 60 2.2 diff --git a/xml/schema/SMS/History.xml b/xml/schema/SMS/History.xml index 376d52b766..7ef4ada22e 100644 --- a/xml/schema/SMS/History.xml +++ b/xml/schema/SMS/History.xml @@ -24,10 +24,9 @@ Contents of the SMS. TextArea + 5 + 80 - - 5 - 80 1.4 -- 2.25.1