Merge branch 'issue-184' into dev

Conflicts:
	app/views/layouts/project.html.haml
	app/views/projects/_form.html.haml
This commit is contained in:
Aleksei Kvitinskii 2011-11-08 23:19:42 +02:00
commit 1d85197b08
9 changed files with 81 additions and 39 deletions

View file

@ -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();
})

View file

@ -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

View file

@ -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