arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Added an icon for conference management. Added fields in the config for teachers

Browse Source
This commit is contained in:
jacob 2010-11-18 22:46:46 +00:00
parent 0720cb0ae0
commit 8f255f4eb8
5 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/db.code.version.txt
View File

@ -1 +1 @@
222
223

33
db/db.update.223.sql Normal file
View File

@ -0,0 +1,33 @@
INSERT INTO `config` (
`var` ,
`val` ,
`category` ,
`type` ,
`type_values` ,
`ord` ,
`description` ,
`year` ,
`conferences_id` ,
`section` ,
`conferencetypes`
)
VALUES (
'teacher_personal_fields', 'phonehome,phonecell,phonework,org,address,city,province,lang', 'Teacher Registration', 'multisel', 'sex=Gender|phonehome=Home Phone|phonework=Work Phone|phonecell=Cell Phone|fax=Fax|org=Organization|birthdate=Birthdate|lang=Preferred Language|address=Address and PostalCode|city=City|province=Province', '500', 'Personal Information to ask for on the Teacher personal information page (in addition to Name and Email)', '-1', '-1', 'conference', 'sciencefair,scienceolympics'
);
INSERT INTO `config` (
`var` ,
`val` ,
`category` ,
`type` ,
`type_values` ,
`ord` ,
`description` ,
`year` ,
`conferences_id` ,
`section` ,
`conferencetypes`
)
VALUES (
'teacher_personal_required', 'phonehome,address,city,province', 'Teacher Registration', 'multisel', 'sex=Gender|phonehome=Home Phone|phonework=Work Phone|phonecell=Cell Phone|fax=Fax|org=Organization|birthdate=Birthdate|lang=Preferred Language|address=Address and PostalCode|city=City|province=Province', '600', 'Required Personal Information on the Teacher personal information page (Name and Email is always required)', '-1', '-1', 'conference', 'sciencefair,scienceolympics'
);

BIN
theme/icons_default/grouped_people.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

1
theme/icons_default/icons.php
View File

@ -72,5 +72,6 @@
$theme_icons['icons']['new_version_checker']="numbers.png";
$theme_icons['icons']['rollover_fiscal_year']="rollover_fiscal.png";
$theme_icons['icons']['backup_restore']="rebuild.png";
$theme_icons['icons']['conferences']="grouped_people.png";
?>

2
user.inc.php
View File

@ -1173,7 +1173,7 @@ function user_judge_registration_status()
{
global $config;
$now = date('Y-m-d H:i:s');
if(array_key_exists('judgeregopen', $config['dates'])){
if(is_array($config['dates']) && array_key_exists('judgeregopen', $config['dates'])){
if($now < $config['dates']['judgeregopen']) return "notopenyet";
if($now > $config['dates']['judgeregclose']) return "closed";
}