Skip to content
Extraits de code Groupes Projets
Valider a44ca157 rédigé par danielgrippi's avatar danielgrippi
Parcourir les fichiers

added text to private message notification; user picture in popup

parent bec34ec5
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
= person_image_tag(person)
= link_to "#{person.name.titleize}", person_path(person.id) = link_to "#{person.name.titleize}", person_path(person.id)
= object_link(note) = object_link(note)
...@@ -276,6 +276,7 @@ en: ...@@ -276,6 +276,7 @@ en:
notifications: notifications:
request_accepted: "accepted your share request." request_accepted: "accepted your share request."
new_request: "offered to share with you." new_request: "offered to share with you."
private_message: "sent you a message."
comment_on_post: "commented on your" comment_on_post: "commented on your"
also_commented: "also commented on %{post_author}'s" also_commented: "also commented on %{post_author}'s"
mentioned: "has mentioned you in their" mentioned: "has mentioned you in their"
......
...@@ -1615,6 +1615,18 @@ h3 span.current_gs_step ...@@ -1615,6 +1615,18 @@ h3 span.current_gs_step
:padding 12px :padding 12px
:color #fff :color #fff
:vertical
:align middle
.avatar
:display inline-block
:height 20px
:width 20px
:margin
:right 5px
:vertical
:align middle
.bottom_notification .bottom_notification
:position fixed :position fixed
:bottom 0 :bottom 0
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter