Project

General

Profile

« Previous | Next » 

Revision 57407

[Trunk | Library]:
1. home.component.hmtl & explore-custom.css: Buttons for trello updated.
2. app-routing.module.ts & app.component.ts: Menu and routes updated for new deposit functionality (already used in connect portal).
3. deposit-routing.module.ts & deposit.component.ts & deposit.module.ts & searchDataprovidersToDeposit-routing.module.ts & searchDataprovidersToDeposit.component.ts & searchDataprovidersToDeposit.module.ts:
Files added for pages in new deposit functionality.
4. explore-custom.css: Classes for new deposit functionality in explore portal added.
5. env-properties.json: Properties for new deposit routes added (beta and production properties files need to be updated).

View differences:

home.component.html
24 24
          </div>
25 25
        </div>
26 26
      </div>
27
      <div class="uk-container uk-container-large uk-margin-medium explore-numbers">
28
        <div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
29
          <div class="uk-width-1-1@m uk-first-column">
27
      <div class="uk-margin-medium">
28
        <div class="uk-container uk-container-large  explore-numbers">
29
          <div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
30
            <div class="uk-width-1-1@m uk-first-column">
30 31

  
31
            <!--            <div id="page#7"-->
32
            <!--                 class="firstPageNumbers uk-margin uk-margin-remove-bottom uk-width-xlarge uk-margin-auto  uk-animation-fade"-->
33
            <!--                 uk-scrollspy-class="" style="">-->
34
            <!--              <div class="uk-margin-bottom">-->
35
            <!--                <span *ngIf="showPublications && publicationsSize">-->
36
            <!--                  <span class="uk-h2">{{publicationsSize.number|number}}{{publicationsSize.size}}</span>-->
37
            <!--                  <span class="uk-text-large"> {{((showDatasets || showSoftware || showOrp) ? " publications, "-->
38
            <!--                      :" publications ")}}</span>-->
39
            <!--                </span>-->
40
            <!--                <span *ngIf="showDatasets && datasetsSize">-->
41
            <!--                  <span class="uk-h2">{{datasetsSize.number|number}}{{datasetsSize.size}}</span>-->
42
            <!--                  <span-->
43
            <!--                    class="uk-text-large">{{((showSoftware || showOrp) ? "  research data, " :"  research data ")}}</span>-->
44
            <!--                </span>-->
45
            <!--                <span *ngIf="showOrp && otherSize">-->
46
            <!--                  <span class="uk-h2">{{otherSize.number|number}}{{otherSize.size}}</span>-->
47
            <!--                  <span class="uk-text-large">  {{((showSoftware) ? " other research products, " :" other research products ")}}</span>-->
48
            <!--                </span>-->
49
            <!--                <span *ngIf="showSoftware && softwareSize">-->
50
            <!--                  <span class="uk-h2">{{softwareSize.number|number}}{{softwareSize.size}}</span>-->
51
            <!--                  <span class="uk-text-large">  software </span>-->
52
            <!--                </span>-->
32
              <!--            <div id="page#7"-->
33
              <!--                 class="firstPageNumbers uk-margin uk-margin-remove-bottom uk-width-xlarge uk-margin-auto  uk-animation-fade"-->
34
              <!--                 uk-scrollspy-class="" style="">-->
35
              <!--              <div class="uk-margin-bottom">-->
36
              <!--                <span *ngIf="showPublications && publicationsSize">-->
37
              <!--                  <span class="uk-h2">{{publicationsSize.number|number}}{{publicationsSize.size}}</span>-->
38
              <!--                  <span class="uk-text-large"> {{((showDatasets || showSoftware || showOrp) ? " publications, "-->
39
              <!--                      :" publications ")}}</span>-->
40
              <!--                </span>-->
41
              <!--                <span *ngIf="showDatasets && datasetsSize">-->
42
              <!--                  <span class="uk-h2">{{datasetsSize.number|number}}{{datasetsSize.size}}</span>-->
43
              <!--                  <span-->
44
              <!--                    class="uk-text-large">{{((showSoftware || showOrp) ? "  research data, " :"  research data ")}}</span>-->
45
              <!--                </span>-->
46
              <!--                <span *ngIf="showOrp && otherSize">-->
47
              <!--                  <span class="uk-h2">{{otherSize.number|number}}{{otherSize.size}}</span>-->
