Download as
Browse Code »

Commit b0370b850671ed87bb57b31678977c10989eb07a

Authored by AntonioTerceiro
1 parent 4984c776
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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 <div class="search-index"> 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 &nbsp; 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 </div> 5 </div>
6 <br style='clear:both'/> 6 <br style='clear:both'/>
app/views/search/_search_form.rhtml
  Diff comments   View file @b0370b8
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
6 :method => 'get', :class => 'search_form' ) do %> 6 :method => 'get', :class => 'search_form' ) do %>
7 <%= '<h3>%s</h3>' % form_title if defined? form_title %> 7 <%= '<h3>%s</h3>' % form_title if defined? form_title %>
8 8
  9 + <%= hidden_field_tag :display, params[:display] %>
  10 +
9 <div class="search-field"> 11 <div class="search-field">
10 <span class="formfield"> 12 <span class="formfield">
11 <%= text_field_tag 'query', @query, :id => ( lightbox? ? 'popup-search-input' : '' ), :size => 50 %> 13 <%= text_field_tag 'query', @query, :id => ( lightbox? ? 'popup-search-input' : '' ), :size => 50 %>
app/views/search/people.rhtml
  Diff comments   View file @b0370b8
1 <% if @query.blank? %> 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 <%= render :partial => 'directory' %> 10 <%= render :partial => 'directory' %>
4 <% else %> 11 <% else %>
5 <h1> <%= @asset_name %>: <%= h(@category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query)) %> </h1> 12 <h1> <%= @asset_name %>: <%= h(@category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query)) %> </h1>
6 <div style='text-align: center'> 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 </div> 15 </div>
9 <% end %> 16 <% end %>
10 17
po/pt_BR/noosfero.po
  Diff comments   View file @b0370b8
@@ -10,7 +10,7 @@ msgid &quot;&quot; @@ -10,7 +10,7 @@ msgid &quot;&quot;
10 msgstr "" 10 msgstr ""
11 "Project-Id-Version: noosfero 0.10.0\n" 11 "Project-Id-Version: noosfero 0.10.0\n"
12 "POT-Creation-Date: 2008-06-07 13:47-0300\n" 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 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n" 14 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
15 "Language-Team: \n" 15 "Language-Team: \n"
16 "MIME-Version: 1.0\n" 16 "MIME-Version: 1.0\n"
@@ -2635,7 +2635,7 @@ msgstr &quot;Navegar por nome&quot; @@ -2635,7 +2635,7 @@ msgstr &quot;Navegar por nome&quot;
2635 2635
2636 #: app/views/search/_directory.rhtml:2 2636 #: app/views/search/_directory.rhtml:2
2637 msgid "Recent" 2637 msgid "Recent"
2638 -msgstr "Recente" 2638 +msgstr "Recentes"
2639 2639
2640 #: app/views/search/_display_results.rhtml:18 2640 #: app/views/search/_display_results.rhtml:18
2641 msgid "(more ...)" 2641 msgid "(more ...)"