Merge branch 'dev'

app/views/projects/_form.html.haml

@@ -25,6 +25,11 @@
           .left= f.label :code
           %cite.right http://yourserver/
         %td= f.text_field :code, :placeholder => "example"
+
+      %tr
+        %td= f.label :tag_list
+        %td= f.text_area :tag_list, :placeholder => "project tags", :style => "height:50px", :id => :tag_field
+
     .field
       = f.label :description
       %br/
@@ -41,8 +46,25 @@
         %h3.prepend-top Creating project & repository. Please wait for few minutes
       - else
         %h3.prepend-top Updating project & repository. Please wait for few minutes
+
 :javascript
   $('.new_project, .edit_project').bind('ajax:before', function() {
     $(this).find(".form_content").hide();
     $('.ajax_loader').show();
   });
+
+: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;
+    });
+  })  

app/views/projects/_list.html.haml

@@ -10,7 +10,12 @@
 
   - @projects.each do |project|
     %tr{ :class => "project", :url => project_path(project) }
-      %td= project.name
+      %td
+        = project.name
+        .small-tags
+          - project.tag_list.each do |tag|
+            = link_to tag, "/tags/#{tag}"
+
       %td= truncate project.url_to_repo
       %td= project.code
       %td= check_box_tag "read",   1, project.readers.include?(current_user), :disabled => :disabled

app/views/projects/_refs.html.haml

@@ -0,0 +1,8 @@
+= form_tag destination, :method => :get, :class => "project-refs-form" do
+  = select_tag "ref", grouped_options_refs, :onchange => "this.form.submit();", :class => "project-refs-select"
+
+
+:javascript
+  $(function(){
+    $('.project-refs-select').chosen();
+  })

app/views/projects/_tile.html.haml

@@ -12,6 +12,11 @@
             %span Last Activity:
             - 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}"
+
         .buttons
           %a.browse-code.button.yellow{:href => tree_project_path(project)} Browse code
           %a.commits.button.green{:href => project_commits_path(project)} Commits

app/views/projects/_tree.html.haml

@@ -1,12 +1,3 @@
-.left
-  = form_tag tree_project_path(@project), :method => :get do
-    = select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
-.left
-  = form_tag tree_project_path(@project), :method => :get do
-    = select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
-.clear
-
-%br
 
 -#%a.right.button{:href => "#"} Download
 -#-if can? current_user, :admin_project, @project
@@ -14,14 +5,9 @@
 #tree-breadcrumbs
   %h2.icon
     %span
-    = link_to tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true, :class => 'project-name' do 
-      %i.arrow>
-      = @project.name
-     
     %d
-      %a{:href => "#"}
-        = @ref
-
+      = link_to tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true do 
+        = @project.name
       - if params[:path]
         - part_path = ""
         - params[:path].split("\/").each do |part|
@@ -30,7 +16,8 @@
             - part_path = part
           \/
           = link_to truncate(part, :length => 40), tree_file_project_path(@project, :path => part_path, :commit_id => @commit.try(:id), :branch => @branch, :tag => @tag), :remote => :true
-
+         
+  .right= render :partial => "projects/refs", :locals => { :destination => tree_project_path(@project) }
 .clear
 
 #tree-content-holder

app/views/projects/_tree_item.html.haml

@@ -11,5 +11,8 @@
   %td
     = time_ago_in_words(content_commit.committed_date)
     ago
-  %td
-    = link_to truncate(content_commit.safe_message, :length => 40), project_commit_path(@project, content_commit)
+  %td.commit
+    = link_to truncate(content_commit.safe_message, :length => fixed_mode? ? 40 : 80), project_commit_path(@project, content_commit), :class => "tree-commit-link"
+    - tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
+    - if tm
+      = link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)

app/views/projects/index.html.haml

@@ -1,18 +1,20 @@
 - content_for(:body_class, "projects-page")
 - content_for(:page_title) do
-  .grid_4
-    - if current_user.can_create_project?
-      %a.grey-button.right{:href => new_project_path} Create new project
-    %h2.icon  
-      %span
-      Projects
+  .container_4
+    .grid_4
+      - if current_user.can_create_project?
+        %a.grey-button.right{:href => new_project_path} Create new project
+      %h2.icon  
+        %span
+        Projects
 
-- unless @projects.empty?
-  %div{:class => "tile", :style => view_mode_style("tile")}
-    = render "tile"
-  %div{:class => "list", :style => view_mode_style("list")}
-    = render "list"
-- else
-  %center.prepend-top
-    %h2
-      %cite Nothing here
+    %div.clear
+    - unless @projects.empty?
+      %div{:class => "tile", :style => view_mode_style("tile")}
+        = render "tile"
+      %div{:class => "list", :style => view_mode_style("list")}
+        = render "list"
+    - else
+      %center.prepend-top
+        %h2
+          %cite Nothing here

app/views/projects/wall.html.haml

@@ -1,29 +1,6 @@
 %div.wall_page
-  - if can? current_user, :write_note, @project
-    = render "notes/form"
-  .right
-    = form_tag wall_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"
-      .span-2
-        = radio_button_tag :view, "all", params[:view] == "all", :onclick => "this.form.submit()", :id => "all_view"
-        = label_tag "all_view","All"
-  .clear
-  %br
-  %hr
-= render "notes/notes"
+  = render "notes/notes"
+
+.loading{ :style => "display:none;"}
+  %center= image_tag "ajax-loader.gif"
 
-:javascript
-  $(function(){
-    $("#note_note").live("click", function(){
-      $(this).css("height", "100px");
-      $('.attach_holder').show();
-    });
-  });

app/views/projects/wall.js.haml

@@ -1,2 +1 @@
-:plain
-  $("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+= render "notes/load"