From b4fb0fc371f2425e7b5c1f02b4f6d45b2888d65b Mon Sep 17 00:00:00 2001 From: Michael McGrath Date: Sat, 1 Mar 2008 22:46:36 -0600 Subject: [PATCH] Added some more online help --- fas/fas/help.py | 5 +++++ fas/fas/templates/user/edit.html | 7 +++++-- fas/fas/templates/user/view.html | 6 ++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fas/fas/help.py b/fas/fas/help.py index ed07520..23dd5d6 100644 --- a/fas/fas/help.py +++ b/fas/fas/help.py @@ -11,6 +11,11 @@ class Help(controllers.Controller): 'user_human_name' : ['Full Name (Required)', '

Your Human Name or "real life" name

'], 'user_gpg_keyid' : ['GPG Key', '

Only required for users signing the CLA. It is generally used to prove that a message or email came from you or to encrypt information so that only the recipients can read it. See the CLAHowTo for more information

'], 'user_telephone' : ['Telephone', '

Only required for users signing the CLA. Sometimes during a time of emergency someone from the Fedora Project may need to contact you. For more information see our Privacy Policy

'], + 'user_postal_address': ['Postal Address', '

Only required for users signing the CLA. This should be a mailing address where you can be contacted. See our Privacy Policy about any concerns.

'], + 'user_timezone': ['Timezone (Optional)', '

Please specify the time zone you are in.

'], + 'user_comments': ['Comments (Optional)', '

Misc comments about yourself.

'], + 'user_account_status': ['Account Status', '

Shows account status, possible values include

'], + 'user_cla' : ['CLA', '

In order to become a full Fedora contributor you must sign a Contributor License Agreement. This license is a legal agreement between you and Red Hat. Full status allows people to contribute content and code and is recommended for anyone interested in getting involved in the Fedora Project. To find out more, see the CLAHowTo.

'], } def __init__(self): diff --git a/fas/fas/templates/user/edit.html b/fas/fas/templates/user/edit.html index f5ffb80..679739c 100644 --- a/fas/fas/templates/user/edit.html +++ b/fas/fas/templates/user/edit.html @@ -41,7 +41,8 @@
- + +
@@ -51,10 +52,12 @@ ?> +
- + +
diff --git a/fas/fas/templates/user/view.html b/fas/fas/templates/user/view.html index e22cbb4..3cdf082 100644 --- a/fas/fas/templates/user/view.html +++ b/fas/fas/templates/user/view.html @@ -23,12 +23,14 @@
${_('Postal Address:')}
${person.postal_address} 
${_('Comments:')}
${person.comments} 
${_('Password:')}
${_('Valid')} (change)
-
${_('Account Status:')}
${_('Valid')}
+
${_('Account Status:')}
${_('Valid')} +
${_('CLA:')}
${_('Signed CLA')} ${_('Click-through CLA')}(${_('GPG Sign it!')}) - ${_('Not Done')} (${_('Sign it!')})
+ ${_('Not Done')} (${_('Sign it!')}) +

${_('Your Roles')}