Update design of software catalog

Luciano Prestes
1 parent 946f97e5
Showing 5 changed files with 29 additions and 20 deletions Show diff stats
lib/ext/search_controller.rb
po/pt/software_communities.po
views/search/_catalog_filter.html.erb
views/search/_software_search_form.html.erb
views/search/software_infos.html.erb
@@ -114,7 +114,7 @@ class SearchController
   end
  
   def prepare_software_infos_params
-    @titles[:software_infos] = _("Public Software Catalog")
+    @titles[:software_infos] = _("Result Search")
     @selected_categories_id = params[:selected_categories_id]
     @selected_categories_id ||= []
     @selected_categories_id = @selected_categories_id.map(&:to_i)
@@ -408,15 +408,15 @@ msgstr &quot;Categorias&quot;
  
 #: plugins/software_communities/views/search/_catalog_filter.html.erb:33
 msgid "Clean up"
-msgstr "Limpe formulário"
+msgstr "Limpar"
  
 #: plugins/software_communities/views/search/_catalog_filter.html.erb:34
 msgid "Close"
-msgstr "Feche"
+msgstr "Fechar"
  
 #: plugins/software_communities/views/search/_catalog_filter.html.erb:37
-msgid "All Software Projects:"
-msgstr "Todos os Projetos de Software"
+msgid "Software Projects:"
+msgstr "Projetos de Software:"
  
 #: plugins/software_communities/views/search/_catalog_filter.html.erb:40
 msgid "Include in results"
@@ -29,16 +29,19 @@
             <br />
           </div>
         </div>
+
+      <div class="project-software"> <%= _("Software Projects:") %>
+        <label>
+          <%= check_box_tag("include_non_public", true, @include_non_public) %>
+          <%= _("Include in results") %>
+        </label>
+        <span class"doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">(?)</span>
+      </div>
+
       <br />
+
       <%= button_tag _("Clean up"), :id => "cleanup-filter-catalg", :type => "button" %>
       <%= button_tag _("Close"), :id => "close-filter-catalog", :type => "button" %>
     </div>
  
-  <div class="project-software"> <%= _("All Software Projects:") %>
-    <label>
-      <%= check_box_tag("include_non_public", true, @include_non_public) %>
-      <%= _("Include in results") %>
-    </label>
-    <span class"doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">(?)</span>
-  </div>
 </div>
 <div class='search-form'>
+  <h3> <%= _("Search Public Software Catalog") %> </h3>
+
   <%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.path : nil ) },
                  :method => 'get', :class => 'search_form' ) do %>
  
@@ -17,6 +19,8 @@
     <%= render :partial => 'search_form_extra_fields' %>
     <%= render :partial => 'catalog_filter' %>
  
+    <br />
+
     <div id="catalog-display-options">
       <div id="catalog-display-options-count">
         <strong id="software-count"><%= "#{@software_count} Software(s)" %></strong>
+<h2>Catálogo de Software Público</h2>
+
 <div id="software-search-container">
   <%= search_page_title( @titles[@asset], @category ) %>
  
   <%= render :partial => 'software_search_form', :locals => { :hint => _("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
  
-  <%= render partial:"catalog_result_list" %>
-
-  <div id="software-pagination">
-    <% if params[:display] != 'map' %>
-      <%= pagination_links @searches[@asset][:results] %>
-    <% end %>
-  </div>
-
   <div style="clear: both"></div>
  
   <% if @asset == :product %>
@@ -18,4 +12,12 @@
       jQuery('.search-product-price-details').altBeautify();
     <% end %>
   <% end %>
+</div>
+
+<%= render partial:"catalog_result_list" %>
+
+<div id="software-pagination">
+  <% if params[:display] != 'map' %>
+    <%= pagination_links @searches[@asset][:results] %>
+  <% end %>
 </div>
 \ No newline at end of file
...	...	@@ -114,7 +114,7 @@ class SearchController
114	114	end
115	115
116	116	def prepare_software_infos_params
117		- @titles[:software_infos] = _("Public Software Catalog")
	117	+ @titles[:software_infos] = _("Result Search")
118	118	@selected_categories_id = params[:selected_categories_id]
119	119	@selected_categories_id \|\|= []
120	120	@selected_categories_id = @selected_categories_id.map(&:to_i)
...	...
...	...	@@ -408,15 +408,15 @@ msgstr "Categorias"
408	408
409	409	#: plugins/software_communities/views/search/_catalog_filter.html.erb:33
410	410	msgid "Clean up"
411		-msgstr "Limpe formulário"
	411	+msgstr "Limpar"
412	412
413	413	#: plugins/software_communities/views/search/_catalog_filter.html.erb:34
414	414	msgid "Close"
415		-msgstr "Feche"
	415	+msgstr "Fechar"
416	416
417	417	#: plugins/software_communities/views/search/_catalog_filter.html.erb:37
418		-msgid "All Software Projects:"
419		-msgstr "Todos os Projetos de Software"
	418	+msgid "Software Projects:"
	419	+msgstr "Projetos de Software:"
420	420
421	421	#: plugins/software_communities/views/search/_catalog_filter.html.erb:40
422	422	msgid "Include in results"
...	...
...	...	@@ -29,16 +29,19 @@
29	29	<br />
30	30	</div>
31	31	</div>
	32	+
	33	+ <div class="project-software"> <%= _("Software Projects:") %>
	34	+ <label>
	35	+ <%= check_box_tag("include_non_public", true, @include_non_public) %>
	36	+ <%= _("Include in results") %>
	37	+ </label>
	38	+ <span class"doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">(?)</span>
	39	+ </div>
	40	+
32	41	<br />
	42	+
33	43	<%= button_tag _("Clean up"), :id => "cleanup-filter-catalg", :type => "button" %>
34	44	<%= button_tag _("Close"), :id => "close-filter-catalog", :type => "button" %>
35	45	</div>
36	46
37		- <div class="project-software"> <%= _("All Software Projects:") %>
38		- <label>
39		- <%= check_box_tag("include_non_public", true, @include_non_public) %>
40		- <%= _("Include in results") %>
41		- </label>
42		- <span class"doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">(?)</span>
43		- </div>
44	47	</div>
...	...
1	1	<div class='search-form'>
	2	+ <h3> <%= _("Search Public Software Catalog") %> </h3>
	3	+
2	4	<%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.path : nil ) },
3	5	:method => 'get', :class => 'search_form' ) do %>
4	6
...	...	@@ -17,6 +19,8 @@
17	19	<%= render :partial => 'search_form_extra_fields' %>
18	20	<%= render :partial => 'catalog_filter' %>
19	21
	22	+ <br />
	23	+
20	24	<div id="catalog-display-options">
21	25	<div id="catalog-display-options-count">
22	26	<strong id="software-count"><%= "#{@software_count} Software(s)" %></strong>
...	...
	1	+<h2>Catálogo de Software Público</h2>
	2	+
1	3	<div id="software-search-container">
2	4	<%= search_page_title( @titles[@asset], @category ) %>
3	5
4	6	<%= render :partial => 'software_search_form', :locals => { :hint => _("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
5	7
6		- <%= render partial:"catalog_result_list" %>
7		-
8		- <div id="software-pagination">
9		- <% if params[:display] != 'map' %>
10		- <%= pagination_links @searches[@asset][:results] %>
11		- <% end %>
12		- </div>
13		-
14	8	<div style="clear: both"></div>
15	9
16	10	<% if @asset == :product %>
...	...	@@ -18,4 +12,12 @@
18	12	jQuery('.search-product-price-details').altBeautify();
19	13	<% end %>
20	14	<% end %>
	15	+</div>
	16	+
	17	+<%= render partial:"catalog_result_list" %>
	18	+
	19	+<div id="software-pagination">
	20	+ <% if params[:display] != 'map' %>
	21	+ <%= pagination_links @searches[@asset][:results] %>
	22	+ <% end %>
21	23	</div>
22	24	\ No newline at end of file
...	...