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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
bc80efb1
Commit
bc80efb1
authored
Feb 21, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bring Gitorious import page in line with others.
parent
20691df2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
app/views/import/gitorious/status.html.haml
app/views/import/gitorious/status.html.haml
+8
-3
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+1
-1
No files found.
app/views/import/gitorious/status.html.haml
View file @
bc80efb1
%h3
.page-title
%h3
.page-title
%i
.fa.fa-gitorious
%i
.fa.fa-gitorious
Import
repositories from Gitorious.org
Import
projects from Gitorious
%p
.light
%p
.light
Select projects you want to import.
Select projects you want to import.
...
@@ -17,7 +17,8 @@
...
@@ -17,7 +17,8 @@
%tbody
%tbody
-
@already_added_projects
.
each
do
|
project
|
-
@already_added_projects
.
each
do
|
project
|
%tr
{
id:
"project_#{project.id}"
,
class:
"#{project_status_css_class(project.import_status)}"
}
%tr
{
id:
"project_#{project.id}"
,
class:
"#{project_status_css_class(project.import_status)}"
}
%td
=
project
.
import_source
%td
=
link_to
project
.
import_source
,
"https://gitorious.org/
#{
project
.
import_source
}
"
,
target:
"_blank"
%td
%td
%strong
=
link_to
project
.
path_with_namespace
,
project
%strong
=
link_to
project
.
path_with_namespace
,
project
%td
.job-status
%td
.job-status
...
@@ -25,12 +26,16 @@
...
@@ -25,12 +26,16 @@
%span
.cgreen
%span
.cgreen
%i
.fa.fa-check
%i
.fa.fa-check
done
done
-
elsif
project
.
import_status
==
'started'
%i
.fa.fa-spinner.fa-spin
started
-
else
-
else
=
project
.
human_import_status_name
=
project
.
human_import_status_name
-
@repos
.
each
do
|
repo
|
-
@repos
.
each
do
|
repo
|
%tr
{
id:
"repo_#{repo.id}"
}
%tr
{
id:
"repo_#{repo.id}"
}
%td
=
repo
.
full_name
%td
=
link_to
repo
.
full_name
,
"https://gitorious.org/
#{
repo
.
full_name
}
"
,
target:
"_blank"
%td
.import-target
%td
.import-target
=
repo
.
full_name
=
repo
.
full_name
%td
.import-actions.job-status
%td
.import-actions.job-status
...
...
app/views/projects/new.html.haml
View file @
bc80efb1
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
.col-sm-10
.col-sm-10
=
link_to
new_import_gitorious_path
do
=
link_to
new_import_gitorious_path
do
%i
.fa.fa-heart
%i
.fa.fa-heart
Import projects from Gitorious
.org
Import projects from Gitorious
%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