Merge branch 'dev'

app/views/projects/_form.html.haml

@@ -21,7 +21,7 @@
         %td
           = f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
       %tr
-        %td 
+        %td
           .left= f.label :code
           %cite.right http://yourserver/
         %td= f.text_field :code, :placeholder => "example"
@@ -39,10 +39,10 @@
       = image_tag "ajax-loader.gif", :class => "append-bottom"
       - if @project.new_record?
         %h3.prepend-top Creating project & repository. Please wait for few minutes
-      - else 
+      - 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();  
+  $('.new_project, .edit_project').bind('ajax:before', function() {
+    $(this).find(".form_content").hide();
     $('.ajax_loader').show();
-  });  
+  });

app/views/projects/_list.html.haml

@@ -16,7 +16,7 @@
       %td= check_box_tag "read",   1, project.readers.include?(current_user), :disabled => :disabled
       %td= check_box_tag "commit", 1, project.writers.include?(current_user), :disabled => :disabled
       %td= check_box_tag "admin",  1, project.admins.include?(current_user), :disabled => :disabled
-      %td 
+      %td
         -if can? current_user, :admin_project, project
           = link_to 'Edit', edit_project_path(project), :class => "lbutton positive"
 %br

app/views/projects/_projects_top_menu.html.haml

@@ -11,7 +11,7 @@
     $(".list").toggle();
     if($(".tile").is(":visible")){
       $.cookie('project_view', 'tile', { expires: 14 });
-    } else { 
+    } else {
       $.cookie('project_view', 'list', { expires: 14 });
     }
   }

app/views/projects/_recent_commits.html.haml

@@ -6,8 +6,8 @@
       = 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) 
-      
+        = 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")

app/views/projects/_team.html.haml

@@ -14,5 +14,5 @@
     = render(:partial => 'team_members/show', :locals => {:member => up})
 
 :javascript
-  $('.delete-team-member').live('ajax:success', function() {  
-    $(this).closest('tr').fadeOut(); });  
+  $('.delete-team-member').live('ajax:success', function() {
+    $(this).closest('tr').fadeOut(); });

app/views/projects/_top_menu.html.haml

@@ -23,7 +23,7 @@
     = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
       Snippets
       - if @project.snippets.count > 0
-        %span{ :class => "top_menu_count" }= @project.snippets.count
+        %span{ :class => "top_menu_count" }= @project.snippets.non_expired.count
 
   - if @commit
     %span= 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

app/views/projects/empty.html.erb

@@ -40,7 +40,7 @@ eos
       <p>
       Be careful! <br/>
       Project cant be recovered after destroy.</p>
-      <%= link_to 'Destroy', @project, 
+      <%= link_to 'Destroy', @project,
       :confirm => 'Are you sure?', :method => :delete,
       :class => "left button negative span-6", :style => "text-align:center" %>
       <div class="clear"></div>

app/views/projects/index.html.haml

@@ -3,7 +3,7 @@
     = render "tile"
   %div{:class => "list", :style => view_mode_style("list")}
     = render "list"
-- else 
+- else
   %center.prepend-top
     %h2
       %cite Nothing here

app/views/projects/show.html.haml

@@ -21,3 +21,8 @@
   %h3 Talk
   =render "projects/recent_messages"
 
+:javascript
+  function updateDashboard(){
+    $('#content-container').load("#{escape_javascript(project_path(@project))} #content-container>*");
+  }
+  setInterval("updateDashboard()", 300000);

app/views/projects/tree.js.haml

@@ -1,5 +1,5 @@
 :plain
-  $("#tree-holder table").hide("slide", { direction: "left" }, 150, function(){ 
+  $("#tree-holder table").hide("slide", { direction: "left" }, 150, function(){
     $("#tree-holder").html("#{escape_javascript(render(:partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree}))}");
     $("#tree-holder table").show("slide", { direction: "right" }, 150);
   });

app/views/projects/wall.html.haml

@@ -20,7 +20,7 @@
   %hr
 = render "notes/notes"
 
-:javascript 
+:javascript
   $(function(){
     $("#note_note").live("click", function(){
       $(this).css("height", "100px");

app/views/projects/wall.js.haml

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