annotate .svn/pristine/96/96404659ec418cc105ea9a468be16d3044c14ca3.svn-base @ 1074:b98e55985cb7 luisf

Merge

<div id="block_<%= block_name.dasherize %>" class="mypage-box">

    <div style="float:right;margin-right:16px;z-index:500;">
    <%= link_to_remote "", {
        :url => { :action => "remove_block", :block => block_name },
        :complete => "removeBlock('block_#{block_name.dasherize}')" },
        :class => "close-icon"
         %>
    </div>

    <div class="handle">
    <%= render :partial => "my/blocks/#{block_name}", :locals => { :user => user } %>
    </div>
</div>