Merge branch 'master' of ssh://git.fedorahosted.org/git/fedora-infrastructure

fas/client/fasClient

@@ -29,6 +29,7 @@ import codecs
 import datetime
 import time
 
+from urllib2 import URLError
 from fedora.tg.client import BaseClient, AuthError, ServerError
 from optparse import OptionParser
 from shutil import move, rmtree, copytree
@@ -539,6 +540,9 @@ if __name__ == '__main__':
         except AuthError, e:
             print >> sys.stderr, e
             sys.exit(1)
+        except URLError, e:
+            print >> sys.stderr, 'Could not connect to %s - %s' % (FAS_URL, e.reason[1])
+            sys.exit(9)
         fas.mk_tempdir()
         fas.make_group_db()
         fas.make_passwd_db()

fas/fas/help.py

@@ -35,6 +35,7 @@ class Help(controllers.Controller):
             'group_self_removal':   ['Self Removal', '''<p>Should users be able to remove themselves from this group without sponsor / admin intervention?  (recommended yes)</p>'''],
             'group_prerequisite':   ['Must Belong To', '''<p>Before a user can join this group, they must belong to the group listed in this box.  <b>This value cannot be removed without administrative intervention, only changed</b>.  Recommended values are for the 'cla_sign' group.</p>'''],
             'group_join_message':   ['Join Message', '''<p>This message will go out to users when they join the group.  It should be informative and offer tips about what to do next.  A description of the group would also be valuable here</p>'''],
+            'gencert':              ['Client Side Cert', '''<p>The client side cert is generally used to grant access to upload packages to Fedora or for other authentication purposes like with koji.  If you are not a package maintainer there is no need to worry about the client side cert</p>'''],
             }
 
     def __init__(self):

fas/fas/templates/home.html

@@ -27,7 +27,8 @@
       </ul>
       <div>
         <!-- TODO: Make this entire page more friendly -->
-        <a href="${tg.url('/user/gencert')}">Download a client-side certificate</a>
+        <a href="${tg.url('/user/gencert')}">Download a client-side certificate</a>&nbsp;
+        <script type="text/javascript">var gencert = new HelpBalloon({dataURL: '${tg.url('/help/get_help/gencert')}'});</script>
       </div>
   </body>
 </html>