Merge lp:~amigadave/gnome-control-center-signon/legal-notice into lp:gnome-control-center-signon

[David King]

Add legal notice button to panel UI

* Add draft legal notice
* Add link to online legal notice
* Add legal notice button to AccountsPage
* Add legal notice button to OAuth plugin widget

This will need a UI freeze exception, as it changes the UI and a few translatable strings.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:113
http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/48/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/./label=quantal/48/console

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

Ugly as hell, but that's how it's designed to be... :-/
Works perfectly anyway, so thanks! :-)

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2012-09-18 10:12:12 +0000
+++ Makefile.am	2012-09-26 06:46:21 +0000
@@ -10,6 +10,7 @@
 libaccount_plugin_@LIBACCOUNT_PLUGIN_API_VERSION@_la_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-DLIBACCOUNT_PLUGIN_DIR=\"$(LIBACCOUNT_PLUGIN_DIR)\" \
+	-DG_LOG_DOMAIN=\"account-plugin\" \
 	$(LIBACCOUNT_PLUGIN_CFLAGS) \
 	$(WARN_CFLAGS)
 libaccount_plugin_@LIBACCOUNT_PLUGIN_API_VERSION@_la_LIBADD = \
 
=== added file 'help/C/legal-notice.page'
--- help/C/legal-notice.page	1970-01-01 00:00:00 +0000
+++ help/C/legal-notice.page	2012-09-26 06:46:21 +0000
@@ -0,0 +1,93 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="legal-notice">
+
+  <info>
+    <link type="guide" xref="index#information"/>
+
+    <revision version="0.1" date="2012-09-25" status="candidate"/>
+
+    <credit type="author">
+      <name>David King</name>
+      <email>[e-mail]</email>
+      <years>2012</years>
+    </credit>
+    <credit type="copyright">
+      <name>Canonical Ltd.</name>
+      <years>2012</years>
+    </credit>
+    <license>
+      <p>Creative Commons Attribution-ShareAlike 3.0</p>
+    </license>
+
+    <desc>Important information about Online Accounts.</desc>
+  </info>
+
+  <title>Legal notice</title>
+
+  <p>Ubuntu Online Accounts is provided by Canonical Group Limited (Canonical).
+  This Ubuntu Online Accounts legal notice applies to your use of Ubuntu Online
+  Accounts and incorporates the terms of
+  <link href="http://www.canonical.com/legal">Canonical's legal notice</link>
+  (and privacy policy).</p>
+
+  <section id="collection-of-credentials">
+    <title>Collection and use of credential information</title>
+
+    <p>You provide Ubuntu Online Accounts with your name and password(s)
+    (credentials) for those online services you want Ubuntu Online Accounts to
+    authenticate while using Ubuntu.</p>
+
+    <p>Ubuntu Online Accounts collects and stores your credentials when you
+    enter them in the web authentication dialog and uses them, and
+    authentication cookies, to provide authentication to those online services
+    each time you access them while using Ubuntu.</p>
+
+    <p>By using Ubuntu Online Accounts you consent to:</p>
+    <list>
+      <item><p>the collection and use of your credentials in this way;</p></item>
+      <item><p>the use of authentication cookies; and</p></item>
+      <item><p>the storage of your credentials and the authentication cookies on your Ubuntu computer.</p></item>
+    </list>
+    <p>Canonical will not access or use your credentials or authentication
+    cookies in any other way.</p>
+  </section>
+
+  <section id="links-and-third-party-content">
+    <title>Links and third party content</title>
+
+    <p>Ubuntu Online Accounts provides links to online services. Canonical has
+    no affiliation or partnership with the online services you link to from
+    Ubuntu Online Accounts. Any trademarks, logos and service marks displayed
+    on Ubuntu Online Accounts are the property of their owners, whether
+    Canonical or third parties. For further information on links to third party
+    sites and content please see Canonical's legal notice.</p>
+  </section>
+
+  <section id="ceasing-use">
+    <title>Ceasing use</title>
+
+    <p>You may cease using Ubuntu Online Accounts at any time. If you cease
+    using Ubuntu Online Accounts, or wish to cease using it for certain online
+    services, please ensure that you have removed all of your credentials from
+    the “Online Accounts” entry of your Ubuntu System Settings.</p>
+  </section>
+
+  <section id="changes">
+    <title>Changes</title>
+
+    <p>Although most changes are likely to be minor, Canonical may change this
+    legal notice from time to time, and at Canonical's sole discretion. Please
+    check this page from time to time for any changes to this legal notice as
+    we will not be able to notify you directly.</p>
+  </section>
+
+  <section id="contact-us">
+    <title>How to contact us</title>
+
+    <p>Please submit any questions or comments about Ubuntu Online Accounts or
+    this legal notice by contacting us at the following address: Canonical
+    Group Ltd, 5th Floor, Blue Fin Building, 110 Southwark Street, London,
+    England, SE1 0SU.</p>
+  </section>
+</page>
 
