Commit 04997592 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

issues & fixed layout

parent 31a9d653
...@@ -163,10 +163,6 @@ table.round-borders { ...@@ -163,10 +163,6 @@ table.round-borders {
padding:20px; padding:20px;
} }
//body {
//background: #eaeaea;
//}
a { a {
color: #111; color: #111;
} }
...@@ -232,43 +228,15 @@ input.ssh_project_url { ...@@ -232,43 +228,15 @@ input.ssh_project_url {
text-align:center; 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 { #projects-list .project {
height:50px; height:50px;
} }
#tree-slider .tree-item,
#projects-list .project, #projects-list .project,
#snippets-table .snippet, #snippets-table .snippet,
#issues-table .issue{ #issues-table .issue{
cursor:pointer; cursor:pointer;
&:hover {
@include hover-color;
td {
@include hover-color;
}
}
} }
.clear { .clear {
...@@ -563,6 +531,7 @@ input.ssh_project_url { ...@@ -563,6 +531,7 @@ input.ssh_project_url {
@include round-borders-all(4px); @include round-borders-all(4px);
padding:2px 4px; padding:2px 4px;
border:none; border:none;
text-shadow:none;
&.high { &.high {
background: #D12F19; background: #D12F19;
...@@ -687,6 +656,13 @@ table.highlighttable pre{ ...@@ -687,6 +656,13 @@ table.highlighttable pre{
width:200px; 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 {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;} body.project-page #notes-list .note img{float: left; margin-right: 10px;}
......
...@@ -82,6 +82,12 @@ class ApplicationController < ActionController::Base ...@@ -82,6 +82,12 @@ class ApplicationController < ActionController::Base
elsif params[:view_style] == "fluid" elsif params[:view_style] == "fluid"
cookies[:view_style] = "" cookies[:view_style] = ""
end end
@view_mode = if cookies[:view_style] == "collapsed"
:fixed
else
:fluid
end
end end
def respond_with_notes def respond_with_notes
......
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
= image_tag "move.png" , :class => [:handle, :left] = image_tag "move.png" , :class => [:handle, :left]
%td %td
= image_tag gravatar_icon(issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;" = 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 ##{issue.id}
%td %td
= truncate(html_escape(issue.title), :length => 60) = truncate(html_escape(issue.title), :length => 200)
%br
%br %br
- if issue.critical - if issue.critical
%span.tag.high critical %span.tag.high critical
...@@ -27,7 +28,8 @@ ...@@ -27,7 +28,8 @@
- else - else
= check_box_tag "closed", 1, issue.closed, :disabled => true = check_box_tag "closed", 1, issue.closed, :disabled => true
%td %td
- if can?(current_user, :admin_issue, @project) || issue.author == current_user - if @view_mode == :fluid
= 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
- 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
= link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-issue negative", :id => "destroy_issue_#{issue.id}" - 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 @@ ...@@ -7,18 +7,18 @@
= hidden_field_tag :project_id, @project.id, { :id => 'project_id' } = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
= search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' } = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
.right .right.issues_filter
= form_tag project_issues_path(@project), :method => :get do = 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" = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
= label_tag "open_issues","Open" = 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" = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
= label_tag "closed_issues","Closed" = 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" = radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
= label_tag "my_issues","To Me" = 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" = radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
= label_tag "all_issues","All" = label_tag "all_issues","All"
......
%h2 %h2
= "Issue ##{@issue.id} - #{html_escape(@issue.title)}" %strong
Issue
= "##{@issue.id}"
&ndash;
= html_escape(@issue.title)
.left.width-65p .left.width-65p
.issue_notes= render "notes/notes" .issue_notes= render "notes/notes"
...@@ -8,14 +12,6 @@ ...@@ -8,14 +12,6 @@
.right.width-30p .right.width-30p
.span-8 .span-8
%table.round-borders %table.round-borders
%tr
%td Title:
%td
= truncate html_escape(@issue.title)
%tr
%td Project
%td
%strong= @issue.project.name
%tr %tr
%td Author: %td Author:
%td %td
...@@ -39,7 +35,7 @@ ...@@ -39,7 +35,7 @@
%tr %tr
%td Closed? %td Closed?
%td %td
- if can? current_user, :write_issue, @project - if can? current_user, :write_issue, @issue
= form_for([@project, @issue]) do |f| = form_for([@project, @issue]) do |f|
= f.check_box :closed, :onclick => "$(this).parent().submit();" = f.check_box :closed, :onclick => "$(this).parent().submit();"
= hidden_field_tag :status_only, true = hidden_field_tag :status_only, true
...@@ -47,8 +43,9 @@ ...@@ -47,8 +43,9 @@
= check_box_tag "closed", 1, @issue.closed, :disabled => true = check_box_tag "closed", 1, @issue.closed, :disabled => true
- if can?(current_user, :admin_issue, @issue) - if can?(current_user, :write_issue, @issue)
.clear .clear
= link_to 'Edit', edit_project_issue_path(@project, @issue), :class => "lbutton positive", :remote => true %br
.right= link_to 'Destroy', [@project, @issue], :confirm => 'Are you sure?', :method => :delete, :class => "lbutton delete-issue negative", :id => "destroy_issue_#{@issue.id}" = 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 .clear
...@@ -12,7 +12,6 @@ describe "Issues" do ...@@ -12,7 +12,6 @@ describe "Issues" do
describe "add new note", :js => true do describe "add new note", :js => true do
before do before do
visit project_commit_path(project, commit) visit project_commit_path(project, commit)
click_link "Comments" # notes tab
fill_in "note_note", :with => "I commented this commit" fill_in "note_note", :with => "I commented this commit"
click_button "Add note" click_button "Add note"
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment