jro_apps/redmine Commit - r31:6a0022d7a146

redmine/app/controllers/admin_controller.rb +3 -1

             								@params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
+                render :action => "projects", :layout => false if request.xhr?
               end
               def mail_options

redmine/app/controllers/auth_sources_controller.rb +2 -1

               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               def list
                 @auth_source_pages, @auth_sources = paginate :auth_sources, :per_page => 10
+                render :action => "list", :layout => false if request.xhr?
               end
               def new

redmine/app/controllers/custom_fields_controller.rb +3 -2

               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               def list
                 @custom_field_pages, @custom_fields = paginate :custom_fields, :per_page => 15
+                render :action => "list", :layout => false if request.xhr?
               end
               def new

redmine/app/controllers/issue_statuses_controller.rb +3 -2

               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               def list
                 @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 10
+                render :action => "list", :layout => false if request.xhr?
               end
               def new

redmine/app/controllers/projects_controller.rb +9 -4

               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               # Lists public projects
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => ["is_public=?", true],
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
+                render :action => "list", :layout => false if request.xhr?
               end
               # Add a new project
                 sort_update
                 search_filter_init_list_issues
-                search_filter_update if params[:set_filter] or request.post?
+                search_filter_update if params[:set_filter]
                 @issue_count = Issue.count(:include => [:status, :project], :conditions => search_filter_clause)
                 @issue_pages = Paginator.new self, @issue_count, 15, @params['page']
             						:include => [ :author, :status, :tracker, :project ],
             						:conditions => search_filter_clause,
             						:limit  =>  @issue_pages.items_per_page,
             						:offset =>  @issue_pages.current.offset
+                render :action => "list_issues", :layout => false if request.xhr?
               end
               # Export filtered/sorted issues list to CSV
               # Show news list of @project
               def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
+                render :action => "list_news", :layout => false if request.xhr?
               end
               def add_file

redmine/app/controllers/roles_controller.rb +3 -2

               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               def list
                 @role_pages, @roles = paginate :roles, :per_page => 10
+                render :action => "list", :layout => false if request.xhr?
               end
               def new

redmine/app/controllers/trackers_controller.rb +3 -2

               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :list }
               def list
                 @tracker_pages, @trackers = paginate :trackers, :per_page => 10
+                render :action => "list", :layout => false if request.xhr?
               end
               def new

redmine/app/controllers/users_controller.rb +4 -2

               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               def list
             								@params['page']
                 @users =  User.find :all,:order => sort_clause,
             						:limit  =>  @user_pages.items_per_page,
             						:offset =>  @user_pages.current.offset
+                render :action => "list", :layout => false if request.xhr?
               end
               def add

redmine/app/helpers/application_helper.rb +14 -4

@@ -59,10 +59,20 module ApplicationHelper
59	end	59	end
60		60
61	def pagination_links_full(paginator, options={}, html_options={})	61	def pagination_links_full(paginator, options={}, html_options={})
62	html =''	62	html = ''
63	html << link_to(('« ' + l(:label_previous) ), { :page => paginator.current.previous }) + ' ' if paginator.current.previous	63	html << link_to_remote(('« ' + l(:label_previous)),
64	html << (pagination_links(paginator, options, html_options) \|\| '')	64	{:update => "content", :url => { :page => paginator.current.previous }},
65	html << ' ' + link_to((l(:label_next) + ' »'), { :page => paginator.current.next }) if paginator.current.next	65	{:href => url_for(:action => 'list', :params => @params.merge({:page => paginator.current.previous}))}) + ' ' if paginator.current.previous
		66
		67	html << (pagination_links_each(paginator, options) do \|n\|
		68	link_to_remote(n.to_s,
		69	{:url => {:action => 'list', :params => @params.merge({:page => n})}, :update => 'content'},
		70	{:href => url_for(:action => 'list', :params => @params.merge({:page => n}))})
		71	end \|\| '')
		72
		73	html << ' ' + link_to_remote((l(:label_next) + ' »'),
		74	{:update => "content", :url => { :page => paginator.current.next }},
		75	{:href => url_for(:action => 'list', :params => @params.merge({:page => paginator.current.next}))}) if paginator.current.next
66	html	76	html
67	end	77	end
68		78

redmine/app/helpers/sort_helper.rb +4 -1

                 end
                 caption = titleize(Inflector::humanize(column)) unless caption
                 params = {:params => {:sort_key => column, :sort_order => order}}
-                link_to(caption, params) + (icon ? nbsp(2) + image_tag(icon) : '')
+                link_to_remote(caption,
+                              {:update => "content", :url => { :sort_key => column, :sort_order => order}},
+                              {:href => url_for(:params => { :sort_key => column, :sort_order => order})}) +
+                (icon ? nbsp(2) + image_tag(icon) : '')
               end
               # Returns a table header <th> tag with a sort link for the named column

redmine/app/views/auth_sources/list.rhtml +5 -5

             <table class="listTableContent">
               <tr class="ListHead">
-              <td><%=l(:field_name)%></td>
+            	  <th><%=l(:field_name)%></th>
-              <td><%=l(:field_type)%></td>
+            	  <th><%=l(:field_type)%></th>
-              <td><%=l(:field_host)%></td>
+            	  <th><%=l(:field_host)%></th>
-              <td></td>
+            	  <th></th>
-              <td></td>
+            	  <th></th>
               </tr>
             <% for source in @auth_sources %>

redmine/app/views/projects/list_issues.rhtml +7 -7

                 <td><small><%=l(:field_fixed_version)%>:</small><br /><%= search_filter_tag 'fixed_version_id', :class => 'select-small' %></td>
                 <td><small><%=l(:field_assigned_to)%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>
                 <td><small><%=l(:label_subproject_plural)%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>
                 <td valign="bottom">
+                  <%= hidden_field_tag 'set_filter', 1 %>
                   <%= submit_tag l(:button_apply), :class => 'button-small' %>
-                  <%= end_form_tag %>
-                  <%= start_form_tag %>
-                  <%= submit_tag l(:button_clear), :class => 'button-small' %>
-                  <%= end_form_tag %>
                 </td>
-              </tr>
+                <td valign="bottom">
+                  <%= link_to l(:button_clear), :action => 'list_issues', :id => @project, :set_filter => 1 %>
+                </td>
+              </tr>
             </table>
+            <%= end_form_tag %>
              &nbsp;
             <%= start_form_tag ({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) %>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages