app/views/spree/admin/promotions/edit.html.erb in spree_promo-1.2.5 vs app/views/spree/admin/promotions/edit.html.erb in spree_promo-1.3.0.rc1

- old
+ new

@@ -1,12 +1,28 @@ -<h1><%= t(:editing_promotion) %></h1> +<% content_for :page_title do %> + <%= t(:editing_promotion) %> +<% end %> +<% content_for :page_actions do %> + <li> + <%= button_link_to t(:back_to_promotions_list), admin_promotions_path, :icon => 'icon-arrow-left' %> + </li> +<% end %> + <%= form_for @promotion, :url => object_url, :method => :put do |f| %> - <%= render :partial => 'form', :locals => { :f => f } %> - <%= render :partial => 'spree/admin/shared/edit_resource_links' %> + <fieldset class="no-border-top"> + <%= render :partial => 'form', :locals => { :f => f } %> + <%= render :partial => 'spree/admin/shared/edit_resource_links' %> + </fieldset> <% end %> -<%= render :partial => 'rules' %> +<div id="promotion-filters" class="row"> + <div id="rules_container" class="alpha eight columns"> + <%= render :partial => 'rules' %> + </div> -<div id="actions_container"> - <%= render :partial => 'actions' %> + <div id="actions_container" class="omega eight columns"> + <%= render :partial => 'actions' %> + </div> </div> + +<%= render :partial => "spree/admin/variants/autocomplete", :formats => [:js] %>