From 78c05ad67b0e55b065a27b070ca5218d1b03417a Mon Sep 17 00:00:00 2001
From: AurelioAHeckert <AurelioAHeckert@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Sat, 21 Jun 2008 04:16:01 +0000
Subject: [PATCH] ActionItem440: lista embelezada de produtos do empreendimento

---
 app/helpers/application_helper.rb                               | 11 +++++++++++
 app/views/catalog/index.rhtml                                   | 34 ++++++++++++++++++++++------------
 app/views/catalog/show.rhtml                                    | 38 +++++++++++++++-----------------------
 app/views/content_viewer/_comment.rhtml                         | 11 +----------
 public/designs/themes/ecosol/stylesheets/controller_catalog.css | 19 +++++++++++++++++++
 public/designs/themes/zen3/stylesheets/controller_catalog.css   | 19 +++++++++++++++++++
 public/images/icons-app/product-default-pic-portrait.png        | Bin 0 -> 5278 bytes
 public/images/icons-app/product-default-pic-thumb.png           | Bin 0 -> 9604 bytes
 public/stylesheets/controller_catalog.css                       | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 168 insertions(+), 45 deletions(-)
 create mode 100644 public/designs/themes/ecosol/stylesheets/controller_catalog.css
 create mode 100644 public/designs/themes/zen3/stylesheets/controller_catalog.css
 create mode 100644 public/images/icons-app/product-default-pic-portrait.png
 create mode 100644 public/images/icons-app/product-default-pic-thumb.png
 create mode 100644 public/stylesheets/controller_catalog.css

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4268d24..9ef764e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -621,4 +621,15 @@ module ApplicationHelper
     end
   end
 
+  def txt2html(txt)
+    txt.
+      gsub( /\n\s*\n/, ' <p/> ' ).
+      gsub( /\n/, ' <br/> ' ).
+      gsub( /(^|\s)(www\.[^\s])/, '\1http://\2' ).
+      gsub( /(https?:\/\/([^\s]+))/,
+            '<a href="\1" target="_blank" rel="nofolow" onclick="return confirm(\'' +
+            escape_javascript( _('Are you sure you want to visit this web site?') ) +
+            '\n\n\'+this.href)">\2</a>' )
+  end
+
 end
diff --git a/app/views/catalog/index.rhtml b/app/views/catalog/index.rhtml
index 0a795a3..2311a0a 100644
--- a/app/views/catalog/index.rhtml
+++ b/app/views/catalog/index.rhtml
@@ -1,15 +1,25 @@
 <h1> <%= _('%s:Products/Services') % @profile.name %> </h1>
 
-<table align='center'>
-  <tr>
-    <th colspan="2"><%= _('Product/Service') %></th>
-    <th><%= _('Price') %></th>
-  </tr>
-<% @products.each do |p| %>
-  <tr>
-    <td> <%= image_tag p.image.public_filename if p.image %> </td>
-    <td> <%= link_to p.name, :action => 'show', :id => p %> </td>
-    <td> <%= p.price || content_tag('em', _('not informed'))  %> </th>
-  </tr>
+<ul id="product_list">
+<% @products.each do |product| %>
+  <li class="product">
+    <%= link_to_product product, :class => 'product-pic', :style => 'background-image:url(%s)' %
+          ( product.image ? product.image.public_filename(:portrait) : '/images/icons-app/product-default-pic-portrait.png' ) %>
+    <h3>
+      <%= link_to_product product %>
+    </h3> 
+    <ul>
+      <li class="product_price"> <%= _('Price: %s') % ( product.price ? "%.2f" % product.price : content_tag('em', _('not informed')) ) %> </li>
+      <li class="product_category"> <%= link_to_category(product.product_category) %> </li>
+    </ul>
+    <% if product.description %>
+    <div class="description">
+      <%= txt2html product.description %>
+    <div>
+    <% else %>
+    <br style="clear:both" />
+    <% end %>
+  </li>
 <% end %>
-</table>
+<ul>
+
diff --git a/app/views/catalog/show.rhtml b/app/views/catalog/show.rhtml
index d568c18..a5b662c 100644
--- a/app/views/catalog/show.rhtml
+++ b/app/views/catalog/show.rhtml
@@ -1,31 +1,23 @@
+<div id="show_product">
+
 <h1> <%= @product.name %> </h1>
 
-<table>
-  <tr>
-    <td>
-      <%= image_tag @product.image.public_filename, :style => 'float: left;' if @product.image %>
-    </td>
-    <td>
-      <%= @product.description %>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">
-      <ul>
-        <li>
-        <strong><%= _('Price:') %></strong>
-        <%= @product.price || _('not informed') %>
-        </li>
-        <li>
-        <%= _('Category: %s ') % link_to_category(@product.product_category) %> <br/>
-        </li>
-      </ul>
-    </td>
-  </tr>
-</table>
+<%= image_tag @product.image.public_filename, :class => 'product-pic' if @product.image %>
+
+<div class="product_description">
+<%= txt2html @product.description  if @product.description %>
+</div>
 
+<p class="product_price">
+<%= _('Price: %s') % ( @product.price ? "<strong>%.2f</strong>" % @product.price : content_tag('em', _('not informed')) ) %>
+</p>
 
