Merge branch 'dev'
Conflicts: app/helpers/dashboard_helper.rb
This commit is contained in:
commit
fe1433c379
|
@ -40,3 +40,19 @@ $(document).ready(function(){
|
|||
function focusSearch() {
|
||||
$("#search").focus();
|
||||
}
|
||||
|
||||
function taggifyForm(){
|
||||
var tag_field = $('#tag_field').tagify();
|
||||
|
||||
tag_field.tagify('inputField').autocomplete({
|
||||
source: '/tags.json'
|
||||
});
|
||||
|
||||
|
||||
$('form').submit( function() {
|
||||
var tag_field = $('#tag_field')
|
||||
tag_field.val( tag_field.tagify('serialize') );
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -443,67 +443,6 @@ input.ssh_project_url {
|
|||
padding: 10px;
|
||||
}
|
||||
|
||||
.recent_message_parent {
|
||||
img {
|
||||
padding-right:10px;
|
||||
}
|
||||
|
||||
float: left;
|
||||
margin: 0 20px 20px 0px;
|
||||
padding: 5px 0px;;
|
||||
width: 420px;
|
||||
|
||||
&.dash_wall{
|
||||
border-bottom: 2px solid orange;
|
||||
span {
|
||||
background: orange;
|
||||
color:black;
|
||||
}
|
||||
}
|
||||
|
||||
&.dash_issue{
|
||||
border-bottom: 2px solid #ffbbbb;
|
||||
span {
|
||||
background: #ffbbbb;
|
||||
}
|
||||
}
|
||||
&.dash_commit{
|
||||
border-bottom: 2px solid #bbbbff;
|
||||
|
||||
span{
|
||||
background: #bbbbff;
|
||||
}
|
||||
}
|
||||
|
||||
&.dash_snippet{
|
||||
border-bottom: 2px solid #bbffbb;
|
||||
|
||||
span{
|
||||
background: #bbffbb;
|
||||
}
|
||||
}
|
||||
|
||||
span{
|
||||
border: 1px solid #aaa;
|
||||
color:black;
|
||||
padding:1px 4px;
|
||||
}
|
||||
|
||||
h4 {
|
||||
margin-bottom:3px;
|
||||
}
|
||||
|
||||
}
|
||||
.commit,
|
||||
.message{
|
||||
.author {
|
||||
background: #eaeaea;
|
||||
color: #333;
|
||||
border: 1px solid #aaa;
|
||||
padding:1px 2px;
|
||||
margin-right:5px;
|
||||
}
|
||||
}
|
||||
|
||||
/* Note textare */
|
||||
#note_note {
|
||||
|
@ -665,6 +604,8 @@ table.highlighttable pre{
|
|||
margin-right:15px;
|
||||
}
|
||||
}
|
||||
.filter .left { margin-right:15px; }
|
||||
|
||||
|
||||
.cgray { color:gray; }
|
||||
.cred { color:#D12F19; }
|
||||
|
@ -710,3 +651,33 @@ body.project-page #notes-list .note span.note-title{display: block;}
|
|||
body.project-page #notes-list .note span.note-title{margin-bottom: 10px}
|
||||
body.project-page #notes-list .note span.note-author{color: #999; font-weight: normal; font-style: italic;}
|
||||
body.project-page #notes-list .note span.note-author strong{font-weight: bold; font-style: normal;}
|
||||
|
||||
|
||||
/** NEW PROJECT **/
|
||||
.new-project-hodler {
|
||||
.icon span {
|
||||
background-position: -31px -70px;
|
||||
}
|
||||
td {
|
||||
border-bottom: 1px solid #DEE2E3;
|
||||
}
|
||||
}
|
||||
|
||||
//.message .note-title p { margin-bottom:0px; }
|
||||
|
||||
.commit,
|
||||
.message {
|
||||
.title {
|
||||
color:#666;
|
||||
a {
|
||||
color:#666 !important;
|
||||
}
|
||||
p {
|
||||
margin-top:0px;
|
||||
}
|
||||
}
|
||||
|
||||
.author {
|
||||
color: #999
|
||||
}
|
||||
}
|
||||
|
|
|
@ -28,3 +28,17 @@
|
|||
text-shadow: none;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
||||
.medium-tags a{
|
||||
font-size: 12px;
|
||||
|
||||
display: inline-block;
|
||||
padding: 3px 4px 2px 4px;
|
||||
margin: 0px 7px 8px 0px;
|
||||
border-radius: 3px;
|
||||
background-color: #72bbdf;
|
||||
color: #FFF;
|
||||
text-shadow: none;
|
||||
font-weight: bold;
|
||||
}
|
|
@ -12,7 +12,7 @@ module DashboardHelper
|
|||
when "Commit" then project_commit_path(project, :id => note.noteable_id)
|
||||
else wall_project_path(project)
|
||||
end
|
||||
else "#"
|
||||
else wall_project_path(project)
|
||||
end
|
||||
rescue
|
||||
"#"
|
||||
|
@ -24,8 +24,8 @@ module DashboardHelper
|
|||
title = case klass
|
||||
when "Note" then markdown(object.note)
|
||||
when "Issue" then object.title
|
||||
when "Commit" then object.safe_message
|
||||
else ""
|
||||
when "Grit::Commit" then object.safe_message
|
||||
else return "Project Wall"
|
||||
end
|
||||
|
||||
"[#{klass}] #{truncate(sanitize(title, :tags => []), :length => 60)} "
|
||||
|
|
|
@ -1,2 +1,12 @@
|
|||
module IssuesHelper
|
||||
def sort_class
|
||||
if can?(current_user, :admin_issue, @project) && (!params[:f] || params[:f] == "0")
|
||||
"handle"
|
||||
end
|
||||
end
|
||||
|
||||
def project_issues_filter_path project, params = {}
|
||||
params[:f] ||= cookies['issue_filter']
|
||||
project_issues_path project, params
|
||||
end
|
||||
end
|
||||
|
|
15
app/helpers/tags_helper.rb
Normal file
15
app/helpers/tags_helper.rb
Normal file
|
@ -0,0 +1,15 @@
|
|||
module TagsHelper
|
||||
def tag_path tag
|
||||
"/tags/#{tag}"
|
||||
end
|
||||
|
||||
def tag_list project
|
||||
html = ''
|
||||
project.tag_list.each do |tag|
|
||||
html += link_to tag, tag_path(tag)
|
||||
end
|
||||
|
||||
html.html_safe
|
||||
end
|
||||
|
||||
end
|
|
@ -6,25 +6,34 @@
|
|||
- @admin_project.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
|
||||
.span-24
|
||||
.span-12
|
||||
.field
|
||||
= f.label :name
|
||||
%br
|
||||
= f.text_field :name
|
||||
.field
|
||||
= f.label :code
|
||||
%br
|
||||
= f.text_field :code
|
||||
.field
|
||||
= f.label :path
|
||||
%br
|
||||
= f.text_field :path
|
||||
.span-10
|
||||
.field
|
||||
= f.label :description
|
||||
%br
|
||||
= f.text_area :description
|
||||
.form-row
|
||||
= f.label :name
|
||||
%br
|
||||
= f.text_field :name
|
||||
.form-row
|
||||
= f.label :code
|
||||
%br
|
||||
= f.text_field :code
|
||||
.form-row
|
||||
= f.label :path
|
||||
%br
|
||||
= f.text_field :path
|
||||
|
||||
|
||||
.form-row
|
||||
= f.label :tag_list
|
||||
%br
|
||||
= f.text_area :tag_list, :placeholder => "project tags", :style => "height:50px", :id => :tag_field
|
||||
|
||||
.form-row
|
||||
= f.label :description
|
||||
%br
|
||||
= f.text_area :description
|
||||
.clear
|
||||
.actions
|
||||
= f.submit 'Save', :class => "lbutton"
|
||||
|
||||
:javascript
|
||||
$(function(){
|
||||
taggifyForm();
|
||||
})
|
||||
|
|
|
@ -13,10 +13,8 @@
|
|||
= diff_line(line, line_new, line_old)
|
||||
- if line[0] == "+"
|
||||
- line_new += 1
|
||||
- elsif
|
||||
- line[0] == "-"
|
||||
- elsif line[0] == "-"
|
||||
- line_old += 1
|
||||
- else
|
||||
- line_new += 1
|
||||
- line_old += 1
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
.project-box.project-updates.ui-box.ui-box-small.ui-box-big
|
||||
%h3= project.name
|
||||
.data
|
||||
- project.updates.each do |update|
|
||||
- project.updates(4).each do |update|
|
||||
%a.project-update{:href => dashboard_feed_path(project, update)}
|
||||
= image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
|
||||
%span.update-title
|
||||
|
@ -34,7 +34,5 @@
|
|||
= time_ago_in_words(update.created_at)
|
||||
ago
|
||||
%br
|
||||
/ .project-update
|
||||
/ .project-updates
|
||||
/ #news-feed
|
||||
/ #dashboard-content
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
%tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(@project, issue) }
|
||||
-#- if can?(current_user, :admin_issue, @project) && (!params[:f] || params[:f] == "0")
|
||||
%td
|
||||
= image_tag "move.png" , :class => [:handle, :left]
|
||||
%td
|
||||
%strong.issue-number= "##{issue.id}"
|
||||
%strong.issue-number{:class => sort_class}= "##{issue.id}"
|
||||
%span
|
||||
= truncate(html_escape(issue.title), :length => fixed_mode? ? 100 : 200)
|
||||
%br
|
||||
|
|
|
@ -13,16 +13,16 @@
|
|||
.right.issues_filter
|
||||
= form_tag project_issues_path(@project), :method => :get do
|
||||
.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 => "setIssueFilter(this.form, 0)", :id => "open_issues", :class => "status"
|
||||
= label_tag "open_issues","Open"
|
||||
.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 => "setIssueFilter(this.form, 2)", :id => "closed_issues", :class => "status"
|
||||
= label_tag "closed_issues","Closed"
|
||||
.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 => "setIssueFilter(this.form, 3)", :id => "my_issues", :class => "status"
|
||||
= label_tag "my_issues","To Me"
|
||||
.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 => "setIssueFilter(this.form, 1)", :id => "all_issues", :class => "status"
|
||||
= label_tag "all_issues","All"
|
||||
|
||||
= render "issues"
|
||||
|
@ -31,6 +31,12 @@
|
|||
var href = $('.issue_search').parent().attr('action');
|
||||
var last_terms = '';
|
||||
|
||||
|
||||
var setIssueFilter = function(form, value){
|
||||
$.cookie('issue_filter', value, { expires: 140 });
|
||||
form.submit();
|
||||
}
|
||||
|
||||
$('.issue_search').keyup(function() {
|
||||
var terms = $(this).val();
|
||||
var project_id = $('#project_id').val();
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
Team
|
||||
- if @project.users_projects.count > 0
|
||||
%span{ :class => "number" }= @project.users_projects.count
|
||||
= link_to project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
|
||||
= link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
|
||||
Issues
|
||||
- if @project.issues.opened.count > 0
|
||||
%span{ :class => "number" }= @project.issues.opened.count
|
||||
|
@ -40,5 +40,7 @@
|
|||
- if @commit
|
||||
= link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil
|
||||
|
||||
.medium-tags{:style => 'padding: 10px 0 0 10px; width: 210px;'}= tag_list @project
|
||||
|
||||
.project-content
|
||||
= yield
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
= form_for(@project, :remote => true) do |f|
|
||||
%div.form_content
|
||||
- unless @project.new_record?
|
||||
%h1 Edit Project
|
||||
%h2.icon
|
||||
%span
|
||||
= @project.name
|
||||
- if @project.errors.any?
|
||||
#error_explanation
|
||||
%h2
|
||||
|
@ -10,7 +12,7 @@
|
|||
%ul
|
||||
- @project.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
%table.round-borders
|
||||
%table
|
||||
%tr
|
||||
%td= f.label :name
|
||||
%td= f.text_field :name, :placeholder => "Example Project"
|
||||
|
@ -29,15 +31,13 @@
|
|||
%tr
|
||||
%td= f.label :tag_list
|
||||
%td= f.text_area :tag_list, :placeholder => "project tags", :style => "height:50px", :id => :tag_field
|
||||
%tr
|
||||
%td= f.label :description
|
||||
%td= f.text_area :description, :placeholder => "project description", :style => "height:50px"
|
||||
|
||||
.field
|
||||
= f.label :description
|
||||
%br/
|
||||
= f.text_area :description, :style => "height:140px;width:932px;"
|
||||
.clear
|
||||
%hr.prepend-top
|
||||
%br
|
||||
.actions
|
||||
= f.submit :class => "lbutton vm"
|
||||
= f.submit :class => "button"
|
||||
|
||||
%div{ :class => "ajax_loader", :style => "display:none;height:200px;"}
|
||||
%center
|
||||
|
@ -55,16 +55,5 @@
|
|||
|
||||
:javascript
|
||||
$(function(){
|
||||
var tag_field = $('#tag_field').tagify();
|
||||
|
||||
tag_field.tagify('inputField').autocomplete({
|
||||
source: '/tags.json'
|
||||
});
|
||||
|
||||
|
||||
$('form').submit( function() {
|
||||
var tag_field = $('#tag_field')
|
||||
tag_field.val( tag_field.tagify('serialize') );
|
||||
return true;
|
||||
});
|
||||
taggifyForm();
|
||||
})
|
||||
|
|
|
@ -12,9 +12,8 @@
|
|||
%tr{ :class => "project", :url => project_path(project) }
|
||||
%td
|
||||
= project.name
|
||||
.small-tags
|
||||
- project.tag_list.each do |tag|
|
||||
= link_to tag, "/tags/#{tag}"
|
||||
.small-tags= tag_list project
|
||||
|
||||
|
||||
%td= truncate project.url_to_repo
|
||||
%td= project.code
|
||||
|
|
|
@ -1,18 +1,32 @@
|
|||
- @commits.each do |commit|
|
||||
%div.commit
|
||||
- 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;"
|
||||
%p{:style => "margin-bottom: 3px;"}
|
||||
%strong
|
||||
= link_to truncate(commit.safe_message, :length => 60), project_commit_path(@project, :id => commit.id)
|
||||
|
||||
%span
|
||||
%span.author
|
||||
= commit.author.name.force_encoding("UTF-8")
|
||||
%cite
|
||||
= time_ago_in_words(commit.committed_date)
|
||||
ago
|
||||
%br
|
||||
%table
|
||||
%thead
|
||||
%th
|
||||
Commits
|
||||
.filter.right
|
||||
= form_tag project_path(@project), :method => :get, :class => "right" do
|
||||
.left
|
||||
= radio_button_tag :view, "recent", (params[:view] || "recent") == "recent", :onclick => "this.form.submit()", :id => "recent_view"
|
||||
= label_tag "recent_view","Recent"
|
||||
.left
|
||||
= radio_button_tag :view, "day", params[:view] == "day", :onclick => "this.form.submit()", :id => "day_view"
|
||||
= label_tag "day_view","Today"
|
||||
.left
|
||||
= radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view"
|
||||
= label_tag "week_view","Week"
|
||||
- @commits.each do |commit|
|
||||
%tr
|
||||
%td
|
||||
%div.commit
|
||||
- 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;"
|
||||
.title
|
||||
%p= link_to truncate(commit.safe_message, :length => fixed_mode? ? 40 : 100), project_commit_path(@project, :id => commit.id)
|
||||
|
||||
%span
|
||||
%span.author
|
||||
%strong= commit.author.name.force_encoding("UTF-8")
|
||||
%cite.cgray
|
||||
= time_ago_in_words(commit.committed_date)
|
||||
ago
|
||||
|
|
|
@ -3,50 +3,25 @@
|
|||
- parent = load_note_parent(id, type, @project)
|
||||
- next unless parent
|
||||
|
||||
- case type
|
||||
- when "Issue"
|
||||
- css_class = "dash_issue"
|
||||
- issue = parent
|
||||
- item_code = issue.author.email
|
||||
- link_item_name = truncate(issue.title, :length => 50)
|
||||
- link_to_item = project_issue_path(@project, issue)
|
||||
- when "Snippet"
|
||||
- css_class = "dash_snippet"
|
||||
- item_code = parent.author.email
|
||||
- link_item_name = parent.title
|
||||
- link_to_item = project_snippet_path(@project, parent)
|
||||
- when "Commit"
|
||||
- css_class = "dash_commit"
|
||||
- commit = parent
|
||||
- item_code = commit.author.email
|
||||
- link_item_name = truncate(commit.safe_message, :length => 50)
|
||||
- link_to_item = project_commit_path(@project, :id => commit.id)
|
||||
- else
|
||||
- css_class = "dash_wall"
|
||||
- item_code = @project.name
|
||||
- link_item_name = "Project Wall"
|
||||
- link_to_item = wall_project_path(@project)
|
||||
|
||||
%div{ :class => "recent_message_parent #{css_class}"}
|
||||
= image_tag gravatar_icon(item_code), :class => "left", :width => 40
|
||||
%h4
|
||||
= link_to(link_item_name, link_to_item)
|
||||
%span
|
||||
= type
|
||||
.clear
|
||||
- notes.sort {|x,y| x.updated_at <=> y.updated_at }.each do |note|
|
||||
%div.message
|
||||
= image_tag gravatar_icon(note.author.email), :class => "left", :width => 24, :style => "padding-right:5px;"
|
||||
%p{:style => "margin-bottom: 3px;"}
|
||||
%span.author
|
||||
= note.author.name
|
||||
= link_to markdown(truncate(note.note, :length => 200)), link_to_item + "#note_#{note.id}"
|
||||
- if note.attachment.url
|
||||
%br
|
||||
Attachment:
|
||||
= link_to note.attachment_identifier, note.attachment.url
|
||||
%br
|
||||
%br
|
||||
.append-bottom
|
||||
|
||||
.clear
|
||||
%table
|
||||
%thead
|
||||
%th
|
||||
%div{ :class => "recent_message_parent"}
|
||||
= link_to(truncate(dashboard_feed_title(parent), :length => fixed_mode? ? 40 : 100 ), dashboard_feed_path(@project, parent))
|
||||
- notes.sort {|x,y| y.updated_at <=> x.updated_at }.each do |note|
|
||||
%tr
|
||||
%td
|
||||
%div.message
|
||||
= image_tag gravatar_icon(note.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
|
||||
%div.title
|
||||
= link_to markdown(truncate(note.note, :length => fixed_mode? ? 40 : 100)), dashboard_feed_path(@project, parent) + "#note_#{note.id}"
|
||||
- if note.attachment.url
|
||||
%br
|
||||
Attachment:
|
||||
= link_to note.attachment_identifier, note.attachment.url
|
||||
%div.author
|
||||
%strong= note.author_name
|
||||
%cite.cgray
|
||||
= time_ago_in_words(note.updated_at)
|
||||
ago
|
||||
%br
|
||||
|
|
|
@ -13,9 +13,7 @@
|
|||
- last_note = project.notes.last
|
||||
= last_note ? last_note.created_at.stamp("24 Aug, 2011") : "Never"
|
||||
|
||||
%p.small-tags
|
||||
- project.tag_list.each do |tag|
|
||||
= link_to tag, "/tags/#{tag}"
|
||||
%p.small-tags= tag_list project
|
||||
|
||||
.buttons
|
||||
%a.browse-code.button.yellow{:href => tree_project_path(project)} Browse code
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
<%= render 'form' %>
|
8
app/views/projects/new.html.haml
Normal file
8
app/views/projects/new.html.haml
Normal file
|
@ -0,0 +1,8 @@
|
|||
.new-project-hodler
|
||||
.container_4
|
||||
%h2.icon
|
||||
%span
|
||||
New Project
|
||||
|
||||
%div.clear
|
||||
= render 'form'
|
|
@ -1,28 +1,11 @@
|
|||
%div
|
||||
%h2.left History
|
||||
.right
|
||||
= form_tag project_path(@project), :method => :get do
|
||||
.span-2
|
||||
= radio_button_tag :view, "recent", (params[:view] || "recent") == "recent", :onclick => "this.form.submit()", :id => "recent_view"
|
||||
= label_tag "recent_view","Recent"
|
||||
.span-2
|
||||
= radio_button_tag :view, "day", params[:view] == "day", :onclick => "this.form.submit()", :id => "day_view"
|
||||
= label_tag "day_view","Today"
|
||||
.span-2
|
||||
= radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view"
|
||||
= label_tag "week_view","Week"
|
||||
.clear
|
||||
%hr
|
||||
.left.width-49p
|
||||
%h3 Commits
|
||||
=render "projects/recent_commits"
|
||||
|
||||
.right.width-49p
|
||||
%h3 Talk
|
||||
=render "projects/recent_messages"
|
||||
|
||||
:javascript
|
||||
function updateDashboard(){
|
||||
$('#content-container').load("#{escape_javascript(project_path(@project))} #content-container>*");
|
||||
$('.project-content').load("#{escape_javascript(project_path(@project))} .project-content>*");
|
||||
}
|
||||
setInterval("updateDashboard()", 300000);
|
||||
|
|
|
@ -7,5 +7,5 @@
|
|||
|
||||
.tags-list
|
||||
- @tags.all.each do |tag|
|
||||
= link_to "#{tag.name}(#{tag.count})", "/tags/#{tag.name}"
|
||||
= link_to "#{tag.name}(#{tag.count})", tag_path(name)
|
||||
|
||||
|
|
|
@ -158,7 +158,6 @@ describe "Issues" do
|
|||
it "should have valid show page for issue" do
|
||||
page.should have_content @issue.title
|
||||
page.should have_content @user.name
|
||||
page.should have_content "today"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue