Wall redesign

12 files changed, 89 insertions, 36 deletions

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 01e3b416526..024dfe1182a 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,3 +16,7 @@ $(function(){
   $('select#branch').selectmenu({style:'popup', width:200});
   $('select#tag').selectmenu({style:'popup', width:200});
 });
+
+function updatePage(){
+  $.ajax({type: "GET", url: location.href, dataType: "script"});
+}
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index 860523b046a..517886722c1 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -491,8 +491,14 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
       background: white;
     }
     p { 
-      margin-bottom: 3px;
-      font-size: 12px;
+      margin-bottom: 4px;
+      font-size: 13px;
+      color:#111;
+    }
+  }
+  cite { 
+    &.ago { 
+      color:#666;
     }
   }
 }
@@ -515,7 +521,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
 }
 .note_content { 
   float:left;
-  width:750px;
+  width:650px;
 }
 
 .issue_notes { 
@@ -605,7 +611,9 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
   }
 
 }
-.message{
+.commit,
+.message, 
+#notes-list{
   .author { 
     background: #eaeaea;
     color: #333;
@@ -614,3 +622,19 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
     margin-right:5px;
   }
 }
+
+/* Note textare */
+#note_note { 
+  height:100px;
+  width:97%;
+  font-size:14px;
+}
+
+.wall_page { 
+  #note_note { 
+    height:25px;
+  }
+  .attach_holder { 
+    display:none;
+  }
+}
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 8ce3ca97ccb..dc94bae2c71 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -75,7 +75,7 @@ class ProjectsController < ApplicationController
         y.committed_date <=> x.committed_date
       end
 
-      @messages = project.notes.since(@date).limit(40).order("created_at DESC")
+      @messages = project.notes.since(@date).order("created_at DESC")
     else 
       return render "projects/empty"
     end
@@ -86,7 +86,14 @@ class ProjectsController < ApplicationController
   #
 
   def wall
-    @notes = @project.common_notes
+    @date = case params[:view]
+            when "week" then Date.today - 7.days
+            when "all" then nil
+            else Date.today
+            end
+
+    @notes = @project.common_notes.order("created_at DESC")
+    @notes = @notes.since(@date.at_beginning_of_day) if @date
     @note = Note.new
   end
 
diff --git a/app/views/commits/_commits.html.haml b/app/views/commits/_commits.html.haml
index 5a3ba3a7f46..94a1bd1b995 100644
--- a/app/views/commits/_commits.html.haml
+++ b/app/views/commits/_commits.html.haml
@@ -15,8 +15,8 @@
             = link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right"
             = link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right"
           %span
