Unverified Commit 1bd630d8 authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Merge pull request #7536 from SuperTux88/refactor-publisher-preview 

Remove avatar, name, timestamp and interactions from publisher preview
parents 7a21c227 dd6cbbbb

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ If so, please delete it since it will prevent the federation from working proper 
* Update help pages [#7528](https://github.com/diaspora/diaspora/pull/7528)

* Disable rendering logging in production [#7529](https://github.com/diaspora/diaspora/pull/7529)

* Add some missing indexes and cleanup the database if needed [#7533](https://github.com/diaspora/diaspora/pull/7533)

* Remove avatar, name, timestamp and interactions from publisher preview [#7536](https://github.com/diaspora/diaspora/pull/7536)



## Bug fixes

app/assets/javascripts/app/views/preview_post_view.js

+0 −11
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ app.views.PreviewPost = app.views.Post.extend({ 
  className: "stream-element loaded",



  subviews: {

    ".feedback": "feedbackView",

    ".post-content": "postContentView",

    ".oembed": "oEmbedView",

    ".opengraph": "openGraphView",
@@ -13,12 +12,6 @@ app.views.PreviewPost = app.views.Post.extend({ 
    ".status-message-location": "postLocationStreamView"

  },



  tooltipSelector: [

    ".timeago",

    ".delete",

    ".permalink"

  ].join(", "),



  initialize: function() {

    this.model.set("preview", true);

    this.oEmbedView = new app.views.OEmbed({model: this.model});
@@ -26,10 +19,6 @@ app.views.PreviewPost = app.views.Post.extend({ 
    this.pollView = new app.views.Poll({model: this.model});

  },



  feedbackView: function() {

    return new app.views.Feedback({model: this.model});

  },



  postContentView: function() {

    return new app.views.StatusMessage({model: this.model});

  },

app/assets/stylesheets/publisher.scss

+10 −4
Original line number Diff line number Diff line
@@ -197,10 +197,16 @@ 
    border: 0;

  }



  .md-preview {

    // This rule is required until we switch to the newer release of bootstrap-markdown with

    // the following commit in:

    // https://github.com/toopay/bootstrap-markdown/commit/14a21c3837140144b27efc19c795d1a37fad70fb

  .md-preview { min-height: 90px; }

    min-height: 90px;



    .stream-element .post-content .markdown-content {

      padding-top: 0;

    }

  }

}



.publisher-textarea-wrapper {

app/assets/templates/feedback_tpl.jst.hbs

+9 −21
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ 
  –

</span>





{{#if preview}}

  <span>{{t "stream.like"}}</span>

{{else}}

<a href="#" class="like" rel='nofollow'>

  {{~#if userLike~}}

    {{~t "stream.unlike"~}}
@@ -24,18 +20,10 @@ 
    {{~t "stream.like"~}}

  {{~/if~}}

</a>

{{/if}}

·

{{#if preview}}

  <span>{{t "stream.reshare"}}</span>

  ·

{{else if userCanReshare}}

{{#if userCanReshare}}

  <a href="#" class="reshare" rel='nofollow'>{{t "stream.reshare"}}</a>

  ·

{{/if}}



{{#if preview}}

  <span>{{t "stream.comment"}}</span>

{{else}}

<a href="#" class="focus_comment_textarea" rel="nofollow">{{t "stream.comment"}}</a>
 
{{/if}}

app/assets/templates/stream-element_tpl.jst.hbs

+27 −24
Original line number Diff line number Diff line 
<div class="media {{#if showPost}} {{#if nsfw}} shield-off {{/if}} {{else}} shield-active {{/if}}">



  {{#unless preview}}

    {{#with author}}

      <a href="/people/{{guid}}" class="img {{{hovercardable this}}}">

        {{{personImage this}}}

      </a>

    {{/with}}

  {{/unless}}



  <div class="bd">

    {{#unless preview}}

      {{#if loggedIn}}

        <div class="post-controls"></div>

      {{/if}}
@@ -17,9 +21,6 @@ 


        <span class="details gray">

          -

        {{#if preview}}

          <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" />

        {{else}}

          <a href="/posts/{{id}}">

            <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" />

          </a>
@@ -27,16 +28,18 @@ 
          <a href="/posts/{{guid}}" class="permalink" title="{{t "stream.permalink"}}">

            <i class="entypo-link"></i>

          </a>

        {{/if}}

        </span>

      </div>

    {{/unless}}



    <div class="post-content"> </div>

    <div class="status-message-location nsfw-hidden"> </div>



    {{#unless preview}}

      <div class="feedback nsfw-hidden"> </div>

      <div class="likes nsfw-hidden"> </div>

      <div class="reshares nsfw-hidden"> </div>

      <div class="comments nsfw-hidden"> </div>

    {{/unless}}

  </div>

</div>