changeset 1512:96ca535049b3 cannam

Merge from branch "live"

--- a/app/controllers/projects_controller.rb	Fri Mar 21 13:37:39 2014 +0000
+++ b/app/controllers/projects_controller.rb	Fri Mar 21 14:17:45 2014 +0000
@@ -58,7 +58,7 @@
         @project_pages = Paginator.new self, @project_count, @limit, params['page']
         @offset ||= @project_pages.current.offset
         @projects = Project.visible_roots.all(:offset => @offset, :limit => @limit, :order => sort_clause)
-        render :template => 'projects/index.html.erb', :layout => !request.xhr?
+        render :template => 'projects/index', :layout => !request.xhr?
 
 ## Redmine 2.2:
 #        scope = Project
@@ -85,7 +85,7 @@
     respond_to do |format|
       format.html {
         @projects = Project.visible
-        render :template => 'projects/explore.html.erb', :layout => !request.xhr?
+        render :template => 'projects/explore', :layout => !request.xhr?
       }
     end
   end

--- a/app/views/projects/explore.html.erb	Fri Mar 21 13:37:39 2014 +0000
+++ b/app/views/projects/explore.html.erb	Fri Mar 21 14:17:45 2014 +0000
@@ -37,6 +37,16 @@
   <% end %>
 </div>
 
+<div class="threecolumnright">
+  <% cache(:action => 'explore', :action_suffix => 'busy_projects') do %>
+  <div class="projects box">
+  <h3><%=l(:label_projects_busy)%></h3>
+    <%= render :partial => 'activities/busy' %>
+    <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }, :class => 'more' %>
+  </div>
+  <% end %>
+</div>
+
 <div class="threecolumnmid">
   <% cache(:action => 'explore', :action_suffix => 'mature_projects') do %>
   <div class="projects box">
@@ -47,14 +57,4 @@
   <% end %>
 </div>
 
-<div class="threecolumnright">
-  <% cache(:action => 'explore', :action_suffix => 'busy_projects') do %>
-  <div class="projects box">
-  <h3><%=l(:label_projects_busy)%></h3>
-    <%= render :partial => 'activities/busy' %>
-    <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }, :class => 'more' %>
-  </div>
-  <% end %>
-</div>
-
 <% html_title(l(:label_explore_projects)) -%>

--- a/app/views/projects/show.html.erb	Fri Mar 21 13:37:39 2014 +0000
+++ b/app/views/projects/show.html.erb	Fri Mar 21 14:17:45 2014 +0000
@@ -133,4 +133,4 @@
 <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
 
-<% html_title(l(:label_overview)) -%>
+<% html_title('') -%>

--- a/plugins/redmine_bibliography/app/views/projects/show.html.erb	Fri Mar 21 13:37:39 2014 +0000
+++ b/plugins/redmine_bibliography/app/views/projects/show.html.erb	Fri Mar 21 14:17:45 2014 +0000
@@ -139,4 +139,4 @@
 <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
 
-<% html_title(l(:label_overview)) -%>
+<% html_title('') -%>

--- a/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Fri Mar 21 13:37:39 2014 +0000
+++ b/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Fri Mar 21 14:17:45 2014 +0000
@@ -77,7 +77,7 @@
               # todo: check ordering ~luisf.14/Jan/2013
               @projects = @projects[@offset, @limit]
 
-              render :template => 'projects/index.html.erb', :layout => !request.xhr?
+              render :template => 'projects/index', :layout => !request.xhr?
             }
             format.api {
               @offset, @limit = api_offset_and_limit