+<p class="product_category">
+<%= _('Category: %s ') % link_to_category(@product.product_category) %>
+</p>
 
 <% button_bar do %>
   <%= button :back, _("%s's products/services listing") % profile.name, :action => 'index', :id => nil %>
 <% end %>
+
+</div>
diff --git a/app/views/content_viewer/_comment.rhtml b/app/views/content_viewer/_comment.rhtml
index e59a8e4..bd5b6c2 100644
--- a/app/views/content_viewer/_comment.rhtml
+++ b/app/views/content_viewer/_comment.rhtml
@@ -28,15 +28,6 @@
   </div>
   <div class="comment-text">
     <p/>
-    <%=
-      comment.body.
-              gsub( /\n\s*\n/, ' <p/> ' ).
-              gsub( /\n/, ' <br/> ' ).
-              gsub( /(^|\s)(www\.[^\s])/, '\1http://\2' ).
-              gsub( /(https?:\/\/([^\s]+))/,
-                    '<a href="\1" target="_blank" rel="nofolow" onclick="return confirm(\'' +
-                    escape_javascript( _('Are you sure you want to visit this web site?') ) +
-                    '\n\n\'+this.href)">\2</a>' )
-    %>
+    <%= txt2html comment.body %>
   </div>
 </div>
diff --git a/public/designs/themes/ecosol/stylesheets/controller_catalog.css b/public/designs/themes/ecosol/stylesheets/controller_catalog.css
new file mode 100644
index 0000000..d3d3867
--- /dev/null
+++ b/public/designs/themes/ecosol/stylesheets/controller_catalog.css
@@ -0,0 +1,19 @@
+
+/* * * List Products * * * * * * * * * * * * */
+
+#content #product_list li {
+  list-style-image: none;
+}
+
+#content #product_list li.product {
+  border: none;
+  background: #B8CFE7;
+  -moz-border-radius: 15px;
+}
+
+/* * * Show Product * * * * * * * * * * * * */
+
+#show_product .product-pic {
+  border: 1px solid #027;
+}
+
diff --git a/public/designs/themes/zen3/stylesheets/controller_catalog.css b/public/designs/themes/zen3/stylesheets/controller_catalog.css
new file mode 100644
index 0000000..3195ffd
--- /dev/null
+++ b/public/designs/themes/zen3/stylesheets/controller_catalog.css
@@ -0,0 +1,19 @@
+
+/* * * List Products * * * * * * * * * * * * */
+
+#content #product_list li {
+  list-style-image: none;
+}
+
+#content #product_list li.product {
+  border: none;
+  background: #FFE890;
+  -moz-border-radius: 15px;
+}
+
+/* * * Show Product * * * * * * * * * * * * */
+
+#show_product .product-pic {
+  border: 1px solid #930;
+}
+
diff --git a/public/images/icons-app/product-default-pic-portrait.png b/public/images/icons-app/product-default-pic-portrait.png
new file mode 100644
index 0000000..dce11fe
Binary files /dev/null and b/public/images/icons-app/product-default-pic-portrait.png differ
diff --git a/public/images/icons-app/product-default-pic-thumb.png b/public/images/icons-app/product-default-pic-thumb.png
new file mode 100644
index 0000000..217ad3c
Binary files /dev/null and b/public/images/icons-app/product-default-pic-thumb.png differ
diff --git a/public/stylesheets/controller_catalog.css b/public/stylesheets/controller_catalog.css
new file mode 100644
index 0000000..0985b18
--- /dev/null
+++ b/public/stylesheets/controller_catalog.css
@@ -0,0 +1,81 @@
+
+/* * * List Products * * * * * * * * * * * * */
+
+#product_list {
+  margin: 0px;
+  padding: 0px;
+}
+
+#product_list ul {
+  margin: 0px;
+  padding: 0px;
+}
+
+#content #product_list li {
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+}
+
+#content #product_list li.product {
+  border: 1px solid #888;
+  margin-bottom: 10px;
+  padding: 5px 10px;
+}
+
+#product_list .product-pic {
+  display: block;
+  width: 64px;
+  height: 64px;
+  background-repeat: no-repeat;
+  background-position: 50% 50%;
+  float: left;
+  margin-right: 15px;
+  position: relative; /* work arround msie bug */
+}
+
+#product_list .product-pic span {
+  display: none;
+}
+
+#content #product_list h3 {
+  margin: 0px;
+  padding: 0px;
+  font-size: 120%;
+}
+.msie #content #product_list h3 {
+  margin-top: -15px;
+}
+#product_list h3 a {
+  text-decoration: none;
+}
+
+#product_list .product_category {
+  font-size: 11px;
+}
+
+#product_list .description {
+  clear: left;
+  font-size: 11px;
+  text-align: justify;
+  padding: 5px 10px 0px 10px;
+}
+.msie #product_list .description {
+  padding: 5px 10px 10px 10px;
+}
+
+/* * * Show Product * * * * * * * * * * * * */
+
+#show_product .product-pic {
+  float: left;
+  margin-right: 15px;
+  border: 1px solid #444;
+  padding: 2px;
+  background: #FFF;
+}
+
+#show_product .product_category {
+  padding-top: 10px;
+  clear: left;
+}
+
--
libgit2 0.21.2