Merge lp:~osomon/webbrowser-app/broken-lock into lp:webbrowser-app

[Olivier Tilloy]

Display a broken padlock icon when browsing a page loaded over an insecure connection.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:871
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1377/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/887
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/135
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/135/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/135
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/885
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/885/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17250
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/472
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/472/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1377/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:872
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1378/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/891
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/420
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/136
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/136/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/136
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/889
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/889/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17257
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/342
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/475
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/475/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1378/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:872
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1379/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/895
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/137
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/786
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/893
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/893/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17268
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/481
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/481/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1379/rebuild

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good to me, the only possible addition that might be worth considering is adding a brief description to the certificate pop-up for the broken padlock like we currently have for the insecure content warning.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:873
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1380/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/907
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/138
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/138
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/905
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/905/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17297
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/486
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/486/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1380/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:873
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1381/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/926
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/426
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/139
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/139
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/817
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/924
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/924/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17336
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/505
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/505/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1381/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:873
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1382/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/927
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/427/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/140
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/140/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/140
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/818
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/925
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/925/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17340
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/349/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/506
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/506/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1382/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:873
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1383/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/932
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/141
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/823
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/930
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/930/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17349
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/509
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/509/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1383/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/AddressBar.qml'
--- src/app/webbrowser/AddressBar.qml	2014-12-12 23:51:36 +0000
+++ src/app/webbrowser/AddressBar.qml	2015-01-21 15:39:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -41,7 +41,7 @@
     // XXX: for testing purposes only, do not use to modify the
     // contents/behaviour of the internals of the component.
     readonly property Item __textField: textField
-    readonly property Item __actionButton: actionButton
+    readonly property Item __actionButton: action
     readonly property Item __bookmarkToggle: bookmarkToggle
 
     height: textField.height
@@ -64,117 +64,118 @@
         anchors.fill: parent
 
         primaryItem: Item {
-            width: iconsRow.width
-            height: iconsRow.height
+            id: icons
+
+            width: iconsRow.width + units.gu(1)
+            height: units.gu(2)
+
             Row {
                 id: iconsRow
-                Item {
-                    height: textField.height
+
+                spacing: units.gu(1)
+                anchors {
+                    top: parent.top
+                    bottom: parent.bottom
+                    horizontalCenter: parent.horizontalCenter
+                }
+
+                Favicon {
+                    id: favicon
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: (addressbar.state == "") && addressbar.actualUrl.toString() &&
+                             !internal.securityWarning && !internal.securityError
+                }
+
+                Icon {
+                    id: action
+
+                    height: parent.height
                     width: height
-                    visible: (addressbar.state != "") || !internal.secureConnection || !internal.securityWarning
-
-                    Favicon {
-                        id: favicon
-                        anchors.centerIn: parent
-                        visible: (addressbar.state == "") && addressbar.actualUrl.toString() && !internal.securityWarning
-                    }
-
-                    Item {
-                        id: certificatePopoverPositioner
-                        anchors.bottom: favicon.bottom
-                        anchors.horizontalCenter: favicon.horizontalCenter
-                    }
+
+                    visible: (addressbar.state == "editing") ||
+                             (addressbar.state == "loading") ||
+                             !addressbar.text
+
+                    enabled: addressbar.text
+                    opacity: enabled ? 1.0 : 0.3
+
+                    readonly property bool loading: addressbar.state == "loading"
+                    readonly property bool editing: addressbar.state == "editing"
+                    readonly property bool reload: editing && addressbar.text &&
+                                                   (addressbar.text == addressbar.actualUrl)
+                    readonly property bool looksLikeAUrl: internal.looksLikeAUrl(addressbar.text.trim())
+
+                    name: loading ? "stop" :
+                          reload ? "reload" :
+                          looksLikeAUrl ? "stock_website" : "search"
 
                     MouseArea {
-                        id: actionButton
                         objectName: "actionButton"
-                        anchors.fill: parent
-                        enabled: addressbar.text
-                        opacity: enabled ? 1.0 : 0.3
 
-                        Icon {
-                            id: actionIcon
-                            height: parent.height - units.gu(2)
-                            width: height
-                            anchors.centerIn: parent
-                            name: {
-                                switch (addressbar.state) {
-                                case "loading":
-                                    return "stop"
-                                case "editing":
-                                    if (addressbar.text && (addressbar.text == addressbar.actualUrl)) {
-                                        return "reload"
-                                    } else if (internal.looksLikeAUrl(addressbar.text.trim())) {
-                                        return "stock_website"
-                                    } else {
-                                        return "search"
-                                    }
-                                default:
-                                    if (!favicon.visible) {
-                                        if (internal.looksLikeAUrl(addressbar.text.trim())) {
-                                            return "stock_website"
-                                        } else {
-                                            return "search"
-                                        }
-                                    } else {
-                                        return ""
-                                    }
-                                }
-                            }
+                        anchors {
+                            fill: parent
+                            margins: -units.gu(1)
                         }
 
                         onClicked: {
-                            switch (actionIcon.name) {
-                            case "":
-                                break
-                            case "stop":
+                            if (action.loading) {
                                 addressbar.requestStop()
-                                break
-                            case "reload":
+                            } else if (action.reload) {
                                 addressbar.requestReload()
-                                break
-                            default:
+                            } else {
                                 textField.accepted()
                             }
                         }
                     }
                 }
 
-                Item {
-                    id: securityDisplay
-                    height: textField.height
-                    width: securityIcon.width
-                    visible: internal.secureConnection && (addressbar.state == "")
-
-                    Icon {
-                        id: securityIcon
-                        anchors.centerIn: parent
-                        height: parent.height - units.gu(2)
-                        width: height
-                        name: "network-secure"
-                    }
-                }
-
-                Item {
-                    height: textField.height
-                    width: warningIcon.width
-                    visible: internal.securityWarning && (addressbar.state == "")
-
-                    Icon {
-                        id: warningIcon
-                        anchors.centerIn: parent
-                        height: parent.height - units.gu(2)
-                        width: height
-                        name: "security-alert"
-                    }
-                }
+                Icon {
+                    name: "network-secure"
+                    height: parent.height
+                    width: height
+                    visible: (addressbar.state == "") && internal.secureConnection
+                }
+
+                Image {
+                    source: "assets/broken_lock.png"
+                    height: parent.height
+                    fillMode: Image.PreserveAspectFit
+                    visible: (addressbar.state == "") && internal.securityError
+                }
+
+                Icon {
+                    name: "security-alert"
+                    height: parent.height
+                    width: height
+                    visible: (addressbar.state == "") && internal.securityWarning
+                }
+            }
+
+            Item {
+                id: certificatePopoverPositioner
+                anchors {
+                    top: iconsRow.top
+                    bottom: iconsRow.bottom
+                    left: iconsRow.left
+                }
+                width: units.gu(2)
             }
 
             MouseArea {
-                enabled: securityDisplay.visible && addressbar.state != "editing" && addressbar.state != "loading"
-                anchors.fill: parent
+                enabled: addressbar.state == ""
+                anchors {
+                    left: iconsRow.left
+                    leftMargin: -units.gu(1)
+                    right: iconsRow.right
+                    verticalCenter: parent.verticalCenter
+                }
+                height: textField.height
 
-                onClicked: addressbar.showSecurityCertificateDetails()
+                onClicked: {
+                    if (internal.secureConnection || internal.securityError) {
+                        addressbar.showSecurityCertificateDetails()
+                    }
+                }
             }
         }
 
@@ -226,8 +227,8 @@
         MouseArea {
             anchors {
                 fill: parent
-                leftMargin: iconsRow.width
-                rightMargin: bookmarkButton.width
+                leftMargin: icons.width
+                rightMargin: bookmarkToggle.width
             }
             visible: !textField.activeFocus
             onClicked: {
@@ -243,6 +244,7 @@
         readonly property int securityLevel: addressbar.securityStatus ? addressbar.securityStatus.securityLevel : Oxide.SecurityStatus.SecurityLevelNone
         readonly property bool secureConnection: addressbar.securityStatus ? (securityLevel == Oxide.SecurityStatus.SecurityLevelSecure || securityLevel == Oxide.SecurityStatus.SecurityLevelSecureEV || securityLevel == Oxide.SecurityStatus.SecurityLevelWarning) : false
         readonly property bool securityWarning: addressbar.securityStatus ? (securityLevel == Oxide.SecurityStatus.SecurityLevelWarning) : false
+        readonly property bool securityError: addressbar.securityStatus ? (securityLevel == Oxide.SecurityStatus.SecurityLevelError) : false
 
         property var securityCertificateDetails: null
 

=== modified file 'src/app/webbrowser/Chrome.qml'
--- src/app/webbrowser/Chrome.qml	2014-12-12 09:48:34 +0000
+++ src/app/webbrowser/Chrome.qml	2015-01-21 15:39:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -98,7 +98,7 @@
                 verticalCenter: parent.verticalCenter
             }
 
-            icon: chrome.webview ? chrome.webview.icon : ""
+            icon: (chrome.webview && !chrome.webview.certificateError) ? chrome.webview.icon : ""
 
             loading: chrome.webview ?
                      chrome.webview.loading

=== modified file 'src/app/webbrowser/SecurityCertificatePopover.qml'
--- src/app/webbrowser/SecurityCertificatePopover.qml	2014-11-11 11:48:10 +0000
+++ src/app/webbrowser/SecurityCertificatePopover.qml	2015-01-21 15:39:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -27,6 +27,9 @@
 
     property var securityStatus
 
+    readonly property bool isWarning: securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelWarning
+    readonly property bool isError: securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelError
+
     Column {
         width: parent.width - units.gu(4)
         anchors.horizontalCenter: parent.horizontalCenter
@@ -39,7 +42,7 @@
 
         Column {
             width: parent.width
-            visible: securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelWarning
+            visible: certificatePopover.isWarning || certificatePopover.isError
             spacing: units.gu(0.5)
 
             Row {
@@ -47,16 +50,60 @@
                 spacing: units.gu(0.5)
 
                 Icon {
+                    id: alertIcon
                     name: "security-alert"
                     height: units.gu(2)
                     width: height
                 }
 
-                Label {
-                    width: parent.width
-                    wrapMode: Text.WordWrap
-                    text: i18n.tr("This site has insecure content")
-                    fontSize: "x-small"
+                Column {
+                    width: parent.width - alertIcon.width - parent.spacing
+                    height: childrenRect.height
+                    spacing: units.gu(0.5)
+
+                    Label {
+                        width: parent.width
+                        wrapMode: Text.WordWrap
+                        fontSize: "x-small"
+                        text: certificatePopover.isWarning ?
+                                  i18n.tr("This site has insecure content") :
+                                  i18n.tr("Identity Not Verified")
+                    }
+
+                    Label {
+                        width: parent.width
+                        wrapMode: Text.WordWrap
+                        visible: certificatePopover.isError
+                        fontSize: "x-small"
+                        text: i18n.tr("The identity of this website has not been verified.")
+                    }
+
+                    Label {
+                        width: parent.width
+                        wrapMode: Text.WordWrap
+                        visible: certificatePopover.isError
+                        fontSize: "x-small"
+                        text: {
+                            switch (securityStatus.certStatus) {
+                                case Oxide.SecurityStatus.CertStatusBadIdentity:
+                                    return i18n.tr("Server certificate does not match the identity of the site.")
+                                case Oxide.SecurityStatus.CertStatusExpired:
+                                    return i18n.tr("Server certificate has expired.")
+                                case Oxide.SecurityStatus.CertStatusDateInvalid:
+                                    return i18n.tr("Server certificate contains invalid dates.")
+                                case Oxide.SecurityStatus.CertStatusAuthorityInvalid:
+                                    return i18n.tr("Server certificate is issued by an entity that is not trusted.")
+                                case Oxide.SecurityStatus.CertStatusRevoked:
+                                    return i18n.tr("Server certificate has been revoked.")
+                                case Oxide.SecurityStatus.CertStatusInvalid:
+                                    return i18n.tr("Server certificate is invalid.")
+                                case Oxide.SecurityStatus.CertStatusInsecure:
+                                    return i18n.tr("Server certificate is insecure.")
+                                default:
+                                    return i18n.tr("Server certificate failed our security checks for an unknown reason.")
+                            }
+                        }
+                    }
                 }
             }
 
@@ -64,76 +111,83 @@
                 width: parent.width
                 anchors.leftMargin: 0
                 anchors.rightMargin: 0
-            }
-        }
-
-        Label {
-            width: parent.width
-            wrapMode: Text.WordWrap
-            text: i18n.tr("You are connected to")
-            fontSize: "x-small"
-        }
-
-        Label {
-            width: parent.width
-            wrapMode: Text.WordWrap
-            text: securityStatus.certificate.subjectDisplayName
-            fontSize: "x-small"
-        }
-
-        ThinDivider {
-            width: parent.width
-            anchors.leftMargin: 0
-            anchors.rightMargin: 0
-            visible: orgName.visible || localityName.visible || stateName.visible || countryName.visible
-        }
-
-        Label {
-            width: parent.width
-            wrapMode: Text.WordWrap
-            visible: orgName.visible
-            text: i18n.tr("Which is run by")
-            fontSize: "x-small"
-        }
-
-        Label {
-            id: orgName
-            width: parent.width
-            wrapMode: Text.WordWrap
-            visible: text.length > 0
-            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrOrganizationName).join(", ")
-            fontSize: "x-small"
-        }
-
-        Label {
-            id: localityName
-            width: parent.width
-            wrapMode: Text.WordWrap
-            visible: text.length > 0
-            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrLocalityName).join(", ")
-            fontSize: "x-small"
-        }
-
-        Label {
-            id: stateName
-            width: parent.width
-            wrapMode: Text.WordWrap
-            visible: text.length > 0
-            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrStateOrProvinceName).join(", ")
-            fontSize: "x-small"
-        }
-
-        Label {
-            id: countryName
-            width: parent.width
-            wrapMode: Text.WordWrap
-            visible: text.length > 0
-            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrCountryName).join(", ")
-            fontSize: "x-small"
+                visible: !certificatePopover.isError
+            }
+        }
+
+        Column {
+            width: parent.width
+            spacing: units.gu(0.5)
+            visible: !certificatePopover.isError
+
+            Label {
+                width: parent.width
+                wrapMode: Text.WordWrap
+                text: i18n.tr("You are connected to")
+                fontSize: "x-small"
+            }
+
+            Label {
+                width: parent.width
+                wrapMode: Text.WordWrap
+                text: securityStatus.certificate.subjectDisplayName
+                fontSize: "x-small"
+            }
+
+            ThinDivider {
+                width: parent.width
+                anchors.leftMargin: 0
+                anchors.rightMargin: 0
+                visible: orgName.visible || localityName.visible || stateName.visible || countryName.visible
+            }
+
+            Label {
+                width: parent.width
+                wrapMode: Text.WordWrap
+                visible: orgName.visible
+                text: i18n.tr("Which is run by")
+                fontSize: "x-small"
+            }
+
+            Label {
+                id: orgName
+                width: parent.width
+                wrapMode: Text.WordWrap
+                visible: text.length > 0
+                text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrOrganizationName).join(", ")
+                fontSize: "x-small"
+            }
+
+            Label {
+                id: localityName
+                width: parent.width
+                wrapMode: Text.WordWrap
+                visible: text.length > 0
+                text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrLocalityName).join(", ")
+                fontSize: "x-small"
+            }
+
+            Label {
+                id: stateName
+                width: parent.width
+                wrapMode: Text.WordWrap
+                visible: text.length > 0
+                text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrStateOrProvinceName).join(", ")
+                fontSize: "x-small"
+            }
+
+            Label {
+                id: countryName
+                width: parent.width
+                wrapMode: Text.WordWrap
+                visible: text.length > 0
+                text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrCountryName).join(", ")
+                fontSize: "x-small"
+            }
         }
 
         Item {
-            height: units.gu(1.5)
+            height: units.gu(1)
             width: parent.width
         }
     }

=== added file 'src/app/webbrowser/assets/[e-mail]'
Binary files src/app/webbrowser/assets/[e-mail]	1970-01-01 00:00:00 +0000 and src/app/webbrowser/assets/[e-mail]	2015-01-21 15:39:32 +0000 differ