diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index 0e1ad931d4c7f33d9a557c34f3cdd2c91fafd99f..c4b5de8a67e85e271281b09bd26622beb205c3aa 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -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;}
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5c25d7d6c8df9c7258c268a5732880dd1058b6d8..782612c0aed4e0d269a7a38899d8ca989d698283 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -82,6 +82,12 @@ class ApplicationController < 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
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index 94cc03d17aeb147802bfc18d3923376ffce11a2d..05208d09ff449dea0c6e340eecb69585358ed6f4 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -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}"
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index a70c65d47c65db94806d95402899681709859389..21e455b9ec8945eaf6898516958ba82f1ee4fc1d 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -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"
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 8267a850ba3b89db085508d87c7c37d7ed4c6aed..dc4ab338001db76df810896f16dea91cdee75cc2 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -1,5 +1,9 @@
%h2
- = "Issue ##{@issue.id} - #{html_escape(@issue.title)}"
+ %strong
+ Issue
+ = "##{@issue.id}"
+ –
+ = html_escape(@issue.title)
.left.width-65p
.issue_notes= render "notes/notes"
@@ -8,14 +12,6 @@
.right.width-30p
.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
@@ -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
diff --git a/spec/requests/commits_notes_spec.rb b/spec/requests/commits_notes_spec.rb
index c424f4fc3cad17f4d2820f181bbbb1ba94a2af04..69a492e9282438770770b16c0e0429058a1600b5 100644
--- a/spec/requests/commits_notes_spec.rb
+++ b/spec/requests/commits_notes_spec.rb
@@ -12,7 +12,6 @@ describe "Issues" 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