Project

General

Profile

« Previous | Next » 

Revision 60126

Commented out the OA policies since we don't have numbers for those at the moment

View differences:

modules/open-science-observatory-ui/trunk/src/app/pages/countrypage/country-page.component.html
161 161
                  </div>
162 162

  
163 163
                  <div class="">
164

  
165
                    <div class="md-card">
164
                    <div class="md-card" style="height: 47%">
166 165
                      <div class="md-card-content">
167 166
                        <div class="uk-margin-top">
168 167
                          <div class="uk-float-right uk-margin-small-right">
169
                            <img src="../../../assets/img/icons/repositories-icon.svg" width="43" height="40">
170
                          </div>
171
                          <h3 class="uk-margin-remove">
172
                            <span *ngIf="!countryPageOverviewData || !countryPageOverviewData.repositories || !countryPageOverviewData.repositories.total" class="number">--</span>
173
                            <span *ngIf="countryPageOverviewData?.repositories?.total" class="number">{{countryPageOverviewData.repositories.total | number}}</span>
174
                          </h3>
175
                        </div>
176
                        <div class="uk-margin-top">
177
                          <span class=""><i>repositories</i> from openDOAR & re3data</span>
178
                        </div>
179
                        <div *ngIf="countryPageOverviewData?.repositories?.percentage" class="uk-margin-top">
180
                          <span class="number">{{countryPageOverviewData.repositories.percentage | number :'1.0-1'}}%</span> Validated
181
                          <div class="progress uk-margin-small-top">
182
                            <div [ngStyle]="{'width': countryPageOverviewData.repositories.percentage+'%'}" class="progress-bar progress-bar-repositories animate-progress-bar"></div>
183
                          </div>
184
                        </div>
185
                      </div>
186
                    </div>
187

  
188
                    <div class="md-card">
189
                      <div class="md-card-content">
190
                        <div class="uk-margin-top">
191
                          <div class="uk-float-right uk-margin-small-right">
192 168
                            <img src="../../../assets/img/icons/journals-icon.svg" width="43" height="40">
193 169
                          </div>
194 170
                          <h3 class="uk-margin-remove">
......
209 185
                        </div>
210 186
                      </div>
211 187
                    </div>
212

  
213 188
                  </div>
214 189

  
215

  
216 190
                  <div class="">
217 191

  
218 192
                    <div class="md-card" style="height: 47%">
219 193
                      <div class="md-card-content">
220 194
                        <div class="uk-margin-top">
221 195
                          <div class="uk-float-right uk-margin-small-right">
222
                            <img src="../../../assets/img/icons/policies-icon.svg" width="36" height="40">
196
                            <img src="../../../assets/img/icons/repositories-icon.svg" width="43" height="40">
223 197
                          </div>
224 198
                          <h3 class="uk-margin-remove">
225
                            <span class="number">--</span>
226
                            <!--<span *ngIf="overviewData.overview.policies?.oa" class="number">{{overviewData.overview.policies.oa | number}}</span>-->
227
                            <!--<span *ngIf="!overviewData.overview.policies || !overviewData.overview.policies.oa" class="number">--</span>-->
199
                            <span *ngIf="!countryPageOverviewData || !countryPageOverviewData.repositories || !countryPageOverviewData.repositories.total" class="number">--</span>
200
                            <span *ngIf="countryPageOverviewData?.repositories?.total" class="number">{{countryPageOverviewData.repositories.total | number}}</span>
228 201
                          </h3>
229 202
                        </div>
230 203
                        <div class="uk-margin-top">
231
                          <span class="">organizations with <i>OA policies</i></span>
204
                          <span class=""><i>repositories</i> from openDOAR & re3data</span>
232 205
                        </div>
206
                        <div *ngIf="countryPageOverviewData?.repositories?.percentage" class="uk-margin-top">
207
                          <span class="number">{{countryPageOverviewData.repositories.percentage | number :'1.0-1'}}%</span> Validated
208
                          <div class="progress uk-margin-small-top">
209
                            <div [ngStyle]="{'width': countryPageOverviewData.repositories.percentage+'%'}" class="progress-bar progress-bar-repositories animate-progress-bar"></div>
210
                          </div>
211
                        </div>
233 212
                      </div>
234 213
                    </div>
235 214

  
236
                    <div></div>
215
                    <!--<div class="md-card">-->
216
                      <!--<div class="md-card-content">-->
217
                        <!--<div class="uk-margin-top">-->
218
                          <!--<div class="uk-float-right uk-margin-small-right">-->
219
                            <!--<img src="../../../assets/img/icons/journals-icon.svg" width="43" height="40">-->
220
                          <!--</div>-->
221
                          <!--<h3 class="uk-margin-remove">-->
222
                            <!--<span *ngIf="!countryPageOverviewData || !countryPageOverviewData.journals || !countryPageOverviewData.journals.total" class="number">&#45;&#45;</span>-->
223
                            <!--<span *ngIf="countryPageOverviewData?.journals?.total" class="number">{{countryPageOverviewData.journals.total | number}}</span>-->
224
                            <!--&lt;!&ndash;<span *ngIf="overviewData.overview.journals?.oa" class="number">{{overviewData.overview.journals.oa | number}}</span>&ndash;&gt;-->
225
                            <!--&lt;!&ndash;<span *ngIf="!overviewData.overview.journals || !overviewData.overview.journals.oa" class="number">&#45;&#45;</span>&ndash;&gt;-->
226
                          <!--</h3>-->
227
                        <!--</div>-->
228
                        <!--<div class="uk-margin-top">-->
229
                          <!--<span class=""><i>OA journals</i> from DOAJ</span>-->
230
                        <!--</div>-->
231
                        <!--<div *ngIf="countryPageOverviewData?.journals?.percentage" class="uk-margin-top">-->
232
                          <!--<span class="number">{{countryPageOverviewData.journals.percentage | number :'1.0-1'}}%</span> Validated-->
233
                          <!--<div class="progress uk-margin-small-top">-->
234
                            <!--<div [ngStyle]="{'width': countryPageOverviewData.journals.percentage+'%'}" class="progress-bar progress-bar-journals animate-progress-bar"></div>-->
235
                          <!--</div>-->
236
                        <!--</div>-->
237
                      <!--</div>-->
238
                    <!--</div>-->
239

  
237 240
                  </div>
241

  
242

  
243
                  <!--<div class="">-->
244

  
245
                    <!--<div class="md-card" style="height: 47%">-->
246
                      <!--<div class="md-card-content">-->
247
                        <!--<div class="uk-margin-top">-->
248
                          <!--<div class="uk-float-right uk-margin-small-right">-->
249
                            <!--<img src="../../../assets/img/icons/policies-icon.svg" width="36" height="40">-->
250
                          <!--</div>-->
251
                          <!--<h3 class="uk-margin-remove">-->
252
                            <!--<span class="number">&#45;&#45;</span>-->
253
                            <!--&lt;!&ndash;<span *ngIf="overviewData.overview.policies?.oa" class="number">{{overviewData.overview.policies.oa | number}}</span>&ndash;&gt;-->
254
                            <!--&lt;!&ndash;<span *ngIf="!overviewData.overview.policies || !overviewData.overview.policies.oa" class="number">&#45;&#45;</span>&ndash;&gt;-->
255
                          <!--</h3>-->
256
                        <!--</div>-->
257
                        <!--<div class="uk-margin-top">-->
258
                          <!--<span class="">organizations with <i>OA policies</i></span>-->
259
                        <!--</div>-->
260
                      <!--</div>-->
261
                    <!--</div>-->
262

  
263
                    <!--<div></div>-->
264
                  <!--</div>-->
238 265
                </div>
239 266
              </div>
240 267
            </div>
......
355 382
                    </div>
356 383
                  </div>
357 384

  
358
                  <div class="uk-grid uk-margin-medium-top uk-margin-bottom">
359
                    <div class="uk-width-1-5">
360
                      <img src="../../../assets/img/icons/policies-icon.svg" width="30" height="30">
361
                    </div>
362
                    <div class="uk-width-2-5">
363
                      <div *ngIf="countryPageOverviewData.policies?.oa" class="number big">{{countryPageOverviewData.policies.oa | number}}</div>
364
                      <div *ngIf="!countryPageOverviewData.policies || !countryPageOverviewData.policies.oa" class="number big">--</div>
365
                      <div class="uk-margin-small-top">OA POLICIES</div>
366
                    </div>
367
                    <div class="uk-width-2-5">
385
                  <!--<div class="uk-grid uk-margin-medium-top uk-margin-bottom">-->
386
                    <!--<div class="uk-width-1-5">-->
387
                      <!--<img src="../../../assets/img/icons/policies-icon.svg" width="30" height="30">-->
388
                    <!--</div>-->
389
                    <!--<div class="uk-width-2-5">-->
390
                      <!--<div *ngIf="countryPageOverviewData.policies?.oa" class="number big">{{countryPageOverviewData.policies.oa | number}}</div>-->
391
                      <!--<div *ngIf="!countryPageOverviewData.policies || !countryPageOverviewData.policies.oa" class="number big">&#45;&#45;</div>-->
392
                      <!--<div class="uk-margin-small-top">OA POLICIES</div>-->
393
                    <!--</div>-->
394
                    <!--<div class="uk-width-2-5">-->
368 395

  
369
                    </div>
370
                  </div>
396
                    <!--</div>-->
397
                  <!--</div>-->
371 398

  
372 399
                </div>
373 400
              </div>
modules/open-science-observatory-ui/trunk/src/app/pages/home/europe-map-overview.component.html
39 39
          <span class="text {{activeView=='journals' ? 'active' : ''}}">journals</span>
40 40
        </a>
41 41
      </li>
42
      <li>
43
        <a (click)="changeView('policies')">
44
          <span class="uk-nav-label" style="background-color: #D4ECD6 !important; border: 1px solid #639C66;"></span>
45
          <span class="text {{activeView=='policies' ? 'active' : ''}}">OA policies</span>
46
        </a>
47
      </li>
42
      <!--<li>-->
43
        <!--<a (click)="changeView('policies')">-->
44
          <!--<span class="uk-nav-label" style="background-color: #D4ECD6 !important; border: 1px solid #639C66;"></span>-->
45
          <!--<span class="text {{activeView=='policies' ? 'active' : ''}}">OA policies</span>-->
46
        <!--</a>-->
47
      <!--</li>-->
48 48
    </ul>
49 49
    <!--<h2 class="heading_b">-->
50 50
    <!--Our Team-->
modules/open-science-observatory-ui/trunk/src/app/pages/home/home.component.html
108 108
                      <span><i>journals</i> from DOAJ</span>
109 109
                    </div>
110 110

  
111
                    <hr class="greyBoldDivider uk-margin-top uk-margin-bottom">
111
                    <!--<hr class="greyBoldDivider uk-margin-top uk-margin-bottom">-->
112 112

  
113
                    <div class="indicator">
114
                      <span class="number policies" *ngIf="selectedCountryData.policies!=null">{{selectedCountryData.policies | number}}</span>
115
                      <span class="number policies" *ngIf="selectedCountryData.policies===null">--</span>
116
                      <span>organisations with <i>OA policies</i></span>
117
                    </div>
113
                    <!--<div class="indicator">-->
114
                      <!--<span class="number policies" *ngIf="selectedCountryData.policies!=null">{{selectedCountryData.policies | number}}</span>-->
115
                      <!--<span class="number policies" *ngIf="selectedCountryData.policies===null">&#45;&#45;</span>-->
116
                      <!--<span>organisations with <i>OA policies</i></span>-->
117
                    <!--</div>-->
118 118

  
119 119
                  </div>
120 120

  
......
146 146
      <div class="">
147 147
        <!--Overview cards-->
148 148
        <div *ngIf="europeOverviewData" class="uk-width-1-1 indicatorCards">
149
          <div class="uk-grid uk-grid-small uk-child-width-1-2@s uk-child-width-1-3@m uk-child-width-1-5@l uk-margin-top uk-grid-match" data-uk-grid-margin="">
149
          <div class="uk-grid uk-grid-small uk-child-width-1-2@s uk-child-width-1-3@m uk-child-width-1-4@l uk-margin-top uk-grid-match" data-uk-grid-margin="">
150 150
            <div class="uk-row-first">
151 151
              <div class="md-card">
152 152
                <div class="md-card-content">
......
245 245
                </div>
246 246
              </div>
247 247
            </div>
248
            <div class="">
249
              <div class="md-card">
250
                <div class="md-card-content">
251
                  <div class="uk-margin-top">
252
                    <div class="uk-float-right uk-margin-small-right">
253
                      <img src="../../../assets/img/icons/policies-icon.svg" width="36" height="40">
