Merge lp:~nataliabidart/ubuntu-sso-client/remove-unused-fields into lp:ubuntu-sso-client

Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 608
Merged at revision: 612
Proposed branch: lp:~nataliabidart/ubuntu-sso-client/remove-unused-fields
Merge into: lp:ubuntu-sso-client
Diff against target: 62 lines (+14/-6)
2 files modified
ubuntu_sso/gui.py (+11/-5)
ubuntu_sso/tests/test_gui.py (+3/-1)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu-sso-client/remove-unused-fields
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Alejandro J. Cura (community) Approve
Review via email: mp+34211@code.launchpad.net

Commit message

Hiding unused fields to make the registration UI a bit shorter (LP: #627440).

Description of the change

Hiding unused fields to make the registration UI a bit shorter.

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Looks fine on a 11.6", 1366x768 screen.
Found another related issue, bug #627496

review: Approve
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
John Lenton (chipaca) wrote :

leave this on 'needs review' until we get the uie

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/gui.py'
2--- ubuntu_sso/gui.py 2010-08-31 14:31:22 +0000
3+++ ubuntu_sso/gui.py 2010-08-31 15:17:45 +0000
4@@ -320,7 +320,7 @@
5
6 window_size = None
7 if not login_only:
8- window_size = (550, 600)
9+ window_size = (550, 500)
10 self._append_page(self._build_enter_details_page())
11 self._append_page(self._build_tc_page())
12 self._append_page(self._build_verify_email_page())
13@@ -354,6 +354,11 @@
14 except:
15 msg = 'UbuntuSSOClientGUI: failed set_transient_for win id %r'
16 logger.exception(msg, window_id)
17+
18+ # XXX: Hidding unused widgets to save some space (LP #627440).
19+ self.name_entry.hide()
20+ self.yes_to_updates_checkbutton.hide()
21+
22 self.window.show()
23
24 def _setup_signals(self):
25@@ -703,10 +708,11 @@
26
27 error = False
28
29- name = self.name_entry.get_text()
30- if not name:
31- self.name_entry.set_warning(self.FIELD_REQUIRED)
32- error = True
33+ # XXX: Hidding unused widgets to save some space (LP #627440).
34+ #name = self.name_entry.get_text()
35+ #if not name:
36+ # self.name_entry.set_warning(self.FIELD_REQUIRED)
37+ # error = True
38
39 # check email
40 email1 = self.email1_entry.get_text()
41
42=== modified file 'ubuntu_sso/tests/test_gui.py'
43--- ubuntu_sso/tests/test_gui.py 2010-08-31 14:31:22 +0000
44+++ ubuntu_sso/tests/test_gui.py 2010-08-31 15:17:45 +0000
45@@ -837,7 +837,7 @@
46
47 def test_join_ok_button_does_nothing_if_clicked_but_disabled(self):
48 """The join form can only be submitted if the button is sensitive."""
49- self.patch(self.ui.name_entry, 'get_text', self._set_called)
50+ self.patch(self.ui.email1_entry, 'get_text', self._set_called)
51
52 self.ui.join_ok_button.set_sensitive(False)
53 self.ui.join_ok_button.clicked()
54@@ -1115,6 +1115,8 @@
55 self.assert_correct_entry_warning(self.ui.name_entry,
56 self.ui.FIELD_REQUIRED)
57 self.assertNotIn('register_user', self.ui.backend._called)
58+ test_warning_is_shown_if_name_empty.skip = \
59+ 'Unused for now, will be hidden to save space (LP: #627440).'
60
61 def test_warning_is_shown_if_empty_email(self):
62 """A warning message is shown if emails are empty."""

Subscribers

People subscribed via source and target branches