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

[Stuart Langridge]

Show a small padlock on secure pages

Show a small padlock on secure pages.

[lp:~sil/libubuntuone/secure-padlock]

75. By Stuart Langridge on 2010-03-29

remove old useless function

[Rodrigo Moya (rodrigo-moya)]

Looks good

review: Approve

=== modified file 'data/u1-preview.js'
--- data/u1-preview.js	2010-03-05 12:27:29 +0000
+++ data/u1-preview.js	2010-03-29 15:57:44 +0000
@@ -49,4 +49,19 @@
 	        mainContent.insertBefore(warn, mainContent.firstChild);
 	    }
 	}
+
+	// add a padlock if this is a secure page
+	if (location.href.substr(0,6) == "https:") {
+	    var padlock = document.createElement("img");
+	    padlock.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAYAAACwXJejAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAINJREFUeNpiTEtLYwACfiCeBsQ2QCwHxK%2BBeB8QZwHxOyYGCOgFYl0gjgNiQyD2B2IJIJ4DkmSBKvIGYjcgvsyAAOlAfAzEgJkkCsQ3GVDBI6gzwIp4gJgZiH%2BhKfoOFQdb9xkq%2BJ8BO/jPxEAEGABFTwmoeQpSlALEL3AoAImnAAQYAHZ7FWCCovUtAAAAAElFTkSuQmCC";
+	    padlock.style.position = "fixed";
+	    padlock.style.bottom = "0";
+	    padlock.style.right = "0";
+	    padlock.style.zIndex = "1000";
+	    padlock.onclick = function() {
+	        window.status = "u1showcertificate:::";
+	        return false;
+	    }
+	    document.body.appendChild(padlock);
+	}
 })()
 
=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2010-03-25 22:07:59 +0000
+++ libubuntuone/u1-music-store.c	2010-03-29 15:57:44 +0000
@@ -784,6 +784,12 @@
 			g_strfreev (args);
 		}
 	}
+
+	if (g_str_has_prefix (text, "u1showcertificate:::")) {
+		/* should show certificate here in its own window. */
+	}
+
+	
 }
 
 static gboolean