diff options
Diffstat (limited to 'site/app/views/editors')
9 files changed, 69 insertions, 42 deletions
diff --git a/site/app/views/editors/email/inforequest_plain.thtml b/site/app/views/editors/email/inforequest_plain.thtml new file mode 100644 index 0000000..6d99f11 --- /dev/null +++ b/site/app/views/editors/email/inforequest_plain.thtml @@ -0,0 +1,13 @@ +A Mozilla Add-ons Editor requested further information from you regarding version <?=$info['version']?> of your add-on <?=$info['name']?>. + +<?=$info['reviewer']?> wrote: + +"<?=$info['comments']?>" + +Please go to <?=FULL_BASE_URL.$html->url("/developers/discuss/{$info['infoid']}", true, true, false)?> to reply. + + +If you have further questions, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org. + +Mozilla Add-ons +<?=SITE_URL?> diff --git a/site/app/views/editors/email/inforequest_reply_plain.thtml b/site/app/views/editors/email/inforequest_reply_plain.thtml new file mode 100644 index 0000000..4a3d859 --- /dev/null +++ b/site/app/views/editors/email/inforequest_reply_plain.thtml @@ -0,0 +1,11 @@ +<?=$info['sender']?> has commented on version <?=$info['version']?> of the add-on <?=$info['name']?>: + +"<?=$info['comments']?>" + +Please go to <?=FULL_BASE_URL.$html->url("/developers/discuss/{$info['infoid']}", true, true, false)?> if you would like to reply. + + +If you have further questions, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org. + +Mozilla Add-ons +<?=SITE_URL?> diff --git a/site/app/views/editors/email/nominated/public_plain.thtml b/site/app/views/editors/email/nominated/public_plain.thtml index 86072da..4f161e5 100644 --- a/site/app/views/editors/email/nominated/public_plain.thtml +++ b/site/app/views/editors/email/nominated/public_plain.thtml @@ -8,7 +8,7 @@ You can view your public add-on now at: <?=SITE_URL?>/addon/<?=$info['id']?> Review Information: Reviewer: <?=$info['reviewer']?> -Comments: <?=nl2br($info['comments'])?> +Comments: <?=$info['comments']?> If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org. diff --git a/site/app/views/editors/email/nominated/sandbox_plain.thtml b/site/app/views/editors/email/nominated/sandbox_plain.thtml index fe86809..71caaa9 100644 --- a/site/app/views/editors/email/nominated/sandbox_plain.thtml +++ b/site/app/views/editors/email/nominated/sandbox_plain.thtml @@ -3,7 +3,7 @@ Your nominated add-on, <?=$info['name']?>, has been reviewed by a <?=SITE_NAME?> Review Information: Reviewer: <?=$info['reviewer']?> -Comments: <?=nl2br($info['comments'])?> +Comments: <?=$info['comments']?> If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org. diff --git a/site/app/views/editors/email/notify_update_plain.thtml b/site/app/views/editors/email/notify_update_plain.thtml new file mode 100644 index 0000000..5694fd3 --- /dev/null +++ b/site/app/views/editors/email/notify_update_plain.thtml @@ -0,0 +1,19 @@ +Dear editor, + +An add-on you previously reviewed was just updated. + + +Add-on Information: + +Name: <?=$info['name']?> +URL: <?=FULL_BASE_URL.$html->url("/addon/{$info['id']}")?> + +Version Number: <?=$info['version']?> +Review Link: <?=FULL_BASE_URL.$html->url("/editors/review/{$info['versionid']}")?> + + +Thanks! +Mozilla Add-ons +<?=SITE_URL?> + +This is a one-time notification sent to you because you requested a follow up email regarding queue activity for <?=$info['name']?>. There is no need to unsubscribe if you don't wish to receive further mail. diff --git a/site/app/views/editors/email/pending/public_plain.thtml b/site/app/views/editors/email/pending/public_plain.thtml index 19b5157..8e099a7 100644 --- a/site/app/views/editors/email/pending/public_plain.thtml +++ b/site/app/views/editors/email/pending/public_plain.thtml @@ -11,7 +11,7 @@ Reviewer: <?=$info['reviewer']?> Tested on <?=$info['os']?> with <?=$info['apps']?> -Comments: <?=nl2br($info['comments'])?> +Comments: <?=$info['comments']?> If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org. diff --git a/site/app/views/editors/email/pending/sandbox_plain.thtml b/site/app/views/editors/email/pending/sandbox_plain.thtml index 8a08d33..8bcc353 100644 --- a/site/app/views/editors/email/pending/sandbox_plain.thtml +++ b/site/app/views/editors/email/pending/sandbox_plain.thtml @@ -6,7 +6,7 @@ Reviewer: <?=$info['reviewer']?> Tested on <?=$info['os']?> with <?=$info['apps']?> -Comments: <?=nl2br($info['comments'])?> +Comments: <?=$info['comments']?> If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org. diff --git a/site/app/views/editors/email/superreview_plain.thtml b/site/app/views/editors/email/superreview_plain.thtml index 6a5ac65..8eb4a8b 100644 --- a/site/app/views/editors/email/superreview_plain.thtml +++ b/site/app/views/editors/email/superreview_plain.thtml @@ -10,7 +10,7 @@ Please open your plethora of knowledge and wield your mighty administrative swor Review Information: Reviewer: <?=$info['reviewer']?> -Comments: <?=nl2br($info['comments'])?> +Comments: <?=$info['comments']?> Love, 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 { |