Download as
Browse Code »

Commit 314971692efe76087f30b188dba84908d398feb8

Authored by Leandro Santos
1 parent d678e143
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

fixing wrong merge conflit resolution

Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
app/views/layouts/_user.html.erb
  Diff comments   View file @3149716
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 <% end %> 19 <% end %>
20 20
21 </span> 21 </span>
  22 + <% end %>
22 <form action="/search/articles" id="top-search" class="search_form clean" method="get"> 23 <form action="/search/articles" id="top-search" class="search_form clean" method="get">
23 <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" /> 24 <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
24 <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div> 25 <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>