Download as
Browse Code »

Commit 69df378d690b6aef535bbbf0522495bdc643f5a2

Authored by Rodrigo Souto
1 parent 405d15e1
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

Adding the cart namespace to a style selector of the cart plugin

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
plugins/shopping_cart/public/style.css
  Diff comments   View file @69df378
@@ -209,7 +209,7 @@ label.error { @@ -209,7 +209,7 @@ label.error {
209 padding-left: 5px; 209 padding-left: 5px;
210 } 210 }
211 211
212 -#order-filter { 212 +#cart-order-filter {
213 background-color: #ccc; 213 background-color: #ccc;
214 border: 1px solid #aaa; 214 border: 1px solid #aaa;
215 border-radius: 5px; 215 border-radius: 5px;
plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb
  Diff comments   View file @69df378
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <% status_collection = [[nil, _('All')]] %> 6 <% status_collection = [[nil, _('All')]] %>
7 <% status_collection += status.map{|s| [pos+=1, s] } %> 7 <% status_collection += status.map{|s| [pos+=1, s] } %>
8 8
9 -<% form_tag({}, {:id => 'order-filter'}) do %> 9 +<% form_tag({}, {:id => 'cart-order-filter'}) do %>
10 <%= labelled_text_field(_('From')+' ', :from, @from.strftime("%Y-%m-%d"), :id => 'from', :size => 9) %> 10 <%= labelled_text_field(_('From')+' ', :from, @from.strftime("%Y-%m-%d"), :id => 'from', :size => 9) %>
11 <%= labelled_text_field(_('to')+' ', :to, @to.strftime("%Y-%m-%d"), :id => 'to', :size => 9) %> 11 <%= labelled_text_field(_('to')+' ', :to, @to.strftime("%Y-%m-%d"), :id => 'to', :size => 9) %>
12 <span style="white-space:nowrap"><%= labelled_select(_('Status')+' ', :filter_status, :first, :last, @status, status_collection)%></span> 12 <span style="white-space:nowrap"><%= labelled_select(_('Status')+' ', :filter_status, :first, :last, @status, status_collection)%></span>