Merge branch 'zj-import-gitlab-fa-icon' into 'master'
Use FA GitLab Icon for import project button Before: ![Screen_Shot_2016-08-08_at_09.43.47](/uploads/e419dc0d229ff848294cf277ffbb02f9/Screen_Shot_2016-08-08_at_09.43.47.png) After: ![Screen_Shot_2016-08-08_at_09.43.09](/uploads/3a77c5e98385bbc1c7139300eeca5866/Screen_Shot_2016-08-08_at_09.43.09.png) See merge request !5702
This commit is contained in:
commit
0f4ff69fb4
|
@ -46,28 +46,18 @@
|
||||||
%div
|
%div
|
||||||
- if github_import_enabled?
|
- if github_import_enabled?
|
||||||
= link_to new_import_github_path, class: 'btn import_github' do
|
= link_to new_import_github_path, class: 'btn import_github' do
|
||||||
= icon 'github', text: 'GitHub'
|
= icon('github', text: 'GitHub')
|
||||||
%div
|
%div
|
||||||
- if bitbucket_import_enabled?
|
- if bitbucket_import_enabled?
|
||||||
- if bitbucket_import_configured?
|
= link_to status_import_bitbucket_path, class: "btn import_bitbucket #{'how_to_import_link' unless bitbucket_import_configured?}", "data-no-turbolink" => "true" do
|
||||||
= link_to status_import_bitbucket_path, class: 'btn import_bitbucket', "data-no-turbolink" => "true" do
|
= icon('bitbucket', text: 'Bitbucket')
|
||||||
%i.fa.fa-bitbucket
|
- unless bitbucket_import_configured?
|
||||||
Bitbucket
|
|
||||||
- else
|
|
||||||
= link_to status_import_bitbucket_path, class: 'how_to_import_link btn import_bitbucket', "data-no-turbolink" => "true" do
|
|
||||||
%i.fa.fa-bitbucket
|
|
||||||
Bitbucket
|
|
||||||
= render 'bitbucket_import_modal'
|
= render 'bitbucket_import_modal'
|
||||||
%div
|
%div
|
||||||
- if gitlab_import_enabled?
|
- if gitlab_import_enabled?
|
||||||
- if gitlab_import_configured?
|
= link_to status_import_gitlab_path, class: "btn import_gitlab #{'how_to_import_link' unless bitbucket_import_configured?}" do
|
||||||
= link_to status_import_gitlab_path, class: 'btn import_gitlab' do
|
= icon('gitlab', text: 'GitLab.com')
|
||||||
%i.fa.fa-heart
|
- unless gitlab_import_configured?
|
||||||
GitLab.com
|
|
||||||
- else
|
|
||||||
= link_to status_import_gitlab_path, class: 'how_to_import_link btn import_gitlab' do
|
|
||||||
%i.fa.fa-heart
|
|
||||||
GitLab.com
|
|
||||||
= render 'gitlab_import_modal'
|
= render 'gitlab_import_modal'
|
||||||
%div
|
%div
|
||||||
- if gitorious_import_enabled?
|
- if gitorious_import_enabled?
|
||||||
|
@ -77,23 +67,19 @@
|
||||||
%div
|
%div
|
||||||
- if google_code_import_enabled?
|
- if google_code_import_enabled?
|
||||||
= link_to new_import_google_code_path, class: 'btn import_google_code' do
|
= link_to new_import_google_code_path, class: 'btn import_google_code' do
|
||||||
%i.fa.fa-google
|
= icon('google', text: 'Google Code')
|
||||||
Google Code
|
|
||||||
%div
|
%div
|
||||||
- if fogbugz_import_enabled?
|
- if fogbugz_import_enabled?
|
||||||
= link_to new_import_fogbugz_path, class: 'btn import_fogbugz' do
|
= link_to new_import_fogbugz_path, class: 'btn import_fogbugz' do
|
||||||
%i.fa.fa-bug
|
= icon('bug', text: 'Fogbugz')
|
||||||
Fogbugz
|
|
||||||
%div
|
%div
|
||||||
- if git_import_enabled?
|
- if git_import_enabled?
|
||||||
= link_to "#", class: 'btn js-toggle-button import_git' do
|
= link_to "#", class: 'btn js-toggle-button import_git' do
|
||||||
%i.fa.fa-git
|
= icon('git', text: 'Repo by URL')
|
||||||
%span Repo by URL
|
|
||||||
%div{ class: 'import_gitlab_project' }
|
%div{ class: 'import_gitlab_project' }
|
||||||
- if gitlab_project_import_enabled?
|
- if gitlab_project_import_enabled?
|
||||||
= link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do
|
= link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do
|
||||||
%i.fa.fa-gitlab
|
= icon('gitlab', text: 'GitLab export')
|
||||||
%span GitLab export
|
|
||||||
|
|
||||||
.js-toggle-content.hide
|
.js-toggle-content.hide
|
||||||
= render "shared/import_form", f: f
|
= render "shared/import_form", f: f
|
||||||
|
|
Loading…
Reference in New Issue