Project

General

Profile

« Previous | Next » 

Revision 53117

almost ready for review

View differences:

modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources-register/register-datasource-shareable.component.html
19 19
                  <label class="control-label">Select repository's country</label>
20 20
                  <select class="form-control" (change) ="getReposInCountry($event.target.value)">
21 21
                    <option value="" disabled>-- none selected --</option>
22
                    <option *ngFor="let country of countries" value="{{ country.code }}">{{ country.name }}</option>
22
                    <option *ngFor="let country of countries" value="{{ country.code }}">{{country.name }}</option>
23 23
                  </select>
24 24
                </div>
25 25
                <div class="form-group">
modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources-register/register-datasource-shareable.component.ts
59 59
  getCountries(){
60 60
    this.repoService.getCountries()
61 61
      .subscribe(
62
        countries => this.countries = countries.sort( function(a,b){
63
          if(a.name<b.name){
62
        countries => this.countries = countries.sort( function(a,b) {
63
          if (a.name<b.name) {
64 64
            return -1;
65 65
          } else if(a.name>b.name){
66 66
            return 1;
modules/uoa-repository-dashboard-gui/trunk/app/pages/metrics/metrics.module.ts
13 13
import {MetricsUsagestatsComponent} from "./metrics-usagestats.component";
14 14
import { MetricsUsagestatsReportResultsComponent } from './metrics-usagestats-report-results.component';
15 15
import {MetricsUsagestatsReportComponent} from "./metrics-usagestats-report.component";
16
import { ReactiveFormsModule } from '@angular/forms';
16 17

  
17 18
@NgModule ({
18 19
  imports: [
19 20
    CommonModule,
20 21
    TabsModule.forRoot(),
21 22
    MetricsRouting,
22
    ReusableComponentsModule
23
    ReusableComponentsModule,
24
    ReactiveFormsModule
23 25
  ],
24 26
  declarations: [
25 27
    MetricsComponent,
modules/uoa-repository-dashboard-gui/trunk/app/pages/metrics/metrics-usagestats-report-results.component.ts
4 4
import { UsagestatsService } from '../../services/usagestats.service';
5 5
import { ReportResponse } from '../../domain/usageStatsClasses';
6 6
import {ar1_report_results} from "../../domain/sushilite_demo_data/AR1_ex";
7
import { FormBuilder, FormGroup } from '@angular/forms';
7 8

  
8 9
@Component({
9 10
  selector: 'metrics-usagestats-report-results',
10
  templateUrl: 'metrics-usagestats-report-results.component.html'
11
  templateUrl: 'metrics-usagestats-report-results.component.html',
12
  styleUrls:['metrics-usagestats-report-results.component.css']
11 13
})
12 14
export class MetricsUsagestatsReportResultsComponent implements OnInit {
13 15

  
......
23 25
  totalPages:number;
24 26
  selectedItemIndex: number;
25 27

  
28
  pageSizeSelect: FormGroup;
29

  
26 30
  constructor(private route: ActivatedRoute,
27 31
              private authService: AuthenticationService,
28
              private usageService: UsagestatsService) {}
32
              private usageService: UsagestatsService,
33
              private fb: FormBuilder) {}
29 34

  
30 35
  ngOnInit() {
31 36
    this.page = 0;
32 37
    this.pageSize = 10;
33 38
    this.readParams();
39
    this.pageSizeSelect = this.fb.group({selectPageSize: ['']});
34 40
  }
35 41

  
36 42
  readParams() {
......
70 76
        this.errorMessage = '';
71 77
        this.loadingMessage = '';
72 78

  
79
        this.pageSizeSelect.get('selectPageSize').setValue(this.pageSize);
80
        this.pageSizeSelect.get('selectPageSize').updateValueAndValidity();
81

  
73 82
        this.totalPages = Math.ceil(
74 83
          +this.repoResponse.ReportDefinition.Filters
75 84
                  .ReportAttribute.filter(x => x['Name'] === 'ReportItemCount')[0].Value / this.pageSize);
......
101 110
  }
102 111

  
103 112

  
104
  getPageSize(num: string){
105
    this.pageSize = +num;
113
  getPageSize(){
114
    this.pageSize = +(this.pageSizeSelect.get('selectPageSize').value);
106 115
    this.page = 0;
107 116
    this.getReportResponse();
108 117
  }
modules/uoa-repository-dashboard-gui/trunk/app/pages/metrics/metrics-usagestats-report-results.component.css
1
.innerTable {
2
  padding: 50px;
3
}
4

  
5
.innerTable th, .innerTable td {
6
  padding: 11px 12px;
7
}
modules/uoa-repository-dashboard-gui/trunk/app/pages/metrics/metrics-instructions.component.ts
33 33
      piwik => this.piwik = piwik,
34 34
      error => console.log(error),
35 35
      () => {
36
        // TODO: UNCOMMENT
37
        /*if ( this.authService.getUserEmail() !== this.piwik.requestorEmail ) {
36
        if ( this.authService.getUserEmail() !== this.piwik.requestorEmail ) {
38 37
          this.router.navigateByUrl('/403-forbidden', { skipLocationChange: true });
39
        }*/
38
        }
40 39
      }
41 40
    );
42 41
  }
modules/uoa-repository-dashboard-gui/trunk/app/pages/metrics/metrics-usagestats-report-results.component.html
70 70
                  <div>
71 71
                    <div class="show-options uk-inline" style="float: right;">
72 72
                      <div class="filterLabel" style="display: inline;">Results per page:</div>
73
                      <div class="inlineBlock">
74
                        <select #itemsPerPage class="form-control" (change)="getPageSize(itemsPerPage.value)">
73
                      <div [formGroup]="pageSizeSelect" class="inlineBlock">
74
                        <select class="form-control" formControlName="selectPageSize" (change)="getPageSize()">
75 75
                          <option value="10" selected>10</option>
76 76
                          <option value="25">25</option>
77 77
                          <option value="50">50</option>
......
121 121
                                <th>Publisher</th>
122 122
                                <th>Type</th>
123 123
                                <th colspan="2">Downloads/Views</th>
124
                                <!--<th *ngIf="repoResponse.ReportDefinition.Filters.ReportAttribute[0].Value === 'Totals'">
125
                                  Total Downloads
126
                                </th>
127
                                <th *ngIf="repoResponse.ReportDefinition.Filters.ReportAttribute[0].Value === 'Totals'">
128
                                  Total Views
129
                                </th>-->
130 124
                              </tr>
131 125
                            </thead>
132 126
                            <td colspan="6" *ngIf="infoMessage" class="uk-alert">{{ infoMessage }}</td>
133
                            <!--<tbody *ngFor="let item of repoResponse.Report.Report.Customer.ReportItems; let item_i = index"
134
                                   style="{{ (item_i % 2) > 0 ? 'background-color:white; border-bottom: 1px solid gray;': 'border-bottom: 1px solid gray;'">-->
135 127
                            <tbody *ngFor="let item of repoResponse.Report.Report.Customer.ReportItems; let item_i = index"
136 128
                                   style="border-bottom: 1px solid whitesmoke;">
137 129
                              <tr>
......
146 138
                                <td class="uk-text-center"
147 139
                                    *ngIf="repoResponse.ReportDefinition.Filters.ReportAttribute[0].Value === 'Monthly'" colspan="2">
148 140
                                  <a *ngIf="item.ItemPerformance && (item.ItemPerformance.length > 0)"
149
                                     (click)="displayItemPerformance(item_i)">See results</a>
141
                                     (click)="displayItemPerformance(item_i)">{{ (selectedItemIndex === item_i) ? 'Hide' : 'See' }} results</a>
150 142
                                </td>
151 143
                                <td class="uk-text-center"
152 144
                                    *ngIf="repoResponse.ReportDefinition.Filters.ReportAttribute[0].Value === 'Totals'">
......
160 152
                              <tr *ngIf="(selectedItemIndex === item_i)">
161 153
                                <td colspan="6">
162 154
                                  <div class="uk-animation-slide-top-medium uk-margin-small-top">
163
                                    <!--<div class="uk-child-width-expand uk-grid" uk-grid>
164
                                      <div class="uk-h5">Month</div>
165
                                      <div class="uk-h5">Downloads</div>
166
                                      <div class="uk-h5">Views</div>
167
                                    </div>
168
                                    <div *ngFor="let month of item.ItemPerformance" class="uk-child-width-expand uk-grid" uk-grid>
169
                                      <div>{{ month.Period.Begin | date: "MMM yyyy" }}</div>
170
                                      <div>{{ month.Instance[0].Count }}</div>
171
                                      <div>{{ month.Instance[1].Count }}</div>
172
                                    </div>-->
173
                                    <table class="uk-table uk-table-middle uk-table-striped">
155
                                    <table class="uk-table uk-table-middle uk-table-striped innerTable">
174 156
                                      <tr>
175 157
                                        <th>Month</th>
176 158
                                        <th>Downloads</th>
modules/uoa-repository-dashboard-gui/trunk/app/pages/metrics/metrics-show.component.ts
53 53
      () => {
54 54
        this.loadingMessage = '';
55 55
        this.errorMessage = '';
56
        // TODO: UNCOMMENT
57
        /*if ( this.authService.getUserEmail() !== this.piwik.requestorEmail ) {
56
        if ( this.authService.getUserEmail() !== this.piwik.requestorEmail ) {
58 57
          this.router.navigateByUrl('/403-forbidden', { skipLocationChange: true });
59
        } else {*/
58
        } else {
60 59
          this.getMetrics();
61
        /*}*/
60
        }
62 61
      }
63 62
    );
64 63
  }
modules/uoa-repository-dashboard-gui/trunk/app/pages/landing/landing.component.html
161 161
            <li class="el-item">
162 162
              <h3 class="el-title uk-h3 uk-margin-remove">Data acquisition</h3>
163 163
              <div class="el-content">
164
                <a href="/www.cnn.com">How we retrieve data, how often, what processes it goes through (aggregating cleaning, trasnforming, inferring, de-duplicating), what are the quality checks&nbsp;along all&nbsp; data processing stages.</a>
164
                <span>How we retrieve data, how often, what processes it goes through (aggregating cleaning, trasnforming, inferring, de-duplicating), what are the quality checks&nbsp;along all&nbsp; data processing stages.</span>
165 165
              </div>
166 166
            </li>
167 167
            <li class="el-item">
168 168
              <h3 class="el-title uk-h3 uk-margin-remove">Data usage</h3>
169 169
              <div class="el-content">
170
                <a href="/www.cnn.com">Who is able to retrieve our data, what are the licences, what about specific SLAs.</a>
170
                <span>Who is able to retrieve our data, what are the licences, what about specific SLAs.</span>
171 171
              </div>
172 172
            </li>
173 173
          </ul>
174
          <div class="uk-margin uk-margin-remove-bottom uk-text-left">
174
          <!--<div class="uk-margin uk-margin-remove-bottom uk-text-left">
175 175
            <a class="el-content uk-link-text" href="/www.cnn.com" target="_blank">
176 176
              Learn more
177 177
            </a>
178
          </div>
178
          </div>-->
179 179
        </div>
180 180
      </div>
181 181
    </div>
modules/uoa-repository-dashboard-gui/trunk/app/services/statistics.service.ts
11 11

  
12 12

  
13 13
const headerOptions = {
14
  headers : new HttpHeaders().set('Content-Type', 'application/json')
15
    .set('Accept', 'application/json'),
14
  headers : new HttpHeaders().set('Content-Type', 'application/json').set('Accept', 'application/json'),
16 15
  withCredentials: true
17 16
};
18 17

  
modules/uoa-repository-dashboard-gui/trunk/app/app.component.ts
13 13
export class AppComponent implements OnInit {
14 14

  
15 15
  constructor(private router: Router,private authService: AuthenticationService) {
16
    /*disabling console.log in production*/
17
    if ( process.env.PRODUCTION === true ) {
18
      console.log = function () {};
19
    }
16 20

  
17 21
    // URL of the SPA to redirect the user to after login
18 22
    this.authService.redirectUrl = "/dashboard";
modules/uoa-repository-dashboard-gui/trunk/app/shared/footer/footer.component.html
173 173
            </div>
174 174
          </div>
175 175
        </div>
176
        <div class="newsletter uk-margin uk-margin-remove-bottom uk-text-left uk-panel">
176
        <!--<div class="newsletter uk-margin uk-margin-remove-bottom uk-text-left uk-panel">
177 177
          <h6 class="el-title uk-margin uk-h2">
178 178
            Newsletter    </h6>
179 179
          <a href="/www.cnn.com" class="el-link"><span uk-icon="icon: comments;ratio: 1.5" class="el-image uk-icon"><svg width="30" height="30" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1.5"> <polyline fill="none" stroke="#000" points="2 0.5 19.5 0.5 19.5 13"></polyline> <path d="M5,19.71 L5,15 L0,15 L0,2 L18,2 L18,15 L9.71,15 L5,19.71 L5,19.71 L5,19.71 Z M1,14 L6,14 L6,17.29 L9.29,14 L17,14 L17,3 L1,3 L1,14 L1,14 L1,14 Z"></path></svg></span></a>
180 180
        </div>
181 181
        <div class="newsletter uk-panel">
182 182
          <script type="text/javascript">
183
            <!--
183
            &lt;!&ndash;
184 184
            if(typeof acymailing == 'undefined'){
185 185
              var acymailing = Array();
186 186
            }
......
191 191
            acymailing['ACCEPT_TERMS'] = 'Please check the Terms and Conditions';
192 192
            acymailing['CAPTCHA_MISSING'] = 'The captcha is invalid, please try again';
193 193
            acymailing['NO_LIST_SELECTED'] = 'Please select the lists you want to subscribe to';
194
            //-->
194
            //&ndash;&gt;
195 195
          </script>
196 196
          <script type="text/javascript" src="/media/com_acymailing/js/acymailing_module.js?v=570"></script>
197 197

  
198 198
          <link rel="stylesheet" property="stylesheet" href="/media/com_acymailing/css/module_default_square_blue.css?v=1494072539" type="text/css">
199 199
          <script type="text/javascript">
200
            <!--
200
            &lt;!&ndash;
201 201
            acymailing['level'] = 'enterprise';
202
            //-->
202
            //&ndash;&gt;
203 203
          </script><script type="text/javascript">
204
          <!--
204
          &lt;!&ndash;
205 205
          acymailing['reqFieldsformAcymailing61281'] = Array('name','html');
206 206
          acymailing['validFieldsformAcymailing61281'] = Array('Please enter a value for the field Name','Please enter a value for the field Receive');
207
          //-->
207
          //&ndash;&gt;
208 208
        </script><script type="text/javascript">
209
          <!--
209
          &lt;!&ndash;
210 210
          if (window.jQuery) {
211 211
            jQuery(document).ready(function(){
212 212
              jQuery("#acymailing_fulldiv_formAcymailing61281").hide();
......
241 241
              });
242 242
            });
243 243
          }
244
          //-->
245
        </script><div class="acymailing_module" id="acymailing_module_formAcymailing61281">
246
          <div class="acymailing_mootoolsbutton" id="acymailing_toggle_formAcymailing61281">
247
            <p><a class="acymailing_togglemodule" id="acymailing_togglemodule_formAcymailing61281" href="#subscribe">Subscribe</a></p>
248
            <div class="acymailing_fulldiv" id="acymailing_fulldiv_formAcymailing61281" style="text-align: left; display: none;">
249
              <form id="formAcymailing61281" action="/testing-stuff-2" onsubmit="return submitacymailingform('optin','formAcymailing61281')" method="post" name="formAcymailing61281">
250
                <div class="acymailing_module_form">
251
                  <div class="acymailing_form">
252
                    <p class="onefield fieldacyemail" id="field_email_formAcymailing61281">								<span class="acyfield_email acy_requiredField">
253
								<input id="user_email_formAcymailing61281" style="width:80%" onfocus="if(this.value == 'E-mail') this.value = '';" onblur="if(this.value=='') this.value='E-mail';" class="inputbox required" name="user[email]" value="E-mail" title="E-mail" type="text">								</span>
254
                    </p>
255
<!--
256
                    <div class="onefield fieldacycaptcha" id="field_captcha_formAcymailing61281"><div id="formAcymailing61281-captcha" data-sitekey="6LftQyAUAAAAAOv1NBWgayP9RsAeaSPFzSSjqLYc" data-theme="light" data-size="normal"><div style="width: 304px; height: 78px;"><div><iframe src="https://www.google.com/recaptcha/api2/anchor?k=6LftQyAUAAAAAOv1NBWgayP9RsAeaSPFzSSjqLYc&amp;co=aHR0cDovL2RsMTE5Lm1hZGdpay5kaS51b2EuZ3I6ODA.&amp;hl=en-GB&amp;v=r20171115120512&amp;theme=light&amp;size=normal&amp;cb=avgqzgw2ygmu" role="presentation" scrolling="no" sandbox="allow-forms allow-popups allow-same-origin allow-scripts allow-top-navigation allow-modals allow-popups-to-escape-sandbox" width="304" height="78" frameborder="0"></iframe></div><textarea id="g-recaptcha-response-1" name="g-recaptcha-response" class="g-recaptcha-response" style="width: 250px; height: 40px; border: 1px solid #c1c1c1; margin: 10px 25px; padding: 0px; resize: none;  display: none; "></textarea></div></div>					</div>
257
-->
258
                    <p class="acysubbuttons">
259
                      <input class="button subbutton btn btn-primary" value="Subscribe" name="Submit" onclick="try{ return submitacymailingform('optin','formAcymailing61281'); }catch(err){alert('The form could not be submitted '+err);return false;}" type="submit">
260
                    </p>
261
                  </div>
262
                  <script type="text/javascript">
263
                    <!--
264
                    acymailing['excludeValuesformAcymailing61281'] = Array();
265
                    acymailing['excludeValuesformAcymailing61281']['email'] = 'E-mail';
266
                    //-->
267
                  </script>			<input name="ajax" value="0" type="hidden">
268
                  <input name="acy_source" value="module_361" type="hidden">
269
                  <input name="ctrl" value="sub" type="hidden">
270
                  <input name="task" value="notask" type="hidden">
271
                  <input name="redirect" value="http%3A%2F%2Fdl119.madgik.di.uoa.gr%2Ftesting-stuff-2" type="hidden">
272
                  <input name="redirectunsub" value="http%3A%2F%2Fdl119.madgik.di.uoa.gr%2Ftesting-stuff-2" type="hidden">
273
                  <input name="option" value="com_acymailing" type="hidden">
274
                  <input name="hiddenlists" value="1" type="hidden">
275
                  <input name="acyformname" value="formAcymailing61281" type="hidden">
276
                  <input name="Itemid" value="185" type="hidden">			</div>
277
              </form>
244
          //&ndash;&gt;
245
        </script>
246
          <div class="acymailing_module" id="acymailing_module_formAcymailing61281">
247
            <div class="acymailing_mootoolsbutton" id="acymailing_toggle_formAcymailing61281">
248
              <p><a class="acymailing_togglemodule" id="acymailing_togglemodule_formAcymailing61281" href="#subscribe">Subscribe</a></p>
249
              <div class="acymailing_fulldiv" id="acymailing_fulldiv_formAcymailing61281" style="text-align: left; display: none;">
250
                <form id="formAcymailing61281" action="/testing-stuff-2" onsubmit="return submitacymailingform('optin','formAcymailing61281')" method="post" name="formAcymailing61281">
251
                  <div class="acymailing_module_form">
252
                    <div class="acymailing_form">
253
                      <p class="onefield fieldacyemail" id="field_email_formAcymailing61281">								<span class="acyfield_email acy_requiredField">
254
                  <input id="user_email_formAcymailing61281" style="width:80%" onfocus="if(this.value == 'E-mail') this.value = '';" onblur="if(this.value=='') this.value='E-mail';" class="inputbox required" name="user[email]" value="E-mail" title="E-mail" type="text">								</span>
255
                      </p>
256
  &lt;!&ndash;
257
                      <div class="onefield fieldacycaptcha" id="field_captcha_formAcymailing61281"><div id="formAcymailing61281-captcha" data-sitekey="6LftQyAUAAAAAOv1NBWgayP9RsAeaSPFzSSjqLYc" data-theme="light" data-size="normal"><div style="width: 304px; height: 78px;"><div><iframe src="https://www.google.com/recaptcha/api2/anchor?k=6LftQyAUAAAAAOv1NBWgayP9RsAeaSPFzSSjqLYc&amp;co=aHR0cDovL2RsMTE5Lm1hZGdpay5kaS51b2EuZ3I6ODA.&amp;hl=en-GB&amp;v=r20171115120512&amp;theme=light&amp;size=normal&amp;cb=avgqzgw2ygmu" role="presentation" scrolling="no" sandbox="allow-forms allow-popups allow-same-origin allow-scripts allow-top-navigation allow-modals allow-popups-to-escape-sandbox" width="304" height="78" frameborder="0"></iframe></div><textarea id="g-recaptcha-response-1" name="g-recaptcha-response" class="g-recaptcha-response" style="width: 250px; height: 40px; border: 1px solid #c1c1c1; margin: 10px 25px; padding: 0px; resize: none;  display: none; "></textarea></div></div>					</div>
258
  &ndash;&gt;
259
                      <p class="acysubbuttons">
260
                        <input class="button subbutton btn btn-primary" value="Subscribe" name="Submit" onclick="try{ return submitacymailingform('optin','formAcymailing61281'); }catch(err){alert('The form could not be submitted '+err);return false;}" type="submit">
261
                      </p>
262
                    </div>
263
                    <script type="text/javascript">
264
                      &lt;!&ndash;
265
                      acymailing['excludeValuesformAcymailing61281'] = Array();
266
                      acymailing['excludeValuesformAcymailing61281']['email'] = 'E-mail';
267
                      //&ndash;&gt;
268
                    </script>			<input name="ajax" value="0" type="hidden">
269
                    <input name="acy_source" value="module_361" type="hidden">
270
                    <input name="ctrl" value="sub" type="hidden">
271
                    <input name="task" value="notask" type="hidden">
272
                    <input name="redirect" value="http%3A%2F%2Fdl119.madgik.di.uoa.gr%2Ftesting-stuff-2" type="hidden">
273
                    <input name="redirectunsub" value="http%3A%2F%2Fdl119.madgik.di.uoa.gr%2Ftesting-stuff-2" type="hidden">
274
                    <input name="option" value="com_acymailing" type="hidden">
275
                    <input name="hiddenlists" value="1" type="hidden">
276
                    <input name="acyformname" value="formAcymailing61281" type="hidden">
277
                    <input name="Itemid" value="185" type="hidden">			</div>
278
                </form>
279
              </div>
278 280
            </div>
279
          </div> </div>
280
        </div>
281
          </div>
282
        </div>-->
281 283
      </div>
282 284

  
283 285
      <div class="uk-width-expand@m uk-light">
284 286
        <div>
285 287
          <ul class="uk-subnav uk-margin-remove-bottom uk-subnav-divider" uk-margin="">
286 288
            <li class="el-item uk-first-column">
287
              <a class="el-link" href="/www.cnn.com">About</a>
289
              <a class="el-link" href="https://{{ inBeta ? 'beta.' : '' }}openaire.eu/project-factsheets">About</a>
288 290
            </li>
289
            <li class="el-item">
291
            <!--<li class="el-item">
290 292
              <a class="el-content uk-disabled">Services</a>
291
            </li>
293
            </li>-->
292 294
            <li class="el-item">
293
              <a class="el-link" href="/news/?filter_tag[0]=">News</a>
295
              <a class="el-link" href="https://{{ inBeta ? 'beta.' : '' }}openaire.eu/news-events">News - Events</a>
294 296
            </li>
295 297
            <li class="el-item">
296
              <a class="el-link" href="/index.php?option=com_jevents&amp;view=month&amp;layout=calendar&amp;Itemid=2090">Events</a>
298
              <a class="el-content uk-disabled" href="https://blogs.openaire.eu/">Blog</a>
297 299
            </li>
298 300
            <li class="el-item">
299
              <a class="el-content uk-disabled">Blog</a>
301
              <a class="el-content uk-disabled" href="https://{{ inBeta ? 'beta.' : '' }}.openaire.eu/contact-us">Contact us</a>
300 302
            </li>
301
            <li class="el-item">
302
              <a class="el-content uk-disabled">Contact us</a>
303
            </li>
304 303
          </ul>
305 304
        </div>
306 305
      </div>
......
317 316
        </div>
318 317
        <div class="footer-license uk-margin uk-margin-remove-bottom uk-text-center uk-text-lead">
319 318
          <div><a href="http://creativecommons.org/licenses/by/4.0/" rel="license"><img src="https://i.creativecommons.org/l/by/3.0/80x15.png" alt="Creative" style="height: auto; max-width: 100%; vertical-align: middle;"></a>&nbsp;UNLESS OTHERWISE INDICATED, ALL MATERIALS CREATED BY THE OPENAIRE CONSORTIUM ARE LICENSED UNDER A&nbsp;<a href="http://creativecommons.org/licenses/by/4.0/" rel="license">CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE</a>.</div>
320
          <div>OPENAIRE IS POWERED BY&nbsp;<a href="http://www.d-net.research-infrastructures.eu/">D-NET</a>.</div></div>
319
          <!--<div>OPENAIRE IS POWERED BY&nbsp;<a href="http://www.d-net.research-infrastructures.eu/">D-NET</a>.</div></div>-->
321 320
        <div class="uk-margin uk-margin-remove-bottom uk-text-center">
322 321
          <img src="http://dl119.madgik.di.uoa.gr/templates/yootheme/cache/ec_logo_inv_small-4aa7cf58.png" srcset="http://dl119.madgik.di.uoa.gr/templates/yootheme/cache/ec_logo_inv_small-e4d7de03.png 91w,http://dl119.madgik.di.uoa.gr/templates/yootheme/cache/ec_logo_inv_small-4aa7cf58.png 114w" sizes="(min-width: 114px) 114px, 100vw" class="el-image" alt="European Commission" width="114">
323 322
        </div>
modules/uoa-repository-dashboard-gui/trunk/app/shared/footer/footer.component.ts
1 1
/**
2 2
 * Created by stefania on 1/19/17.
3 3
 */
4
import {Component} from "@angular/core";
4
import { Component, OnInit } from '@angular/core';
5 5

  
6 6
@Component({
7 7
  selector: 'footer',
......
9 9
  styleUrls: ['./footer.component.css'],
10 10
})
11 11

  
12
export class FooterComponent {
12
export class FooterComponent implements OnInit {
13
  inBeta: boolean;
13 14

  
15
  constructor() {}
16

  
17
  ngOnInit() {
18
    const baseUrl = window.location.origin;
19
    this.inBeta = ( baseUrl.includes('beta') || baseUrl.includes('athenarc') );
20
  }
21

  
14 22
}
modules/uoa-repository-dashboard-gui/trunk/Dockerfile
3 3
COPY nginx.conf /etc/nginx/nginx.conf
4 4
COPY index.html /usr/share/nginx/html/
5 5
COPY dist/      /usr/share/nginx/html/dist
6
COPY assets/        /usr/share/nginx/html/assets
6
COPY assets/    /usr/share/nginx/html/assets
7 7

  
8 8
EXPOSE 80
modules/uoa-repository-dashboard-gui/trunk/webpack.config.js
77 77
    },
78 78
    proxy: {
79 79
      '/uoa-repository-manager-service': {
80
        target: 'http://aleka.athenarc.gr:8480',
80
        target: 'http://koulis.athenarc.gr:8480',
81 81
        secure: false
82 82
      }
83 83
    }
......
122 122
      }
123 123
    );
124 124
  } else {
125
    /*disabling console.log in production*/
126
    console.log = function () {};
127 125

  
128 126
    webpackConfig.plugins.push(
129 127
      new AotPlugin({

Also available in: Unified diff