projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7deea51)
CRM-13497 - Move rows and cols
authorlynndanzig <lynndanzig@btinternet.com>
Sun, 6 Oct 2013 15:12:06 +0000 (16:12 +0100)
committerlynndanzig <lynndanzig@btinternet.com>
Sun, 6 Oct 2013 15:12:06 +0000 (16:12 +0100)
24 files changed:
xml/schema/Batch/Batch.xml patch | blob | blame | history
xml/schema/Campaign/Campaign.xml patch | blob | blame | history
xml/schema/Campaign/Survey.xml patch | blob | blame | history
xml/schema/Case/Case.xml patch | blob | blame | history
xml/schema/Contact/ContactType.xml patch | blob | blame | history
xml/schema/Contact/Group.xml patch | blob | blame | history
xml/schema/Contribute/Contribution.xml patch | blob | blame | history
xml/schema/Contribute/ContributionPage.xml patch | blob | blame | history
xml/schema/Core/CustomGroup.xml patch | blob | blame | history
xml/schema/Core/Domain.xml patch | blob | blame | history
xml/schema/Core/Job.xml patch | blob | blame | history
xml/schema/Core/Note.xml patch | blob | blame | history
xml/schema/Core/OptionValue.xml patch | blob | blame | history
xml/schema/Core/Preferences.xml patch | blob | blame | history
xml/schema/Core/UFGroup.xml patch | blob | blame | history
xml/schema/Event/Event.xml patch | blob | blame | history
xml/schema/Event/EventPage.xml patch | blob | blame | history
xml/schema/Grant/Grant.xml patch | blob | blame | history
xml/schema/Mailing/Component.xml patch | blob | blame | history
xml/schema/Member/MembershipType.xml patch | blob | blame | history
xml/schema/Price/PriceField.xml patch | blob | blame | history
xml/schema/Price/PriceSet.xml patch | blob | blame | history
xml/schema/Report/Instance.xml patch | blob | blame | history
xml/schema/SMS/History.xml patch | blob | blame | history

diff --git a/xml/schema/Batch/Batch.xml b/xml/schema/Batch/Batch.xml
index 9e744925a76737cd87498c44e94bb7a9bdf4460e..85523e81862250569f8dd31fb427c4f4c2a33b47 100644 (file)
--- a/xml/schema/Batch/Batch.xml
+++ b/xml/schema/Batch/Batch.xml
@@ -54,10 +54,9 @@
     <localizable>true</localizable>
     <html>
       <type>TextArea</type>
+      <rows>4</rows>
+      <cols>80</cols>
     </html>
-
-    <rows>4</rows>
-    <cols>80</cols>
     <add>3.3</add>
   </field>
   <field>
diff --git a/xml/schema/Campaign/Campaign.xml b/xml/schema/Campaign/Campaign.xml
index 5a1c89d1667ec6fb0f76aac5262c71eac43faff4..a5c6ab0a3ff311c20a4ad914f655aec37a5354ae 100644 (file)
--- a/xml/schema/Campaign/Campaign.xml
+++ b/xml/schema/Campaign/Campaign.xml
@@ -54,8 +54,8 @@
       <html>
         <type>TextArea</type>
         <rows>8</rows>
+        <cols>60</cols>
       </html>
-      <cols>60</cols>
       <comment>Full description of Campaign.</comment>
       <add>3.3</add>
   </field>
diff --git a/xml/schema/Campaign/Survey.xml b/xml/schema/Campaign/Survey.xml
index 092757c89ea69056ae6549a9b56d17ed6f4fe3fb..0068aabefa695ccbe9cb68ba637070c93bb024f2 100644 (file)
--- a/xml/schema/Campaign/Survey.xml
+++ b/xml/schema/Campaign/Survey.xml
@@ -68,10 +68,9 @@
     <comment>Recontact intervals for each status.</comment>
     <html>
       <type>TextArea</type>
+      <rows>20</rows>
+      <cols>80</cols>
     </html>
-
-    <rows>20</rows>
-    <cols>80</cols>
     <add>3.3</add>
   </field>
 
