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

Jdf/bigcz style #2087

Merged
merged 5 commits into from
Jul 31, 2017
Merged

Jdf/bigcz style #2087

merged 5 commits into from
Jul 31, 2017

Conversation

jfrankl
Copy link
Contributor

@jfrankl jfrankl commented Jul 27, 2017 •
edited by rajadain
Loading

Overview

Style cleanup for BiG CZ application.

Connects #1938

Demo

image

image

Notes

  • I removed hyperlinks in the search results text. Users will eventually be clicking on those result boxes, so we should keep them simple. We can expose those links in the detailed view if they're important.
  • The pagination should ideally be fixed to the bottom of the page. This is going to take some collaboration with a developer to pull off.

Testing Instructions

  • Go through the BiG CZ standard workflow, make sure everything looks okay.

@jfrankl jfrankl requested a review from rajadain July 27, 2017 13:33
@rajadain
Copy link
Member

Taking a look now.

@mmcfarland
Copy link
Contributor

The date range filters don't appear in the screenshots posted - was this based on the most recent UI version?

rajadain
rajadain requested changes Jul 27, 2017
View reviewed changes
Copy link
Member

@rajadain rajadain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work, looks much better. Need to accommodate the new date picker though:

image

src/mmw/mmw/settings/base.py Outdated
@@ -359,7 +359,7 @@ def get_env_setting(setting):
# BiG-CZ Host, for enabling custom behavior.
BIGCZ_HOST = 'portal.bigcz.org'
BIGCZ_CLIENT_TIMEOUT = 5 # timeout in seconds
BIGCZ_CLIENT_PAGE_SIZE = 100
BIGCZ_CLIENT_PAGE_SIZE = 20
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider reverting this, we need it to be 100 for Hydroshare to work correctly

@rajadain
Copy link
Member

Also, would it be possible to left align the overflowing lines to the first line? Like this:

image

mmcfarland
mmcfarland reviewed Jul 27, 2017
View reviewed changes
src/mmw/sass/pages/_data-catalog.scss
@@ -46,9 +69,9 @@
}
.data-catalog-search-icon {
color: $ui-grey;
position: relative;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was previously set to relative to account for the changing height when toggling the date filters. Using absolute keeps it fixed even when the search box itself is pushed down.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what this means, Matt. I'm going to need some developer support to get the pagination fixed in the correct way. Previously, the pagination didn't move, which was good, but there were other issues with the sidebar layout. I fixed the other issues but I need help to get the pagination working right.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a card to fix pagination #2091. The date filter opens and closes correctly, pushing things down and up as it should. Don't think this is an issue here.

@jfrankl
Copy link
Contributor Author

jfrankl commented Jul 28, 2017

@rajadain I believe I've made all of the fixes you requested. Take a look:

image

@rajadain
Copy link
Member

Taking another look.

@rajadain
Copy link
Member

We seem to have hidden the many sample method fields behind a an ellipsis:

image

Since we have a recommendation of possibly dropping the field entirely (see: #2096 (comment)) I think this is fine for now.

rajadain
rajadain approved these changes Jul 28, 2017
View reviewed changes
Copy link
Member

@rajadain rajadain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks and works really well. Great job!

src/mmw/sass/pages/_data-catalog.scss
@@ -46,9 +69,9 @@
}
.data-catalog-search-icon {
color: $ui-grey;
position: relative;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a card to fix pagination #2091. The date filter opens and closes correctly, pushing things down and up as it should. Don't think this is an issue here.

@rajadain
Copy link
Member

I'm going to merge these in before they get too far behind develop and have conflicts to deal with.

@rajadain rajadain assigned jfrankl and unassigned rajadain Jul 31, 2017
@rajadain
Copy link
Member

Sorry, had forgotten to assign you @jfrankl. Is this good to merge?

@jfrankl
Copy link
Contributor Author

jfrankl commented Jul 31, 2017

Yes please go ahead.

@rajadain rajadain merged commit 44c265b into develop Jul 31, 2017
@rajadain rajadain deleted the jdf/bigcz-style branch July 31, 2017 19:50
@rajadain
Copy link
Member

Thanks for working on this!

@rajadain rajadain mentioned this pull request Aug 1, 2017
Closed
@rajadain rajadain mentioned this pull request Oct 16, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmcfarland mmcfarland mmcfarland left review comments

@rajadain rajadain rajadain approved these changes

Assignees

@jfrankl jfrankl

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jfrankl @rajadain @mmcfarland @hectcastro