Merge pull request #223 from ipb-halle/216-ui-refactoring-advanced-search

216 UI refactoring advanced search

Author: fbroda

ui/src/main/java/de/ipb_halle/lbac/search/bean/SearchBean.java

@@ -285,5 +285,4 @@ public int getPollIntervall() {
             return POLLING_INTERVALL_INACTIVE;
         }
     }
-
 }

ui/src/main/resources/de/ipb_halle/lbac/i18n/messages_de.properties

@@ -44,8 +44,12 @@
         <h:outputStylesheet name="css/collections.css"/>
         <h:outputStylesheet name="css/materialEdit.css"/>
         <h:outputStylesheet name="css/sequenceSearch.css"/>
+        <h:outputStylesheet name="css/main-search-panel.css"/>
         <h:outputScript name="js/lbac_helper.js"/>
-        <h:outputScript name="js/colorCloudTerms.js"/>      
+        <h:outputScript name="js/colorCloudTerms.js"/>     
+        
+        
+        
         <h:outputStylesheet name="css/modal/fileUploadModal.css"/>
 
     </h:head>

ui/src/main/resources/de/ipb_halle/lbac/i18n/messages_en.properties

@@ -679,11 +679,7 @@ select.selCollection {
     margin-left: -5px;
 }
 .advancedSearchButton{
-    margin-left: -0px;
-    margin-top: 2px;
-    padding-top:2px !important;
-    width:10px;
-    height:23px;
+   
 }
 
 .advancedSearchButton i{

ui/web/WEB-INF/templates/default.xhtml

@@ -0,0 +1,97 @@
+/*
+ * Cloud Resource & Information Management System (CRIMSy)
+ * Copyright 2020 Leibniz-Institut f. Pflanzenbiochemie
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/*
+   customer styles
+
+*/
+
+.main-search-panel{
+    width:100%;
+
+}
+
+.advanced-search-panel{
+    width:20%;
+}
+
+.search-result-panel{
+
+}
+/** format info box test results in ldpap check **/
+
+.search-panel-logo > div{
+    display: flex;
+    align-items: center;
+}
+.search-panel-logo > div > img{
+    margin:auto;
+}
+.interaction-search-panel > table{
+    width:100%;
+}
+.interaction-search-panel  .interaction-search-panel-first-column {
+    display: flex;
+}
+.interaction-search-panel-first-column  input {
+    width:100%;
+}
+.interaction-search-panel-first-column  .ui-inputgroup {
+    width:100%;
+}
+
+.interaction-search-panel-row  {
+    height:80px;
+}
+
+interaction-search-panel  .interaction-search-panel-second-column {
+    border-style: none;
+}
+.interaction-search-panel-second-column  .searchButton{
+    margin-left:5px;
+}
+.interaction-search-panel-second-column  .uploadButton{
+    margin-left:30px;
+}
+.interaction-search-panel-second-column  .newDocumentsBadge{
+    position:absolute;
+    margin-left: -11px;
+    margin-top: -10px;
+}
+body .main-search-panel .interaction-search-panel tr {
+    border-style: none;
+}
+body .main-search-panel .interaction-search-panel td {
+    border-style: none;
+}
+
+body .main-search-panel tbody .search-panel-logo {
+    border-style: none;
+}
+
+body .main-search-panel tbody .interaction-search-panel {
+    border-style: none;
+}
+
+body .main-search-panel tbody .search-result-panel {
+    border-style: none;
+    vertical-align: top;
+}
+body .main-search-panel tbody .advanced-search-panel {
+    border-style: none;
+}