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 df18cb4c authored by Leigh B Stoller's avatar Leigh B Stoller

Address nits raised by Eric in issue #135. Lets see if anyone notices.

parent b1f3b243
......@@ -34,13 +34,13 @@ $(function ()
$("input[id='startorjoin']").change(function(e){
if ($(this).val() == "join") {
$('#start_project_rollup').addClass("hidden");
$('#submit_button').text("Join Project");
$('#signup_panel_title').text("Join Project");
$('#submit_button').text("Submit Request");
$('#signup_panel_title').text("Request to join a project");
}
else {
$('#start_project_rollup').removeClass("hidden");
$('#submit_button').text("Start Project");
$('#signup_panel_title').text("Start Project");
$('#submit_button').text("Submit Request");
$('#signup_panel_title').text("Request to start a project");
}
});
if (window.APT_OPTIONS.toomany) {
......@@ -51,11 +51,16 @@ $(function ()
function renderForm(formfields, errors, joinproject, showVerify,
thisUser, promoting)
{
var buttonLabel = (joinproject ? "Join Project" : "Start Project");
var buttonLabel = "Submit Request";
var pageTitle = (joinproject ?
"Request to join a project" :
"Request to start a project");
var about = aboutTemplate({});
var verify = verifyTemplate({
id: 'verify_modal',
label: buttonLabel
label: buttonLabel,
title: pageTitle
});
var personal_html = personalTemplate({
formfields: formfields,
......@@ -67,6 +72,7 @@ $(function ()
});
var signup = signupTemplate({
button_label: buttonLabel,
pagetitle: pageTitle,
general_error: (errors.error || ''),
about_account: (window.ISAPT && !thisUser ? about : null),
this_user: thisUser,
......
......@@ -35,6 +35,13 @@
class="form-control format-me" data-key="proj_url"
placeholder="Project Page URL" type="text">
</div>
<div>
<center>
<span class="text-danger">Students (grad or undergrad)</span>
<a href="" data-toggle='modal' data-target='#student-modal'>
read this!</a>
</center>
</div>
<div class="form-group sidebyside-form" >
<textarea name="formfields[proj_why]" rows="8"
class="form-control format-me" data-key="proj_why"
......@@ -51,4 +58,23 @@
you provide, the faster they can approve your project.
</div>
</div>
<div id='student-modal' class='modal fade'>
<div class='modal-dialog'>
<div class='modal-content'>
<div class='modal-header'>
<button type='button' class='close' data-dismiss='modal'
aria-hidden='true'>&times;</button>
<h4 class="text-center">Important</h4>
</div>
<div class='modal-body'>
<p>
If you are a student (undergraduate <b>or</b> graduate) do
<b>NOT</b> start a project. Your advisor must do this.
Your request will be rejected and you will have wasted
everyone's time!
</p>
</div>
</div>
</div>
</div>
</div>
......@@ -5,8 +5,15 @@
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'>
<%- button_label %>
<%- pagetitle %>
</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