@@ -81,10 +80,9 @@
     <comment>Script instructions for volunteers to use for the survey.</comment>
     <html>
       <type>TextArea</type>
+      <rows>20</rows>
+      <cols>80</cols>
     </html>
-
-    <rows>20</rows>
-    <cols>80</cols>
     <add>3.3</add>
   </field>
 
@@ -202,10 +200,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>8</rows>
+      <cols>60</cols>
     </html>
-
-    <rows>8</rows>
-    <cols>60</cols>
     <localizable>true</localizable>
     <comment>text and html allowed. displayed above result on success page</comment>
     <add>4.2</add>
diff --git a/xml/schema/Case/Case.xml b/xml/schema/Case/Case.xml
index 57695fc2ba0ead0d85f25c6e6a5b20a31e3fff5b..0227e20664477727749cb6b201b5dcd0018c68a5 100644 (file)
--- a/xml/schema/Case/Case.xml
+++ b/xml/schema/Case/Case.xml
@@ -134,10 +134,9 @@
       <type>text</type>
       <html>
         <type>TextArea</type>
+        <rows>8</rows>
+        <cols>60</cols>
       </html>
-
-      <rows>8</rows>
-      <cols>60</cols>
       <comment>Details about the meeting (agenda, notes, etc).</comment>
       <add>1.8</add>
   </field>
diff --git a/xml/schema/Contact/ContactType.xml b/xml/schema/Contact/ContactType.xml
index 4b6a113abc9eb687d3570211cb89456eb1c97d7b..79582abbf2510468315bb1bc8fbbcb8d7be7ce75 100644 (file)
--- a/xml/schema/Contact/ContactType.xml
+++ b/xml/schema/Contact/ContactType.xml
@@ -43,10 +43,9 @@
        <type>text</type>
        <html>
          <type>TextArea</type>
+         <rows>2</rows>
+         <cols>60</cols>
        </html>
-
-       <rows>2</rows>
-       <cols>60</cols>
        <comment>localized Optional verbose description of the type.</comment>
        <localizable>true</localizable>
        <add>3.1</add>
diff --git a/xml/schema/Contact/Group.xml b/xml/schema/Contact/Group.xml
index 2235c773ed76413664f0043c266f7e5501b16a7f..4f425fe53a3d2612e219663726d18ae3c75ce26b 100644 (file)
--- a/xml/schema/Contact/Group.xml
+++ b/xml/schema/Contact/Group.xml
@@ -42,10 +42,9 @@
        <title>Group Description</title>
        <html>
          <type>TextArea</type>
+         <rows>2</rows>
+         <cols>60</cols>
        </html>
-
-       <rows>2</rows>
-       <cols>60</cols>
        <comment>Optional verbose description of the group.</comment>
        <add>1.1</add>
   </field>
diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml
index 54bee24fbd8af96bf2a6af7f9948b12e33ce9c50..902ddf529d7a434d66236c0a213262e7d9d11f57 100644 (file)
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@ -270,10 +270,9 @@
     <comment>Note and/or Comment.</comment>
     <html>
       <type>TextArea</type>
+      <rows>4</rows>
+      <cols>80</cols>
     </html>
-
-    <rows>4</rows>
-    <cols>80</cols>
     <import>true</import>
     <headerPattern>/Note|Comment/i</headerPattern>
     <dataPattern>//</dataPattern>
diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml
index 89cbe86883e84af4f96f18ff87570d5f3cdaf468..eede149bf4ef0c4478241d07841bff279671ebcc 100644 (file)
--- a/xml/schema/Contribute/ContributionPage.xml
+++ b/xml/schema/Contribute/ContributionPage.xml
@@ -31,10 +31,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <localizable>true</localizable>
     <comment>Text and html allowed. Displayed below title.</comment>
     <add>1.3</add>
@@ -226,10 +225,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>8</rows>
+      <cols>60</cols>
     </html>
-
-    <rows>8</rows>
-    <cols>60</cols>
     <localizable>true</localizable>
     <comment>text and html allowed. displayed above result on success page</comment>
     <add>1.3</add>
