Fixes #14869 - Adds import button to environments welcome page #3501
Conversation
| @@ -11,4 +11,8 @@ | |||
| <div class="blank-slate-pf-main-action"> | |||
| <%= new_link(_('New Puppet environment'), {}, { :class => "btn-lg" }) %> | |||
| </div> | |||
| <p><%= _('Or') %></p> | |||
There was a problem hiding this comment.
If there's no proxy I see 'Or' and nothing below that. It should check for at least one proxy to display this part. Otherwise looks good.
There was a problem hiding this comment.
That breaks https://www.patternfly.org/patterns/empty-state/, please try to adapt to use it @shlomizadok 😄
There was a problem hiding this comment.
how strict should we follow it? according to the PF, it should be separate button for each proxy but I'd prefer having the select (current implementation) since there might be a lot of proxies available...
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
Removed the 'Or' sentence. Adapted to pf |
|
Tested, works fine, @dLobatog any thoughts on the select vs. multiple buttons? If not, I'd merge. |
| @@ -11,4 +11,7 @@ | |||
| <div class="blank-slate-pf-main-action"> | |||
| <%= new_link(_('New Puppet environment'), {}, { :class => "btn-lg" }) %> | |||
| </div> | |||
| <div class="blank-slate-pf-secondary-action"> | |||
| <%= select_action_button( _('Import'), {}, import_proxy_links(hash_for_import_environments_environments_path, 'btn btn-default')) %> | |||
There was a problem hiding this comment.
We already have a import_proxy_select helper that does this (and is used in the index page for the same button)
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
Fails on Ruby 2.3 unrelated(?) JS test |
|
[test] |
|
Merged as 8aea793, thanks @shlomizadok |
No description provided.