Unverified Commit b556ad52 authored by Rete2's avatar Rete2 Committed by Benjamin Neff
Browse files

show users vote in poll 

closes #7550
parent e08440d7

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


## Features

* Ask for confirmation when leaving a submittable comment field [#7530](https://github.com/diaspora/diaspora/pull/7530)

* Show users vote in polls [#7550](https://github.com/diaspora/diaspora/pull/7550)



# 0.7.0.0

app/assets/javascripts/app/views/poll_view.js

+9 −2
Original line number Diff line number Diff line
@@ -17,15 +17,22 @@ app.views.Poll = app.views.Base.extend({ 
    var isReshare = (this.model.get('post_type') === 'Reshare');

    var showForm = defaultPresenter.loggedIn &&

                   !isReshare &&

                   !this.model.get('already_participated_in_poll');

                   !this.model.get("poll_participation_answer_id");

    var originalPostLink = isReshare && this.model.get('root') ?

      '<a href="/posts/' + this.model.get('root').id + '" class="root_post_link">' + Diaspora.I18n.t('poll.original_post') + '</a>' :

      '';

    var answerGiven = this.model.get("poll_participation_answer_id");



    if (defaultPresenter.poll && defaultPresenter.poll.poll_answers) {

      defaultPresenter.poll.poll_answers.forEach(function(answer) {

        _.extend(answer, {isCurrentUserVote: answerGiven ? answer.id === answerGiven : false});

      });

    }



    return _.extend(defaultPresenter, {

      show_form: showForm,

      is_reshare: isReshare,

      original_post_link: originalPostLink

      originalPostLink: originalPostLink

    });

  },

app/assets/stylesheets/color_themes/_color_theme_override.scss

+0 −2
Original line number Diff line number Diff line
@@ -6,7 +6,5 @@ body { 


  .left-navbar .hoverable:hover { background-color: $main-color-essence; }



  .poll_form .progress .bar { background-color: $main-color-dark; }



  .badge { background-color: $brand-primary; }

}

app/assets/stylesheets/color_themes/_color_theme_override_dark.scss

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ body { 
  .poll_form .progress {

    background-color: $gray-dark;

    .bar { background-color: $gray-light; }

    .users-vote { background-color: $brand-primary; }

  }



  .stream-element .collapsible {

app/assets/stylesheets/poll.scss

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ 
      height: 100%;

      text-align: left;

    }



    .users-vote {

      background-color: $brand-primary;

    }

  }



  .submit[disabled] {