@@ -240,10 +238,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>8</rows>
+      <cols>60</cols>
     </html>
-
-    <rows>8</rows>
-    <cols>60</cols>
     <localizable>true</localizable>
     <comment>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.</comment>
     <add>1.3</add>
@@ -261,10 +258,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>2</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>2</rows>
-    <cols>50</cols>
     <localizable>true</localizable>
     <comment>This text field is shown when is_for_organization is checked. For example - I am contributing on behalf on an organization.</comment>
     <add>2.1</add>
@@ -310,10 +306,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <localizable>true</localizable>
     <comment>text to include above standard receipt info on receipt email. emails are text-only, so do not allow html for now</comment>
     <add>1.3</add>
@@ -329,10 +324,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <localizable>true</localizable>
     <comment>Text and html allowed. Displayed at the bottom of the first page of the contribution wizard.</comment>
     <add>1.4</add>
@@ -363,10 +357,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>2</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>2</rows>
-    <cols>50</cols>
     <localizable>true</localizable>
     <comment>text for honor block.</comment>
     <add>1.5</add>
diff --git a/xml/schema/Core/CustomGroup.xml b/xml/schema/Core/CustomGroup.xml
index 4d814336d0e0b275420ce164f469692b1836c7dd..3ccd747fad67d82275ea5abbda3be7eb8824c596 100644 (file)
--- a/xml/schema/Core/CustomGroup.xml
+++ b/xml/schema/Core/CustomGroup.xml
@@ -86,11 +86,10 @@
      <comment>Description and/or help text to display before fields in form.</comment>
      <html>
        <type>TextArea</type>
+       <rows>4</rows>
+       <cols>80</cols>
      </html>
-
-     <rows>4</rows>
-     <cols>80</cols>
-       <add>1.1</add>
+     <add>1.1</add>
   </field>
   <field>
      <name>help_post</name>
@@ -99,10 +98,9 @@
      <comment>Description and/or help text to display after fields in form.</comment>
      <html>
        <type>TextArea</type>
+       <rows>4</rows>
+       <cols>80</cols>
      </html>
-
-     <rows>4</rows>
-     <cols>80</cols>
      <add>1.1</add>
   </field>
   <field>
diff --git a/xml/schema/Core/Domain.xml b/xml/schema/Core/Domain.xml
index 98f7c1811b880c69dc935b9121b1cb4b3b4cf957..0c835ac6058373e3b354c4a9ea6ed74c638cbe64 100644 (file)
--- a/xml/schema/Core/Domain.xml
+++ b/xml/schema/Core/Domain.xml
@@ -83,10 +83,9 @@
     <comment>Backend configuration.</comment>
     <html>
       <type>TextArea</type>
+      <rows>20</rows>
+      <cols>80</cols>
     </html>
-
-    <rows>20</rows>
-    <cols>80</cols>
     <add>1.6</add>
   </field>
   <field>
@@ -127,10 +126,9 @@
     <comment>Locale specific string overrides</comment>
     <html>
       <type>TextArea</type>
+      <rows>20</rows>
+      <cols>80</cols>
     </html>
-
-    <rows>20</rows>
-    <cols>80</cols>
     <add>3.2</add>
   </field>
 </table>
diff --git a/xml/schema/Core/Job.xml b/xml/schema/Core/Job.xml
index 004b759d7953e811c7e1a689e7125f750e315c23..71561a5cbd5dccdd230dc9224d568fc4367b3504 100644 (file)
--- a/xml/schema/Core/Job.xml
+++ b/xml/schema/Core/Job.xml
@@ -89,10 +89,9 @@
        <comment>List of parameters to the command.</comment>
        <html>
          <type>TextArea</type>
+         <rows>4</rows>
+         <cols>60</cols>
        </html>
-
-       <rows>4</rows>
-       <cols>60</cols>
        <add>4.1</add>
   </field>
   <field>
diff --git a/xml/schema/Core/Note.xml b/xml/schema/Core/Note.xml
index 5768336ec595ec71fd8d29dde01ef0629ddb00cb..9b6e0dba3582f012f59dc88a780a51e8324eb710 100644 (file)
--- a/xml/schema/Core/Note.xml
+++ b/xml/schema/Core/Note.xml
@@ -50,10 +50,9 @@
        <comment>Note and/or Comment.</comment>
        <html>
          <type>TextArea</type>
+         <rows>4</rows>
+         <cols>60</cols>
        </html>
-
-       <rows>4</rows>
-       <cols>60</cols>
        <import>true</import>
        <headerPattern>/Note|Comment/i</headerPattern>
        <dataPattern>//</dataPattern>
diff --git a/xml/schema/Core/OptionValue.xml b/xml/schema/Core/OptionValue.xml
index 6decd723707ac4609f1465d9e59e3704adb4b949..d6a1347fbe73a6c0dcc8c51f543d80afe9172df9 100644 (file)
--- a/xml/schema/Core/OptionValue.xml
+++ b/xml/schema/Core/OptionValue.xml
@@ -98,10 +98,9 @@
        <type>text</type>
        <html>
          <type>TextArea</type>
+         <rows>8</rows>
+         <cols>60</cols>
        </html>
-
-       <rows>8</rows>
-       <cols>60</cols>
        <localizable>true</localizable>
        <comment>Optional description.</comment>
        <add>1.5</add>
diff --git a/xml/schema/Core/Preferences.xml b/xml/schema/Core/Preferences.xml
index 26aff6e65b56e8cfb27a7b208af3005cb9fe1cd9..22e3b055f9a1dbc22caddff8b2b9d03903840195 100644 (file)
--- a/xml/schema/Core/Preferences.xml
+++ b/xml/schema/Core/Preferences.xml
@@ -183,10 +183,9 @@
        <comment>Smtp Backend configuration.</comment>
        <html>
          <type>TextArea</type>
+         <rows>20</rows>
+         <cols>80</cols>
        </html>
-
-       <rows>20</rows>
-       <cols>80</cols>
        <add>2.2</add>
   </field>
   <field>
diff --git a/xml/schema/Core/UFGroup.xml b/xml/schema/Core/UFGroup.xml
index a854bdbc2d155f223b99eb9a8ee759ed3f7eca42..19db8bf78942ab88ea546c9dd54b2cd6b9f5d156 100644 (file)
--- a/xml/schema/Core/UFGroup.xml
+++ b/xml/schema/Core/UFGroup.xml
@@ -55,10 +55,9 @@
        <title>Profile Description</title>
        <html>
          <type>TextArea</type>
+         <rows>2</rows>
+         <cols>60</cols>
        </html>
-
-       <rows>2</rows>
-       <cols>60</cols>
        <comment>Optional verbose description of the profile.</comment>
        <add>4.4</add>
   </field>
@@ -77,10 +76,9 @@
      <comment>Description and/or help text to display before fields in form.</comment>
      <html>
        <type>TextArea</type>
+       <rows>4</rows>
+       <cols>80</cols>
      </html>
-
-     <rows>4</rows>
-     <cols>80</cols>
      <add>1.2</add>
   </field>
   <field>
@@ -90,10 +88,9 @@
      <comment>Description and/or help text to display after fields in form.</comment>
      <html>
        <type>TextArea</type>
+       <rows>4</rows>
+       <cols>80</cols>
      </html>
-
-     <rows>4</rows>
-     <cols>80</cols>
      <add>1.2</add>
   </field>
   <field>
diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml
index f2caa9a1d615a982713351b72e47fdfa86eca79d..6be7c1b90109f8dcedcd8aacf27bf28ebb5ebe67 100644 (file)
--- a/xml/schema/Event/Event.xml
+++ b/xml/schema/Event/Event.xml
@@ -36,10 +36,9 @@
     <title>Event Summary</title>
     <html>
       <type>TextArea</type>
+      <rows>4</rows>
+      <cols>60</cols>
     </html>
-
-    <rows>4</rows>
-    <cols>60</cols>
     <localizable>true</localizable>
     <comment>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.</comment>
     <add>1.7</add>
@@ -51,10 +50,9 @@
     <title>Event Description</title>
     <html>
       <type>TextArea</type>
+      <rows>8</rows>
+      <cols>60</cols>
     </html>
-
-    <rows>8</rows>
-    <cols>60</cols>
     <localizable>true</localizable>
     <comment>Full description of event. Text and html allowed. Displayed on built-in Event Information screens.</comment>
     <add>1.7</add>
@@ -161,10 +159,9 @@
     <title>Event Information</title>
     <html>
       <type>TextArea</type>
+      <rows>4</rows>
+      <cols>60</cols>
     </html>
-
-    <rows>4</rows>
-    <cols>60</cols>
     <localizable>true</localizable>
     <comment>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.</comment>
     <add>1.7</add>
@@ -263,10 +260,9 @@
     <type>varchar</type>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <length>255</length>
     <comment>Receipt Text for off-line event participation</comment>
     <add>2.0</add>
@@ -287,10 +283,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <title>Introductory Message</title>
     <localizable>true</localizable>
     <comment>Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.</comment>
@@ -302,10 +297,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <localizable>true</localizable>
     <comment>Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.</comment>
     <add>1.7</add>
@@ -325,10 +319,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <title>Confirm Text</title>
     <localizable>true</localizable>
     <comment>Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.</comment>
@@ -340,10 +333,9 @@
     <title>Footer Text</title>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <localizable>true</localizable>
     <comment>Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.</comment>
     <add>1.7</add>
@@ -362,10 +354,9 @@
     <title>Confirmation Email Text</title>
     <html>
       <type>TextArea</type>
+      <rows>4</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>4</rows>
-    <cols>50</cols>
     <localizable>true</localizable>
     <comment>text to include above standard event info on confirmation email. emails are text-only, so do not allow html for now</comment>
     <add>1.7</add>
@@ -430,10 +421,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <title>ThankYou Text</title>
     <localizable>true</localizable>
     <comment>ThankYou Text.</comment>
@@ -445,10 +435,9 @@
     <title>Footer Text</title>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <localizable>true</localizable>
     <comment>Footer message.</comment>
     <add>1.7</add>
@@ -549,10 +538,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>4</rows>
+      <cols>60</cols>
     </html>
-
-    <rows>4</rows>
-    <cols>60</cols>
     <localizable>true</localizable>
     <comment>Text to display when the event is full, but participants can signup for a waitlist.</comment>
     <add>3.0</add>
@@ -562,10 +550,9 @@
     <type>text</type>
     <html>
       <type>TextArea</type>
+      <rows>4</rows>
+      <cols>60</cols>
     </html>
-
-    <rows>4</rows>
-    <cols>60</cols>
     <localizable>true</localizable>
     <comment>Text to display when the approval is required to complete registration for an event.</comment>
     <add>3.0</add>
diff --git a/xml/schema/Event/EventPage.xml b/xml/schema/Event/EventPage.xml
index 482028aef5ec86e70bb05df2e22372c032a0553e..e653f2b1fd029fa2b999e9e304ace501143cd694 100644 (file)
--- a/xml/schema/Event/EventPage.xml
+++ b/xml/schema/Event/EventPage.xml
@@ -35,10 +35,9 @@
       <type>text</type>
       <html>
         <type>TextArea</type>
+        <rows>6</rows>
+        <cols>50</cols>
       </html>
-
-      <rows>6</rows>
-      <cols>50</cols>
       <title>Introductory Message</title>
       <localizable>true</localizable>
       <comment>Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.</comment>
@@ -50,10 +49,9 @@
       <type>text</type>
       <html>
         <type>TextArea</type>
+        <rows>6</rows>
+        <cols>50</cols>
       </html>
-
-      <rows>6</rows>
-      <cols>50</cols>
       <localizable>true</localizable>
       <comment>Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.</comment>
       <add>1.7</add>
@@ -73,10 +71,9 @@
       <type>text</type>
       <html>
         <type>TextArea</type>
+        <rows>6</rows>
+        <cols>50</cols>
       </html>