254
                    </div>
255
                    <h3 class="uk-margin-remove">
256
                      <span *ngIf="europeOverviewData.policies?.oa" class="number">{{europeOverviewData.policies.oa | number}}</span>
257
                      <span *ngIf="!europeOverviewData.policies || !europeOverviewData.policies.oa" class="number">--</span>
258
                    </h3>
259
                  </div>
260
                  <div class="uk-margin-top">
261
                    <!--<span class="uk-text-muted uk-text-small">Number of OA publications</span>-->
262
                    <span class="">organizations with <i>OA policies</i></span>
263
                  </div>
264
                  <!--<div *ngIf="overviewData.overview.policies?.percentage" class="uk-margin-top">-->
265
                  <!--<span class="number">{{overviewData.overview.policies.percentage | number}}%</span> are OA-->
248
            <!--<div class="">-->
249
              <!--<div class="md-card">-->
250
                <!--<div class="md-card-content">-->
251
                  <!--<div class="uk-margin-top">-->
252
                    <!--<div class="uk-float-right uk-margin-small-right">-->
253
                      <!--<img src="../../../assets/img/icons/policies-icon.svg" width="36" height="40">-->
254
                    <!--</div>-->
255
                    <!--<h3 class="uk-margin-remove">-->
256
                      <!--<span *ngIf="europeOverviewData.policies?.oa" class="number">{{europeOverviewData.policies.oa | number}}</span>-->
257
                      <!--<span *ngIf="!europeOverviewData.policies || !europeOverviewData.policies.oa" class="number">&#45;&#45;</span>-->
258
                    <!--</h3>-->
266 259
                  <!--</div>-->
267
                </div>
268
              </div>
269
            </div>
260
                  <!--<div class="uk-margin-top">-->
261
                    <!--&lt;!&ndash;<span class="uk-text-muted uk-text-small">Number of OA publications</span>&ndash;&gt;-->
262
                    <!--<span class="">organizations with <i>OA policies</i></span>-->
263
                  <!--</div>-->
264
                  <!--&lt;!&ndash;<div *ngIf="overviewData.overview.policies?.percentage" class="uk-margin-top">&ndash;&gt;-->
265
                  <!--&lt;!&ndash;<span class="number">{{overviewData.overview.policies.percentage | number}}%</span> are OA&ndash;&gt;-->
266
                  <!--&lt;!&ndash;</div>&ndash;&gt;-->
267
                <!--</div>-->
268
              <!--</div>-->
269
            <!--</div>-->
270 270
          </div>
271 271
        </div>
272 272
      </div>
......
430 430
            </div>
431 431
          </div>
432 432

  
433
          <div class="uk-grid uk-margin-medium-top uk-margin-bottom">
434
            <div class="uk-width-1-5">
435
              <img src="../../../assets/img/icons/policies-icon.svg" width="30" height="30">
436
            </div>
437
            <div class="uk-width-2-5">
438
              <div *ngIf="europeOverviewData.policies?.oa" class="number big">{{europeOverviewData.policies.oa | number}}</div>
439
              <div *ngIf="!europeOverviewData.policies || !europeOverviewData.policies.oa" class="number big">--</div>
440
              <div class="uk-margin-small-top">OA POLICIES</div>
441
            </div>
442
            <div class="uk-width-2-5">
433
          <!--<div class="uk-grid uk-margin-medium-top uk-margin-bottom">-->
434
            <!--<div class="uk-width-1-5">-->
435
              <!--<img src="../../../assets/img/icons/policies-icon.svg" width="30" height="30">-->
436
            <!--</div>-->
437
            <!--<div class="uk-width-2-5">-->
438
              <!--<div *ngIf="europeOverviewData.policies?.oa" class="number big">{{europeOverviewData.policies.oa | number}}</div>-->
439
              <!--<div *ngIf="!europeOverviewData.policies || !europeOverviewData.policies.oa" class="number big">&#45;&#45;</div>-->
440
              <!--<div class="uk-margin-small-top">OA POLICIES</div>-->
441
            <!--</div>-->
442
            <!--<div class="uk-width-2-5">-->
443 443

  
444
            </div>
445
          </div>
444
            <!--</div>-->
445
          <!--</div>-->
446 446

  
447 447
        </div>
448 448
      </div>

Also available in: Unified diff