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.

Sign up for GitHub

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

Jump to bottom

merge release 500 into develop #5400

Merged
merged 2 commits into from
May 30, 2024
Merged

merge release 500 into develop #5400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c42cc2
SWC-6849
jay-hodgson May 30, 2024
1c04c82
Merge pull request #5399 from jay-hodgson/SWC-6849
xschildw May 30, 2024
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
2 changes: 1 addition & 1 deletion src/main/java/org/sagebionetworks/web/client/AppLoadingView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public AppLoadingView() {
* DO NOT ADD THIS TO THE MAIN IMAGE BUNGLE! This is shown while the image bundle is being download
* to the browser so putting it in the bundle defeats the whole purpose of this image.
*/
final Image ajaxImage = new Image("images/main-page-load.gif");
final Image ajaxImage = new Image("/images/main-page-load.gif");
final Grid grid = new Grid(1, 2);
grid.setWidget(0, 0, ajaxImage);
grid.setHTML(0, 1, " Loading...");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sagebionetworks/web/client/widget/entity/download/UploaderViewImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ public void showUploadingToSynapseStorage() {
uploadDestinationContainer.add(
new InlineHTML(DisplayConstants.UPLOAD_DESTINATION)
);
Image logo = new Image("images/logo.svg");
Image logo = new Image("/images/logo.svg");
logo.setSize("35px", "35px");
logo.addStyleName("displayInlineBlock margin-right-5 moveup-7");
uploadDestinationContainer.add(logo);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sagebionetworks/web/client/widget/googlemap/GoogleMapViewImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private static native void _addMarker(
) /*-{

var image = {
url : 'images/synapse-map-marker.png',
url : '/images/synapse-map-marker.png',
size : new google.maps.Size(20, 32),
origin : new google.maps.Point(0, 0),
anchor : new google.maps.Point(0, 32)
Expand Down
Loading