diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml index 3a7c690bf..a94ad57d6 100644 --- a/app/views/aspects/manage.html.haml +++ b/app/views/aspects/manage.html.haml @@ -51,7 +51,7 @@ %span.tip click to edit %ul.tools - %li= link_to t('.add_a_new_contact'), "#manage_aspect_contacts_pane_#{hash[:aspect].id}", :class => 'manage_aspect_contacts_button' + %li= link_to t('.add_a_new_contact'), "#manage_aspect_contacts_pane_#{hash[:aspect].id}", :class => 'manage_aspect_contacts_button', :rel => "facebox" %li!= remove_link(hash[:aspect]) %ul.dropzone{:data=>{:aspect_id=>hash[:aspect].id}} @@ -65,7 +65,7 @@ .draggable_info =t('.drag_to_add') - .fancybox_content + .facebox_content %div{:id => "manage_aspect_contacts_pane_#{hash[:aspect].id}"} = render "requests/manage_aspect_contacts", :aspect => hash[:aspect], :manage => true, :contact_hashes => hash[:contacts] diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index bd5803ced..b8903cdb5 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -51,7 +51,7 @@ %li = link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('aspects.manage.add_a_new_aspect'), :rel => 'facebox' - .fancybox_content + .facebox_content #add_aspect_pane = render "aspects/new_aspect" diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index ecc9667e3..4e2e461d1 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -46,9 +46,9 @@ - for service in current_user.services = image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider - = link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;" + = link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;", :rel => 'facebox' - .fancybox_content + .facebox_content #question_mark_pane = render 'shared/public_explain' diff --git a/public/javascripts/view.js b/public/javascripts/view.js index 444eb31f2..c0f62c9a6 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -65,20 +65,6 @@ var View = { selector: ".add_aspect_button" }, - fancyBoxButtons: { - selectors: [ - ".add_aspect_button", - ".manage_aspect_contacts_button", - ".invite_user_button", - ".add_photo_button", - ".remove_person_button", - ".question_mark", - ".share_with_button", - ".aspect_detail_button", - ".aspect_selector_edit" - ] - }, - debug: { click: function() { $("#debug_more").toggle("fast"); diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 7d35ffa49..17115c215 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -1207,10 +1207,6 @@ ul#settings_nav .settings_pane :display none -#fancybox-close:hover - :background - :color transparent - .contact_pictures, #aspect_listings li img @@ -1302,7 +1298,7 @@ input[type="search"] :-webkit-appearance textfield :-moz-appearance textfield -.fancybox_content +.facebox_content :display none #photo_edit_options diff --git a/spec/javascripts/view-spec.js b/spec/javascripts/view-spec.js index 2b8dade69..09b394cb2 100644 --- a/spec/javascripts/view-spec.js +++ b/spec/javascripts/view-spec.js @@ -11,14 +11,6 @@ describe("View", function() { }); }); - describe("fancyBoxButtons", function() { - describe("selectors", function() { - it("is an array of all the selectors that will have fancybox attached", function() { - expect(typeof View.fancyBoxButtons.selectors === "object").toBeTruthy(); - expect($.isArray(View.fancyBoxButtons.selectors)).toBeTruthy(); - }); - }); - }); describe("debug", function() { describe("click", function() {