From a407f124636e234a5217fc6b5e2a24c3acc91c2e Mon Sep 17 00:00:00 2001 From: Ilyaaaaaaaaaaaaa Zhitomirskiy Date: Thu, 18 Aug 2011 16:16:14 -0700 Subject: [PATCH] Revert "Merge branch 'issue1586-aspectdropdown-when-posting'" This reverts commit 2777f16f4ff632ccc3d1d05d9f944d3d054a5bac, reversing changes made to 8b278adff657979a1ea6151bb20632b80bc31486. --- app/controllers/people_controller.rb | 2 +- app/helpers/aspect_global_helper.rb | 17 +------ .../_aspect_dropdown.html.haml | 21 ++++++++ .../_aspect_dropdown_list_item.haml | 6 +++ app/views/aspects/_aspect_stream.haml | 2 +- app/views/aspects/create.js.erb | 2 +- app/views/aspects/index.mobile.haml | 2 +- app/views/contacts/sharing.haml | 2 +- app/views/notifications/index.html.haml | 2 +- .../people/_aspect_membership_dropdown.haml | 1 - app/views/people/_relationship_action.haml | 2 +- app/views/people/_sub_header.html.haml | 2 +- app/views/services/_remote_friend.html.haml | 4 +- app/views/shared/_aspect_dropdown.html.haml | 21 -------- app/views/shared/_publisher.html.haml | 7 ++- .../status_messages/bookmarklet.html.haml | 6 +-- app/views/status_messages/new.haml | 4 +- config/assets.yml | 1 - config/locales/diaspora/en.yml | 16 +++---- features/posts.feature | 3 +- features/step_definitions/custom_web_steps.rb | 9 ---- public/javascripts/aspects-dropdown.js | 33 ------------- public/javascripts/contact-edit.js | 29 +++++++++-- public/javascripts/publisher.js | 48 ++++--------------- public/stylesheets/sass/application.sass | 14 ++---- 25 files changed, 97 insertions(+), 159 deletions(-) create mode 100644 app/views/aspect_memberships/_aspect_dropdown.html.haml create mode 100644 app/views/aspect_memberships/_aspect_dropdown_list_item.haml delete mode 100644 app/views/people/_aspect_membership_dropdown.haml delete mode 100644 app/views/shared/_aspect_dropdown.html.haml delete mode 100644 public/javascripts/aspects-dropdown.js diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 173f133b8..0277fa88f 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -158,7 +158,7 @@ class PeopleController < ApplicationController def aspect_membership_dropdown @person = Person.find(params[:person_id]) @contact = current_user.contact_for(@person) || Contact.new - render :partial => 'aspect_membership_dropdown', :locals => {:contact => @contact, :person => @person, :hang => 'left'} + render :partial => 'aspect_memberships/aspect_dropdown', :locals => {:contact => @contact, :person => @person, :hang => 'left'} end private diff --git a/app/helpers/aspect_global_helper.rb b/app/helpers/aspect_global_helper.rb index 9b38b7a09..0545d60f1 100644 --- a/app/helpers/aspect_global_helper.rb +++ b/app/helpers/aspect_global_helper.rb @@ -65,17 +65,8 @@ module AspectGlobalHelper end end - def aspect_membership_dropdown(contact, person, hang, aspect=nil) - selected_aspects = all_aspects.select{|aspect| contact.in_aspect?(aspect) } - - render "shared/aspect_dropdown", - :selected_aspects => selected_aspects, - :person => person, - :hang => hang, - :dropdown_class => "aspect_membership" - end - - def aspect_dropdown_list_item(aspect, checked) + def aspect_dropdown_list_item(aspect, contact, person) + checked = (contact.persisted? && contact.in_aspect?(aspect)) klass = checked ? "selected" : "" str = < "hang_#{hang} #{extra_class if defined?(extra_class)}"} + .button.toggle{:class => ("in_aspects" if contact.aspects.size > 0)} + - if contact.aspects.size == 1 + = contact.aspects.first.name + - else + = t('.toggle', :count => contact.aspects.size) + ▼ + + .wrapper + %ul.dropdown_list{:unSelectable => 'on', 'data-person_id' => ((person.id) if person), 'data-service_uid' => (service_uid if defined?(service_uid))} + - for aspect in all_aspects + = aspect_dropdown_list_item(aspect, contact, person) + + - if @aspect && (@aspect == :profile || @aspect == :getting_started || @aspect == :tag || @aspect == :search || @aspect == :notification) + %li.newItem + .add_aspect + = link_to t('contacts.index.add_a_new_aspect'), new_aspect_path(:person_id => person.id), :rel => 'facebox', :class => 'new_aspect' diff --git a/app/views/aspect_memberships/_aspect_dropdown_list_item.haml b/app/views/aspect_memberships/_aspect_dropdown_list_item.haml new file mode 100644 index 000000000..d7508aa0c --- /dev/null +++ b/app/views/aspect_memberships/_aspect_dropdown_list_item.haml @@ -0,0 +1,6 @@ +-# Copyright (c) 2011, Diaspora Inc. This file is +-# licensed under the Affero General Public License version 3 or later. See +-# the COPYRIGHT file. + += aspect_dropdown_list_item(aspect, contact, person) + diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml index b086f3127..c727f32fc 100644 --- a/app/views/aspects/_aspect_stream.haml +++ b/app/views/aspects/_aspect_stream.haml @@ -16,7 +16,7 @@ - else = @aspects.to_sentence -= render 'shared/publisher', :selected_aspects => @aspects, :aspect_ids => aspect_ids, :aspect => @aspect += render 'shared/publisher', :aspect => aspect, :aspect_ids => aspect_ids - if posts.length == 0 = render 'aspects/no_posts_message' diff --git a/app/views/aspects/create.js.erb b/app/views/aspects/create.js.erb index 1b3b6d428..304732473 100644 --- a/app/views/aspects/create.js.erb +++ b/app/views/aspects/create.js.erb @@ -3,7 +3,7 @@ // the COPYRIGHT file. var dropdown = $("ul.dropdown_list[data-person_id=<%= @person.id %>]") -$('.newItem', dropdown).before("<%= escape_javascript( aspect_dropdown_list_item(@aspect, @contact.aspects.include?(@aspect))) %>"); +$('.newItem', dropdown).before("<%= escape_javascript( render('aspect_memberships/aspect_dropdown_list_item', :aspect => @aspect, :person => @person, :contact => @contact)) %>"); ContactEdit.updateNumber(dropdown, "<%= @person.id %>", <%= @contact.aspects.size %>); $.facebox.close(); diff --git a/app/views/aspects/index.mobile.haml b/app/views/aspects/index.mobile.haml index e7e22f20a..caea84c34 100644 --- a/app/views/aspects/index.mobile.haml +++ b/app/views/aspects/index.mobile.haml @@ -17,4 +17,4 @@ %a.more-link.paginate{:href => next_page_path} %h2= t("more") - content_for :subpages do - = render 'shared/publisher', :aspect_ids => @aspect_ids, :selected_aspects => @aspects, :aspect => @aspect + = render 'shared/publisher', :aspect_ids => @aspect_ids diff --git a/app/views/contacts/sharing.haml b/app/views/contacts/sharing.haml index 3ef702ece..8e687f361 100644 --- a/app/views/contacts/sharing.haml +++ b/app/views/contacts/sharing.haml @@ -23,7 +23,7 @@ = contact.person.diaspora_handle .right - = aspect_membership_dropdown(contact, contact.person, 'right') + = render 'aspect_memberships/aspect_dropdown', :contact => contact, :person => contact.person, :hang => 'right' %br %div{:style => "text-align:right;"} diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml index 88a098ab2..cc02bb16a 100644 --- a/app/views/notifications/index.html.haml +++ b/app/views/notifications/index.html.haml @@ -24,7 +24,7 @@ .stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"} - if note.type == "Notifications::StartedSharing" && contact = current_user.contact_for(note[:target]) .right - = aspect_membership_dropdown(contact, note[:target], 'left') + = render 'aspect_memberships/aspect_dropdown', :contact => contact, :person => note[:target], :hang => 'left' %span.from = notification_message_for(note) diff --git a/app/views/people/_aspect_membership_dropdown.haml b/app/views/people/_aspect_membership_dropdown.haml deleted file mode 100644 index 778ca85bf..000000000 --- a/app/views/people/_aspect_membership_dropdown.haml +++ /dev/null @@ -1 +0,0 @@ -= aspect_membership_dropdown(@contact, @person, 'left') diff --git a/app/views/people/_relationship_action.haml b/app/views/people/_relationship_action.haml index 98119128c..9f70f9981 100644 --- a/app/views/people/_relationship_action.haml +++ b/app/views/people/_relationship_action.haml @@ -1,6 +1,6 @@ - unless person == current_user.person - contact = current_user.contacts.find_by_person_id(person.id) - contact ||= Contact.new(:person => person) - = aspect_membership_dropdown(contact, person, 'left') + = render 'aspect_memberships/aspect_dropdown', :contact => contact, :person => person, :hang => 'left' -else = t('people.person.thats_you') diff --git a/app/views/people/_sub_header.html.haml b/app/views/people/_sub_header.html.haml index fd9b70547..4d376461f 100644 --- a/app/views/people/_sub_header.html.haml +++ b/app/views/people/_sub_header.html.haml @@ -1,7 +1,7 @@ #author_info .right - if user_signed_in? && current_user.person != person - = aspect_membership_dropdown(contact, person, 'left') + = render 'aspect_memberships/aspect_dropdown', :contact => contact, :person => person, :hang => 'left' - elsif user_signed_in? && current_user.person == person = link_to t('people.profile_sidebar.edit_my_profile'), edit_profile_path, :class => 'button creation' diff --git a/app/views/services/_remote_friend.html.haml b/app/views/services/_remote_friend.html.haml index db4a668c0..09d5fce2f 100644 --- a/app/views/services/_remote_friend.html.haml +++ b/app/views/services/_remote_friend.html.haml @@ -4,9 +4,9 @@ - if friend.already_invited? = link_to t('.resend'), service_inviter_path(:uid => friend.uid, :provider => 'facebook', :invitation_id => friend.invitation_id) - elsif friend.on_diaspora? - = render 'shared/aspect_dropdown', :selected_aspects => contact_proxy(friend).aspects, :person => friend.person, :hang => 'left' + = render 'aspect_memberships/aspect_dropdown', :contact => contact_proxy(friend), :person => friend.person, :hang => 'left' - else - = render 'shared/aspect_dropdown', :selected_aspects => contact_proxy(friend).aspects, :person => friend.person, :hang => 'left', :dropdown_class => 'inviter', :service_uid => friend.uid + = render 'aspect_memberships/aspect_dropdown', :contact => contact_proxy(friend), :person => friend.person, :hang => 'left', :extra_class => 'inviter', :service_uid => friend.uid - if friend.on_diaspora? = person_image_link(friend.person, :size => :thumb_small) diff --git a/app/views/shared/_aspect_dropdown.html.haml b/app/views/shared/_aspect_dropdown.html.haml deleted file mode 100644 index 33c9ae811..000000000 --- a/app/views/shared/_aspect_dropdown.html.haml +++ /dev/null @@ -1,21 +0,0 @@ --# Copyright (c) 2011, Diaspora Inc. This file is --# licensed under the Affero General Public License version 3 or later. See --# the COPYRIGHT file. - -.dropdown{:class => ["hang_#{hang}", defined?(dropdown_class) && dropdown_class]} - .button.toggle{:class => ("in_aspects" if selected_aspects.size > 0)} - - if selected_aspects.size == 1 - = selected_aspects.first.name - - else - = t('.toggle', :count => selected_aspects.size) - ▼ - - .wrapper - %ul.dropdown_list{:unSelectable => 'on', 'data-person_id' => (person.id if defined?(person) && person), 'data-service_uid' => (service_uid if defined?(service_uid))} - - for aspect in all_aspects - = aspect_dropdown_list_item(aspect, selected_aspects.include?(aspect) ) - - - if (dropdown_may_create_new_aspect && defined?(person) && person) - %li.newItem - .add_aspect - = link_to t('contacts.index.add_a_new_aspect'), new_aspect_path(:person_id => person.id), :rel => 'facebox' diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml index 3b534281a..d899c3d02 100644 --- a/app/views/shared/_publisher.html.haml +++ b/app/views/shared/_publisher.html.haml @@ -29,6 +29,12 @@ = hidden_field_tag 'aspect_ids[]', aspect_id.to_s .options_and_submit + - if aspect == :profile + .mention_helper + .badges + %i= t('.publishing_to') + = aspect_badges(aspects_with_person, :link => false) + .public_toggle %span#publisher_service_icons = t("shared.publisher.click_to_share_with") @@ -39,7 +45,6 @@ - for service in current_user.services = image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider.titleize, :class => "service_icon dim", :id =>"#{service.provider}", :maxchar => "#{service.class::MAX_CHARACTERS}" = link_to (image_tag "icons/monotone_wrench_settings.png"), "#question_mark_pane", :class => 'question_mark', :rel => 'facebox', :title => t('shared.public_explain.manage') - = render "shared/aspect_dropdown", :selected_aspects => selected_aspects, :hang => 'left' = status.submit t('.share'), :disable_with => t('.posting'), :class => 'button creation', :tabindex => 2 .facebox_content diff --git a/app/views/status_messages/bookmarklet.html.haml b/app/views/status_messages/bookmarklet.html.haml index 3854a9255..134d01303 100644 --- a/app/views/status_messages/bookmarklet.html.haml +++ b/app/views/status_messages/bookmarklet.html.haml @@ -10,7 +10,7 @@ :javascript Diaspora.widgets.i18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}"); - $(document).ready(function() + $(document).ready(function() { Publisher.open(); $("#publisher").bind('ajax:success', function(){ @@ -24,7 +24,7 @@ if ("#{params[:notes]}".length > 0){ contents = contents + " - #{params[:notes]}"; } - + $("#publisher #status_message_fake_text").val(contents); $("#publisher #status_message_text").val(contents); $('input.button')[0].removeAttribute('disabled'); @@ -34,5 +34,5 @@ .span-15.last %h4 =t('bookmarklet.post_something') - = render :partial => 'shared/publisher', :locals => { :aspect => :profile, :selected_aspects => @aspects, :aspect_ids => @aspect_ids } + = render :partial => 'shared/publisher', :locals => { :aspect => :profile, :aspects_with_person => @aspects, :aspect_ids => @aspect_ids} diff --git a/app/views/status_messages/new.haml b/app/views/status_messages/new.haml index 003073df1..acc8b1677 100644 --- a/app/views/status_messages/new.haml +++ b/app/views/status_messages/new.haml @@ -6,7 +6,7 @@ = javascript_include_tag "publisher.js" :javascript - $(document).ready(function() + $(document).ready(function() { var person = {name: '#{@person.name}', handle: '#{@person.diaspora_handle}' }; Publisher.autocompletion.onSelect($("#status_message_fake_text"),person,'#{@person.name}'); @@ -21,5 +21,5 @@ %h3 = t('.mentioning', :person => @person.name) - = render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :selected_aspects => @aspects_with_person, :person => @person} + = render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :aspects_with_person => @aspects_with_person, :person => @person} diff --git a/config/assets.yml b/config/assets.yml index 62a75ae4b..f45144dbf 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -42,7 +42,6 @@ javascripts: - public/javascripts/stream.js - public/javascripts/content-updater.js - public/javascripts/search.js - - public/javascripts/aspects-dropdown.js - public/javascripts/contact-edit.js - public/javascripts/contact-list.js - public/javascripts/aspect-sorting.js diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 700fb2585..93efc0d8b 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -180,6 +180,14 @@ en: success: "Successfully removed person from aspect" failure: "Failed to remove person from aspect" no_membership: "Could not find the selected person in that aspect" + aspect_dropdown: + add_to_aspect: "Add to aspect" + toggle: + zero: "Add to aspect" + one: "In %{count} aspect" + few: "In %{count} aspects" + many: "In %{count} aspects" + other: "In %{count} aspects" bookmarklet: heading: "Bookmarklet" @@ -645,14 +653,6 @@ en: not_on_diaspora: "Not yet on Diaspora" shared: - aspect_dropdown: - add_to_aspect: "Add to aspect" - toggle: - zero: "Add to aspect" - one: "In %{count} aspect" - few: "In %{count} aspects" - many: "In %{count} aspects" - other: "In %{count} aspects" publisher: posting: "Posting..." share: "Share" diff --git a/features/posts.feature b/features/posts.feature index b95cea3cb..95a6436eb 100644 --- a/features/posts.feature +++ b/features/posts.feature @@ -154,8 +154,7 @@ Feature: posting And I click "Mention" button And I expand the publisher in the modal window And I append "I am eating a yogurt" to the publisher - And I press the aspect dropdown in the modal window - And I toggle the aspect "DidntPostTo" in the modal window + And I follow "DidntPostTo" within "#publisher" in the modal window And I press "Share" in the modal window And I am on the aspects page And I follow "" within "#aspect_nav" diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb index 594ffc2f6..08b99dd74 100644 --- a/features/step_definitions/custom_web_steps.rb +++ b/features/step_definitions/custom_web_steps.rb @@ -11,15 +11,6 @@ And /^I expand the publisher$/ do ') end -When /^I press the aspect dropdown$/ do - find('.dropdown .button').click -end - -And /^I toggle the aspect "([^"]*)"$/ do |aspect_name| - aspect = @me.aspects.where(:name => aspect_name).first - find("li[data-aspect_id='#{aspect.id}']").click -end - Then /^the publisher should be collapsed$/ do find("#publisher")["class"].should include("closed") end diff --git a/public/javascripts/aspects-dropdown.js b/public/javascripts/aspects-dropdown.js deleted file mode 100644 index 5aed7eeb9..000000000 --- a/public/javascripts/aspects-dropdown.js +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2011, Diaspora Inc. This file is -// licensed under the Affero General Public License version 3 or later. See -// the COPYRIGHT file. - -var AspectsDropdown = { - updateNumber: function(dropdown, personId, number, inAspectClass){ - var button = dropdown.parents(".dropdown").children('.button.toggle'), - replacement; - - if (number == 0) { - button.removeClass(inAspectClass); - replacement = Diaspora.widgets.i18n.t("aspect_dropdown.toggle.zero"); - }else if (number == 1) { - button.addClass(inAspectClass); - replacement = dropdown.find(".selected").first().text(); - }else if (number < 3) { - replacement = Diaspora.widgets.i18n.t('aspect_dropdown.toggle.few', { count: number.toString()}) - }else if (number > 3) { - replacement = Diaspora.widgets.i18n.t('aspect_dropdown.toggle.many', { count: number.toString()}) - }else { - //the above one are a tautology, but I want to have them here once for once we figure out a neat way i18n them - replacement = Diaspora.widgets.i18n.t('aspect_dropdown.toggle.other', { count: number.toString()}) - } - - button.html(replacement + ' ▼'); - }, - - toggleCheckbox: - function(check){ - check.parent('li').toggleClass('selected'); - }, -}; - diff --git a/public/javascripts/contact-edit.js b/public/javascripts/contact-edit.js index 9480257aa..76795ba3d 100644 --- a/public/javascripts/contact-edit.js +++ b/public/javascripts/contact-edit.js @@ -4,8 +4,7 @@ var ContactEdit = { init: function(){ - $.extend(ContactEdit, AspectsDropdown); - $('.dropdown.aspect_membership .dropdown_list > li').live('click', function(evt){ + $('.dropdown .dropdown_list > li').live('click', function(evt){ ContactEdit.processClick($(this), evt); }); }, @@ -45,11 +44,33 @@ var ContactEdit = { "_method": (selected) ? "DELETE" : "POST" }, function(aspectMembership) { li.removeClass('loading') - ContactEdit.toggleCheckbox(checkbox); - ContactEdit.updateNumber(li.closest(".dropdown_list"), li.parent().data("person_id"), aspectMembership.aspect_ids.length, 'in_aspect'); + li.toggleClass("selected"); + ContactEdit.updateNumber(li.closest(".dropdown_list"), li.parent().data("person_id"), aspectMembership.aspect_ids.length); Diaspora.widgets.publish("aspectDropdown/updated", [li.parent().data("person_id"), li.parents(".dropdown").parent(".right").html()]); }); }, + + updateNumber: function(dropdown, personId, number){ + var button = dropdown.parents(".dropdown").children('.button.toggle'), + replacement; + + if (number == 0) { + button.removeClass("in_aspects"); + replacement = Diaspora.widgets.i18n.t("aspect_dropdown.toggle.zero"); + }else if (number == 1) { + button.addClass("in_aspects"); + replacement = dropdown.find(".selected").first().text(); + }else if (number < 3) { + replacement = Diaspora.widgets.i18n.t('aspect_dropdown.toggle.few', { count: number.toString()}) + }else if (number > 3) { + replacement = Diaspora.widgets.i18n.t('aspect_dropdown.toggle.many', { count: number.toString()}) + }else { + //the above one are a tautology, but I want to have them here once for once we figure out a neat way i18n them + replacement = Diaspora.widgets.i18n.t('aspect_dropdown.toggle.other', { count: number.toString()}) + } + + button.html(replacement + ' ▼'); + }, }; $(document).ready(function(){ diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js index d3265c2ec..77950f6e2 100644 --- a/public/javascripts/publisher.js +++ b/public/javascripts/publisher.js @@ -315,12 +315,6 @@ var Publisher = { ''); } }, - selectedAspectIds: function() { - var aspects = $('#publisher [name="aspect_ids[]"]'); - var aspectIds = []; - aspects.each(function() { aspectIds.push( parseInt($(this).attr('value'))); }); - return aspectIds; - }, toggleAspectIds: function(aspectId) { var hidden_field = $('#publisher [name="aspect_ids[]"][value="'+aspectId+'"]'); if(hidden_field.length > 0){ @@ -344,25 +338,18 @@ var Publisher = { $('#status_message_fake_text').charCount({allowed: min, warning: min/10 }); } }, + bindAspectToggles: function() { - $('#publisher .dropdown .dropdown_list li').bind("click", function(evt){ - var li = $(this), - button = li.find('.button'), - checkbox = li.find('img.check'); - if(button.hasClass('disabled')) { return; } - - AspectsDropdown.toggleCheckbox(checkbox); - AspectsDropdown.updateNumber(li.closest(".dropdown_list"), null, li.parent().find('li.selected').length, ''); - - Publisher.toggleAspectIds(li.attr('data-aspect_id')); + $('#publisher .aspect_badge').bind("click", function(){ + var unremovedAspects = $(this).parent().children('.aspect_badge').length - $(this).parent().children(".aspect_badge.removed").length; + if(!$(this).hasClass('removed') && ( unremovedAspects == 1 )){ + alert(Diaspora.widgets.i18n.t('publisher.at_least_one_aspect')); + }else{ + Publisher.toggleAspectIds($(this).children('a').attr('data-guid')); + $(this).toggleClass("removed"); + } }); }, - beforeSubmit: function(){ - if($("#publisher .content_creation form #aspect_ids_").length == 0){ - alert(Diaspora.widgets.i18n.t('publisher.at_least_one_aspect')); - return false; - } - }, onSubmit: function(data, json, xhr){ $("#photodropzone").find('li').remove(); $("#publisher textarea").removeClass("with_attachments").css('paddingBottom', ''); @@ -376,21 +363,7 @@ var Publisher = { } }, onSuccess: function(data, json, xhr){ - var isPostVisible = false; - var postedTo = Publisher.selectedAspectIds(); - $.each(AspectFilters.selectedGUIDS, function(index, value){ - if(postedTo.indexOf(parseInt(value))>-1) - isPostVisible = true; - }); - - if(isPostVisible) - ContentUpdater.addPostToStream(json.html); - else - Diaspora.widgets.flashes.render({ - success: true, - message: Diaspora.widgets.i18n.t('successfully_posted_message_to_an_aspects_that_is_not_visible') - }); - + ContentUpdater.addPostToStream(json.html); //collapse publisher Publisher.close(); Publisher.clear(); @@ -398,7 +371,6 @@ var Publisher = { Stream.setUpAudioLinks(); }, bindAjax: function(){ - Publisher.form().bind('submit', Publisher.beforeSubmit); Publisher.form().bind('ajax:loading', Publisher.onSubmit); Publisher.form().bind('ajax:failure', Publisher.onFailure); Publisher.form().bind('ajax:success', Publisher.onSuccess); diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 78026adb1..9fcb6b13b 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -765,12 +765,8 @@ a.paginate, #infscr-loading &:hover :border 1px solid #1C6D99 -#main_stream - :position relative - :z-index 0 - - .pagination - :display none +#main_stream .pagination + :display none .request_buttons :position absolute @@ -870,7 +866,7 @@ label #publisher - :z-index 1 + :z-index 0 :color #999 :position relative :margin @@ -934,9 +930,6 @@ label .public_toggle :text :align right - .dropdown - :text - :align left #publisher_service_icons :position relative @@ -952,7 +945,6 @@ label :position relative :top -2px - .content_creation :margin :top 1em