Commit 62cd17bb authored by James Lopez's avatar James Lopez

fixes CSS issues and namespace path issue. Also tested in different browsers.

parent 13e81898
...@@ -769,4 +769,14 @@ pre.light-well { ...@@ -769,4 +769,14 @@ pre.light-well {
display: block; display: block;
} }
} }
}
.project-path {
#path.form-control {
min-width: 100px;
}
.select2-choice {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
} }
\ No newline at end of file
...@@ -46,16 +46,16 @@ ...@@ -46,16 +46,16 @@
= github_project_link(repo.full_name) = github_project_link(repo.full_name)
%td.import-target %td.import-target
%fieldset.row %fieldset.row
.input-group.col-sm-8 .input-group
.project-path.input-group-btn .project-path.input-group-btn
- if false - if current_user.can_select_namespace?
- selected = params[:namespace_id] || :current_user - selected = params[:namespace_id] || :current_user
- opts = current_user.can_create_group? ? { extra_group: Group.new(name: repo.owner.login) } : { display_path: true } - opts = current_user.can_create_group? ? { extra_group: Group.new(name: repo.owner.login, path: repo.owner.login) }: {}
= select_tag :namespace_id, namespaces_options(selected, opts), { class: 'select2 js-select-namespace', tabindex: 1 } = select_tag :namespace_id, namespaces_options(selected, opts.merge({ display_path: true })), { class: 'select2 js-select-namespace', tabindex: 1 }
- else - else
= text_field_tag :path, current_user.namespace_path, class: "form-control", tabindex: 1, autofocus: true, disabled: true = text_field_tag :path, current_user.namespace_path, class: "input-large form-control", tabindex: 1, disabled: true
%span.input-group-addon / %span.input-group-addon /
= text_field_tag :path, repo.name, class: "form-control", tabindex: 2, autofocus: true, required: true = text_field_tag :path, repo.name, class: "input-mini form-control", tabindex: 2, autofocus: true, required: true
%td.import-actions.job-status %td.import-actions.job-status
= button_tag class: "btn btn-import js-add-to-import" do = button_tag class: "btn btn-import js-add-to-import" do
Import Import
......
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