diff options
Diffstat (limited to 'site/app/views/editors/review.thtml')
| -rw-r--r-- | site/app/views/editors/review.thtml | 58 |
1 files changed, 21 insertions, 37 deletions
diff --git a/site/app/views/editors/review.thtml b/site/app/views/editors/review.thtml index fd26be7..f0229d4 100644 --- a/site/app/views/editors/review.thtml +++ b/site/app/views/editors/review.thtml @@ -120,10 +120,10 @@ echo '<li>'; echo $html->checkbox('Approval/File][', null, array('value' => $file['id'], 'class' => 'fileCheckbox', 'checked' => $checked, 'disabled' => $file['disabled'], 'onClick' => 'selectedFile();')); - echo ' <b>'.$html->link($platforms[$file['platform_id']], '/downloads/file/'.$file['id'].'/'.$file['filename'], array('onClick' => $this->controller->Amo->installTrigger($addon['Addon']['addontype_id'], $html->url('/downloads/file/'.$file['id'].'/'.$file['filename']), $addon['Translation']['name']['string'].' '.$version['Version']['version'], '', $file['hash']).' return false;')).'</b>'; + echo ' <b>'.$html->link($platforms[$file['platform_id']], '/downloads/file/'.$file['id'].'/'.$file['filename'], array('onClick' => $this->controller->Amo->installTrigger($addon['Addon']['addontype_id'], FULL_BASE_URL.$html->url('/downloads/file/'.$file['id'].'/'.$file['filename']), $addon['Translation']['name']['string'].' '.$version['Version']['version'], '', $file['hash']).' return false;')).'</b>'; echo ' - '.$approval[$file['status']].' ('.$file['created'].')'; echo ' - '.$html->link(_('editors_review_file_viewcontents_link'), '/files/browse/'.$file['id'].'/1'); - if ($has_public) { + if ($has_public && $addontype != ADDON_SEARCH) { //if (count($addon['Version']) > 1) { echo ' - '.$html->link(_('editors_review_file_diff_link'), '/files/diff/'.$file['id'].'/'); } @@ -150,6 +150,7 @@ <div id="actionbox"> <span id="public" class="action_color" onClick="selectAction('public');"><?=$html->image('developers/public-bw.png', array('id' => 'publicIcon')).' '._('editors_review_action_public')?></span> <span id="sandbox" class="action_color" onClick="selectAction('sandbox');"><?=$html->image('developers/sandbox-bw.png', array('id' => 'sandboxIcon')).' '._('editors_review_action_sandbox')?></span> + <span id="info" class="action_color" onClick="selectAction('info');"><?=$html->image('developers/info-bw.png', array('id' => 'infoIcon')).' '.___('editors_review_action_info', 'Request More Information')?></span> <span id="superreview" class="action_color" onClick="selectAction('superreview');"><?=$html->image('developers/superreview-bw.png', array('id' => 'superreviewIcon')).' '._('editors_review_action_request_superreview')?></span> </div> <div id="actiondetails"> @@ -170,10 +171,15 @@ echo _('editors_review_details_nominated_sandbox'); echo '</div>'; } - echo '<div id="details-superreview" style="display: none;">'; - echo _('editors_review_details_superreview'); - echo '</div>'; ?> + <div id="details-info" style="display: none;"> + <?=___('editors_review_details_info_request', 'Use this form to request more information ' + .'from the author. They will receive an email and be able to answer here. You will be ' + .'notified by email when they reply.');?> + </div> + <div id="details-superreview" style="display: none;"> + <?=_('editors_review_details_superreview');?> + </div> </div> <div id="subform" style="display: none;"> <div id="commentsbox"> @@ -183,7 +189,7 @@ <?php if (!empty($cannedresponses)) { echo '<div id="canned">'; - echo _('editors_review_label_cannedresponse'); + echo _('editors_review_label_cannedresponse').' '; echo $html->selectTag('Approval/CannedResponse', $cannedresponses, null, array("onChange" => "document.getElementById('comments').value = this.value;", 'class' => 'input')); echo '</div>'; } @@ -202,6 +208,13 @@ <? } ?> + <div id="subscribe"> + <?php + $_subscribetext = ___('editors_review_update_notify_once', 'Notify me the next time this add-on is updated. (Subsequent updates will not generate an email)'); + echo $html->checkbox('Approval/subscribe', $_subscribetext); + ?> + <label for="ApprovalSubscribe"><?=$_subscribetext?></label> + </div> <div id="finish"> <?=$html->submit(_('editors_review_submit_process_action'), array('id' => 'process', 'onClick' => 'return validateReview(\''.$reviewType.'\');'))?> </div> @@ -278,37 +291,8 @@ if (!empty($addon['Translation']['developercomments']['string'])) { </tr> <?php if (!empty($history)) { - foreach ($history as $hist) { - echo '<tr>'; - echo '<td>'.$hist['Version']['version'].' ('.$platforms[$hist['File']['platform_id']].')</td>'; - echo '<td>'.$hist['Approval']['created'].'</td>'; - echo '<td>'.$html->linkEmail($hist['User']['firstname'].' '.$hist['User']['lastname'], $hist['User']['email']).'</td>'; - echo '<td>'; - if ($hist['Approval']['reviewtype'] == 'nominated') { - if ($hist['Approval']['action'] == STATUS_PUBLIC) { - echo _('editors_review_history_nominated_approved'); - } - elseif ($hist['Approval']['action'] == STATUS_SANDBOX) { - echo _('editors_review_history_nominated_denied'); - } - elseif ($hist['Approval']['action'] == STATUS_NOMINATED) { - echo _('editors_review_history_nominated_adminreview'); - } - } - elseif ($hist['Approval']['reviewtype'] == 'pending') { - if ($hist['Approval']['action'] == STATUS_PUBLIC) { - echo _('editors_review_history_pending_approved'); - } - elseif ($hist['Approval']['action'] == STATUS_SANDBOX) { - echo _('editors_review_history_pending_denied'); - } - elseif ($hist['Approval']['action'] == STATUS_PENDING) { - echo _('editors_review_history_pending_adminreview'); - } - } - echo '</td>'; - echo '<td>'.nl2br($hist['Approval']['comments']).'</td>'; - echo '</tr>'; + foreach ($history as &$hist) { + echo $this->renderElement('developers/editors_review_history_item', array('hist'=>$hist)); } } else { |