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

- Fix a reference to the award external identifier

Browse Source 
- Move the nubmer of available prizes to the top so it's harder to miss.
This commit is contained in:
dave 2009-09-14 05:34:31 +00:00
parent 347d2d5a86
commit 0a9053181c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/award_awards.php
View File

@ -518,6 +518,7 @@ $(document).ready(function() {
<div id="editor_tab_eligibility"> <div id="editor_tab_eligibility">
<h4><?=i18n("Eligibility")?></h4> <h4><?=i18n("Eligibility")?></h4>
<div id="eligibility_notice" class="notice_area"></div> <div id="eligibility_notice" class="notice_area"></div>
<br />
<form id="eligibility"> <form id="eligibility">
<input type="hidden" id="eligibility_id" name="id" value="" /> <input type="hidden" id="eligibility_id" name="id" value="" />
<table class="tableedit"> <table class="tableedit">
@ -576,7 +577,11 @@ $(document).ready(function() {
<input type="hidden" id="prizeinfo_id" name="id" value=""/> <input type="hidden" id="prizeinfo_id" name="id" value=""/>
<input type="hidden" id="prizeinfo_award_awards_id" name="award_awards_id" value=""/> <input type="hidden" id="prizeinfo_award_awards_id" name="award_awards_id" value=""/>
<table class="tableedit"> <table class="tableedit">
<tr> <td class="left"><?=i18n("Prize Description")?>:</td> <tr>
<td class="left"><?=i18n("Number available")?>:</td>
<td class="right"><input type="text" id="prizeinfo_number" class="prizeinfo" name="number" value="" size="3" maxlength="5" disabled="disabled" /></td>
</tr><tr>
<td class="left"><?=i18n("Prize Description")?>:</td>
<td class="right"><input type="text" id="prizeinfo_prize" class="prizeinfo translatable" name="prize" value="" size="40" maxlength="128" disabled="disabled"/></td> <td class="right"><input type="text" id="prizeinfo_prize" class="prizeinfo translatable" name="prize" value="" size="40" maxlength="128" disabled="disabled"/></td>
</tr><tr> </tr><tr>
<td class="left"><?=i18n("Cash Amount")?> ($):</td> <td class="left"><?=i18n("Cash Amount")?> ($):</td>
@ -587,9 +592,6 @@ $(document).ready(function() {
</tr><tr> </tr><tr>
<td class="left"><?=i18n("Prize Value")?> ($):</td> <td class="left"><?=i18n("Prize Value")?> ($):</td>
<td class="right"><input type="text" id="prizeinfo_value" class="prizeinfo" name="value" value="" size="10" maxlength="10" disabled="disabled" /></td> <td class="right"><input type="text" id="prizeinfo_value" class="prizeinfo" name="value" value="" size="10" maxlength="10" disabled="disabled" /></td>
</tr><tr>
<td class="left"><?=i18n("Number available")?>:</td>
<td class="right"><input type="text" id="prizeinfo_number" class="prizeinfo" name="number" value="" size="3" maxlength="5" disabled="disabled" /></td>
</tr><tr> </tr><tr>
<td class="left" valign="top"><?=i18n("Plaque/Trophy")?>:</td> <td class="left" valign="top"><?=i18n("Plaque/Trophy")?>:</td>
<td class="right"> <td class="right">
@ -606,7 +608,6 @@ $(document).ready(function() {
</tr></table></td> </tr></table></td>
</tr><tr> </tr><tr>
<td class="left"><?=i18n("Awards Ceremony")?>:</td> <td class="left"><?=i18n("Awards Ceremony")?>:</td>
<td class="right"><input type="checkbox" id="prizeinfo_excludefromac" class="prizeinfo" name="excludefromac" value="1" disabled="disabled"><?=i18n("Exclude this prize from the award ceremony script")?></td> <td class="right"><input type="checkbox" id="prizeinfo_excludefromac" class="prizeinfo" name="excludefromac" value="1" disabled="disabled"><?=i18n("Exclude this prize from the award ceremony script")?></td>
</tr> </tr>
</table> </table>

2
xmltransport.php
View File

@ -86,7 +86,7 @@ function handle_getawards(&$u, $fair, &$data, &$response)
while($a = mysql_fetch_assoc($q)) { while($a = mysql_fetch_assoc($q)) {
$award = array(); $award = array();
$award['identifier'] = $a['identifier']; $award['identifier'] = $a['external_identifier'];
$award['year'] = $a['year']; $award['year'] = $a['year'];
$award['name_en'] = $a['name']; $award['name_en'] = $a['name'];
$award['criteria_en'] = $a['criteria']; $award['criteria_en'] = $a['criteria'];