Restore merge of phutil_tag.

This commit is contained in:
epriestley
2013-02-13 14:50:15 -08:00
parent 73cce6e131
commit ef7f16180c
264 changed files with 1690 additions and 1716 deletions

View File

@@ -155,28 +155,32 @@ final class PhrictionDiffController
$link_r = pht('Most Recent Change');
}
$navigation_table =
$navigation_table = hsprintf(
'<table class="phriction-history-nav-table">
<tr>
<td class="nav-prev">'.$link_l.'</td>
<td class="nav-next">'.$link_r.'</td>
<td class="nav-prev">%s</td>
<td class="nav-next">%s</td>
</tr>
</table>';
</table>',
$link_l,
$link_r);
}
$output =
$output = hsprintf(
'<div class="phriction-document-history-diff">'.
$comparison_table->render().
'<br />'.
'<br />'.
$navigation_table.
'%s<br /><br />%s'.
'<table class="phriction-revert-table">'.
'<tr><td>'.$revert_l.'</td><td>'.$revert_r.'</td>'.
'<tr><td>%s</td><td>%s</td>'.
'</table>'.
$output.
'</div>';
'%s'.
'</div>',
$comparison_table->render(),
$navigation_table,
$revert_l,
$revert_r,
$output);
return $this->buildStandardPageResponse(
array(
@@ -234,9 +238,9 @@ final class PhrictionDiffController
$rows[] = array(
phabricator_date($c->getDateCreated(), $user),
phabricator_time($c->getDateCreated(), $user),
phutil_escape_html('Version '.$c->getVersion()),
'Version '.$c->getVersion(),
$handles[$c->getAuthorPHID()]->renderLink(),
phutil_escape_html($c->getDescription()),
$c->getDescription(),
);
}