From 76644e68973fe6a859c699abb1cea0fd48d5faaf Mon Sep 17 00:00:00 2001
From: AurelioAHeckert <AurelioAHeckert@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Fri, 11 Apr 2008 01:29:19 +0000
Subject: [PATCH] ActionItem291: bt adicionado, web2.0 conf criado e controller_account.css esquecido adicionado

---
 app/views/consumed_products/index.rhtml                          |  5 +++--
 app/views/content_viewer/view_page.rhtml                         | 19 +++++++++++++++++++
 app/views/layouts/application.rhtml                              |  9 +++++++--
 app/views/search/_article.rhtml                                  | 12 ++++++++----
 app/views/search/_display_results.rhtml                          |  2 +-
 app/views/shared/user_menu.rhtml                                 |  4 ++--
 config/web2.0.yml.dist                                           |  9 +++++++++
 public/designs/themes/default/stylesheets/controller_account.css | 15 +++++++++++++++
 public/images/bt-bookmark.gif                                    | Bin 0 -> 1287 bytes
 public/images/logo-anhetegua-200x50.png                          | Bin 0 -> 7233 bytes
 public/stylesheets/common.css                                    | 11 +++++++++++
 11 files changed, 75 insertions(+), 11 deletions(-)
 create mode 100644 config/web2.0.yml.dist
 create mode 100644 public/designs/themes/default/stylesheets/controller_account.css
 create mode 100644 public/images/bt-bookmark.gif
 create mode 100644 public/images/logo-anhetegua-200x50.png

diff --git a/app/views/consumed_products/index.rhtml b/app/views/consumed_products/index.rhtml
index b3bbe6e..eb3afc8 100644
--- a/app/views/consumed_products/index.rhtml
+++ b/app/views/consumed_products/index.rhtml
@@ -4,8 +4,9 @@
 
 <% @consumptions.each do |consumption| %>
   <p> <b> <%= link_to_category(consumption.product_category)  %> </b> </p> 
-  <%= link_to _('destroy'), :action => 'destroy', :id => consumption %> <br/>
-  <p> <%= consumption.aditional_specifications  %></p>
+  <%= link_to _('remove'), { :action => 'destroy', :id => consumption },
+              :confirm => _('Are you sure, you want to remove this product from your list') %>
+  <pre><%= consumption.aditional_specifications  %></pre>
 <% end %>
 
 <%=  link_to_myprofile(_('Back'), {}, @profile.identifier)%>
diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml
index 7610170..833f8f0 100644
--- a/app/views/content_viewer/view_page.rhtml
+++ b/app/views/content_viewer/view_page.rhtml
@@ -1,5 +1,24 @@
 <div class="article">
 
+<%
+  # AddThis Button
+  if block_given?
+    opts = YAML.load_file( RAILS_ROOT + '/config/web2.0.yml' )
+    if opts['addthis']
+      opts = opts['addthis']
+%>
+<script type="text/javascript">
+  addthis_brand = '<%= escape_javascript( @environment.name ) %>';
+<%=
+  str = ''
+  opts.each { |k, v|
+    str += '  addthis_'+ k +' = "'+ escape_javascript( v ) +"\";\n"
+  }
+  str
+%></script>
+<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>
+<% end; end %>
+
 <h2><%= @page.title %></h2>
 
 <% if logged_in?  && current_user.person.has_permission?('post_content', profile) %>
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index d78097e..fd792d2 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -140,10 +140,15 @@
     </div><!-- id="wrap" -->
 
     <div id="footer">
+      Um projeto do FBES <br/>
+      F&oacute;rum Brasileiro de Economia Solid&aacute;ria
+      <p/>
       <%= language_chooser %>
-
-      <!-- <a name='footer'/></a> -->
+      <p/>
       <%= footer %>
+      <p/>
+      Desenvolvimento Colivre <br/>
+      Cooperativa de Tecnologias Livres
     </div><!-- id="footer" -->
 
     <div id="helpBox" style="display:none">
diff --git a/app/views/search/_article.rhtml b/app/views/search/_article.rhtml
index 66bb950..848ca64 100644
--- a/app/views/search/_article.rhtml
+++ b/app/views/search/_article.rhtml
@@ -1,11 +1,15 @@
 <li>
