Compare commits

...

3 Commits

Author SHA1 Message Date
Siroco
38ed7cda56 Cambio el link a los media en Interviews*
Cambio styles para reducir el video al 50%
Cambio styles para versión movil
2019-01-16 23:19:13 +01:00
Siroco
ab8fd34ce9 Hide texto-legal/lege-oharra 2019-01-15 00:14:05 +01:00
Siroco
b611591998 Update template 2019-01-14 23:50:28 +01:00
14 changed files with 52 additions and 134 deletions

View File

@ -1,6 +1,7 @@
<footer class="single"> <footer class="single">
<p>&copy; <span i18n>Museo Zumalakarregi</span>. 2018 - <span i18n="copyright text">El contenido de este sitio web está bajo la licencia <a target="_blank" href="https://creativecommons.org/licenses/by-nc-sa/3.0/deed.es_ES">Creative Commons By-SA-NC</a></span> - <a routerLink="/texto-legal"><span i18n>Texto legal</span></a> </p> <p>&copy; <span i18n>Museo Zumalakarregi</span>. 2018 - <span i18n="copyright text">El contenido de este sitio web está bajo la licencia <a target="_blank" href="https://creativecommons.org/licenses/by-nc-sa/3.0/deed.es_ES">Creative Commons By-SA-NC</a></span> - <span i18n><a [routerLink]="_link_texto_legal">{{_name_texto_legal}}</a></span> </p>
<p>www.zumalakarregimuseoa.eus - mzumalakarregi@gipuzkoa.eus - +34 943 88 99 00 - Muxika Egurastokia 6. 20216 Ormaiztegi (Gipuzkoa)</p> <p>www.zumalakarregimuseoa.eus - mzumalakarregi@gipuzkoa.eus - +34 943 88 99 00 - Muxika Egurastokia 6. 20216 Ormaiztegi (Gipuzkoa)</p>
<p>Developed by <a href="https://www.audio-lab.org">Audio-lab</a></p>
<a href="http://www.zumalakarregimuseoa.eus"><img title="Iniciativa del Museo Zumalakarregi" src="assets/zuma-dipu.jpg" style="margin:0 30px;"/></a> <a href="http://www.zumalakarregimuseoa.eus"><img title="Iniciativa del Museo Zumalakarregi" src="assets/zuma-dipu.jpg" style="margin:0 30px;"/></a>
<a href="http://www.irizar.com/"><img title="Con el patrocinio de Irizar Sociedad Cooperativa" src="assets/irizar.jpg" style="max-width:100px;margin:0 30px;"/></a> <a href="http://www.irizar.com/"><img title="Con el patrocinio de Irizar Sociedad Cooperativa" src="assets/irizar.jpg" style="max-width:100px;margin:0 30px;"/></a>
</footer> </footer>

View File

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit,LOCALE_ID, Inject } from '@angular/core';
@Component({ @Component({
selector: 'app-footer', selector: 'app-footer',
@ -7,9 +7,23 @@ import { Component, OnInit } from '@angular/core';
}) })
export class FooterComponent implements OnInit { export class FooterComponent implements OnInit {
constructor() { } _link_texto_legal:string;
_name_texto_legal:string;
constructor(
@Inject(LOCALE_ID) protected localeId: string
) { }
ngOnInit() { ngOnInit() {
switch (this.localeId) {
case "eu":
this._link_texto_legal = "lege-oharra";
this._name_texto_legal = "Lege Oharra";
break;
default:
this._link_texto_legal = "texto-legal";
this._name_texto_legal = "Texto Legal";
}
} }
} }

View File

