Merge lp:~sil/libubuntuone/secure-padlock into lp:libubuntuone

Proposed by Stuart Langridge on 2010-03-29
Status: Merged
Approved by: Rodrigo Moya on 2010-03-29
Approved revision: 75
Merged at revision: not available
Proposed branch: lp:~sil/libubuntuone/secure-padlock
Merge into: lp:libubuntuone
Diff against target: 40 lines (+21/-0)
2 files modified
data/u1-preview.js (+15/-0)
libubuntuone/u1-music-store.c (+6/-0)
To merge this branch: bzr merge lp:~sil/libubuntuone/secure-padlock
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) 2010-03-29 Approve on 2010-03-29
Review via email: mp+22375@code.launchpad.net

Commit message

Show a small padlock on secure pages

Description of the change

Show a small padlock on secure pages.

To post a comment you must log in.
lp:~sil/libubuntuone/secure-padlock updated on 2010-03-29
75. By Stuart Langridge on 2010-03-29

remove old useless function

Rodrigo Moya (rodrigo-moya) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/u1-preview.js'
2--- data/u1-preview.js 2010-03-05 12:27:29 +0000
3+++ data/u1-preview.js 2010-03-29 15:57:44 +0000
4@@ -49,4 +49,19 @@
5 mainContent.insertBefore(warn, mainContent.firstChild);
6 }
7 }
8+
9+ // add a padlock if this is a secure page
10+ if (location.href.substr(0,6) == "https:") {
11+ var padlock = document.createElement("img");
12+ padlock.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAYAAACwXJejAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAINJREFUeNpiTEtLYwACfiCeBsQ2QCwHxK%2BBeB8QZwHxOyYGCOgFYl0gjgNiQyD2B2IJIJ4DkmSBKvIGYjcgvsyAAOlAfAzEgJkkCsQ3GVDBI6gzwIp4gJgZiH%2BhKfoOFQdb9xkq%2BJ8BO/jPxEAEGABFTwmoeQpSlALEL3AoAImnAAQYAHZ7FWCCovUtAAAAAElFTkSuQmCC";
13+ padlock.style.position = "fixed";
14+ padlock.style.bottom = "0";
15+ padlock.style.right = "0";
16+ padlock.style.zIndex = "1000";
17+ padlock.onclick = function() {
18+ window.status = "u1showcertificate:::";
19+ return false;
20+ }
21+ document.body.appendChild(padlock);
22+ }
23 })()
24
25=== modified file 'libubuntuone/u1-music-store.c'
26--- libubuntuone/u1-music-store.c 2010-03-25 22:07:59 +0000
27+++ libubuntuone/u1-music-store.c 2010-03-29 15:57:44 +0000
28@@ -784,6 +784,12 @@
29 g_strfreev (args);
30 }
31 }
32+
33+ if (g_str_has_prefix (text, "u1showcertificate:::")) {
34+ /* should show certificate here in its own window. */
35+ }
36+
37+
38 }
39
40 static gboolean

Subscribers

People subscribed via source and target branches