48
              <!--                  <span class="uk-text-large">  {{((showSoftware) ? " other research products, " :" other research products ")}}</span>-->
49
              <!--                </span>-->
50
              <!--                <span *ngIf="showSoftware && softwareSize">-->
51
              <!--                  <span class="uk-h2">{{softwareSize.number|number}}{{softwareSize.size}}</span>-->
52
              <!--                  <span class="uk-text-large">  software </span>-->
53
              <!--                </span>-->
53 54

  
54 55

  
55
            <!--                <br>-->
56
            <!--                <span *ngIf="showDataProviders && datasourcesSize">-->
57
            <!--                  <span class="uk-text-large"> from </span>-->
58
            <!--                   <span class="uk-h2">{{datasourcesSize.number|number}}{{datasourcesSize.size}}</span>-->
59
            <!--                   <span class="uk-text-large"> content providers </span>-->
60
            <!--                </span>-->
61
            <!--                <span *ngIf="showProjects && fundersSize">-->
62
            <!--                  <span class="uk-text-large"> {{((showDataProviders && datasourcesSize) ? " and " : " from ")}} </span>-->
63
            <!--                   <span class="uk-h2">{{fundersSize.number|number}}{{fundersSize.size}} </span>-->
64
            <!--                  <span class="uk-text-large"> funders </span>-->
56
              <!--                <br>-->
57
              <!--                <span *ngIf="showDataProviders && datasourcesSize">-->
58
              <!--                  <span class="uk-text-large"> from </span>-->
59
              <!--                   <span class="uk-h2">{{datasourcesSize.number|number}}{{datasourcesSize.size}}</span>-->
60
              <!--                   <span class="uk-text-large"> content providers </span>-->
61
              <!--                </span>-->
62
              <!--                <span *ngIf="showProjects && fundersSize">-->
63
              <!--                  <span class="uk-text-large"> {{((showDataProviders && datasourcesSize) ? " and " : " from ")}} </span>-->
64
              <!--                   <span class="uk-h2">{{fundersSize.number|number}}{{fundersSize.size}} </span>-->
65
              <!--                  <span class="uk-text-large"> funders </span>-->
65 66

  
66
            <!--                </span>-->
67
            <!--                <span *ngIf="showPublications || showDatasets || showOrp || showSoftware || showProjects ||-->
68
            <!--                   showDataProviders"-->
69
            <!--                      class="uk-text-large"> linked together for an integrated discovery of research outcomes </span>-->
67
              <!--                </span>-->
68
              <!--                <span *ngIf="showPublications || showDatasets || showOrp || showSoftware || showProjects ||-->
69
              <!--                   showDataProviders"-->
70
              <!--                      class="uk-text-large"> linked together for an integrated discovery of research outcomes </span>-->
70 71

  
71
            <!--              </div>-->
72
            <!--            </div>-->
72
              <!--              </div>-->
73
              <!--            </div>-->
73 74

  
74
            <div class="uk-grid uk-margin uk-margin-remove-bottom uk-width-xxlarge uk-margin-auto">
75
              <div class="uk-width-expand uk-padding-remove">
75
              <div class="uk-grid uk-margin uk-margin-remove-bottom uk-width-xxlarge uk-margin-auto">
76
                <div class="uk-width-expand uk-padding-remove">
76 77

  
77
                <div uk-slider="autoplay: true; autoplay-interval: 2500" class="uk-margin-top">
78
                  <div class="uk-position-relative">
79
                    <div class="uk-slider-container">
80
                      <ul class="uk-slider-items" uk-height-match="target: > li > div > div > .logo1; row: false;">
81
                        <ng-container *ngFor="let type of getKeys(logos)">
82
                          <li *ngFor="let range of createRange(logos[type].length) let j=index" class="uk-width-1-1 home-logo">
83
                            <div class="uk-text-center uk-margin-bottom portal-color uk-h2">
84
                              <span *ngIf="type=='publication' && showPublications && publicationsSize">
85
                                <span class="uk-text-bold">{{publicationsSize.number|number}}{{publicationsSize.size}}
86
                                  publications</span><span> deduplicated</span>
87
                              </span>
88
                              <span *ngIf="type=='dataset' && showDatasets && datasetsSize">