-            %span
-              [ #{commit.author} ]
+            %span.author
+              = commit.author
             = time_ago_in_words(commit.committed_date)
             ago
 = more_commits_link if @commits.size > 99
diff --git a/app/views/commits/show.js.haml b/app/views/commits/show.js.haml
index 2c46689b1ed..cec1fe28348 100644
--- a/app/views/commits/show.js.haml
+++ b/app/views/commits/show.js.haml
@@ -1,6 +1,8 @@
-:plain
+-#:plain
   $("#side-commit-preview").remove();
   var side = $("<div id='side-commit-preview'></div>");
   side.html("#{escape_javascript(render "commits/show")}");
   $("##{dom_id(@project)}").parent().append(side);
   $("##{dom_id(@project)}").addClass("span-14");
+:plain 
+  $("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index 8eaf968c803..ca56a2450a0 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -12,9 +12,9 @@
       = f.label :note
       %cite (255 symbols only)
       %br
-      = f.text_area :note, :style => "width:97%;height:100px", :size => 255
+      = f.text_area :note,  :size => 255
 
-    %div
+    %div.attach_holder
       = f.label :attachment
       %cite (less than 10 MB)
       %br
diff --git a/app/views/notes/_notes.html.haml b/app/views/notes/_notes.html.haml
index c93a47239fb..2d110162eca 100644
--- a/app/views/notes/_notes.html.haml
+++ b/app/views/notes/_notes.html.haml
@@ -1,9 +1,12 @@
-%ul#notes-list= render "notes/notes_list"
+- if controller.action_name == "wall"
+  %ul#notes-list= render "notes/notes_list"
 
-%br
-%br
-- if can? current_user, :write_note, @project
-  = render "notes/form"
+- else 
+  %ul#notes-list= render "notes/notes_list"
+  %br
+  %br
+  - if can? current_user, :write_note, @project
+    = render "notes/form"
 
 :javascript
   $('.delete-note').live('ajax:success', function() {  
@@ -23,7 +26,3 @@
     $(function(){
       var int =self.setInterval("updatePage()", 20000);
     });
-
-    function updatePage(){
-      $.ajax({type: "GET", url: location.href, dataType: "script"});
-    }
diff --git a/app/views/notes/_show.html.haml b/app/views/notes/_show.html.haml
index 2b0a6d2ebcd..ee9f9ffaa4b 100644
--- a/app/views/notes/_show.html.haml
+++ b/app/views/notes/_show.html.haml
@@ -1,19 +1,17 @@
 %li{:id => dom_id(note)}
   %div.note_author
     = image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
-  %div.note_content
+  %div.note_content.left
     = simple_format(html_escape(note.note))
     - if note.attachment.url
       Attachment:
-      = link_to note.attachment_identifier, note.attachment.url
+      = link_to note.attachment_identifier, note.attachment.url, :target => "_blank"
       %br
-    %span
-      %span
-        [ #{note.author.name} ]
-      &nbsp;
+    %span.author= note.author.name
+    %cite.ago
       = time_ago_in_words(note.updated_at)
       ago
-      %br
+    %br
   - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
     = link_to 'Remove', [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-note right negative"
   .clear
diff --git a/app/views/notes/create.js.haml b/app/views/notes/create.js.haml
index 0af548ff855..15371dbce2b 100644
--- a/app/views/notes/create.js.haml
+++ b/app/views/notes/create.js.haml
@@ -1,7 +1,7 @@
 - if @note.valid?
   :plain
     $("#new_note .errors").remove();
-    $("#notes-list").append("#{escape_javascript(render(:partial => 'show', :locals => {:note => @note} ))}");
+    updatePage();
     $('#note_note').val("");
 - else
   :plain
diff --git a/app/views/projects/_recent_commits.html.haml b/app/views/projects/_recent_commits.html.haml
index 812be93c1a3..e435ea30f00 100644
--- a/app/views/projects/_recent_commits.html.haml
+++ b/app/views/projects/_recent_commits.html.haml
@@ -9,8 +9,8 @@
         = link_to truncate_commit_message(commit, 60), project_commit_path(@project, :id => commit.id) 
       
     %span
-      %span
-        [ #{commit.author} ]
+      %span.author
+        = commit.author.name.force_encoding("UTF-8")
       %cite
         = time_ago_in_words(commit.committed_date)
         ago
diff --git a/app/views/projects/_recent_messages.html.haml b/app/views/projects/_recent_messages.html.haml
index 03f723da877..1af7fe3bb24 100644
--- a/app/views/projects/_recent_messages.html.haml
+++ b/app/views/projects/_recent_messages.html.haml
@@ -46,12 +46,6 @@
           Attachment:
           = link_to note.attachment_identifier, note.attachment.url
           %br
-      -#%span
-        %span
-          [ #{note.author.name} ]
-        %cite
-          = time_ago_in_words(note.created_at)
-          ago
     %br
   .append-bottom
     &nbsp;
diff --git a/app/views/projects/wall.html.haml b/app/views/projects/wall.html.haml
index 479bb3cfc5b..d3dcb3530aa 100644
--- a/app/views/projects/wall.html.haml
+++ b/app/views/projects/wall.html.haml
@@ -1 +1,26 @@
+%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, "day", (params[:view] || "day") == "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"
+
+:javascript 
+  $(function(){
+    $("#note_note").live("click", function(){
+      $(this).css("height", "100px");
+      $('.attach_holder').show();
+    });
+  });