@ -16,6 +16,7 @@
<!-- <li><strong><span i18n>Fecha:</span></strong> <!-- <li><strong><span i18n>Fecha:</span></strong>
<ul><li>{{entrevista.date}}</li></ul> <ul><li>{{entrevista.date}}</li></ul>
</li> --> </li> -->
<div [innerHTML]="entrevista.abstract" style="margin-bottom:50px;"></div>
<li *ngIf="entrevista.informant"><strong><span i18n>Informantes:</span></strong> <li *ngIf="entrevista.informant"><strong><span i18n>Informantes:</span></strong>
<ul> <ul>
<li *ngFor="let i of entrevista.informant; let i = index; let odd = odd"><span *ngIf="odd">{{i.surname}}; {{i.name}}</span></li> <li *ngFor="let i of entrevista.informant; let i = index; let odd = odd"><span *ngIf="odd">{{i.surname}}; {{i.name}}</span></li>
@ -37,11 +38,10 @@
</div> --> </div> -->
<!-- informant --> <!-- informant -->
<!-- audiovisual --> <!-- audiovisual -->
<div [innerHTML]="entrevista.abstract" style="margin-bottom:50px;"></div> <div style="width:100%;" *ngFor="let video of entrevista.audiovisual; let i = index;let odd = odd;">
<div *ngFor="let video of entrevista.audiovisual; let i = index;let odd = odd;"> <div class="row" *ngIf="odd" style="margin-bottom:20px;">
<div class="row" *ngIf="odd"> <video controls style="border:5px solid #fff;margin-bottom:20px;width:auto; margin:auto;background-image:url('https://backend.industriapaisaia.eus/wp-content/uploads/2019/01/industria-paisaia-poster.png');background-size:contain;background-repeat:no-repeat;background-position:center center;">
<video controls style="width:auto; margin:auto;"> <source [src]="this._MEDIAURL+video.video" type="video/mp4">
<source [src]="'https://dedalo.anorgatarrak.eus'+video.video" type="video/mp4">
</video> </video>
</div> </div>
<div class="row" *ngIf="video.rsc36 && odd"> <div class="row" *ngIf="video.rsc36 && odd">
@ -59,7 +59,7 @@
<section class="entrevista" *ngIf="entrevistas && !single"> <section class="entrevista" *ngIf="entrevistas && !single">
<div class="row item-container-wrapper" *ngFor="let entrevista of entrevistas" [routerLink]="entrevista.id" style=""> <div class="row item-container-wrapper" *ngFor="let entrevista of entrevistas" [routerLink]="entrevista.id" style="">
<div class="col-md-3 offset-md-1"> <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('+this._MEDIAURL+entrevista.image[0].src+')'}"></div>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<div class="item-container" style="width:auto;"> <div class="item-container" style="width:auto;">

View File

@ -13,6 +13,9 @@ export class InterviewGridComponent implements OnInit {
@Input() entrevistas : Entrevista[] @Input() entrevistas : Entrevista[]
@Input() single: boolean @Input() single: boolean
_MEDIAURL = 'https://www.industriapaisaia.eus';
//_MEDIAURL = 'https://dedalo.anorgatarrak.eus';
constructor() {} constructor() {}
ngOnInit() {} ngOnInit() {}

View File

@ -15,10 +15,12 @@ export class InterviewComponent implements OnInit {
pages : PageItem[]; pages : PageItem[];
interviews : InterviewItem[]; interviews : InterviewItem[];
entrevistas : Entrevista[] entrevistas : Entrevista[];
entrevistaID: string entrevistaID: string;
single: boolean = false single: boolean = false;
loading: boolean = true; loading: boolean = true;
_MEDIAURL = 'https://www.industriapaisaia.eus';
constructor( constructor(
private entrevistaService : DedaloService, private entrevistaService : DedaloService,
@ -81,7 +83,7 @@ export class InterviewComponent implements OnInit {
this.entrevistas = this.entrevistas.filter(entrevista => entrevista.id == this.entrevistaID) 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].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].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 = this._MEDIAURL+this.entrevistas[0].image[0].src; }
} }
}) })
} }

View File

@ -19,8 +19,8 @@
<li>Video</li> <li>Video</li>
<li>Imágen</li> <li>Imágen</li>
</ul> --> </ul> -->
<app-menu-childs *ngIf="page.parent==0 && page.slug!='texto-legal'" [parent_id]="page.id" [parent_link]="page.link" [parent_title]="page.title"></app-menu-childs> <app-menu-childs *ngIf="page.parent==0 && page.slug!='texto-legal' && page.slug!='lege-oharra'" [parent_id]="page.id" [parent_link]="page.link" [parent_title]="page.title"></app-menu-childs>
<app-menu-childs *ngIf="page.parent>0 && page.slug!='texto-legal'" [parent_id]="page.parent" [parent_title]="page.parent_title" [parent_link]="page.parent_link"></app-menu-childs> <app-menu-childs *ngIf="page.parent>0 && page.slug!='texto-legal' && page.slug!='lege-oharra'" [parent_id]="page.parent" [parent_title]="page.parent_title" [parent_link]="page.parent_link"></app-menu-childs>
<!-- imagenes en lista--> <!-- imagenes en lista-->
</div> </div>
<div class="col-md-7 col-xm-12"> <div class="col-md-7 col-xm-12">

View File

