Download as
Browse Code »

Commit c8b8706fdb0d60e883aa421b943b2afe83442092

Authored by Leandro Santos
1 parent 1b8ae012
Exists in staging and in 7 other branches angular_poc, api-article-archived, api-homepage, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email

fixing merge bug

Showing 2 changed files with 0 additions and 50 deletions   Show diff stats
app/controllers/my_profile/profile_design_controller.rb
  Diff comments   View file @c8b8706
... ... @@ -9,7 +9,6 @@ class ProfileDesignController < BoxOrganizerController
9 9 def protect_fixed_block
10 10 block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
11 11 if !block.nil? && block.fixed && !current_person.is_admin?
12   -
13 12 render_access_denied
14 13 end
15 14 end
... ...
app/views/box_organizer/add_block.html.erb
View file @1b8ae01
... ... @@ -1,49 +0,0 @@
1   -<div id="add-block-dialog">
2   - <%= form_tag do %>
3   -
4   - <p><%= _('In what area do you want to put your new block?') %></p>
5   -
6   - <div id="box-position">
7   - <% @boxes.each do |box| %>
8   - <% name = box.central? ? _('Main area') : _('Area %d') % box.position %>
9   - <%= labelled_radio_button(name, :box_id, box.id, box.central?, { 'data-position' => box.position }) %>
10   - <% end %>
11   - </div>
12   -
13   - <script type="text/javascript">
14   - jQuery('#box-position input').bind('change',
15   - function () {
16   - showCenter = jQuery(this).attr('data-position') == '1';
17   - jQuery('#center-block-types').toggle(showCenter);
18   - jQuery('#side-block-types').toggle(!showCenter);
19   - }
20   - );
21   - </script>
22   -
23   - <p><%= _('Select the type of block you want to add to your page.') %></p>
24   -
25   - <div id="center-block-types" class="block-types">
26   - <% @center_block_types.each do |block| %>
27   - <div class='block-type'>
28   - <%= labelled_radio_button(block.description, :type, block.name) %>
29   - </div>
30   - <% end %>
31   - </div>
32   -
33   - <div id="side-block-types" class="block-types" style="display:none">
34   - <% @side_block_types.each do |block| %>
35   - <div class='block-type'>
36   - <%= labelled_radio_button(block.description, :type, block.name) %>
37   - </div>
38   - <% end %>
39   - </div>
40   -
41   - <br style='clear: both'/>
42   -
43   - <% button_bar do %>
44   - <%= submit_button(:add, _("Add")) %>
45   - <%= modal_close_button(_('Close')) %>
46   - <% end %>
47   -
48   - <% end %>
49   -</div>