Skip to content

GitLab

Commit 1d1c71e1 authored by Cody Cutler's avatar Cody Cutler
Browse files

Merge branch 'master' of... 

Merge branch 'master' of ccutler@git-public.flux.utah.edu:/flux/git/users/mike/emulab-devel into tpm-tmcd
parents 11ce2f77 06d83fc2
Hide whitespace changes
Inline Side-by-side
sql/updates/4/222 0 → 100644
View file @ 1d1c71e1
#
# Add missing sitevars.
#
use strict;
use libdb;
sub DoUpdate($$$)
{
my ($dbhandle, $dbname, $version) = @_;
DBQueryFatal("INSERT INTO sitevariables VALUES ".
"('protogeni/max_components','-1','-1', ".
" 'Maximum number of components that can be allocated.".
" -1 indicates any number of components can be allocated.', ".
" 0")
if (!TBSiteVarExists("protogeni/max_components"));
my $foo = "When set, external users may allocate slivers on your testbed.";
if (TBSiteVarExists("protogeni/max_components")) {
DBQueryFatal("update sitevariables set ".
"description='$foo' ".
"where name='protogeni/max_externalnodes'");
}
else {
DBQueryFatal("INSERT INTO sitevariables VALUES ".
"('protogeni/max_externalnodes',NULL,'1024', ".
" '$foo', 0");
}
return 0;
}
1;
www/showexp.php3
View file @ 1d1c71e1
......@@ -618,15 +618,18 @@ echo "<script type='text/javascript' language='javascript'>
var li_current = 'li_settings';
function Show(which) {
li = getObjbyName(li_current);
li.style.backgroundColor = '#DDE';
li.style.borderBottom = '1px solid #778';
if (li) {
li.style.backgroundColor = '#DDE';
li.style.borderBottom = '1px solid #778';
}
li_current = 'li_' + which;
li = getObjbyName(li_current);
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
x_Show(which, 0, 0, Show_cb);
if (li) {
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
x_Show(which, 0, 0, Show_cb);
}
return false;
}
function Show_cb(html) {
......@@ -675,12 +678,19 @@ echo "<script type='text/javascript' language='javascript'>
var urllocation = location.href; //find url parameter
if (urllocation && urllocation.indexOf('#') >= 0) {
var which = urllocation.substr(urllocation.indexOf('#') + 1);
li = getObjbyName('li_' + which);
if (!li) {
which = 'settings';
}
Show(which);
}
else {
li = getObjbyName(li_current);
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
if (li) {
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
}
}
}
</script>\n";
......
www/showproject.php3
View file @ 1d1c71e1
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -134,29 +134,44 @@ echo "<script type='text/javascript' language='javascript'>
var div_current = 'div_profile';
function Show(which) {
li = getObjbyName(li_current);
li.style.backgroundColor = '#DDE';
li.style.borderBottom = '1px solid #778';
div = getObjbyName(div_current);
div.style.display = 'none';
if (li) {
li.style.backgroundColor = '#DDE';
li.style.borderBottom = '1px solid #778';
div = getObjbyName(div_current);
div.style.display = 'none';
}
li_current = 'li_' + which;
li = getObjbyName(li_current);
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
div_current = 'div_' + which;
div = getObjbyName(div_current);
div.style.display = 'block';
li = getObjbyName(li_current);
if (li) {
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
div = getObjbyName(div_current);
div.style.display = 'block';
}
return false;
}
function Setup(which) {
li_current = 'li_' + which;
div_current = 'div_' + which;
li = getObjbyName(li_current);
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
div = getObjbyName(div_current);
div.style.display = 'block';
function Setup() {
var urllocation = location.href; //find url parameter
if (urllocation && urllocation.indexOf('#') >= 0) {
var which = urllocation.substr(urllocation.indexOf('#') + 1);
li = getObjbyName('li_' + which);
if (!li) {
which = 'profile';
}
Show(which);
}
else {
li = getObjbyName(li_current);
if (li) {
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
div = getObjbyName(div_current);
div.style.display = 'block';
}
}
}
</script>\n";
......@@ -167,30 +182,35 @@ echo "<div width=\"100%\" align=center>\n";
echo "<ul id=\"topnavbar\">\n";
if ($templates_html) {
echo "<li>
<a href=\"#A\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#templates\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_templates\" onclick=\"Show('templates');\">".
"Templates</a></li>\n";
}
if ($experiments_html) {
echo "<li>
<a href=\"#B\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#experiments\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_experiments\" onclick=\"Show('experiments');\">".
"Experiments</a></li>\n";
}
if ($groups_html) {
echo "<li>
<a href=\"#C\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#groups\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_groups\" onclick=\"Show('groups');\">".
"Groups</a></li>\n";
}
if ($members_html) {
echo "<li>
<a href=\"#D\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#members\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_members\" onclick=\"Show('members');\">".
"Members</a></li>\n";
}
echo "<li>
<a href=\"#E\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#profile\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_profile\" onclick=\"Show('profile');\">".
"Profile</a></li>\n";
......@@ -202,13 +222,15 @@ if ($isadmin && $stats_html) {
}
if ($papers_html) {
echo "<li>
<a href=\"#G\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#papers\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_papers\" onclick=\"Show('papers');\">".
"Publications</a></li>\n";
}
if ($vis_html) {
echo "<li>
<a href=\"#G\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#vis\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_vis\" onclick=\"Show('vis');\">".
"Visualization</a></li>\n";
}
......@@ -244,7 +266,7 @@ SUBPAGEEND();
# Get the active tab to look right.
#
echo "<script type='text/javascript' language='javascript'>
Setup(\"profile\");
Setup();
</script>\n";
#
......
www/showuser.php3
View file @ 1d1c71e1
......@@ -331,34 +331,48 @@ if ($message != "") {
# Function to change what is being shown.
#
echo "<script type='text/javascript' language='javascript'>
var li_current = 'li_experiments';
var table_current = 'experiments_table';
var li_current = 'li_profile';
var table_current = 'profile_table';
function Show(which) {
li = getObjbyName(li_current);
li.style.backgroundColor = '#DDE';
li.style.borderBottom = '1px solid #778';
table = getObjbyName(table_current);
table.style.display = 'none';
if (li) {
li.style.backgroundColor = '#DDE';
li.style.borderBottom = '1px solid #778';
table = getObjbyName(table_current);
table.style.display = 'none';
}
li_current = 'li_' + which;
li = getObjbyName(li_current);
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
table_current = which + '_table';
table = getObjbyName(table_current);
table.style.display = 'block';
li = getObjbyName(li_current);
if (li) {
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
table = getObjbyName(table_current);
table.style.display = 'block';
}
return false;
}
function Setup(which) {
li_current = 'li_' + which;
table_current = which + '_table';
li = getObjbyName(li_current);
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
table = getObjbyName(table_current);
table.style.display = 'block';
function Setup() {
var urllocation = location.href; //find url parameter
if (urllocation && urllocation.indexOf('#') >= 0) {
var which = urllocation.substr(urllocation.indexOf('#') + 1);
li = getObjbyName('li_' + which);
if (!li) {
which = 'profile';
}
Show(which);
}
else {
li = getObjbyName(li_current);
if (li) {
li.style.backgroundColor = 'white';
li.style.borderBottom = '1px solid white';
table = getObjbyName(table_current);
table.style.display = 'block';
}
}
}
</script>\n";
......@@ -369,42 +383,49 @@ echo "<div width=\"100%\" align=center>\n";
echo "<ul id=\"topnavbar\">\n";
if ($html_templates) {
echo "<li>
<a href=\"#A\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#templates\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_templates\" onclick=\"Show('templates');\">".
"Templates</a></li>\n";
}
if ($html_experiments) {
echo "<li>
<a href=\"#B\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#experiments\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_experiments\" onclick=\"Show('experiments');\">".
"Experiments</a></li>\n";
}
if ($html_instances) {
echo "<li>
<a href=\"#C\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#instances\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_instances\" onclick=\"Show('instances');\">".
"Instances</a></li>\n";
}
if ($html_groups) {
echo "<li>
<a href=\"#D\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#groups\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_groups\" onclick=\"Show('groups');\">".
"Projects</a></li>\n";
}
echo "<li>
<a href=\"#E\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#profile\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_profile\" onclick=\"Show('profile');\">".
"Profile</a></li>\n";
if ($isadmin && $html_stats) {
echo "<li>
<a href=\"#F\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#stats\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_stats\" onclick=\"Show('stats');\">".
"User Stats</a></li>\n";
}
if ($html_pubs) {
echo "<li>
<a href=\"#G\" class=topnavbar onfocus=\"this.hideFocus=true;\" ".
<a href=\"#pubs\" ".
"class=topnavbar onfocus=\"this.hideFocus=true;\" ".
"id=\"li_pubs\" onclick=\"Show('pubs');\">".
"Publications</a></li>\n";
}
......@@ -438,7 +459,7 @@ if ($html_experiments) {
$current = ($html_experiments ? "experiments" : "profile");
echo "<script type='text/javascript' language='javascript'>
Setup(\"$current\");
Setup();
</script>\n";
#
......
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