-  <strong><%= link_to(article.title, article.url) %></strong>
+<% if hit %>
+  <strong><%= link_to(hit.title, hit.url) %></strong>
   <div class="item_meta">
-    <% if article.last_changed_by %>
+    <% if hit.last_changed_by %>
       <span class="cat_item_by">
-      <%= _('by %s') % link_to(article.last_changed_by.name, article.last_changed_by.url) %>
+      <%= _('by %s') % link_to(hit.last_changed_by.name, hit.last_changed_by.url) %>
       </span>
     <% end %>
-    <span class="cat_item_update"><%= _('Last update: %s.') % show_date(article.updated_on) %></span>
+    <span class="cat_item_update"><%= _('Last update: %s.') % show_date(hit.updated_on) %></span>
   </div>
+<% else %>
+  Problem to show this hit (_article.rhtml)
+<% end %>
 </li>
diff --git a/app/views/search/_display_results.rhtml b/app/views/search/_display_results.rhtml
index 2d7cec3..1eeafab 100644
--- a/app/views/search/_display_results.rhtml
+++ b/app/views/search/_display_results.rhtml
@@ -6,7 +6,7 @@
       <% end %>
       <ul>
       <% results.each do |hit| %>
-        <%= render :partial => partial_for_class(hit.class), :object => hit %>
+        <%= render :partial => partial_for_class(hit.class), :object => hit, :locals => { :hit => hit } %>
       <% end %>
       </ul>
     </div>
diff --git a/app/views/shared/user_menu.rhtml b/app/views/shared/user_menu.rhtml
index 4d4f27d..c860782 100644
--- a/app/views/shared/user_menu.rhtml
+++ b/app/views/shared/user_menu.rhtml
@@ -34,8 +34,8 @@
         '</li>' if user.is_admin?
       %>
 
-      <li><%= lightbox_link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'),
-                                { :controller => 'account', :action => 'logout_popup'},
+      <li><%= link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'),
+                                { :controller => 'account', :action => 'logout'},
                                 :id => 'link_logout',
                                 :help => _('This link takes you out of the system. You should logout if other people are willing to use the same computer after you.')
                               ) %></li>
diff --git a/config/web2.0.yml.dist b/config/web2.0.yml.dist
new file mode 100644
index 0000000..207aa2e
--- /dev/null
+++ b/config/web2.0.yml.dist
@@ -0,0 +1,9 @@
+# This file configures all Web 2.0 services used by this noosfero instalation
+
+# You can add (or remove) any addthis option here.
+# Know more: http://www.addthis.com/customization.php
+addthis:
+  pub: your-user-name
+  logo: http://localhost:3000/images/logo-200x50.png
+  options: favorites, email, digg, delicious, technorati, slashdot, twitter, more
+
diff --git a/public/designs/themes/default/stylesheets/controller_account.css b/public/designs/themes/default/stylesheets/controller_account.css
new file mode 100644
index 0000000..566aac5
--- /dev/null
+++ b/public/designs/themes/default/stylesheets/controller_account.css
@@ -0,0 +1,15 @@
+
+.main-block form {
+  border: 2px solid #3465A4;
+  padding: 10px 5px 10px 20px;
+  background: #B8CFE7;
+}
+
+.main-block label {
+  font-weight: bold;
+}
+
+.main-block small {
+  color: #3465A4;
+}
+
diff --git a/public/images/bt-bookmark.gif b/public/images/bt-bookmark.gif
new file mode 100644
index 0000000..f7e3ce8
Binary files /dev/null and b/public/images/bt-bookmark.gif differ
diff --git a/public/images/logo-anhetegua-200x50.png b/public/images/logo-anhetegua-200x50.png
new file mode 100644
index 0000000..fb7ca53
Binary files /dev/null and b/public/images/logo-anhetegua-200x50.png differ
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 68d326f..ea97a4d 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -310,6 +310,17 @@ div.auto-complete li.selected {
   color: #204A87;
 }
 
+/* addThis button */
+
+.bt_addthis {
+  float: right;
+  margin: 0px;
+}
+
+#addthis_dropdown15 table td {
+  border: none;
+}
+
 /* pending tasks list */
 
 div.pending-tasks {
--
libgit2 0.21.2