Removed Portal class and almost everything related to portals and flags for NIHVIVO-2248

webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl

@@ -6,29 +6,11 @@
 
     <h2>${title}</h2>
     
-    <p>Thank you for your interest in 
-        <#compress>
-            <#if portalType == "CALSResearch">
-                the Cornell University College of Agriculture and Life Sciences Research Portal
-            <#elseif portalType == "VIVO">
-                VIVO        
-            <#else>
-                the ${siteName} portal
-            </#if>
-        </#compress>. 
+    <p>Thank you for your interest in ${siteName}. 
         Please submit this form with questions, comments, or feedback about the content of this site.
     </p>
         
-    <#if siteName == "CALSResearch" || siteName == "CALSImpact">
-        <p>
-            ${siteName} is a service that depends on regular updates and feedback.
-            Please help us out by providing comments and suggestions for additional content (people, departments, courses, research services, etc.)
-            that you would like to see represented. The reference librarians at Albert R. Mann Library will be in touch with you soon.
-        </p>
-    </#if>
-
     <form name="contact_form" id="contact_form" action="${formAction}" method="post" onsubmit="return ValidateForm('contact_form');">
-        <input type="hidden" name="home" value="${portalId}"/>
         <input type="hidden" name="RequiredFields" value="webusername,webuseremail,s34gfd88p9x1"/>
         <input type="hidden" name="RequiredFieldsNames" value="Name,Email address,Comments"/>
         <input type="hidden" name="EmailFields" value="webuseremail"/>

webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl

@@ -8,15 +8,9 @@
         <h3>Site Configuration</h3>
         
         <ul>
-            <#if siteConfig.urls.portals??>
-                <#if siteConfig.urls.siteInfo??>
-                    <li><a href="${siteConfig.urls.siteInfo}">Current portal information</a></li>
-                </#if>
-                <li><a href="${siteConfig.urls.portals}">List all portals</a></li>
-            <#else>
-                <#if siteConfig.urls.siteInfo??>
-                    <li><a href="${siteConfig.urls.siteInfo}">Site information</a></li>
-                </#if>
+
+            <#if siteConfig.urls.siteInfo??>
+                <li><a href="${siteConfig.urls.siteInfo}">Site information</a></li>
             </#if>
             
             <#if siteConfig.urls.menuN3Editor??>

webapp/web/templates/freemarker/page/partials/identity.ftl

@@ -32,16 +32,6 @@
             <legend>Search form</legend>
             
             <form id="search-form" action="${urls.search}" name="search" role="search"> 
-                <#if user.showFlag1SearchField>
-                    <select id="search-form-modifier" name="flag1" class="form-item" >
-                        <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
-                        <option value="${portalId}">${siteTagline!}</option>
-                    </select>
-                
-                <#else>
-                    <input type="hidden" name="flag1" value="${portalId}" /> 
-                </#if> 
-                
                 <div id="search-field">
                     <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
                     <input type="submit" value="Search" class="submit">
@@ -49,4 +39,4 @@
             </form>
         </fieldset>
     </section>
-</header>
+</header>

webapp/web/templates/freemarker/page/partials/search.ftl

@@ -6,4 +6,4 @@
         <input type="text" name="querytext" id="search" class="search-form-item" value="${querytext!}" size="20" />
         <input class="search-form-submit" name="submit" type="submit"  value="Search" />
     </form>
-</div> <!-- end searchBlock -->
+</div> <!-- end searchBlock -->