Project

General

Profile

« Previous | Next » 

Revision 47533

Loading message in every tab (with extra query) of landing pages | checks for undefined, null, empty simplified in html templates of landing pages | changed data-uk-tooltip to uk-tooltip | Organization landing: rename CSV buttons | Dataproviders landing: add both publications-datasets tabs at the same time | Projects landing: to get number of datasets, add a function to fetchDatasets class instead of calling directly search service | Publication & Dataset landing: added ul-light class for better visibility on dark background on tooltip in funded by section | Publication landing: small bug fix in journal display & journal/publisher display in download from section | Datasets landing: small bug fix in publisher display in download from section | claims project manager: search form moved to top, save changes button moved under pending claims | filters' modal of search pages moved to filters' component (old component not removed yet) and became smaller | Compatible dataproviders page: small bug fixes in url, filters, filter-name: changed to Funder from Funder database

View differences:

organization.component.html
24 24

  
25 25
        <!--div class="uk-width-2-3" *ngIf="organizationInfo != null"-->
26 26
            <dl class="uk-description-list">
27
                <dt *ngIf="organizationInfo.name != undefined && organizationInfo.name != ''">Name: </dt>
28
                <dd *ngIf="organizationInfo.name != undefined && organizationInfo.name != ''">{{organizationInfo.name}}</dd>
29
                <dt *ngIf="organizationInfo.country != undefined && organizationInfo.country != ''">Country: </dt>
30
                <dd *ngIf="organizationInfo.country != undefined && organizationInfo.country != ''">{{organizationInfo.country}}</dd>
27
                <dt *ngIf="organizationInfo.name">Name: </dt>
28
                <dd *ngIf="organizationInfo.name">{{organizationInfo.name}}</dd>
29
                <dt *ngIf="organizationInfo.country">Country: </dt>
30
                <dd *ngIf="organizationInfo.country">{{organizationInfo.country}}</dd>
31 31
            </dl>
32 32

  
33 33
            <ul class="uk-tab" data-uk-switcher="{connect:'#tab-content'}">
......
113 113

  
114 114
                <li class="uk-animation-fade">
115 115
                    <!--showDataProviders [dataProviders]="organizationInfo.dataProviders"></showDataProviders-->
116
                    <div *ngIf="fetchDataproviders.searchUtils.totalResults == 0" class = "uk-alert  uk-alert-primary">
116
                    <!--div *ngIf="fetchDataproviders.searchUtils.totalResults == 0" class = "uk-alert  uk-alert-primary">
117 117
                        There are no dataproviders
118
                    </div>
118
                    </div-->
119 119

  
120
                    <div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">There are no data providers</div>
121
                    <div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.ERROR" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">An Error Occured</div>
122
                    <div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger uk-animation-fade" role="alert">Service not available</div>
123
                    <div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.LOADING" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">Loading...</div>
124

  
120 125
                    <div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">
121 126

  
122 127
                        <div class = "uk-text-right" *ngIf = "fetchDataproviders.searchUtils.totalResults > 10">
......
164 169
                            </a-->
165 170
                            <span class="clickable" (click)="downloadfile(downloadURLAPI+'resources?size='+funder.number+'&'+csvProjectParamsHead+funder.id+csvParamsTail)">
166 171
                                <span aria-hidden="true" class="glyphicon glyphicon-download"></span>
167
                                <span class="uk-icon-download"> Projects report(CSV) for {{funder.name}}</span>
172
                                <span class="uk-icon-download"> Project list for {{funder.name}} (CSV)</span>
168 173
                            </span>
169 174
                        </li>
170 175

  
171 176
                        <li *ngFor="let funder of searchingProjectsTabComponent.fetchProjects.funders">
172 177
                            <span class="clickable" (click)="confirmOpen(funder.name,funder.id, funder.number)">
173 178
                                <span aria-hidden="true" class="glyphicon glyphicon-download"></span>
174
                                <span class="uk-icon-download"> Publications report(CSV) for {{funder.name}}</span>
179
                                <span class="uk-icon-download"> Project Publications for {{funder.name}} (CSV)</span>
175 180
                            </span>
176 181
                        </li>
182
                        <!--li>
183
                            <span class="clickable">
184
                                <span aria-hidden="true" class="glyphicon glyphicon-download"></span>
185
                                <span class="uk-icon-download"> Publications of organization (CSV) - based on the affiliation information.</span>
186
                            </span>
187
                        </li-->
177 188
                </ng-container>
178 189
            </ul>
179 190
        </div>

Also available in: Unified diff