Project

General

Profile

« Previous | Next » 

Revision 55995

Added by Argiro Kokogiannaki almost 5 years ago

[Library|Trunk]

add cache in some services and pass properties as parameter
initiate a searchResearchResultsService where it gets result type as parameter
update navbar/bottom to get properties as parameter and remove attributes included in properties
add spaces in search results & authors components

View differences:

navigationBar.component.html
10 10 
         <a *ngIf="!community" class="uk-navbar-item uk-logo"  routerLinkActive="uk-link" routerLink="/" >
11 11 
           <img  src="{{logoPath}}logo-small-{{portal}}.png" alt="OpenAIRE" class="uk-responsive-height">
12 12 
          </a>
13 
          <a *ngIf="community && !homeurl" class="uk-navbar-item uk-logo"  [href]="'https://'+(environment =='beta'?'beta.':'')+community.id+'.openaire.eu'"  target="_blank">
13 
          <a *ngIf="community && !homeurl" class="uk-navbar-item uk-logo"  [href]="'https://'+(properties.environment =='beta'?'beta.':'')+community.id+'.openaire.eu'"  target="_blank">
14 14 
            <img *ngIf="community.logoUrl && community.logoUrl.length > 0" src="{{community.logoUrl}}"  [alt]=community.name  class="uk-responsive-height">
15 15 
            <div *ngIf="!community.logoUrl || community.logoUrl.length == 0" class="uk-margin-left uk-text-large"> {{community.name}} </div>
16 16 
           </a>
......
34 34 
                    <li class="uk-nav-header uk-parent" >
35 35 
                      Dashboards
36 36 
                      <ul class="uk-nav-sub">
37 
                    		<li *ngIf="portal!='explore'"><a [href]="'https://'+(environment =='beta' || environment =='development' ?'beta.':'')+'explore.openaire.eu'" target="_blank" class="uk-heading-bullet explore-heading-bullet">EXPLORE</a></li>
38 
                    		<li *ngIf="portal!='provide'"><a [href]="'https://'+(environment =='beta' || environment =='development'?'beta.':'')+'provide.openaire.eu'" target="_blank" class="uk-heading-bullet provide-heading-bullet">PROVIDE</a></li>
39 
                    		<li *ngIf="portal!='connect'"><a [href]="'https://'+(environment =='beta' || environment =='development'?'beta.':'')+'connect.openaire.eu'" target="_blank" class="uk-heading-bullet connect-heading-bullet">CONNECT</a></li>
40 
                    		<li *ngIf="portal!='monitor'"><a [href]="'https://'+(environment =='beta' || environment =='development'?'beta.openaire.eu/monitor':'monitor.openaire.eu')" target="_blank" class="uk-heading-bullet monitor-heading-bullet">MONITOR</a></li>
37 
                    		<li *ngIf="portal!='explore'"><a [href]="'https://'+(properties.environment =='beta' || properties.environment =='development' ?'beta.':'')+'explore.openaire.eu'" target="_blank" class="uk-heading-bullet explore-heading-bullet">EXPLORE</a></li>
38 
                    		<li *ngIf="portal!='provide'"><a [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'provide.openaire.eu'" target="_blank" class="uk-heading-bullet provide-heading-bullet">PROVIDE</a></li>
39 
                    		<li *ngIf="portal!='connect'"><a [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'connect.openaire.eu'" target="_blank" class="uk-heading-bullet connect-heading-bullet">CONNECT</a></li>
40 
                    		<li *ngIf="portal!='monitor'"><a [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.openaire.eu/monitor':'monitor.openaire.eu')" target="_blank" class="uk-heading-bullet monitor-heading-bullet">MONITOR</a></li>
41 41 
                    		<li *ngIf="portal!='develop'"><a href="https://develop.openaire.eu" target="_blank" class="uk-heading-bullet develop-heading-bullet">DEVELOP</a></li>
42 42 
                      </ul>
43 43 
                    </li>
......
64 64 
                    </ng-container>
65 65 
                  </ng-container>
66 66 
                      <ng-container *ngIf="userMenu">
67 
                       <user-mini  mobileView=true [userMenuItems]=userMenuItems [logInUrl]=logInUrl [logOutUrl]=logOutUrl [cookieDomain]=cookieDomain></user-mini>
67 
                       <user-mini  mobileView=true [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
68 68 
                     </ng-container>
69 69 
                  </ul>
70 70 
               </div>
......
84 84 
            <div class="uk-first-column">
85 85 
               <div class="uk-panel inner" id="module-119">
86 86 
                  <ul class="uk-subnav uk-subnav-line">
87 
                     <li ><a [href]="'https://'+(environment =='beta'?'beta':'www')+'.openaire.eu'" target="_blank" class="home-icon"><span class="uk-responsive-height" >
87 
                     <li ><a [href]="'https://'+(properties.environment =='beta'?'beta':'www')+'.openaire.eu'" target="_blank" class="home-icon"><span class="uk-responsive-height" >
88 88 
                      <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 20 20" height="20px" id="Layer_1" version="1.1" viewBox="0 0 48 48" width="20px" xml:space="preserve"><path id="home" clip-rule="evenodd" d="M44.715,23.711c-0.381,0.382-1,0.382-1.381,0l-8.939-8.938  c-0.064-0.051-0.119-0.106-0.17-0.171l-3.83-3.829c-0.064-0.051-0.119-0.106-0.17-0.171L24,4.377L4.667,23.711  c-0.381,0.382-1,0.382-1.381,0c-0.381-0.381-0.381-1,0-1.381L23.191,2.425c0.031-0.047,0.053-0.101,0.094-0.144  C23.482,2.085,23.742,1.994,24,2c0.258-0.006,0.518,0.084,0.715,0.281c0.043,0.042,0.062,0.096,0.096,0.144L30,7.616V4.997  c0,0,0,0,0,0c0-0.552,0.447-1,1-1h4c0.277,0,0.527,0.112,0.707,0.293C35.889,4.471,36,4.721,36,4.997v8.619l8.715,8.714  C45.096,22.711,45.096,23.33,44.715,23.711z M34,5.997h-2v3.619l2,2V5.997z M10,21.997c0.552,0,1,0.448,1,1v19c0,1.105,0.896,2,2,2  h6l0,0v-13c0-0.553,0.447-1,1-1h8c0.553,0,1,0.447,1,1v13l0,0h6c1.105,0,2-0.895,2-2v-19c0-0.552,0.447-1,1-1s1,0.448,1,1v19  c0,2.209-1.791,4-4,4H13c-2.209,0-4-1.791-4-4v-19C9,22.444,9.448,21.997,10,21.997z M27,43.996v-12h-6v12l0,0H27L27,43.996z" fill-rule="evenodd" fill="#fff"/></svg>
89 89 
                     </span></a></li>
90 
                     <li  [class]="(portal=='explore')?'custom-'+portal+'-li':''"><a [href]="'https://'+(environment =='beta' || environment =='development'?'beta.':'')+'explore.openaire.eu'" title="Search in OA. Link your research">Explore</a></li>
91 
                     <li [class]="(portal=='provide')?'custom-'+portal+'-li':''"><a [href]="'https://'+(environment =='beta'  || environment =='development'?'beta.':'')+'provide.openaire.eu'" target="_blank" title="Content Provider Dashboard">Provide</a></li>
92 
                     <li [class]="(portal=='connect'||portal=='connect-admin')?'custom-'+portal+'-li':''"><a [href]="'https://'+(environment =='beta'  || environment =='development' ?'beta.':'')+'connect.openaire.eu'" target="_blank" title="Research Community Dashboard">Connect</a></li>
93 
                     <li [class]="(portal=='monitor')?'custom-'+portal+'-li':''"><a [href]="'https://'+(environment =='beta'  || environment =='development'?'beta.openaire.eu/monitor':'monitor.openaire.eu')" target="_blank" title="Monitoring Dashboard">Monitor</a></li>
90 
                     <li  [class]="(portal=='explore')?'custom-'+portal+'-li':''"><a [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'explore.openaire.eu'" title="Search in OA. Link your research">Explore</a></li>
91 
                     <li [class]="(portal=='provide')?'custom-'+portal+'-li':''"><a [href]="'https://'+(properties.environment =='beta'  || properties.environment =='development'?'beta.':'')+'provide.openaire.eu'" target="_blank" title="Content Provider Dashboard">Provide</a></li>
92 
                     <li [class]="(portal=='connect'||portal=='connect-admin')?'custom-'+portal+'-li':''"><a [href]="'https://'+(properties.environment =='beta'  || properties.environment =='development' ?'beta.':'')+'connect.openaire.eu'" target="_blank" title="Research Community Dashboard">Connect</a></li>
93 
                     <li [class]="(portal=='monitor')?'custom-'+portal+'-li':''"><a [href]="'https://'+(properties.environment =='beta'  || properties.environment =='development'?'beta.openaire.eu/monitor':'monitor.openaire.eu')" target="_blank" title="Monitoring Dashboard">Monitor</a></li>
94 94 
                     <li [class]="(portal=='develop')?'custom-'+portal+'-li':''"><a href="https://develop.openaire.eu" target="_blank" title="APIs">Develop</a></li>
95 95 
                  </ul>
96 96 
               </div>
......
116 116 
                 <img *ngIf="community.logoUrl && community.logoUrl.length > 0" src="{{community.logoUrl}}"  [alt]=community.name class="uk-responsive-height">
117 117 
                 <div *ngIf="!community.logoUrl || community.logoUrl.length == 0" class="uk-margin-left uk-text-large"> {{community.name}} </div>
118 118 
               </a>
119 
               <a *ngIf="community  && !homeurl" [href]="'https://'+(environment =='beta'?'beta.':'')+community.id+'.openaire.eu'" target="_blank"  class="uk-logo uk-navbar-item">
119 
               <a *ngIf="community  && !homeurl" [href]="'https://'+(properties.environment =='beta'?'beta.':'')+community.id+'.openaire.eu'" target="_blank"  class="uk-logo uk-navbar-item">
120 120 

  		




  121
  121
  
    
                 <img *ngIf="community.logoUrl && community.logoUrl.length > 0" src="{{community.logoUrl}}"  [alt]=community.name class="uk-responsive-height">


  		




  122
  122
  
    
                 <div *ngIf="!community.logoUrl || community.logoUrl.length == 0" class="uk-margin-left uk-text-large"> {{community.name}} </div>


  		




  ......




  130
  130
  
    
                 <img *ngIf="community.logoUrl && community.logoUrl.length > 0" src="{{community.logoUrl}}"   [alt]=community.name class="uk-responsive-height">


  		




  131
  131
  
    
                 <div *ngIf="!community.logoUrl || community.logoUrl.length == 0" class="uk-margin-left uk-text-large"> {{community.name}} </div>


  		




  132
  132
  
    
               </a>


  		




  133
  
  
    
               <a  *ngIf="community && !homeurl"  [href]="'https://'+(environment =='beta'?'beta.':'')+community.id+'.openaire.eu'" target="_blank"  class="uk-logo uk-navbar-item">


  		




  
  133
  
    
               <a  *ngIf="community && !homeurl"  [href]="'https://'+(properties.environment =='beta'?'beta.':'')+community.id+'.openaire.eu'" target="_blank"  class="uk-logo uk-navbar-item">


  		




  134
  134
  
    
                 <img *ngIf="community.logoUrl && community.logoUrl.length > 0" src="{{community.logoUrl}}"   [alt]=community.name class="uk-responsive-height">


  		




  135
  135
  
    
                 <div *ngIf="!community.logoUrl || community.logoUrl.length == 0" class="uk-margin-left uk-text-large"> {{community.name}} </div>


  		




  136
  136
  
    
               </a>


  		




  ......




  170
  170
  
    
            <!-- </div> -->


  		




  171
  171
  
    
            <!-- <div  *ngIf="userMenu" class="uk-navbar-right"> -->


  		




  172
  172
  
    
            <!-- <div  *ngIf="userMenu" class="uk-navbar-right"> -->


  		




  173
  
  
    
                  <user-mini  *ngIf="userMenu"  [userMenuItems]=userMenuItems [logInUrl]=logInUrl [logOutUrl]=logOutUrl [cookieDomain]=cookieDomain></user-mini>


  		




  
  173
  
    
                  <user-mini  *ngIf="userMenu"  [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>


  		




  174
  174
  
    

  		




  175
  175
  
    
            </div>


  		




  176
  176
  
    
         </nav>


  		












Also available in:  Unified diff