Download as
Browse Code »

Commit be89a25c5cf159964f0d55099386781061c4eeaa

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

ActionItem154: moving a shared template to the right place 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1272 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 39 additions and 39 deletions   Show diff stats
app/views/layouts/application.rhtml
  Diff comments   View file @be89a25
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 </script> 75 </script>
76 76
77 <div id='user_box'> 77 <div id='user_box'>
78 - <%= render :file => 'layouts/user_menu' %> 78 + <%= render :file => 'shared/user_menu' %>
79 <%= 79 <%=
80 lightbox_link_to '<span class="icon-menu-search"></span>'+ _('Search'), 80 lightbox_link_to '<span class="icon-menu-search"></span>'+ _('Search'),
81 { :controller => 'search', :action => 'popup' }, :id => 'open_search' 81 { :controller => 'search', :action => 'popup' }, :id => 'open_search'
app/views/layouts/user_menu.rhtml
View file @f6d56ce
@@ -1,38 +0,0 @@ @@ -1,38 +0,0 @@
1 -<div id="user_menu" class="top_extra_menu">  
2 -  
3 -<% if logged_in? %>  
4 - <%=  
5 - link_to_homepage '<img src="' + (  
6 - (current_user.person.image)? current_user.person.image.public_filename(:icon) : "/images/icons-bar/photo.png"  
7 - ) +  
8 - '" alt="'+ current_user.login() +' Icon-Photo" title="" height="20" border="0"/>'+  
9 - current_user.login, current_user.login, :id=>'link_go_home', :class => 'user_menu_first_link'  
10 - %>  
11 - <ul>  
12 - <li><a href="#"><span class="icon-menu-blog"></span> Meu Blog</a></li>  
13 - <%=  
14 - '<li>'+ link_to_myprofile( '<span class="icon-menu-ctrl-panel"></span>'+ _('control panel'),  
15 - {}, nil, :id => 'link_edit_profile' ) +'</li>'+  
16 - '<li>'+ lightbox_link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'),  
17 - { :controller => 'account', :action => 'logout_popup'}, :id => 'link_logout' ) +'</li>'  
18 - %>  
19 - <%=  
20 - '<li>'+ link_to( '<span class="icon-menu-"></span>'+ _('Admin'),  
21 - { :controller => 'admin_panel' }, :id => 'link_admin_panel' ) +  
22 - '</li>' if current_user.person.is_admin?  
23 - %>  
24 - <li><%= link_to( '<span class="icon-menu-"></span>'+_('Edit Profile'),  
25 - :controller => 'profile_editor', :action => 'edit' ) %></li>  
26 - <li><%= link_to( '<span class="icon-menu-"></span>'+_('Consumed Products'),  
27 - :controller => 'consumed_products' ) %></li>  
28 - </ul>  
29 -  
30 -<% else %>  
31 -  
32 -<%= lightbox_link_to '<span class="icon-menu-login"></span>'+ _('Login'),  
33 - { :controller => 'account', :action => 'login_popup' },  
34 - :id => 'link_login', :class => 'user_menu_first_link' %>  
35 -  
36 -<% end %>  
37 -  
38 -</div><!-- fim id="user_menu" -->  
app/views/shared/user_menu.rhtml 0 → 100644
  Diff comments   View file @be89a25
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
  1 +<div id="user_menu" class="top_extra_menu">
  2 +
  3 +<% if logged_in? %>
  4 + <%=
  5 + link_to_homepage '<img src="' + (
  6 + (current_user.person.image)? current_user.person.image.public_filename(:icon) : "/images/icons-bar/photo.png"
  7 + ) +
  8 + '" alt="'+ current_user.login() +' Icon-Photo" title="" height="20" border="0"/>'+
  9 + current_user.login, current_user.login, :id=>'link_go_home', :class => 'user_menu_first_link'
  10 + %>
  11 + <ul>
  12 + <li><a href="#"><span class="icon-menu-blog"></span> Meu Blog</a></li>
  13 + <%=
  14 + '<li>'+ link_to_myprofile( '<span class="icon-menu-ctrl-panel"></span>'+ _('control panel'),
  15 + {}, nil, :id => 'link_edit_profile' ) +'</li>'+
  16 + '<li>'+ lightbox_link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'),
  17 + { :controller => 'account', :action => 'logout_popup'}, :id => 'link_logout' ) +'</li>'
  18 + %>
  19 + <%=
  20 + '<li>'+ link_to( '<span class="icon-menu-"></span>'+ _('Admin'),
  21 + { :controller => 'admin_panel' }, :id => 'link_admin_panel' ) +
  22 + '</li>' if current_user.person.is_admin?
  23 + %>
  24 + <li><%= link_to( '<span class="icon-menu-"></span>'+_('Edit Profile'),
  25 + :controller => 'profile_editor', :action => 'edit' ) %></li>
  26 + <li><%= link_to( '<span class="icon-menu-"></span>'+_('Consumed Products'),
  27 + :controller => 'consumed_products' ) %></li>
  28 + </ul>
  29 +
  30 +<% else %>
  31 +
  32 +<%= lightbox_link_to '<span class="icon-menu-login"></span>'+ _('Login'),
  33 + { :controller => 'account', :action => 'login_popup' },
  34 + :id => 'link_login', :class => 'user_menu_first_link' %>
  35 +
  36 +<% end %>
  37 +
  38 +</div><!-- fim id="user_menu" -->