diff --git a/admin/award_awards.php b/admin/award_awards.php index b6f0f7ae..cf1d677a 100644 --- a/admin/award_awards.php +++ b/admin/award_awards.php @@ -381,6 +381,7 @@ echo mysql_error(); award_awards.id, award_awards.name, award_awards.order, + award_awards.award_sources_id, award_types.type, award_sponsors.organization @@ -415,9 +416,11 @@ echo mysql_error(); echo "\n"; + $hasexternal=false; while($r=mysql_fetch_object($q)) { - echo "\n"; + if($r->award_sources_id){ $cl="class=\"externalaward\""; $hasexternal=true; } else $cl=""; + echo "\n"; echo " id]\" value=\"$r->order\" size=\"3\" />\n"; echo " $r->organization\n"; echo " $r->type\n"; @@ -441,7 +444,8 @@ echo mysql_error(); echo " \n"; echo "\n"; } - + if($hasexternal) + echo "".i18n("Indicates award imported from an external source").""; echo "\n"; echo ""; echo ""; diff --git a/admin/award_download.php b/admin/award_download.php index b8836389..afbd66ca 100644 --- a/admin/award_download.php +++ b/admin/award_download.php @@ -105,7 +105,7 @@ echo i18n("Award Name: %1",array($award['name_en'][0]))."
"; if($year==$config['FAIRYEAR']) { - $tq=mysql_query("SELECT * FROM award_awards WHERE external_identifier='$identifier' AND year='$year'"); + $tq=mysql_query("SELECT * FROM award_awards WHERE external_identifier='$identifier' AND award_sources_id='$checksource' AND year='$year'"); if($awardrecord=mysql_fetch_object($tq)) { echo i18n("Award already exists, updating info")."
"; @@ -286,7 +286,7 @@ echo mysql_error(); //remove any awards that are left in the $existingawards array, they must have been removed from the source foreach($existingawards AS $aid) { - echo i18n("Removing award id %1 that was removed from external source",array($aid)); + echo i18n("Removing award id %1 that was removed from external source",array($aid))."
"; mysql_query("DELETE FROM award_prizes WHERE award_awards_id='$aid'"); mysql_query("DELETE FROM award_awards WHERE id='$aid'"); } diff --git a/sfiab.css b/sfiab.css index 1228d597..cc72e86e 100644 --- a/sfiab.css +++ b/sfiab.css @@ -289,4 +289,8 @@ hr { margin-top: 2px; } +tr.externalaward { + background-color: #CCCCDD; + font-style: italic; +}