=== modified file 'help/Makefile.am'
--- help/Makefile.am	2012-04-10 12:52:15 +0000
+++ help/Makefile.am	2012-09-26 06:46:21 +0000
@@ -7,5 +7,6 @@
 	introduction.page \
 	add-account.page \
 	disable-account.page \
+	legal-notice.page \
 	remove-account.page \
 	supported-services.page
 
=== modified file 'libaccount-plugin/oauth-plugin.c'
--- libaccount-plugin/oauth-plugin.c	2012-09-10 11:15:39 +0000
+++ libaccount-plugin/oauth-plugin.c	2012-09-26 06:46:21 +0000
@@ -483,7 +483,9 @@
 create_infobar (ApOAuthPlugin *self)
 {
     GtkWidget *infobar;
+    GtkWidget *grid;
     GtkWidget *infobar_label;
+    GtkWidget *legal_button;
     GtkWidget *content_area;
     GtkCssProvider *css;
     GError *error;
@@ -501,15 +503,23 @@
     g_signal_connect (infobar, "response",
                       G_CALLBACK (on_infobar_response), self);
 
+    grid = gtk_grid_new ();
+
     provider = ap_plugin_get_provider ((ApPlugin *)self);
     text = g_strdup_printf (_("Please authorize Ubuntu to access "
-                              "your %s account"),
+                              "your %s account."),
                             ag_provider_get_display_name (provider));
     infobar_label = gtk_label_new (text);
     g_free (text);
 
+    gtk_container_add (GTK_CONTAINER (grid), infobar_label);
+
+    legal_button = gtk_link_button_new_with_label ("help:web-credentials/legal-notice",
+                                                   _("Learn more"));
+    gtk_container_add (GTK_CONTAINER (grid), legal_button);
+
     content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar));
-    gtk_container_add (GTK_CONTAINER (content_area), infobar_label);
+    gtk_container_add (GTK_CONTAINER (content_area), grid);
 
     css = gtk_css_provider_new ();
     error = NULL;
 
=== modified file 'src/cc-credentials-accounts-page.vala'
--- src/cc-credentials-accounts-page.vala	2012-08-09 09:02:03 +0000
+++ src/cc-credentials-accounts-page.vala	2012-09-26 06:46:21 +0000
@@ -98,8 +98,9 @@
         row_spacing = 6;
         column_spacing = 12;
 
-        this.add (create_accounts_tree ());
-        this.add (create_accounts_notebook ());
+        this.attach (create_legal_button (), 0, 0, 2, 1);
+        this.attach (create_accounts_tree (), 0, 1, 1, 1);
+        this.attach (create_accounts_notebook (), 1, 1, 1, 1);
 
         // Force handling of the changed signal.
         var selection = accounts_tree.get_selection ();
@@ -111,6 +112,26 @@
     }
 
     /**
+     * Create the buttonbox containing the button to display a legal notice.
+     *
+     * @return a Gtk.ButtonBox for presecting the legal notice button
+     */
+    private Gtk.Widget create_legal_button ()
+    {
+        var buttonbox = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
+        var legal_button = new Gtk.LinkButton.with_label ("help:"
+                                                          + "web-credentials"
+                                                          + "/legal-notice",
+                                                          _("Legal notice"));
+
+        buttonbox.layout_style = Gtk.ButtonBoxStyle.END;
+        buttonbox.add (legal_button);
+        buttonbox.show_all ();
+
+        return buttonbox;
+    }
+
+    /**
      * Create the treeview for the list of accounts and show it.
      *
      * @return a Gtk.ScrolledWindow containing a treeview of accounts