89
                                <span class="uk-text-bold">{{datasetsSize.number|number}}{{datasetsSize.size}}
90
                                  datasets</span><span> interlinked with publications</span>
91
                              </span>
92
                              <span *ngIf="type=='software' && showSoftware && softwareSize">
93
                                <span class="uk-text-bold">{{softwareSize.number|number}}{{softwareSize.size}} research software</span><span> interlinked with publications</span>
94
                              </span>
95
                              <!--                              <span *ngIf="type=='other' && showOrp && otherSize">-->
96
                              <!--                                <span class="uk-h2">{{otherSize.number|number}}{{otherSize.size}}</span>-->
97
                              <!--                                <span class="uk-text-large"> other research products interlinked with publications</span>-->
98
                              <!--                              </span>-->
99
                              <span *ngIf="type=='persistent'">
100
                                <span>Persistent identifiers and registries</span>
101
                              </span>
102
                              <span *ngIf="type=='funder' && showProjects && fundersSize">
103
                                <span class="uk-text-bold">{{fundersSize.number|number}}{{fundersSize.size}}
104
                                  funders</span><span> and</span>
105
                                <span class="uk-text-bold"> {{projectsSize.number|number}}{{projectsSize.size}} funded grants</span>
106
                              </span>
78
                  <div uk-slider="autoplay: true; autoplay-interval: 2500" class="uk-margin-top">
79
                    <div class="uk-position-relative">
80
                      <div class="uk-slider-container">
81
                        <ul class="uk-slider-items" uk-height-match="target: > li > div > div > .logo1; row: false;">
82
                          <ng-container *ngFor="let type of getKeys(logos)">
83
                            <li *ngFor="let range of createRange(logos[type].length) let j=index" class="uk-width-1-1 home-logo">
84
                              <div class="uk-text-center uk-margin-bottom portal-color uk-h2">
85
                                <span *ngIf="type=='publication' && showPublications && publicationsSize">
86
                                  <span class="uk-text-bold">{{publicationsSize.number|number}}{{publicationsSize.size}}
87
                                    publications</span><span> deduplicated</span>
88
                                </span>
89
                                <span *ngIf="type=='dataset' && showDatasets && datasetsSize">
90
                                  <span class="uk-text-bold">{{datasetsSize.number|number}}{{datasetsSize.size}}
91
                                    datasets</span><span> interlinked with publications</span>
92
                                </span>
93
                                <span *ngIf="type=='software' && showSoftware && softwareSize">
94
                                  <span class="uk-text-bold">{{softwareSize.number|number}}{{softwareSize.size}} research software</span><span> interlinked with publications</span>
95
                                </span>
96
                                <!--                              <span *ngIf="type=='other' && showOrp && otherSize">-->
97
                                <!--                                <span class="uk-h2">{{otherSize.number|number}}{{otherSize.size}}</span>-->
98
                                <!--                                <span class="uk-text-large"> other research products interlinked with publications</span>-->
99
                                <!--                              </span>-->
100
                                <span *ngIf="type=='persistent'">
101
                                  <span>Persistent identifiers and registries</span>
102
                                </span>
103
                                <span *ngIf="type=='funder' && showProjects && fundersSize">
104
                                  <span class="uk-text-bold">{{fundersSize.number|number}}{{fundersSize.size}}
105
                                    funders</span><span> and</span>
106
                                  <span class="uk-text-bold"> {{projectsSize.number|number}}{{projectsSize.size}} funded grants</span>
107
                                </span>
107 108

  
108
                            </div>
109
                            <div class="uk-grid-small  uk-child-width-1-6 uk-text-center grid uk-flex uk-flex-center"
110
                                 uk-grid uk-height-match="target: > div > .logo2; row: false;">
111
                              <div
112
                                *ngFor="let logo of logos[type][j].slice(0,ceil(logos[type][j].length/2)); let i=index">
113
                                <ng-container
114
                                  *ngTemplateOutlet="_logos; context: { logo: logo, class: 'logo1 '}"></ng-container>
115
                                <ng-container
116
                                  *ngTemplateOutlet="_logos; context: { logo: logos[type][j][ceil(logos[type][j].length/2)+i], class: 'uk-margin-top logo2 '}"></ng-container>
117 109
                              </div>
118
                            </div>
119
                          </li>
120
                        </ng-container>
121
                      </ul>
122
                    </div>
110
                              <div class="uk-grid-small  uk-child-width-1-6 uk-text-center grid uk-flex uk-flex-center"
111
                                   uk-grid uk-height-match="target: > div > .logo2; row: false;">
112
                                <div
113
                                  *ngFor="let logo of logos[type][j].slice(0,ceil(logos[type][j].length/2)); let i=index">
114
                                  <ng-container
115
                                    *ngTemplateOutlet="_logos; context: { logo: logo, class: 'logo1 '}"></ng-container>
116
                                  <ng-container
117
                                    *ngTemplateOutlet="_logos; context: { logo: logos[type][j][ceil(logos[type][j].length/2)+i], class: 'uk-margin-top logo2 '}"></ng-container>
118
                                </div>
119
                              </div>
120
                            </li>
121
                          </ng-container>
122
                        </ul>
123
                      </div>
123 124

  
124
                    <div class="uk-hidden@s">
125
                      <a class="uk-position-center-left uk-position-small" href="#" uk-slidenav-previous
126
                         uk-slider-item="previous"></a>
127
                      <a class="uk-position-center-right uk-position-small" href="#" uk-slidenav-next
128
                         uk-slider-item="next"></a>
129
                    </div>
125
                      <div class="uk-hidden@s">
126
                        <a class="uk-position-center-left uk-position-small" href="#" uk-slidenav-previous
127
                           uk-slider-item="previous"></a>
128
                        <a class="uk-position-center-right uk-position-small" href="#" uk-slidenav-next
129
                           uk-slider-item="next"></a>
130
                      </div>
130 131

  
131
                    <div class="uk-visible@s">
132
                      <a class="uk-position-center-left-out uk-position-small" href="#" uk-slidenav-previous
133
                         uk-slider-item="previous"></a>
134
                      <a class="uk-position-center-right-out uk-position-small" href="#" uk-slidenav-next
135
                         uk-slider-item="next"></a>
132
                      <div class="uk-visible@s">
133
                        <a class="uk-position-center-left-out uk-position-small" href="#" uk-slidenav-previous
134
                           uk-slider-item="previous"></a>
135
                        <a class="uk-position-center-right-out uk-position-small" href="#" uk-slidenav-next
136
                           uk-slider-item="next"></a>
137
                      </div>
136 138
                    </div>
137 139
                  </div>
140

  
138 141
                </div>
142
              </div>
139 143

  
140
              </div>
141 144
            </div>
142

  
143 145
          </div>
144 146
        </div>
147
<!--        <div class="uk-text-right uk-padding-small uk-padding-remove-vertical">-->
148
<!--          <a class="uk-button trello-button trello-button-white uk-button-large"-->
149
<!--             href="https://trello.com/b/o1tEJ3rN/openaire-research-graph"-->
150
<!--             target="_blank"-->
151
<!--             (mouseenter)="trelloImg = 'trello-2.svg'"-->
152
<!--             (mouseleave)="trelloImg = 'trello-2.svg'">-->
153
<!--            <img [src]="'assets/' + trelloImg">-->
154
<!--            <span class="uk-margin-left">Give us <b>feedback</b></span>-->
155
<!--          </a>-->
156
<!--        </div>-->
157
        <div class="uk-text-right uk-padding-small uk-padding-remove-vertical">
158
          <a class="uk-button uk-button-large trello-button trello-button-white"
159
             href="https://trello.com/b/o1tEJ3rN/openaire-research-graph"
160
             target="_blank">
161
<!--             (mouseenter)="trelloClass = 'trello-button-blue'"-->
162
<!--             (mouseleave)="trelloClass = 'trello-button-white'">-->
163
            <img [src]="'assets/trello-2.svg'" class="trello-image">
164
            <span class="uk-margin-small-left">Give us <b>feedback</b></span>
165
          </a>
166
        </div>
145 167
      </div>
168
    </div>
146 169

  
147
    </div>
170

  
171

  
148 172
  </div>
149 173
</div>
150 174
<schema2jsonld [URL]="properties.baseLink"
151 175
               [logoURL]="properties.baseLink+'/assets/common-assets/logo-small-explore.png'" type="home"
152 176
               name="OpenAIRE Explore"></schema2jsonld>
153 177
<ng-template [ngIf]="properties.environment !== 'production'">
154
  <div class="uk-text-right uk-padding-small uk-padding-remove-vertical">
155
    <a class="uk-button trello-button uk-button-large"
156
       href="https://trello.com/b/o1tEJ3rN/openaire-research-graph"
157
       target="_blank"
158
       (mouseenter)="trelloImg = 'trello-2.svg'"
159
       (mouseleave)="trelloImg = 'trello.svg'">
160
      <img [src]="'assets/' + trelloImg">
161
      <span class="uk-margin-left">Give us <b>feedback</b></span>
162
    </a>
163
  </div>
164 178
  <div class="uk-section uk-section-small graph-background uk-margin-top">
165 179
    <div class="uk-container uk-container-large uk-margin-medium-top">
166 180
      <div class="uk-flex uk-flex-top uk-child-width-1-1@s uk-child-width-1-2@m" uk-grid>
......
245 259
              <u>Instructions on providing feedback</u>
246 260
            </a>
247 261
            <div class="uk-margin-top uk-text-right uk-visible@l">
248
              <a class="uk-button trello-button uk-button-large"
262
              <a class="uk-button trello-button trello-button-blue uk-button-large"
249 263
                 href="https://trello.com/b/o1tEJ3rN/openaire-research-graph"
250
                 target="_blank"
251
                 (mouseenter)="trelloImg2 = 'trello-2.svg'"
252
                 (mouseleave)="trelloImg2 = 'trello.svg'">
253
                <img [src]="'assets/' + trelloImg2">
254
                <span class="uk-margin-left uk-margin-small-right">Go to <b>Trello</b></span>
264
                 target="_blank">
265
<!--                 (mouseenter)="trelloImg2 = 'trello-2.svg'"-->
266
<!--                 (mouseleave)="trelloImg2 = 'trello.svg'">-->
267
                <img [src]="'assets/trello.svg'" class="trello-image">
268
                <span class="uk-margin-small-left uk-margin-small-right">Go to <b>Trello</b></span>
255 269
                <span uk-icon="arrow-right"></span>
256 270
              </a>
257 271
            </div>
258 272
            <div class="uk-margin-top uk-text-right uk-hidden@m">
259
              <a class="uk-button trello-button uk-button-large"
273
              <a class="uk-button trello-button trello-button-blue uk-button-large"
260 274
                 href="https://trello.com/b/o1tEJ3rN/openaire-research-graph"
261
                 target="_blank"
262
                 (mouseenter)="trelloImg = 'trello-2.svg'"
263
                 (mouseleave)="trelloImg = 'trello.svg'">
264
                <img [src]="'assets/' + trelloImg">
265
                <span class="uk-margin-left uk-margin-small-right">Go to <b>Trello</b></span>
275
                 target="_blank">
276
<!--                 (mouseenter)="trelloImg = 'trello-2.svg'"-->
277
<!--                 (mouseleave)="trelloImg = 'trello.svg'">-->
278
                <img [src]="'assets/trello.svg'" class="trello-image">
279
                <span class="uk-margin-small-left uk-margin-small-right">Go to <b>Trello</b></span>
266 280
                <span uk-icon="arrow-right"></span>
267 281
              </a>
268 282
            </div>
269 283
            <div class="uk-margin-top uk-text-right uk-visible@m uk-hidden@l">
270
              <a class="uk-button trello-button uk-button-large"
284
              <a class="uk-button trello-button trello-button-blue uk-button-large"
271 285
                 href="https://trello.com/b/o1tEJ3rN/openaire-research-graph"
272
                 target="_blank"
273
                 (mouseenter)="trelloImg = 'trello-2.svg'"
274
                 (mouseleave)="trelloImg = 'trello.svg'">
275
                <img [src]="'assets/' + trelloImg" class="uk-margin-right">
286
                 target="_blank">
287
<!--                 (mouseenter)="trelloImg = 'trello-2.svg'"-->
288
<!--                 (mouseleave)="trelloImg = 'trello.svg'">-->
289
                <img [src]="'assets/trello.svg'" class="uk-margin-right trello-image">
276 290
                <span uk-icon="arrow-right"></span>
277 291
              </a>
278 292
            </div>

Also available in: Unified diff