@ -0,0 +1,2 @@
#texto-legal {display:none;}
#lege-oharra {display:none;}

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -2,11 +2,14 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title i18n>Industria Paisaia | Memoria y paisaje industrial . Irizar</title> <title i18n>Industria Paisaia . Irizar</title>
<base href="/"> <base href="/">
<meta name="description" content="Industria Paisaia">
<meta name="keywords" content="Museo Zuamalakarregi, exposición, Made in Ormaiztegi, Fábrica, empresa, memoria, historia, Ormaiztegi, Gipuzkoa, Irizar, Paisaje industrial, Memoria industrial, empresario, empresaria, emprendedor, emprendedora, Mukija, Azurmendi, Lasa, Garcia, Telleria, obrero, obrera, trabajador, trabajadora, motor, carrocería, tejería, balneario, turismo, aguas sulfurosas, rotor, investigación, tejido empresarial, desarrollo industrial, taller, viaducto de Ormaiztegi. Ferrocarril del Norte, patrimonio, patrimonio industrial, hierro, siglo XIX, siglo diecinueve, negocio, bobinaje, entrevistas, memoria oral, patrimonio inmaterial,Fabrika, enpresa, memoria, historia, Ormaiztegi, Gipuzkoa, irizar, Industria paisaia, industria memoria, enpresaburua, ekintzailea, Mujika, Azurmendi, Lasa, garcia, langilea, motorra, karrozeria, bainuetxea, turismoa, ur beltza, errotorra, ikerketa, enpresa sarea, industria garapena, tailerra, Ormaiztegiko trenzubia, Norteko Ferrokarrila, ondarea, ondare industriala, burdina, XIX. mendea, hemeretzigarren mendea, negozio, bobinatzea, elkarrizketak, ahozko memoria, ondare inmateriala">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="/assets/favicon.ico">
</head> </head>
<body> <body>
<app-root></app-root> <app-root></app-root>

View File

@ -28,7 +28,7 @@
</context-group> </context-group>
</trans-unit> </trans-unit>
<trans-unit id="7985f472540105f3f50778f418d7b31de17599ad" datatype="html" approved="yes"> <trans-unit id="7985f472540105f3f50778f418d7b31de17599ad" datatype="html" approved="yes">
<source>Sección referente a <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/><x id="INTERPOLATION" equiv-text="{{page.title}}"/><x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> en la publicación <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/><x id="INTERPOLATION_1" equiv-text="{{page.pdf.title}}"/><x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source> <target state="translated"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/><x id="INTERPOLATION" equiv-text="{{page.title}}"/><x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/>ri buruzko atala, <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/><x id="INTERPOLATION_1" equiv-text="{{page.pdf.title}}"/><x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/>aren garapena publikazioan </target><context-group purpose="location"> <source>Sección referente a <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/><x id="INTERPOLATION" equiv-text="{{page.title}}"/><x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> en la publicación <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/><x id="INTERPOLATION_1" equiv-text="{{page.pdf.title}}"/><x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source> <target state="translated"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/><x id="INTERPOLATION" equiv-text="{{page.title}}"/><x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/>ri buruzko atala, <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/><x id="INTERPOLATION_1" equiv-text="{{page.pdf.title}}"/><x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> publikazioan </target><context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context> <context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">44</context> <context context-type="linenumber">44</context>
</context-group> </context-group>

View File

