Download as
Browse Code »

Commit 371df2fb5f6c5a8dd8b4f3cd82955e0d2e4f5052

Authored by AurelioAHeckert
1 parent b026a547
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem440: manage_products embelezada 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2081 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 16 additions and 10 deletions   Show diff stats
app/views/manage_products/index.rhtml
  Diff comments   View file @371df2f
... ... @@ -18,7 +18,9 @@
18 18 <% end %>
19 19 </table>
20 20  
21   -<p> <%= link_to _('New product or service'), :action => 'new' %> </p>
  21 +<%= button :add, _('New product or service'), :action => 'new' %>
  22 +
  23 +<br /> &nbsp;
22 24  
23 25 <h3> <%=_('Listing raw materials') %> </h3>
24 26  
... ... @@ -42,6 +44,9 @@
42 44 <% end %>
43 45 </table>
44 46  
45   -<p> <%= link_to _('Add raw material'), :action => 'new_consumption' %> </p>
  47 +<%= button :add, _('Add raw material'), :action => 'new_consumption' %>
  48 +
  49 +<p>
  50 +<%= link_to_myprofile( '<span>'+ _('Back') +'</span>', {}, @profile.identifier, :class => 'button with-text icon-back' ) %>
  51 +</p>
46 52  
47   -<%= link_to_myprofile(_('Back'), {}, @profile.identifier) %>
... ...
app/views/manage_products/show.rhtml
  Diff comments   View file @371df2f
1 1 <h3> <%= @product.name %> </h3>
2 2  
3 3 <p> <%= image_tag @product.image.public_filename if @product.image %> </p>
4   -<p> <%= _('Price:') %> <%= @product.price %> </p>
5   -<p> <%= _('Description:') %> <%= @product.description %> </p>
6   -<p> <%= _('Category:') %> <%= link_to_category(@product.product_category) %> </p>
  4 +<p> <strong><%= _('Price:') %></strong> <%= @product.price %> </p>
  5 +<p> <strong><%= _('Description:') %></strong> <%= txt2html @product.description if @product.description %> </p>
  6 +<p> <strong><%= _('Category:') %></strong> <%= link_to_category(@product.product_category) %> </p>
  7 +
  8 +<%= button :back, _('back'), :action => 'index' %>
  9 +&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
  10 +<%= button :delete, _('destroy'), :action => 'destroy', :id => @product %>
  11 +<%= button :edit, _('edit'), :action => 'edit', :id => @product %>
7 12  
8   -<%= link_to _('edit'), :action => 'edit', :id => @product %>
9   -<%= link_to _('destroy'), :action => 'destroy', :id => @product %>
10   -<br/>
11   -<%= link_to _('back'), :action => 'index' %>
... ...