-
-      <rows>6</rows>
-      <cols>50</cols>
       <title>Confirm Text</title>
       <localizable>true</localizable>
       <comment>Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.</comment>
@@ -88,10 +85,9 @@
       <title>Footer Text</title>
       <html>
         <type>TextArea</type>
+        <rows>6</rows>
+        <cols>50</cols>
       </html>
-
-      <rows>6</rows>
-      <cols>50</cols>
       <localizable>true</localizable>
       <comment>Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.</comment>
       <add>1.7</add>
@@ -110,10 +106,9 @@
       <title>Confirmation Email Text</title>
       <html>
         <type>TextArea</type>
+        <rows>4</rows>
+        <cols>50</cols>
       </html>
-
-      <rows>4</rows>
-      <cols>50</cols>
       <localizable>true</localizable>
       <comment>text to include above standard event info on confirmation email. emails are text-only, so do not allow html for now</comment>
       <add>1.7</add>
@@ -176,10 +171,9 @@
       <type>text</type>
       <html>
         <type>TextArea</type>
+        <rows>6</rows>
+        <cols>50</cols>
       </html>
-
-      <rows>6</rows>
-      <cols>50</cols>
       <title>ThankYou Text</title>
       <localizable>true</localizable>
       <comment>ThankYou Text.</comment>
@@ -191,10 +185,9 @@
       <title>Footer Text</title>
       <html>
         <type>TextArea</type>
+        <rows>6</rows>
+        <cols>50</cols>
       </html>
-
-      <rows>6</rows>
-      <cols>50</cols>
       <localizable>true</localizable>
       <comment>Footer message.</comment>
       <add>1.7</add>
diff --git a/xml/schema/Grant/Grant.xml b/xml/schema/Grant/Grant.xml
index 35db234ea79c2ff470cd6f8ea68454126dbeec01..273b5054f8b956d665bd662014fc31f366b736d3 100644 (file)
--- a/xml/schema/Grant/Grant.xml
+++ b/xml/schema/Grant/Grant.xml
@@ -154,10 +154,9 @@
     <comment>Grant rationale.</comment>
     <html>
       <type>TextArea</type>
+      <rows>4</rows>
+      <cols>60</cols>
     </html>
-
-    <rows>4</rows>
-    <cols>60</cols>
     <import>true</import>
     <add>1.8</add>
   </field>
diff --git a/xml/schema/Mailing/Component.xml b/xml/schema/Mailing/Component.xml
index 958e930b1327f44a179fdc1ef145993eb1fcae9c..f3084ad590f6586cb1d96c80fed0cd8d8653f07c 100644 (file)
--- a/xml/schema/Mailing/Component.xml
+++ b/xml/schema/Mailing/Component.xml
@@ -38,22 +38,20 @@
        <comment>Body of the component in html format.</comment>
        <html>
          <type>TextArea</type>
+         <rows>8</rows>
+         <cols>80</cols>
        </html>
-
-       <rows>8</rows>
-       <cols>80</cols>
-  </field>
+       </field>
   <field>
        <name>body_text</name>
        <type>text</type>
        <comment>Body of the component in text format.</comment>
        <html>
          <type>TextArea</type>
+         <rows>8</rows>
+         <cols>80</cols>
        </html>
-
-       <rows>8</rows>
-       <cols>80</cols>
-  </field>
+       </field>
   <field>
        <name>is_default</name>
        <type>boolean</type>
diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml
index 2b7aa8a150b30f6f120cbc52f81147e4f63f3981..2493b6fd4735db492ab57cd07caa8e7c5ca662bb 100644 (file)
--- a/xml/schema/Member/MembershipType.xml
+++ b/xml/schema/Member/MembershipType.xml
@@ -47,10 +47,9 @@
     <type>varchar</type>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <length>255</length>
     <localizable>true</localizable>
     <comment>Description of Membership Type</comment>
@@ -189,10 +188,9 @@
     <type>varchar</type>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <length>255</length>
     <comment>Receipt Text for membership signup</comment>
     <add>2.0</add>
