Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Idr front page #91

Closed
wants to merge 80 commits into from
Closed
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
2a2dbb5
TEMP hard-code IDR settings
will-moore Jan 21, 2022
f834867
Initial work on redesign of IDR front page
will-moore Jan 21, 2022
bed43e8
Add tooltips with tippy.js
will-moore Jan 24, 2022
5b4a9cd
tooltip shows e.g. 2 Screens. Thumb links to study in webclient
will-moore Jan 24, 2022
d7b5713
Show authors in tooltip
will-moore Jan 24, 2022
2051002
Styling of tabs
will-moore Jan 26, 2022
a228c50
YouTube videos, click to expand
will-moore Jan 29, 2022
e3abc55
Background carousel. Tooltips have links
will-moore Feb 5, 2022
b88fe3a
Put stats in a box, Fix twitter feed height
will-moore Feb 6, 2022
099952f
Add missing logo-idr-dark.svg
will-moore Feb 7, 2022
3a8e333
Limit height of studies thumbnails
will-moore Feb 11, 2022
9dd5d69
Fix Cell/Tissue button links when on /cell or /tissue pages
will-moore Feb 13, 2022
0fd99e2
Remove 'Case Studies' tab
will-moore Feb 13, 2022
9a1aad6
Revert hard-coded settings
will-moore Feb 14, 2022
d68ea7a
Limit thumbnails to 6 rows
will-moore Feb 14, 2022
d6a9711
Add settings.GALLERY_INDEX and filter study thumbs by tag
will-moore Feb 14, 2022
8814dac
Use loadStudyThumbnails() for front-page. No hard-coded image-ids
will-moore Feb 14, 2022
21a4343
Move background_carousel into background_carousel.html
will-moore Feb 14, 2022
f44d839
Background carousels cell/tissue specific
will-moore Feb 15, 2022
38ffc75
Add link to viewer for background images
will-moore Feb 16, 2022
0ffd1eb
Open background image in webclient
will-moore Feb 16, 2022
13f6474
Fix api-thumbnails query for screens
will-moore Feb 16, 2022
2356e70
Fix tooltip layout - less whitespace + link to study
will-moore Feb 17, 2022
c0c06dc
Thumbnails use background image. tooltip click to show
will-moore Feb 17, 2022
ad2c7a7
Fix tooltip link styles
will-moore Feb 17, 2022
64f0b0d
Fix thumbnail bg placeholder color
will-moore Feb 17, 2022
bfe685c
Load studies.tsv for stats
will-moore Feb 18, 2022
47f32e7
Support Django 3.2
will-moore Feb 21, 2022
a657804
Add link to publication
will-moore Feb 21, 2022
ba9c06c
Format stats numbers internationally
will-moore Feb 21, 2022
fd8a556
Fix expanding of videos buttons
will-moore Feb 21, 2022
9919030
improve expandVideo icons
will-moore Feb 21, 2022
c088071
Update video links and text. Initial Analysis text
will-moore Feb 23, 2022
f815642
Move autocomplete code to autocomplete.js
will-moore Feb 25, 2022
46460b4
cleanup src/model.js -> static/model.js
will-moore Feb 26, 2022
7bfbc82
Use async / await for loadStudies() and loadMapAnns
will-moore Feb 26, 2022
0bd53ba
copy src/search.js -> static/gallery/search.js to skip compile step
will-moore Feb 28, 2022
e021b98
Use pub/sub for loadThumbnails() instead of callback
will-moore Feb 28, 2022
b6aeead
Udpate videos to use placeholders
will-moore Feb 28, 2022
e7a1ca6
Fix rendering for Group-by-type
will-moore Feb 28, 2022
9e101f6
Video titles match upper/lower case in videos
will-moore Feb 28, 2022
28ba214
videos from settings
will-moore Feb 28, 2022
5c7aae6
change first video link and title
will-moore Feb 28, 2022
0f53bfa
Full re-render() on thumbnails load, instead of update thumbs direct
will-moore Feb 28, 2022
527e757
Fix re-render when groupByType is checked
will-moore Feb 28, 2022
3854578
Use Django not JS to renderStudyKeys
will-moore Feb 28, 2022
63d0dfc
Use class syntax
will-moore Feb 28, 2022
1bd2870
modify the video blurbs
pwalczysko Mar 1, 2022
79241b7
Exchange the first video (rerecord because of typo)
pwalczysko Mar 1, 2022
eb925ca
Replace "Search" with "Query", be more precise in formulation
pwalczysko Mar 1, 2022
5a26b61
Merge pull request #1 from pwalczysko/idr-front
will-moore Mar 1, 2022
514d53e
Filter study stats by cell or tissue
will-moore Mar 2, 2022
5550440
Make sure we never filter out ALL stats
will-moore Mar 2, 2022
66f2f98
Handle failure to load studies.tsv from github
will-moore Mar 2, 2022
052ca4f
Revert 0f53bfa. Don't re-render on thumbs loading. Fix img link
will-moore Mar 3, 2022
f0c0a37
Fix filter study counts by cell/tissue
will-moore Mar 3, 2022
588a2be
Add Cell/Tissue into IDR logo
will-moore Mar 3, 2022
125826a
Filter studies by text on front page
will-moore Mar 5, 2022
ba4b376
Filter studies by text - improve UI
will-moore Mar 6, 2022
ffae2f9
Improve Analyse Data tab text - link to omero guides
will-moore Mar 7, 2022
ae9f828
Add 'IDR' link button to /cell and /tissue pages
will-moore Mar 7, 2022
7c0e515
Reorder stats: Studies, Images, TB. Tweak filterInput css
will-moore Mar 7, 2022
b4d9ba7
Improve display of filter-text results
will-moore Mar 7, 2022
d54d466
Carousel ignores left/right keys from input elements
will-moore Mar 7, 2022
d890be1
Exchange the teaser video: Sars-cov typo
pwalczysko Mar 8, 2022
e4276a5
Merge pull request #2 from pwalczysko/add-analysis-teaser
will-moore Mar 8, 2022
2786552
Add video to Analyse Data tab
will-moore Mar 9, 2022
61321a1
Video title Compound analysis: SARS-CoV-2
will-moore Mar 9, 2022
e110404
Exchange analysis tab video because of Sars... typo
pwalczysko Mar 9, 2022
27b9f48
Merge pull request #3 from pwalczysko/redo-analysis-video
will-moore Mar 9, 2022
122be63
Load tabs and videos from static github json file
will-moore Mar 9, 2022
09ef595
Fix expand/collapse of videos
will-moore Mar 9, 2022
3f06b42
Make studies.tsv URL configurable
will-moore Mar 9, 2022
180d470
Revert "Add 'IDR' link button to /cell and /tissue pages"
will-moore Mar 10, 2022
a83b9da
Revert "Add Cell/Tissue into IDR logo"
will-moore Mar 10, 2022
93de59d
Re-add highlight of cell/tissue buttons
will-moore Mar 10, 2022
bf5f9a4
Background thumbnail placeholder. Only load images as needed
will-moore Mar 10, 2022
84e3869
Show placeholder thumbnails while studies are loading
will-moore Mar 10, 2022
497c3ff
Update Copyright date on IDR footer
will-moore Mar 11, 2022
cae5cb9
Improve formatting of Image counts in tooltips
will-moore Mar 11, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions omero_gallery/gallery_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

