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
a7fab42b
Commit
a7fab42b
authored
Jul 27, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Public area: Project#show page prototype
parent
cb86cf84
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
87 additions
and
16 deletions
+87
-16
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+13
-3
app/controllers/public/projects_controller.rb
app/controllers/public/projects_controller.rb
+8
-0
app/views/layouts/public.html.haml
app/views/layouts/public.html.haml
+7
-1
app/views/public/projects/index.html.haml
app/views/public/projects/index.html.haml
+10
-12
app/views/public/projects/show.html.haml
app/views/public/projects/show.html.haml
+47
-0
config/routes.rb
config/routes.rb
+2
-0
No files found.
app/assets/stylesheets/sections/projects.scss
View file @
a7fab42b
...
@@ -81,9 +81,11 @@ ul.nav.nav-projects-tabs {
...
@@ -81,9 +81,11 @@ ul.nav.nav-projects-tabs {
.public-projects
{
.public-projects
{
li
{
li
{
margin-top
:
8px
;
.project-title
{
margin-bottom
:
5px
;
font-size
:
14px
;
border-bottom
:
1px
solid
#eee
;
line-height
:
2
;
font-weight
:
normal
;
}
.description
{
.description
{
margin-left
:
15px
;
margin-left
:
15px
;
...
@@ -92,6 +94,14 @@ ul.nav.nav-projects-tabs {
...
@@ -92,6 +94,14 @@ ul.nav.nav-projects-tabs {
}
}
}
}
.public-clone
{
background
:
#333
;
color
:
#f5f5f5
;
padding
:
5px
10px
;
margin
:
1px
;
font-weight
:
normal
;
}
.new-tag-btn
{
.new-tag-btn
{
position
:
relative
;
position
:
relative
;
top
:
-5px
;
top
:
-5px
;
...
...
app/controllers/public/projects_controller.rb
View file @
a7fab42b
...
@@ -10,4 +10,12 @@ class Public::ProjectsController < ApplicationController
...
@@ -10,4 +10,12 @@ class Public::ProjectsController < ApplicationController
@projects
=
@projects
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@projects
=
@projects
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@projects
=
@projects
.
includes
(
:namespace
).
order
(
"namespaces.path, projects.name ASC"
).
page
(
params
[
:page
]).
per
(
20
)
@projects
=
@projects
.
includes
(
:namespace
).
order
(
"namespaces.path, projects.name ASC"
).
page
(
params
[
:page
]).
per
(
20
)
end
end
def
show
@project
=
Project
.
public_only
.
find_with_namespace
(
params
[
:id
])
render_404
and
return
unless
@project
@repository
=
@project
.
repository
@recent_tags
=
@repository
.
tags
.
first
(
10
)
end
end
end
app/views/layouts/public.html.haml
View file @
a7fab42b
...
@@ -10,10 +10,16 @@
...
@@ -10,10 +10,16 @@
.container
.container
%div
.app_logo
%div
.app_logo
%span
.separator
%span
.separator
=
link_to
root_path
,
class:
"home"
do
=
link_to
public_
root_path
,
class:
"home"
do
%h1
GITLAB
%h1
GITLAB
%span
.separator
%span
.separator
%h1
.project_name
Public Projects
%h1
.project_name
Public Projects
%ul
.nav
%li
%a
%div
.hide.turbolink-spinner
%i
.icon-refresh.icon-spin
Loading...
.container.navless-container
.container.navless-container
.content
.content
...
...
app/views/public/projects/index.html.haml
View file @
a7fab42b
...
@@ -11,20 +11,18 @@
...
@@ -11,20 +11,18 @@
=
search_field_tag
:search
,
params
[
:search
],
placeholder:
"gitlab-ci"
,
class:
"span3 search-text-input"
,
id:
"projects_search"
=
search_field_tag
:search
,
params
[
:search
],
placeholder:
"gitlab-ci"
,
class:
"span3 search-text-input"
,
id:
"projects_search"
=
submit_tag
'Search'
,
class:
"btn btn-primary wide"
=
submit_tag
'Search'
,
class:
"btn btn-primary wide"
%hr
.public-projects
.public-projects
%ul
.
unstyled
%ul
.
bordered-list
-
@projects
.
each
do
|
project
|
-
@projects
.
each
do
|
project
|
%li
.clearfix
%li
%div
.project-title
%i
.icon-share
%i
.icon-share.cgray
-
if
current_user
=
link_to
public_project_path
(
project
)
do
=
link_to_project
project
-
else
=
project
.
name_with_namespace
=
project
.
name_with_namespace
.pull-right
.pull-right
%pre
.dark.tiny
git clone
#{
project
.
http_url_to_repo
}
%pre
.public-clone
git clone
#{
project
.
http_url_to_repo
}
-
if
project
.
description
.
present?
%div
.description
%div
.description
=
project
.
description
=
project
.
description
-
unless
@projects
.
present?
-
unless
@projects
.
present?
...
...
app/views/public/projects/show.html.haml
0 → 100644
View file @
a7fab42b
%h3
.page-title
=
@project
.
name_with_namespace
.pull-right
%pre
.public-clone
git clone
#{
@project
.
http_url_to_repo
}
.pull-right
-
if
current_user
=
link_to
'Browse project'
,
@project
,
class:
'btn btn-create append-right-10'
%div
=
link_to
public_root_path
do
←
To projects list
.pull-right
%span
.light
=
@project
.
description
%br
.row
.span9
.light-well
%h3
.nothing_here_message
Some awesome stuff here
.span3
%h5
Repository:
%div
%p
%span
.light
Bare size is
#{
@project
.
repository
.
size
}
MB
%p
=
pluralize
(
@repository
.
round_commit_count
,
'commit'
)
%p
=
pluralize
(
@repository
.
branch_names
.
count
,
'branch'
)
%p
=
pluralize
(
@repository
.
tag_names
.
count
,
'tag'
)
-
if
@recent_tags
.
present?
%hr
%h5
Most Recent Tags:
%ul
.unstyled
-
@recent_tags
.
each
do
|
tag
|
%li
%p
%i
.icon-tag
%strong
=
tag
.
name
%small
.light.pull-right
%i
.icon-calendar
=
time_ago_in_words
(
tag
.
commit
.
committed_date
)
ago
config/routes.rb
View file @
a7fab42b
...
@@ -55,6 +55,8 @@ Gitlab::Application.routes.draw do
...
@@ -55,6 +55,8 @@ Gitlab::Application.routes.draw do
#
#
namespace
:public
do
namespace
:public
do
resources
:projects
,
only:
[
:index
]
resources
:projects
,
only:
[
:index
]
resources
:projects
,
constraints:
{
id:
/[a-zA-Z.\/0-9_\-]+/
},
only:
[
:show
]
root
to:
"projects#index"
root
to:
"projects#index"
end
end
...
...
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