Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
abf90611
Commit
abf90611
authored
Mar 14, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve import buttons on new project page
parent
dffa2fa9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
25 deletions
+23
-25
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+5
-0
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+18
-25
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
abf90611
...
@@ -301,3 +301,8 @@ table.table.protected-branches-list tr.no-border {
...
@@ -301,3 +301,8 @@ table.table.protected-branches-list tr.no-border {
border
:
0
;
border
:
0
;
}
}
}
}
.project-import
.btn
{
float
:
left
;
margin-right
:
10px
;
}
app/views/projects/new.html.haml
View file @
abf90611
...
@@ -40,52 +40,45 @@
...
@@ -40,52 +40,45 @@
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
For SVN repositories, check
#{
link_to
"this migrating from SVN doc."
,
"http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"
}
For SVN repositories, check
#{
link_to
"this migrating from SVN doc."
,
"http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"
}
.project-import.form-group
.project-import.form-group
.col-sm-2
%label
.control-label
Import projects from
.col-sm-10
.col-sm-10
-
if
github_import_enabled?
-
if
github_import_enabled?
=
link_to
status_import_github_path
do
=
link_to
status_import_github_path
,
class:
'btn'
do
%i
.fa.fa-github
%i
.fa.fa-github
Import projects from
GitHub
GitHub
-
else
-
else
=
link_to
'#'
,
class:
'how_to_import_link light'
do
=
link_to
'#'
,
class:
'how_to_import_link light
btn
'
do
%i
.fa.fa-github
%i
.fa.fa-github
Import projects from
GitHub
GitHub
=
render
'github_import_modal'
=
render
'github_import_modal'
.project-import.form-group
.col-sm-2
.col-sm-10
-
if
bitbucket_import_enabled?
-
if
bitbucket_import_enabled?
=
link_to
status_import_bitbucket_path
do
=
link_to
status_import_bitbucket_path
,
class:
'btn'
do
%i
.fa.fa-bitbucket
%i
.fa.fa-bitbucket
Import projects from
Bitbucket
Bitbucket
-
else
-
else
=
link_to
'#'
,
class:
'how_to_import_link light'
do
=
link_to
'#'
,
class:
'how_to_import_link light
btn
'
do
%i
.fa.fa-bitbucket
%i
.fa.fa-bitbucket
Import projects from
Bitbucket
Bitbucket
=
render
'bitbucket_import_modal'
=
render
'bitbucket_import_modal'
-
unless
request
.
host
==
'gitlab.com'
-
unless
request
.
host
==
'gitlab.com'
.project-import.form-group
.col-sm-2
.col-sm-10
-
if
gitlab_import_enabled?
-
if
gitlab_import_enabled?
=
link_to
status_import_gitlab_path
do
=
link_to
status_import_gitlab_path
,
class:
'btn'
do
%i
.fa.fa-heart
%i
.fa.fa-heart
Import projects from
GitLab.com
GitLab.com
-
else
-
else
=
link_to
'#'
,
class:
'how_to_import_link light'
do
=
link_to
'#'
,
class:
'how_to_import_link light
btn
'
do
%i
.fa.fa-heart
%i
.fa.fa-heart
Import projects from
GitLab.com
GitLab.com
=
render
'gitlab_import_modal'
=
render
'gitlab_import_modal'
.project-import.form-group
=
link_to
new_import_gitorious_path
,
class:
'btn'
do
.col-sm-2
.col-sm-10
=
link_to
new_import_gitorious_path
do
%i
.icon-gitorious.icon-gitorious-small
%i
.icon-gitorious.icon-gitorious-small
Import projects from
Gitorious.org
Gitorious.org
%hr
.prepend-botton-10
%hr
.prepend-botton-10
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment