Commit 76644e68973fe6a859c699abb1cea0fd48d5faaf
1 parent
a89eb6d5
Exists in
staging
and in
42 other branches
ActionItem291: bt adicionado, web2.0 conf criado e controller_account.css esquecido adicionado
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1649 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
11 changed files
with
75 additions
and
11 deletions
Show diff stats
app/views/consumed_products/index.rhtml
| @@ -4,8 +4,9 @@ | @@ -4,8 +4,9 @@ | ||
| 4 | 4 | ||
| 5 | <% @consumptions.each do |consumption| %> | 5 | <% @consumptions.each do |consumption| %> |
| 6 | <p> <b> <%= link_to_category(consumption.product_category) %> </b> </p> | 6 | <p> <b> <%= link_to_category(consumption.product_category) %> </b> </p> |
| 7 | - <%= link_to _('destroy'), :action => 'destroy', :id => consumption %> <br/> | ||
| 8 | - <p> <%= consumption.aditional_specifications %></p> | 7 | + <%= link_to _('remove'), { :action => 'destroy', :id => consumption }, |
| 8 | + :confirm => _('Are you sure, you want to remove this product from your list') %> | ||
| 9 | + <pre><%= consumption.aditional_specifications %></pre> | ||
| 9 | <% end %> | 10 | <% end %> |
| 10 | 11 | ||
| 11 | <%= link_to_myprofile(_('Back'), {}, @profile.identifier)%> | 12 | <%= link_to_myprofile(_('Back'), {}, @profile.identifier)%> |
app/views/content_viewer/view_page.rhtml
| 1 | <div class="article"> | 1 | <div class="article"> |
| 2 | 2 | ||
| 3 | +<% | ||
| 4 | + # AddThis Button | ||
| 5 | + if block_given? | ||
| 6 | + opts = YAML.load_file( RAILS_ROOT + '/config/web2.0.yml' ) | ||
| 7 | + if opts['addthis'] | ||
| 8 | + opts = opts['addthis'] | ||
| 9 | +%> | ||
| 10 | +<script type="text/javascript"> | ||
| 11 | + addthis_brand = '<%= escape_javascript( @environment.name ) %>'; | ||
| 12 | +<%= | ||
| 13 | + str = '' | ||
| 14 | + opts.each { |k, v| | ||
| 15 | + str += ' addthis_'+ k +' = "'+ escape_javascript( v ) +"\";\n" | ||
| 16 | + } | ||
| 17 | + str | ||
| 18 | +%></script> | ||
| 19 | +<a href="http://www.addthis.com/bookmark.php" class="bt_addthis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]', '<%= escape_javascript( @environment.name()+' :: '+@page.title ) %>')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script> | ||
| 20 | +<% end; end %> | ||
| 21 | + | ||
| 3 | <h2><%= @page.title %></h2> | 22 | <h2><%= @page.title %></h2> |
| 4 | 23 | ||
| 5 | <% if logged_in? && current_user.person.has_permission?('post_content', profile) %> | 24 | <% if logged_in? && current_user.person.has_permission?('post_content', profile) %> |
app/views/layouts/application.rhtml
| @@ -140,10 +140,15 @@ | @@ -140,10 +140,15 @@ | ||
| 140 | </div><!-- id="wrap" --> | 140 | </div><!-- id="wrap" --> |
| 141 | 141 | ||
| 142 | <div id="footer"> | 142 | <div id="footer"> |
| 143 | + Um projeto do FBES <br/> | ||
| 144 | + Fórum Brasileiro de Economia Solidária | ||
| 145 | + <p/> | ||
| 143 | <%= language_chooser %> | 146 | <%= language_chooser %> |
| 144 | - | ||
| 145 | - <!-- <a name='footer'/></a> --> | 147 | + <p/> |
| 146 | <%= footer %> | 148 | <%= footer %> |
| 149 | + <p/> | ||
| 150 | + Desenvolvimento Colivre <br/> | ||
| 151 | + Cooperativa de Tecnologias Livres | ||
| 147 | </div><!-- id="footer" --> | 152 | </div><!-- id="footer" --> |
| 148 | 153 | ||
| 149 | <div id="helpBox" style="display:none"> | 154 | <div id="helpBox" style="display:none"> |
app/views/search/_article.rhtml
| 1 | <li> | 1 | <li> |
| 2 | - <strong><%= link_to(article.title, article.url) %></strong> | 2 | +<% if hit %> |
| 3 | + <strong><%= link_to(hit.title, hit.url) %></strong> | ||
| 3 | <div class="item_meta"> | 4 | <div class="item_meta"> |
| 4 | - <% if article.last_changed_by %> | 5 | + <% if hit.last_changed_by %> |
| 5 | <span class="cat_item_by"> | 6 | <span class="cat_item_by"> |
| 6 | - <%= _('by %s') % link_to(article.last_changed_by.name, article.last_changed_by.url) %> | 7 | + <%= _('by %s') % link_to(hit.last_changed_by.name, hit.last_changed_by.url) %> |
| 7 | </span> | 8 | </span> |
| 8 | <% end %> | 9 | <% end %> |
| 9 | - <span class="cat_item_update"><%= _('Last update: %s.') % show_date(article.updated_on) %></span> | 10 | + <span class="cat_item_update"><%= _('Last update: %s.') % show_date(hit.updated_on) %></span> |
| 10 | </div> | 11 | </div> |
| 12 | +<% else %> | ||
| 13 | + Problem to show this hit (_article.rhtml) | ||
| 14 | +<% end %> | ||
| 11 | </li> | 15 | </li> |
app/views/search/_display_results.rhtml
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | <% end %> | 6 | <% end %> |
| 7 | <ul> | 7 | <ul> |
| 8 | <% results.each do |hit| %> | 8 | <% results.each do |hit| %> |
| 9 | - <%= render :partial => partial_for_class(hit.class), :object => hit %> | 9 | + <%= render :partial => partial_for_class(hit.class), :object => hit, :locals => { :hit => hit } %> |
| 10 | <% end %> | 10 | <% end %> |
| 11 | </ul> | 11 | </ul> |
| 12 | </div> | 12 | </div> |
app/views/shared/user_menu.rhtml
| @@ -34,8 +34,8 @@ | @@ -34,8 +34,8 @@ | ||
| 34 | '</li>' if user.is_admin? | 34 | '</li>' if user.is_admin? |
| 35 | %> | 35 | %> |
| 36 | 36 | ||
| 37 | - <li><%= lightbox_link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'), | ||
| 38 | - { :controller => 'account', :action => 'logout_popup'}, | 37 | + <li><%= link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'), |
| 38 | + { :controller => 'account', :action => 'logout'}, | ||
| 39 | :id => 'link_logout', | 39 | :id => 'link_logout', |
| 40 | :help => _('This link takes you out of the system. You should logout if other people are willing to use the same computer after you.') | 40 | :help => _('This link takes you out of the system. You should logout if other people are willing to use the same computer after you.') |
| 41 | ) %></li> | 41 | ) %></li> |
| @@ -0,0 +1,9 @@ | @@ -0,0 +1,9 @@ | ||
| 1 | +# This file configures all Web 2.0 services used by this noosfero instalation | ||
| 2 | + | ||
| 3 | +# You can add (or remove) any addthis option here. | ||
| 4 | +# Know more: http://www.addthis.com/customization.php | ||
| 5 | +addthis: | ||
| 6 | + pub: your-user-name | ||
| 7 | + logo: http://localhost:3000/images/logo-200x50.png | ||
| 8 | + options: favorites, email, digg, delicious, technorati, slashdot, twitter, more | ||
| 9 | + |
public/designs/themes/default/stylesheets/controller_account.css
0 → 100644
1.26 KB
7.06 KB
public/stylesheets/common.css
| @@ -310,6 +310,17 @@ div.auto-complete li.selected { | @@ -310,6 +310,17 @@ div.auto-complete li.selected { | ||
| 310 | color: #204A87; | 310 | color: #204A87; |
| 311 | } | 311 | } |
| 312 | 312 | ||
| 313 | +/* addThis button */ | ||
| 314 | + | ||
| 315 | +.bt_addthis { | ||
| 316 | + float: right; | ||
| 317 | + margin: 0px; | ||
| 318 | +} | ||
| 319 | + | ||
| 320 | +#addthis_dropdown15 table td { | ||
| 321 | + border: none; | ||
| 322 | +} | ||
| 323 | + | ||
| 313 | /* pending tasks list */ | 324 | /* pending tasks list */ |
| 314 | 325 | ||
| 315 | div.pending-tasks { | 326 | div.pending-tasks { |