Commit fbdb1da2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Bootstrap: issues, notes css

parent d4ad3623
function switchToNewIssue(form){ function switchToNewIssue(form){
$("#issues-table-holder").hide("slide", { direction: "left" }, 150, function(){ $("#issues-table").hide("slide", { direction: "left" }, 150, function(){
$(".project-content").append(form); $("#issues-table").after(form);
$('select#issue_assignee_id').chosen(); $('select#issue_assignee_id').chosen();
$("#new_issue_dialog").show("slide", { direction: "right" }, 150); $("#new_issue_dialog").show("slide", { direction: "right" }, 150);
$('.top-tabs .add_new').hide(); $('.top-tabs .add_new').hide();
...@@ -8,11 +8,11 @@ function switchToNewIssue(form){ ...@@ -8,11 +8,11 @@ function switchToNewIssue(form){
} }
function switchToEditIssue(form){ function switchToEditIssue(form){
$("#issues-table-holder").hide("slide", { direction: "left" }, 150, function(){ $("#issues-table").hide("slide", { direction: "left" }, 150, function(){
$(".project-content").append(form); $("#issues-table").after(form);
$('select#issue_assignee_id').chosen(); $('select#issue_assignee_id').chosen();
$("#edit_issue_dialog").show("slide", { direction: "right" }, 150); $("#edit_issue_dialog").show("slide", { direction: "right" }, 150);
$('.top-tabs .add_new').hide(); $('.add_new').hide();
}); });
} }
...@@ -26,10 +26,10 @@ function switchFromEditIssue(){ ...@@ -26,10 +26,10 @@ function switchFromEditIssue(){
function backToIssues(){ function backToIssues(){
$("#edit_issue_dialog, #new_issue_dialog").hide("slide", { direction: "right" }, 150, function(){ $("#edit_issue_dialog, #new_issue_dialog").hide("slide", { direction: "right" }, 150, function(){
$("#issues-table-holder").show("slide", { direction: "left" }, 150, function() { $("#issues-table").show("slide", { direction: "left" }, 150, function() {
$("#edit_issue_dialog").remove(); $("#edit_issue_dialog").remove();
$("#new_issue_dialog").remove(); $("#new_issue_dialog").remove();
$('.top-tabs .add_new').show(); $('.add_new').show();
}); });
}); });
} }
...@@ -87,6 +87,9 @@ $blue_link: "#2fa0bb"; ...@@ -87,6 +87,9 @@ $blue_link: "#2fa0bb";
.no-padding { .no-padding {
padding:0 !important; padding:0 !important;
} }
.underlined {
border-bottom: 1px solid $border_color;
}
/** LAYOUT **/ /** LAYOUT **/
...@@ -94,7 +97,7 @@ $blue_link: "#2fa0bb"; ...@@ -94,7 +97,7 @@ $blue_link: "#2fa0bb";
min-width:$min_app_width; min-width:$min_app_width;
max-width:$max_app_width; max-width:$max_app_width;
margin:auto; margin:auto;
margin-top:60px; margin-top:51px;
} }
.container-fluid > .sidebar { .container-fluid > .sidebar {
...@@ -106,6 +109,7 @@ $blue_link: "#2fa0bb"; ...@@ -106,6 +109,7 @@ $blue_link: "#2fa0bb";
.container-fluid > .content { .container-fluid > .content {
margin-left: 160px; margin-left: 160px;
margin-top:20px;
} }
@import "reset_bootstrap.scss"; @import "reset_bootstrap.scss";
...@@ -113,12 +117,12 @@ $blue_link: "#2fa0bb"; ...@@ -113,12 +117,12 @@ $blue_link: "#2fa0bb";
@import "projects.css.scss"; @import "projects.css.scss";
@import "commits.css.scss"; @import "commits.css.scss";
@import "tree.scss"; @import "tree.scss";
@import "issues.css.scss";
@import "merge_requests.css.scss";
@import "notes.css.scss";
//@import "style.scss"; //@import "style.scss";
//@import "notes.css.scss";
//@import "merge_requests.css.scss";
//@import "issues.css.scss";
//@import "commits.css.scss"; //@import "commits.css.scss";
//@import "dashboard.scss"; //@import "dashboard.scss";
......
...@@ -10,61 +10,6 @@ ...@@ -10,61 +10,6 @@
color: #444; color: #444;
} }
.issues_filter {
margin:10px 0;
.left {
margin-right:15px;
}
}
.top_panel_issues{
#issue_search_form {
margin:5px 0;
input {
border:1px solid #D3D3D3;
padding: 3px;
height: 28px;
width: 250px;
-webkit-appearance:none;
box-sizing: border-box;
-moz-box-sizing: border-box;
&:focus {
border-color:#c2e1ef;
}
}
}
}
/** ISSUES LIST **/
.issue .action-links {
display:none;
a {
margin-left:10px;
}
}
.issue:hover .action-links { display:block; }
.issue-show-holder {
width:100%;
.data p { font-size:16px }
}
#issue_assignee_id { #issue_assignee_id {
width:300px; width:300px;
} }
.issue-form-holder .ui-box .data {
margin: 0;
padding: 0;
}
#issues-table {
tr {
border-top: 1px solid $lite_border_color;
&:first-child {
border:none;
}
}
}
// Place all the styles related to the MergeRequests controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
.merge-request-form-holder { .merge-request-form-holder {
select { select {
width:300px; width:300px;
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#notes-list .note .delete-note { display:none; } #notes-list .note .delete-note { display:none; }
#notes-list .note:hover .delete-note { display:block; } #notes-list .note:hover .delete-note { display:block; }
#notes-list .note {padding: 10px 0; border-bottom: 1px solid #eee; overflow: hidden; display: block;} #notes-list .note {padding: 10px 0; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
#notes-list .note img{float: left; margin-right: 10px;} #notes-list .note img{float: left; margin-right: 10px;}
#notes-list .note span.note-title{display: block;} #notes-list .note span.note-title{display: block;}
......
- @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits| - @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits|
%div{ :class => "commits-date ui-box ui-box-small ui-box-big" } %div{ :class => "commits-date ui-box ui-box-small ui-box-big" }
.day-commits-table .day-commits-table
%div.alert-message.info %h5.underlined= day.stamp("28 Aug, 2010")
%p= day.stamp("28 Aug, 2010") %ul.unstyled
.data
- commits.each do |commit| - commits.each do |commit|
%li
%a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) } %a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) }
%span.commit-info %span.commit-info
%data.commit-button %data.commit-button
......
.commit .commit
%span.commit-info %span.commit-info
= link_to tree_project_ref_path(@project, @commit.id) do = link_to tree_project_ref_path(@project, @commit.id), :class => "btn" do
%data.commit-button Browse Code »
Browse Code
%i
- if @commit.author_email - if @commit.author_email
= image_tag gravatar_icon(@commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;" = image_tag gravatar_icon(@commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
- else - else
......
.top-tabs .tabs
= link_to project_issues_path(@project), :class => "tab #{'active' if current_page?(project_issues_path(@project)) }" do %li{:class => "#{'active' if current_page?(project_issues_path(@project))}"}
%span = link_to project_issues_path(@project), :class => "tab" do
Issues Issues
-#= link_to project_issues_path(@project), :class => "tab" do -#= link_to project_issues_path(@project), :class => "tab" do
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
- if current_page?(project_issues_path(@project)) - if current_page?(project_issues_path(@project))
- if can? current_user, :write_issue, @project - if can? current_user, :write_issue, @project
%li
= link_to new_project_issue_path(@project), :class => "add_new", :title => "New Issue", :remote => true do = link_to new_project_issue_path(@project), :class => "add_new", :title => "New Issue", :remote => true do
Add new Add new
%tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) } %tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) }
%td %td
%strong.issue-number{:class => sort_class}= "##{issue.id}" = image_tag gravatar_icon(issue.assignee_email), :class => "left", :width => 40, :style => "padding-right:5px;"
%span %span
= truncate(html_escape(issue.title), :length => 100) = truncate(html_escape(issue.title), :length => 100)
%br
%br
%div.note-author %div.note-author
%strong= issue.assignee.name %strong= issue.assignee.name
%cite.cgray %cite.cgray
......
...@@ -6,31 +6,25 @@ ...@@ -6,31 +6,25 @@
= image_tag "Rss-UI.PNG", :width => 22, :title => "feed" = image_tag "Rss-UI.PNG", :width => 22, :title => "feed"
%div#issues-table-holder %div#issues-table-holder
.top_panel_issues .well
= form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :right, :id => "issue_search_form" do = form_tag project_issues_path(@project), :method => :get, :class => :left do
= hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
= search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
.left.issues_filter
= form_tag project_issues_path(@project), :method => :get do
.left
= radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "setIssueFilter(this.form, 0)", :id => "open_issues", :class => "status"
= label_tag "open_issues" do = label_tag "open_issues" do
= radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "setIssueFilter(this.form, 0)", :id => "open_issues", :class => "status"
%span.tag.open Open %span.tag.open Open
.left
= radio_button_tag :f, 2, params[:f] == "2", :onclick => "setIssueFilter(this.form, 2)", :id => "closed_issues", :class => "status"
= label_tag "closed_issues" do = label_tag "closed_issues" do
= radio_button_tag :f, 2, params[:f] == "2", :onclick => "setIssueFilter(this.form, 2)", :id => "closed_issues", :class => "status"
%span.tag.closed Closed %span.tag.closed Closed
.left = label_tag "my_issues" do
= radio_button_tag :f, 3, params[:f] == "3", :onclick => "setIssueFilter(this.form, 3)", :id => "my_issues", :class => "status" = radio_button_tag :f, 3, params[:f] == "3", :onclick => "setIssueFilter(this.form, 3)", :id => "my_issues", :class => "status"
= label_tag "my_issues","To Me" %span To Me
.left = label_tag "all_issues" do
= radio_button_tag :f, 1, params[:f] == "1", :onclick => "setIssueFilter(this.form, 1)", :id => "all_issues", :class => "status" = radio_button_tag :f, 1, params[:f] == "1", :onclick => "setIssueFilter(this.form, 1)", :id => "all_issues", :class => "status"
= label_tag "all_issues","All" %span 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' }
.clear %table#issues-table
%hr
%table.no-borders#issues-table
= render "issues" = render "issues"
%br %br
:javascript :javascript
......
%div %div
%h3 Leave a note
= form_for [@project, @note], :remote => "true", :multipart => true do |f| = form_for [@project, @note], :remote => "true", :multipart => true do |f|
-if @note.errors.any? -if @note.errors.any?
.errors.error .errors.error
...@@ -7,30 +8,25 @@ ...@@ -7,30 +8,25 @@
= f.hidden_field :noteable_id = f.hidden_field :noteable_id
= f.hidden_field :noteable_type = f.hidden_field :noteable_type
%div
= f.label :note
%cite.cgray markdown supported
%br
%br
= f.text_area :note, :size => 255 = f.text_area :note, :size => 255
%div.attach_holder .row
%br .span6
= f.label :attachment %h5 Notify via email:
%cite.cgray (less than 10 MB) .clearfix
  = label_tag :notify do
