Download as
Browse Code »

Commit 387be1fcc001579bf186d59abb5abe0c07f00a27

Authored by AntonioTerceiro
1 parent 544ee407
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

ActionItem0: minor changes 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@410 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
app/views/account/change_password.rhtml
  Diff comments   View file @387be1f
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 <% form_tag do %> 3 <% form_tag do %>
4 4
5 -<p><label for="password"><%= _('Current password') %>'</label><br/> 5 +<p><label for="password"><%= _('Current password') %></label><br/>
6 <%= password_field_tag :current_password %></p> 6 <%= password_field_tag :current_password %></p>
7 7
8 <p><label for="password"><%= _('New password') %></label><br/> 8 <p><label for="password"><%= _('New password') %></label><br/>
app/views/layouts/application.rhtml
  Diff comments   View file @387be1f
@@ -34,9 +34,11 @@ @@ -34,9 +34,11 @@
34 34
35 <div id='content'> 35 <div id='content'>
36 <!-- <a name='main_content'/></a> --> 36 <!-- <a name='main_content'/></a> -->
  37 + <!-- Aqui entra um conteudo tipo o titulo da pagina do usuário e os botoes do comatose? -->
  38 + <!--
37 <div id='header_content'> 39 <div id='header_content'>
38 - <!-- Aqui entra um conteudo tipo o titulo da pagina do usuário e os botoes do comatose? -->  
39 </div> 40 </div>
  41 + -->
40 <% if params[:controller] == 'cms' %> 42 <% if params[:controller] == 'cms' %>
41 <div id='boxes'> 43 <div id='boxes'>
42 <%= yield %> 44 <%= yield %>