From be89a25c5cf159964f0d55099386781061c4eeaa Mon Sep 17 00:00:00 2001
From: AntonioTerceiro <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Mon, 28 Jan 2008 12:55:02 +0000
Subject: [PATCH] ActionItem154: moving a shared template to the right place

---
 app/views/layouts/application.rhtml |  2 +-
 app/views/layouts/user_menu.rhtml   | 38 --------------------------------------
 app/views/shared/user_menu.rhtml    | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 app/views/layouts/user_menu.rhtml
 create mode 100644 app/views/shared/user_menu.rhtml

diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index 421e1ce..a68d2c3 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -75,7 +75,7 @@
         </script>
 
         <div id='user_box'>
-          <%= render :file => 'layouts/user_menu' %>
+          <%= render :file => 'shared/user_menu' %>
           <%=
           lightbox_link_to '<span class="icon-menu-search"></span>'+ _('Search'),
                            { :controller => 'search', :action => 'popup' }, :id => 'open_search'
diff --git a/app/views/layouts/user_menu.rhtml b/app/views/layouts/user_menu.rhtml
deleted file mode 100644
index 51a72b2..0000000
--- a/app/views/layouts/user_menu.rhtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<div id="user_menu" class="top_extra_menu">
-
-<% if logged_in? %>
-  <%=
-  link_to_homepage '<img src="' + (
-      (current_user.person.image)? current_user.person.image.public_filename(:icon) : "/images/icons-bar/photo.png"
-    ) +
-    '" alt="'+ current_user.login() +' Icon-Photo" title="" height="20" border="0"/>'+
-    current_user.login, current_user.login, :id=>'link_go_home', :class => 'user_menu_first_link'
-  %>
-  <ul>
-    <li><a href="#"><span class="icon-menu-blog"></span> Meu Blog</a></li>
-    <%=
-      '<li>'+ link_to_myprofile( '<span class="icon-menu-ctrl-panel"></span>'+ _('control panel'),
-                                 {}, nil, :id => 'link_edit_profile' ) +'</li>'+
-      '<li>'+ lightbox_link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'),
-                                { :controller => 'account', :action => 'logout_popup'}, :id => 'link_logout' ) +'</li>'
-    %>
-    <%=
-      '<li>'+ link_to( '<span class="icon-menu-"></span>'+ _('Admin'),
-                       { :controller => 'admin_panel' }, :id => 'link_admin_panel' ) +
-      '</li>' if current_user.person.is_admin?
-    %>
-    <li><%= link_to( '<span class="icon-menu-"></span>'+_('Edit Profile'),
-                     :controller => 'profile_editor', :action => 'edit' ) %></li>
-    <li><%= link_to( '<span class="icon-menu-"></span>'+_('Consumed Products'),
-                     :controller => 'consumed_products' ) %></li>
-  </ul>
-
-<% else %>
-
-<%= lightbox_link_to '<span class="icon-menu-login"></span>'+ _('Login'),
-                     { :controller => 'account', :action => 'login_popup' },
-                     :id => 'link_login', :class => 'user_menu_first_link' %>
-
-<% end %>
-
-</div><!-- fim id="user_menu" -->
diff --git a/app/views/shared/user_menu.rhtml b/app/views/shared/user_menu.rhtml
new file mode 100644
index 0000000..51a72b2
--- /dev/null
+++ b/app/views/shared/user_menu.rhtml
@@ -0,0 +1,38 @@
+<div id="user_menu" class="top_extra_menu">
+
+<% if logged_in? %>
+  <%=
+  link_to_homepage '<img src="' + (
+      (current_user.person.image)? current_user.person.image.public_filename(:icon) : "/images/icons-bar/photo.png"
+    ) +
+    '" alt="'+ current_user.login() +' Icon-Photo" title="" height="20" border="0"/>'+
+    current_user.login, current_user.login, :id=>'link_go_home', :class => 'user_menu_first_link'
+  %>
+  <ul>
+    <li><a href="#"><span class="icon-menu-blog"></span> Meu Blog</a></li>
+    <%=
+      '<li>'+ link_to_myprofile( '<span class="icon-menu-ctrl-panel"></span>'+ _('control panel'),
+                                 {}, nil, :id => 'link_edit_profile' ) +'</li>'+
+      '<li>'+ lightbox_link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'),
+                                { :controller => 'account', :action => 'logout_popup'}, :id => 'link_logout' ) +'</li>'
+    %>
+    <%=
+      '<li>'+ link_to( '<span class="icon-menu-"></span>'+ _('Admin'),
+                       { :controller => 'admin_panel' }, :id => 'link_admin_panel' ) +
+      '</li>' if current_user.person.is_admin?
+    %>
+    <li><%= link_to( '<span class="icon-menu-"></span>'+_('Edit Profile'),
+                     :controller => 'profile_editor', :action => 'edit' ) %></li>
+    <li><%= link_to( '<span class="icon-menu-"></span>'+_('Consumed Products'),
+                     :controller => 'consumed_products' ) %></li>
+  </ul>
+
+<% else %>
+
+<%= lightbox_link_to '<span class="icon-menu-login"></span>'+ _('Login'),
+                     { :controller => 'account', :action => 'login_popup' },
+                     :id => 'link_login', :class => 'user_menu_first_link' %>
+
+<% end %>
+
+</div><!-- fim id="user_menu" -->
--
libgit2 0.21.2