1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/1b4fe994e587/ changeset: 1b4fe994e587 user: natefoo date: 2012-07-12 20:05:55 summary: Add links to terms and conditions. affected #: 4 files
diff -r b20316c1058a583b73693dedeb8224b1c1f044e1 -r 1b4fe994e587bd63e1afd5bd7f45db14a00e2da7 templates/user/login.mako --- a/templates/user/login.mako +++ b/templates/user/login.mako @@ -53,6 +53,13 @@ ${render_openid_form( redirect, False, openid_providers )} %endif
+ %if trans.app.config.get( 'terms_url', None ) is not None: + <br/> + <p> + <a href="${trans.app.config.get('terms_url', None)}">Terms and Conditions for use of this service</a> + </p> + %endif + %endif
</div>
diff -r b20316c1058a583b73693dedeb8224b1c1f044e1 -r 1b4fe994e587bd63e1afd5bd7f45db14a00e2da7 templates/user/register.mako --- a/templates/user/register.mako +++ b/templates/user/register.mako @@ -19,6 +19,13 @@ ## But if the current user is not an admin user, then don't display the registration form. %if trans.user_is_admin() or not trans.user: ${render_registration_form()} + + %if trans.app.config.get( 'terms_url', None ) is not None: + <br/> + <p> + <a href="${trans.app.config.get('terms_url', None)}">Terms and Conditions for use of this service</a> + </p> + %endif %endif
<%def name="render_registration_form( form_action=None )">
diff -r b20316c1058a583b73693dedeb8224b1c1f044e1 -r 1b4fe994e587bd63e1afd5bd7f45db14a00e2da7 templates/webapps/galaxy/base_panels.mako --- a/templates/webapps/galaxy/base_panels.mako +++ b/templates/webapps/galaxy/base_panels.mako @@ -129,6 +129,8 @@ [_('Video tutorials (screencasts)'), app.config.get( "screencasts_url", "http://galaxycast.org" ), "_blank" ], [_('How to Cite Galaxy'), app.config.get( "citation_url", "http://wiki.g2.bx.psu.edu/Citing%20Galaxy" ), "_blank" ] ] + if app.config.get( 'terms_url', None ) is not None: + menu_options.append( [_('Terms and Conditions'), app.config.get( 'terms_url', None ), '_blank'] ) tab( "help", _("Help"), None, menu_options=menu_options) %>
diff -r b20316c1058a583b73693dedeb8224b1c1f044e1 -r 1b4fe994e587bd63e1afd5bd7f45db14a00e2da7 universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -259,6 +259,10 @@ # The URL linked by the "How to Cite..." link in the "Help" menu. #citation_url = http://wiki.g2.bx.psu.edu/Citing%20Galaxy
+# The URL linked by the "Terms and Conditions" link in the "Help" menu, as well +# as on the user registration and login forms. +#terms_url = None + # Serve static content, which must be enabled if you're not serving it via a # proxy server. These options should be self explanatory and so are not # documented individually. You can use these paths (or ones in the proxy
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.