diff --git a/committee_main.php b/committee_main.php
index a91bf8c0..aed19ff3 100644
--- a/committee_main.php
+++ b/committee_main.php
@@ -49,7 +49,7 @@
echo "
\n";
echo " ".theme_icon("edit_profile")." ".i18n("Edit My Profile")." | ";
echo " ".theme_icon("change_password")." ".i18n("Change My Password")." | ";
- echo " ".theme_icon("")." ".i18n("Manage My Roles")." | ";
+ echo " ".theme_icon("manage_roles")." ".i18n("Manage My Roles")." | ";
echo "
\n";
echo "\n";
diff --git a/common.inc.php b/common.inc.php
index 0d59300e..e964d044 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -179,7 +179,8 @@ while($r=mysql_fetch_object($q))
}
//and now pull the theme
-require_once("theme/".$config['theme']."/theme.php");
+require_once("theme/{$config['theme']}/theme.php");
+require_once("theme/{$config['theme_icons']}/icons.php");
require_once("committee.inc.php");
@@ -646,7 +647,7 @@ function send_popup_header($title="")
=i18n($title)?>
-
+
@@ -1105,13 +1106,14 @@ $CWSFDivisions=array(
7=>"Physical & Mathematical Sciences"
);
-function theme_icon($icon) {
- global $theme;
- global $config;
- if($theme['icons'][$icon])
- return "
";
- else
- return "";
+function theme_icon($icon, $width=0) {
+ global $theme_icons, $config;
+
+ $w = ($width == 0) ? '' : "width=\"$width\"" ;
+ if($theme_icons['icons'][$icon])
+ return "
";
+
+ return "";
}
//$d can be a unix timestamp integer, OR a text string, eg 2008-01-22
diff --git a/config_editor.inc.php b/config_editor.inc.php
index 4aaf862a..08741725 100644
--- a/config_editor.inc.php
+++ b/config_editor.inc.php
@@ -305,7 +305,37 @@ function config_editor($category, $year, $array_name, $self)
print("");
}
print("");
- break;
+ break;
+
+ case 'theme':
+ print("");
+ break;
default:
print("\n");
diff --git a/db/db.code.version.txt b/db/db.code.version.txt
index fa8f08cb..1b9cba4a 100644
--- a/db/db.code.version.txt
+++ b/db/db.code.version.txt
@@ -1 +1 @@
-150
+151
diff --git a/db/db.update.151.sql b/db/db.update.151.sql
new file mode 100644
index 00000000..9b5e63c9
--- /dev/null
+++ b/db/db.update.151.sql
@@ -0,0 +1,13 @@
+ALTER TABLE `config` CHANGE `type` `type` ENUM( '', 'yesno', 'number', 'text', 'enum', 'multisel', 'language', 'theme' ) NOT NULL;
+
+UPDATE `config` SET `type` = 'theme', `type_values` = 'theme', `description` = 'Theme for colours' WHERE `config`.`var` = 'theme';
+
+INSERT INTO `config` ( `var` , `val` , `category` , `type` , `type_values` , `ord` , `description` , `year`)
+ VALUES ( 'theme_icons', 'icons_default', 'Global', 'theme', 'icons', '860', 'Icon set', '-1');
+
+
+INSERT INTO `config` (`var`, `val`, `category`, `type`, `type_values`, `ord`, `description`, `year`) VALUES
+('fairs_allow_login', 'no', 'Science Fairs', 'yesno', '', 200, 'Allow feeder fairs to login an enter stats and winners. If set to ''no'', they will only be able to download and upload awards using the SFIAB award download/upload mechanism.', -1),
+('fairs_name', 'Science', 'Feeder Fairs', 'text', '', 300, 'What level the feeder fairs are. For example, ''School'' , ''Regional'', or just ''Science'' for a generic ''Science Fair''', -1);
+('fairs_enable', 'no', 'Science Fairs', 'yesno', '', 100, 'Enable the Science Fair. Science Fairs can download awards tagged as ''downloadable'', and can upload winners of those awards directly into this system (optionally creating accounts for all students). There are also options to collect stats from these fairs.', -1);
+
diff --git a/theme/classic/theme.php b/theme/classic/theme.php
index b5829fa8..1181a690 100644
--- a/theme/classic/theme.php
+++ b/theme/classic/theme.php
@@ -20,55 +20,8 @@
Boston, MA 02111-1307, USA.
*/
- $theme['name']="default";
- $theme['description']="The default theme, with KDE4 icons";
+ $theme['name']="Classic";
+ $theme['description']="A classic colour scheme";
$theme['author']="James Grant ";
- //COMMITTEE MAIN ICONS (that are not used in admin/config already)
- $theme['icons']['change_password']="encrypted.png";
- $theme['icons']['edit_profile']="edit_user.png";
-
- //ADMIN ICONS
- $theme['icons']['administration']="gear.png";
- $theme['icons']['participant_registration']="accessories-text-editor.png";
- $theme['icons']['print/export_reports']="application-pdf.png";
- $theme['icons']['print_awards_ceremony_scripts']="application-pdf.png";
- $theme['icons']['committee_management']="system-users.png";
- $theme['icons']['awards_management']="plasmagik.png";
- $theme['icons']['schools_management']="applications-education.png";
- $theme['icons']['judging_management']="klipper.png";
- $theme['icons']['translations_management']="kwordquiz.png";
- $theme['icons']['report_management']="document-multiple.png";
- $theme['icons']['volunteer_management']="user-group-new.png";
- $theme['icons']['tour_management']="preferences-system-performance.png";
- $theme['icons']['internal_document_management']="application-vnd.oasis.opendocument.text.png";
- $theme['icons']['registration_fee_items_management']="transfers_list.png";
- $theme['icons']['judging_score_entry']="transfers_list.png";
- $theme['icons']['enter_winning_projects']="legalmoves.png";
- $theme['icons']['one-click_cwsf_registration']="flag-blue.png";
- $theme['icons']['one-click_ysf_affiliation_stats']="flag-green.png";
- $theme['icons']['fair_stats']="view_sort_descending.png";
- $theme['icons']['communication']="mail-mark-unread.png";
- $theme['icons']['website_content_management']="toggle_log.png";
- $theme['icons']['fundraising']="Coins-32x32.png";
-
- //CONFIG ICONS
- $theme['icons']['configuration']="package_utilities.png";
- $theme['icons']['configuration_variables']="configure.png";
- $theme['icons']['important_dates']="date.png";
- $theme['icons']['project_age_categories']="kdmconfig.png";
- $theme['icons']['project_divisions']="edu_science.png";
- $theme['icons']['cwsf_project_divisions']="edu_science_canada.png";
- $theme['icons']['project_sub_divisions']="chemical.png";
- $theme['icons']['page_texts']="kwrite.png";
- $theme['icons']['exhibitor_signature_page']="signature.png";
- $theme['icons']['judge_registration_questions']="vcs_status.png";
- $theme['icons']['project_safety_questions']="help-contents.png";
- $theme['icons']['images']="elempic.png";
- $theme['icons']['external_award_sources']="ark.png";
- $theme['icons']['language_pack_installer']="kanagram.png";
- $theme['icons']['new_version_checker']="numbers.png";
- $theme['icons']['rollover_fair_year']="svn_switch.png";
- $theme['icons']['backup_restore']="rebuild.png";
-
?>
diff --git a/theme/default/icons/Coins-32x32.png b/theme/default/icons/Coins-32x32.png
deleted file mode 100644
index dfe4018c..00000000
Binary files a/theme/default/icons/Coins-32x32.png and /dev/null differ
diff --git a/theme/default/icons/accessories-text-editor.png b/theme/default/icons/accessories-text-editor.png
deleted file mode 100644
index eab991a7..00000000
Binary files a/theme/default/icons/accessories-text-editor.png and /dev/null differ
diff --git a/theme/default/icons/application-pdf.png b/theme/default/icons/application-pdf.png
deleted file mode 100644
index c78b86c5..00000000
Binary files a/theme/default/icons/application-pdf.png and /dev/null differ
diff --git a/theme/default/icons/application-vnd.oasis.opendocument.text.png b/theme/default/icons/application-vnd.oasis.opendocument.text.png
deleted file mode 100644
index 50b9d4f2..00000000
Binary files a/theme/default/icons/application-vnd.oasis.opendocument.text.png and /dev/null differ
diff --git a/theme/default/icons/applications-education.png b/theme/default/icons/applications-education.png
deleted file mode 100644
index 1fbab402..00000000
Binary files a/theme/default/icons/applications-education.png and /dev/null differ
diff --git a/theme/default/icons/ark.png b/theme/default/icons/ark.png
deleted file mode 100644
index b8632c1e..00000000
Binary files a/theme/default/icons/ark.png and /dev/null differ
diff --git a/theme/default/icons/chemical.png b/theme/default/icons/chemical.png
deleted file mode 100644
index e88b4830..00000000
Binary files a/theme/default/icons/chemical.png and /dev/null differ
diff --git a/theme/default/icons/configure.png b/theme/default/icons/configure.png
deleted file mode 100644
index 93d3d77f..00000000
Binary files a/theme/default/icons/configure.png and /dev/null differ
diff --git a/theme/default/icons/date.png b/theme/default/icons/date.png
deleted file mode 100644
index ebee06e0..00000000
Binary files a/theme/default/icons/date.png and /dev/null differ
diff --git a/theme/default/icons/document-multiple.png b/theme/default/icons/document-multiple.png
deleted file mode 100644
index 2b18a538..00000000
Binary files a/theme/default/icons/document-multiple.png and /dev/null differ
diff --git a/theme/default/icons/edit_user.png b/theme/default/icons/edit_user.png
deleted file mode 100644
index 7c8a21f0..00000000
Binary files a/theme/default/icons/edit_user.png and /dev/null differ
diff --git a/theme/default/icons/edu_science.png b/theme/default/icons/edu_science.png
deleted file mode 100644
index 82f8d14c..00000000
Binary files a/theme/default/icons/edu_science.png and /dev/null differ
diff --git a/theme/default/icons/edu_science_canada.png b/theme/default/icons/edu_science_canada.png
deleted file mode 100644
index 0c9d0082..00000000
Binary files a/theme/default/icons/edu_science_canada.png and /dev/null differ
diff --git a/theme/default/icons/elempic.png b/theme/default/icons/elempic.png
deleted file mode 100644
index 8f58c968..00000000
Binary files a/theme/default/icons/elempic.png and /dev/null differ
diff --git a/theme/default/icons/encrypted.png b/theme/default/icons/encrypted.png
deleted file mode 100644
index ea51b8e5..00000000
Binary files a/theme/default/icons/encrypted.png and /dev/null differ
diff --git a/theme/default/icons/flag-blue.png b/theme/default/icons/flag-blue.png
deleted file mode 100644
index 9373e3d3..00000000
Binary files a/theme/default/icons/flag-blue.png and /dev/null differ
diff --git a/theme/default/icons/flag-green.png b/theme/default/icons/flag-green.png
deleted file mode 100644
index 51e1c8f8..00000000
Binary files a/theme/default/icons/flag-green.png and /dev/null differ
diff --git a/theme/default/icons/gear.png b/theme/default/icons/gear.png
deleted file mode 100644
index 9592c122..00000000
Binary files a/theme/default/icons/gear.png and /dev/null differ
diff --git a/theme/default/icons/help-contents.png b/theme/default/icons/help-contents.png
deleted file mode 100644
index 7579eefb..00000000
Binary files a/theme/default/icons/help-contents.png and /dev/null differ
diff --git a/theme/default/icons/kanagram.png b/theme/default/icons/kanagram.png
deleted file mode 100644
index c92b04ca..00000000
Binary files a/theme/default/icons/kanagram.png and /dev/null differ
diff --git a/theme/default/icons/kdmconfig.png b/theme/default/icons/kdmconfig.png
deleted file mode 100644
index e00fcb22..00000000
Binary files a/theme/default/icons/kdmconfig.png and /dev/null differ
diff --git a/theme/default/icons/klipper.png b/theme/default/icons/klipper.png
deleted file mode 100644
index e46ca841..00000000
Binary files a/theme/default/icons/klipper.png and /dev/null differ
diff --git a/theme/default/icons/kwordquiz.png b/theme/default/icons/kwordquiz.png
deleted file mode 100644
index e2cecef6..00000000
Binary files a/theme/default/icons/kwordquiz.png and /dev/null differ
diff --git a/theme/default/icons/kwrite.png b/theme/default/icons/kwrite.png
deleted file mode 100644
index 6657385b..00000000
Binary files a/theme/default/icons/kwrite.png and /dev/null differ
diff --git a/theme/default/icons/legalmoves.png b/theme/default/icons/legalmoves.png
deleted file mode 100644
index 0983fc83..00000000
Binary files a/theme/default/icons/legalmoves.png and /dev/null differ
diff --git a/theme/default/icons/mail-mark-unread.png b/theme/default/icons/mail-mark-unread.png
deleted file mode 100644
index e07161c1..00000000
Binary files a/theme/default/icons/mail-mark-unread.png and /dev/null differ
diff --git a/theme/default/icons/numbers.png b/theme/default/icons/numbers.png
deleted file mode 100644
index 3d322fb6..00000000
Binary files a/theme/default/icons/numbers.png and /dev/null differ
diff --git a/theme/default/icons/package_utilities.png b/theme/default/icons/package_utilities.png
deleted file mode 100644
index 28f34120..00000000
Binary files a/theme/default/icons/package_utilities.png and /dev/null differ
diff --git a/theme/default/icons/plasmagik.png b/theme/default/icons/plasmagik.png
deleted file mode 100644
index 34914417..00000000
Binary files a/theme/default/icons/plasmagik.png and /dev/null differ
diff --git a/theme/default/icons/preferences-system-performance.png b/theme/default/icons/preferences-system-performance.png
deleted file mode 100644
index 8a80d446..00000000
Binary files a/theme/default/icons/preferences-system-performance.png and /dev/null differ
diff --git a/theme/default/icons/rebuild.png b/theme/default/icons/rebuild.png
deleted file mode 100644
index 0f5e2119..00000000
Binary files a/theme/default/icons/rebuild.png and /dev/null differ
diff --git a/theme/default/icons/signature.png b/theme/default/icons/signature.png
deleted file mode 100644
index c8fea8da..00000000
Binary files a/theme/default/icons/signature.png and /dev/null differ
diff --git a/theme/default/icons/svn_switch.png b/theme/default/icons/svn_switch.png
deleted file mode 100644
index 734186f0..00000000
Binary files a/theme/default/icons/svn_switch.png and /dev/null differ
diff --git a/theme/default/icons/system-users.png b/theme/default/icons/system-users.png
deleted file mode 100644
index 5f02a0e3..00000000
Binary files a/theme/default/icons/system-users.png and /dev/null differ
diff --git a/theme/default/icons/toggle_log.png b/theme/default/icons/toggle_log.png
deleted file mode 100644
index e454cb67..00000000
Binary files a/theme/default/icons/toggle_log.png and /dev/null differ
diff --git a/theme/default/icons/transfers_list.png b/theme/default/icons/transfers_list.png
deleted file mode 100644
index d0d571ff..00000000
Binary files a/theme/default/icons/transfers_list.png and /dev/null differ
diff --git a/theme/default/icons/ui-icons_222222_256x240.png b/theme/default/icons/ui-icons_222222_256x240.png
deleted file mode 100644
index ee039dc0..00000000
Binary files a/theme/default/icons/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/theme/default/icons/ui-icons_2e83ff_256x240.png b/theme/default/icons/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index 30265d4e..00000000
Binary files a/theme/default/icons/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/theme/default/icons/ui-icons_454545_256x240.png b/theme/default/icons/ui-icons_454545_256x240.png
deleted file mode 100644
index 7ec70d11..00000000
Binary files a/theme/default/icons/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/theme/default/icons/ui-icons_888888_256x240.png b/theme/default/icons/ui-icons_888888_256x240.png
deleted file mode 100644
index 5ba708c3..00000000
Binary files a/theme/default/icons/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/theme/default/icons/ui-icons_cd0a0a_256x240.png b/theme/default/icons/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index 7930a558..00000000
Binary files a/theme/default/icons/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/theme/default/icons/user-group-new.png b/theme/default/icons/user-group-new.png
deleted file mode 100644
index 534cf9de..00000000
Binary files a/theme/default/icons/user-group-new.png and /dev/null differ
diff --git a/theme/default/icons/vcs_status.png b/theme/default/icons/vcs_status.png
deleted file mode 100644
index 3b6d6a70..00000000
Binary files a/theme/default/icons/vcs_status.png and /dev/null differ
diff --git a/theme/default/icons/view_sort_descending.png b/theme/default/icons/view_sort_descending.png
deleted file mode 100644
index 879a698e..00000000
Binary files a/theme/default/icons/view_sort_descending.png and /dev/null differ
diff --git a/theme/default/theme.php b/theme/default/theme.php
index b5829fa8..7c16962a 100644
--- a/theme/default/theme.php
+++ b/theme/default/theme.php
@@ -20,55 +20,8 @@
Boston, MA 02111-1307, USA.
*/
- $theme['name']="default";
- $theme['description']="The default theme, with KDE4 icons";
+ $theme['name']="Default";
+ $theme['description']="The default theme";
$theme['author']="James Grant ";
- //COMMITTEE MAIN ICONS (that are not used in admin/config already)
- $theme['icons']['change_password']="encrypted.png";
- $theme['icons']['edit_profile']="edit_user.png";
-
- //ADMIN ICONS
- $theme['icons']['administration']="gear.png";
- $theme['icons']['participant_registration']="accessories-text-editor.png";
- $theme['icons']['print/export_reports']="application-pdf.png";
- $theme['icons']['print_awards_ceremony_scripts']="application-pdf.png";
- $theme['icons']['committee_management']="system-users.png";
- $theme['icons']['awards_management']="plasmagik.png";
- $theme['icons']['schools_management']="applications-education.png";
- $theme['icons']['judging_management']="klipper.png";
- $theme['icons']['translations_management']="kwordquiz.png";
- $theme['icons']['report_management']="document-multiple.png";
- $theme['icons']['volunteer_management']="user-group-new.png";
- $theme['icons']['tour_management']="preferences-system-performance.png";
- $theme['icons']['internal_document_management']="application-vnd.oasis.opendocument.text.png";
- $theme['icons']['registration_fee_items_management']="transfers_list.png";
- $theme['icons']['judging_score_entry']="transfers_list.png";
- $theme['icons']['enter_winning_projects']="legalmoves.png";
- $theme['icons']['one-click_cwsf_registration']="flag-blue.png";
- $theme['icons']['one-click_ysf_affiliation_stats']="flag-green.png";
- $theme['icons']['fair_stats']="view_sort_descending.png";
- $theme['icons']['communication']="mail-mark-unread.png";
- $theme['icons']['website_content_management']="toggle_log.png";
- $theme['icons']['fundraising']="Coins-32x32.png";
-
- //CONFIG ICONS
- $theme['icons']['configuration']="package_utilities.png";
- $theme['icons']['configuration_variables']="configure.png";
- $theme['icons']['important_dates']="date.png";
- $theme['icons']['project_age_categories']="kdmconfig.png";
- $theme['icons']['project_divisions']="edu_science.png";
- $theme['icons']['cwsf_project_divisions']="edu_science_canada.png";
- $theme['icons']['project_sub_divisions']="chemical.png";
- $theme['icons']['page_texts']="kwrite.png";
- $theme['icons']['exhibitor_signature_page']="signature.png";
- $theme['icons']['judge_registration_questions']="vcs_status.png";
- $theme['icons']['project_safety_questions']="help-contents.png";
- $theme['icons']['images']="elempic.png";
- $theme['icons']['external_award_sources']="ark.png";
- $theme['icons']['language_pack_installer']="kanagram.png";
- $theme['icons']['new_version_checker']="numbers.png";
- $theme['icons']['rollover_fair_year']="svn_switch.png";
- $theme['icons']['backup_restore']="rebuild.png";
-
?>
diff --git a/theme/classic/icons/Coins-32x32.png b/theme/icons_default/Coins-32x32.png
similarity index 100%
rename from theme/classic/icons/Coins-32x32.png
rename to theme/icons_default/Coins-32x32.png
diff --git a/theme/classic/icons/accessories-text-editor.png b/theme/icons_default/accessories-text-editor.png
similarity index 100%
rename from theme/classic/icons/accessories-text-editor.png
rename to theme/icons_default/accessories-text-editor.png
diff --git a/theme/icons_default/agt_forum.png b/theme/icons_default/agt_forum.png
new file mode 100644
index 00000000..37371456
Binary files /dev/null and b/theme/icons_default/agt_forum.png differ
diff --git a/theme/classic/icons/application-pdf.png b/theme/icons_default/application-pdf.png
similarity index 100%
rename from theme/classic/icons/application-pdf.png
rename to theme/icons_default/application-pdf.png
diff --git a/theme/classic/icons/application-vnd.oasis.opendocument.text.png b/theme/icons_default/application-vnd.oasis.opendocument.text.png
similarity index 100%
rename from theme/classic/icons/application-vnd.oasis.opendocument.text.png
rename to theme/icons_default/application-vnd.oasis.opendocument.text.png
diff --git a/theme/classic/icons/applications-education.png b/theme/icons_default/applications-education.png
similarity index 100%
rename from theme/classic/icons/applications-education.png
rename to theme/icons_default/applications-education.png
diff --git a/theme/classic/icons/ark.png b/theme/icons_default/ark.png
similarity index 100%
rename from theme/classic/icons/ark.png
rename to theme/icons_default/ark.png
diff --git a/theme/classic/icons/chemical.png b/theme/icons_default/chemical.png
similarity index 100%
rename from theme/classic/icons/chemical.png
rename to theme/icons_default/chemical.png
diff --git a/theme/classic/icons/configure.png b/theme/icons_default/configure.png
similarity index 100%
rename from theme/classic/icons/configure.png
rename to theme/icons_default/configure.png
diff --git a/theme/classic/icons/date.png b/theme/icons_default/date.png
similarity index 100%
rename from theme/classic/icons/date.png
rename to theme/icons_default/date.png
diff --git a/theme/classic/icons/document-multiple.png b/theme/icons_default/document-multiple.png
similarity index 100%
rename from theme/classic/icons/document-multiple.png
rename to theme/icons_default/document-multiple.png
diff --git a/theme/classic/icons/edit_user.png b/theme/icons_default/edit_user.png
similarity index 100%
rename from theme/classic/icons/edit_user.png
rename to theme/icons_default/edit_user.png
diff --git a/theme/classic/icons/edu_science.png b/theme/icons_default/edu_science.png
similarity index 100%
rename from theme/classic/icons/edu_science.png
rename to theme/icons_default/edu_science.png
diff --git a/theme/classic/icons/edu_science_canada.png b/theme/icons_default/edu_science_canada.png
similarity index 100%
rename from theme/classic/icons/edu_science_canada.png
rename to theme/icons_default/edu_science_canada.png
diff --git a/theme/classic/icons/elempic.png b/theme/icons_default/elempic.png
similarity index 100%
rename from theme/classic/icons/elempic.png
rename to theme/icons_default/elempic.png
diff --git a/theme/classic/icons/encrypted.png b/theme/icons_default/encrypted.png
similarity index 100%
rename from theme/classic/icons/encrypted.png
rename to theme/icons_default/encrypted.png
diff --git a/theme/classic/icons/flag-blue.png b/theme/icons_default/flag-blue.png
similarity index 100%
rename from theme/classic/icons/flag-blue.png
rename to theme/icons_default/flag-blue.png
diff --git a/theme/classic/icons/flag-green.png b/theme/icons_default/flag-green.png
similarity index 100%
rename from theme/classic/icons/flag-green.png
rename to theme/icons_default/flag-green.png
diff --git a/theme/icons_default/folder.png b/theme/icons_default/folder.png
new file mode 100644
index 00000000..d1e46614
Binary files /dev/null and b/theme/icons_default/folder.png differ
diff --git a/theme/classic/icons/gear.png b/theme/icons_default/gear.png
similarity index 100%
rename from theme/classic/icons/gear.png
rename to theme/icons_default/gear.png
diff --git a/theme/classic/icons/help-contents.png b/theme/icons_default/help-contents.png
similarity index 100%
rename from theme/classic/icons/help-contents.png
rename to theme/icons_default/help-contents.png
diff --git a/theme/icons_default/icons.php b/theme/icons_default/icons.php
new file mode 100644
index 00000000..14543132
--- /dev/null
+++ b/theme/icons_default/icons.php
@@ -0,0 +1,76 @@
+
+/*
+ This file is part of the 'Science Fair In A Box' project
+ SFIAB Website: http://www.sfiab.ca
+
+ Copyright (C) 2008 James Grant
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation, version 2.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+ $theme_icons['name']="Default Icons";
+ $theme_icons['description']="KDE4 icons";
+ $theme_icons['author']="James Grant ";
+
+ //COMMITTEE MAIN ICONS (that are not used in admin/config already)
+ $theme_icons['icons']['change_password']="encrypted.png";
+ $theme_icons['icons']['edit_profile']="edit_user.png";
+ $theme_icons['icons']['manage_roles']="agt_forum.png";
+
+ //ADMIN ICONS
+ $theme_icons['icons']['administration']="gear.png";
+ $theme_icons['icons']['participant_registration']="accessories-text-editor.png";
+ $theme_icons['icons']['print/export_reports']="application-pdf.png";
+ $theme_icons['icons']['print_awards_ceremony_scripts']="application-pdf.png";
+ $theme_icons['icons']['committee_management']="system-users.png";
+ $theme_icons['icons']['awards_management']="plasmagik.png";
+ $theme_icons['icons']['schools_management']="applications-education.png";
+ $theme_icons['icons']['judging_management']="klipper.png";
+ $theme_icons['icons']['sciencefair_management']="folder.png";
+ $theme_icons['icons']['translations_management']="kwordquiz.png";
+ $theme_icons['icons']['report_management']="document-multiple.png";
+ $theme_icons['icons']['volunteer_management']="user-group-new.png";
+ $theme_icons['icons']['tour_management']="preferences-system-performance.png";
+ $theme_icons['icons']['internal_document_management']="application-vnd.oasis.opendocument.text.png";
+ $theme_icons['icons']['registration_fee_items_management']="transfers_list.png";
+ $theme_icons['icons']['judging_score_entry']="transfers_list.png";
+ $theme_icons['icons']['enter_winning_projects']="legalmoves.png";
+ $theme_icons['icons']['one-click_cwsf_registration']="flag-blue.png";
+ $theme_icons['icons']['one-click_ysf_affiliation_stats']="flag-green.png";
+ $theme_icons['icons']['fair_stats']="view_sort_descending.png";
+ $theme_icons['icons']['communication']="mail-mark-unread.png";
+ $theme_icons['icons']['website_content_management']="toggle_log.png";
+ $theme_icons['icons']['fundraising']="Coins-32x32.png";
+
+ //CONFIG ICONS
+ $theme_icons['icons']['configuration']="package_utilities.png";
+ $theme_icons['icons']['configuration_variables']="configure.png";
+ $theme_icons['icons']['important_dates']="date.png";
+ $theme_icons['icons']['project_age_categories']="kdmconfig.png";
+ $theme_icons['icons']['project_divisions']="edu_science.png";
+ $theme_icons['icons']['cwsf_project_divisions']="edu_science_canada.png";
+ $theme_icons['icons']['project_sub_divisions']="chemical.png";
+ $theme_icons['icons']['page_texts']="kwrite.png";
+ $theme_icons['icons']['exhibitor_signature_page']="signature.png";
+ $theme_icons['icons']['judge_registration_questions']="vcs_status.png";
+ $theme_icons['icons']['project_safety_questions']="help-contents.png";
+ $theme_icons['icons']['images']="elempic.png";
+ $theme_icons['icons']['external_award_sources']="ark.png";
+ $theme_icons['icons']['language_pack_installer']="kanagram.png";
+ $theme_icons['icons']['new_version_checker']="numbers.png";
+ $theme_icons['icons']['rollover_fair_year']="svn_switch.png";
+ $theme_icons['icons']['backup_restore']="rebuild.png";
+
+?>
diff --git a/theme/classic/icons/kanagram.png b/theme/icons_default/kanagram.png
similarity index 100%
rename from theme/classic/icons/kanagram.png
rename to theme/icons_default/kanagram.png
diff --git a/theme/classic/icons/kdmconfig.png b/theme/icons_default/kdmconfig.png
similarity index 100%
rename from theme/classic/icons/kdmconfig.png
rename to theme/icons_default/kdmconfig.png
diff --git a/theme/classic/icons/klipper.png b/theme/icons_default/klipper.png
similarity index 100%
rename from theme/classic/icons/klipper.png
rename to theme/icons_default/klipper.png
diff --git a/theme/classic/icons/kwordquiz.png b/theme/icons_default/kwordquiz.png
similarity index 100%
rename from theme/classic/icons/kwordquiz.png
rename to theme/icons_default/kwordquiz.png
diff --git a/theme/classic/icons/kwrite.png b/theme/icons_default/kwrite.png
similarity index 100%
rename from theme/classic/icons/kwrite.png
rename to theme/icons_default/kwrite.png
diff --git a/theme/classic/icons/legalmoves.png b/theme/icons_default/legalmoves.png
similarity index 100%
rename from theme/classic/icons/legalmoves.png
rename to theme/icons_default/legalmoves.png
diff --git a/theme/classic/icons/mail-mark-unread.png b/theme/icons_default/mail-mark-unread.png
similarity index 100%
rename from theme/classic/icons/mail-mark-unread.png
rename to theme/icons_default/mail-mark-unread.png
diff --git a/theme/classic/icons/numbers.png b/theme/icons_default/numbers.png
similarity index 100%
rename from theme/classic/icons/numbers.png
rename to theme/icons_default/numbers.png
diff --git a/theme/classic/icons/package_utilities.png b/theme/icons_default/package_utilities.png
similarity index 100%
rename from theme/classic/icons/package_utilities.png
rename to theme/icons_default/package_utilities.png
diff --git a/theme/classic/icons/plasmagik.png b/theme/icons_default/plasmagik.png
similarity index 100%
rename from theme/classic/icons/plasmagik.png
rename to theme/icons_default/plasmagik.png
diff --git a/theme/classic/icons/preferences-system-performance.png b/theme/icons_default/preferences-system-performance.png
similarity index 100%
rename from theme/classic/icons/preferences-system-performance.png
rename to theme/icons_default/preferences-system-performance.png
diff --git a/theme/classic/icons/rebuild.png b/theme/icons_default/rebuild.png
similarity index 100%
rename from theme/classic/icons/rebuild.png
rename to theme/icons_default/rebuild.png
diff --git a/theme/classic/icons/signature.png b/theme/icons_default/signature.png
similarity index 100%
rename from theme/classic/icons/signature.png
rename to theme/icons_default/signature.png
diff --git a/theme/classic/icons/svn_switch.png b/theme/icons_default/svn_switch.png
similarity index 100%
rename from theme/classic/icons/svn_switch.png
rename to theme/icons_default/svn_switch.png
diff --git a/theme/classic/icons/system-users.png b/theme/icons_default/system-users.png
similarity index 100%
rename from theme/classic/icons/system-users.png
rename to theme/icons_default/system-users.png
diff --git a/theme/classic/icons/toggle_log.png b/theme/icons_default/toggle_log.png
similarity index 100%
rename from theme/classic/icons/toggle_log.png
rename to theme/icons_default/toggle_log.png
diff --git a/theme/classic/icons/transfers_list.png b/theme/icons_default/transfers_list.png
similarity index 100%
rename from theme/classic/icons/transfers_list.png
rename to theme/icons_default/transfers_list.png
diff --git a/theme/classic/icons/user-group-new.png b/theme/icons_default/user-group-new.png
similarity index 100%
rename from theme/classic/icons/user-group-new.png
rename to theme/icons_default/user-group-new.png
diff --git a/theme/classic/icons/vcs_status.png b/theme/icons_default/vcs_status.png
similarity index 100%
rename from theme/classic/icons/vcs_status.png
rename to theme/icons_default/vcs_status.png
diff --git a/theme/classic/icons/view_sort_descending.png b/theme/icons_default/view_sort_descending.png
similarity index 100%
rename from theme/classic/icons/view_sort_descending.png
rename to theme/icons_default/view_sort_descending.png