From 2a9fb88de43741de73c860e298b1d213f7b2e8a3 Mon Sep 17 00:00:00 2001 From: Armanveer Gill Date: Sun, 29 Dec 2024 13:26:25 -0500 Subject: [PATCH] Changed icons to Material Icons --- committees.php | 10 +- common.inc.php | 80 +++++++++------- css/output.css | 72 ++++++++------ css/styles.css | 3 + helper.inc.php | 5 + theme/dropped text.txt | 1 + theme/icons_default/icons.php | 88 +++++++++--------- theme/material_icons/Coins-32x32.png | Bin 0 -> 3299 bytes .../accessories-text-editor.png | Bin 0 -> 1758 bytes theme/material_icons/agt_forum.png | Bin 0 -> 1937 bytes theme/material_icons/application-pdf.png | Bin 0 -> 1060 bytes ...pplication-vnd.oasis.opendocument.text.png | Bin 0 -> 973 bytes .../material_icons/applications-education.png | Bin 0 -> 1434 bytes theme/material_icons/chemical.png | Bin 0 -> 1935 bytes theme/material_icons/configure.png | Bin 0 -> 2367 bytes theme/material_icons/date.png | Bin 0 -> 1048 bytes theme/material_icons/document-multiple.png | Bin 0 -> 820 bytes theme/material_icons/edit_user.png | Bin 0 -> 2093 bytes theme/material_icons/edu_science.png | Bin 0 -> 1714 bytes theme/material_icons/edu_science_canada.png | Bin 0 -> 1975 bytes theme/material_icons/elempic.png | Bin 0 -> 1079 bytes theme/material_icons/encrypted.png | Bin 0 -> 1451 bytes theme/material_icons/flag-blue.png | Bin 0 -> 637 bytes theme/material_icons/flag-green.png | Bin 0 -> 637 bytes theme/material_icons/folder.png | Bin 0 -> 644 bytes theme/material_icons/gear.png | Bin 0 -> 1716 bytes theme/material_icons/help-contents.png | Bin 0 -> 2649 bytes theme/material_icons/kanagram.png | Bin 0 -> 2997 bytes theme/material_icons/kdmconfig.png | Bin 0 -> 1098 bytes theme/material_icons/klipper.png | Bin 0 -> 816 bytes theme/material_icons/kwordquiz.png | Bin 0 -> 1156 bytes theme/material_icons/kwrite.png | Bin 0 -> 975 bytes theme/material_icons/legalmoves.png | Bin 0 -> 1683 bytes theme/material_icons/mail-mark-unread.png | Bin 0 -> 1255 bytes theme/material_icons/numbers.png | Bin 0 -> 2988 bytes theme/material_icons/package_utilities.png | Bin 0 -> 1660 bytes theme/material_icons/plasmagik.png | Bin 0 -> 2452 bytes theme/material_icons/rebuild.png | Bin 0 -> 2385 bytes theme/material_icons/rollover_fiscal.png | Bin 0 -> 1514 bytes theme/material_icons/signature.png | Bin 0 -> 2637 bytes theme/material_icons/svn_switch.png | Bin 0 -> 1514 bytes theme/material_icons/system-users.png | Bin 0 -> 1550 bytes theme/material_icons/toggle_log.png | Bin 0 -> 1861 bytes theme/material_icons/transfers_list.png | Bin 0 -> 1121 bytes theme/material_icons/user-group-new.png | Bin 0 -> 1583 bytes theme/material_icons/vcs_status.png | Bin 0 -> 1922 bytes theme/material_icons/view_sort_descending.png | Bin 0 -> 877 bytes 47 files changed, 145 insertions(+), 114 deletions(-) create mode 100644 css/styles.css create mode 100644 theme/dropped text.txt create mode 100644 theme/material_icons/Coins-32x32.png create mode 100644 theme/material_icons/accessories-text-editor.png create mode 100644 theme/material_icons/agt_forum.png create mode 100644 theme/material_icons/application-pdf.png create mode 100644 theme/material_icons/application-vnd.oasis.opendocument.text.png create mode 100644 theme/material_icons/applications-education.png create mode 100644 theme/material_icons/chemical.png create mode 100644 theme/material_icons/configure.png create mode 100644 theme/material_icons/date.png create mode 100644 theme/material_icons/document-multiple.png create mode 100644 theme/material_icons/edit_user.png create mode 100644 theme/material_icons/edu_science.png create mode 100644 theme/material_icons/edu_science_canada.png create mode 100644 theme/material_icons/elempic.png create mode 100644 theme/material_icons/encrypted.png create mode 100644 theme/material_icons/flag-blue.png create mode 100644 theme/material_icons/flag-green.png create mode 100644 theme/material_icons/folder.png create mode 100644 theme/material_icons/gear.png create mode 100644 theme/material_icons/help-contents.png create mode 100644 theme/material_icons/kanagram.png create mode 100644 theme/material_icons/kdmconfig.png create mode 100644 theme/material_icons/klipper.png create mode 100644 theme/material_icons/kwordquiz.png create mode 100644 theme/material_icons/kwrite.png create mode 100644 theme/material_icons/legalmoves.png create mode 100644 theme/material_icons/mail-mark-unread.png create mode 100644 theme/material_icons/numbers.png create mode 100644 theme/material_icons/package_utilities.png create mode 100644 theme/material_icons/plasmagik.png create mode 100644 theme/material_icons/rebuild.png create mode 100644 theme/material_icons/rollover_fiscal.png create mode 100644 theme/material_icons/signature.png create mode 100644 theme/material_icons/svn_switch.png create mode 100644 theme/material_icons/system-users.png create mode 100644 theme/material_icons/toggle_log.png create mode 100644 theme/material_icons/transfers_list.png create mode 100644 theme/material_icons/user-group-new.png create mode 100644 theme/material_icons/vcs_status.png create mode 100644 theme/material_icons/view_sort_descending.png diff --git a/committees.php b/committees.php index d9045aec..0aeb2bfe 100644 --- a/committees.php +++ b/committees.php @@ -57,7 +57,7 @@ $output=$config['committee_publiclayout']; $name=$r2->firstname.' '.$r2->lastname; - $output=str_replace("name",$u['name'],$output); + $output=str_replace("name",get_value_or_default_boolean($u, 'name', ''),$output); $output=str_replace("title",$r2->title,$output); //make sure we do emailprivate before email so we dont match the wrong thing @@ -73,10 +73,10 @@ } else $output=str_replace("email","",$output); - $output=str_replace("phonehome",$u['phonehome'],$output); - $output=str_replace("phonework",$u['phonework'],$output); - $output=str_replace("phonecell",$u['phonecell'],$output); - $output=str_replace("fax",$u['fax'],$output); + $output=str_replace("phonehome",get_value_or_default_boolean($u, 'phonehome', ''),$output); + $output=str_replace("phonework",get_value_or_default_boolean($u, 'phonework', ''),$output); + $output=str_replace("phonecell",get_value_or_default_boolean($u, 'phonecell', ''),$output); + $output=str_replace("fax",get_value_or_default_boolean($u, 'fax', ''),$output); echo $output; diff --git a/common.inc.php b/common.inc.php index fa1d6cd2..a107cbb4 100644 --- a/common.inc.php +++ b/common.inc.php @@ -395,12 +395,13 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false) echo "\n"; ?> - + <? //if($title && !$titletranslated) echo i18n($title); else if($title) echo $title; else echo i18n($config['fairname']); ?> /css/output.css' /> - +/css/styles.css' /> + - + @@ -431,10 +432,10 @@ if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config" || substr(get ?>
-