if(committee_auth_has_access("config") || committee_auth_has_access("admin"))
@@ -623,7 +635,7 @@ if(committee_auth_has_access("config"))
if(committee_auth_has_access("admin"))
admin_warnings();
-echo "
"; @@ -660,7 +672,7 @@ global $config; ?> |
+
//we only show the debug session variables if we have an ODD numbered version.
if(substr($config['version'], -1) % 2 != 0)
@@ -703,10 +715,10 @@ function send_popup_header($title="")
=i18n($title)?>
-
+
@@ -1136,8 +1148,8 @@ function output_page_cms($filename)
echo "
";
//if it looks like we have HTML content, dont do a nl2br, if there's no html, then do the nl2br
- if(strlen($r->text)==strlen(strip_tags($r->text)))
- echo nl2br($r->text);
+ if(strlen(get_value_from_array($r, 'text'))==strlen(strip_tags(get_value_from_array($r, 'text'))))
+ echo nl2br(get_value_from_array($r, 'text'));
else
echo $r->text;
}
diff --git a/css/output.css b/css/output.css
index f81fb06b..7f1105b2 100644
--- a/css/output.css
+++ b/css/output.css
@@ -562,12 +562,8 @@ video {
position: fixed;
}
-.m-10 {
- margin: 2.5rem;
-}
-
-.ml-3 {
- margin-left: 0.75rem;
+.bottom-0 {
+ bottom: 0px;
}
.block {
@@ -594,14 +590,36 @@ video {
height: 0px;
}
+.h-full {
+ height: 100%;
+}
+
+.h-screen {
+ height: 100vh;
+}
+
+.min-w-full {
+ min-width: 100%;
+}
+
.items-center {
align-items: center;
}
+.justify-start {
+ justify-content: flex-start;
+}
+
.justify-center {
justify-content: center;
}
+.space-y-5 > :not([hidden]) ~ :not([hidden]) {
+ --tw-space-y-reverse: 0;
+ margin-top: calc(1.25rem * calc(1 - var(--tw-space-y-reverse)));
+ margin-bottom: calc(1.25rem * var(--tw-space-y-reverse));
+}
+
.truncate {
overflow: hidden;
text-overflow: ellipsis;
@@ -616,17 +634,14 @@ video {
border-width: 1px;
}
-.bg-white {
+.bg-purple-200 {
--tw-bg-opacity: 1;
- background-color: rgb(255 255 255 / var(--tw-bg-opacity, 1));
+ background-color: rgb(233 213 255 / var(--tw-bg-opacity, 1));
}
-.p-10 {
- padding: 2.5rem;
-}
-
-.p-3 {
- padding: 0.75rem;
+.bg-slate-100 {
+ --tw-bg-opacity: 1;
+ background-color: rgb(241 245 249 / var(--tw-bg-opacity, 1));
}
.px-3 {
@@ -634,13 +649,9 @@ video {
padding-right: 0.75rem;
}
-.py-8 {
- padding-top: 2rem;
- padding-bottom: 2rem;
-}
-
-.pl-3 {
- padding-left: 0.75rem;
+.py-5 {
+ padding-top: 1.25rem;
+ padding-bottom: 1.25rem;
}
.text-center {
@@ -660,16 +671,6 @@ video {
font-style: italic;
}
-.text-red-700 {
- --tw-text-opacity: 1;
- color: rgb(185 28 28 / var(--tw-text-opacity, 1));
-}
-
-.text-blue-700 {
- --tw-text-opacity: 1;
- color: rgb(29 78 216 / var(--tw-text-opacity, 1));
-}
-
.underline {
text-decoration-line: underline;
}
@@ -678,4 +679,13 @@ video {
--tw-shadow: 0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1);
--tw-shadow-colored: 0 20px 25px -5px var(--tw-shadow-color), 0 8px 10px -6px var(--tw-shadow-color);
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+}
+
+.hover\:rounded-lg:hover {
+ border-radius: 0.5rem;
+}
+
+.hover\:bg-white:hover {
+ --tw-bg-opacity: 1;
+ background-color: rgb(255 255 255 / var(--tw-bg-opacity, 1));
}
\ No newline at end of file
diff --git a/css/styles.css b/css/styles.css
new file mode 100644
index 00000000..c2923164
--- /dev/null
+++ b/css/styles.css
@@ -0,0 +1,3 @@
+a{
+ color: blue;
+}
\ No newline at end of file
diff --git a/helper.inc.php b/helper.inc.php
index e86c6661..28b38bbd 100644
--- a/helper.inc.php
+++ b/helper.inc.php
@@ -25,6 +25,11 @@ function get_value_or_default(mixed $var, mixed $default = null) : mixed {
return isset($var) ? $var : $default;
}
+function get_value_or_default_boolean(mixed $var, string $key, mixed $default=null): mixed{
+ if($var) return $var[$key];
+ else return $default;
+}
+
function get_value_property_or_default(mixed $var, mixed $property, mixed $default = null) : mixed {
return $var && property_exists($var, $property) ? $var->$property : $default;
diff --git a/theme/dropped text.txt b/theme/dropped text.txt
new file mode 100644
index 00000000..4e1c86d4
--- /dev/null
+++ b/theme/dropped text.txt
@@ -0,0 +1 @@
+/home/dev/Repositories/sfiab/theme/icons_default
\ No newline at end of file
diff --git a/theme/icons_default/icons.php b/theme/icons_default/icons.php
index 5ed44d8e..9ec086fe 100644
--- a/theme/icons_default/icons.php
+++ b/theme/icons_default/icons.php
@@ -25,53 +25,53 @@
$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";
+ $theme_icons['icons']['change_password']="../material_icons/encrypted.png";
+ $theme_icons['icons']['edit_profile']="../material_icons/edit_user.png";
+ $theme_icons['icons']['manage_roles']="../material_icons/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";
+ $theme_icons['icons']['administration']="../material_icons/gear.png";
+ $theme_icons['icons']['participant_registration']="../material_icons/accessories-text-editor.png";
+ $theme_icons['icons']['print/export_reports']="../material_icons/application-pdf.png";
+ $theme_icons['icons']['print_awards_ceremony_scripts']="../material_icons/application-pdf.png";
+ $theme_icons['icons']['committee_management']="../material_icons/system-users.png";
+ $theme_icons['icons']['awards_management']="../material_icons/plasmagik.png";
+ $theme_icons['icons']['schools_management']="../material_icons/applications-education.png";
+ $theme_icons['icons']['judging_management']="../material_icons/klipper.png";
+ $theme_icons['icons']['sciencefair_management']="../material_icons/folder.png";
+ $theme_icons['icons']['translations_management']="../material_icons/kwordquiz.png";
+ $theme_icons['icons']['report_management']="../material_icons/document-multiple.png";
+ $theme_icons['icons']['volunteer_management']="../material_icons/user-group-new.png";
+ $theme_icons['icons']['tour_management']="../material_icons/preferences-system-performance.png";
+ $theme_icons['icons']['internal_document_management']="../material_icons/application-vnd.oasis.opendocument.text.png";
+ $theme_icons['icons']['registration_fee_items_management']="../material_icons/transfers_list.png";
+ $theme_icons['icons']['judging_score_entry']="../material_icons/transfers_list.png";
+ $theme_icons['icons']['enter_winning_projects']="../material_icons/legalmoves.png";
+ $theme_icons['icons']['one-click_cwsf_registration']="../material_icons/flag-blue.png";
+ $theme_icons['icons']['one-click_ysf_affiliation_stats']="../material_icons/flag-green.png";
+ $theme_icons['icons']['fair_stats']="../material_icons/view_sort_descending.png";
+ $theme_icons['icons']['communication']="../material_icons/mail-mark-unread.png";
+ $theme_icons['icons']['website_content_management']="../material_icons/toggle_log.png";
+ $theme_icons['icons']['fundraising']="../material_icons/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']['rollover_fiscal_year']="rollover_fiscal.png";
- $theme_icons['icons']['backup_restore']="rebuild.png";
+ $theme_icons['icons']['configuration']="../material_icons/../material_icons/package_utilities.png";
+ $theme_icons['icons']['configuration_variables']="../material_icons/configure.png";
+ $theme_icons['icons']['important_dates']="../material_icons/date.png";
+ $theme_icons['icons']['project_age_categories']="../material_icons/kdmconfig.png";
+ $theme_icons['icons']['project_divisions']="../material_icons/edu_science.png";
+ $theme_icons['icons']['cwsf_project_divisions']="../material_icons/edu_science_canada.png";
+ $theme_icons['icons']['project_sub_divisions']="../material_icons/chemical.png";
+ $theme_icons['icons']['page_texts']="../material_icons/kwrite.png";
+ $theme_icons['icons']['exhibitor_signature_page']="../material_icons/signature.png";
+ $theme_icons['icons']['judge_registration_questions']="../material_icons/vcs_status.png";
+ $theme_icons['icons']['project_safety_questions']="../material_icons/help-contents.png";
+ $theme_icons['icons']['images']="../material_icons/elempic.png";
+ $theme_icons['icons']['external_award_sources']="../material_icons/ark.png";
+ $theme_icons['icons']['language_pack_installer']="../material_icons/kanagram.png";
+ $theme_icons['icons']['new_version_checker']="../material_icons/numbers.png";
+ $theme_icons['icons']['rollover_fair_year']="../material_icons/svn_switch.png";
+ $theme_icons['icons']['rollover_fiscal_year']="../material_icons/rollover_fiscal.png";
+ $theme_icons['icons']['backup_restore']="../material_icons/rebuild.png";
?>
diff --git a/theme/material_icons/Coins-32x32.png b/theme/material_icons/Coins-32x32.png
new file mode 100644
index 00000000..3ee57f18
Binary files /dev/null and b/theme/material_icons/Coins-32x32.png differ
diff --git a/theme/material_icons/accessories-text-editor.png b/theme/material_icons/accessories-text-editor.png
new file mode 100644
index 00000000..f0eac0dc
Binary files /dev/null and b/theme/material_icons/accessories-text-editor.png differ
diff --git a/theme/material_icons/agt_forum.png b/theme/material_icons/agt_forum.png
new file mode 100644
index 00000000..00c1ca9e
Binary files /dev/null and b/theme/material_icons/agt_forum.png differ
diff --git a/theme/material_icons/application-pdf.png b/theme/material_icons/application-pdf.png
new file mode 100644
index 00000000..d2c98a03
Binary files /dev/null and b/theme/material_icons/application-pdf.png differ
diff --git a/theme/material_icons/application-vnd.oasis.opendocument.text.png b/theme/material_icons/application-vnd.oasis.opendocument.text.png
new file mode 100644
index 00000000..58d9e803
Binary files /dev/null and b/theme/material_icons/application-vnd.oasis.opendocument.text.png differ
diff --git a/theme/material_icons/applications-education.png b/theme/material_icons/applications-education.png
new file mode 100644
index 00000000..b13a45ad
Binary files /dev/null and b/theme/material_icons/applications-education.png differ
diff --git a/theme/material_icons/chemical.png b/theme/material_icons/chemical.png
new file mode 100644
index 00000000..c059d052
Binary files /dev/null and b/theme/material_icons/chemical.png differ
diff --git a/theme/material_icons/configure.png b/theme/material_icons/configure.png
new file mode 100644
index 00000000..80ab1a28
Binary files /dev/null and b/theme/material_icons/configure.png differ
diff --git a/theme/material_icons/date.png b/theme/material_icons/date.png
new file mode 100644
index 00000000..24c5f765
Binary files /dev/null and b/theme/material_icons/date.png differ
diff --git a/theme/material_icons/document-multiple.png b/theme/material_icons/document-multiple.png
new file mode 100644
index 00000000..10f7efdb
Binary files /dev/null and b/theme/material_icons/document-multiple.png differ
diff --git a/theme/material_icons/edit_user.png b/theme/material_icons/edit_user.png
new file mode 100644
index 00000000..c344b6db
Binary files /dev/null and b/theme/material_icons/edit_user.png differ
diff --git a/theme/material_icons/edu_science.png b/theme/material_icons/edu_science.png
new file mode 100644
index 00000000..e582ce5a
Binary files /dev/null and b/theme/material_icons/edu_science.png differ
diff --git a/theme/material_icons/edu_science_canada.png b/theme/material_icons/edu_science_canada.png
new file mode 100644
index 00000000..c54e049a
Binary files /dev/null and b/theme/material_icons/edu_science_canada.png differ
diff --git a/theme/material_icons/elempic.png b/theme/material_icons/elempic.png
new file mode 100644
index 00000000..3f0d7c32
Binary files /dev/null and b/theme/material_icons/elempic.png differ
diff --git a/theme/material_icons/encrypted.png b/theme/material_icons/encrypted.png
new file mode 100644
index 00000000..7c6de60a
Binary files /dev/null and b/theme/material_icons/encrypted.png differ
diff --git a/theme/material_icons/flag-blue.png b/theme/material_icons/flag-blue.png
new file mode 100644
index 00000000..383d1df3
Binary files /dev/null and b/theme/material_icons/flag-blue.png differ
diff --git a/theme/material_icons/flag-green.png b/theme/material_icons/flag-green.png
new file mode 100644
index 00000000..383d1df3
Binary files /dev/null and b/theme/material_icons/flag-green.png differ
diff --git a/theme/material_icons/folder.png b/theme/material_icons/folder.png
new file mode 100644
index 00000000..2134dc92
Binary files /dev/null and b/theme/material_icons/folder.png differ
diff --git a/theme/material_icons/gear.png b/theme/material_icons/gear.png
new file mode 100644
index 00000000..8c6cae4f
Binary files /dev/null and b/theme/material_icons/gear.png differ
diff --git a/theme/material_icons/help-contents.png b/theme/material_icons/help-contents.png
new file mode 100644
index 00000000..36cb2eb0
Binary files /dev/null and b/theme/material_icons/help-contents.png differ
diff --git a/theme/material_icons/kanagram.png b/theme/material_icons/kanagram.png
new file mode 100644
index 00000000..98650f25
Binary files /dev/null and b/theme/material_icons/kanagram.png differ
diff --git a/theme/material_icons/kdmconfig.png b/theme/material_icons/kdmconfig.png
new file mode 100644
index 00000000..27682273
Binary files /dev/null and b/theme/material_icons/kdmconfig.png differ
diff --git a/theme/material_icons/klipper.png b/theme/material_icons/klipper.png
new file mode 100644
index 00000000..6c288bcd
Binary files /dev/null and b/theme/material_icons/klipper.png differ
diff --git a/theme/material_icons/kwordquiz.png b/theme/material_icons/kwordquiz.png
new file mode 100644
index 00000000..4b793cdc
Binary files /dev/null and b/theme/material_icons/kwordquiz.png differ
diff --git a/theme/material_icons/kwrite.png b/theme/material_icons/kwrite.png
new file mode 100644
index 00000000..d2b74ed4
Binary files /dev/null and b/theme/material_icons/kwrite.png differ
diff --git a/theme/material_icons/legalmoves.png b/theme/material_icons/legalmoves.png
new file mode 100644
index 00000000..4521c804
Binary files /dev/null and b/theme/material_icons/legalmoves.png differ
diff --git a/theme/material_icons/mail-mark-unread.png b/theme/material_icons/mail-mark-unread.png
new file mode 100644
index 00000000..1035c777
Binary files /dev/null and b/theme/material_icons/mail-mark-unread.png differ
diff --git a/theme/material_icons/numbers.png b/theme/material_icons/numbers.png
new file mode 100644
index 00000000..6b183738
Binary files /dev/null and b/theme/material_icons/numbers.png differ
diff --git a/theme/material_icons/package_utilities.png b/theme/material_icons/package_utilities.png
new file mode 100644
index 00000000..9025cdac
Binary files /dev/null and b/theme/material_icons/package_utilities.png differ
diff --git a/theme/material_icons/plasmagik.png b/theme/material_icons/plasmagik.png
new file mode 100644
index 00000000..dadfb907
Binary files /dev/null and b/theme/material_icons/plasmagik.png differ
diff --git a/theme/material_icons/rebuild.png b/theme/material_icons/rebuild.png
new file mode 100644
index 00000000..76884184
Binary files /dev/null and b/theme/material_icons/rebuild.png differ
diff --git a/theme/material_icons/rollover_fiscal.png b/theme/material_icons/rollover_fiscal.png
new file mode 100644
index 00000000..4bec54a9
Binary files /dev/null and b/theme/material_icons/rollover_fiscal.png differ
diff --git a/theme/material_icons/signature.png b/theme/material_icons/signature.png
new file mode 100644
index 00000000..a3a41c32
Binary files /dev/null and b/theme/material_icons/signature.png differ
diff --git a/theme/material_icons/svn_switch.png b/theme/material_icons/svn_switch.png
new file mode 100644
index 00000000..4bec54a9
Binary files /dev/null and b/theme/material_icons/svn_switch.png differ
diff --git a/theme/material_icons/system-users.png b/theme/material_icons/system-users.png
new file mode 100644
index 00000000..35953ba8
Binary files /dev/null and b/theme/material_icons/system-users.png differ
diff --git a/theme/material_icons/toggle_log.png b/theme/material_icons/toggle_log.png
new file mode 100644
index 00000000..b0f4d30f
Binary files /dev/null and b/theme/material_icons/toggle_log.png differ
diff --git a/theme/material_icons/transfers_list.png b/theme/material_icons/transfers_list.png
new file mode 100644
index 00000000..007d9bd7
Binary files /dev/null and b/theme/material_icons/transfers_list.png differ
diff --git a/theme/material_icons/user-group-new.png b/theme/material_icons/user-group-new.png
new file mode 100644
index 00000000..72abe747
Binary files /dev/null and b/theme/material_icons/user-group-new.png differ
diff --git a/theme/material_icons/vcs_status.png b/theme/material_icons/vcs_status.png
new file mode 100644
index 00000000..54c559fe
Binary files /dev/null and b/theme/material_icons/vcs_status.png differ
diff --git a/theme/material_icons/view_sort_descending.png b/theme/material_icons/view_sort_descending.png
new file mode 100644
index 00000000..48f99203
Binary files /dev/null and b/theme/material_icons/view_sort_descending.png differ
