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

Kill classic picker button, we are not ever going back to classic.

parent c86d5366
......@@ -57,7 +57,6 @@ $optargs = OptionalPageArguments("create", PAGEARG_STRING,
"project", PAGEARG_PROJECT,
"asguest", PAGEARG_BOOLEAN,
"default", PAGEARG_STRING,
"classic", PAGEARG_STRING,
"from", PAGEARG_STRING,
"formfields", PAGEARG_ARRAY);
......@@ -86,29 +85,6 @@ if (isset($from) && ($from == "manage-profile" || $from == "show-profile")) {
$skipfirststep = 1;
}
#
# Alternate version of the picker, temporary.
#
if (isset($classic)) {
#
# This file is the default picker.
#
if ($classic == "true") {
setcookie("picker", "classic", 0, "/", $TBAUTHDOMAIN, 0);
$classic = 1;
}
else {
setcookie("picker", "new", 0, "/", $TBAUTHDOMAIN, 0);
$classic = 0;
}
}
elseif (isset($_COOKIE['picker'])) {
$classic = ($_COOKIE['picker'] == "classic" ? 1 : 0);
}
else {
$classic = 0;
}
if ($this_user) {
$projlist = $this_user->ProjectAccessList($TB_PROJECT_CREATEEXPT);
#
......@@ -342,7 +318,7 @@ function SPITFORM($formfields, $newuser, $errors)
{
global $TBBASE, $APTMAIL, $ISAPT, $ISCLOUD, $ISPNET, $PORTAL_NAME;
global $profile_array, $this_user, $profilename, $profile, $am_array;
global $projlist, $skipfirststep, $classic, $TBMAINSITE;
global $projlist, $skipfirststep, $TBMAINSITE;
$amlist = array();
$fedlist = array();
......@@ -367,9 +343,7 @@ function SPITFORM($formfields, $newuser, $errors)
}
SPITHEADER(1);
if (!$classic) {
echo "<link rel='stylesheet' href='css/picker.css'>\n";
}
echo "<link rel='stylesheet' href='css/picker.css'>\n";
# I think this will take care of XSS prevention?
echo "<script type='text/plain' id='form-json'>\n";
......@@ -465,7 +439,6 @@ function SPITFORM($formfields, $newuser, $errors)
echo " window.DOCONSTRAINTS = 1;\n";
echo " window.SKIPFIRSTSTEP = " . ($skipfirststep ? "true" : "false") . ";\n";
echo " window.PORTAL_NAME = '$PORTAL_NAME';\n";
echo " window.CLASSIC = " . ($classic ? "true" : "false") . ";\n";
echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
......@@ -479,7 +452,7 @@ function SPITFORM($formfields, $newuser, $errors)
REQUIRE_MARKED();
REQUIRE_JACKS();
REQUIRE_JQUERY_STEPS();
SPITREQUIRE("js/instantiate" . ($classic ? "" : "-new") . ".js");
SPITREQUIRE("js/instantiate-new.js");
}
if (!isset($create)) {
......
......@@ -131,39 +131,6 @@ $(function ()
if (projlist)
UpdateGroupSelector();
// TEMPORARY BUTTON FOR CLASSIC PICKER
// To be removed when the new picker becomes default
// Quick and dirty
var btntext = 'Use Classic Picker';
var btnhtml = window.location.href;
var whichchar = (btnhtml.indexOf('?') > -1) ? '&' : '?';
if (window.CLASSIC === undefined || window.CLASSIC) {
btntext = 'Try the New Picker!';
btnhtml = btnhtml.replace('classic=true','');
btnhtml += whichchar + 'classic=false';
}
else {
btnhtml = btnhtml.replace('classic=false','');
btnhtml += whichchar + 'classic=true';
}
btnhtml = btnhtml.replace('&&','&').replace('?&','?');
btnhtml.replace('#','');
$('#quickvm_topomodal #showtopo_dialog .modal-header').append('<a '+
' href="'+btnhtml+'"'+
'>'+
'<button'+
' id="whichPicker"'+
' class="btn btn-info btn-sm"'+
' style="position: absolute;top:14px;right:40px"'+
'>'+btntext+'</button>'+
'</a>');
// END TEMPORARY BUTTON
// Check if the browser has cookies stating what they previoiusly had minimized.
CookieCollapse('#profile_name > span', 'pp_collpased');
_.defer(function () {
......
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