Download as
Browse Code »

Commit 76644e68973fe6a859c699abb1cea0fd48d5faaf

Authored by AurelioAHeckert
1 parent a89eb6d5
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

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
  Diff comments   View file @76644e6
... ... @@ -4,8 +4,9 @@
4 4  
5 5 <% @consumptions.each do |consumption| %>
6 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 10 <% end %>
10 11  
11 12 <%= link_to_myprofile(_('Back'), {}, @profile.identifier)%>
... ...
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @76644e6
1 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 22 <h2><%= @page.title %></h2>
4 23  
5 24 <% if logged_in? && current_user.person.has_permission?('post_content', profile) %>
... ...
app/views/layouts/application.rhtml
  Diff comments   View file @76644e6
... ... @@ -140,10 +140,15 @@
140 140 </div><!-- id="wrap" -->
141 141  
142 142 <div id="footer">
  143 + Um projeto do FBES <br/>
  144 + F&oacute;rum Brasileiro de Economia Solid&aacute;ria
  145 + <p/>
143 146 <%= language_chooser %>
144   -
145   - <!-- <a name='footer'/></a> -->
  147 + <p/>
146 148 <%= footer %>
  149 + <p/>
  150 + Desenvolvimento Colivre <br/>
  151 + Cooperativa de Tecnologias Livres
147 152 </div><!-- id="footer" -->
148 153  
149 154 <div id="helpBox" style="display:none">
... ...
app/views/search/_article.rhtml
  Diff comments   View file @76644e6
1 1 <li>
2   - <strong><%= link_to(article.title, article.url) %></strong>
  2 +<% if hit %>
  3 + <strong><%= link_to(hit.title, hit.url) %></strong>
3 4 <div class="item_meta">
4   - <% if article.last_changed_by %>
  5 + <% if hit.last_changed_by %>
5 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 8 </span>
8 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 11 </div>
  12 +<% else %>
  13 + Problem to show this hit (_article.rhtml)
  14 +<% end %>
11 15 </li>
... ...
app/views/search/_display_results.rhtml
  Diff comments   View file @76644e6
... ... @@ -6,7 +6,7 @@
6 6 <% end %>
7 7 <ul>
8 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 10 <% end %>
11 11 </ul>
12 12 </div>
... ...
app/views/shared/user_menu.rhtml
  Diff comments   View file @76644e6
... ... @@ -34,8 +34,8 @@
34 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 39 :id => 'link_logout',
40 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 41 ) %></li>
... ...
config/web2.0.yml.dist 0 → 100644
  Diff comments   View file @76644e6
... ... @@ -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
  Diff comments   View file @76644e6
... ... @@ -0,0 +1,15 @@
  1 +
  2 +.main-block form {
  3 + border: 2px solid #3465A4;
  4 + padding: 10px 5px 10px 20px;
  5 + background: #B8CFE7;
  6 +}
  7 +
  8 +.main-block label {
  9 + font-weight: bold;
  10 +}
  11 +
  12 +.main-block small {
  13 + color: #3465A4;
  14 +}
  15 +
... ...
public/images/bt-bookmark.gif 0 → 100644
View file @76644e6

1.26 KB
public/images/logo-anhetegua-200x50.png 0 → 100644
View file @76644e6

7.06 KB
public/stylesheets/common.css
  Diff comments   View file @76644e6
... ... @@ -310,6 +310,17 @@ div.auto-complete li.selected {
310 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 324 /* pending tasks list */
314 325  
315 326 div.pending-tasks {
... ...