Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
c2d4cd0
New UI for creating and editing views
jeffbaumes Sep 26, 2024
2a706ed
Linting fixes
jeffbaumes Sep 26, 2024
a00e885
Enable configuration of the list of columns that are allowed to be us…
jeffbaumes Sep 27, 2024
d2d9510
Better help on hover for table search
jeffbaumes Sep 27, 2024
d38ebf6
Fix sorting and move away from a strict table to set up for enabling …
jeffbaumes Sep 30, 2024
d2a5bec
Lint fixes
jeffbaumes Sep 30, 2024
d641374
Better help text for flatten
jeffbaumes Sep 30, 2024
64b6a9b
grid view and option for setting grid cell width
jeffbaumes Oct 14, 2024
6d2748a
merge in master
jeffbaumes Oct 14, 2024
d56d595
fix padding on search input
jeffbaumes Oct 14, 2024
4d17617
fix navigating between views to utilize url, and make sure whole conf…
jeffbaumes Oct 15, 2024
e811224
remove unnecessary render
jeffbaumes Oct 15, 2024
03b0cc3
Merge remote-tracking branch 'origin/master' into edit-views-ui
jeffbaumes Oct 28, 2024
eef5b13
fix overflow on table
jeffbaumes Oct 31, 2024
9ae784d
Adjust table overflow again
manthey Nov 1, 2024
1a7c504
Merge branch 'master' into closer-to-master
manthey Nov 7, 2024
fbb2656
Merge pull request #1719 from girder/closer-to-master
manthey Nov 7, 2024
faa170a
Do not conditionally show image columns to keep table stable
jeffbaumes Nov 7, 2024
890bc44
Merge pull request #1720 from girder/always-show-all-columns
jeffbaumes Nov 7, 2024
3a20fd0
improve styling on grid view
jeffbaumes Nov 12, 2024
d670b6a
take care of special case of deleting current view
jeffbaumes Nov 12, 2024
fe1eed3
Merge pull request #1722 from girder/view-ui-fixes
jeffbaumes Nov 12, 2024
eefa9d8
Merge branch 'master' into merge-annotation-permissions-fix
jeffbaumes Nov 12, 2024
aa926f8
Merge pull request #1724 from girder/merge-annotation-permissions-fix
jeffbaumes Nov 12, 2024
55353a1
Merge branch 'master' into edit-views-ui
manthey Nov 13, 2024
3506c38
Add a distinct class name to controls.
manthey Nov 13, 2024
87584d5
Merge branch 'edit-views-ui' into edit-views-class-name
manthey Nov 13, 2024
b23fbab
Merge branch 'master' into edit-views-class-name
manthey Nov 13, 2024
3e2985b
Merge pull request #1726 from girder/edit-views-class-name
manthey Nov 13, 2024
b96b5d2
Add a check for adding the menu item to^Che new-style menu
jeffbaumes Dec 5, 2024
8155a1c
Merge pull request #1737 from girder/fix-annotation-access-control
jeffbaumes Dec 5, 2024
c50e5e8
Merge branch 'master' into edit-views-ui
manthey May 8, 2025
decdffc
Merge branch 'master' into edit-views-ui
manthey May 19, 2025
582ec19
Merge branch 'master' into v5-edit-views-ui
naglepuff May 21, 2025
404c51c
Merge branch 'master' into edit-views-ui
manthey May 23, 2025
35edbd6
Merge branch 'master' into edit-views-ui
manthey May 27, 2025
a67150a
Merge branch 'master' into edit-views-ui
manthey May 27, 2025
7ec4d25
Merge branch 'improve-save-debounce' into edit-views-ui
manthey May 29, 2025
45a516c
Merge branch 'master' into edit-views-ui
manthey Jun 3, 2025
5cd4369
Merge branch 'master' into edit-views-ui
manthey Jun 5, 2025
30928bd
Merge branch 'girder-5' into v5-edit-views-ui
naglepuff Jun 4, 2025
9996562
Merge branch 'edit-views-ui' into v5-edit-views-ui
naglepuff Jun 4, 2025
4322b5d
Fix after merge
naglepuff Jun 5, 2025
1ed127d
Merge branch 'edit-views-ui' into v5-edit-views-ui
naglepuff Jun 5, 2025
c4edc54
Merge branch 'master' into edit-views-ui
manthey Jun 24, 2025
04a3d66
Merge branch 'master' into edit-views-ui
manthey Jul 9, 2025
4586f7f
Merge branch 'master' into edit-views-ui
manthey Jul 9, 2025
f012297
Force tailwind to be built into client dist
naglepuff Jul 16, 2025
93da668
Adjust some styles for a cleaner layout
naglepuff Jul 16, 2025
d4c1887
Merge branch 'girder-5' into v5-edit-views-ui
naglepuff Jul 16, 2025
b8a60f9
Merge branch 'edit-views-ui' into v5-edit-views-ui
naglepuff Aug 6, 2025
5247413
Merge branch 'girder-5' into v5-edit-views-ui
naglepuff Aug 6, 2025
6183edf
Update package-lock.json
naglepuff Aug 6, 2025
f532545
Narrow content scope for tailwind
naglepuff Aug 13, 2025
f9b9240
Remove do-nothing tailwind plugin
naglepuff Aug 14, 2025
77764e9
Remove stale TableViewSelect component
naglepuff Aug 14, 2025
8445156
Merge branch 'girder-5' into v5-edit-views-ui
naglepuff Aug 21, 2025
9aac16b
Merge branch 'girder-5' into v5-edit-views-ui
naglepuff Aug 28, 2025
9731adb
Merge branch 'girder-5' into v5-edit-views-ui
manthey Sep 11, 2025
92427c1
Merge branch 'girder-5' into v5-edit-views-ui
manthey Sep 17, 2025
f7e1ba0
Merge branch 'girder-5' into v5-edit-views-ui
manthey Sep 25, 2025
7ce4f1e
Merge branch 'master' into girder-5
manthey Oct 1, 2025
29e044d
Merge branch 'girder-5' into v5-edit-views-ui
manthey Oct 1, 2025
de90e9f
Merge branch 'girder-5' into v5-edit-views-ui
manthey Oct 2, 2025
142f29d
Merge branch 'girder-5' into v5-edit-views-ui
manthey Oct 6, 2025
a81a39f
Merge branch 'girder-5' into v5-edit-views-ui
manthey Oct 10, 2025
8eb981c
Merge branch 'girder-5' into v5-edit-views-ui
manthey Oct 15, 2025
9892b34
Merge branch 'girder-5' into v5-edit-views-ui
manthey Nov 12, 2025
6866eb6
Merge branch 'girder-5' into v5-edit-views-ui
manthey Nov 17, 2025
dc2c872
Merge branch 'girder-5' into v5-edit-views-ui
manthey Dec 2, 2025
14d3cef
Merge branch 'girder-5' into v5-edit-views-ui
manthey Dec 3, 2025
ff5053f
Merge branch 'girder-5' into v5-edit-views-ui
manthey Jan 9, 2026
330cf12
Merge branch 'girder-5' into v5-edit-views-ui
manthey Jan 12, 2026
0218fdc
Merge branch 'girder-5' into v5-edit-views-ui
manthey Jan 21, 2026
49a3e4c
Merge branch 'girder-5' into v5-edit-views-ui
manthey Jan 30, 2026
c9453af
Merge branch 'girder-5' into v5-edit-views-ui
manthey Apr 21, 2026
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
4 changes: 4 additions & 0 deletions girder/girder_large_image/web_client/main.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// import tailwind
import './stylesheets/importTailwind.css';