"omero.web.gallery.base_url":
["BASE_URL",
None,
"https://idr.openmicroscopy.org",
str_slash,
("Base URL to use for JSON AJAX requests."
" e.g. 'https://demo.openmicroscopy.org'."
Expand All @@ -38,7 +38,7 @@

"omero.web.gallery.category_queries":
["CATEGORY_QUERIES",
('{}'),
('{"others":{ "label": "Others", "query": "LAST200:date", "index": 10 },"infection":{"label":"Infection studies","index":1,"query":"Study Type:infection"},"timelapse":{"label":"Time-lapse imaging","index":2,"query":"Study Type:time OR Study Type:5D OR Study Type:3D-tracking"},"lightsheet":{"label":"Light sheet fluorescence microscopy","index":3,"query":"Study Type:light sheet"},"proteinlocalization":{"label":"Protein localization studies","index":4,"query":"Study Type:protein localization"},"histology":{"label":"Digital pathology imaging","index":5,"query":"Study Type:histology"},"yeast":{"label":"Yeast studies","index":6,"query":"Organism: Saccharomyces cerevisiae OR Organism:Schizosaccharomyces pombe"},"humancellscreen":{"label":"High-content screening (human)","index":7,"query":"Organism:Homo sapiens AND Study Type:high content screen"}}'),
json.loads,
("If this is configured then the gallery Home Page shows a list"
" of categories containing Projects and Screens that match the"
Expand All @@ -51,7 +51,7 @@

"omero.web.gallery.filter_keys":
["FILTER_KEYS",
('[]'),
('[{"label": "Name (IDR number)", "value": "Name" }, "Imaging Method", "License", "Organism", "Publication Authors", "Publication Title", "Screen Technology Type", "Screen Type", "Study Type"]'),
json.loads,
("If this is configured then we allow filtering of Screens and"
" Projects by Key:Value pairs linked to them. This list allows us"
Expand All @@ -60,7 +60,7 @@

"omero.web.gallery.filter_mapr_keys":
["FILTER_MAPR_KEYS",
('[]'),
('["antibody","cellline","compound","gene","phenotype","sirna"]'),
json.loads,
("If this is configured then we allow filtering of Screens and"
" Projects by OMERO.mapr. This is a list of mapr_config IDs, such"
Expand All @@ -78,7 +78,7 @@

"omero.web.gallery.super_categories":
["SUPER_CATEGORIES",
('{}'),
('{"cell": {"label": "Cell - IDR","title": "Welcome to Cell-IDR","query": "Sample Type:cell","image": "https://idr.openmicroscopy.org/webgateway/render_image/122770/0/0/"},"tissue": {"label": "Tissue - IDR","title": "Welcome to Tissue-IDR","query": "Sample Type:tissue","image": "https://idr.openmicroscopy.org/webgateway/render_image_region/5470164/0/0/?region=1024,1024,696,520"}}'),
json.loads,
("Optional config to provide top-level categories, similar to"
" category_queries, using the same config format and 'query' syntax."
Expand All @@ -96,15 +96,15 @@

"omero.web.gallery.top_right_links":
["TOP_RIGHT_LINKS",
('[]'),
('[{"text":"About","href":"https://idr.openmicroscopy.org/about/index.html","submenu":[{"text":"Overview","href":"https://idr.openmicroscopy.org/about/index.html"},{"text":"Published studies","href":"https://idr.openmicroscopy.org/about/studies.html"},{"text":"Linked resources","href":"https://idr.openmicroscopy.org/about/linked-resources.html"},{"text":"API Access","href":"https://idr.openmicroscopy.org/about/api.html"},{"text":"Data download","href":"https://idr.openmicroscopy.org/about/download.html"},{"text":"Image Tools Resource (ITR)","href":"https://idr.openmicroscopy.org/about/itr.html"},{"text":"Analysis Environments","href":"https://idr.openmicroscopy.org/about/analysis-environments.html"},{"text":"Deployment","href":"https://idr.openmicroscopy.org/about/deployment.html"},{"text":"FAQ","href":"https://idr.openmicroscopy.org/about/faq/"}]},{"text":"Submissions","href":"https://idr.openmicroscopy.org/about/submission.html","submenu":[{"text":"Overview","href":"https://idr.openmicroscopy.org/about/submission.html"},{"text":"Screens","href":"https://idr.openmicroscopy.org/about/screens.html"},{"text":"Experiments","href":"https://idr.openmicroscopy.org/about/experiments.html"}]}]'),
json.loads,
("List of {'text':'Text','href':'www.url'} links for top-right of"
" page. If a link contains 'submenu':[ ] with more links,"
" these will be shown in a dropdown menu")],

"omero.web.gallery.top_left_logo":
["TOP_LEFT_LOGO",
('{}'),
('{"src": "https://idr.openmicroscopy.org/about/img/logos/logo-idr.svg","href": "/"}'),
json.loads,
("Logo image and link. e.g."
" {'src':'url.png','href':'www.url', 'alt':'Image alt text'}"
Expand All @@ -113,14 +113,14 @@

"omero.web.gallery.footer_html":
["FOOTER_HTML",
(''),
('IDR'),
str,
("HTML to go in the footer. If this is set to 'IDR' then"
" we show the footer for the IDR site.")],

"omero.web.gallery.subheading_html":
["SUBHEADING_HTML",
(''),
("The Image Data Resource (IDR) is a public repository of image datasets from published scientific studies,<br/>where the community can submit, search and access high-quality bio-image data."),
str,
("HTML to show as a sub-heading, within a <p> tag.")],

Expand Down
Loading