@ -1,112 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="ng2.template">
<body>
<trans-unit id="cf889c9a1f82cc60750a08dbe904a3d12be1e47f" datatype="html">
<source>Museo Zumalakarregi</source>
<context-group purpose="location">
<context context-type="sourcefile">app/footer/footer.component.ts</context>
<context context-type="linenumber">2</context>
</context-group>
</trans-unit>
<trans-unit id="25c82e39720e69847de05cdec745e285e2e9cca0" datatype="html">
<source>El contenido de este sitio web está bajo la licencia <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>Creative Commons By-SA-NC<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/></source>
<context-group purpose="location">
<context context-type="sourcefile">app/footer/footer.component.ts</context>
<context context-type="linenumber">2</context>
</context-group>
<note priority="1" from="description">copyright text</note>
</trans-unit>
<trans-unit id="f413614f8e419403f1dc5809f07ebbd5aa5b8c67" datatype="html">
<source>Texto legal</source>
<context-group purpose="location">
<context context-type="sourcefile">app/footer/footer.component.ts</context>
<context context-type="linenumber">2</context>
</context-group>
</trans-unit>
<trans-unit id="a8709df32837914fd6b5ae84d2be5043e4f0aef6" datatype="html">
<source>Galería fotográfica</source>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">39</context>
</context-group>
</trans-unit>
<trans-unit id="7985f472540105f3f50778f418d7b31de17599ad" datatype="html">
<source>Sección referente a <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/><x id="INTERPOLATION" equiv-text="{{page.title}}"/><x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> en la publicación <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/><x id="INTERPOLATION_1" equiv-text="{{page.pdf.title}}"/><x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">44</context>
</context-group>
</trans-unit>
<trans-unit id="1af8b50dae005a00bc39c00a17693a6b46705677" datatype="html">
<source>Cargando documento</source>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">50</context>
</context-group>
</trans-unit>
<trans-unit id="15bd9a60dbeb82c176a09f4d2653934414e9d528" datatype="html">
<source>Primera página</source>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">53</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">61</context>
</context-group>
</trans-unit>
<trans-unit id="41ada76252535a632219b680c25cebe9ccb3e16b" datatype="html">
<source>Anterior</source>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">54</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">62</context>
</context-group>
</trans-unit>
<trans-unit id="0ac5848d3ee8b22b4f286fbd661a0649e42fe5ca" datatype="html">
<source>Siguiente</source>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">56</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">64</context>
</context-group>
</trans-unit>
<trans-unit id="6c7999abba43653026019f7ad548bcd739891efc" datatype="html">
<source>Última página</source>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">57</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">65</context>
</context-group>
</trans-unit>
<trans-unit id="af830f23806e4451cb81b00b23cc9e59644b4c50" datatype="html">
<source>Descarga</source>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">58</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">app/page/page.component.ts</context>
<context context-type="linenumber">66</context>
</context-group>
</trans-unit>
<trans-unit id="d94368d7f34cb9a2d87629580a5ae428c64ee96a" datatype="html">
<source>Informantes:</source>
<context-group purpose="location">
<context context-type="sourcefile">app/interview-grid/interview-grid.component.ts</context>
<context context-type="linenumber">19</context>
</context-group>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"> <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="ng2.template"> <file source-language="es" datatype="plaintext" original="ng2.template">
<body> <body>
<trans-unit id="cf889c9a1f82cc60750a08dbe904a3d12be1e47f" datatype="html"> <trans-unit id="cf889c9a1f82cc60750a08dbe904a3d12be1e47f" datatype="html">
<source>Museo Zumalakarregi</source> <source>Museo Zumalakarregi</source>
@ -17,8 +17,8 @@
</context-group> </context-group>
<note priority="1" from="description">copyright text</note> <note priority="1" from="description">copyright text</note>
</trans-unit> </trans-unit>
<trans-unit id="f413614f8e419403f1dc5809f07ebbd5aa5b8c67" datatype="html"> <trans-unit id="f524e22da94815e45232fd48b6f0ed63b53d188b" datatype="html">
<source>Texto legal</source> <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>Texto legal<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/></source>
<context-group purpose="location"> <context-group purpose="location">
<context context-type="sourcefile">app/footer/footer.component.ts</context> <context context-type="sourcefile">app/footer/footer.component.ts</context>
<context context-type="linenumber">2</context> <context context-type="linenumber">2</context>

View File

@ -81,7 +81,8 @@ article div.article-content div.alignleft { float: left;max-width: 50%;margin: 0
article div.article-content img.alignleft { float: left;max-width: 50%;margin: 0 0 20px 20px;} article div.article-content img.alignleft { float: left;max-width: 50%;margin: 0 0 20px 20px;}
article div.article-content div.alignright img {width:100%;} article div.article-content div.alignright img {width:100%;}
article div.article-content blockquote {font-family:"Indie Flower", serif; margin: 0 0 1rem 10rem; padding:2rem; background-color:#d2e8eb;} article div.article-content blockquote {font-family:"Indie Flower", serif; margin: 0 0 1rem 10rem; padding:2rem; background-color:#d2e8eb;}
article div.article-content div.wp-video {width:100%;text-align:center;}
article div.article-content div.wp-video video {width:50%;}
section.page-gallery { margin-top:50px;margin-bottom:50px; } section.page-gallery { margin-top:50px;margin-bottom:50px; }
@ -215,4 +216,8 @@ div.loading-block div.progress-bar-load.blue {background:#d2e8eb;animation: expa
@media (max-width:480px) { @media (max-width:480px) {
div.menu { position:relative;} div.menu { position:relative;}
div.menu * { width:100%;background:#fff; } div.menu * { width:100%;background:#fff; }
article div.article-content div.wp-video video {width:100%;}
article h2 {text-align:center;}
blockquote {margin:5px !important;}
article div.article-content div.alignright {max-width:100%;}
} }