Public area: Project#show page prototype

Dmitriy Zaporozhets
1 parent cb86cf84
Showing 6 changed files with 87 additions and 16 deletions Show diff stats
app/assets/stylesheets/sections/projects.scss
app/controllers/public/projects_controller.rb
app/views/layouts/public.html.haml
app/views/public/projects/index.html.haml
app/views/public/projects/show.html.haml
config/routes.rb
@@ -81,9 +81,11 @@ ul.nav.nav-projects-tabs {
 .public-projects {
   li {
-    margin-top: 8px;
-    margin-bottom: 5px;
-    border-bottom: 1px solid #eee;
+    .project-title {
+      font-size: 14px;
+      line-height: 2;
+      font-weight: normal;
+    }
     .description {
       margin-left: 15px;
@@ -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 {
   position: relative;
   top: -5px;
@@ -10,4 +10,12 @@ class Public::ProjectsController &lt; ApplicationController
     @projects = @projects.search(params[:search]) if params[:search].present?
     @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)
   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
@@ -10,10 +10,16 @@
           .container
             %div.app_logo
               %span.separator
-              = link_to root_path, class: "home" do
+              = link_to public_root_path, class: "home" do
                 %h1 GITLAB
               %span.separator
             %h1.project_name Public Projects
+            %ul.nav
+              %li
+                %a
+                  %div.hide.turbolink-spinner
+                    %i.icon-refresh.icon-spin
+                    Loading...
     .container.navless-container
       .content
@@ -11,22 +11,20 @@
             = 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"
-%hr
-
 .public-projects
-  %ul.unstyled
+  %ul.bordered-list
     - @projects.each do |project|
-      %li.clearfix
-        %div
-          %i.icon-share
-          - if current_user
-            = link_to_project project
-          - else
+      %li
+        .project-title
+          %i.icon-share.cgray
+          = link_to public_project_path(project) do
             = project.name_with_namespace
           .pull-right
-            %pre.dark.tiny git clone #{project.http_url_to_repo}
-        %div.description
-          = project.description
+            %pre.public-clone git clone #{project.http_url_to_repo}
+
+        - if project.description.present?
+          %div.description
+            = project.description
     - unless @projects.present?
       %h3.nothing_here_message No public projects
@@ -0,0 +1,47 @@
+%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
+    &larr; 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
@@ -55,6 +55,8 @@ Gitlab::Application.routes.draw do
   #
   namespace :public do
     resources :projects, only: [:index]
+    resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:show]
+
     root to: "projects#index"
   end
	@@ -10,4 +10,12 @@ class Public::ProjectsController < ApplicationController		@@ -10,4 +10,12 @@ class Public::ProjectsController < ApplicationController
10	@projects = @projects.search(params[:search]) if params[:search].present?	10	@projects = @projects.search(params[:search]) if params[:search].present?
11	@projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)	11	@projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)
12	end	12	end
		13	+
		14	+ def show
		15	+ @project = Project.public_only.find_with_namespace(params[:id])
		16	+ render_404 and return unless @project
		17	+
		18	+ @repository = @project.repository
		19	+ @recent_tags = @repository.tags.first(10)
		20	+ end
13	end	21	end
@@ -0,0 +1,47 @@		@@ -0,0 +1,47 @@
	1	+%h3.page-title
	2	+ = @project.name_with_namespace
	3	+ .pull-right
	4	+ %pre.public-clone git clone #{@project.http_url_to_repo}
	5	+ .pull-right
	6	+ - if current_user
	7	+ = link_to 'Browse project', @project, class: 'btn btn-create append-right-10'
	8	+
	9	+
	10	+%div
	11	+ = link_to public_root_path do
	12	+ ← To projects list
	13	+ .pull-right
	14	+ %span.light= @project.description
	15	+
	16	+%br
	17	+.row
	18	+ .span9
	19	+ .light-well
	20	+ %h3.nothing_here_message Some awesome stuff here
	21	+ .span3
	22	+ %h5 Repository:
	23	+ %div
	24	+ %p
	25	+ %span.light Bare size is
	26	+ #{@project.repository.size} MB
	27	+
	28	+ %p
	29	+ = pluralize(@repository.round_commit_count, 'commit')
	30	+ %p
	31	+ = pluralize(@repository.branch_names.count, 'branch')
	32	+ %p
	33	+ = pluralize(@repository.tag_names.count, 'tag')
	34	+
	35	+ - if @recent_tags.present?
	36	+ %hr
	37	+ %h5 Most Recent Tags:
	38	+ %ul.unstyled
	39	+ - @recent_tags.each do \|tag\|
	40	+ %li
	41	+ %p
	42	+ %i.icon-tag
	43	+ %strong= tag.name
	44	+ %small.light.pull-right
	45	+ %i.icon-calendar
	46	+ = time_ago_in_words(tag.commit.committed_date)
	47	+ ago