Unverified Commit 5017bd95 authored by Benjamin Neff's avatar Benjamin Neff Committed by Steffen van Bergerem
Browse files

rewrite notifier template with haml 

closes #7054
parent b0611ce2

Changelog.md

+1 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 




## Refactor

## Refactor

* Indicate proper way to report bugs in the sidebar [#7039](https://github.com/diaspora/diaspora/pull/7039)

* Indicate proper way to report bugs in the sidebar [#7039](https://github.com/diaspora/diaspora/pull/7039)

* Remove text color from notification mails and fix sender avatar [#7054](https://github.com/diaspora/diaspora/pull/7054)





## Bug fixes

## Bug fixes

app/views/layouts/notifier.html.erb

deleted100644 → 0
+0 −27
Original line number Original line Diff line number Diff line 
<table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:14px;">

  <tr width="100%">

    <% if @notification.try(:sender) %>

      <td style="vertical-align:top;" width="60px">

        <div style="background-color:#eee; height:50px; width:50px;">

          <img alt="<%=@notification.sender%>" src="<%=@notification.sender.profile.image_url(:thumb_small)%>"

               style="border:0; display:block; top:0; left:0;" height="50px" width="50px">

        </div>

      </td>

    <% end %>

    <td style="vertical-align:top;">

      <%= yield %>

    </td>

  </tr>

</table>



<table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:12px;color:#999; padding-top:10px; margin-top:10px; border-top: 1px solid #ddd;">

  <tr>

    <td>

      <%= t("notifier.email_sent_by_diaspora", pod_name: pod_name) %>

      <a href="<%=edit_user_url%>">

        <%= t("notifier.click_here") %>

      </a>

      <%=t("notifier.to_change_your_notification_settings")%>.

    </td>

  </tr>

</table>

app/views/layouts/notifier.html.haml

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
%table{cellspacing: 0, cellpadding: 0, border: 0,

       style: "font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px"}

  %tr

    - if @notification.try(:sender)

      %td{width: "60px", style: "vertical-align: top"}>

        %div{style: "background-color: #eee; height: 50px; width: 50px"}

          = image_tag @notification.sender.profile.image_url(:thumb_small), alt: @notification.sender.name,

                      style: "border: 0, display: block; top: 0; left: 0", height: "50px", width: "50px"

    %td{style: "vertical-align: top"}

      != yield



%div{style: "font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; color: #999; padding-top: 10px; margin-top: 10px; border-top: 1px solid #ddd"}

  != t("notifier.email_sent_by_diaspora", pod_name: pod_name)

  != link_to t("notifier.click_here"), edit_user_url

  != t("notifier.to_change_your_notification_settings") + "."