Compare commits

..

No commits in common. "d1cd6bd6a65cf8800d6abbd661594b78d2119778" and "e8fa9bb6028ccb01816091a6d7584cc5c63d5912" have entirely different histories.

6 changed files with 6 additions and 9 deletions

View File

@ -32,7 +32,7 @@
<div *ngFor="let video of entrevista.audiovisual; let i = index">
<div class="row" *ngIf="i==0">
<video controls style="width:auto;max-height:40vh; margin:auto;">
<source [src]="'https://dedalo.anorgatarrak.eus'+video.video" type="video/mp4">
<source [src]="'http://dedalo.anorgatarrak.eus'+video.video" type="video/mp4">
</video>
</div>
<div class="row" *ngIf="i==0">
@ -48,7 +48,7 @@
<section class="entrevista" *ngIf="entrevistas && !single">
<div class="row item-container-wrapper" *ngFor="let entrevista of entrevistas" [routerLink]="entrevista.id" style="">
<div class="col-md-3 offset-md-1">
<div *ngIf="entrevista.image" class="thumbnail-image" [ngStyle]="{backgroundImage:'url(https://dedalo.anorgatarrak.eus'+entrevista.image[0].src+')'}"></div>
<div *ngIf="entrevista.image" class="thumbnail-image" [ngStyle]="{backgroundImage:'url(http://dedalo.anorgatarrak.eus'+entrevista.image[0].src+')'}"></div>
</div>
<div class="col-md-7">
<div class="item-container" style="width:auto;">

View File

@ -65,7 +65,7 @@ export class InterviewComponent implements OnInit {
this.entrevistas = this.entrevistas.filter(entrevista => entrevista.id == this.entrevistaID)
if(this.entrevistas[0].title) { this.pages[0].title = this.entrevistas[0].title; }
if(this.entrevistas[0].abstract) { this.pages[0].excerpt = this.entrevistas[0].abstract; }
if(this.entrevistas[0].image) { this.pages[0].background_image = "https://dedalo.anorgatarrak.eus"+this.entrevistas[0].image[0].src; }
if(this.entrevistas[0].image) { this.pages[0].background_image = "http://dedalo.anorgatarrak.eus"+this.entrevistas[0].image[0].src; }
}
})
}

View File

@ -88,10 +88,7 @@ export class PageService {
page['parent_title']=item['parentTitle']['title'];
page['parent_link']=item['parentTitle']['link'];
if (item['acf']['pdf']) {
page['pdf']=item['acf']['pdf'];
if (item['acf']['pagina_del_pdf']) page['pdf']['url'] = page['pdf']['url']+"#page="+item['acf']['pagina_del_pdf'];
}
if (item['acf']['pdf']) { page['pdf']=item['acf']['pdf']; }
else { page['pdf']=null; }
/* chilsd */

View File

@ -22,7 +22,6 @@ export class PageItem {
es:{ slug:string},
eu:{ slug:string},
},
public pdf?:any,
) {}
// public set (key,attr) {

View File

@ -41,6 +41,7 @@
</section>
<section class="section-publitas">
<div class="row" *ngIf="page.pdf">
<div class="col-md-12">
<!-- <div><h3>{{page.pdf.title}}</h3></div> -->
<simple-pdf-viewer #pdfViewer [src]="page.pdf.url" [removePageBorders]="true" (onProgress)="onProgressPDF($event,page.pdf.filesize)"></simple-pdf-viewer>

View File

@ -90,7 +90,7 @@ export class PageComponent implements OnInit {
.subscribe(data => {
this.pages = data;
this.pages.forEach( (p) => {
this.pageService.currentPage = p as PageItem;
this.pageService.currentPage = p;
var safeUrl:SafeUrl;
safeUrl = this.sanitizer.bypassSecurityTrustUrl('https://backend.industriapaisaia.eus/wp-content/uploads/2018/10/test.pdf');
p['publitas_link_sanitize'] = safeUrl;