@@ -202,10 +200,9 @@
     <type>varchar</type>
     <html>
       <type>TextArea</type>
+      <rows>6</rows>
+      <cols>50</cols>
     </html>
-
-    <rows>6</rows>
-    <cols>50</cols>
     <length>255</length>
     <comment>Receipt Text for membership renewal</comment>
     <add>2.0</add>
diff --git a/xml/schema/Price/PriceField.xml b/xml/schema/Price/PriceField.xml
index afafadffd38e5d7446a36543c0442c6d995fd654..a1af3bf18ae48bd3eaf4d497de6013b761d132a8 100644 (file)
--- a/xml/schema/Price/PriceField.xml
+++ b/xml/schema/Price/PriceField.xml
@@ -75,10 +75,9 @@
       <comment>Description and/or help text to display before this field.</comment>
       <html>
         <type>TextArea</type>
+        <rows>4</rows>
+        <cols>80</cols>
       </html>
-
-      <rows>4</rows>
-      <cols>80</cols>
       <add>1.8</add>
   </field>
   <field>
@@ -88,10 +87,9 @@
       <comment>Description and/or help text to display after this field.</comment>
       <html>
         <type>TextArea</type>
+        <rows>4</rows>
+        <cols>80</cols>
       </html>
-
-      <rows>4</rows>
-      <cols>80</cols>
       <add>1.8</add>
   </field>
   <field>
diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml
index d02c472621e5d6758b4e158694060433f2b63250..894b212fa28841bbe0b63b016141d5ae1f466380 100644 (file)
--- a/xml/schema/Price/PriceSet.xml
+++ b/xml/schema/Price/PriceSet.xml
@@ -66,10 +66,9 @@
     <comment>Description and/or help text to display before fields in form.</comment>
     <html>
       <type>TextArea</type>
+      <rows>4</rows>
+      <cols>80</cols>
     </html>
-
-    <rows>4</rows>
-    <cols>80</cols>
     <add>1.8</add>
   </field>
   <field>
@@ -79,10 +78,9 @@
     <comment>Description and/or help text to display after fields in form.</comment>
     <html>
       <type>TextArea</type>
+      <rows>4</rows>
+      <cols>80</cols>
     </html>
-
-    <rows>4</rows>
-    <cols>80</cols>
     <add>1.8</add>
   </field>
   <field>
diff --git a/xml/schema/Report/Instance.xml b/xml/schema/Report/Instance.xml
index f33b657b97f51b58a9893fc892aa7fdc869b8f96..24dcb9fecbac0ec8ebb0cc11c72e6fd5224e51c7 100644 (file)
--- a/xml/schema/Report/Instance.xml
+++ b/xml/schema/Report/Instance.xml
@@ -132,10 +132,9 @@
       <comment>comma-separated list of email addresses to send the report to</comment>
       <html>
         <type>TextArea</type>
+        <rows>4</rows>
+        <cols>60</cols>
       </html>
-
-      <rows>4</rows>
-      <cols>60</cols>
       <add>2.2</add>
   </field>
   <field>
@@ -145,10 +144,9 @@
       <comment>comma-separated list of email addresses to send the report to</comment>
       <html>
         <type>TextArea</type>
+        <rows>4</rows>
+        <cols>60</cols>
       </html>
-
-      <rows>4</rows>
-      <cols>60</cols>
       <add>2.2</add>
   </field>
   <field>
diff --git a/xml/schema/SMS/History.xml b/xml/schema/SMS/History.xml
index 376d52b7663d187e31e673afa5a343e784a07491..7ef4ada22e2d5e25717191e157cb72d36d4fdf66 100644 (file)
--- a/xml/schema/SMS/History.xml
+++ b/xml/schema/SMS/History.xml
@@ -24,10 +24,9 @@
        <comment>Contents of the SMS.</comment>
        <html>
          <type>TextArea</type>
+         <rows>5</rows>
+         <cols>80</cols>
        </html>
-
-       <rows>5</rows>
-       <cols>80</cols>
        <add>1.4</add>
   </field>
   <field>