// import modules for side effects
import './routes';
import './views/fileList';
Expand All @@ -12,6 +15,7 @@ import * as largeImage from './index';
const {registerPluginNamespace} = girder.pluginUtils;
const SearchFieldWidget = girder.views.widgets.SearchFieldWidget;

console.log('registering plugin namespace for large image');
registerPluginNamespace('large_image', largeImage);

SearchFieldWidget.addMode(
Expand Down
954 changes: 679 additions & 275 deletions girder/girder_large_image/web_client/package-lock.json

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion girder/girder_large_image/web_client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
"vue-color": "^2.8.1",
"vue-loader": "~15.9.8",
"vue-template-compiler": "~2.6.14",
"yaml": "^2.1.1"
"vuedraggable": "^2.24.3",
"yaml": "^2.1.1",
"autoprefixer": "^10.4.21",
"postcss": "^8.5.3",
"tailwindcss": "^3.4.17"
},
"main": "./index.js",
"eslintConfig": {
Expand Down Expand Up @@ -76,6 +80,7 @@
],
"pugLintConfig": {
"extends": "@girder/pug-lint-config",
"disallowHtmlText": null,
"excludeFiles": [
"**/node_modules/"
]
Expand Down
6 changes: 6 additions & 0 deletions girder/girder_large_image/web_client/postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export default {
plugins: {
tailwindcss: {},
autoprefixer: {}
}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
108 changes: 4 additions & 104 deletions girder/girder_large_image/web_client/stylesheets/itemList.styl
Original file line number Diff line number Diff line change
Expand Up @@ -24,75 +24,6 @@ div.large_image_container+span
div.large_image_container
min-width 480px

ul.g-item-list
&.li-item-list
display table
background #fff

>li
display table-row

&.li-item-list-header
padding-bottom 5px

>span.li-item-list-header
display table-cell
font-weight bold
text-align center
border-bottom 1px solid #888
padding 0 5px

&.sortable
&:after
color black
content "\002b65"
padding-left 5px

&.down:after
content "\002b63"

&.up:after
content "\002b61"

>.li-item-list-cell
display table-cell
padding 4px 3px 3px
vertical-align top

&.li-column-record-size
div
float none
margin-left 0
padding 0 10px

&.li-column-record-controls
white-space nowrap

>span.li-item-list-cell:first-child
padding-left 5px

>span.li-item-list-cell:last-child
padding-right 5px

>span.li-column-metadata
padding-left 5px
padding-right 5px

div.large_image_thumbnail
display flex
align-items flex-end
justify-content center
width inherit

span.g-item-list-label
font-weight bold
font-size 14px
color black
padding-right 5px

span.large_image_metadata
display inline-block

&.li-item-list[layout_mode="grid"]
display block

Expand All @@ -114,9 +45,6 @@ ul.g-item-list[metadata-columns="0"]
.li-column-record-name
width 100%

.li-item-list-filter
padding-left 12px

@media (min-width 768px)
.modal-dialog.li-item-list-dialog
width inherit
Expand All @@ -126,36 +54,8 @@ ul.g-item-list[metadata-columns="0"]
width 70%
max-width 1000px

.li-flatten-item-list
font-size 14px
display inline-block
margin-left 20px

label
padding-left 5px
font-weight normal

.g-hierarchy-widget .g-hierarchy-actions-header.li-item-list-filter-parent
display flex
align-items baseline

button.g-checked-actions-button
float unset

.li-item-list-filter
flex 1
display flex
align-items baseline

input
flex 1

.li-item-list-filter-clear
cursor pointer
margin-right 20px

.g-hierarchy-widget .g-hierarchy-breadcrumb-bar ol.breadcrumb.li-item-list-filter-parent
white-space wrap
.li-item-list-filter
padding-top 11px

.li-item-list-filter
white-space nowrap
.li-item-list-filter-clear
cursor pointer
41 changes: 41 additions & 0 deletions girder/girder_large_image/web_client/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/** @type {import('tailwindcss').Config} */
export default {
content: [
"./views/**/*.{js,ts,jsx,tsx,styl,css,pug,vue}",
"./templates/**/*.{js,ts,jsx,tsx,styl,css,pug,vue}",
"./stylesheets/**/*.{js,ts,jsx,tsx,styl,css,pug,vue}",
"./vue/**/*.{js,ts,jsx,tsx,styl,css,pug,vue}",
"./widgets/**/*.{js,ts,jsx,tsx,styl,css,pug,vue}",
"./*.{js,ts,jsx,tsx,styl,css,pug,vue}",
],
safelist: [
{
pattern: /.*/, // Match all class names since plugins may use anything
},
],
theme: {
extend: {
colors: {
primary: {
DEFAULT: 'hsl(var(--primary-h), var(--primary-s), var(--primary-l))',
hover: 'var(--primary-hover)',
content: 'var(--primary-content)',
},
secondary: {
DEFAULT: 'hsl(var(--secondary-h), var(--secondary-s), var(--secondary-l))',
hover: 'var(--secondary-hover)',
content: 'var(--secondary-content)',
},
accent: {
DEFAULT: 'hsl(var(--accent-h), var(--accent-s), var(--accent-l))',
hover: 'var(--accent-hover)',
content: 'var(--accent-content)',
},
},
zIndex: {
'100': '100',
},
},
},
blocklist: ['collapse'], // disable because bootstrap uses it for something else
}
Loading
Loading