1. In searchPage and searchPageTableView bug fixing in widths and help texts.

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51757 d315682c-612b-4755-9ff5-7f18f6832af3

searchPages/searchUtils/searchPage.component.html

@@ -108,6 +108,7 @@
 
             <div *ngIf="tableViewLink || searchUtils.totalResults <= csvLimit" class="helper-left-right uk-visible@m">
               <helper position="right" before="true"></helper>
+              <div>
                 <span *ngIf="tableViewLink" class="uk-margin-medium-right">
                   <a routerLinkActive="router-link-active" [class]="(disableForms)?'uk-disabled uk-link-muted':''" [routerLink]=tableViewLink >
                     <span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
@@ -116,6 +117,7 @@
                   <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
                 </span>
                 <search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults"></search-download>
+              </div>
               <helper position="right" before="false"></helper>
             </div>
             <helper *ngIf="!tableViewLink && searchUtils.totalResults > csvLimit" class="helper-left-right uk-visible@m" position="right"></helper>

searchPages/searchUtils/searchPageTableView.component.html

@@ -48,11 +48,12 @@
         </div>
 
         <div  class="uk-grid uk-width-1-1">
-          <div *ngIf="filters.length > 0" class="helper-left-right search-filters uk-width-1-6@m  uk-visible@m">
+          <div *ngIf="filters.length > 0" class="helper-left-right search-filters uk-visible@m">
             <helper position="left" before="true"></helper>
             <search-filter  *ngFor="let filter of filters " [isDisabled]="disableForms" [filter]="filter"  [showResultCount]=showResultCount (change)="filterChanged($event)" (toggleModal)="toggleModal($event)"></search-filter>
             <helper position="left" before="false"></helper>
           </div>
+          <helper *ngIf="filters.length == 0" class="helper-left-right uk-visible@m" position="left"></helper>
 
           <div class="uk-width-expand@m uk-width-1-1@s uk-first-column custom-dataTable-content" >
             <div *ngIf="searchUtils.totalResults > 0" class="uk-align-center uk-margin-remove-bottom">
@@ -80,25 +81,19 @@
               <errorMessages [status]="[searchUtils.status]" [type]="'results'"></errorMessages>
             </div>
 
-            <div *ngIf="searchUtils.totalResults > 0" class="uk-overflow-container">
+            <div *ngIf="searchUtils.totalResults > 0" class="uk-overflow-auto">
               <!--  #mf="mfDataTable" [mfRowsOnPage]="rowsOnPage"
                       [mfData]="results | contentProvidersDatatable : [searchUtils, filters, triggerPipe, cd]"
 
                     -->
               <table datatable class="uk-table uk-table-striped divider-table" [dtOptions]="dtOptions" id="dpTable" [dtTrigger]="dtTrigger" dtInstance="dtInstanceCallback">
-
                 <thead >
                   <tr>
-                    <!-- <th class="uk-text-left">Name</th>
-                    <th class="uk-text-center"> Type</th>
-                    <th class="uk-text-center"> Country</th>
-                    <th class="uk-text-center"> Institution</th> -->
-                    <!-- <th class="uk-text-center"> Compatibility</th> -->
                     <th *ngFor="let column of columnNames" class="uk-text-center">{{column}}</th>
                   </tr>
                 </thead>
                 <tbody>
-                  <tr class="uk-width-1-5 uk-table-middle" *ngFor="let result of results">
+                  <tr class="uk-table-middle" *ngFor="let result of results">
                     <td *ngIf="result.hasOwnProperty('title')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
                       <a [queryParams]="{datasourceId: result.id}" routerLinkActive="router-link-active" routerLink="/search/dataprovider">
                         <span *ngIf="result.title.name"
@@ -128,16 +123,6 @@
                       <span *ngIf="!result.compatibility">-</span>
                     </td>
 
-                    <!--Community Projects - name is also used for Community Content Providers-->
-                    <!-- <td *ngIf="result.hasOwnProperty('acronym')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
-                      <span *ngIf="result.acronym">{{result.acronym}}</span>
-                      <span *ngIf="!result.acronym">-</span>
-                    </td>
-                    <td *ngIf="result.hasOwnProperty('name')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
-                      <span *ngIf="result.name">{{result.name}}</span>
-                      <span *ngIf="!result.name">-</span>
-                    </td> -->
-
                     <!--Community Projects-->
                     <td *ngIf="result.hasOwnProperty('acronym') && result.hasOwnProperty('name')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
                       <a [queryParams]="(result.openaireId) ? {projectId: result.openaireId} : {grantId: encode(result.grantId), funder: encode(result.funder)}"
@@ -197,8 +182,7 @@
             <helper class="uk-hidden@m" position="right" styleName="uk-width-1-1@s"></helper>
           </div>
 
-          <div  class="helper-left-right uk-width-1-6@m uk-visible@m">
+          <div *ngIf="searchViewLink" class="helper-left-right uk-visible@m">
-            <p  *ngIf="searchViewLink">
             <helper position="right" before="true"></helper>
             <span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
 
@@ -206,10 +190,8 @@
               <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
             </a>
             <helper position="right" before="false"></helper>
-            </p>
-
-            <helper *ngIf="!searchViewLink" position="right"></helper>
           </div>
+          <helper *ngIf="!searchViewLink" class="helper-left-right uk-visible@m" position="right"></helper>
         </div>
 
         <helper position="bottom"></helper>