Merge pull request #71 from SalesforceFoundation/feature/xinnanli/typ…

…eOfSchool Add type of school to education institution layout
SalesforceFoundation · Oct 8, 2019 · e26cdbf · e26cdbf
2 parents 4255bb7 + 4a16479
commit e26cdbf
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 20 deletions.
diff --git a/src/objectTranslations/Account-ca.objectTranslation b/src/objectTranslations/Account-ca.objectTranslation
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomObjectTranslation xmlns="http://soap.sforce.com/2006/04/metadata">
     <fields>
-        <help><!-- Indicates that this Educational Institution provides elementary school services and curriculum. --></help>
         <label><!-- Elementary School --></label>
         <name>Elementary_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides high school services and curriculum. --></help>
         <label><!-- High School --></label>
         <name>High_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides middle school services and curriculum. --></help>
         <label><!-- Middle School --></label>
         <name>Middle_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides Pre-K services and curriculum. --></help>
         <label><!-- Pre-school --></label>
         <name>Pre_school__c</name>
     </fields>

diff --git a/src/objectTranslations/Account-en_US.objectTranslation b/src/objectTranslations/Account-en_US.objectTranslation
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomObjectTranslation xmlns="http://soap.sforce.com/2006/04/metadata">
     <fields>
-        <help><!-- Indicates that this Educational Institution provides elementary school services and curriculum. --></help>
         <label><!-- Elementary School --></label>
         <name>Elementary_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides high school services and curriculum. --></help>
         <label><!-- High School --></label>
         <name>High_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides middle school services and curriculum. --></help>
         <label><!-- Middle School --></label>
         <name>Middle_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides Pre-K services and curriculum. --></help>
         <label><!-- Pre-school --></label>
         <name>Pre_school__c</name>
     </fields>

diff --git a/src/objectTranslations/Account-es.objectTranslation b/src/objectTranslations/Account-es.objectTranslation
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomObjectTranslation xmlns="http://soap.sforce.com/2006/04/metadata">
     <fields>
-        <help><!-- Indicates that this Educational Institution provides elementary school services and curriculum. --></help>
         <label><!-- Elementary School --></label>
         <name>Elementary_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides high school services and curriculum. --></help>
         <label><!-- High School --></label>
         <name>High_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides middle school services and curriculum. --></help>
         <label><!-- Middle School --></label>
         <name>Middle_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides Pre-K services and curriculum. --></help>
         <label><!-- Pre-school --></label>
         <name>Pre_school__c</name>
     </fields>

diff --git a/src/objectTranslations/Account-fr.objectTranslation b/src/objectTranslations/Account-fr.objectTranslation
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomObjectTranslation xmlns="http://soap.sforce.com/2006/04/metadata">
     <fields>
-        <help><!-- Indicates that this Educational Institution provides elementary school services and curriculum. --></help>
         <label><!-- Elementary School --></label>
         <name>Elementary_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides high school services and curriculum. --></help>
         <label><!-- High School --></label>
         <name>High_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides middle school services and curriculum. --></help>
         <label><!-- Middle School --></label>
         <name>Middle_School__c</name>
     </fields>
     <fields>
-        <help><!-- Indicates that this Educational Institution provides Pre-K services and curriculum. --></help>
         <label><!-- Pre-school --></label>
         <name>Pre_school__c</name>
     </fields>

diff --git a/src/objects/Account.object b/src/objects/Account.object
@@ -5,7 +5,6 @@
         <defaultValue>false</defaultValue>
         <description>Indicates that this Educational Institution provides elementary school services and curriculum.</description>
         <externalId>false</externalId>
-        <inlineHelpText>Indicates that this Educational Institution provides elementary school services and curriculum.</inlineHelpText>
         <label>Elementary School</label>
         <trackFeedHistory>false</trackFeedHistory>
         <type>Checkbox</type>
@@ -15,7 +14,6 @@
         <defaultValue>false</defaultValue>
         <description>Indicates that this Educational Institution provides high school services and curriculum.</description>
         <externalId>false</externalId>
-        <inlineHelpText>Indicates that this Educational Institution provides high school services and curriculum.</inlineHelpText>
         <label>High School</label>
         <trackFeedHistory>false</trackFeedHistory>
         <type>Checkbox</type>
@@ -25,7 +23,6 @@
         <defaultValue>false</defaultValue>
         <description>Indicates that this Educational Institution provides middle school services and curriculum.</description>
         <externalId>false</externalId>
-        <inlineHelpText>Indicates that this Educational Institution provides middle school services and curriculum.</inlineHelpText>
         <label>Middle School</label>
         <trackFeedHistory>false</trackFeedHistory>
         <type>Checkbox</type>
@@ -35,7 +32,6 @@
         <defaultValue>false</defaultValue>
         <description>Indicates that this Educational Institution provides Pre-K services and curriculum.</description>
         <externalId>false</externalId>
-        <inlineHelpText>Indicates that this Educational Institution provides Pre-K services and curriculum.</inlineHelpText>
         <label>Pre-school</label>
         <trackFeedHistory>false</trackFeedHistory>
         <type>Checkbox</type>

diff --git a/unpackaged/post/config/layouts/Account-K12 Educational Institution Layout.layout b/unpackaged/post/config/layouts/Account-K12 Educational Institution Layout.layout
@@ -34,6 +34,33 @@
         </layoutColumns>
         <style>TwoColumnsLeftToRight</style>
     </layoutSections>
+    <layoutSections>
+        <customLabel>true</customLabel>
+        <detailHeading>true</detailHeading>
+        <editHeading>true</editHeading>
+        <label>Type of School</label>
+        <layoutColumns>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>Pre_school__c</field>
+            </layoutItems>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>Middle_School__c</field>
+            </layoutItems>
+        </layoutColumns>
+        <layoutColumns>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>Elementary_School__c</field>
+            </layoutItems>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>High_School__c</field>
+            </layoutItems>
+        </layoutColumns>
+        <style>TwoColumnsLeftToRight</style>
+    </layoutSections>
     <layoutSections>
         <customLabel>true</customLabel>
         <detailHeading>true</detailHeading>