Commit d609238e authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff
Browse files

Refactor mobile alerts for error responses, add them to container with fixed position

parent b8d3323d

app/assets/javascripts/mobile/mobile_alert.js

+9 −1
Original line number Diff line number Diff line
@@ -14,6 +14,14 @@ 


    success: function(message) { this._flash(message, "success"); },



    error: function(message) { this._flash(message, "danger"); }

    error: function(message) { this._flash(message, "danger"); },



    handleAjaxError: function(response) {

      if (response.status === 0) {

        this.error(Diaspora.I18n.t("errors.connection"));

      } else {

        this.error(response.responseText);

      }

    }

  };

})();

app/assets/javascripts/mobile/mobile_conversations.js

+2 −3
Original line number Diff line number Diff line
@@ -10,9 +10,8 @@ 
      Diaspora.Mobile.changeLocation(Routes.conversation(data.id));

    },



    conversationCreateError: function(evt, resp) {

      Diaspora.Mobile.Alert.error(resp.responseText);

      $("html").animate({scrollTop: 0});

    conversationCreateError: function(evt, response) {

      Diaspora.Mobile.Alert.handleAjaxError(response);

    }

  };

})();

app/assets/stylesheets/mobile/flash_messages.scss

0 → 100644
+20 −0
Original line number Diff line number Diff line 
.flash-messages-container {

  background-color: rgba($black, .5);

  padding: 0 10px;

  position: fixed;

  top: $mobile-navbar-height;

  width: 100%;

  z-index: 9;



  .flash-messages {

    width: 100%;

  }



  .alert {

    margin-bottom: 10px;

  }



  .alert:first-of-type {

    margin-top: 10px;

  }

}

app/assets/stylesheets/mobile/mobile.scss

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
@import "mobile/header";

@import "mobile/tags";

@import "mobile/conversations";

@import 'mobile/flash_messages';

@import "mobile/settings";

@import "mobile/stream_element";

@import "mobile/comments";

app/views/conversations/new.mobile.haml

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
    });



.col-md-6.col-md-offset-3#new_conversation_pane

  #flash-messages

  .container-fluid.row

    %h3

      = t("conversations.index.new_conversation")