Merge lp:~gary-lasker/software-center/tos-urls-lp961538 into lp:software-center

[Gary Lasker]

This branch implements Anthony's notes for bug 961538. It fixes the URLs and sets a separate URL for use in a web browser (where header/footers are included) vs. the embedded dialog (where they are not).

Thanks!

=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py	2012-03-16 09:02:42 +0000
+++ softwarecenter/enums.py	2012-03-21 20:58:18 +0000
@@ -52,8 +52,11 @@
 UBUNTU_SSO_SERVICE = os.environ.get(
     "USSOC_SERVICE_URL", "https://login.ubuntu.com/api/1.0")
 
-# the terms-of-service link
-SOFTWARE_CENTER_TOS_LINK = "http://apps.ubuntu.com/cat/tos"
+# the terms-of-service links (the first is for display in a web browser
+# as it has the header and footer, the second is for display in a dialog
+# as it lacks them and so looks better)
+SOFTWARE_CENTER_TOS_LINK = "https://apps.ubuntu.com/cat/tos/"
+SOFTWARE_CENTER_TOS_LINK_NO_HEADER = "https://apps.ubuntu.com/cat/tos/plain/ "
 
 # version of the database, every time something gets added (like
 # terms for mime-type) increase this (but keep as a string!)

=== modified file 'softwarecenter/ui/gtk3/dialogs/dialog_tos.py'
--- softwarecenter/ui/gtk3/dialogs/dialog_tos.py	2012-03-19 14:38:10 +0000
+++ softwarecenter/ui/gtk3/dialogs/dialog_tos.py	2012-03-21 20:58:18 +0000
@@ -26,6 +26,7 @@
 
 from softwarecenter.ui.gtk3.views.webkit import ScrolledWebkitWindow
 from softwarecenter.ui.gtk3.widgets.spinner import SpinnerNotebook
+from softwarecenter.enums import SOFTWARE_CENTER_TOS_LINK_NO_HEADER
 
 
 class DialogTos(Gtk.Dialog):
@@ -65,7 +66,7 @@
 
     def run(self):
         self.spinner.show_spinner()
-        self.webkit.load_uri("http://apps.ubuntu.com/cat/tos")
+        self.webkit.load_uri(SOFTWARE_CENTER_TOS_LINK_NO_HEADER)
         return Gtk.Dialog.run(self)
 
     def _on_load_status_changed(self, view, pspec):