# HG changeset patch # User Chris Cannam # Date 1352491469 0 # Node ID 3e52bc15dd6747be051836ba3871f3c012b1470c # Parent 4ffe9098c16c93e0d9f86d1b3332e923e308cd70 Add browse page stub diff -r 4ffe9098c16c -r 3e52bc15dd67 app/controllers/projects_controller.rb --- a/app/controllers/projects_controller.rb Fri Nov 09 17:41:04 2012 +0000 +++ b/app/controllers/projects_controller.rb Fri Nov 09 20:04:29 2012 +0000 @@ -20,8 +20,8 @@ menu_item :roadmap, :only => :roadmap menu_item :settings, :only => :settings - before_filter :find_project, :except => [ :index, :list, :new, :create, :copy ] - before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy] + before_filter :find_project, :except => [ :index, :list, :browse, :new, :create, :copy ] + before_filter :authorize, :except => [ :index, :list, :browse, :new, :create, :copy, :archive, :unarchive, :destroy] before_filter :authorize_global, :only => [:new, :create] before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ] accept_rss_auth :index @@ -76,6 +76,16 @@ end end + # A different view of projects using browse boxes + def browse + respond_to do |format| + format.html { + @projects = Project.visible + render :template => 'projects/browse.html.erb', :layout => !request.xhr? + } + end + end + def new @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position") @trackers = Tracker.all diff -r 4ffe9098c16c -r 3e52bc15dd67 app/controllers/welcome_controller.rb --- a/app/controllers/welcome_controller.rb Fri Nov 09 17:41:04 2012 +0000 +++ b/app/controllers/welcome_controller.rb Fri Nov 09 20:04:29 2012 +0000 @@ -25,7 +25,6 @@ @site_project = Project.find_by_identifier "soundsoftware-site" @site_news = [] @site_news = News.latest_for @site_project if @site_project - @projects = Project.latest User.current # tests if user is logged in to generate the tips of the day list if User.current.logged? diff -r 4ffe9098c16c -r 3e52bc15dd67 app/views/projects/_latest.html.erb --- a/app/views/projects/_latest.html.erb Fri Nov 09 17:41:04 2012 +0000 +++ b/app/views/projects/_latest.html.erb Fri Nov 09 20:04:29 2012 +0000 @@ -1,6 +1,5 @@ diff -r 4ffe9098c16c -r 3e52bc15dd67 app/views/projects/browse.html.erb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/views/projects/browse.html.erb Fri Nov 09 20:04:29 2012 +0000 @@ -0,0 +1,22 @@ + +

<%= l(:label_browse) %>

+ +
+
+

<%=l(:label_project_latest)%>

+ <%= render :partial => 'projects/latest' %> + <%= link_to l(:label_projects_more), :controller => 'projects' %> +
+
+
+
+

<%=l(:label_project_tags_all)%>

+ <%= render :partial => 'projects/tagcloud' %> + <%= link_to l(:label_projects_more), :controller => 'projects' %> +
+
+

<%=l(:label_projects_busy)%>

+ <%= render :partial => 'activities/busy' %> + <%= link_to l(:label_projects_more), :controller => 'projects' %> +
+
diff -r 4ffe9098c16c -r 3e52bc15dd67 app/views/welcome/index.html.erb --- a/app/views/welcome/index.html.erb Fri Nov 09 17:41:04 2012 +0000 +++ b/app/views/welcome/index.html.erb Fri Nov 09 20:04:29 2012 +0000 @@ -20,7 +20,6 @@ <%= link_to l(:label_news_more), { :controller => 'projects', :action => @site_project.identifier, :id => 'news' } %> <% end %> - <% if @projects.any? %>

<%=l(:label_project_latest)%>

<%= render :partial => 'projects/latest' %> @@ -36,7 +35,6 @@ <%= render :partial => 'activities/busy' %> <%= link_to l(:label_projects_more), :controller => 'projects' %>
- <% end %> <%= call_hook(:view_welcome_index_right, :projects => @projects) %> diff -r 4ffe9098c16c -r 3e52bc15dd67 config/routes.rb --- a/config/routes.rb Fri Nov 09 17:41:04 2012 +0000 +++ b/config/routes.rb Fri Nov 09 20:04:29 2012 +0000 @@ -32,6 +32,8 @@ # TODO: wasteful since this is also nested under issues, projects, and projects/issues map.resources :time_entries, :controller => 'timelog' + map.connect 'browse', :controller => 'projects', :action => 'browse' + map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post} map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get} map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post}