[opensuse-buildservice] Double display of filter on monitor page (PATCH)
Hello, attached a little patch to remove the double displayed monitor filter. I also seperated the "Remove filter" from the text using []. () would be nicer, but [] is consistent with the rest of the build service. Ciao -- http://www.dstoecker.eu/ (PGP key available)
Am Dienstag, 13. Februar 2007 18:33 schrieb Dirk Stoecker:
attached a little patch to remove the double displayed monitor filter. I also seperated the "Remove filter" from the text using []. () would be nicer, but [] is consistent with the rest of the build service.
Applied (rev. 1227), thanks! -- David Mayr, http://davey.de openSUSE LINUX, http://opensuse.de --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On 2007-02-13 19:06:50 +0100, David Mayr wrote:
Am Dienstag, 13. Februar 2007 18:33 schrieb Dirk Stoecker:
attached a little patch to remove the double displayed monitor filter. I also seperated the "Remove filter" from the text using []. () would be nicer, but [] is consistent with the rest of the build service.
the project_filter display should be in the _building_table.rhtml as it can be changed. and the change should be reflected when you update the table from ajax. darix -- openSUSE - SUSE Linux is my linux openSUSE is good for you www.opensuse.org --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Tue, 13 Feb 2007, Marcus Rueckert wrote:
On 2007-02-13 19:06:50 +0100, David Mayr wrote:
Am Dienstag, 13. Februar 2007 18:33 schrieb Dirk Stoecker:
attached a little patch to remove the double displayed monitor filter. I also seperated the "Remove filter" from the text using []. () would be nicer, but [] is consistent with the rest of the build service.
the project_filter display should be in the _building_table.rhtml as it can be changed. and the change should be reflected when you update the table from ajax.
Would be this: Index: app/views/monitor/_building.rhtml =================================================================== --- app/views/monitor/_building.rhtml (Revision 1232) +++ app/views/monitor/_building.rhtml (Arbeitskopie) @@ -22,9 +22,6 @@ :with => "'project=' + escape(value)") %> </div> <p>You can filter the list in the monitor either by using the filter links in the table or by entering the project name in the editbox. In the editbox you can use partial project names.</p> -<% if @project_filter %> - <p class="info filtered_by">Currently active filter <b><%= h(@project_filter) %></b> [<%= link_to 'Remove Filter', :controller => 'monitor' %>]</p> -<% end %> <% if build_count > 0 %> <p class="info">Hover the job time field to see the start time.</p> <p class="info">Build Service reports <%= build_count %> running jobs.</p> Index: app/views/monitor/_building_table.rhtml =================================================================== --- app/views/monitor/_building_table.rhtml (Revision 1232) +++ app/views/monitor/_building_table.rhtml (Arbeitskopie) @@ -1,5 +1,9 @@ <div id="building_list"> +<% if @project_filter %> + <p class="info filtered_by">Currently active filter <b><%= h(@project_filter) %></b> [<%= link_to 'Remove Filter', :controller => 'monitor' %>]</p> +<% end %> + <table class="building"> <thead> <tr> Ciao -- http://www.dstoecker.eu/ (PGP key available) --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Moin Dirk, moin darix,
attached a little patch to remove the double displayed monitor filter. I also seperated the "Remove filter" from the text using []. () would be nicer, but [] is consistent with the rest of the build service.
the project_filter display should be in the _building_table.rhtml as it can be changed. and the change should be reflected when you update the table from ajax.
Would be this: [...patch...]
you're right darix. Sorry for my rashly commit. Thanks for the correction Dirk. I committed it in rev. 1233 ... -- David Mayr, http://davey.de openSUSE LINUX, http://opensuse.de --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
participants (3)
-
David Mayr -
Dirk Stoecker -
Marcus Rueckert