Download as
Browse Code »

Commit e987e18ea5f65f593ad6ed862d9af6e80165e16a

Authored by Luciano Prestes
1 parent 946f97e5
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

Update design of software catalog

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