Commit ee615bbf authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Remove old template & edit a few language strings for consistency


Signed-off-by: default avatarRichard Mansfield <richardm@catalyst.net.nz>
parent cc3390d4
...@@ -32,8 +32,6 @@ $string['Comments'] = 'Comments'; ...@@ -32,8 +32,6 @@ $string['Comments'] = 'Comments';
$string['comment'] = 'comment'; $string['comment'] = 'comment';
$string['comments'] = 'comments'; $string['comments'] = 'comments';
$string['addcomment'] = 'Add comment';
$string['addcommentnotallowed'] = 'You are not allowed to add comments on this View';
$string['allowcomments'] = 'Allow comments'; $string['allowcomments'] = 'Allow comments';
$string['attachfile'] = "Attach file"; $string['attachfile'] = "Attach file";
$string['Attachments'] = "Attachments"; $string['Attachments'] = "Attachments";
...@@ -55,10 +53,8 @@ $string['feedback'] = 'Feedback'; ...@@ -55,10 +53,8 @@ $string['feedback'] = 'Feedback';
$string['feedbackattachdirname'] = 'commentfiles'; $string['feedbackattachdirname'] = 'commentfiles';
$string['feedbackattachdirdesc'] = 'Files attached to comments on your portfolio'; $string['feedbackattachdirdesc'] = 'Files attached to comments on your portfolio';
$string['feedbackattachmessage'] = 'The attached file(s) have been added to your %s folder'; $string['feedbackattachmessage'] = 'The attached file(s) have been added to your %s folder';
$string['feedbackchangedtoprivate'] = 'Feedback changed to private';
$string['feedbackonviewbyuser'] = 'Feedback on %s by %s'; $string['feedbackonviewbyuser'] = 'Feedback on %s by %s';
$string['feedbacksubmitted'] = 'Feedback submitted'; $string['feedbacksubmitted'] = 'Feedback submitted';
$string['makeprivate'] = 'Change to Private';
$string['makepublic'] = 'Make public'; $string['makepublic'] = 'Make public';
$string['makepublicnotallowed'] = 'You are not allowed to make this comment public'; $string['makepublicnotallowed'] = 'You are not allowed to make this comment public';
$string['makepublicrequestsubject'] = 'Request to change private comment to public'; $string['makepublicrequestsubject'] = 'Request to change private comment to public';
...@@ -66,9 +62,8 @@ $string['makepublicrequestbyauthormessage'] = '%s has requested that you make th ...@@ -66,9 +62,8 @@ $string['makepublicrequestbyauthormessage'] = '%s has requested that you make th
$string['makepublicrequestbyownermessage'] = '%s has requested that you make your comment public.'; $string['makepublicrequestbyownermessage'] = '%s has requested that you make your comment public.';
$string['makepublicrequestsent'] = 'A message has been sent to %s to request that the comment be made public.'; $string['makepublicrequestsent'] = 'A message has been sent to %s to request that the comment be made public.';
$string['newfeedbacknotificationsubject'] = 'New feedback on %s'; $string['newfeedbacknotificationsubject'] = 'New feedback on %s';
$string['requestpublic'] = 'Request make public'; $string['placefeedback'] = 'Place feedback';
$string['thisfeedbackispublic'] = 'This feedback is public'; $string['thiscommentisprivate'] = 'This comment is private';
$string['thisfeedbackisprivate'] = 'This feedback is private';
$string['typefeedback'] = 'Feedback'; $string['typefeedback'] = 'Feedback';
$string['youhaverequestedpublic'] = 'You have requested that this comment be made public.'; $string['youhaverequestedpublic'] = 'You have requested that this comment be made public.';
......
...@@ -345,7 +345,7 @@ class ArtefactTypeComment extends ArtefactType { ...@@ -345,7 +345,7 @@ class ArtefactTypeComment extends ArtefactType {
} }
} }
if ($item->private) { if ($item->private) {
$item->pubmessage = get_string('thisfeedbackisprivate', 'artefact.comment'); $item->pubmessage = get_string('thiscommentisprivate', 'artefact.comment');
} }
if (isset($data->showcomment) && $data->showcomment == $item->id) { if (isset($data->showcomment) && $data->showcomment == $item->id) {
...@@ -490,7 +490,7 @@ class ArtefactTypeComment extends ArtefactType { ...@@ -490,7 +490,7 @@ class ArtefactTypeComment extends ArtefactType {
} }
$form['elements']['submit'] = array( $form['elements']['submit'] = array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'value' => array(get_string('addcomment', 'artefact.comment'), get_string('cancel')), 'value' => array(get_string('placefeedback', 'artefact.comment'), get_string('cancel')),
); );
return $form; return $form;
} }
......
...@@ -112,7 +112,6 @@ $string['alreadyinwatchlist'] = 'This View is already in your watchlist'; ...@@ -112,7 +112,6 @@ $string['alreadyinwatchlist'] = 'This View is already in your watchlist';
$string['attachedfileaddedtofolder'] = "The attached file %s has been added to your '%s' folder."; $string['attachedfileaddedtofolder'] = "The attached file %s has been added to your '%s' folder.";
$string['complaint'] = 'Complaint'; $string['complaint'] = 'Complaint';
$string['date'] = 'Date'; $string['date'] = 'Date';
$string['feedback'] = 'Feedback';
$string['notifysiteadministrator'] = 'Notify site administrator'; $string['notifysiteadministrator'] = 'Notify site administrator';
$string['print'] = 'Print'; $string['print'] = 'Print';
$string['reportobjectionablematerial'] = 'Report objectionable material'; $string['reportobjectionablematerial'] = 'Report objectionable material';
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div class="viewfooter cb"> <div class="viewfooter cb">
<table id="feedbacktable" class="fullwidth table"> <table id="feedbacktable" class="fullwidth table">
<thead><tr><th>{str tag="Comments" section="artefact.comment"}</th></tr></thead> <thead><tr><th>{str tag="feedback" section="artefact.comment"}</th></tr></thead>
<tbody> <tbody>
{$feedback->tablerows} {$feedback->tablerows}
</tbody> </tbody>
......
{foreach from=$data item=item}
<tr class="{cycle name=rows values='r0,r1'}">
<td>
{$item->message}
{if $item->attachmessage}<div>{$item->attachmessage}</div>{/if}
<div class="details">
{if $item->author}
<div class="icon"><a href="{$WWWROOT}user/view.php?id={$item->author|escape}">
<img src="{$WWWROOT}thumb.php?type=profileicon&id={$item->author|escape}&maxsize=20" valign="middle" alt="{$item->author|display_name}">
</a></div>
<a href="{$WWWROOT}user/view.php?id={$item->author|escape}">{$item->author|display_name}</a>
{else}
{$item->authorname|escape}
{/if}
| {$item->date|escape}
{if $item->pubmessage}
| {$item->pubmessage|escape}{if $item->makeprivateform}{$item->makeprivateform}{/if}
{/if}
{if $item->attachid}
| {str tag=attachment section=view}: <a href="{$WWWROOT}artefact/file/download.php?file={$item->attachid}">{$item->attachtitle|escape}</a> ({$item->attachsize|escape})
{/if}
</div>
</td>
</tr>
{/foreach}
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div>{$releaseform}</div> <div>{$releaseform}</div>
{if $view_group_submission_form}<div>{$view_group_submission_form}</div>{/if} {if $view_group_submission_form}<div>{$view_group_submission_form}</div>{/if}
<table id="feedbacktable" class="fullwidth table"> <table id="feedbacktable" class="fullwidth table">
<thead><tr><th>{str tag="Comments" section="artefact.comment"}</th></tr></thead> <thead><tr><th>{str tag="feedback" section="artefact.comment"}</th></tr></thead>
<tbody> <tbody>
{$feedback->tablerows} {$feedback->tablerows}
</tbody> </tbody>
......
{if $enablecomments} {if $enablecomments}
<a id="add_feedback_link" href="">{str tag=addcomment section=artefact.comment}</a> | <a id="add_feedback_link" href="">{str tag=placefeedback section=artefact.comment}</a> |
{/if} {/if}
{if $LOGGEDIN} {if $LOGGEDIN}
<a id="objection_link" href="">{str tag=reportobjectionablematerial section=view}</a> | <a id="objection_link" href="">{str tag=reportobjectionablematerial section=view}</a> |
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment