diff --git a/src/app/_modules/pages/sections/types/basic/video/video-section.component.ts b/src/app/_modules/pages/sections/types/basic/video/video-section.component.ts index 29a5088..2f66513 100644 --- a/src/app/_modules/pages/sections/types/basic/video/video-section.component.ts +++ b/src/app/_modules/pages/sections/types/basic/video/video-section.component.ts @@ -30,11 +30,11 @@ export class VideoSectionComponent { parsedUrl(url: any) { let res = ''; if (/https:\/\/youtu.be\//.test(url)) { - this.videoID = url.replace('https://youtu.be/','').replace(/\?.*/,''); + this.videoID = url.replace('https://youtu.be/','').replace(/\?.*/,'').split('&')[0]; this.source = 'youtube.com'; res = 'https://www.youtube.com/embed/' + this.videoID + '?autoplay=1'; } else if (/https:\/\/www\.youtube\.com\/watch\?v\=/.test(url)) { - this.videoID = url.replace('https://www.youtube.com/watch?v=','').replace(/\?.*/,''); + this.videoID = url.replace('https://www.youtube.com/watch?v=','').replace(/\?.*/,'').split('&')[0]; this.source = 'youtube.com'; res = 'https://www.youtube.com/embed/' + this.videoID + '?autoplay=1'; } else if (/https:\/\/rutube.ru\/video\//.test(url)) { diff --git a/src/app/_modules/publications/list/item/gellery/gellery.component.html b/src/app/_modules/publications/list/item/gellery/gellery.component.html index a8c3a1e..11fbd9e 100644 --- a/src/app/_modules/publications/list/item/gellery/gellery.component.html +++ b/src/app/_modules/publications/list/item/gellery/gellery.component.html @@ -1,9 +1,12 @@ -
+
-
- +
+
-
\ No newline at end of file +
+
+ +
diff --git a/src/app/_modules/publications/list/item/gellery/gellery.component.ts b/src/app/_modules/publications/list/item/gellery/gellery.component.ts index f3d049a..1b5913f 100644 --- a/src/app/_modules/publications/list/item/gellery/gellery.component.ts +++ b/src/app/_modules/publications/list/item/gellery/gellery.component.ts @@ -7,7 +7,9 @@ import { Component, Input } from '@angular/core'; }) export class GelleryComponent { @Input() images:any[]; - currentImage:any; + public fullScreen = false; + public currentImage:any; + public id:number ngOnInit() { if (this.images) this.currentImage = this.images[0]; } diff --git a/src/app/_modules/registries/registry/entries/entry/registry-entry.component.html b/src/app/_modules/registries/registry/entries/entry/registry-entry.component.html index 2b03136..cdf95e9 100644 --- a/src/app/_modules/registries/registry/entries/entry/registry-entry.component.html +++ b/src/app/_modules/registries/registry/entries/entry/registry-entry.component.html @@ -1,13 +1,14 @@
-
- - {{title}} + {{title}}
- +
{{entry.state?.title}}
@@ -35,3 +36,4 @@
+
{{entry|json}}
\ No newline at end of file diff --git a/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss b/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss index d4885c1..182fc58 100644 --- a/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss +++ b/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss @@ -32,6 +32,7 @@ img { object-fit:cover; + object-position: 50% 20%; &:not(.active){ filter: brightness(50%); } diff --git a/src/assets/images/ico/document_24.svg b/src/assets/images/ico/document_24.svg new file mode 100644 index 0000000..fb109ca --- /dev/null +++ b/src/assets/images/ico/document_24.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/vniigaz-v2/css/_pages-section.scss b/src/vniigaz-v2/css/_pages-section.scss index de4e937..22f1586 100644 --- a/src/vniigaz-v2/css/_pages-section.scss +++ b/src/vniigaz-v2/css/_pages-section.scss @@ -436,16 +436,19 @@ publication-page { } gellery{ - .poster{ - width: 665px; + .poster{ height: 468px; max-width: calc( 100vw - 80px); max-height: calc( (100vw - 80px ) * 0.7 ); margin-bottom: 8px; - border: 1px solid var(--second-dis); - background-color: var(--second-dis); - border-radius: 12px; overflow: hidden; + cursor: pointer; + >img{ + height: 100%; + border: 1px solid var(--second-dis); + background-color: var(--second-dis); + border-radius: 12px; + } } .posters{ display: flex; @@ -461,26 +464,41 @@ gellery{ :hover{ border-color: var(--prime-act); } + img{ + object-fit: cover; + object-position: 50% 20%; + width: 100%; + height: 100%; + } } } - img{ - object-fit: cover; - width: 100%; - height: 100%; + .gellery-fullscreen{ + position: fixed; + width: 100vw; + height: 100vh; + z-index: 1000; + top:0; + left: 0; + background-color: gray; + swiper-gellery{ + width: 100%; + height: 100%; + } } + } video-section{ + cursor: pointer; + width: 100%; .video-box{ max-width: 720px; height: 400px; position: relative; - z-index: -1; - img{ - cursor:pointer - } + z-index: 0; + .poster{ object-fit: cover; width: 100%; diff --git a/src/vniigaz-v2/images/ico/document_24.svg b/src/vniigaz-v2/images/ico/document_24.svg new file mode 100644 index 0000000..fb109ca --- /dev/null +++ b/src/vniigaz-v2/images/ico/document_24.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file