Commit 91d636b9 authored by Dennis Schubert's avatar Dennis Schubert
Browse files

Merge pull request #6727 from SuperTux88/improve-pod-check 

Improve pod check
parents cc5a3997 acb91c79

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ Contributions are very welcome, the hard work is done! 
* Dropped `parent_author_signature` from relayables [#6586](https://github.com/diaspora/diaspora/pull/6586)

* Attached ShareVisibilities to the User, not the Contact [#6723](https://github.com/diaspora/diaspora/pull/6723)

* Refactor mentions input, now based on typeahead.js [#6728](https://github.com/diaspora/diaspora/pull/6728)

* Optimized the pod up checks [#6727](https://github.com/diaspora/diaspora/pull/6727)



## Bug fixes

* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

app/assets/javascripts/app/pages/admin_pods.js

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ app.pages.AdminPods = app.views.Base.extend({ 
        .append(Diaspora.I18n.t("admin.pods.unchecked", {count: gon.uncheckedCount}));

      msgs.appendChild(unchecked[0]);

    }

    if( gon.versionFailedCount && gon.versionFailedCount > 0 ) {

      var versionFailed = $("<div class='alert alert-warning' />")

          .append(Diaspora.I18n.t("admin.pods.version_failed", {count: gon.versionFailedCount}));

      msgs.appendChild(versionFailed[0]);

    }

    if( gon.errorCount && gon.errorCount > 0 ) {

      var errors = $("<div class='alert alert-danger' />")

        .append(Diaspora.I18n.t("admin.pods.errors", {count: gon.errorCount}));

app/assets/javascripts/app/views/pod_entry_view.js

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ app.views.PodEntry = app.views.Base.extend({ 
      has_no_errors: (this.model.get("status")==="no_errors"),

      has_errors: (this.model.get("status")!=="no_errors"),

      status_text: Diaspora.I18n.t("admin.pods.states."+this.model.get("status")),

      pod_url: (this.model.get("ssl") ? "https" : "http") + "://" + this.model.get("host"),

      pod_url: (this.model.get("ssl") ? "https" : "http") + "://" + this.model.get("host") +

                 (this.model.get("port") ? ":" + this.model.get("port") : ""),

      response_time_fmt: this._fmtResponseTime()

      /* jshint camelcase: true */

    });

app/assets/stylesheets/admin.scss

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,12 @@ 
/** pod list **/



#pod-list {

  .pod-title {

    max-width: 200px;

    overflow: hidden;

    text-overflow: ellipsis;

  }



  th.added,

  td.added,

  td.actions { white-space: nowrap; }

app/assets/templates/pod_table_entry_tpl.jst.hbs

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  {{/if}}

  </i>

</td>

<td>{{host}}</td>

<td class="pod-title" title="{{host}}">{{host}}</td>

<td class="added">

  <small><time datetime="{{created_at}}" title="{{localTime created_at}}" /></small>

</td>