Project

General

Profile

« Previous | Next » 

Revision 57862

1. fix for cris validations (narrowed down steps)
2. update metrics-instructions.component.html (replaced 'piwik' with 'matomo')

View differences:

modules/uoa-repository-dashboard-gui/trunk/src/app/pages/metrics/metrics-instructions.component.html
28 28
              <div *ngIf="errorMessage" class="uk-alert uk-alert-danger">{{ errorMessage }}</div>
29 29
              <div *ngIf="piwik">
30 30
                <p>
31
                  OpenAIRE’s usage statistic service uses the <i>Piwik Open Source Analytics platform</i> (piwik.org) to track usage activity. When <i>metrics</i>
32
                  are enabled for a repository, two unique identifiers are generated - a piwik-ID that associates the repository with its usage events in Piwik
33
                  and an authentication-ID that allows to track usage activity on the Piwik platform. Metadata views and item downloads are tracked and automatically sent to Piwik. Statistics are generated using the COUNTER Code of practice directives.
31
                  OpenAIRE’s usage statistic service uses the <i>Matomo Open Source Analytics platform</i> (matomo.org) to track usage activity. When <i>metrics</i>
32
                  are enabled for a repository, two unique identifiers are generated - a matomo-ID that associates the repository with its usage events in Matomo
33
                  and an authentication-ID that allows to track usage activity on the Matomo platform. Metadata views and item downloads are tracked and automatically sent to Matomo. Statistics are generated using the COUNTER Code of practice directives.
34 34
                </p>
35 35
                <p>
36
                  OpenAIRE's usage statistics service tracking code exploits Piwik’s API. In order to make the tracking of usage events from repositories more robust, it was necessary to implement repository platform specific patches and plugins starting with DSpace and EPrints. The code is maintained on Github:
36
                  OpenAIRE's usage statistics service tracking code exploits Matomo’s API. In order to make the tracking of usage events from repositories more robust, it was necessary to implement repository platform specific patches and plugins starting with DSpace and EPrints. The code is maintained on Github:
37 37
                </p>
38 38
                <ul>
39 39
                  <li>as a patch for various versions of DSpace
......
44 44
                    (<a target="_blank" href="https://github.com/openaire/Generic-Matomo-Tracker">https://github.com/openaire/Generic-Matomo-Tracker</a>)</li>
45 45
                </ul>
46 46
                <p>
47
                  To configure your repository to allow tracking in Piwik platform, please change the configuration files with the following parameters and values, generated for your site:
47
                  To configure your repository to allow tracking in Matomo platform, please change the configuration files with the following parameters and values, generated for your site:
48 48
                </p>
49 49
                <dl class="uk-description-list">
50
                  <dt>PiwikID</dt>
50
                  <dt>MatomoID</dt>
51 51
                  <dd>{{ piwik.siteId }}</dd>
52 52
                  <dt>AuthenticationToken</dt>
53 53
                  <dd>{{ piwik.authenticationToken }}</dd>
modules/uoa-repository-dashboard-gui/trunk/src/app/pages/compatibility/compatibility-validate-type.component.html
17 17
        </aside-help-content>
18 18

  
19 19
        <!-- MIDDLE -->
20
        <div class=" uk-width-expand@m">
20
        <div class="uk-width-expand@m">
21 21

  
22 22
          <div class="wizard">
23 23
            <div class="wizardBreadcrumbs">
......
30 30
                </div>
31 31
                <div class="step {{ (currentStep > 0) ? 'active' : '' }}">
32 32
                  <div>
33
                    Select guidelines
33
                    {{ (type === 'cris') ? 'Finish' : 'Next' }}
34 34
                    <span></span>
35 35
                  </div>
36 36
                </div>
37
                <div class="step {{ (currentStep > 1) ? 'active' : '' }}">
37
                <div *ngIf="(type !== 'cris')" class="step {{ (currentStep > 1) ? 'active' : '' }}">
38 38
                  <div>
39 39
                    Select parameters
40 40
                    <span></span>
41 41
                  </div>
42 42
                </div>
43
                <div class="step {{ (currentStep > 2) ? 'active' : '' }}">
43
                <div *ngIf="(type !== 'cris')" class="step {{ (currentStep > 2) ? 'active' : '' }} ">
44 44
                  <div>
45 45
                    Finish
46 46
                    <span></span>
......
51 51
            <div class="content">
52 52
              <div>
53 53
                <div class="animated fadeInRight stepContent">
54
                  <div *ngIf="errorMessage" class="uk-alert uk-alert-danger">{{ errorMessage }}</div>
54
                  <div *ngIf="errorMessage && (type!=='cris' && errorMessage!=='No rule sets were found')" class="uk-alert uk-alert-danger">{{ errorMessage }}</div>
55 55
                  <div *ngIf="loadingMessage" class="loading-big">
56 56
                    <div class="loader-big" style="text-align: center; padding-top: 170px; color: rgb(47, 64, 80); font-weight: bold;">
57 57
                      {{ loadingMessage }}
......
95 95
              </div>
96 96
            </div>
97 97
            <div *ngIf="!loadingMessage" class="wizardActions">
98
              <button *ngIf="((currentStep === 1) || (currentStep === 2)) && !loadingMessage"
98
              <button *ngIf="((currentStep === 1) || (currentStep === 2)) && (type !== 'cris') && !loadingMessage"
99 99
                      class="uk-button uk-button-grey-light uk-margin-small-right" type="button"
100 100
                      (click)="moveBackAStep()">
101 101
                <i class="fa fa-angle-double-left"></i>
102 102
                Back
103 103
              </button>
104
              <button *ngIf="(currentStep < 3) && !loadingMessage"
104
              <button *ngIf="((currentStep < 3) && !loadingMessage)"
105 105
                      class="uk-button uk-button-grey-light uk-margin-small-left" type="button"
106
                      (click)="moveAStep()">
107

  
108
                <span class="{{(currentStep === 2) ? 'uk-link' : ''}}">
109
                  {{ (currentStep < 2) ? 'Next' : 'Finish' }}
106
                      (click)="(type !== 'cris') ? moveAStep() : (moveAStep() + submitForValidation())">
107
                <span class="{{((currentStep === 2) || ((type === 'cris') && (currentStep === 1))) ? 'uk-link' : ''}}">
108
                  {{ ((currentStep < 2) && (type !== 'cris')) || (currentStep === 0) ? 'Next' : 'Finish' }}
110 109
                </span>
111 110
                <i class="fa fa-angle-double-right"></i>
112

  
113 111
              </button>
114 112
            </div>
115 113
          </div>

Also available in: Unified diff