From e8fa9bb6028ccb01816091a6d7584cc5c63d5912 Mon Sep 17 00:00:00 2001 From: Siroco Date: Thu, 22 Nov 2018 21:23:41 +0100 Subject: [PATCH] Add language support for wordpress content (es+eu) Redesign css for url backgrounds TODO: dedalo language support --- package.json | 3 +- src/app/app-routing.module.ts | 5 +- src/app/app.module.ts | 3 +- src/app/home/home.component.html | 2 +- src/app/home/home.component.ts | 10 +- .../interview-grid.component.css | 23 +++ .../interview-grid.component.html | 23 ++- src/app/interview/interview.component.html | 6 +- src/app/interview/interview.component.ts | 8 +- src/app/menu/menu.component.html | 6 +- src/app/menu/menu.component.ts | 15 +- src/app/page.service.ts | 19 +- src/app/page.ts | 5 + src/app/page/page.component.html | 20 +- src/app/page/page.component.ts | 6 +- src/assets/industria-paisaia.es.svg | 185 ++++++++++++++++++ src/assets/industria-paisaia.svg.es.svg | 185 ++++++++++++++++++ src/index.html | 4 +- src/locale/messages.es.xlf | 7 + src/locale/messages.eu.xlf | 7 + src/locale/messages.xlf | 7 + src/styles.css | 4 +- 22 files changed, 509 insertions(+), 44 deletions(-) create mode 100644 src/assets/industria-paisaia.es.svg create mode 100644 src/assets/industria-paisaia.svg.es.svg create mode 100644 src/locale/messages.es.xlf create mode 100644 src/locale/messages.eu.xlf create mode 100644 src/locale/messages.xlf diff --git a/package.json b/package.json index 9a552e0..d0c05e8 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "ng": "ng", "start": "ng serve", "build": "ng build --prod", - "test": "ng test", + "build-i18n":"for lang in es eu; do ng build --output-path=dist/$lang --aot --bh /$lang/ --i18n-file=src/locale/messages.$lang.xlf --i18n-format=xlf --locale=$lang; done", + "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" }, diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e3832fa..e345776 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -6,8 +6,9 @@ import { InterviewComponent } from './interview/interview.component'; const routes: Routes = [ - { path: '', redirectTo: 'home', pathMatch: 'full'}, - { path: 'home', component: HomeComponent }, + // { path: '', redirectTo: 'home', pathMatch: 'full'}, + // { path: 'home', component: HomeComponent }, + { path: '', component: HomeComponent , pathMatch: 'full'}, { path: 'entrevistas', component: InterviewComponent }, { path: 'entrevistas/:id', component: InterviewComponent }, { path: ':id', component: PageComponent }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8968b8f..cc3244d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,5 +1,5 @@ import { BrowserModule } from '@angular/platform-browser'; -import { NgModule } from '@angular/core'; +import { NgModule, LOCALE_ID } from '@angular/core'; import { HttpModule } from '@angular/http'; /*pdf*/ import { FormsModule } from '@angular/forms'; @@ -48,6 +48,7 @@ import { DedaloService } from './dedalo.service'; providers: [ PageService, DedaloService, + //{provide: LOCALE_ID, useValue: 'es-ES'} ], bootstrap: [AppComponent] }) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 1c54022..fce1b1a 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,2 +1,2 @@ - + diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 4764b1d..9e0eeb7 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit,LOCALE_ID, Inject } from '@angular/core'; import { PageService } from '../page.service'; import { PageItem } from '../page'; import { ActivatedRoute } from "@angular/router"; @@ -11,20 +11,26 @@ import { ActivatedRoute } from "@angular/router"; export class HomeComponent implements OnInit { pages : PageItem[]; + homeImage = "industria-paisaia.svg" constructor( private route: ActivatedRoute, - private pageService: PageService + private pageService: PageService, + @Inject(LOCALE_ID) protected localeId: string ) { // this.route.params.subscribe( params => console.log(params.id) ); } ngOnInit() { + console.log(this.localeId); + if (this.localeId==='es') this.homeImage = "industria-paisaia.es.svg"; + else if (this.localeId==='eu') this.homeImage = "industria-paisaia.svg"; // this.pageService.getItems(); this.pageService.getParentPages() .subscribe(data => { this.pages = data; + //this.pageService.currentPage }); } diff --git a/src/app/interview-grid/interview-grid.component.css b/src/app/interview-grid/interview-grid.component.css index e69de29..fe6f7ed 100644 --- a/src/app/interview-grid/interview-grid.component.css +++ b/src/app/interview-grid/interview-grid.component.css @@ -0,0 +1,23 @@ +.thumbnail-image { + width: 100%; + height:100%; + min-height: 150px; + background-repeat: no-repeat; + background-size: cover; + background-position: center center; +} + +.entrevista .item-container-wrapper { + cursor:pointer; + transition-duration: 2s; + padding-top:20px; + padding-bottom:20px; +} + +.entrevista .item-container-wrapper:hover { + background:#d2e8eb; +} + +h2.thumbtitle { + color:#f7886c; +} diff --git a/src/app/interview-grid/interview-grid.component.html b/src/app/interview-grid/interview-grid.component.html index e5aaa5a..9c4b0c3 100644 --- a/src/app/interview-grid/interview-grid.component.html +++ b/src/app/interview-grid/interview-grid.component.html @@ -10,10 +10,10 @@
-

Entrevistas

+

{{entrevista.title}}

-

{{entrevista.abstract}}

+ @@ -44,14 +44,19 @@
+
-
-
-
- -

{{entrevista.title}}

-

+
+
+
-
+
+
+

{{entrevista.title}}

+
+ +
diff --git a/src/app/interview/interview.component.html b/src/app/interview/interview.component.html index 6f2534c..5ea133b 100644 --- a/src/app/interview/interview.component.html +++ b/src/app/interview/interview.component.html @@ -1,9 +1,5 @@ -
-
-
-
-
+
diff --git a/src/app/interview/interview.component.ts b/src/app/interview/interview.component.ts index 0386bd9..d60eb92 100644 --- a/src/app/interview/interview.component.ts +++ b/src/app/interview/interview.component.ts @@ -17,11 +17,14 @@ export class InterviewComponent implements OnInit { entrevistas : Entrevista[] entrevistaID: string single: boolean = false + loading: boolean = true; constructor( private entrevistaService : DedaloService, private route: ActivatedRoute, - ) { + ) {} + + ngOnInit() { this.getEntrevistas() this.route.params.subscribe( params => { this.entrevistaID = params.id @@ -29,9 +32,6 @@ export class InterviewComponent implements OnInit { }); } - ngOnInit() { - } - getInterviews() : void { this.interviews = []; } diff --git a/src/app/menu/menu.component.html b/src/app/menu/menu.component.html index aefdda5..9683c52 100644 --- a/src/app/menu/menu.component.html +++ b/src/app/menu/menu.component.html @@ -1,5 +1,5 @@
- +