← Back to branch summary

~ubuntuone-pqm-team/canonical-identity-provider/trunk

~ubuntuone-pqm-team/canonical-identity-provider/trunk

« back to all changes in this revision

Viewing changes to src/webui/views/ui.py

Committer: Tarmac
Author(s): Natalia B. Bidart
Date: 2013-06-13 00:42:12 UTC
mfrom: (922.1.24 more-qa-anchors-for-sso)
Revision ID: tarmac-20130613004212-rzryogvwsfzw0h80

[r=elopio] - Adding lots of data-qa-id attrs to several HTML elements for ubuntu, launchpad and ubuntuone templates.
- Bumped revno of u1testutils to 80.
- Unified login/logout template rendering mechanism between ubuntu and launchpad.

files added:
src/webui/templates/widgets/launchpad/login-button.html

files removed:
acceptance/tests/devices/scripts

acceptance/tests/new_account/passwords_bad_client-side_ubuntuone.csv

acceptance/tests/new_account/passwords_bad_client-side_ubuntuone.py

files modified:
acceptance/actions/subheader.py

acceptance/helpers.py

acceptance/pages.py

acceptance/tests/applications/create_multiple_apps.py

acceptance/tests/applications/delete_app.py

acceptance/tests/devices/__init__.py

acceptance/tests/devices/testcases/test_device_login.py

acceptance/tests/logout/logout_deep_pages.py

acceptance/tests/logout/logout_ubuntu.py

acceptance/tests/new_account/passwords_bad_client-side.csv

acceptance/tests/new_account/passwords_bad_client-side.py

acceptance/tests/new_account/passwords_bad_server-side.csv

acceptance/tests/new_account/passwords_bad_server-side.py

acceptance/tests/root/links.py

requirements/testing.txt

scripts/acceptance-dev.sh

scripts/run-acceptance-tests

src/identityprovider/media/ubuntu/styles.css

src/identityprovider/templates/server/decide.html

src/identityprovider/templatetags/menu_item.py

src/identityprovider/tests/test_views_server.py

src/webui/templates/account/applications.html

src/webui/templates/account/confirm_email_invalidation.html

src/webui/templates/account/confirm_new_email.html

src/webui/templates/account/delete_email.html

src/webui/templates/account/edit.html

src/webui/templates/account/emails.html

src/webui/templates/account/new_email.html

src/webui/templates/device/addition-generic.html

src/webui/templates/device/generate-codes.html

src/webui/templates/device/list.html

src/webui/templates/device/print-codes.html

src/webui/templates/device/removal.html

src/webui/templates/device/rename.html

src/webui/templates/device/types.html

src/webui/templates/enter_token.html

src/webui/templates/launchpad/base.html

src/webui/templates/launchpad/registration/confirm_new_account.html

src/webui/templates/launchpad/registration/email_sent.html

src/webui/templates/launchpad/registration/forgot_password.html

src/webui/templates/launchpad/registration/login.html

src/webui/templates/launchpad/registration/logout.html

src/webui/templates/launchpad/registration/new_account.html

src/webui/templates/launchpad/registration/reset_password.html

src/webui/templates/launchpad/registration/twofactor.html

src/webui/templates/menu_item.html

src/webui/templates/select_language.html

src/webui/templates/ubuntu/base.html

src/webui/templates/ubuntu/registration/confirm_new_account.html

src/webui/templates/ubuntu/registration/email_sent.html

src/webui/templates/ubuntu/registration/forgot_password.html

src/webui/templates/ubuntu/registration/login.html

src/webui/templates/ubuntu/registration/new_account.html

src/webui/templates/ubuntu/registration/reset_password.html

src/webui/templates/ubuntu/registration/twofactor.html

src/webui/templates/ubuntuone/account/applications.html

src/webui/templates/ubuntuone/account/confirm_new_email.html

src/webui/templates/ubuntuone/account/delete_email.html

src/webui/templates/ubuntuone/account/edit.html

src/webui/templates/ubuntuone/account/emails.html

src/webui/templates/ubuntuone/account/new_email.html

src/webui/templates/ubuntuone/base.html

src/webui/templates/ubuntuone/device/list.html

src/webui/templates/ubuntuone/device/print-codes.html

src/webui/templates/ubuntuone/device/rename.html

src/webui/templates/ubuntuone/device/types.html

src/webui/templates/ubuntuone/enter_token.html

src/webui/templates/ubuntuone/registration/_create_account_form.html

src/webui/templates/ubuntuone/registration/_login_form.html

src/webui/templates/ubuntuone/registration/confirm_new_account.html

src/webui/templates/ubuntuone/registration/email_sent.html

src/webui/templates/ubuntuone/registration/forgot_password.html

src/webui/templates/ubuntuone/registration/reset_password.html

src/webui/templates/ubuntuone/registration/twofactor.html

src/webui/templates/ubuntuone/select_language.html

src/webui/templates/ubuntuone/server/decide.html

src/webui/templates/widgets/launchpad/logout-button.html

src/webui/templates/widgets/passwords.html

src/webui/templates/widgets/ubuntu/login-button.html

src/webui/templates/widgets/ubuntu/logout-button.html

src/webui/templates/widgets/ubuntuone/header-me-menu.html

src/webui/templates/widgets/ubuntuone/personal-menu.html

src/webui/views/account.py

src/webui/views/ui.py

Show diffs side-by-side

added added

removed removed

src/webui/views/ui.py

872

872

873

873

874

874

def static_page(request, page_name):

875

if settings.BRAND not in ('ubuntu', 'ubuntuone'):

875

if get_current_brand() not in ('ubuntu', 'ubuntuone'):

876

876

raise Http404

877

877

878

878

return render_to_response('static/%s.html' % page_name,

Older »