Download as
Browse Code »

Commit b0370b850671ed87bb57b31678977c10989eb07a

Authored by AntonioTerceiro
1 parent 4984c776
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem265: finishing touches in map stuff 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1930 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 15 additions and 6 deletions   Show diff stats
app/views/search/_directory.rhtml
  Diff comments   View file @b0370b8
1 1 <div class="search-index">
2   - <%= link_to_unless_current(_('Recent'), :action => 'assets') %>
  2 + <%= link_to_unless(params[:initial].blank?, _('Recent'), :action => 'assets', :display => params[:display]) %>
3 3 &nbsp;
4   - <%= (?a..?z).map { |initial| link_to_unless_current(('' << initial).upcase, :action => 'directory', :asset => @asset, :initial => ('' << initial)) }.join(' &nbsp; ') %>
  4 + <%= (?a..?z).map { |initial| link_to_unless(params[:initial] == ('' << initial), ('' << initial).upcase, :action => 'directory', :asset => @asset, :initial => ('' << initial), :display => params[:display]) }.join(' &nbsp; ') %>
5 5 </div>
6 6 <br style='clear:both'/>
... ...
app/views/search/_search_form.rhtml
  Diff comments   View file @b0370b8
... ... @@ -6,6 +6,8 @@
6 6 :method => 'get', :class => 'search_form' ) do %>
7 7 <%= '<h3>%s</h3>' % form_title if defined? form_title %>
8 8  
  9 + <%= hidden_field_tag :display, params[:display] %>
  10 +
9 11 <div class="search-field">
10 12 <span class="formfield">
11 13 <%= text_field_tag 'query', @query, :id => ( lightbox? ? 'popup-search-input' : '' ), :size => 50 %>
... ...
app/views/search/people.rhtml
  Diff comments   View file @b0370b8
1 1 <% if @query.blank? %>
2   - <h1><%= @asset_name %></h1>
  2 + <h1>
  3 + <%= @asset_name %>
  4 + <% if params[:initial] %>
  5 + <%= '(%s)' % params[:initial].upcase %>
  6 + <% else %>
  7 + <%= _('(recently added)') %>
  8 + <% end %>
  9 + </h1>
3 10 <%= render :partial => 'directory' %>
4 11 <% else %>
5 12 <h1> <%= @asset_name %>: <%= h(@category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query)) %> </h1>
6 13 <div style='text-align: center'>
7   - <%= link_to _('Browse by name'), :action => 'index', :asset => 'people' %>
  14 + <%= link_to _('Browse by name'), :action => 'assets', :asset => @results.first.first %>
8 15 </div>
9 16 <% end %>
10 17  
... ...
po/pt_BR/noosfero.po
  Diff comments   View file @b0370b8
... ... @@ -10,7 +10,7 @@ msgid &quot;&quot;
10 10 msgstr ""
11 11 "Project-Id-Version: noosfero 0.10.0\n"
12 12 "POT-Creation-Date: 2008-06-07 13:47-0300\n"
13   -"PO-Revision-Date: 2008-06-07 13:47-0300\n"
  13 +"PO-Revision-Date: 2008-06-07 18:36-0300\n"
14 14 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
15 15 "Language-Team: \n"
16 16 "MIME-Version: 1.0\n"
... ... @@ -2635,7 +2635,7 @@ msgstr &quot;Navegar por nome&quot;
2635 2635  
2636 2636 #: app/views/search/_directory.rhtml:2
2637 2637 msgid "Recent"
2638   -msgstr "Recente"
  2638 +msgstr "Recentes"
2639 2639  
2640 2640 #: app/views/search/_display_results.rhtml:18
2641 2641 msgid "(more ...)"
... ...