From 7944081e73cc0b78d03e96077d252d5a4da3bd1c Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Fri, 6 Mar 2015 16:00:24 -0300
Subject: [PATCH] corrigindo bugs do tema

---
 content_menu.html.erb |  2 +-
 header.html.erb       | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/content_menu.html.erb b/content_menu.html.erb
index ffb8993..c5bc8cc 100644
--- a/content_menu.html.erb
+++ b/content_menu.html.erb
@@ -7,7 +7,7 @@
   <li>
     <% article = @article || @page %>
     <% parent_id = ((article && article.allow_children?) ? article : nil) %>
-    <%= colorbox_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %>
+    <%= modal_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %>
   </li>
 </ul>
 
diff --git a/header.html.erb b/header.html.erb
index ad0c43c..a555ad0 100644
--- a/header.html.erb
+++ b/header.html.erb
@@ -33,17 +33,17 @@
 
   <div id="header-left">
     <div id="logo">
-      <%= link_to(image_tag("/designs/themes/participa2-theme/images/medium-logo.png"), environment.top_url) %>
+      <%= link_to(image_tag("/designs/themes/participa-web/images/medium-logo.png"), environment.top_url) %>
     </div>
   </div><!-- #header-left -->
 
   <div id="header-right">
     <div id="header-right-1">
 
-      <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-forum.png") + "<span class='tile-title'>" + _('CONTENT') + "</span>", {:controller => 'search', :action => 'contents', :filter => 'more_recent'}, :class => 'tile tile-forum') %>
-      <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-groups.png") + "<span class='tile-title'>" + _('GROUPS') + "</span>", {:controller => 'search', :action => 'communities', :filter => 'more_active'}, :class => 'tile tile-groups') %>
-      <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-info.png") + "<span class='tile-title'>" + _('ABOUT US') + "</span>", {:profile => 'save-organic-food'}, :class => 'tile tile-info') %>
-      <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-members.png") + "<span class='tile-title'>" + _('MEMBERS') + "</span>", {:controller => 'search', :action => 'people', :filter => 'more_recent'}, :class => 'tile tile-users')%>
+      <%= link_to(image_tag("/designs/themes/participa-web/images/tile-forum.png") + "<span class='tile-title'>" + _('CONTENT') + "</span>", {:controller => 'search', :action => 'contents', :filter => 'more_recent'}, :class => 'tile tile-forum') %>
+      <%= link_to(image_tag("/designs/themes/participa-web/images/tile-groups.png") + "<span class='tile-title'>" + _('GROUPS') + "</span>", {:controller => 'search', :action => 'communities', :filter => 'more_active'}, :class => 'tile tile-groups') %>
+      <%= link_to(image_tag("/designs/themes/participa-web/images/tile-info.png") + "<span class='tile-title'>" + _('ABOUT US') + "</span>", {:profile => 'save-organic-food'}, :class => 'tile tile-info') %>
+      <%= link_to(image_tag("/designs/themes/participa-web/images/tile-members.png") + "<span class='tile-title'>" + _('MEMBERS') + "</span>", {:controller => 'search', :action => 'people', :filter => 'more_recent'}, :class => 'tile tile-users')%>
     </div><!-- #header-right-1 -->
 
     <div id="header-right-2">
@@ -62,10 +62,10 @@
             </span>
         <% else %>
           <span class='not-logged-in'>
-            <div class="tile-avatar"> <%= image_tag("/designs/themes/participa2-theme/images/avatar.gif") %></div>
+            <div class="tile-avatar"> <%= image_tag("/designs/themes/participa-web/images/avatar.gif") %></div>
             <div class="tile-username"><%= _('Hello') %> <br/><%= _('Guest') %> </div>
             <span class='tile-title'>
-              <%= thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
+              <%= modal_inline_link_to('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
               <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
               <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
                 <span> <%= _('or') %> </span>
@@ -84,8 +84,8 @@
 
       <div class="header-right-2-bottom">
         <% if logged_in? %>
-          <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-activities.png") + "<span class='tile-title'>" + _('ACTIVITY') + "</span>", {:controller => 'profile', :profile => current_person.identifier, :anchor => 'profile-network'}, :class => 'tile tile-activities') %>
-          <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-blog.png") + "<span class='tile-title'>" + _('BLOG') + "</span>", {:controller => 'profile', :profile => current_person.identifier}, :class => 'tile tile-blog') %>
+          <%= link_to(image_tag("/designs/themes/participa-web/images/tile-activities.png") + "<span class='tile-title'>" + _('ACTIVITY') + "</span>", {:controller => 'profile', :profile => current_person.identifier, :anchor => 'profile-network'}, :class => 'tile tile-activities') %>
+          <%= link_to(image_tag("/designs/themes/participa-web/images/tile-blog.png") + "<span class='tile-title'>" + _('BLOG') + "</span>", {:controller => 'profile', :profile => current_person.identifier}, :class => 'tile tile-blog') %>
         <% end %>
       </div><!-- .header-right-2-bottom -->
     </div><!-- .header-right-2 -->
--
libgit2 0.21.2