From bbacea6d1ce2163f66a2e4145bfe3e63ee98ed6d Mon Sep 17 00:00:00 2001 From: kpoddubskaya Date: Tue, 17 Jun 2025 18:40:03 +0300 Subject: [PATCH 1/5] Add gtm selectors --- sources/views/subviews/gallery/galleryMobile.js | 4 ++-- sources/views/subviews/gallery/parts/cartList.js | 1 + sources/views/subviews/gallery/parts/filterPanel.js | 6 ++++-- .../views/subviews/gallery/parts/galleryDataview.js | 12 ++++++------ sources/views/subviews/gallery/parts/galleryPager.js | 3 ++- .../subviews/gallery/parts/mobileFilterPanel.js | 2 ++ .../gallery/windows/multiImageLesionWindow.js | 8 ++++---- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/sources/views/subviews/gallery/galleryMobile.js b/sources/views/subviews/gallery/galleryMobile.js index 58c9015a..0c92c0b6 100644 --- a/sources/views/subviews/gallery/galleryMobile.js +++ b/sources/views/subviews/gallery/galleryMobile.js @@ -263,7 +263,7 @@ export default class GalleryMobileView extends JetView { const html = `
${obj.isic_id}
-
+
@@ -271,7 +271,7 @@ export default class GalleryMobileView extends JetView { Enlarge
-
+
diff --git a/sources/views/subviews/gallery/parts/cartList.js b/sources/views/subviews/gallery/parts/cartList.js index 1918ec99..51b7dadf 100644 --- a/sources/views/subviews/gallery/parts/cartList.js +++ b/sources/views/subviews/gallery/parts/cartList.js @@ -42,6 +42,7 @@ function getConfig(config) { const downloadZipButton = { view: "button", value: "Download ZIP", + css: "gtm-multi-download", id: ID_DOWNLOAD_SELECTED_IMAGES_BUTTON, name: NAME_DOWNLOAD_SELECTED_IMAGES_BUTTON }; diff --git a/sources/views/subviews/gallery/parts/filterPanel.js b/sources/views/subviews/gallery/parts/filterPanel.js index 2e4b4d05..f37e4b54 100644 --- a/sources/views/subviews/gallery/parts/filterPanel.js +++ b/sources/views/subviews/gallery/parts/filterPanel.js @@ -20,7 +20,7 @@ function getConfig(config) { const switchButton = { view: "switch", name: NAME_SWITCH_BUTTON, - css: "switch-search-gallery-button", + css: "gtm-selector switch-search-gallery-button", label: "Search by filters", labelRight: "Search by name", width: 285, @@ -31,6 +31,7 @@ function getConfig(config) { const downloadFilteredImagesButton = { view: "button", value: "Download ZIP", + css: "gtm-filtered-download", id: ID_DOWNLOAD_FILTERED_IMAGES_BUTTON, name: NAME_DOWNLOAD_FILTERED_IMAGES_BUTTON, hidden: true @@ -39,7 +40,7 @@ function getConfig(config) { const searchSuggestConfig = { id: ID_SEARCH_SUGGESTION, fitMaster: false, - css: "filters-suggest", + css: "gtm-search filters-suggest", }; const searchSuggestView = searchSuggest.getConfig(searchSuggestConfig); searchSuggestView.body.template = obj => (obj.name @@ -99,6 +100,7 @@ function getConfig(config) { const filtersForm = { id: ID_FILTERS_FORM, name: NAME_FILTERS_FORM, + css: "gtm-filter", view: "form", paddingX: 7, margin: 0, diff --git a/sources/views/subviews/gallery/parts/galleryDataview.js b/sources/views/subviews/gallery/parts/galleryDataview.js index 9c719c77..56aaaec3 100644 --- a/sources/views/subviews/gallery/parts/galleryDataview.js +++ b/sources/views/subviews/gallery/parts/galleryDataview.js @@ -128,7 +128,7 @@ const dataview = { const disabledBadge = lesion ? "" : " disabled-badge"; - const lesionIcon = `
+ const lesionIcon = `
@@ -151,11 +151,11 @@ const dataview = {
-
${common.markCheckbox(obj, common)}
-
${obj.isic_id}
+
${common.markCheckbox(obj, common)}
+
${obj.isic_id}
-
+
@@ -163,7 +163,7 @@ const dataview = { Enlarge
-
+
@@ -171,7 +171,7 @@ const dataview = { Metadata
-
+
diff --git a/sources/views/subviews/gallery/parts/galleryPager.js b/sources/views/subviews/gallery/parts/galleryPager.js index ccda5796..16255910 100644 --- a/sources/views/subviews/gallery/parts/galleryPager.js +++ b/sources/views/subviews/gallery/parts/galleryPager.js @@ -5,12 +5,13 @@ import util from "../../../../utils/util"; let dataviewId; function createPager({height, width, css, template}) { + const combinedCss = `gtm-paginator${css ? ` ${css}` : ""}`; return { view: "pager", height, width, master: false, - css, + css: combinedCss, template, on: { onItemClick(id) { diff --git a/sources/views/subviews/gallery/parts/mobileFilterPanel.js b/sources/views/subviews/gallery/parts/mobileFilterPanel.js index bfd6715d..75b91ab8 100644 --- a/sources/views/subviews/gallery/parts/mobileFilterPanel.js +++ b/sources/views/subviews/gallery/parts/mobileFilterPanel.js @@ -121,6 +121,7 @@ function getConfig(config) { const filtersForm = { id: ID_FILTERS_FORM, name: NAME_FILTERS_FORM, + css: "gtm-filter", view: "form", paddingX: 7, margin: 0, @@ -198,6 +199,7 @@ function getConfig(config) { const landscapeFiltersForm = { id: ID_LANDSCAPE_FILTERS_FORM, name: NAME_LANDSCAPE_FILTERS_FORM, + css: "gtm-filter", view: "form", paddingX: 7, margin: 0, diff --git a/sources/views/subviews/gallery/windows/multiImageLesionWindow.js b/sources/views/subviews/gallery/windows/multiImageLesionWindow.js index 5693dc50..73332683 100644 --- a/sources/views/subviews/gallery/windows/multiImageLesionWindow.js +++ b/sources/views/subviews/gallery/windows/multiImageLesionWindow.js @@ -376,7 +376,7 @@ function getTopSlider(topPanelID, sliderID, prevButtonID, nextButtonID) { Multirater
` : ""; - const lesionIcon = `
+ const lesionIcon = `
@@ -401,7 +401,7 @@ function getTopSlider(topPanelID, sliderID, prevButtonID, nextButtonID) {
${lesionsModel.getItemID(obj)}
-
+
@@ -409,7 +409,7 @@ function getTopSlider(topPanelID, sliderID, prevButtonID, nextButtonID) { Enlarge
-
+
@@ -417,7 +417,7 @@ function getTopSlider(topPanelID, sliderID, prevButtonID, nextButtonID) { Metadata
-
+
From 16fa1bac757f209ad1aae811c1e5c745f4288d56 Mon Sep 17 00:00:00 2001 From: kpoddubskaya Date: Wed, 18 Jun 2025 11:50:55 +0300 Subject: [PATCH 2/5] Add test GTM container code to every page --- error.html | 18 ++++++++++++++++-- index.html | 18 ++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/error.html b/error.html index ee10e590..93dc24f3 100644 --- a/error.html +++ b/error.html @@ -1,6 +1,20 @@ + + + + + + + + +
404
@@ -9,14 +23,14 @@
- + \ No newline at end of file diff --git a/index.html b/index.html index 4522074f..506d57df 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,15 @@ + + + + + ISIC Archive @@ -15,6 +24,11 @@ + + + + @@ -104,14 +118,14 @@ - + From 5d2a984a852ba1ecdeb9f55fa94de674a868ecc8 Mon Sep 17 00:00:00 2001 From: kpoddubskaya Date: Wed, 18 Jun 2025 19:54:08 +0300 Subject: [PATCH 3/5] Refine GTM selectors for images --- sources/views/subviews/gallery/galleryMobile.js | 8 ++++---- .../subviews/gallery/parts/galleryDataview.js | 16 ++++++++-------- .../gallery/windows/multiImageLesionWindow.js | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sources/views/subviews/gallery/galleryMobile.js b/sources/views/subviews/gallery/galleryMobile.js index 0c92c0b6..97f3ff00 100644 --- a/sources/views/subviews/gallery/galleryMobile.js +++ b/sources/views/subviews/gallery/galleryMobile.js @@ -263,16 +263,16 @@ export default class GalleryMobileView extends JetView { const html = `
${obj.isic_id}
-
- +
+ Enlarge
-
- +
+ diff --git a/sources/views/subviews/gallery/parts/galleryDataview.js b/sources/views/subviews/gallery/parts/galleryDataview.js index 56aaaec3..9221b0f2 100644 --- a/sources/views/subviews/gallery/parts/galleryDataview.js +++ b/sources/views/subviews/gallery/parts/galleryDataview.js @@ -128,8 +128,8 @@ const dataview = { const disabledBadge = lesion ? "" : " disabled-badge"; - const lesionIcon = `
- + const lesionIcon = `
+ @@ -155,24 +155,24 @@ const dataview = {
${obj.isic_id}
-
- +
+ Enlarge
-
- +
+ Metadata
-
- +
+ diff --git a/sources/views/subviews/gallery/windows/multiImageLesionWindow.js b/sources/views/subviews/gallery/windows/multiImageLesionWindow.js index 73332683..3de32533 100644 --- a/sources/views/subviews/gallery/windows/multiImageLesionWindow.js +++ b/sources/views/subviews/gallery/windows/multiImageLesionWindow.js @@ -376,8 +376,8 @@ function getTopSlider(topPanelID, sliderID, prevButtonID, nextButtonID) { Multirater
` : ""; - const lesionIcon = `
- + const lesionIcon = `
+ @@ -401,24 +401,24 @@ function getTopSlider(topPanelID, sliderID, prevButtonID, nextButtonID) {
${lesionsModel.getItemID(obj)}
-
- +
+ Enlarge
-
- +
+ Metadata
-
- +
+ From ce61944ac1ab243a9bbbd83b3f74485024396ba0 Mon Sep 17 00:00:00 2001 From: EkaterinaPoddubskaya Date: Fri, 20 Jun 2025 12:30:41 +0300 Subject: [PATCH 4/5] Add selectors for mobile single download and paginator --- sources/views/subviews/gallery/gallery.js | 1 + sources/views/subviews/gallery/galleryMobile.js | 2 +- .../views/subviews/gallery/parts/contextMenu.js | 14 ++++++-------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sources/views/subviews/gallery/gallery.js b/sources/views/subviews/gallery/gallery.js index b7b30853..24aac86f 100644 --- a/sources/views/subviews/gallery/gallery.js +++ b/sources/views/subviews/gallery/gallery.js @@ -44,6 +44,7 @@ export default class GalleryView extends JetView { const clonePagerForNameFilter = { view: "pager", name: NAME_CLONED_PAGER_FOR_NAME_SEARCH, + css: "gtm-paginator", size: 80, hidden: true, height: 36, diff --git a/sources/views/subviews/gallery/galleryMobile.js b/sources/views/subviews/gallery/galleryMobile.js index 97f3ff00..6bd631f7 100644 --- a/sources/views/subviews/gallery/galleryMobile.js +++ b/sources/views/subviews/gallery/galleryMobile.js @@ -505,7 +505,7 @@ export default class GalleryMobileView extends JetView { this.removeParam.bind(this) )); this.metadataWindow = this.getMetadataLayout(); - const contextMenuConfig = contextMenu.getConfig(ID_MOBILE_GALLERY_CONTEXT_MENU); + const contextMenuConfig = contextMenu.getConfig(ID_MOBILE_GALLERY_CONTEXT_MENU, "gtm-single-download"); this.contextMenu = this.ui(contextMenuConfig); const enlargeContextMenuConfig = contextMenu.getConfig(ID_ENLARGE_CONTEXT_MENU); this.enlargeContextMenu = this.ui(enlargeContextMenuConfig); diff --git a/sources/views/subviews/gallery/parts/contextMenu.js b/sources/views/subviews/gallery/parts/contextMenu.js index c7405c1b..107a2c95 100644 --- a/sources/views/subviews/gallery/parts/contextMenu.js +++ b/sources/views/subviews/gallery/parts/contextMenu.js @@ -5,16 +5,14 @@ const contextMenu = { data: [constants.ID_GALLERY_CONTEXT_MENU_SAVE_IMAGE] }; -function getConfig(id) { - contextMenu.id = id || `contextmenu-${webix.uid()}`; - return contextMenu; -} - -function getIdFromConfig() { - return contextMenu; +function getConfig(id = `contextmenu-${webix.uid()}`, css) { + return { + ...contextMenu, + id, + ...(css && { css }) + }; } export default { getConfig, - getIdFromConfig }; From 87cff898b1585528da6c0502bc7508de8f9f2d3f Mon Sep 17 00:00:00 2001 From: kpoddubskaya Date: Fri, 20 Jun 2025 17:07:26 +0300 Subject: [PATCH 5/5] Replace test gtm with official gtm --- error.html | 14 ++------------ index.html | 14 ++------------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/error.html b/error.html index 93dc24f3..fc8d855d 100644 --- a/error.html +++ b/error.html @@ -6,12 +6,12 @@ new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); - })(window,document,'script','dataLayer','GTM-TQWPXL9L'); + })(window,document,'script','dataLayer','GTM-W2JQSNLL'); - @@ -22,15 +22,5 @@
Oops! The page you are looking for does not exist.
- - - \ No newline at end of file diff --git a/index.html b/index.html index 506d57df..384a2a0d 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,7 @@ new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); - })(window,document,'script','dataLayer','GTM-TQWPXL9L'); + })(window,document,'script','dataLayer','GTM-W2JQSNLL'); @@ -25,7 +25,7 @@ - @@ -117,15 +117,5 @@ - - -