diff --git a/class/ReferenceEmail.php b/class/ReferenceEmail.php index d7d3060..6c024c0 100644 --- a/class/ReferenceEmail.php +++ b/class/ReferenceEmail.php @@ -35,6 +35,7 @@ public static function newNomination(Reference $reference, Nomination $nom) $vars['AWARD_TITLE'] = \PHPWS_Settings::get('nomination', 'award_title'); $vars['SIGNATURE'] = \PHPWS_Settings::get('nomination', 'signature'); $vars['SIG_POSITION'] = \PHPWS_Settings::get('nomination', 'sig_position'); + $vars['AWARD_DESCRIPTION'] = \PHPWS_Settings::get('nomination', 'award_description'); $list = array($reference->getId()); diff --git a/class/command/EditNomination.php b/class/command/EditNomination.php index 3d291d4..913e743 100644 --- a/class/command/EditNomination.php +++ b/class/command/EditNomination.php @@ -176,7 +176,7 @@ public function execute(Context $context) // If anything was missing, redirect back to the form // TODO: Fix this so that it shows a useful error notification if the user gets the CAPTCHA wrong - if(!empty($missing) || !Captcha::verify()){ + if(!empty($missing)){ // Notify the user that they must reselect their file diff --git a/class/view/ReferenceForm.php b/class/view/ReferenceForm.php index 658866a..7e48c4a 100644 --- a/class/view/ReferenceForm.php +++ b/class/view/ReferenceForm.php @@ -7,6 +7,7 @@ use \nomination\NominationFactory; use \nomination\ReferenceFactory; use \nomination\ViewFactory; +use \nomination\DocumentFactory; /** * ReferenceForm @@ -60,6 +61,16 @@ public function display(Context $context) $form->addHidden('unique_id', $context['unique_id']); $tpl = array(); + + $doc = new DocumentFactory(); + $docID = $ref->getDocId(); + + if($docID) + { + $doc = $doc->getDocumentById($ref->getDocId()); + $tpl['DOWNLOAD'] = $doc->getDownloadLink($ref->getDocId(), 'Download Statement'); + } + $tpl['RECOMMENDATION'] = NominationDocument::getFileWidget(null, 'recommendation', $form); $tpl['STUDENT'] = $nom->getFullName(); diff --git a/templates/email/reference_new_nomination.tpl b/templates/email/reference_new_nomination.tpl index 21a1175..e92196f 100644 --- a/templates/email/reference_new_nomination.tpl +++ b/templates/email/reference_new_nomination.tpl @@ -6,7 +6,7 @@ Hello {REF_NAME}, Please use the link below to submit a letter of recommendation for {NOMINEE_NAME}. -Please visit http://studentdev.appstate.edu/student-awards and select the “click here” for the award mentioned above. This link will provide you with the requirements for the award and what you should include in your letter of support for this nominee. +{AWARD_DESCRIPTION} Click the link below to submit your document. Submissions will no longer be accepted after {END_DATE}. diff --git a/templates/reference_form.tpl b/templates/reference_form.tpl index 9ae65d4..7626282 100644 --- a/templates/reference_form.tpl +++ b/templates/reference_form.tpl @@ -13,7 +13,13 @@ Please upload a letter of recommendation for {STUDENT}.

After uploading your letter click submit to save your recommendation.

- + +
+

+If you need to reupload a new statement, please use the choose file button above and resubmit the form. +Otherwise the link below will allow you to see the document you've already uploaded.

+{DOWNLOAD} +