Compare commits

..

No commits in common. "b95f6046c5842173649b599133ca9db5dc79d068" and "ebe76bec96e844487fe6573347cb82fc18243158" have entirely different histories.

17 changed files with 164 additions and 292 deletions

3
.gitignore vendored
View File

@ -42,6 +42,3 @@ testem.log
# System Files # System Files
.DS_Store .DS_Store
Thumbs.db Thumbs.db
#Bigfiles
/src/assets/*.pdf

35
package-lock.json generated
View File

@ -225,14 +225,6 @@
"tslib": "1.9.2" "tslib": "1.9.2"
} }
}, },
"@ks89/angular-modal-gallery": {
"version": "6.2.3",
"resolved": "https://registry.npmjs.org/@ks89/angular-modal-gallery/-/angular-modal-gallery-6.2.3.tgz",
"integrity": "sha512-5Bj8mZT13Jlmvrc6XV6mk51cqKv8BxWVK/wMVl9oxFz7ANj7Rbk4cscWBOl+Hwn4b4A0Y7CewokIEZbPxovG6w==",
"requires": {
"tslib": "1.9.2"
}
},
"@ngtools/json-schema": { "@ngtools/json-schema": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.2.0.tgz", "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.2.0.tgz",
@ -283,12 +275,6 @@
"semver-intersect": "1.3.1" "semver-intersect": "1.3.1"
} }
}, },
"@types/hammerjs": {
"version": "2.0.36",
"resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.36.tgz",
"integrity": "sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ==",
"dev": true
},
"@types/jasmine": { "@types/jasmine": {
"version": "2.8.8", "version": "2.8.8",
"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.8.tgz", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.8.tgz",
@ -304,12 +290,6 @@
"@types/jasmine": "2.8.8" "@types/jasmine": "2.8.8"
} }
}, },
"@types/mousetrap": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.0.tgz",
"integrity": "sha512-Jn2cF8X6RAMiSmJaATGjf2r3GzIfpZQpvnQhKprQ5sAbMaNXc7hc9sA2XHdMl3bEMEQhTV79JVW7n4Pgg7sjtg==",
"dev": true
},
"@types/node": { "@types/node": {
"version": "6.0.112", "version": "6.0.112",
"resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.112.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.112.tgz",
@ -4236,11 +4216,6 @@
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
"dev": true "dev": true
}, },
"hammerjs": {
"version": "2.0.8",
"resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
"integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
},
"handle-thing": { "handle-thing": {
"version": "1.2.5", "version": "1.2.5",
"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
@ -5449,11 +5424,6 @@
"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=", "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
"dev": true "dev": true
}, },
"jquery": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
"integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
},
"js-base64": { "js-base64": {
"version": "2.4.5", "version": "2.4.5",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz",
@ -6399,11 +6369,6 @@
"minimist": "0.0.8" "minimist": "0.0.8"
} }
}, },
"mousetrap": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.2.tgz",
"integrity": "sha512-jDjhi7wlHwdO6q6DS7YRmSHcuI+RVxadBkLt3KHrhd3C2b+w5pKefg3oj5beTcHZyVFA9Aksf+yEE1y5jxUjVA=="
},
"move-concurrently": { "move-concurrently": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",

View File

@ -21,12 +21,8 @@
"@angular/platform-browser": "^5.2.0", "@angular/platform-browser": "^5.2.0",
"@angular/platform-browser-dynamic": "^5.2.0", "@angular/platform-browser-dynamic": "^5.2.0",
"@angular/router": "^5.2.0", "@angular/router": "^5.2.0",
"@ks89/angular-modal-gallery": "^6.2.3",
"bootstrap": "^4.1.1", "bootstrap": "^4.1.1",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"hammerjs": "^2.0.8",
"jquery": "^3.3.1",
"mousetrap": "^1.6.2",
"rxjs": "^5.5.6", "rxjs": "^5.5.6",
"simple-pdf-viewer": "^2.0.2", "simple-pdf-viewer": "^2.0.2",
"zone.js": "^0.8.19" "zone.js": "^0.8.19"
@ -35,10 +31,8 @@
"@angular/cli": "~1.7.4", "@angular/cli": "~1.7.4",
"@angular/compiler-cli": "^5.2.0", "@angular/compiler-cli": "^5.2.0",
"@angular/language-service": "^5.2.0", "@angular/language-service": "^5.2.0",
"@types/hammerjs": "^2.0.36",
"@types/jasmine": "~2.8.3", "@types/jasmine": "~2.8.3",
"@types/jasminewd2": "~2.0.2", "@types/jasminewd2": "~2.0.2",
"@types/mousetrap": "^1.6.0",
"@types/node": "~6.0.60", "@types/node": "~6.0.60",
"codelyzer": "^4.0.1", "codelyzer": "^4.0.1",
"jasmine-core": "~2.8.0", "jasmine-core": "~2.8.0",

View File

@ -13,7 +13,6 @@ const routes: Routes = [
{ path: ':id', component: PageComponent }, { path: ':id', component: PageComponent },
{ path: ':parent/intro', redirectTo:':parent'}, { path: ':parent/intro', redirectTo:':parent'},
{ path: ':parent/:id', component: PageComponent}, { path: ':parent/:id', component: PageComponent},
{ path: ':parent/:subparent/:id', component: PageComponent},
{ path: '**', component: HomeComponent } { path: '**', component: HomeComponent }
]; ];

View File

@ -9,7 +9,7 @@ import { PageItem } from './page';
}) })
export class AppComponent implements OnInit { export class AppComponent implements OnInit {
title = 'industria-paisaia'; title = 'industria-paisaia';
public pages : PageItem[]; private pages : PageItem[];
constructor ( constructor (
private pageService : PageService private pageService : PageService

View File

@ -1,6 +1,5 @@
<footer class="single"> <footer class="single">
<p>&copy; Zumalakaerregi Museoa 2018 - El contenido de este site está bajo una licencia Creative Commons By-SA-NC - Texto legal </p> <p>&copy; Zumalakaerregi Museoa 2018 - El contenido de este site está bajo una licencia Creative Commons By-SA-NC - Texto legal </p>
<p>www.zumalakarregimuseoa.eus zuma@zm.net +34 000 00 00 00</p> <p>www.zumalakarregimuseoa.eus zuma@zm.net +34 000 00 00 00</p>
<img title="Iniciativa del Museo Zumalakarregi" src="assets/zuma-dipu.jpg" style="margin:0 30px;"/> <img src="../../assets/logo.gif" style="max-width:100px;"/>
<img title="Con el patrocinio de Irizar Sociedad Cooperativa" src="assets/irizar.jpg" style="max-width:100px;margin:0 30px;"/>
</footer> </footer>

View File

@ -1,11 +1,4 @@
<ul class="filters"> <ul class="filters">
<!-- <li *ngIf="childs?.length > 0" routerLink="/{{plink}}">Presentacion</li> --> <!-- <li *ngIf="childs?.length > 0" routerLink="/{{plink}}">Presentacion</li> -->
<li class="parent-header"><a routerLink="/{{parent_link}}">{{parent_title}}</a></li> <li *ngFor="let child of childs" routerLink="/{{child.link}}" [routerLinkActive]="['active']" [innerHTML]='child.title'></li>
<li *ngIf="childs.length==0">Cargando menú</li>
<li *ngFor="let child of childs" routerLink="/{{child.link}}" [routerLinkActive]="['active']">
{{child.title}}
<!-- <ul *ngIf="child.hasChild">
<li *ngFor="let c of getChilds(child.id)"><h1>child</h1></li>
</ul> -->
</li>
</ul> </ul>

View File

@ -13,8 +13,7 @@ export class MenuChildsComponent implements OnInit {
@Input() parent_id: string; @Input() parent_id: string;
@Input() parent_link: string; @Input() parent_link: string;
@Input() parent_title: string; childs : PageItem[];
childs : PageItem[] = [];
plink:string; plink:string;
constructor(private pageService : PageService) { } constructor(private pageService : PageService) { }
@ -23,14 +22,11 @@ export class MenuChildsComponent implements OnInit {
this.getChilds(); this.getChilds();
} }
getChilds(id = this.parent_id) { getChilds() {
this.pageService.getChilds(id) this.pageService.getChilds(this.parent_id)
.subscribe(data => { .subscribe(data => {
this.childs = data; this.childs = data;
this.plink = ''; this.plink = '';
// data.forEach( (child)=> {
// if (child.hasChild) { this.pageService.getChilds(child.id); }
// })
}); });
} }

View File

@ -20,17 +20,17 @@ export class PageService {
public sanitizer: DomSanitizer public sanitizer: DomSanitizer
) { } ) { }
// getItems() : void { getItems() : void {
// //console.log("getItems"); //console.log("getItems");
// let url = `${this.apiUrl}/pages`; let url = `${this.apiUrl}/pages`;
// let search = new URLSearchParams(); let search = new URLSearchParams();
// search.set('foo', 'moo'); search.set('foo', 'moo');
// search.set('limit', "25"); search.set('limit', "25");
// search.set('_embed',''); search.set('_embed','');
// this.http.get(url,{search:search}) this.http.get(url,{search:search})
// .toPromise() .toPromise()
// .then(res => console.log(res.json())); .then(res => console.log(res.json()));
// } }
getParentPages() : Observable<PageItem[]> { getParentPages() : Observable<PageItem[]> {
let search = new URLSearchParams(); let search = new URLSearchParams();
@ -48,46 +48,29 @@ export class PageService {
// console.log("childs de: "+id); // console.log("childs de: "+id);
let search = new URLSearchParams(); let search = new URLSearchParams();
search.set('parent',id); search.set('parent',id);
return this.getPages(search,true); return this.getPages(search);
} }
getPages(searchParams, childs = false) : Observable<PageItem[]> { getPages(searchParams) : Observable<PageItem[]> {
searchParams.set('orderby','menu_order'); searchParams.set('orderby','menu_order');
searchParams.set('_embed',''); searchParams.set('_embed','');
searchParams.set('per_page',20);
//searchParams.set('context','embed'); //searchParams.set('context','embed');
let url = `${this.apiUrl}/pages`; let url = `${this.apiUrl}/pages`;
return this.http.get(url,{search:searchParams}) return this.http.get(url,{search:searchParams})
.map(res => { .map(res => {
return res.json().map(item => { return res.json().map(item => {
//console.log(item);
let page = new PageItem( let page = new PageItem(
item.id as string, item.id as string,
item.title.rendered, item.title.rendered,
item.acf.descripcion, item.excerpt.rendered,
item.content.rendered, item.content.rendered,
item.slug, item.slug,
item.parent item.parent
); );
/*parent */
page['parent_title']=item['parentTitle']['title'];
page['parent_link']=item['parentTitle']['link'];
/* chilsd */
page["hasChild"]=item["hasChild"];
// if (item["hasChild"]) {
// //
// let search = new URLSearchParams();
// search.set('parent',id);
// searchParams.set('orderby','menu_order');
// searchParams.set('_embed','');
// this.http.get(url,{search:searchParams})
// }
/* featured images */ /* featured images */
if ( !childs && item["_embedded"]["wp:featuredmedia"]) { if ( item["_embedded"]["wp:featuredmedia"] ) {
console.log('featured image: '+item.id);
console.log(item["_embedded"]["wp:featuredmedia"])
page["featuredmedia"] = item["_embedded"]["wp:featuredmedia"]; page["featuredmedia"] = item["_embedded"]["wp:featuredmedia"];
if (item["_embedded"]["wp:featuredmedia"][0]["media_details"]["sizes"]["large"]) { if (item["_embedded"]["wp:featuredmedia"][0]["media_details"]["sizes"]["large"]) {
@ -102,19 +85,18 @@ export class PageService {
} }
/* Publitas */ /* Publitas */
if (!childs && item["acf"] && item["acf"]["libro_publitas"]) { if (item["acf"] && item["acf"]["libro_publitas"]) {
//page["publitas_link"] = this.sanitizer.bypassSecurityTrustUrl(item["acf"]["libro_publitas"]); page["publitas_link"] = this.sanitizer.bypassSecurityTrustUrl(item["acf"]["libro_publitas"]);
page["publitas_link"] = item["acf"]["libro_publitas"];
//this.iframeUrl = this.sanitizer.bypassSecurityTrustResourceUrl(this.iframeUrl); //this.iframeUrl = this.sanitizer.bypassSecurityTrustResourceUrl(this.iframeUrl);
} }
/* Gallery */ /* Gallery */
// console.log(item['gallery']) // console.log(item['gallery'])
if (!childs && item["gallery"]) { if (item["gallery"]) {
page['gallery'] = []; page['gallery'] = [];
let c = 0; let c = 0;
item["gallery"].forEach( (i)=> { item["gallery"].forEach( (i)=> {
var im = new Image(c, { img: i['modal'], title: i['title'], alt:i['title'], description: i['desc'] },{ img: i['thumb'], title: i['title'], alt:i['title'], description: i['desc'] }); var im = new Image(c, { img: i['modal'], description: 'Description 1' },{ img: i['thumb'] });
page['gallery'].push(im); page['gallery'].push(im);
c++; c++;
}); });

View File

@ -13,10 +13,7 @@ export class PageItem {
public link?: string, public link?: string,
public publitas_link?: SafeUrl, public publitas_link?: SafeUrl,
public featuredmedia ? : any[], public featuredmedia ? : any[],
public gallery? : Array<Image>, public gallery? : Array<Image>
public hasChild? : boolean,
public childs?: PageItem[],
public parent_title? : string,
) {} ) {}
// public set (key,attr) { // public set (key,attr) {

View File

@ -1,11 +1,8 @@
<app-header [pages]=pages></app-header> <app-header [pages]=pages></app-header>
<!-- <app-section [pages]=pages></app-section> --> <!-- <app-section [pages]=pages></app-section> -->
<article *ngIf="pages.length==0">
<h1>Cargando...</h1>
</article>
<article *ngFor="let page of pages"> <article *ngFor="let page of pages">
<div class="row"> <div class="row">
<div class="col-md-3 offset-md-1 info col-xm-12"> <div class="col-md-3 offset-md-1 info">
<!-- <h1><span>{{page.title}}</span></h1> --> <!-- <h1><span>{{page.title}}</span></h1> -->
<!-- <h2 [innerHTML]={{parent}}></h2> --> <!-- <h2 [innerHTML]={{parent}}></h2> -->
<!-- <h2>{{page.id}}</h2> --> <!-- <h2>{{page.id}}</h2> -->
@ -15,50 +12,40 @@
<li>Video</li> <li>Video</li>
<li>Imágen</li> <li>Imágen</li>
</ul> --> </ul> -->
<app-menu-childs *ngIf="page.parent==0" [parent_id]="page.id" [parent_link]="page.link" [parent_title]="page.title"></app-menu-childs> <app-menu-childs *ngIf="page.parent==0" [parent_id]="page.id" [parent_link]="page.link"></app-menu-childs>
<app-menu-childs *ngIf="page.parent>0" [parent_id]="page.parent" [parent_title]="page.parent_title" [parent_link]="page.parent_link"></app-menu-childs> <app-menu-childs *ngIf="page.parent>0" [parent_id]="page.parent" [parent_link]="page.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">
<section>
<div class="row" *ngIf="page.content"> <div class="row" *ngIf="page.content">
<div class="col-md-12"> <div class="col-md-12" [innerHTML]="page.content"></div>
<!-- <app-menu-childs *ngIf="page.parent>0" [parent_id]="page.id" [parent_link]="page.link"></app-menu-childs> -->
<div class="article-content" [innerHTML]="page.content"></div>
<!-- <div>
Contenido de los hijos
</div> -->
</div> </div>
<section *ngIf="page.gallery.length>0">
<div class="my-app-custom-plain-container-with-desc">
<ng-container *ngFor="let img of page.gallery">
<figure class="my-app-custom-image-with-desc">
<img [src]="img.modal.img" (click)="openImageModalRowDescription(img)"/>
<figcaption class="description">{{img.modal.description ? img.modal.description : 'No description available'}}
</figcaption>
</figure>
</ng-container>
</div> </div>
<ks-modal-gallery [id]="8" [modalImages]="page.gallery" [plainGalleryConfig]="customPlainGalleryRowDescConfig"></ks-modal-gallery>
</section> </section>
<section class="page-gallery" *ngIf="page.gallery.length>0 && page.gallery[0]">
<h2>Galería fotográfica</h2>
<ks-modal-gallery [id]="0" [slideConfig]="{infinite: true, sidePreviews: {show: false}}" [buttonsConfig]="buttonsConfigIndustria" [previewConfig]="{visible: false}" [dotsConfig]="{visible: false}" [currentImageConfig]="{downloadable: true, description: {imageText:''}}" [modalImages]="page.gallery" [plainGalleryConfig]="customPlainGalleryRowDescConfig"></ks-modal-gallery>
</section>
<section class="section-publitas">
<div class="row" *ngIf="page.publitas_link"> <div class="row" *ngIf="page.publitas_link">
<div class="col-md-12"> <div class="col-md-12">
<simple-pdf-viewer #pdfViewer [src]="'../assets/'+page.publitas_link" [removePageBorders]="true"></simple-pdf-viewer> <simple-pdf-viewer #pdfViewer [src]="'../assets/test.pdf#zoom=1.01'" [removePageBorders]="true"></simple-pdf-viewer>
<div class="pdf-buttons" *ngIf="!pdfViewer.isDocumentLoaded()"> <div class="pdf-buttons" *ngIf="!pdfViewer.isDocumentLoaded()">
<button>Cargando documento</button> <button>Cargando documento</button>
</div> </div>
<div class="pdf-buttons" style="" *ngIf="pdfViewer.isDocumentLoaded()"> <div class="pdf-buttons" style="" *ngIf="pdfViewer.isDocumentLoaded()">
<button (click)="pdfViewer.firstPage()">First Page</button> <button (click)="pdfViewer.firstPage()">First Page</button>
<button (click)="pdfViewer.prevPage()">Previous Page</button> <button (click)="pdfViewer.prevPage()">Previous Page</button>
<button>{{pdfViewer.getCurrentPage()}}/{{pdfViewer.getNumberOfPages()}}</button>
<button (click)="pdfViewer.nextPage()">Next Page</button>
<button (click)="pdfViewer.lastPage()">Last Page</button>
</div>
<div class="pdf-buttons pdf-buttons-bottom" style="" *ngIf="pdfViewer.isDocumentLoaded()">
<button (click)="pdfViewer.firstPage()">First Page</button>
<button (click)="pdfViewer.prevPage()">Previous Page</button>
<button>{{pdfViewer.getCurrentPage()}}/{{pdfViewer.getNumberOfPages()}}</button>
<button (click)="pdfViewer.nextPage()">Next Page</button> <button (click)="pdfViewer.nextPage()">Next Page</button>
<button (click)="pdfViewer.lastPage()">Last Page</button> <button (click)="pdfViewer.lastPage()">Last Page</button>
</div> </div>
</div> </div>
</div> </div>
</section>
</div> </div>
<!-- <div class="col-md-7">{{page.content}}</div> --> <!-- <div class="col-md-7">{{page.content}}</div> -->
</div> </div>

View File

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { PageService } from '../page.service'; import { PageService } from '../page.service';
import { PageItem } from '../page'; import { PageItem } from '../page';
import { ActivatedRoute,Router, NavigationEnd } from "@angular/router"; import { ActivatedRoute } from "@angular/router";
import { SafeResourceUrl, DomSanitizer } from '@angular/platform-browser'; import { SafeResourceUrl, DomSanitizer } from '@angular/platform-browser';
import { import {
AccessibilityConfig, AccessibilityConfig,
@ -25,8 +25,6 @@ import {
PreviewConfig PreviewConfig
} from '@ks89/angular-modal-gallery'; } from '@ks89/angular-modal-gallery';
import * as $ from 'jquery';
@Component({ @Component({
selector: 'app-page', selector: 'app-page',
templateUrl: './page.component.html', templateUrl: './page.component.html',
@ -45,8 +43,7 @@ export class PageComponent implements OnInit {
private route: ActivatedRoute, private route: ActivatedRoute,
private pageService: PageService, private pageService: PageService,
private galleryService: GalleryService, private galleryService: GalleryService,
private sanitizer: DomSanitizer, private sanitizer: DomSanitizer
private router: Router
){ ){
this.route.params.subscribe( params => { this.route.params.subscribe( params => {
this.slug = params.id; this.slug = params.id;
@ -55,18 +52,7 @@ export class PageComponent implements OnInit {
} ); } );
} }
ngOnInit() { ngOnInit() {}
console.log('init')
// $('html body').animate(
// {scrollTop:0}, 1000);
document.documentElement.scrollTop = 0
this.router.events.subscribe((evt) => {
if (!(evt instanceof NavigationEnd)) {
return;
}
window.scrollTo(0, 0)
});
}
getPage() { getPage() {
console.log(this.slug); console.log(this.slug);
@ -79,58 +65,10 @@ export class PageComponent implements OnInit {
/** gallery **/ /** gallery **/
customPlainGalleryRowDescConfig: PlainGalleryConfig = { customPlainGalleryRowDescConfig: PlainGalleryConfig = {
// strategy: PlainGalleryStrategy.CUSTOM, strategy: PlainGalleryStrategy.CUSTOM,
strategy: PlainGalleryStrategy.GRID, layout: new AdvancedLayout(-1, true)
layout: new GridLayout({ width: '32%', height: 'auto' }, { length: 2, wrap: true })
// layout: new AdvancedLayout(-1, true)
}; };
buttonsConfigSimple: ButtonsConfig = {
visible: true,
strategy: ButtonsStrategy.SIMPLE
};
buttonsConfigIndustria: ButtonsConfig = {
visible:true,
strategy: ButtonsStrategy.CUSTOM,
buttons: [
{
className: 'download-image',
type: ButtonType.DOWNLOAD,
extUrlInNewTab: true
},
{
className: 'fullscreen-image',
type: ButtonType.FULLSCREEN
},
{
className: 'close-image',
type: ButtonType.CLOSE
}
]
}
// onButtonBeforeHook(event: ButtonEvent) {
// if (!event || !event.button) {
// return;
// }
// if (event.button.type === ButtonType.DELETE) {
// this.images = this.images.filter((val: Image) => event.image && val.id !== event.image.id);
// }
// }
//
// onButtonAfterHook(event: ButtonEvent) {
// if (!event || !event.button) {
// return;
// }
// }
onVisibleIndex(event: ImageModalEvent) {
console.log('onVisibleIndex action: ' + Action[event.action]);
console.log('onVisibleIndex result:' + event.result);
}
openImageModalRowDescription(image: Image) { openImageModalRowDescription(image: Image) {
console.log('Opening modal gallery from custom plain gallery row and description, with image: ', image); console.log('Opening modal gallery from custom plain gallery row and description, with image: ', image);
const index: number = this.getCurrentIndexCustomLayout(image, this.pages[0].gallery); const index: number = this.getCurrentIndexCustomLayout(image, this.pages[0].gallery);

View File

@ -1,11 +1,11 @@
<!-- {{diagnostic}} --> <!-- {{diagnostic}} -->
<div *ngFor="let page of pages" class="ia-section bg1" id="{{page.slug}}"> <div *ngFor="let page of pages" class="ia-section bg1" id="{{page.slug}}">
<section class="ia-section"> <section class="ia-section">
<a routerLink="/{{page.slug}}"> <a href="/{{page.slug}}">
<div class="row section-content" > <div class="row section-content" >
<div class="col-md-1 ia-select"></div> <div class="col-md-1 ia-select"></div>
<div class="col-md-5" [ngStyle]="{'background-size':'cover', 'background-repeat':'no-repeat','background-image':'url(\''+page.background_image+'\')'}"><h1><span>{{page.title}}</span></h1></div> <div class="col-md-5" [ngStyle]="{'background-size':'cover', 'background-repeat':'no-repeat','background-image':'url(\''+page.background_image+'\')'}"><h1><span>{{page.title}}</span></h1></div>
<div class="col-md-6 ia-home-excerpt" [innerHTML]="page.excerpt"></div> <div class="col-md-6" [innerHTML]="page.excerpt"></div>
</div> </div>
</a> </a>
</section> </section>

View File

@ -15,7 +15,6 @@ export class SectionComponent implements OnInit {
ngOnInit() { } ngOnInit() { }
get diagnostic() { get diagnostic() {
console.log(this.pages)
return JSON.stringify(this.pages); return JSON.stringify(this.pages);
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

View File

@ -1,31 +1,30 @@
/* You can add global styles to this file, and also import other style files */ /* You can add global styles to this file, and also import other style files */
@import '../node_modules/bootstrap/dist/css/bootstrap.min.css'; @import '../node_modules/bootstrap/dist/css/bootstrap.min.css';
@import url('https://fonts.googleapis.com/css?family=Oswald'); @import url('https://fonts.googleapis.com/css?family=Tinos');
@import url('https://fonts.googleapis.com/css?family=Raleway'); @import url('https://fonts.googleapis.com/css?family=Raleway');
@import url('https://fonts.googleapis.com/css?family=Indie+Flower'); /*
@font-face { @font-face {
font-family: "Manteka"; font-family: "Manteka";
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
src: url('./assets/vision-webfont.woff'); src: url('./assets/vision-webfont.woff');
} } */
/* main */ /* main */
* { transition:0.2s;} * { transition:0.2s;}
body { font-family:"Raleway",serif; overflow-x:hidden;background:#efefef;margin:0; font-size:14pt;font-size:1rem;} body { font-family:"Raleway",serif; overflow-x:hidden;background:#efefef;margin:0; font-size:14pt;}
h1,h2 { font-family: "Oswald", sans-serif; text-transform:uppercase; font-weight:bold;} h1,h2 { font-family: "Raleway", sans-serif;text-transform:uppercase;font-weight:bold;}
app-home header { overflow:hidden; width:100%;height:100%;height:100vh;text-align:center;position:relative;} app-header header { overflow:hidden; width:100%;height:100%;height:100vh;text-align:center;position:relative;}
header.homepage { background:url('./assets/industria-paisaia.svg'); background-size:contain; background-repeat:no-repeat; background-position:center center;} header.homepage { background:url('./assets/industria-paisaia.svg'); background-size:contain; background-repeat:no-repeat; background-position:center center;}
header.section { background-attachment: fixed; } header.section { background-attachment: fixed; }
header.section > div {padding-top:10%;background-color:rgba(255,255,255,0.6); height:100vh;} header.section > div {padding-top:10%;background-color:rgba(255,255,255,0.6); height:100vh;}
header.section h1 {word-wrap: break-word;text-align:center;} header.section h1 {word-wrap: break-word;}
header.section h1 span {line-height: 1.8; font-size:2.5em;font-size:10vmin;background-color:#d2e8eb; padding:10px;} header.section h1 span {font-size:2.5em;background-color:#d2e8eb; padding:10px;}
header.section h3 {text-align:center; font-size:1.5em;font-size:4vmin;font-weight:400; color:#000; font-family:"Raleway";background-color:#f7886c;padding:20px;} header.section h3 {text-align:center; font-size:1.5em;font-weight:400; color:#000; font-family:"Raleway";background-color:#f7886c;padding:20px;}
header.section h1::after {content:'';width:100%;height:100%;position:absolute;} header.section h1::after {content:'';width:100%;height:100%;position:absolute;}
@ -41,7 +40,7 @@ div.menu div.Search {float:right;}
div.menu div.language {float:right;margin:5px;font-size:0.7em;padding-top:1%;} div.menu div.language {float:right;margin:5px;font-size:0.7em;padding-top:1%;}
div.menu div.language span {padding:3px;font-family:"Raleway";cursor:pointer;} div.menu div.language span {padding:3px;font-family:"Raleway";cursor:pointer;}
div.Search input {background:none; border:none; border-bottom:2px solid #000;} div.Search input {background:none; border:none; border-bottom:2px solid #000;}
div.menu nav ul li {font-family:"Oswald",sans-serif; text-transform:uppercase;height:60px;padding:10px;min-width:10%;cursor:pointer;} div.menu nav ul li {text-transform:uppercase;height:60px;font-family:"Raleway";padding:10px;min-width:10%;cursor:pointer;}
div.menu nav ul li:hover { background-color:#f7886c;} div.menu nav ul li:hover { background-color:#f7886c;}
div.menu nav ul li:active { background-color:#f7886c;color:#fff;} div.menu nav ul li:active { background-color:#f7886c;color:#fff;}
div.menu nav ul li.active { background-color:#f7886c;color:#fff;} div.menu nav ul li.active { background-color:#f7886c;color:#fff;}
@ -61,27 +60,16 @@ div.ia-section:active { background: #f7886c; }
div.ia-section:hover div.ia-select { min-height:300px; background:#f7886c; padding:0 !important; } div.ia-section:hover div.ia-select { min-height:300px; background:#f7886c; padding:0 !important; }
div.ia-section div.col-md-5, div.ia-section div.col-md-5,
div.ia-section div.col-md-6 { padding:20px;} div.ia-section div.col-md-6 { padding:20px;}
div.ia-section div.ia-home-excerpt { font-size:1.5em; }
/*article*/ /*article*/
article {padding-top:80px;} article {padding-top:80px;}
article img {max-width:100%; height:auto; border:0px solid #f7886c;margin:20px auto;filter:grayscale(0);box-shadow: -1px 2px 5px 0px rgba(0,0,0,0.4);} article img {max-width:100%; height:auto; border:3px solid #f7886c;margin:20px auto;filter:grayscale(0.8);}
article img:hover {filter:none; box-shadow: -1px 2px 5px 0px rgba(0,0,0,0.7);} article img:hover {filter:none; box-shadow: -1px 2px 5px 0px rgba(0,0,0,0.7);cursor:pointer;}
article p {font-size:1.2rem;line-height:2;} article p {font-size:0.9em;}
article h2 span {background:#d2e8eb;padding:10px;} article h2 span {background:#d2e8eb;padding:10px;}
article h2 {margin-bottom:20px;} article h2 {margin-bottom:20px;}
article video {max-width:100%; height:auto;} article video {max-width:100%;}
article div.article-content { margin:0 20px;}
article div.article-content ul { list-style:circle; }
article div.article-content div.alignright { float: right;max-width: 50%;margin: 0 0 20px 20px;}
article div.article-content img.alignright { float: right;max-width: 50%;margin: 0 0 20px 20px;}
article div.article-content div.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 blockquote {font-family:"Indie Flower", serif; margin: 0 0 1rem 10rem; padding:2rem; background-color:#d2e8eb;}
section.page-gallery { margin-top:50px;margin-bottom:50px; }
/* footer */ /* footer */
footer { min-height:300px; height:100%; background-color:#d2e8eb; padding:20px; color:#000;} footer { min-height:300px; height:100%; background-color:#d2e8eb; padding:20px; color:#000;}
@ -135,45 +123,81 @@ header.item { margin-top:50px;height:0;}
.info h1 {margin:20px auto;} .info h1 {margin:20px auto;}
.info h1 span {background-color:#d2e8eb;padding:5px;} .info h1 span {background-color:#d2e8eb;padding:5px;}
.info h2 {color:#f7886c;} .info h2 {color:#f7886c;}
.info ul.filters {list-style:none; margin:0;padding:0; margin-bottom:50px;} .info ul.filters {list-style:none; margin:0;padding:0;}
.info ul.filters li { word-wrap:break-word; cursor:pointer; border-right:5px solid #f7886c; padding:5px 30px; text-transform:uppercase;font-family:"Raleway";text-align:right;} .info ul.filters li {cursor:pointer; border-right:5px solid #f7886c; padding:5px 30px; text-transform:uppercase;font-family:"Raleway";text-align:right;}
.info ul.filters li:hover {border-right:0px;color:#f7886c;} .info ul.filters li:hover {border-right:0px;color:#f7886c;}
.info ul.filters li:active {border-right:0px;color:#fff;background-color:#f7886c;} .info ul.filters li:active {border-right:0px;color:#fff;background-color:#f7886c;}
.info ul.filters li.active {border-right:0px;color:#fff;background-color:#f7886c;} .info ul.filters li.active {border-right:0px;color:#fff;background-color:#f7886c;}
.info ul.filters li.parent-header { font-family:"Oswald",sans-serif; background-color:#d2e8eb; font-weight:bold; font-size:1.5rem; color:#fff; padding:30px 30px; border-right:0;}
/* imagen */ /* imagen */
img.fullwidth {width:100%;} img.fullwidth {width:100%;}
/* pdf buttons */ /* pdf buttons */
article section.section-publitas div.row { min-height:300px;margin-top:40px;padding-bottom:20px; } div.pdf-buttons { width:100%;min-height:50px;text-align:center;float:right;position:absolute;top:0; }
div.pdf-buttons { width:100%;min-height:50px;text-align:center;float:right;position:absolute;top:-40px; }
div.pdf-buttons-bottom { top:100% !important;}
div.pdf-buttons button {border:0;background:#d2e8eb; font-size:1em;cursor:pointer;} div.pdf-buttons button {border:0;background:#d2e8eb; font-size:1em;cursor:pointer;}
div.pdf-buttons button:hover {background:#f7886c; } div.pdf-buttons button:hover {background:#f7886c; }
simple-pdf-viewer {margin-top:30px;}
.pdfViewerContainer {overflow:hidden !important;}
/** gallery */ /** gallery */
/* .my-app-custom-plain-container-row {
ks-current-image img { filter:none; } align-items: center;
display: flex;
flex-direction: row;
justify-content: flex-start;
}
.my-app-custom-plain-container-row .my-app-custom-image-row {
cursor: pointer;
height: auto;
margin-right: 2px;
width: 50px;
}
.my-app-custom-plain-container-row .my-app-custom-image-row.after {
border-top: 2px;
cursor: pointer;
display: none;
height: 100%;
left: 0;
position: absolute;
top: 0;
width: 100%;
}
.my-app-custom-plain-container-column {
align-items: center;
display: flex;
flex-direction: column;
justify-content: flex-start;
}
.my-app-custom-plain-container-column .my-app-custom-image-column {
cursor: pointer;
height: auto;
margin-right: 2px;
width: 50px;
}
.my-app-custom-plain-container-column .my-app-custom-image-column.after {
border-top: 2px;
cursor: pointer;
display: none;
height: 100%;
left: 0;
position: absolute;
top: 0;
width: 100%;
} */
.my-app-custom-plain-container-with-desc { .my-app-custom-plain-container-with-desc {
align-items: center; align-items: center;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: flex-start; justify-content: flex-start;
}
figure { .my-app-custom-plain-container-with-desc figure {
margin: 0; margin: 0;
position: relative; position: relative;
}
img { .my-app-custom-plain-container-with-desc figure img {
max-width: 100%; max-width: 100%;
height: auto; height: auto;
cursor: pointer; cursor: pointer;
} }
.my-app-custom-plain-container-with-desc figure figcaption {
figcaption {
background: rgba(0, 0, 0, .5); background: rgba(0, 0, 0, .5);
color: #fff; color: #fff;
font-size: 85%; font-size: 85%;
@ -182,23 +206,25 @@ ks-current-image img { filter:none; }
bottom: 3px; bottom: 3px;
left: 0; left: 0;
right: 0; right: 0;
} }
} .my-app-custom-plain-container-with-desc .description {
.description {
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
} }
.my-app-custom-plain-container-with-desc .my-app-custom-image-with-desc {
.my-app-custom-image-with-desc { height: 150px;
height: auto;
margin-right: 2px; margin-right: 2px;
width: 200px; width: 200px;
align-self: start; align-self: start;
} overflow:hidden;
} }
.more {
@media (max-width:480px) { background: rgba(0, 0, 0, .7);
div.menu { position:relative;} cursor: pointer;
div.menu * { width:100%;background:#fff; } color: #fff;
padding-top: 4px;
height: 46px;
position: absolute;
text-align: center;
width: 50px;
} }