Commit bb392467 authored by Coung Ngo's avatar Coung Ngo

Convert Issue import button to dropdown

Hidden behind feature flag :jira_issue_import
parent 972e5e68
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
} }
> .btn, > .btn,
> .btn-group,
> .btn-container, > .btn-container,
> .dropdown, > .dropdown,
> input, > input,
...@@ -161,7 +162,8 @@ ...@@ -161,7 +162,8 @@
.dropdown, .dropdown,
.dropdown-toggle, .dropdown-toggle,
.dropdown-menu-toggle, .dropdown-menu-toggle,
.form-control { .form-control,
> .btn-group {
margin: 0 0 $gl-padding-8; margin: 0 0 $gl-padding-8;
display: block; display: block;
width: 100%; width: 100%;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- if show_feed_buttons - if show_feed_buttons
= render 'shared/issuable/feed_buttons' = render 'shared/issuable/feed_buttons'
.btn-group.append-right-10< .btn-group
- if show_export_button - if show_export_button
= render_if_exists 'projects/issues/export_csv/button' = render_if_exists 'projects/issues/export_csv/button'
......
- type = local_assigns.fetch(:type, :icon) - type = local_assigns.fetch(:type, :icon)
%button.csv-import-button.btn{ title: _('Import CSV'), class: ('has-tooltip' if type == :icon),
data: { toggle: 'modal', target: '.issues-import-modal' } }
- if type == :icon
= sprite_icon('import')
- else
= _('Import CSV')
- if Feature.enabled?(:jira_issue_import, @project) - if Feature.enabled?(:jira_issue_import, @project)
= link_to _("Import Jira issues"), project_import_jira_path(@project), class: "btn btn-default" .dropdown.btn-group
%button.btn.rounded-right.text-center{ class: ('has-tooltip' if type == :icon), title: (_('Import issues') if type == :icon),
data: { toggle: 'dropdown' }, 'aria-label' => _('Import issues'), 'aria-haspopup' => 'true', 'aria-expanded' => 'false' }
- if type == :icon
= sprite_icon('import')
- else
= _('Import issues')
%ul.dropdown-menu
%li
%button.btn{ data: { toggle: 'modal', target: '.issues-import-modal' } }
= _('Import CSV')
%li= link_to _('Import from Jira'), project_import_jira_path(@project)
- else
%button.csv-import-button.btn{ title: _('Import CSV'), class: ('has-tooltip' if type == :icon),
data: { toggle: 'modal', target: '.issues-import-modal' } }
- if type == :icon
= sprite_icon('import')
- else
= _('Import CSV')
...@@ -10803,9 +10803,6 @@ msgstr "" ...@@ -10803,9 +10803,6 @@ msgstr ""
msgid "Import CSV" msgid "Import CSV"
msgstr "" msgstr ""
msgid "Import Jira issues"
msgstr ""
msgid "Import Projects from Gitea" msgid "Import Projects from Gitea"
msgstr "" msgstr ""
...@@ -10821,6 +10818,9 @@ msgstr "" ...@@ -10821,6 +10818,9 @@ msgstr ""
msgid "Import an exported GitLab project" msgid "Import an exported GitLab project"
msgstr "" msgstr ""
msgid "Import from Jira"
msgstr ""
msgid "Import in progress" msgid "Import in progress"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment