From 74e3796005665c215935cdfe761aee7394a31a7c Mon Sep 17 00:00:00 2001
From: Svetlana Rastegina <rasteginas@yandex.ru>
Date: Thu, 25 Feb 2021 12:05:21 +0100
Subject: [PATCH] Hid select option in search panel on main page .

---
 webapp/src/main/webapp/themes/iph/css/iph.css | 35 ++++++++-----------
 .../themes/iph/templates/customSearchForm.ftl |  4 +--
 .../main/webapp/themes/iph/templates/page.ftl | 12 ++++---
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css
index 94ef48f0..d9a5b436 100644
--- a/webapp/src/main/webapp/themes/iph/css/iph.css
+++ b/webapp/src/main/webapp/themes/iph/css/iph.css
@@ -596,7 +596,7 @@ ul#header-nav a.log-out {
 
 
 .custom-search-input {
-  width: 75%;
+  width: 90%;
   border-radius: unset !important;
   -webkit-border-radius: unset !important;
   float: left;
@@ -981,11 +981,12 @@ body.login #login {
     margin-right: auto;
 }
 #login h2 {
-    font-size: 22px;
+    font-size: 1.4rem;
     color: #8B4513;
     padding-left: 38px;
     padding-top: 18px;
     border-bottom: none;
+    font-family: "IPH Astra Serif";
 }
 h3.internal-auth:hover {
     color: #47B6D0;
@@ -1897,10 +1898,10 @@ li.individual {
 
 /* ADMIN PANEL ------>  */
 #admin {
-    background-color: #f2f9fb;
+    background-color: #efe9d9;
 }
 #admin h3 {
-    background: #2485AE;
+    background: #DD9F00;
     color: #fff;
 }
 #admin .uri-link,
@@ -1908,7 +1909,7 @@ li.individual {
     color: #888c8c;
 }
 #admin a {
-    color: #2a98bc;
+    color: #8B4513;
 }
 /* INDIVIDUAL INTRO FOR ANY CLASS ------>  */
 .preferred {
@@ -2066,7 +2067,7 @@ section.property-group h2,
     font-weight: normal;
 }
 article.property {
-    width: 852px;
+    width: 95%;
 }
 article.property h3 {
     background: #fafaf9;
@@ -2121,7 +2122,7 @@ p.address-line {
   border-bottom: 1px dotted #AFB2B2;
   font-weight: bold;
   padding: .625em;
-  color: #064D68;
+  color: #8B4513;
   margin-bottom: .625em;
 }
 #adminDashboard .pageBodyGroup ul {
@@ -2139,7 +2140,13 @@ p.address-line {
   margin-left: 0;
   font-weight: bold;
 }
-
+.siteAdmin.loggedIn >div#articleWrapper >div#wrapper-content >div.tab >h2 {
+	text-align: center;
+	font-family: "IPH Astra Serif";
+	font-size: 1.5rem;
+	padding-bottom: 0px;
+	border-bottom: 1px solid #8B4513;
+}
 
 
 
@@ -2543,12 +2550,6 @@ button.collapsible.active {
 	#footerWrapper {
 	width: 90%;
 	}
-	.elenph_articles > div#articleWrapper {
-	width: 90%;
-	}
-	.rubrics > div#articleWrapper {
-	width: 90%;
-	}
 }
 
 @media screen and (max-width: 1300px) {
@@ -2579,12 +2580,6 @@ button.collapsible.active {
 	ul#browse-classes li {
 	font-size: 1.1rem;
 	}
-	.elenph_articles > div#articleWrapper {
-	width: 95%;
-	}
-	.rubrics > div#articleWrapper {
-	width: 95%;
-	}
 }
 
 @media screen and (max-width: 1100px) {
diff --git a/webapp/src/main/webapp/themes/iph/templates/customSearchForm.ftl b/webapp/src/main/webapp/themes/iph/templates/customSearchForm.ftl
index 43e0a356..c6697646 100644
--- a/webapp/src/main/webapp/themes/iph/templates/customSearchForm.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/customSearchForm.ftl
@@ -1,12 +1,12 @@
 <div class="search-form-container">
   <form id="custom-search" action="${urls.customsearch}" name="custom-search" role="search" method="post" >
     <input type="text" name="querytext" class="custom-search-input" value="${querytext!?html}" autocapitalize="off" /> 
-   <#if vClassGroups??>
+   <!-- <#if vClassGroups??>
      <select form="custom-search" name="classgroup" class="custom-search-select">
        <option value="">${i18n().all_capitalized}</option>
        <@classGroupOptions vClassGroups! />
      </select>
-   </#if>
+   </#if> -->
    <input type="submit" value="${i18n().search_button}" class="search-submit-button" />
   <!--
    <a class="filter-search filter-default" href="#" title="${i18n().intro_filtersearch}">
diff --git a/webapp/src/main/webapp/themes/iph/templates/page.ftl b/webapp/src/main/webapp/themes/iph/templates/page.ftl
index e0cbaf13..c69f3db4 100644
--- a/webapp/src/main/webapp/themes/iph/templates/page.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/page.ftl
@@ -11,22 +11,24 @@
     <body class="${bodyClasses!}" onload="${bodyOnload!}">
         <#include "identity.ftl">
         <#include "menu.ftl">
-		
+
 <div id="articleWrapper">
-	    <#if individual?? >
+	    <#if currentServlet = "individual" && currentServlet != "display"?? >
        	 <div id="searchRightpanel">
           <#include "customsearchpanel.ftl" >
           </div>
         </#if>
 		<#include "contentWrapper.ftl">
-			<#if currentServlet != "individual" && currentServlet != "login">
+			<#if currentServlet != "individual" && currentServlet != "login" && currentServlet != "display">
 			 <section id="search-home" role="region">
                 <h3><span class="search-filter-selected">filteredSearch</span></h3>
-
+         
                 <fieldset>
                     <legend>${i18n().search_form}</legend>
                 </fieldset>
-                <#include "searchSelector.ftl">
+          
+              <#include "searchSelector.ftl">
+          
             </section>
 		</#if>