issues & fixed layout

Dmitriy Zaporozhets
1 parent 31a9d653
Showing 6 changed files with 38 additions and 58 deletions Show diff stats
app/assets/stylesheets/projects.css.scss
app/controllers/application_controller.rb
app/views/issues/_show.html.haml
app/views/issues/index.html.haml
app/views/issues/show.html.haml
spec/requests/commits_notes_spec.rb
@@ -163,10 +163,6 @@ table.round-borders {
   padding:20px;
 }
-//body {
-  //background: #eaeaea;
-//}
-
 a {
   color: #111;
 }
@@ -232,43 +228,15 @@ input.ssh_project_url {
   text-align:center;
 }
-.day-commits-table li.commit {
-  cursor:pointer;
-
-  &:hover {
-    @include hover-color;
-  }
-}
-
-/*
-#FFF6BF
-#FFD324
-*/
-#tree-slider tr.tree-item {
-  cursor:pointer;
-
-  &:hover {
-    @include hover-color;
-    td {
-      @include hover-color;
-    }
-  }
-}
 #projects-list .project {
   height:50px;
 }
+#tree-slider .tree-item,
 #projects-list .project,
 #snippets-table .snippet,
 #issues-table .issue{
   cursor:pointer;
-
-  &:hover {
-      @include hover-color;
-    td {
-      @include hover-color;
-    }
-  }
 }
 .clear {
@@ -563,6 +531,7 @@ input.ssh_project_url {
   @include round-borders-all(4px);
   padding:2px 4px;
   border:none;
+  text-shadow:none;
   &.high {
     background: #D12F19;
@@ -687,6 +656,13 @@ table.highlighttable pre{
   width:200px;
 }
+.issues_filter {
+  margin-top:10px;
+  .left { 
+    margin-right:15px;
+  }
+}
+
 body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
 body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
 body.project-page #notes-list .note img{float: left; margin-right: 10px;}
@@ -82,6 +82,12 @@ class ApplicationController &lt; ActionController::Base
     elsif params[:view_style] == "fluid"
       cookies[:view_style] = "" 
     end
+
+    @view_mode = if cookies[:view_style] == "collapsed"
+                   :fixed
+                 else
+                   :fluid
+                 end
   end
   def respond_with_notes
@@ -4,10 +4,11 @@
       = image_tag "move.png" , :class => [:handle, :left]
   %td
     = image_tag gravatar_icon(issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
-    = truncate issue.assignee.name, :lenght => 20
+    = issue.assignee.name
   %td ##{issue.id}
   %td
-    = truncate(html_escape(issue.title), :length => 60)
+    = truncate(html_escape(issue.title), :length => 200)
+    %br
     %br
     - if issue.critical
       %span.tag.high critical
@@ -27,7 +28,8 @@
     - else
       = check_box_tag "closed", 1, issue.closed, :disabled => true
   %td
-    - if can?(current_user, :admin_issue, @project) || issue.author == current_user
-      = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "lbutton positive", :remote => true
-    - if can?(current_user, :admin_issue, @project) || issue.author == current_user
-      = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-issue negative", :id => "destroy_issue_#{issue.id}"
+    - if @view_mode == :fluid
+      - if can?(current_user, :admin_issue, @project) || issue.author == current_user
+        = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "lbutton positive", :remote => true
+      - if can?(current_user, :admin_issue, @project) || issue.author == current_user
+        = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-issue negative", :id => "destroy_issue_#{issue.id}"
@@ -7,18 +7,18 @@
       = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
       = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
-    .right
+    .right.issues_filter
       = form_tag project_issues_path(@project), :method => :get do
-        .span-2
+        .left
           = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
           = label_tag "open_issues","Open"
-        .span-2
+        .left
           = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
           = label_tag "closed_issues","Closed"
-        .span-2
+        .left
           = radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
           = label_tag "my_issues","To Me"
-        .span-2
+        .left
           = radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
           = label_tag "all_issues","All"
 %h2
-  = "Issue ##{@issue.id} - #{html_escape(@issue.title)}"
+  %strong
+    Issue
+    = "##{@issue.id}"
+  &ndash;
+  = html_escape(@issue.title)
 .left.width-65p
   .issue_notes= render "notes/notes"
@@ -9,14 +13,6 @@
   .span-8
   %table.round-borders
     %tr
-      %td Title:
-      %td
-        = truncate html_escape(@issue.title)
-    %tr
-      %td Project
-      %td
-        %strong= @issue.project.name
-    %tr
       %td Author:
       %td
         = image_tag gravatar_icon(@issue.author.email), :class => "left", :width => 40, :style => "padding:0 5px;"
@@ -39,7 +35,7 @@
     %tr
       %td Closed?
       %td
-        - if can? current_user, :write_issue, @project
+        - if can? current_user, :write_issue, @issue
           = form_for([@project, @issue]) do |f|
             = f.check_box :closed, :onclick => "$(this).parent().submit();"
             = hidden_field_tag :status_only, true
@@ -47,8 +43,9 @@
           = check_box_tag "closed", 1, @issue.closed, :disabled => true
-  - if can?(current_user, :admin_issue, @issue)
+  - if can?(current_user, :write_issue, @issue)
     .clear
-      = link_to 'Edit', edit_project_issue_path(@project, @issue), :class => "lbutton positive", :remote => true
-      .right= link_to 'Destroy', [@project, @issue], :confirm => 'Are you sure?', :method => :delete,  :class => "lbutton delete-issue negative", :id => "destroy_issue_#{@issue.id}"
+    %br
+    = link_to 'Edit', edit_project_issue_path(@project, @issue), :class => "lbutton positive", :remote => true
+    .right= link_to 'Destroy', [@project, @issue], :confirm => 'Are you sure?', :method => :delete,  :class => "lbutton delete-issue negative", :id => "destroy_issue_#{@issue.id}"
 .clear
@@ -12,7 +12,6 @@ describe &quot;Issues&quot; do
   describe "add new note", :js => true do
     before do
       visit project_commit_path(project, commit)
-      click_link "Comments" # notes tab
       fill_in "note_note", :with => "I commented this commit"
       click_button "Add note"
     end
	@@ -82,6 +82,12 @@ class ApplicationController < ActionController::Base		@@ -82,6 +82,12 @@ class ApplicationController < ActionController::Base
82	elsif params[:view_style] == "fluid"	82	elsif params[:view_style] == "fluid"
83	cookies[:view_style] = ""	83	cookies[:view_style] = ""
84	end	84	end
		85	+
		86	+ @view_mode = if cookies[:view_style] == "collapsed"
		87	+ :fixed
		88	+ else
		89	+ :fluid
		90	+ end
85	end	91	end
86		92
87	def respond_with_notes	93	def respond_with_notes
	@@ -7,18 +7,18 @@		@@ -7,18 +7,18 @@
7	= hidden_field_tag :project_id, @project.id, { :id => 'project_id' }	7	= hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
8	= search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }	8	= search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
9		9
10	- .right	10	+ .right.issues_filter
11	= form_tag project_issues_path(@project), :method => :get do	11	= form_tag project_issues_path(@project), :method => :get do
12	- .span-2	12	+ .left
13	= radio_button_tag :f, 0, (params[:f] \|\| "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"	13	= radio_button_tag :f, 0, (params[:f] \|\| "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
14	= label_tag "open_issues","Open"	14	= label_tag "open_issues","Open"
15	- .span-2	15	+ .left
16	= radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"	16	= radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
17	= label_tag "closed_issues","Closed"	17	= label_tag "closed_issues","Closed"
18	- .span-2	18	+ .left
19	= radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"	19	= radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
20	= label_tag "my_issues","To Me"	20	= label_tag "my_issues","To Me"
21	- .span-2	21	+ .left
22	= radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"	22	= radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
23	= label_tag "all_issues","All"	23	= label_tag "all_issues","All"
24		24