diff --git a/plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb b/plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb index ca4a856..731a446 100644 --- a/plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb +++ b/plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb @@ -118,7 +118,7 @@ class ShoppingCartPluginProfileController < ProfileController session[:cart][:visibility] = true render :text => { :ok => true, - :message => _('Cart displayed.'), + :message => _('Basket displayed.'), :error => {:code => 0} }.to_json rescue Exception => exception @@ -137,7 +137,7 @@ class ShoppingCartPluginProfileController < ProfileController session[:cart][:visibility] = false render :text => { :ok => true, - :message => _('Cart Hidden.'), + :message => _('Basket hidden.'), :error => {:code => 0} }.to_json rescue Exception => exception @@ -173,7 +173,7 @@ class ShoppingCartPluginProfileController < ProfileController :ok => false, :error => { :code => 2, - :message => _("There is no cart.") + :message => _("There is no basket.") } }.to_json return false @@ -203,7 +203,7 @@ class ShoppingCartPluginProfileController < ProfileController :ok => false, :error => { :code => 4, - :message => _("The cart doesn't have this product.") + :message => _("The basket doesn't have this product.") } }.to_json return false diff --git a/plugins/shopping_cart/lib/shopping_cart_plugin.rb b/plugins/shopping_cart/lib/shopping_cart_plugin.rb index 0230a1b..31b529a 100644 --- a/plugins/shopping_cart/lib/shopping_cart_plugin.rb +++ b/plugins/shopping_cart/lib/shopping_cart_plugin.rb @@ -4,17 +4,17 @@ require_dependency 'ext/person' class ShoppingCartPlugin < Noosfero::Plugin def self.plugin_name - "Shopping Cart" + "Shopping Basket" end def self.plugin_description - _("A shopping cart feature for enterprises") + _("A shopping basket feature for enterprises") end def add_to_cart_button(item, enterprise = context.profile) if enterprise.shopping_cart && item.available lambda { - link_to(_('Add to cart'), "add:#{item.name}", + link_to(_('Add to basket'), "add:#{item.name}", :class => 'cart-add-item', :onclick => "Cart.addItem('#{enterprise.identifier}', #{item.id}, this); return false" ) @@ -40,10 +40,10 @@ class ShoppingCartPlugin < Noosfero::Plugin def control_panel_buttons buttons = [] if context.profile.enterprise? - buttons << { :title => 'Shopping cart', :icon => 'shopping_cart_icon', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'edit'} } + buttons << { :title => _('Shopping basket'), :icon => 'shopping-cart-icon', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'edit'} } end if context.profile.enterprise? && context.profile.shopping_cart - buttons << { :title => 'Purchase reports', :icon => 'shopping-cart-purchase-report', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'reports'} } + buttons << { :title => _('Purchase reports'), :icon => 'shopping-cart-purchase-report', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'reports'} } end buttons diff --git a/plugins/shopping_cart/public/style.css b/plugins/shopping_cart/public/style.css index 43fddef..03e5912 100644 --- a/plugins/shopping_cart/public/style.css +++ b/plugins/shopping_cart/public/style.css @@ -1,9 +1,15 @@ @import url(colorbox/colorbox.css); -.cart-add-item { - position: absolute; - right: 5px; - top: 5px; +.cart-add-item .ui-icon-cart { + background: url("images/button-icon.png") no-repeat scroll left center transparent; + width: 22px; + } + .cart-buy .ui-icon-cart { + background: url("images/button-icon.png") no-repeat scroll left center transparent; + width: 22px; + } +.cart-add-item .ui-button-text { + padding-left: 2.6em; } .product-item .cart-add-item { @@ -179,8 +185,8 @@ label.error { .controller-profile_editor a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.png)} .controller-profile_editor .msie6 a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.gif)} -.controller-profile_editor a.control-panel-shopping-cart {background-image: url(/images/control-panel/shopping-cart.png)} -.controller-profile_editor .msie6 a.control-panel-shopping-cart {background-image: url(/images/control-panel/shopping-cart.gif)} +.controller-profile_editor a.control-panel-shopping-cart-icon {background-image: url(images/control-panel/icon.png)} +.controller-profile_editor .msie6 a.control-panel-shopping-cart-icon {background-image: url(images/control-panel/icon.gif)} .action-shopping_cart_plugin_myprofile-reports td.order-info { padding: 0px; diff --git a/plugins/shopping_cart/views/cart.html.erb b/plugins/shopping_cart/views/cart.html.erb index 52dad69..18eef10 100644 --- a/plugins/shopping_cart/views/cart.html.erb +++ b/plugins/shopping_cart/views/cart.html.erb @@ -1,17 +1,17 @@
diff --git a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb index 7c3f7e3..f7d88e6 100644 --- a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb +++ b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb @@ -1,4 +1,4 @@ -