diff --git a/error.html b/error.html index ee10e590..fc8d855d 100644 --- a/error.html +++ b/error.html @@ -1,6 +1,20 @@ + + + + + + + + +
404
@@ -8,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 4522074f..384a2a0d 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,15 @@ + + + + + ISIC Archive @@ -15,6 +24,11 @@ + + + + @@ -103,15 +117,5 @@ - - - - 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 58c9015a..6bd631f7 100644 --- a/sources/views/subviews/gallery/galleryMobile.js +++ b/sources/views/subviews/gallery/galleryMobile.js @@ -264,7 +264,7 @@ export default class GalleryMobileView extends JetView {
${obj.isic_id}
- + @@ -272,7 +272,7 @@ export default class GalleryMobileView extends JetView { Enlarge
- + @@ -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/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/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 }; 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..9221b0f2 100644 --- a/sources/views/subviews/gallery/parts/galleryDataview.js +++ b/sources/views/subviews/gallery/parts/galleryDataview.js @@ -129,7 +129,7 @@ const dataview = { ? "" : " disabled-badge"; const lesionIcon = `
- + @@ -151,12 +151,12 @@ const dataview = {
-
${common.markCheckbox(obj, common)}
-
${obj.isic_id}
+
${common.markCheckbox(obj, common)}
+
${obj.isic_id}
- + @@ -164,7 +164,7 @@ const dataview = { Enlarge
- + @@ -172,7 +172,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..3de32533 100644 --- a/sources/views/subviews/gallery/windows/multiImageLesionWindow.js +++ b/sources/views/subviews/gallery/windows/multiImageLesionWindow.js @@ -377,7 +377,7 @@ function getTopSlider(topPanelID, sliderID, prevButtonID, nextButtonID) { Multirater
` : ""; const lesionIcon = `
- + @@ -402,7 +402,7 @@ function getTopSlider(topPanelID, sliderID, prevButtonID, nextButtonID) {
- + @@ -410,7 +410,7 @@ function getTopSlider(topPanelID, sliderID, prevButtonID, nextButtonID) { Enlarge
- + @@ -418,7 +418,7 @@ function getTopSlider(topPanelID, sliderID, prevButtonID, nextButtonID) { Metadata
- +