[geary/bug/728002-webkit2: 106/140] Update deceptive link popover to provide context and advice.

[Michael Gratton <mjog src gnome org>]

commit 78d116d05440a303fc539f7eeba45252960fd77f
Author: Michael James Gratton <mike vee net>
Date:   Tue Jan 24 11:38:21 2017 +1100

    Update deceptive link popover to provide context and advice.

 ui/conversation-message.ui |  113 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 98 insertions(+), 15 deletions(-)
---
diff --git a/ui/conversation-message.ui b/ui/conversation-message.ui
index 6190fb2..8e6a1b3 100644
--- a/ui/conversation-message.ui
+++ b/ui/conversation-message.ui
@@ -646,59 +646,142 @@
       <object class="GtkGrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
-        <property name="margin_right">6</property>
-        <property name="margin_top">6</property>
-        <property name="margin_bottom">6</property>
+        <property name="margin_left">12</property>
+        <property name="margin_right">12</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkLabel">
+          <object class="GtkImage">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">This link appears to go to:</property>
+            <property name="halign">center</property>
+            <property name="margin_right">12</property>
+            <property name="vexpand">True</property>
+            <property name="icon_name">dialog-warning-symbolic</property>
+            <property name="icon_size">3</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
+            <property name="height">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="good_link_label">
+          <object class="GtkLabel" id="bad_link_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label">&lt;a 
href="http://goodlink.com"&gt;http://goodlink.com&lt;/a&gt;</property>
+            <property name="halign">start</property>
+            <property name="margin_left">12</property>
+            <property name="label">&lt;a href="http://badlink.com"&gt;http://badlink.com&lt;/a&gt;</property>
             <property name="use_markup">True</property>
+            <property name="ellipsize">middle</property>
+            <property name="max_width_chars">60</property>
             <signal name="activate-link" handler="on_link_popover_activated" swapped="no"/>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">5</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="halign">start</property>
             <property name="label" translatable="yes">But actually goes to:</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">4</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="bad_link_label">
+          <object class="GtkLabel" id="good_link_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label">&lt;a href="http://badlink.com"&gt;http://badlink.com&lt;/a&gt;</property>
+            <property name="halign">start</property>
+            <property name="margin_left">12</property>
+            <property name="margin_bottom">6</property>
+            <property name="label">&lt;a 
href="http://goodlink.com"&gt;http://goodlink.com&lt;/a&gt;</property>
             <property name="use_markup">True</property>
+            <property name="ellipsize">middle</property>
+            <property name="max_width_chars">60</property>
             <signal name="activate-link" handler="on_link_popover_activated" swapped="no"/>
           </object>
           <packing>
-            <property name="left_attach">0</property>
+            <property name="left_attach">1</property>
             <property name="top_attach">3</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin_top">12</property>
+            <property name="label" translatable="yes">The link appears to go to:</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">Deceptive link found</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">The email sender may be leading you to the wrong web 
site.</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin_top">12</property>
+            <property name="label" translatable="yes">If unsure, contact the sender and ask before 
continuing.</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">6</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
     </child>
     <style>