Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Chrysweel committed Jun 16, 2015
2 parents 9b67086 + 21d6801 commit 39d50a9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Resources/views/User/edit_profile.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
<div class="col-xs-12">
<form id="profileForm" class="form-horizontal" action="{{ path('chatea_client_update_profile' ) }}" {{ form_enctype(form) }} method="POST">
{% if alerts is not null %}
<div id="form-errors" class="alert alert-warning">
<div id="form-errors" class="alert alert-warning" data-behat="msg-warning">
{{ alerts }}
</div>
{% endif %}
{% if success is not null %}
<div class="alert alert-success">
<div class="alert alert-success" data-behat="msg-success">
{{ 'user.edit_profile.success' | trans }}
</div>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion Resources/views/User/registerSuccess.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

{% block chatea_body %}
<h1>{{ 'user.register' | trans }}</h1>
<p>{{ 'user.register.success' | trans }}</p>
<p data-behat="register-success">{{ 'user.register.success' | trans }}</p>
{% endblock %}

0 comments on commit 39d50a9

Please sign in to comment.