Merge branch 'dev'

app/views/projects/_recent_messages.html.haml

@@ -40,7 +40,7 @@
       %p{:style => "margin-bottom: 3px;"}
         %span.author
           = note.author.name
-        = link_to truncate(note.note, :length => 200), link_to_item + "#note_#{note.id}"
+        = link_to markdown(truncate(note.note, :length => 200)), link_to_item + "#note_#{note.id}"
         - if note.attachment.url
           %br
           Attachment:

app/views/projects/_team.html.haml

@@ -2,7 +2,7 @@
   %div#new-member-holder
     = link_to "Add new", new_project_team_member_path(@project), :remote => true, :class => "lbutton vm"
 %table.round-borders#team-table
-  %tr
+  %thead
     %th Name
     %th Email
     %th Web

app/views/projects/_tile.html.haml

@@ -1,16 +1,17 @@
 - @projects.in_groups_of(3, false) do |projects|
   - projects.each_with_index do |project, i|
-    %div{ :class => "project_thumb round-borders", :style => i == 2 ? "" : "margin-right:30px;" }
-      %div{ :class => "project", :url => project_path(project) }
-        %h2
-          = image_tag gravatar_icon(project.name), :class => "left", :width => 40, :style => "padding-right:5px;"
-          = link_to ("/" + project.code), project_path(project), :style => "text-decoration:none"
-        %p= project.name
-        %p= project.url_to_repo
-        -#%p
-          Commit –
-          = last_commit(project)
-        %hr
-        = link_to "Browse Code", tree_project_path(project), :class => "lbutton"
-        = link_to "Commits", project_commits_path(project), :class => "lbutton", :style => "float:right;width:80px;"
-        .clear
+    %div.grid_1
+      %div{ :class => "project-box ui-box ui-box-big" }
+        = link_to project_path(project) do 
+          %h3= project.name
+        .data
+          %p.title.repository
+            %span Repository:
+            = project.url_to_repo
+          %p.title.activity
+            %span Last Activity:
+            - last_note = project.notes.last
+            = last_note ? last_note.created_at.stamp("24 Aug, 2011") : "Never"
+        .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/_top_menu.html.haml

@@ -1,5 +1,4 @@
 %div.top_project_menu
-  -#%span= link_to @project.code.capitalize, @project, :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
   - if @project.repo_exists?
     %span= link_to image_tag("home.png", :width => 20), project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
     %span= link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil

app/views/projects/_tree.html.haml

@@ -1,31 +1,45 @@
-%h3
-  .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.prepend-1
-    = 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"
-  = text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url","one_click_select"]
-  .clear
+.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
+  %a.right.button.blue{:href => "#"} EDIT
+#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
+
+      - if params[:path]
+        - part_path = ""
+        - params[:path].split("\/").each do |part|
+          - part_path = File.join(part_path, part) unless part_path.empty?
+          - if part_path.empty?
+            - 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
+
+.clear
 
-%h3#tree-breadcrumbs
-  = link_to @project.name, tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true
-  - if params[:path]
-    - part_path = ""
-    - params[:path].split("\/").each do |part|
-      - part_path = File.join(part_path, part) unless part_path.empty?
-      - if part_path.empty?
-        - 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
 #tree-content-holder
   - if tree.is_a?(Grit::Blob)
     = render :partial => "projects/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
   - else
     - contents = tree.contents
     %table#tree-slider.round-borders
-      %tr
+      %thead
         %th Name
         %th Last Update
         %th

app/views/projects/index.html.haml

@@ -1,3 +1,12 @@
+- 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
+
 - unless @projects.empty?
   %div{:class => "tile", :style => view_mode_style("tile")}
     = render "tile"

app/views/projects/show.html.haml

@@ -13,11 +13,11 @@
         = label_tag "week_view","Week"
   .clear
   %hr
-.span-11
+.left.width-49p
   %h3 Commits
   =render "projects/recent_commits"
 
-.span-11.right
+.right.width-49p
   %h3 Talk
   =render "projects/recent_messages"