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

Jl - ui for protocol merge #1721

Merged
merged 12 commits into from Feb 20, 2019
Merged

Jl - ui for protocol merge #1721

merged 12 commits into from Feb 20, 2019

Conversation

jleonardw9
Copy link
Contributor

Copy link
Contributor

@marklohr marklohr left a comment

Choose a reason for hiding this comment

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

Looks good! Couple of small things -
protocol_merges_controller.rb:92
Successful is misspelled.

protocol_merges/show.html.haml
needs the updated copyright info.

@jleonardw9
Copy link
Contributor Author

@marklohr Ah, good catches thanks!

@@ -0,0 +1,19 @@
#protocol-merges-container
%h1{style: 'text-align:center;'}
Copy link
Contributor

Choose a reason for hiding this comment

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

Replace inline style with the text-center class

#protocol-merges-container
%h1{style: 'text-align:center;'}
Protocol Merge Tool
%p &nbsp
Copy link
Contributor

Choose a reason for hiding this comment

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

Standard tags shouldn't really be used for spacing like this. You could use breaks or add margin styles

%p &nbsp
%p &nbsp
%p &nbsp
%p
Copy link
Contributor

Choose a reason for hiding this comment

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

All of this content should be wrapped in a form tag with the URL being the perform_protocol_merge route that you added. Also can you add the bootstrap form style classes for consistency? https://bootstrapdocs.com/v3.3.5/docs/css/#forms

%p &nbsp
%p &nbsp
%p{style: 'text-align:center;'}
%button.btn.btn-info.navbar-btn#merge-button{ type: 'button', title: "Perform Protocol Merge"}
Copy link
Contributor

Choose a reason for hiding this comment

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

This button should be a submit_tag for the form. To force the user to confirm before submitting, you can use the onsubmit attribute. https://stackoverflow.com/a/6515632

@@ -35,6 +35,8 @@
%li
%button.btn.btn-info.navbar-btn#epic-queue-btn{ type: 'button', title: t(:dashboard)[:navbar][:tooltips][:epic_queue], data: { toggle: 'tooltip', placement: 'bottom', delay: '{"show":"500"}'} }
= t(:dashboard)[:navbar][:epic_queue]
- if current_user.catalog_overlord?
= link_to "Protocol Merge", dashboard_protocol_merge_path, :class => ' header_button btn btn-primary btn-md', style: 'margin-top:7px;'
Copy link
Contributor

Choose a reason for hiding this comment

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

This text needs to be YAMLized and styles moved to a stylesheet

config/routes.rb Show resolved Hide resolved
@jleonardw9 jleonardw9 dismissed kayla-glick’s stale review February 20, 2019 02:51

This is really great feedback, and I plan on implementing these and many other changes in future iterations. This is just a first draft so a select group of users (just Leila, Wenjun, etc.) can test and make sure the merge works like expected. Only a couple of people will even see this tool.

Copy link
Collaborator

@Stuart-Johnson Stuart-Johnson left a comment

Choose a reason for hiding this comment

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

I agree with most of Kyle's thoughts I think, but this is totally fine for the "first draft." Especially with Wenjun so eager to see it on -d :)

@Stuart-Johnson Stuart-Johnson merged commit 0bf8ed9 into v3.5.0 Feb 20, 2019
@Stuart-Johnson Stuart-Johnson deleted the jl-ui-for-protocol-merge branch February 20, 2019 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants