Commit 1ce967e8 authored by Jonne Haß's avatar Jonne Haß
Browse files

Merge pull request #6378 from Zauberstuhl/bootstrap3_and_user_detail_btn 

Report tab; Bootstrap3 compatible and reported-user-detail button
parents cc631372 78f9b39e

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure. 
* Backend information panel & health checks for known pods [#6290](https://github.com/diaspora/diaspora/pull/6290)

* Allow users to view a posts locations on an OpenStreetMap [#6256](https://github.com/diaspora/diaspora/pull/6256)

* Redesign and unify error pages [#6428](https://github.com/diaspora/diaspora/pull/6428)

* Redesign and refactor report admin interface [#6378](https://github.com/diaspora/diaspora/pull/6378)



# 0.5.4.0

app/assets/stylesheets/report.scss

+4 −17
Original line number Diff line number Diff line 
#reports {

  padding-top: 2em;

  .content {

    float: left;

    span {

      display: block;

  .reason {

    padding-bottom: 20px;

  }

    span.text {

      padding-bottom: 1em;

    }

  }

  .options {

    float: right;

  }

  .clear {

    clear: both;

    border-bottom: 1px solid #808080;

    padding-bottom: 1em;

    margin-bottom: 1em;

  form input {

    margin-right: 5px;

  }

}

app/assets/templates/comment_tpl.jst.hbs

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
          <i class="entypo-trash"></i>

        <a/>

      {{else}}

        <a href="#" data-type="comment" class="comment_report" title="{{t "report.name"}}">

        <a href="#" data-type="Comment" class="comment_report" title="{{t "report.name"}}">

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

        </a>

      {{/if}}

app/assets/templates/photo_tpl.jst.hbs

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
            <i class="entypo-trash"></i>

          </a>

        {{else}}

          <a href="#" rel="nofollow" data-type="post" class="post_report" title="{{t "report.name"}}">

          <a href="#" rel="nofollow" data-type="Post" class="post_report" title="{{t "report.name"}}">

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

          </a>

          <a href="#" rel="nofollow" class="block_user" title="{{t "ignore"}}">

app/assets/templates/single-post-viewer/single-post-moderation_tpl.jst.hbs

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
        <i class="entypo-trash"></i>

      </a>

    {{else}}

      <a href="#" data-type="post" class="post_report" title="{{t "report.name"}}">

      <a href="#" data-type="Post" class="post_report" title="{{t "report.name"}}">

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

      </a>

      <a href="#" data-type="post" class="block_user" title="{{t "ignore"}}">