comparison app/views/my/.svn/text-base/page_layout.rhtml.svn-base @ 514:7eba09d624db live

Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents 07fa8a8b56a8
children
comparison
equal deleted inserted replaced
512:b9aebdd7dd40 514:7eba09d624db
34 //]]> 34 //]]>
35 </script> 35 </script>
36 36
37 <div class="contextual"> 37 <div class="contextual">
38 <% form_tag({:action => "add_block"}, :id => "block-form") do %> 38 <% form_tag({:action => "add_block"}, :id => "block-form") do %>
39 <%= label_tag('block-select', l(:label_my_page_block)) %> 39 <%= label_tag('block-select', l(:label_my_page_block)) %>:
40 <%= select_tag 'block', "<option></option>" + options_for_select(@block_options), :id => "block-select" %> 40 <%= select_tag 'block', "<option></option>" + options_for_select(@block_options), :id => "block-select" %>
41 <%= link_to_remote l(:button_add), 41 <%= link_to_remote l(:button_add),
42 {:url => { :action => "add_block" }, 42 {:url => { :action => "add_block" },
43 :with => "Form.serialize('block-form')", 43 :with => "Form.serialize('block-form')",
44 :update => "list-top", 44 :update => "list-top",