= f.file_field :attachment
%p.notify_controls
%span Notify:
= check_box_tag :notify, 1, @note.noteable_type != "Commit" = check_box_tag :notify, 1, @note.noteable_type != "Commit"
= label_tag :notify, "Project team" %span Project team
-if @note.noteable_type == "Commit" -if @note.noteable_type == "Commit"
= label_tag :notify_author do
= check_box_tag :notify_author, 1 , @note.noteable_type == "Commit" = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
= label_tag :notify_author, "Commit author" %span Commit author
.span6
%h5 Attachment:
.clearfix
= f.label :attachment, "Any file, < 10 MB"
.input= f.file_field :attachment, :class => "input-file"
.clear = f.submit 'Add note', :class => "btn primary", :id => "submit_note"
%br
= f.submit 'Add note', :class => "positive-button", :id => "submit_note"
.top-tabs %ul.tabs
= link_to project_path(@project), :class => "activities-tab tab #{'active' if current_page?(project_path(@project)) }" do %li{ :class => "#{'active' if current_page?(project_path(@project)) }" }
%span = link_to project_path(@project), :class => "activities-tab tab" do
Activities Activities
= link_to info_project_path(@project), :class => "stat-tab tab #{'active' if current_page?(info_project_path(@project)) || current_page?(edit_project_path(@project)) }" do %li{ :class => "#{'active' if current_page?(info_project_path(@project)) || current_page?(edit_project_path(@project)) }" }
%span = link_to info_project_path(@project), :class => "stat-tab tab " do
Info Info
= link_to team_project_path(@project), :class => "team-tab tab #{'active' if current_page?(team_project_path(@project)) }" do
%span %li{ :class => " #{'active' if current_page?(team_project_path(@project)) }" }
= link_to team_project_path(@project), :class => "team-tab tab" do
Team Team
= link_to files_project_path(@project), :class => "files-tab tab #{'active' if current_page?(files_project_path(@project)) }" do %li{ :class => "#{'active' if current_page?(files_project_path(@project)) }" }
%span = link_to files_project_path(@project), :class => "files-tab tab " do
Files Files
= link_to project_snippets_path(@project), :class => "snippets-tab tab #{'active' if current_page?(project_snippets_path(@project)) }" do %li{ :class => " #{'active' if current_page?(project_snippets_path(@project)) }" }
%span = link_to project_snippets_path(@project), :class => "snippets-tab tab" do
Snippets Snippets
- if current_page?(project_snippets_path(@project)) - if current_page?(project_snippets_path(@project))
- if can? current_user, :write_snippet, @project - if can? current_user, :write_snippet, @project
%li
= link_to new_project_snippet_path(@project), :class => "add_new", :title => "New Snippet" do = link_to new_project_snippet_path(@project), :class => "add_new", :title => "New Snippet" do
Add new Add new
- if current_page?(team_project_path(@project)) - if current_page?(team_project_path(@project))
- if can? current_user, :admin_team_member, @project - if can? current_user, :admin_team_member, @project
%li
= link_to new_project_team_member_path(@project), :class => "add_new", :title => "New Team Member" do = link_to new_project_team_member_path(@project), :class => "add_new", :title => "New Team Member" do
Add New Add New
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