All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 841f1fb2 authored by Robert Ricci's avatar Robert Ricci

Partial revert of commit df18cb4c.

Leave the link to the AUP (when we have one), and the improvement
to the "submit" buttons. Remove the unnecessarily combative (and
not strictly true) test about students.
parent a17cbe6e
......@@ -34,13 +34,13 @@ $(function ()
$("input[id='startorjoin']").change(function(e){
if ($(this).val() == "join") {
$('#start_project_rollup').addClass("hidden");
$('#submit_button').text("Submit Request");
$('#signup_panel_title').text("Request to join a project");
$('#submit_button').text("Join Project");
$('#signup_panel_title').text("Join Project");
}
else {
$('#start_project_rollup').removeClass("hidden");
$('#submit_button').text("Submit Request");
$('#signup_panel_title').text("Request to start a project");
$('#submit_button').text("Start Project");
$('#signup_panel_title').text("Start Project");
}
});
if (window.APT_OPTIONS.toomany) {
......@@ -51,16 +51,11 @@ $(function ()
function renderForm(formfields, errors, joinproject, showVerify,
thisUser, promoting)
{
var buttonLabel = "Submit Request";
var pageTitle = (joinproject ?
"Request to join a project" :
"Request to start a project");
var buttonLabel = (joinproject ? "Join Project" : "Start Project");
var about = aboutTemplate({});
var verify = verifyTemplate({
id: 'verify_modal',
label: buttonLabel,
title: pageTitle
label: buttonLabel
});
var personal_html = personalTemplate({
formfields: formfields,
......@@ -72,7 +67,6 @@ $(function ()
});
var signup = signupTemplate({
button_label: buttonLabel,
pagetitle: pageTitle,
general_error: (errors.error || ''),
about_account: (window.ISAPT && !thisUser ? about : null),
this_user: thisUser,
......
......@@ -5,15 +5,8 @@
col-xs-12'>
<div class='panel panel-default'>
<div class='panel-heading'>
<% if (window.ISCLOUD) { %>
<span class="pull-right">
Please see our
<a href="http://www.cloudlab.us/aup.php" target="_blank">
Acceptible Use Policy</a>
</span>
<% } %>
<h3 class='panel-title' id='signup_panel_title'>
<%- pagetitle %>
<%- button_label %>
</h3>
</div>
<div class='panel-body'>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment