Download as
Browse Code »

Commit 7944081e73cc0b78d03e96077d252d5a4da3bd1c

Authored by Leandro Santos
1 parent 6a32ce7f
Exists in master and in 3 other branches production, staging, working

corrigindo bugs do tema

Showing 2 changed files with 10 additions and 10 deletions   Show diff stats
content_menu.html.erb
  Diff comments   View file @7944081
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <li> 7 <li>
8 <% article = @article || @page %> 8 <% article = @article || @page %>
9 <% parent_id = ((article && article.allow_children?) ? article : nil) %> 9 <% parent_id = ((article && article.allow_children?) ? article : nil) %>
10 - <%= colorbox_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %> 10 + <%= modal_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %>
11 </li> 11 </li>
12 </ul> 12 </ul>
13 13
header.html.erb
  Diff comments   View file @7944081
@@ -33,17 +33,17 @@ @@ -33,17 +33,17 @@
33 33
34 <div id="header-left"> 34 <div id="header-left">
35 <div id="logo"> 35 <div id="logo">
36 - <%= link_to(image_tag("/designs/themes/participa2-theme/images/medium-logo.png"), environment.top_url) %> 36 + <%= link_to(image_tag("/designs/themes/participa-web/images/medium-logo.png"), environment.top_url) %>
37 </div> 37 </div>
38 </div><!-- #header-left --> 38 </div><!-- #header-left -->
39 39
40 <div id="header-right"> 40 <div id="header-right">
41 <div id="header-right-1"> 41 <div id="header-right-1">
42 42
43 - <%= 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') %>  
44 - <%= 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') %>  
45 - <%= 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') %>  
46 - <%= 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')%> 43 + <%= 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') %>
  44 + <%= 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') %>
  45 + <%= 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') %>
  46 + <%= 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')%>
47 </div><!-- #header-right-1 --> 47 </div><!-- #header-right-1 -->
48 48
49 <div id="header-right-2"> 49 <div id="header-right-2">
@@ -62,10 +62,10 @@ @@ -62,10 +62,10 @@
62 </span> 62 </span>
63 <% else %> 63 <% else %>
64 <span class='not-logged-in'> 64 <span class='not-logged-in'>
65 - <div class="tile-avatar"> <%= image_tag("/designs/themes/participa2-theme/images/avatar.gif") %></div> 65 + <div class="tile-avatar"> <%= image_tag("/designs/themes/participa-web/images/avatar.gif") %></div>
66 <div class="tile-username"><%= _('Hello') %> <br/><%= _('Guest') %> </div> 66 <div class="tile-username"><%= _('Hello') %> <br/><%= _('Guest') %> </div>
67 <span class='tile-title'> 67 <span class='tile-title'>
68 - <%= thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %> 68 + <%= modal_inline_link_to('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
69 <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %> 69 <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
70 <% unless @plugins.dispatch(:allow_user_registration).include?(false) %> 70 <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
71 <span> <%= _('or') %> </span> 71 <span> <%= _('or') %> </span>
@@ -84,8 +84,8 @@ @@ -84,8 +84,8 @@
84 84
85 <div class="header-right-2-bottom"> 85 <div class="header-right-2-bottom">
86 <% if logged_in? %> 86 <% if logged_in? %>
87 - <%= 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') %>  
88 - <%= 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') %> 87 + <%= 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') %>
  88 + <%= 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') %>
89 <% end %> 89 <% end %>
90 </div><!-- .header-right-2-bottom --> 90 </div><!-- .header-right-2-bottom -->
91 </div><!-- .header-right-2 --> 91 </div><!-- .header-right-2 -->