Bootstrap: Issues & MR

Dmitriy Zaporozhets
1 parent d81f0b78
Showing 11 changed files with 171 additions and 140 deletions Show diff stats
app/assets/stylesheets/common.scss
app/assets/stylesheets/reset_bootstrap.scss
app/assets/stylesheets/tree.scss
app/models/commit.rb
app/views/issues/_form.html.haml
app/views/issues/_show.html.haml
app/views/issues/index.html.haml
app/views/issues/show.html.haml
app/views/merge_requests/_commits.html.haml
app/views/merge_requests/_merge_request.html.haml
app/views/merge_requests/index.html.haml
@@ -162,6 +162,10 @@ img.avatar {
   p { padding-top:5px;}
 }
  
+.author_link { 
+  color: $active_link_color;
+}
+
 @import "reset_bootstrap.scss";
 @import "top_panel.scss";
 @import "projects.css.scss";
@@ -6,7 +6,33 @@ a {
   }
 }
  
-.alert-message.entry { 
+.entry { 
+  position: relative;
+  padding: 7px 15px;
+  margin-bottom: 18px;
+  color: #404040;
+  background-color: #eedc94;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+  background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+  background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+  background-image: linear-gradient(top, #fceec1, #eedc94);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFCEEC1', endColorstr='#FFEEDC94', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #eedc94 #eedc94 #e4c652;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) fadein(rgba(0, 0, 0, 0.1), 15%);
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  border-width: 1px;
+  border-style: solid;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
   background:#F1F1F1;
   border-color:#ccc;
 }
@@ -119,4 +119,8 @@ table.highlighttable .linenodiv pre {
     background: #FFFFCF;
     cursor:pointer;
   }
+
+  .tree-item-file-name { 
+    font-weight:bold;
+  }
 }
@@ -27,7 +27,7 @@ class Commit
     @head = head
   end
  
-  def safe_message()
+  def safe_message
     message
   end
  
@@ -24,7 +24,7 @@
     .clearfix
       = f.label :title
       .input= f.text_area :title, :maxlength => 255, :class => "xlarge"
-    .clearfix
+    .actions
       = f.submit 'Save', :class => "primary btn"
  
       - if request.xhr?
@@ -36,6 +36,6 @@
           = link_to "Cancel", project_issue_path(@project, @issue), :class => "btn"
  
  
-      -#- unless @issue.new_record?
+      - unless @issue.new_record?
         .right
-          = link_to 'Remove', [@project, @issue], :confirm => 'Are you sure?', :method => :delete, :class => "red-button"
+          = link_to 'Remove', [@project, @issue], :confirm => 'Are you sure?', :method => :delete, :class => "danger btn"
-%tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) }
-  %td
-    = image_tag gravatar_icon(issue.assignee_email), :class => "left", :width => 40, :style => "padding-right:5px;"
-    %span
-      = truncate(html_escape(issue.title), :length => 50)
-    %div.note-author
-      %strong= issue.assignee.name
-      %cite.cgray
-        = time_ago_in_words(issue.created_at)
-        ago
-      - if issue.critical
-        %span.tag.high critical
-      - if issue.today?
-        %span.tag.today today
-      .right.action-links
-        - if can? current_user, :write_issue, issue
-          - if issue.closed
-            = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put,  :class => "btn small", :remote => true
-          - else
-            = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small", :remote => true
-        - if can? current_user, :write_issue, issue
-          = link_to 'Edit', edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true
-        - if can?(current_user, :admin_issue, @project) || issue.author == current_user
-          = link_to 'Remove', [issue.project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "danger btn small delete-issue", :id => "destroy_issue_#{issue.id}"
+%li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) }
+  = image_tag gravatar_icon(issue.author_email), :class => "avatar"
+  %span.update-author
+    %strong
+      = link_to project_team_member_path(@project, @project.team_member_by_id(issue.author_id)), :class => "author_link" do
+        = issue.author_name
+    authored
+    = time_ago_in_words(issue.created_at)
+    ago
+    - if issue.critical
+      %span.label.important critical
+    - if issue.today?
+      %span.label.success today
+
+  .right
+    - if can? current_user, :write_issue, issue
+      - if issue.closed
+        = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put,  :class => "btn small", :remote => true
+      - else
+        = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small", :remote => true
+    - if can? current_user, :write_issue, issue
+      = link_to 'Edit', edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true
+    -#- if can?(current_user, :admin_issue, @project) || issue.author == current_user
+      = link_to 'Remove', [issue.project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "danger btn small delete-issue", :id => "destroy_issue_#{issue.id}"
+
+
+  = link_to project_issue_path(issue.project, issue) do
+    %p
+      Issue ##{issue.id}:
+      = truncate(issue.title, :length => 50)
+
+
+
+
@@ -13,25 +13,29 @@
         New Issue
   %hr
   %div#issues-table-holder
-    %ul.pills.left
-      %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
-        = link_to project_issues_path(@project, :f => 0) do 
-          Open
-      %li{:class => ("active" if params[:f] == "2")}
-        = link_to project_issues_path(@project, :f => 2) do 
-          Closed
-      %li{:class => ("active" if params[:f] == "3")}
-        = link_to project_issues_path(@project, :f => 3) do 
-          To Me
-      %li{:class => ("active" if params[:f] == "1")}
-        = link_to project_issues_path(@project, :f => 1) do 
-          All
+    .row
+      .span8
+        %ul.pills.left
+          %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
+            = link_to project_issues_path(@project, :f => 0) do 
+              Open
+          %li{:class => ("active" if params[:f] == "2")}
+            = link_to project_issues_path(@project, :f => 2) do 
+              Closed
+          %li{:class => ("active" if params[:f] == "3")}
+            = link_to project_issues_path(@project, :f => 3) do 
+              To Me
+          %li{:class => ("active" if params[:f] == "1")}
+            = link_to project_issues_path(@project, :f => 1) do 
+              All
  
-    = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :id => "issue_search_form", :class => :right  do
-      = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
-      = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
+      .span2.right
+        = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :id => "issue_search_form", :class => :right  do
+          = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
+          = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
  
-    %table#issues-table= render "issues"
+    %hr
+    %ul#issues-table.unstyled= render "issues"
  
 :javascript
   var href       = $('.issue_search').parent().attr('action');
@@ -46,7 +50,7 @@
  
       if (terms.length >= 2 || terms.length == 0) {
         $.get(href, { 'status': status, 'terms': terms, project: project_id  }, function(response) {
-          $('#issues-table tbody').html(response);
+          $('#issues-table').html(response);
           setSortable();
         });
       }
@@ -57,7 +61,7 @@
     $(this).closest('tr').fadeOut(); updatePage();});
  
   function setSortable(){
-    $('#issues-table>tbody').sortable({
+    $('#issues-table').sortable({
       axis: 'y',
       dropOnEmpty: false,
       handle: '.handle',
@@ -68,10 +72,10 @@
       update: function(){
         $.ajax({
         type: 'post',
-        data: $('#issues-table>tbody').sortable('serialize'),
+        data: $('#issues-table').sortable('serialize'),
         dataType: 'script',
         complete: function(request){
-          $('#issues-table>tbody').effect('highlight');
+          $('#issues-table').effect('highlight');
         },
         url: "#{sort_project_issues_path(@project)}"})
         }
-%div
-  %span.entity-info
+%h3 
+  Issue ##{@issue.id} 
+
+  %span.right
+    - if can?(current_user, :admin_project, @project) || @issue.author == current_user
+      - if @issue.closed
+        = link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put,  :class => "btn"
+      - else
+        = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request"
     - if can?(current_user, :admin_project, @project) || @issue.author == current_user
-      = link_to edit_project_issue_path(@project, @issue) do 
-        .entity-button
-          Edit Issue
-          %i
-  = image_tag gravatar_icon(@issue.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
-  %span.commit-title
-    %strong
-      = "Issue ##{@issue.id}:"
-  %span.commit-author
-    %strong
-      = link_to project_team_member_path(@project, @project.team_member_by_id(@issue.author.id)) do 
-        %span.author= @issue.author_name
-      - if @issue.author != @issue.assignee
+      = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do 
+        Edit
+
+%hr
+- if @issue.closed
+  .alert-message.error Closed
+- else 
+  .alert-message.success Open
+
+
+%div.well
+  %div
+    %span.entity-info
+    = image_tag gravatar_icon(@issue.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
+    %span.commit-title
+      %strong
+        %span.commit-author
+      %strong
+        = link_to project_team_member_path(@project, @project.team_member_by_id(@issue.author.id)) do 
+          %span.author= @issue.author_name
         &rarr;
         = link_to project_team_member_path(@project, @project.team_member_by_id(@issue.assignee.id)) do 
           %span.author= @issue.assignee_name
-        &nbsp;
-
-    &nbsp;
-    = @issue.created_at.stamp("Aug 21, 2011 9:23pm")
-
-  %hr
-  %br
-  %h3
-    = simple_format @issue.title
-
-.clear
-%br
-%br
-
-.merge-tabs
-  = link_to "#notes", :class => "merge-notes-tab active tab" do 
-    %span
-    Notes
-  .right
-    - if @issue.closed
-      = link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put,  :class => "red-button"
-    - else
-      = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "positive-button"
-
-.merge-request-notes
-  .issue_notes= render "notes/notes"
-  .loading{ :style => "display:none;"}
-    %center= image_tag "ajax-loader.gif"
-  .clear
+      %br
+      .cgray= @issue.created_at.stamp("Aug 21, 2011 9:23pm")
+    
+
+  %div= simple_format @issue.title
+
+
+.issue_notes= render "notes/notes"
  
 - if @commits.size > 0
-  .merge-request-commits.ui-box.width-100p
+  .merge-request-commits
     - @commits.each do |commit|
-      %a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) }
-        - if commit.author_email
-          = image_tag gravatar_icon(commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
-        - else
-          = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
-        %span.commit-title
-          = truncate commit.safe_message, :length => 60
-        %span.commit-author
-          %strong= commit.author_name
-          authored
-          = time_ago_in_words(commit.created_at)
-          ago
-  .clear
+      .entry
+        = link_to project_commit_path(@project, :id => commit.id) do
+          %strong
+            = truncate(commit.id.to_s, :length => 10)
+          = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
+          %span= truncate(commit.safe_message, :length => 40)
+          %span.right
+            = time_ago_in_words(commit.committed_date)
+            ago
  
 - if @commits.empty? 
   %p.cgray Nothing to merge
-%a.update-item{:href => project_merge_request_path(merge_request.project, merge_request)}
-  = image_tag gravatar_icon(merge_request.author_email), :class => "left", :width => 40
-  %span.update-title
-    = truncate(merge_request.title, :length => 60)
+%li.wll
+  = image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
   %span.update-author
-    %strong= merge_request.author_name
+    %strong
+      = link_to project_team_member_path(@project, @project.team_member_by_id(merge_request.author_id)), :class => "author_link" do
+        = merge_request.author_name
     authored
     = time_ago_in_words(merge_request.created_at)
     ago
   .right
-    %span.tag.commit= merge_request.source_branch
+    %span.label= merge_request.source_branch
     &rarr;
-    %span.tag.commit= merge_request.target_branch
-
+    %span.label= merge_request.target_branch
+  = link_to project_merge_request_path(merge_request.project, merge_request) do
+    %p
+      Merge Request ##{merge_request.id}:
+      = truncate(merge_request.title, :length => 50)
-.left.issues_filter
-  = form_tag project_merge_requests_path(@project), :method => :get do
-    .left
-      = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_merge_requests", :class => "status"
-      = label_tag "open_merge_requests" do 
-        %span.tag.open Open
-    .left
-      = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_merge_requests", :class => "status"
-      = label_tag "closed_merge_requests" do 
-        %span.tag.closed Closed
+%h3
+  Merge Requests
+  - if can? current_user, :write_issue, @project
+    = link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do 
+      New Merge Request
  
-.clear
 %hr
  
+%ul.pills
+  %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
+    = link_to project_merge_requests_path(@project, :f => 0) do 
+      Open
+  %li{:class => ("active" if params[:f] == "2")}
+    = link_to project_merge_requests_path(@project, :f => 2) do 
+      Closed
+
+%hr
+%ul.unstyled= render @merge_requests
  
-.row
-  .span10
-    - if @merge_requests.count > 0
-      %div{ :class => "update-data ui-box ui-box-small ui-box-big" }
-        .data
-          = render @merge_requests
-  .span4
-    - if can? current_user, :write_merge_request, @project
-      .alert-message.block-message.info
-        %p You can open a new merge request.
-        - if current_page?(project_merge_requests_path(@project))
-          = link_to new_project_merge_request_path(@project), :class => "btn small", :title => "New Merge request" do 
-            Add new
...	...	@@ -162,6 +162,10 @@ img.avatar {
162	162	p { padding-top:5px;}
163	163	}
164	164
	165	+.author_link {
	166	+ color: $active_link_color;
	167	+}
	168	+
165	169	@import "reset_bootstrap.scss";
166	170	@import "top_panel.scss";
167	171	@import "projects.css.scss";
...	...
...	...	@@ -6,7 +6,33 @@ a {
6	6	}
7	7	}
8	8
9		-.alert-message.entry {
	9	+.entry {
	10	+ position: relative;
	11	+ padding: 7px 15px;
	12	+ margin-bottom: 18px;
	13	+ color: #404040;
	14	+ background-color: #eedc94;
	15	+ background-repeat: repeat-x;
	16	+ background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
	17	+ background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
	18	+ background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
	19	+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
	20	+ background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
	21	+ background-image: -o-linear-gradient(top, #fceec1, #eedc94);
	22	+ background-image: linear-gradient(top, #fceec1, #eedc94);
	23	+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFCEEC1', endColorstr='#FFEEDC94', GradientType=0);
	24	+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
	25	+ border-color: #eedc94 #eedc94 #e4c652;
	26	+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) fadein(rgba(0, 0, 0, 0.1), 15%);
	27	+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
	28	+ border-width: 1px;
	29	+ border-style: solid;
	30	+ -webkit-border-radius: 4px;
	31	+ -moz-border-radius: 4px;
	32	+ border-radius: 4px;
	33	+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
	34	+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
	35	+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
10	36	background:#F1F1F1;
11	37	border-color:#ccc;
12	38	}
...	...
...	...	@@ -119,4 +119,8 @@ table.highlighttable .linenodiv pre {
119	119	background: #FFFFCF;
120	120	cursor:pointer;
121	121	}
	122	+
	123	+ .tree-item-file-name {
	124	+ font-weight:bold;
	125	+ }
122	126	}
...	...
...	...	@@ -27,7 +27,7 @@ class Commit
27	27	@head = head
28	28	end
29	29
30		- def safe_message()
	30	+ def safe_message
31	31	message
32	32	end
33	33
...	...
...	...	@@ -24,7 +24,7 @@
24	24	.clearfix
25	25	= f.label :title
26	26	.input= f.text_area :title, :maxlength => 255, :class => "xlarge"
27		- .clearfix
	27	+ .actions
28	28	= f.submit 'Save', :class => "primary btn"
29	29
30	30	- if request.xhr?
...	...	@@ -36,6 +36,6 @@
36	36	= link_to "Cancel", project_issue_path(@project, @issue), :class => "btn"
37	37
38	38
39		- -#- unless @issue.new_record?
	39	+ - unless @issue.new_record?
40	40	.right
41		- = link_to 'Remove', [@project, @issue], :confirm => 'Are you sure?', :method => :delete, :class => "red-button"
	41	+ = link_to 'Remove', [@project, @issue], :confirm => 'Are you sure?', :method => :delete, :class => "danger btn"
...	...
1		-%tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) }
2		- %td
3		- = image_tag gravatar_icon(issue.assignee_email), :class => "left", :width => 40, :style => "padding-right:5px;"
4		- %span
5		- = truncate(html_escape(issue.title), :length => 50)
6		- %div.note-author
7		- %strong= issue.assignee.name
8		- %cite.cgray
9		- = time_ago_in_words(issue.created_at)
10		- ago
11		- - if issue.critical
12		- %span.tag.high critical
13		- - if issue.today?
14		- %span.tag.today today
15		- .right.action-links
16		- - if can? current_user, :write_issue, issue
17		- - if issue.closed
18		- = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small", :remote => true
19		- - else
20		- = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small", :remote => true
21		- - if can? current_user, :write_issue, issue
22		- = link_to 'Edit', edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true
23		- - if can?(current_user, :admin_issue, @project) \|\| issue.author == current_user
24		- = link_to 'Remove', [issue.project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "danger btn small delete-issue", :id => "destroy_issue_#{issue.id}"
	1	+%li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) }
	2	+ = image_tag gravatar_icon(issue.author_email), :class => "avatar"
	3	+ %span.update-author
	4	+ %strong
	5	+ = link_to project_team_member_path(@project, @project.team_member_by_id(issue.author_id)), :class => "author_link" do
	6	+ = issue.author_name
	7	+ authored
	8	+ = time_ago_in_words(issue.created_at)
	9	+ ago
	10	+ - if issue.critical
	11	+ %span.label.important critical
	12	+ - if issue.today?
	13	+ %span.label.success today
	14	+
	15	+ .right
	16	+ - if can? current_user, :write_issue, issue
	17	+ - if issue.closed
	18	+ = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small", :remote => true
	19	+ - else
	20	+ = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small", :remote => true
	21	+ - if can? current_user, :write_issue, issue
	22	+ = link_to 'Edit', edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true
	23	+ -#- if can?(current_user, :admin_issue, @project) \|\| issue.author == current_user
	24	+ = link_to 'Remove', [issue.project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "danger btn small delete-issue", :id => "destroy_issue_#{issue.id}"
	25	+
	26	+
	27	+ = link_to project_issue_path(issue.project, issue) do
	28	+ %p
	29	+ Issue ##{issue.id}:
	30	+ = truncate(issue.title, :length => 50)
	31	+
	32	+
	33	+
	34	+
...	...
...	...	@@ -13,25 +13,29 @@
13	13	New Issue
14	14	%hr
15	15	%div#issues-table-holder
16		- %ul.pills.left
17		- %li{:class => ("active" if (params[:f] == "0" \|\| !params[:f]))}
18		- = link_to project_issues_path(@project, :f => 0) do
19		- Open
20		- %li{:class => ("active" if params[:f] == "2")}
21		- = link_to project_issues_path(@project, :f => 2) do
22		- Closed
23		- %li{:class => ("active" if params[:f] == "3")}
24		- = link_to project_issues_path(@project, :f => 3) do
25		- To Me
26		- %li{:class => ("active" if params[:f] == "1")}
27		- = link_to project_issues_path(@project, :f => 1) do
28		- All
	16	+ .row
	17	+ .span8
	18	+ %ul.pills.left
	19	+ %li{:class => ("active" if (params[:f] == "0" \|\| !params[:f]))}
	20	+ = link_to project_issues_path(@project, :f => 0) do
	21	+ Open
	22	+ %li{:class => ("active" if params[:f] == "2")}
	23	+ = link_to project_issues_path(@project, :f => 2) do
	24	+ Closed
	25	+ %li{:class => ("active" if params[:f] == "3")}
	26	+ = link_to project_issues_path(@project, :f => 3) do
	27	+ To Me
	28	+ %li{:class => ("active" if params[:f] == "1")}
	29	+ = link_to project_issues_path(@project, :f => 1) do
	30	+ All
29	31
30		- = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :id => "issue_search_form", :class => :right do
31		- = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
32		- = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
	32	+ .span2.right
	33	+ = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :id => "issue_search_form", :class => :right do
	34	+ = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
	35	+ = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
33	36
34		- %table#issues-table= render "issues"
	37	+ %hr
	38	+ %ul#issues-table.unstyled= render "issues"
35	39
36	40	:javascript
37	41	var href = $('.issue_search').parent().attr('action');
...	...	@@ -46,7 +50,7 @@
46	50
47	51	if (terms.length >= 2 \|\| terms.length == 0) {
48	52	$.get(href, { 'status': status, 'terms': terms, project: project_id }, function(response) {
49		- $('#issues-table tbody').html(response);
	53	+ $('#issues-table').html(response);
50	54	setSortable();
51	55	});
52	56	}
...	...	@@ -57,7 +61,7 @@
57	61	$(this).closest('tr').fadeOut(); updatePage();});
58	62
59	63	function setSortable(){
60		- $('#issues-table>tbody').sortable({
	64	+ $('#issues-table').sortable({
61	65	axis: 'y',
62	66	dropOnEmpty: false,
63	67	handle: '.handle',
...	...	@@ -68,10 +72,10 @@
68	72	update: function(){
69	73	$.ajax({
70	74	type: 'post',
71		- data: $('#issues-table>tbody').sortable('serialize'),
	75	+ data: $('#issues-table').sortable('serialize'),
72	76	dataType: 'script',
73	77	complete: function(request){
74		- $('#issues-table>tbody').effect('highlight');
	78	+ $('#issues-table').effect('highlight');
75	79	},
76	80	url: "#{sort_project_issues_path(@project)}"})
77	81	}
...	...
1		-%div
2		- %span.entity-info
	1	+%h3
	2	+ Issue ##{@issue.id}
	3	+
	4	+ %span.right
	5	+ - if can?(current_user, :admin_project, @project) \|\| @issue.author == current_user
	6	+ - if @issue.closed
	7	+ = link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn"
	8	+ - else
	9	+ = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request"
3	10	- if can?(current_user, :admin_project, @project) \|\| @issue.author == current_user
4		- = link_to edit_project_issue_path(@project, @issue) do
5		- .entity-button
6		- Edit Issue
7		- %i
8		- = image_tag gravatar_icon(@issue.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
9		- %span.commit-title
10		- %strong
11		- = "Issue ##{@issue.id}:"
12		- %span.commit-author
13		- %strong
14		- = link_to project_team_member_path(@project, @project.team_member_by_id(@issue.author.id)) do
15		- %span.author= @issue.author_name
16		- - if @issue.author != @issue.assignee
	11	+ = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do
	12	+ Edit
	13	+
	14	+%hr
	15	+- if @issue.closed
	16	+ .alert-message.error Closed
	17	+- else
	18	+ .alert-message.success Open
	19	+
	20	+
	21	+%div.well
	22	+ %div
	23	+ %span.entity-info
	24	+ = image_tag gravatar_icon(@issue.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
	25	+ %span.commit-title
	26	+ %strong
	27	+ %span.commit-author
	28	+ %strong
	29	+ = link_to project_team_member_path(@project, @project.team_member_by_id(@issue.author.id)) do
	30	+ %span.author= @issue.author_name
17	31	→
18	32	= link_to project_team_member_path(@project, @project.team_member_by_id(@issue.assignee.id)) do
19	33	%span.author= @issue.assignee_name
20		-
21		-
22		-
23		- = @issue.created_at.stamp("Aug 21, 2011 9:23pm")
24		-
25		- %hr
26		- %br
27		- %h3
28		- = simple_format @issue.title
29		-
30		-.clear
31		-%br
32		-%br
33		-
34		-.merge-tabs
35		- = link_to "#notes", :class => "merge-notes-tab active tab" do
36		- %span
37		- Notes
38		- .right
39		- - if @issue.closed
40		- = link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "red-button"
41		- - else
42		- = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "positive-button"
43		-
44		-.merge-request-notes
45		- .issue_notes= render "notes/notes"
46		- .loading{ :style => "display:none;"}
47		- %center= image_tag "ajax-loader.gif"
48		- .clear
	34	+ %br
	35	+ .cgray= @issue.created_at.stamp("Aug 21, 2011 9:23pm")
	36	+
	37	+
	38	+ %div= simple_format @issue.title
	39	+
	40	+
	41	+.issue_notes= render "notes/notes"
49	42
...	...
1	1	- if @commits.size > 0
2		- .merge-request-commits.ui-box.width-100p
	2	+ .merge-request-commits
3	3	- @commits.each do \|commit\|
4		- %a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) }
5		- - if commit.author_email
6		- = image_tag gravatar_icon(commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
7		- - else
8		- = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
9		- %span.commit-title
10		- = truncate commit.safe_message, :length => 60
11		- %span.commit-author
12		- %strong= commit.author_name
13		- authored
14		- = time_ago_in_words(commit.created_at)
15		- ago
16		- .clear
	4	+ .entry
	5	+ = link_to project_commit_path(@project, :id => commit.id) do
	6	+ %strong
	7	+ = truncate(commit.id.to_s, :length => 10)
	8	+ = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
	9	+ %span= truncate(commit.safe_message, :length => 40)
	10	+ %span.right
	11	+ = time_ago_in_words(commit.committed_date)
	12	+ ago
17	13
18	14	- if @commits.empty?
19	15	%p.cgray Nothing to merge
...	...
1		-%a.update-item{:href => project_merge_request_path(merge_request.project, merge_request)}
2		- = image_tag gravatar_icon(merge_request.author_email), :class => "left", :width => 40
3		- %span.update-title
4		- = truncate(merge_request.title, :length => 60)
	1	+%li.wll
	2	+ = image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
5	3	%span.update-author
6		- %strong= merge_request.author_name
	4	+ %strong
	5	+ = link_to project_team_member_path(@project, @project.team_member_by_id(merge_request.author_id)), :class => "author_link" do
	6	+ = merge_request.author_name
7	7	authored
8	8	= time_ago_in_words(merge_request.created_at)
9	9	ago
10	10	.right
11		- %span.tag.commit= merge_request.source_branch
	11	+ %span.label= merge_request.source_branch
12	12	→
13		- %span.tag.commit= merge_request.target_branch
14		-
	13	+ %span.label= merge_request.target_branch
	14	+ = link_to project_merge_request_path(merge_request.project, merge_request) do
	15	+ %p
	16	+ Merge Request ##{merge_request.id}:
	17	+ = truncate(merge_request.title, :length => 50)
...	...