Switch from CSS to Table layout for HTML mails so they work in Outlook aka Word

    Remove templates-vector and theme templates with variables instead
    Switch to matrix.to URLs by default for links

1 files changed, 31 insertions, 23 deletions

diff --git a/res/templates/room.html b/res/templates/room.html
index 3c0a4607b3..723c222d25 100644
--- a/res/templates/room.html
+++ b/res/templates/room.html
@@ -1,25 +1,33 @@
-<div class="room">
-    <div class="room_avatar">
-        {% if room.avatar_url %}
-            <img src="{{ room.avatar_url|mxc_to_http(48,48) }}" />
-        {% else %}
-            {% if room.hash % 3 == 0 %}
-                <img src="https://vector.im/beta/img/76cfa6.png"  />
-            {% elif room.hash % 3 == 1 %}
-                <img src="https://vector.im/beta/img/50e2c2.png"  />
+<table class="room">
+    <tr class="room_header">
+        <td class="room_avatar">
+            {% if room.avatar_url %}
+                <img alt="" src="{{ room.avatar_url|mxc_to_http(48,48) }}" />
             {% else %}
-                <img src="https://vector.im/beta/img/f4c371.png"  />
+                {% if room.hash % 3 == 0 %}
+                    <img alt="" src="https://vector.im/beta/img/76cfa6.png"  />
+                {% elif room.hash % 3 == 1 %}
+                    <img alt="" src="https://vector.im/beta/img/50e2c2.png"  />
+                {% else %}
+                    <img alt="" src="https://vector.im/beta/img/f4c371.png"  />
+                {% endif %}
             {% endif %}
-        {% endif %}
-    </div>
-    <h2>{{ room.title }}</h2>
-    <div class="room_content">
-        {% if room.invite %}
-            <a href="{{ room.link }}">Join the conversation.</a>
-        {% else %}
-            {% for notif in room.notifs %}
-                {% include 'notif.html' with context %}
-            {% endfor %}
-        {% endif %}
-    </div>
-</div>
+        </td>
+        <td class="room_name" colspan="2">
+            {{ room.title }}
+        </td>
+    </tr>
+    {% if room.invite %}
+        <tr>
+            <td></td>
+            <td>
+                <a href="{{ room.link }}">Join the conversation.</a>
+            </td>
+            <td></td>
+        </tr>
+    {% else %}
+        {% for notif in room.notifs %}
+            {% include 'notif.html' with context %}
+        {% endfor %}
+    {% endif %}
+</table>