diff --git a/fas/fas/auth.py b/fas/fas/auth.py index 6f1f622..05b5deb 100644 --- a/fas/fas/auth.py +++ b/fas/fas/auth.py @@ -76,7 +76,7 @@ def isApproved(person, group): def CLADone(person): ''' - Returns True if the user has completed the GPG-signed CLA + Returns True if the user has completed the CLA ''' cla_done_group =config.get('cla_done_group') try: diff --git a/fas/fas/cla.py b/fas/fas/cla.py index 17931c8..f16838e 100644 --- a/fas/fas/cla.py +++ b/fas/fas/cla.py @@ -60,20 +60,20 @@ class CLA(controllers.Controller): @identity.require(turbogears.identity.not_anonymous()) @error_handler(error) @expose(template="fas.templates.cla.index") - def sign(self, agree=False): - '''Sign CLA''' + def send(self, agree=False): + '''Send CLA''' username = turbogears.identity.current.user_name person = People.by_username(username) if CLADone(person): - turbogears.flash(_('You have already signed the CLA.')) + turbogears.flash(_('You have already completed the CLA.')) turbogears.redirect('/cla/') return dict() if not agree: - turbogears.flash(_("You have not signed the CLA.")) + turbogears.flash(_("You have not completed the CLA.")) turbogears.redirect('/user/view/%s' % person.username) if not person.telephone or \ not person.postal_address: - turbogears.flash(_('To sign the CLA we must have your telephone number and postal address. Please ensure they have been filled out.')) + turbogears.flash(_('To complete the CLA, we must have your telephone number and postal address. Please ensure they have been filled out.')) turbogears.redirect('/user/edit/%s' % username) groupname = config.get('cla_fedora_group') group = Groups.by_name(groupname) @@ -85,16 +85,16 @@ class CLA(controllers.Controller): except: # TODO: If apply succeeds and sponsor fails, the user has # to remove themselves from the CLA group before they can - # sign the CLA and go through the above try block again. + # complete the CLA and go through the above try block again. turbogears.flash(_("You could not be added to the '%s' group.") % group.name) turbogears.redirect('/cla/') return dict() else: dt = datetime.utcnow() - Log(author_id=person.id, description='Signed CLA', changetime=dt) + Log(author_id=person.id, description='Completed CLA', changetime=dt) message = turbomail.Message(config.get('accounts_email'), config.get('legal_cla_email'), 'Fedora ICLA completed') message.plain = ''' -Fedora user %(username)s has signed a completed ICLA (below). +Fedora user %(username)s has completed an ICLA (below). Username: %(username)s Email: %(email)s Date: %(date)s @@ -113,7 +113,7 @@ Date: %(date)s template = loader.load('cla.txt', cls=TextTemplate) message.plain += template.generate(person=person).render('text') turbomail.enqueue(message) - turbogears.flash(_("You have successfully signed the CLA. You are now in the '%s' group.") % group.name) + turbogears.flash(_("You have successfully completed the CLA. You are now in the '%s' group.") % group.name) turbogears.redirect('/user/view/%s' % person.username) return dict() diff --git a/fas/fas/help.py b/fas/fas/help.py index f8cdc47..b00aedd 100644 --- a/fas/fas/help.py +++ b/fas/fas/help.py @@ -10,13 +10,13 @@ class Help(controllers.Controller): 'user_ircnick' : ['IRC Nick (Optional)', '

IRC Nick is used to identify yourself on irc.freenode.net. Please register your nick on irc.freenode.net first, then fill this in so people can find you online when they need to

'], 'user_email' : ['Email (Required)', '

This email address should be your prefered email contact and will be used to send various official emails to. This is also where your @fedoraproject.org email will get forwarded

'], '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_gpg_keyid' : ['GPG Key', '

A GPG key 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. This can be used when a password reset is sent to your email.

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

Required in order to complete 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', '

Required in order to complete 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.

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

In order to become a full Fedora contributor you must complete the 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.

'], 'user_ssh_key' : ['Public SSH Key', '

Many resources require public key authentiaction to work. By uploading your public key to us, you can then log in to our servers. Type "man ssh-keygen" for more information on creating your key. Once created you will want to upload ~/.ssh/id_dsa.pub or ~/.ssh/id_rsa.pub

'], 'user_locale': ['Locale', '

For non-english speaking peoples this allows individuals to select which locale they are in.

'], diff --git a/fas/fas/templates/cla/index.html b/fas/fas/templates/cla/index.html index ff12d90..ff8f9e6 100644 --- a/fas/fas/templates/cla/index.html +++ b/fas/fas/templates/cla/index.html @@ -12,10 +12,10 @@ ${Markup(_('<a href="%(url)s">Text Version</a>') % {'url': tg.url('/cla/text')})}

- ${Markup(_('You have already sucessfully signed the CLA.') % {'url': tg.url('/cla/text')})} + ${Markup(_('You have already sucessfully complete the CLA.') % {'url': tg.url('/cla/text')})}

-
+
diff --git a/fas/fas/templates/home.html b/fas/fas/templates/home.html index 2aba417..d6ac3ed 100644 --- a/fas/fas/templates/home.html +++ b/fas/fas/templates/home.html @@ -21,7 +21,7 @@
    -
  • ${_('CLA Not Signed. To become a full Fedora Contributor please ')}${_('Sign the CLA')}.
    • +
  • ${_('CLA not completed. To become a full Fedora Contributor please ')}${_('Complete the CLA')}.
  • You have not submitted an SSH key, some Fedora resources require an SSH key. Please submit yours by editing My Account
diff --git a/fas/fas/templates/user/edit.html b/fas/fas/templates/user/edit.html index 074af4a..0b25090 100644 --- a/fas/fas/templates/user/edit.html +++ b/fas/fas/templates/user/edit.html @@ -27,6 +27,16 @@
--> +
+ + + +
+
+ + + +
@@ -37,22 +47,12 @@
-
- - - -
-
- - - -