Return project description back

Dmitriy Zaporozhets
1 parent 7b38a0de
Showing 4 changed files with 35 additions and 2 deletions Show diff stats
app/controllers/projects_controller.rb
app/views/projects/_form.html.haml
app/views/projects/_last_commit.html.haml
app/views/projects/show.html.haml
@@ -59,6 +59,7 @@ class ProjectsController &lt; ProjectResourceController
       format.html do
         if @project.repository && !@project.repository.empty?
           @last_push = current_user.recent_push(@project.id)
+          @last_commit = CommitDecorator.decorate(@project.repository.commit)
           render :show
         else
           render "projects/empty"
@@ -9,11 +9,19 @@
       Project name is
     .input
       = f.text_field :name, placeholder: "Example Project", class: "xxlarge"
+
+
   - unless @repository.heads.empty?
     .clearfix
       = f.label :default_branch, "Default Branch"
       .input= f.select(:default_branch, @repository.heads.map(&:name), {}, style: "width:210px;")
  
+  .clearfix
+    = f.label :description do
+      Project description
+      %span.light (optional)
+    .input
+      = f.text_area :description, placeholder: "awesome project", class: "xxlarge", rows: 3, maxlength: 250
  
   %fieldset.features
     %legend Features:
@@ -0,0 +1,11 @@
+.commit
+  %p
+    %time.committed_ago{ datetime: commit.committed_date, title: commit.committed_date.stamp("Aug 21, 2011 9:23pm") }
+      = time_ago_in_words(commit.committed_date)
+      ago
+      &nbsp;
+    = commit.author_link avatar: true, size: 16
+  %p
+    = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
+    &nbsp;
+    = link_to_gfm truncate(commit.title, length: 30), project_commit_path(@project, commit.id), class: "row_title"
 = render "project_head"
 = render 'clone_panel'
 = render "events/event_last_push", event: @last_push
-.content_list= render @events
-.loading.hide
  
+.row
+  .span8
+    .content_list= render @events
+    .loading.hide
+  .span4
+    .ui-box.white
+      .padded
+        %h3.page_title
+          = @project.name
+        %hr
+        - if @project.description.present?
+          %p.light= @project.description
+
+        %h5 Last commit:
+        = render 'last_commit', commit: @last_commit
 :javascript
   $(function(){ Pager.init(20); });
...	...	@@ -59,6 +59,7 @@ class ProjectsController < ProjectResourceController
59	59	format.html do
60	60	if @project.repository && !@project.repository.empty?
61	61	@last_push = current_user.recent_push(@project.id)
	62	+ @last_commit = CommitDecorator.decorate(@project.repository.commit)
62	63	render :show
63	64	else
64	65	render "projects/empty"
...	...
...	...	@@ -9,11 +9,19 @@
9	9	Project name is
10	10	.input
11	11	= f.text_field :name, placeholder: "Example Project", class: "xxlarge"
	12	+
	13	+
12	14	- unless @repository.heads.empty?
13	15	.clearfix
14	16	= f.label :default_branch, "Default Branch"
15	17	.input= f.select(:default_branch, @repository.heads.map(&:name), {}, style: "width:210px;")
16	18
	19	+ .clearfix
	20	+ = f.label :description do
	21	+ Project description
	22	+ %span.light (optional)
	23	+ .input
	24	+ = f.text_area :description, placeholder: "awesome project", class: "xxlarge", rows: 3, maxlength: 250
17	25
18	26	%fieldset.features
19	27	%legend Features:
...	...
...	...	@@ -0,0 +1,11 @@
	1	+.commit
	2	+ %p
	3	+ %time.committed_ago{ datetime: commit.committed_date, title: commit.committed_date.stamp("Aug 21, 2011 9:23pm") }
	4	+ = time_ago_in_words(commit.committed_date)
	5	+ ago
	6	+
	7	+ = commit.author_link avatar: true, size: 16
	8	+ %p
	9	+ = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
	10	+
	11	+ = link_to_gfm truncate(commit.title, length: 30), project_commit_path(@project, commit.id), class: "row_title"
...	...
1	1	= render "project_head"
2	2	= render 'clone_panel'
3	3	= render "events/event_last_push", event: @last_push
4		-.content_list= render @events
5		-.loading.hide
6	4
	5	+.row
	6	+ .span8
	7	+ .content_list= render @events
	8	+ .loading.hide
	9	+ .span4
	10	+ .ui-box.white
	11	+ .padded
	12	+ %h3.page_title
	13	+ = @project.name
	14	+ %hr
	15	+ - if @project.description.present?
	16	+ %p.light= @project.description
	17	+
	18	+ %h5 Last commit:
	19	+ = render 'last_commit', commit: @last_commit
7	20	:javascript
8	21	$(function(){ Pager.init(20); });
...	...